From 8ec1fd4587b33459cc2ad940ee9623f7cba3195a Mon Sep 17 00:00:00 2001 From: Default email Date: Mon, 15 Mar 2021 09:37:03 +0100 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 266dc8c3d052f549826ba246d06787a219533b8f --- .../nixpkgs/doc/builders/fetchers.chapter.md | 2 +- .../nixpkgs/doc/builders/images/snaptools.xml | 2 +- .../languages-frameworks/android.section.md | 2 +- .../languages-frameworks/dotnet.section.md | 2 +- .../doc/languages-frameworks/lua.section.md | 4 +- .../languages-frameworks/python.section.md | 4 +- .../doc/languages-frameworks/ruby.section.md | 2 +- .../doc/languages-frameworks/rust.section.md | 2 +- third_party/nixpkgs/doc/manual.xml | 6 +- .../nixpkgs/doc/stdenv/meta.chapter.md | 194 ++ third_party/nixpkgs/doc/stdenv/meta.xml | 349 --- .../doc/stdenv/multiple-output.chapter.md | 128 + .../nixpkgs/doc/stdenv/multiple-output.xml | 261 -- .../nixpkgs/doc/stdenv/stdenv.chapter.md | 1215 ++++++++ third_party/nixpkgs/doc/stdenv/stdenv.xml | 2419 --------------- third_party/nixpkgs/doc/using/overlays.xml | 2 +- .../maintainers/scripts/pluginupdate.py | 526 ++++ .../doc/manual/release-notes/rl-2105.xml | 52 +- .../nixos/modules/misc/documentation.nix | 2 +- .../nixpkgs/nixos/modules/misc/meta.nix | 4 +- .../nixpkgs/nixos/modules/module-list.nix | 1 + .../nixos/modules/services/games/factorio.nix | 10 + .../services/misc/mautrix-telegram.nix | 20 +- .../monitoring/prometheus/exporters.nix | 3 +- .../monitoring/prometheus/exporters/jitsi.nix | 40 + .../modules/services/networking/croc.nix | 88 + .../nixos/modules/services/printing/cupsd.nix | 2 +- .../modules/services/web-apps/miniflux.nix | 24 +- third_party/nixpkgs/nixos/tests/all-tests.nix | 1 + third_party/nixpkgs/nixos/tests/croc.nix | 51 + third_party/nixpkgs/nixos/tests/miniflux.nix | 14 + .../nixos/tests/prometheus-exporters.nix | 23 + third_party/nixpkgs/nixos/tests/spike.nix | 2 +- .../accessibility/contrast/default.nix | 23 +- .../audio/gnome-podcasts/default.nix | 28 +- .../default.nix | 82 + .../applications/audio/musescore/default.nix | 4 +- .../applications/audio/rosegarden/default.nix | 4 +- .../applications/audio/shortwave/default.nix | 26 +- .../backup/pika-backup/borg-path.patch | 13 + .../backup/pika-backup/default.nix | 77 + .../blockchains/zcash/default.nix | 32 +- .../lightdm-mini-greeter/default.nix | 4 +- .../editors/emacs-modes/elpa-generated.nix | 130 +- .../editors/emacs-modes/org-generated.nix | 12 +- .../emacs-modes/recipes-archive-melpa.json | 2522 +++++++++------- .../applications/editors/glow/default.nix | 6 +- .../editors/kakoune/plugins/aliases.nix | 46 + .../kakoune/plugins/build-kakoune-plugin.nix | 33 + .../editors/kakoune/plugins/case.kak.nix | 27 - .../editors/kakoune/plugins/default.nix | 38 +- .../editors/kakoune/plugins/deprecated.json | 1 + .../editors/kakoune/plugins/generated.nix | 211 ++ .../editors/kakoune/plugins/kak-ansi.nix | 32 - .../kakoune/plugins/kak-auto-pairs.nix | 24 - .../editors/kakoune/plugins/kak-buffers.nix | 24 - .../editors/kakoune/plugins/kak-fzf.nix | 39 - .../editors/kakoune/plugins/kak-plumb.nix | 31 - .../editors/kakoune/plugins/kak-powerline.nix | 29 - .../editors/kakoune/plugins/kak-prelude.nix | 25 - .../plugins/kak-vertical-selection.nix | 24 - .../kakoune/plugins/kakoune-plugin-names | 17 + .../editors/kakoune/plugins/kakoune-utils.nix | 4 + .../editors/kakoune/plugins/openscad.kak.nix | 25 - .../editors/kakoune/plugins/overrides.nix | 161 + .../kakoune/plugins/quickscope.kak.nix | 29 - .../editors/kakoune/plugins/update.py | 91 + .../applications/editors/texworks/default.nix | 14 +- .../applications/graphics/ImageMagick/6.x.nix | 5 +- .../graphics/photoflare/default.nix | 8 +- .../graphics/renderdoc/default.nix | 4 +- .../applications/misc/caerbannog/default.nix | 7 +- .../applications/misc/calibre/default.nix | 4 +- .../misc/crow-translate/default.nix | 4 +- .../deadd-notification-center/default.nix | 33 +- .../pkgs/applications/misc/free42/default.nix | 4 +- .../applications/misc/gphoto2/default.nix | 4 +- .../pkgs/applications/misc/mkgmap/default.nix | 4 +- .../applications/misc/obsidian/default.nix | 4 +- .../misc/pdfsam-basic/default.nix | 4 +- .../pkgs/applications/misc/pueue/default.nix | 11 +- .../misc/syncthingtray/default.nix | 15 +- .../pkgs/applications/misc/ticker/default.nix | 6 +- .../pkgs/applications/misc/tickrs/default.nix | 6 +- .../misc/todoist-electron/default.nix | 4 +- .../pkgs/applications/misc/worker/default.nix | 4 +- .../networking/browsers/asuka/default.nix | 10 +- .../browsers/chromium/upstream-info.json | 12 +- .../browsers/firefox-bin/default.nix | 2 + .../networking/browsers/firefox/common.nix | 3 +- ...atch => env_var_for_system_dir-ff85.patch} | 0 .../firefox/env_var_for_system_dir-ff86.patch | 21 + .../networking/browsers/firefox/packages.nix | 4 +- .../browsers/google-chrome/default.nix | 8 + .../networking/cluster/argo/default.nix | 4 +- .../networking/cluster/helm/default.nix | 6 +- .../networking/cluster/kubecfg/default.nix | 4 +- .../cluster/tektoncd-cli/default.nix | 21 +- .../networking/cluster/terragrunt/default.nix | 6 +- .../feedreaders/newsflash/default.nix | 6 +- .../instant-messengers/fractal/default.nix | 24 +- .../jitsi-meet-electron/default.nix | 11 +- .../instant-messengers/teams/default.nix | 10 +- .../instant-messengers/zulip-term/default.nix | 8 +- .../networking/mailreaders/aerc/default.nix | 10 +- .../networking/seaweedfs/default.nix | 6 +- .../applications/radio/gnss-sdr/default.nix | 32 +- .../pkgs/applications/radio/gnuradio/3.7.nix | 55 +- .../pkgs/applications/radio/gnuradio/3.8.nix | 284 ++ .../pkgs/applications/radio/gnuradio/ais.nix | 53 - .../applications/radio/gnuradio/default.nix | 161 +- .../pkgs/applications/radio/gnuradio/gsm.nix | 37 - .../applications/radio/gnuradio/limesdr.nix | 38 - .../applications/radio/gnuradio/osmosdr.nix | 45 - .../pkgs/applications/radio/gnuradio/rds.nix | 36 - .../applications/radio/gnuradio/shared.nix | 9 +- .../applications/radio/gnuradio/wrapper.nix | 125 +- .../pkgs/applications/radio/gqrx/default.nix | 36 +- .../applications/radio/inspectrum/default.nix | 19 +- .../applications/radio/qradiolink/default.nix | 68 +- .../applications/radio/svxlink/default.nix | 4 +- .../pkgs/applications/radio/uhd/3.5.nix | 159 + .../pkgs/applications/radio/uhd/default.nix | 17 +- .../science/biology/spades/default.nix | 4 +- .../science/biology/stacks/default.nix | 4 +- .../science/chemistry/jmol/default.nix | 4 +- .../science/electronics/pcb/default.nix | 4 +- .../science/logic/tlaplus/toolbox.nix | 26 +- .../science/math/calc/default.nix | 4 +- .../applications/search/doodle/default.nix | 4 +- .../terminal-emulators/kgx/default.nix | 75 + .../git-and-tools/ghorg/default.nix | 4 +- .../git-and-tools/glab/default.nix | 6 +- .../pkgs/applications/video/kodi/default.nix | 260 +- .../video/kodi/{plugins.nix => packages.nix} | 153 +- .../applications/video/kodi/unwrapped.nix | 242 ++ .../pkgs/applications/video/kodi/wrapper.nix | 19 +- .../applications/video/mkvtoolnix/default.nix | 7 +- .../video/qstopmotion/default.nix | 4 +- .../applications/video/smplayer/default.nix | 49 +- .../virtualization/singularity/default.nix | 4 +- .../virtualization/spike/default.nix | 12 +- .../fonts/twitter-color-emoji/default.nix | 4 +- .../pkgs/data/icons/luna-icons/default.nix | 4 +- .../pkgs/data/misc/osinfo-db/default.nix | 4 +- .../pkgs/data/themes/orchis/default.nix | 4 +- .../core/evolution-data-server/default.nix | 11 +- .../desktops/gnome-3/games/hitori/default.nix | 4 +- .../pkgs/development/compilers/go/1.15.nix | 4 +- .../pkgs/development/compilers/go/1.16.nix | 4 +- .../development/compilers/opa/default.nix | 2 +- .../compilers/opa/ocaml-4.04.patch | 75 + .../pkgs/development/compilers/solc/0.7.nix | 78 + .../development/compilers/solc/default.nix | 157 +- .../coq-modules/mathcomp-analysis/default.nix | 21 +- .../gnuradio-modules/ais/default.nix | 45 + .../gnuradio-modules/gsm/default.nix | 48 + .../gnuradio-modules/limesdr/default.nix | 61 + .../gnuradio-modules/mkDerivation.nix | 25 + .../gnuradio-modules/nacl/default.nix} | 41 +- .../gnuradio-modules/osmosdr/default.nix | 86 + .../gnuradio-modules/rds/default.nix | 59 + .../guile-modules/guile-opengl/default.nix | 2 +- .../haskell-modules/configuration-common.nix | 85 +- .../configuration-ghc-8.10.x.nix | 6 + .../configuration-ghc-8.8.x.nix | 10 +- .../configuration-ghc-9.0.x.nix | 3 + .../configuration-hackage2nix.yaml | 148 +- .../haskell-modules/configuration-nix.nix | 10 +- .../haskell-modules/hackage-packages.nix | 2687 +++++++++-------- .../haskell-modules/non-hackage-packages.nix | 4 + .../pkgs/development/interpreters/php/7.4.nix | 4 +- .../pkgs/development/interpreters/php/8.0.nix | 4 +- .../development/interpreters/ruby/default.nix | 6 +- .../development/libraries/amdvlk/default.nix | 4 +- .../libraries/armadillo/default.nix | 4 +- .../libraries/clucene-core/default.nix | 2 +- .../development/libraries/flatpak/default.nix | 8 +- .../development/libraries/folks/default.nix | 17 + .../development/libraries/gdal/default.nix | 7 +- .../libraries/gtkdatabox/default.nix | 2 +- .../libraries/gupnp-igd/default.nix | 25 +- .../development/libraries/htmlcxx/default.nix | 5 +- .../libraries/iniparser/default.nix | 3 + .../libraries/iniparser/iniparser.pc.in | 12 + .../development/libraries/jasper/default.nix | 48 + .../development/libraries/kissfft/default.nix | 7 +- .../development/libraries/levmar/default.nix | 5 +- .../development/libraries/libcec/platform.nix | 2 +- .../development/libraries/libcli/default.nix | 4 +- .../libraries/libcredis/default.nix | 2 +- .../libraries/libcsptr/default.nix | 2 +- .../libraries/libdigidocpp/default.nix | 4 +- .../development/libraries/libebml/default.nix | 5 +- .../libraries/libfilezilla/default.nix | 4 +- .../libraries/libgdata/default.nix | 4 +- .../libraries/libhandy/default.nix | 4 +- .../libraries/libisoburn/default.nix | 4 +- .../development/libraries/liblcf/default.nix | 2 +- .../libraries/liblinear/default.nix | 4 +- .../libraries/liblouis/default.nix | 4 +- .../libraries/libmatroska/default.nix | 5 +- .../libraries/libnatpmp/default.nix | 8 +- .../libraries/libnest2d/default.nix | 2 +- .../libraries/liboauth/default.nix | 2 +- .../development/libraries/libofx/default.nix | 4 +- .../libraries/libpostal/default.nix | 4 +- .../libraries/libwebsockets/default.nix | 1 + .../development/libraries/libxmi/default.nix | 2 +- .../development/libraries/libxmlb/default.nix | 4 +- .../development/libraries/libxmp/default.nix | 2 +- .../libraries/lightning/default.nix | 2 +- .../libraries/loudmouth/default.nix | 2 +- .../development/libraries/lrdf/default.nix | 2 +- .../development/libraries/metal/default.nix | 2 +- .../development/libraries/minixml/default.nix | 2 +- .../development/libraries/msgpuck/default.nix | 2 +- .../development/libraries/nss/default.nix | 4 +- .../development/libraries/oneDNN/default.nix | 4 +- .../development/libraries/orcania/default.nix | 4 +- .../development/libraries/osip/default.nix | 2 +- .../libraries/prime-server/default.nix | 7 +- .../development/libraries/pxlib/default.nix | 2 +- .../development/libraries/redkite/default.nix | 4 +- .../libraries/safefile/default.nix | 2 +- .../development/libraries/shhmsg/default.nix | 7 +- .../development/libraries/shhopt/default.nix | 6 +- .../development/libraries/spglib/default.nix | 2 +- .../libraries/spice-protocol/default.nix | 2 +- .../development/libraries/tidyp/default.nix | 2 +- .../development/libraries/volk/default.nix | 51 + .../libraries/zxing-cpp/default.nix | 44 + .../hercules-ci-optparse-applicative.nix | 21 + .../ocaml-modules/zarith/default.nix | 33 +- .../php-packages/php-cs-fixer/default.nix | 4 +- .../php-packages/phpstan/default.nix | 4 +- .../php-packages/swoole/default.nix | 21 + .../python-modules/Rtree/default.nix | 23 +- .../adafruit-platformdetect/default.nix | 4 +- .../python-modules/adguardhome/default.nix | 43 +- .../python-modules/agate-sql/default.nix | 10 +- .../python-modules/azure-core/default.nix | 4 +- .../azure-eventgrid/default.nix | 8 +- .../default.nix | 9 +- .../azure-mgmt-compute/default.nix | 6 +- .../azure-mgmt-kusto/default.nix | 12 +- .../azure-mgmt-network/default.nix | 4 +- .../azure-multiapi-storage/default.nix | 15 +- .../azure-storage-blob/default.nix | 4 +- .../python-modules/beniget/default.nix | 25 + .../python-modules/bip_utils/default.nix | 4 +- .../python-modules/bitarray/default.nix | 4 +- .../python-modules/broadlink/default.nix | 24 +- .../python-modules/cadquery/default.nix | 5 +- .../python-modules/caldav/default.nix | 10 +- .../python-modules/casbin/default.nix | 4 +- .../ciscomobilityexpress/default.nix | 28 +- .../python-modules/convertdate/default.nix | 7 +- .../python-modules/cryptography/default.nix | 1 + .../python-modules/ddt/default.nix | 13 +- .../python-modules/deepmerge/default.nix | 22 +- .../python-modules/defcon/default.nix | 4 +- .../python-modules/evohome-async/default.nix | 34 + .../python-modules/fluent-logger/default.nix | 4 +- .../google-cloud-automl/default.nix | 4 +- .../google-cloud-bigquery/default.nix | 4 +- .../google-cloud-dataproc/default.nix | 4 +- .../google-cloud-os-config/default.nix | 4 +- .../google-cloud-redis/default.nix | 4 +- .../python-modules/hass-nabucasa/default.nix | 6 +- .../python-modules/howdoi/default.nix | 4 +- .../incomfort-client/default.nix | 34 + .../python-modules/kaggle/default.nix | 4 +- .../python-modules/labgrid/default.nix | 6 +- .../python-modules/msal/default.nix | 4 +- .../python-modules/msrest/default.nix | 4 +- .../python-modules/ntc-templates/default.nix | 27 +- .../python-modules/plexapi/default.nix | 4 +- .../python-modules/plugwise/default.nix | 4 +- .../python-modules/powerline/default.nix | 4 +- .../python-modules/pynetdicom/default.nix | 55 + .../python-modules/pythran/default.nix | 69 + .../python-modules/xknx/default.nix | 4 +- .../tools/analysis/coan/default.nix | 2 +- .../tools/analysis/codeql/default.nix | 4 +- .../tools/analysis/tfsec/default.nix | 4 +- .../tools/build-managers/qbs/default.nix | 4 +- .../continuous-integration/hci/default.nix | 23 + .../hercules-ci-agent/default.nix | 6 +- .../development/tools/gofumpt/default.nix | 6 +- .../pkgs/development/tools/jbang/default.nix | 4 +- .../pkgs/development/tools/k6/default.nix | 4 +- .../development/tools/lazygit/default.nix | 4 +- .../development/tools/misc/pwndbg/default.nix | 2 +- .../tools/misc/terraform-ls/default.nix | 6 +- .../tools/ocaml/ocamlformat/default.nix | 6 +- .../tools/ocaml/ocamlformat/generic.nix | 26 +- .../tools/open-policy-agent/default.nix | 4 +- .../development/tools/renderizer/default.nix | 12 +- .../repository-managers/nexus/default.nix | 4 +- .../tools/rust/cargo-criterion/default.nix | 6 +- .../tools/rust/cbindgen/default.nix | 17 +- .../development/tools/sd-local/default.nix | 4 +- .../development/tools/wrangler/default.nix | 6 +- .../pkgs/development/web/insomnia/default.nix | 4 +- .../nixpkgs/pkgs/games/cbonsai/default.nix | 4 +- .../nixpkgs/pkgs/games/factorio/versions.json | 48 +- .../nixpkgs/pkgs/games/osu-lazer/default.nix | 4 +- .../nixpkgs/pkgs/games/osu-lazer/deps.nix | 44 +- .../nixpkgs/pkgs/games/pentobi/default.nix | 4 +- .../nixpkgs/pkgs/games/steam/fhsenv.nix | 8 +- .../nixpkgs/pkgs/games/unciv/default.nix | 4 +- .../nixpkgs/pkgs/games/vassal/default.nix | 2 +- .../pkgs/misc/cups/drivers/canon/default.nix | 5 +- .../misc/cups/drivers/hll2340dw/default.nix | 4 +- .../nixpkgs/pkgs/misc/lilypond/unstable.nix | 21 - .../nixpkgs/pkgs/misc/riscv-pk/default.nix | 15 +- .../nixpkgs/pkgs/misc/vim-plugins/update.py | 501 +-- .../pkgs/misc/vscode-extensions/default.nix | 4 +- .../vscode-extensions/terraform/default.nix | 4 +- .../os-specific/linux/fatrace/default.nix | 4 +- .../firmware-linux-nonfree/default.nix | 2 +- .../windows/mcfgthreads/default.nix | 8 +- .../home-assistant/component-packages.nix | 6 +- .../pkgs/servers/home-assistant/default.nix | 4 +- .../nixpkgs/pkgs/servers/imgproxy/default.nix | 6 +- .../nixpkgs/pkgs/servers/jellyfin/default.nix | 15 +- .../pkgs/servers/kapowbang/default.nix | 6 +- .../matrix-synapse/plugins/default.nix | 1 + .../plugins/shared-secret-auth.nix | 18 + .../nixpkgs/pkgs/servers/minio/default.nix | 6 +- .../pkgs/servers/monitoring/loki/default.nix | 4 +- .../monitoring/prometheus/jitsi-exporter.nix | 23 + .../servers/nats-streaming-server/default.nix | 4 +- .../servers/rtsp-simple-server/default.nix | 6 +- .../sql/postgresql/ext/plpgsql_check.nix | 4 +- .../nixpkgs/pkgs/servers/traefik/default.nix | 6 +- .../pkgs/servers/web-apps/moodle/default.nix | 4 +- .../nixpkgs/pkgs/shells/nushell/default.nix | 6 +- .../pkgs/shells/powershell/default.nix | 6 +- .../pkgs/tools/admin/azure-cli/default.nix | 5 +- .../tools/admin/azure-cli/python-packages.nix | 107 +- .../pkgs/tools/admin/clair/default.nix | 6 +- .../pkgs/tools/admin/eksctl/default.nix | 6 +- .../pkgs/tools/admin/procs/default.nix | 6 +- .../pkgs/tools/backup/monolith/default.nix | 6 +- .../pkgs/tools/compression/zstd/default.nix | 4 +- .../zstd/mcfgthreads-no-pthread.patch | 13 - .../pkgs/tools/filesystems/catcli/default.nix | 4 +- .../filesystems/reiser4progs/default.nix | 4 +- .../filesystems/rmfuse/poetry-git-overlay.nix | 4 +- .../pkgs/tools/filesystems/rmfuse/poetry.lock | 337 +-- .../tools/filesystems/rmfuse/pyproject.toml | 2 +- .../pkgs/tools/filesystems/rmfuse/update | 0 .../tools/filesystems/s3backer/default.nix | 4 +- .../pkgs/tools/graphics/resvg/default.nix | 11 +- .../ibus-engines/ibus-anthy/default.nix | 4 +- .../ibus-engines/ibus-table/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/3mux/default.nix | 28 +- .../pkgs/tools/misc/broadlink-cli/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/dijo/default.nix | 6 +- .../pkgs/tools/misc/direnv/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/fzf/default.nix | 4 +- .../pkgs/tools/misc/git-town/default.nix | 4 +- .../pkgs/tools/misc/oppai-ng/default.nix | 4 +- .../pkgs/tools/misc/pcb2gcode/default.nix | 4 +- .../pkgs/tools/misc/pgcenter/default.nix | 4 +- .../pkgs/tools/misc/pistol/default.nix | 6 +- .../pkgs/tools/misc/plantuml/default.nix | 4 +- .../pkgs/tools/misc/progress/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/pspg/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/tfk8s/default.nix | 38 + .../nixpkgs/pkgs/tools/misc/units/default.nix | 4 +- .../tools/misc/uutils-coreutils/default.nix | 44 +- .../nixpkgs/pkgs/tools/misc/yad/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/ytfzf/default.nix | 15 +- .../pkgs/tools/misc/ytfzf/no-update.patch | 30 + .../tools/networking/boundary/default.nix | 39 +- .../tools/networking/cassowary/default.nix | 6 +- .../networking/go-shadowsocks2/default.nix | 6 +- .../pkgs/tools/networking/kapp/default.nix | 4 +- .../tools/networking/keepalived/default.nix | 4 +- .../tools/networking/minio-client/default.nix | 4 +- .../network-manager/applet/default.nix | 8 +- .../pkgs/tools/networking/radvd/default.nix | 5 + .../pkgs/tools/networking/wget/default.nix | 3 + .../package-management/emplace/default.nix | 6 +- .../tools/package-management/nix/default.nix | 3 +- .../pkgs/tools/security/age/default.nix | 6 +- .../pkgs/tools/security/expliot/default.nix | 72 + .../pkgs/tools/security/gopass/default.nix | 8 +- .../pkgs/tools/security/libtpms/default.nix | 4 +- .../pkgs/tools/security/metasploit/Gemfile | 2 +- .../tools/security/metasploit/Gemfile.lock | 30 +- .../tools/security/metasploit/default.nix | 4 +- .../pkgs/tools/security/metasploit/gemset.nix | 56 +- .../pkgs/tools/security/teler/default.nix | 6 +- .../pkgs/tools/security/terrascan/default.nix | 6 +- .../nixpkgs/pkgs/tools/system/fio/default.nix | 4 +- .../pkgs/tools/system/snooze/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/mark/default.nix | 6 +- .../pkgs/tools/typesetting/scdoc/default.nix | 10 +- .../tools/typesetting/tex/dblatex/default.nix | 13 +- .../tools/virtualization/shipyard/default.nix | 6 +- .../pkgs/tools/wayland/wev/default.nix | 10 +- .../pkgs/tools/wayland/wlsunset/default.nix | 10 +- .../pkgs/tools/wayland/wshowkeys/default.nix | 10 +- .../nixpkgs/pkgs/top-level/aliases.nix | 33 +- .../nixpkgs/pkgs/top-level/all-packages.nix | 261 +- .../pkgs/top-level/gnuradio-packages.nix | 47 + .../nixpkgs/pkgs/top-level/php-packages.nix | 8 +- .../pkgs/top-level/python-packages.nix | 10 + 412 files changed, 10296 insertions(+), 8598 deletions(-) create mode 100644 third_party/nixpkgs/doc/stdenv/meta.chapter.md delete mode 100644 third_party/nixpkgs/doc/stdenv/meta.xml create mode 100644 third_party/nixpkgs/doc/stdenv/multiple-output.chapter.md delete mode 100644 third_party/nixpkgs/doc/stdenv/multiple-output.xml create mode 100644 third_party/nixpkgs/doc/stdenv/stdenv.chapter.md delete mode 100644 third_party/nixpkgs/doc/stdenv/stdenv.xml create mode 100644 third_party/nixpkgs/maintainers/scripts/pluginupdate.py create mode 100644 third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/jitsi.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/croc.nix create mode 100644 third_party/nixpkgs/nixos/tests/croc.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/backup/pika-backup/borg-path.patch create mode 100644 third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/aliases.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/deprecated.json create mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names create mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-utils.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/overrides.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix create mode 100755 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py rename third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/{env_var_for_system_dir.patch => env_var_for_system_dir-ff85.patch} (100%) create mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch create mode 100644 third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix create mode 100644 third_party/nixpkgs/pkgs/applications/radio/uhd/3.5.nix create mode 100644 third_party/nixpkgs/pkgs/applications/terminal-emulators/kgx/default.nix rename third_party/nixpkgs/pkgs/applications/video/kodi/{plugins.nix => packages.nix} (80%) create mode 100644 third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/opa/ocaml-4.04.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/solc/0.7.nix create mode 100644 third_party/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/gnuradio-modules/gsm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/gnuradio-modules/limesdr/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/gnuradio-modules/mkDerivation.nix rename third_party/nixpkgs/pkgs/{applications/radio/gnuradio/nacl.nix => development/gnuradio-modules/nacl/default.nix} (50%) create mode 100644 third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/gnuradio-modules/rds/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/iniparser/iniparser.pc.in create mode 100644 third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/volk/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix create mode 100644 third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/beniget/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/incomfort-client/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix delete mode 100644 third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix create mode 100644 third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch mode change 100644 => 100755 third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/update create mode 100644 third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch create mode 100644 third_party/nixpkgs/pkgs/tools/security/expliot/default.nix create mode 100644 third_party/nixpkgs/pkgs/top-level/gnuradio-packages.nix diff --git a/third_party/nixpkgs/doc/builders/fetchers.chapter.md b/third_party/nixpkgs/doc/builders/fetchers.chapter.md index 317c9430cd..c70e3020bb 100644 --- a/third_party/nixpkgs/doc/builders/fetchers.chapter.md +++ b/third_party/nixpkgs/doc/builders/fetchers.chapter.md @@ -18,7 +18,7 @@ stdenv.mkDerivation { The main difference between `fetchurl` and `fetchzip` is in how they store the contents. `fetchurl` will store the unaltered contents of the URL within the Nix store. `fetchzip` on the other hand will decompress the archive for you, making files and directories directly accessible in the future. `fetchzip` can only be used with archives. Despite the name, `fetchzip` is not limited to .zip files and can also be used with any tarball. -`fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time. +`fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time. Other fetcher functions allow you to add source code directly from a VCS such as subversion or git. These are mostly straightforward nambes based on the name of the command used with the VCS system. Because they give you a working repository, they act most like `fetchzip`. diff --git a/third_party/nixpkgs/doc/builders/images/snaptools.xml b/third_party/nixpkgs/doc/builders/images/snaptools.xml index 422fcfa37d..bbe2e3f5e1 100644 --- a/third_party/nixpkgs/doc/builders/images/snaptools.xml +++ b/third_party/nixpkgs/doc/builders/images/snaptools.xml @@ -16,7 +16,7 @@ - The base should not be be specified, as makeSnap will force set it. + The base should not be specified, as makeSnap will force set it. diff --git a/third_party/nixpkgs/doc/languages-frameworks/android.section.md b/third_party/nixpkgs/doc/languages-frameworks/android.section.md index 62e544cd48..416073df07 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/android.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/android.section.md @@ -80,7 +80,7 @@ Most of the function arguments have reasonable default settings. You can specify license names: -* `extraLicenses` is a list of of license names. +* `extraLicenses` is a list of license names. You can get these names from repo.json or `querypackages.sh licenses`. The SDK license (`android-sdk-license`) is accepted for you if you set accept_license to true. If you are doing something like working with preview SDKs, you will diff --git a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md index 88fd74db82..c394704249 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md @@ -64,7 +64,7 @@ $ dotnet --info The `dotnetCorePackages.sdk_X_Y` is preferred over the old dotnet-sdk as both major and minor version are very important for a dotnet environment. If a given minor version isn't present (or was changed), then this will likely break your ability to build a project. -## dotnetCorePackages.sdk vs vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore +## dotnetCorePackages.sdk vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `net`, `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. For runtime versions >= .NET 5 `net` is used while `netcore` is used for older .NET Core runtime version. diff --git a/third_party/nixpkgs/doc/languages-frameworks/lua.section.md b/third_party/nixpkgs/doc/languages-frameworks/lua.section.md index d81949c75f..5935cbd7bd 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/lua.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/lua.section.md @@ -50,7 +50,7 @@ and install it in your profile with ```shell nix-env -iA nixpkgs.myLuaEnv ``` -The environment is is installed by referring to the attribute, and considering +The environment is installed by referring to the attribute, and considering the `nixpkgs` channel was used. #### Lua environment defined in `/etc/nixos/configuration.nix` @@ -129,7 +129,7 @@ the whitelist maintainers/scripts/luarocks-packages.csv and updated by running m [luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock). The automation only goes so far though and some packages need to be customized. These customizations go in `pkgs/development/lua-modules/overrides.nix`. -For instance if the rockspec defines `external_dependencies`, these need to be manually added in in its rockspec file then it won't work. +For instance if the rockspec defines `external_dependencies`, these need to be manually added in its rockspec file then it won't work. You can try converting luarocks packages to nix packages with the command `nix-shell -p luarocks-nix` and then `luarocks nix PKG_NAME`. Nix rely on luarocks to install lua packages, basically it runs: diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index e569cdaa93..26458c3906 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -334,7 +334,7 @@ Above, we were mostly just focused on use cases and what to do to get started creating working Python environments in nix. Now that you know the basics to be up and running, it is time to take a step -back and take a deeper look at at how Python packages are packaged on Nix. Then, +back and take a deeper look at how Python packages are packaged on Nix. Then, we will look at how you can use development mode with your code. #### Python library packages in Nixpkgs @@ -918,7 +918,7 @@ because their behaviour is different: * `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables as well as the items listed in `setup_requires`. -* `buildInputs ? []`: Build and/or run-time dependencies that need to be be +* `buildInputs ? []`: Build and/or run-time dependencies that need to be compiled for the host machine. Typically non-Python libraries which are being linked. * `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These diff --git a/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md b/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md index aeec154586..c519d79d3d 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md @@ -229,7 +229,7 @@ end If you want to package a specific version, you can use the standard Gemfile syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable version anyway, it's easier to update by simply running the `bundle lock` and `bundix` steps again. -Now you can also also make a `default.nix` that looks like this: +Now you can also make a `default.nix` that looks like this: ```nix { bundlerApp }: diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md index 94f94aaffe..020201d086 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md @@ -737,7 +737,7 @@ with import "${src.out}/rust-overlay.nix" pkgs pkgs; stdenv.mkDerivation { name = "rust-env"; buildInputs = [ - # Note: to use use stable, just replace `nightly` with `stable` + # Note: to use stable, just replace `nightly` with `stable` latest.rustChannels.nightly.rust # Add some extra dependencies from `pkgs` diff --git a/third_party/nixpkgs/doc/manual.xml b/third_party/nixpkgs/doc/manual.xml index b0490ec74a..375e2394ff 100644 --- a/third_party/nixpkgs/doc/manual.xml +++ b/third_party/nixpkgs/doc/manual.xml @@ -15,9 +15,9 @@ Standard environment - - - + + + diff --git a/third_party/nixpkgs/doc/stdenv/meta.chapter.md b/third_party/nixpkgs/doc/stdenv/meta.chapter.md new file mode 100644 index 0000000000..dd9f532585 --- /dev/null +++ b/third_party/nixpkgs/doc/stdenv/meta.chapter.md @@ -0,0 +1,194 @@ +# Meta-attributes {#chap-meta} + +Nix packages can declare *meta-attributes* that contain information about a package such as a description, its homepage, its license, and so on. For instance, the GNU Hello package has a `meta` declaration like this: + +```nix +meta = with lib; { + description = "A program that produces a familiar, friendly greeting"; + longDescription = '' + GNU Hello is a program that prints "Hello, world!" when you run it. + It is fully customizable. + ''; + homepage = "https://www.gnu.org/software/hello/manual/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.eelco ]; + platforms = platforms.all; +}; +``` + +Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of the package. The value of a meta-attribute must be a string. + +The meta-attributes of a package can be queried from the command-line using `nix-env`: + +```ShellSession +$ nix-env -qa hello --json +{ + "hello": { + "meta": { + "description": "A program that produces a familiar, friendly greeting", + "homepage": "https://www.gnu.org/software/hello/manual/", + "license": { + "fullName": "GNU General Public License version 3 or later", + "shortName": "GPLv3+", + "url": "http://www.fsf.org/licensing/licenses/gpl.html" + }, + "longDescription": "GNU Hello is a program that prints \"Hello, world!\" when you run it.\nIt is fully customizable.\n", + "maintainers": [ + "Ludovic Court\u00e8s " + ], + "platforms": [ + "i686-linux", + "x86_64-linux", + "armv5tel-linux", + "armv7l-linux", + "mips32-linux", + "x86_64-darwin", + "i686-cygwin", + "i686-freebsd", + "x86_64-freebsd", + "i686-openbsd", + "x86_64-openbsd" + ], + "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/default.nix:14" + }, + "name": "hello-2.9", + "system": "x86_64-linux" + } +} +``` + +`nix-env` knows about the `description` field specifically: + +```ShellSession +$ nix-env -qa hello --description +hello-2.3 A program that produces a familiar, friendly greeting +``` + +## Standard meta-attributes {#sec-standard-meta-attributes} + +It is expected that each meta-attribute is one of the following: + +### `description` {#var-meta-description} + +A short (one-line) description of the package. This is shown by `nix-env -q --description` and also on the Nixpkgs release pages. + +Don’t include a period at the end. Don’t include newline characters. Capitalise the first character. For brevity, don’t repeat the name of package --- just describe what it does. + +Wrong: `"libpng is a library that allows you to decode PNG images."` + +Right: `"A library for decoding PNG images"` + +### `longDescription` {#var-meta-longDescription} + +An arbitrarily long description of the package. + +### `branch` {#var-meta-branch} + +Release branch. Used to specify that a package is not going to receive updates that are not in this branch; for example, Linux kernel 3.0 is supposed to be updated to 3.0.X, not 3.1. + +### `homepage` {#var-meta-homepage} + +The package’s homepage. Example: `https://www.gnu.org/software/hello/manual/` + +### `downloadPage` {#var-meta-downloadPage} + +The page where a link to the current version can be found. Example: `https://ftp.gnu.org/gnu/hello/` + +### `changelog` {#var-meta-changelog} + +A link or a list of links to the location of Changelog for a package. A link may use expansion to refer to the correct changelog version. Example: `"https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}"` + +### `license` {#var-meta-license} + +The license, or licenses, for the package. One from the attribute set defined in [`nixpkgs/lib/licenses.nix`](https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix). At this moment using both a list of licenses and a single license is valid. If the license field is in the form of a list representation, then it means that parts of the package are licensed differently. Each license should preferably be referenced by their attribute. The non-list attribute value can also be a space delimited string representation of the contained attribute `shortNames` or `spdxIds`. The following are all valid examples: + +- Single license referenced by attribute (preferred) `lib.licenses.gpl3Only`. +- Single license referenced by its attribute shortName (frowned upon) `"gpl3Only"`. +- Single license referenced by its attribute spdxId (frowned upon) `"GPL-3.0-only"`. +- Multiple licenses referenced by attribute (preferred) `with lib.licenses; [ asl20 free ofl ]`. +- Multiple licenses referenced as a space delimited string of attribute shortNames (frowned upon) `"asl20 free ofl"`. + +For details, see [Licenses](#sec-meta-license). + +### `maintainers` {#var-meta-maintainers} + +A list of the maintainers of this Nix expression. Maintainers are defined in [`nixpkgs/maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix). There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled “maintainers: add alice”, and reference maintainers with `maintainers = with lib.maintainers; [ alice bob ]`. + +### `priority` {#var-meta-priority} + +The *priority* of the package, used by `nix-env` to resolve file name conflicts between packages. See the Nix manual page for `nix-env` for details. Example: `"10"` (a low-priority package). + +### `platforms` {#var-meta-platforms} + +The list of Nix platform types on which the package is supported. Hydra builds packages according to the platform specified. If no platform is specified, the package does not have prebuilt binaries. An example is: + +```nix +meta.platforms = lib.platforms.linux; +``` + +Attribute Set `lib.platforms` defines [various common lists](https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix) of platforms types. + +### `tests` {#var-meta-tests} + +::: warning +This attribute is special in that it is not actually under the `meta` attribute set but rather under the `passthru` attribute set. This is due to how `meta` attributes work, and the fact that they are supposed to contain only metadata, not derivations. +::: + +An attribute set with as values tests. A test is a derivation, which builds successfully when the test passes, and fails to build otherwise. A derivation that is a test needs to have `meta.timeout` defined. + +The NixOS tests are available as `nixosTests` in parameters of derivations. For instance, the OpenSMTPD derivation includes lines similar to: + +```nix +{ /* ... */, nixosTests }: +{ + # ... + passthru.tests = { + basic-functionality-and-dovecot-integration = nixosTests.opensmtpd; + }; +} +``` + +### `timeout` {#var-meta-timeout} + +A timeout (in seconds) for building the derivation. If the derivation takes longer than this time to build, it can fail due to breaking the timeout. However, all computers do not have the same computing power, hence some builders may decide to apply a multiplicative factor to this value. When filling this value in, try to keep it approximately consistent with other values already present in `nixpkgs`. + +### `hydraPlatforms` {#var-meta-hydraPlatforms} + +The list of Nix platform types for which the Hydra instance at `hydra.nixos.org` will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of `meta.platforms`. Thus, the only reason to set `meta.hydraPlatforms` is if you want `hydra.nixos.org` to build the package on a subset of `meta.platforms`, or not at all, e.g. + +```nix +meta.platforms = lib.platforms.linux; +meta.hydraPlatforms = []; +``` + +### `broken` {#var-meta-broken} + +If set to `true`, the package is marked as "broken", meaning that it won’t show up in `nix-env -qa`, and cannot be built or installed. Such packages should be removed from Nixpkgs eventually unless they are fixed. + +### `updateWalker` {#var-meta-updateWalker} + +If set to `true`, the package is tested to be updated correctly by the `update-walker.sh` script without additional settings. Such packages have `meta.version` set and their homepage (or the page specified by `meta.downloadPage`) contains a direct link to the package tarball. + +## Licenses {#sec-meta-license} + +The `meta.license` attribute should preferably contain a value from `lib.licenses` defined in [`nixpkgs/lib/licenses.nix`](https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix), or in-place license description of the same format if the license is unlikely to be useful in another expression. + +Although it’s typically better to indicate the specific license, a few generic options are available: + +### `lib.licenses.free`, `"free"` + +Catch-all for free software licenses not listed above. + +### `lib.licenses.unfreeRedistributable`, `"unfree-redistributable"` + +Unfree package that can be redistributed in binary form. That is, it’s legal to redistribute the *output* of the derivation. This means that the package can be included in the Nixpkgs channel. + +Sometimes proprietary software can only be redistributed unmodified. Make sure the builder doesn’t actually modify the original binaries; otherwise we’re breaking the license. For instance, the NVIDIA X11 drivers can be redistributed unmodified, but our builder applies `patchelf` to make them work. Thus, its license is `"unfree"` and it cannot be included in the Nixpkgs channel. + +### `lib.licenses.unfree`, `"unfree"` + +Unfree package that cannot be redistributed. You can build it yourself, but you cannot redistribute the output of the derivation. Thus it cannot be included in the Nixpkgs channel. + +### `lib.licenses.unfreeRedistributableFirmware`, `"unfree-redistributable-firmware"` + +This package supplies unfree, redistributable firmware. This is a separate value from `unfree-redistributable` because not everybody cares whether firmware is free. diff --git a/third_party/nixpkgs/doc/stdenv/meta.xml b/third_party/nixpkgs/doc/stdenv/meta.xml deleted file mode 100644 index 91ace0b9cc..0000000000 --- a/third_party/nixpkgs/doc/stdenv/meta.xml +++ /dev/null @@ -1,349 +0,0 @@ - - Meta-attributes - - Nix packages can declare meta-attributes that contain information about a package such as a description, its homepage, its license, and so on. For instance, the GNU Hello package has a meta declaration like this: - -meta = with lib; { - description = "A program that produces a familiar, friendly greeting"; - longDescription = '' - GNU Hello is a program that prints "Hello, world!" when you run it. - It is fully customizable. - ''; - homepage = "https://www.gnu.org/software/hello/manual/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.eelco ]; - platforms = platforms.all; -}; - - - - Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of the package. The value of a meta-attribute must be a string. - - - The meta-attributes of a package can be queried from the command-line using nix-env: - -$ nix-env -qa hello --json -{ - "hello": { - "meta": { - "description": "A program that produces a familiar, friendly greeting", - "homepage": "https://www.gnu.org/software/hello/manual/", - "license": { - "fullName": "GNU General Public License version 3 or later", - "shortName": "GPLv3+", - "url": "http://www.fsf.org/licensing/licenses/gpl.html" - }, - "longDescription": "GNU Hello is a program that prints \"Hello, world!\" when you run it.\nIt is fully customizable.\n", - "maintainers": [ - "Ludovic Court\u00e8s <ludo@gnu.org>" - ], - "platforms": [ - "i686-linux", - "x86_64-linux", - "armv5tel-linux", - "armv7l-linux", - "mips32-linux", - "x86_64-darwin", - "i686-cygwin", - "i686-freebsd", - "x86_64-freebsd", - "i686-openbsd", - "x86_64-openbsd" - ], - "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/default.nix:14" - }, - "name": "hello-2.9", - "system": "x86_64-linux" - } -} - - - - nix-env knows about the description field specifically: - -$ nix-env -qa hello --description -hello-2.3 A program that produces a familiar, friendly greeting - - -
- Standard meta-attributes - - - It is expected that each meta-attribute is one of the following: - - - - - - description - - - - A short (one-line) description of the package. This is shown by nix-env -q --description and also on the Nixpkgs release pages. - - - Don’t include a period at the end. Don’t include newline characters. Capitalise the first character. For brevity, don’t repeat the name of package — just describe what it does. - - - Wrong: "libpng is a library that allows you to decode PNG images." - - - Right: "A library for decoding PNG images" - - - - - - longDescription - - - - An arbitrarily long description of the package. - - - - - - branch - - - - Release branch. Used to specify that a package is not going to receive updates that are not in this branch; for example, Linux kernel 3.0 is supposed to be updated to 3.0.X, not 3.1. - - - - - - homepage - - - - The package’s homepage. Example: https://www.gnu.org/software/hello/manual/ - - - - - - downloadPage - - - - The page where a link to the current version can be found. Example: https://ftp.gnu.org/gnu/hello/ - - - - - - changelog - - - - A link or a list of links to the location of Changelog for a package. A link may use expansion to refer to the correct changelog version. Example: "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}" - - - - - - license - - - - The license, or licenses, for the package. One from the attribute set defined in nixpkgs/lib/licenses.nix. At this moment using both a list of licenses and a single license is valid. If the license field is in the form of a list representation, then it means that parts of the package are licensed differently. Each license should preferably be referenced by their attribute. The non-list attribute value can also be a space delimited string representation of the contained attribute shortNames or spdxIds. The following are all valid examples: - - - - Single license referenced by attribute (preferred) lib.licenses.gpl3Only. - - - - - Single license referenced by its attribute shortName (frowned upon) "gpl3Only". - - - - - Single license referenced by its attribute spdxId (frowned upon) "GPL-3.0-only". - - - - - Multiple licenses referenced by attribute (preferred) with lib.licenses; [ asl20 free ofl ]. - - - - - Multiple licenses referenced as a space delimited string of attribute shortNames (frowned upon) "asl20 free ofl". - - - - For details, see . - - - - - - maintainers - - - - A list of the maintainers of this Nix expression. Maintainers are defined in nixpkgs/maintainers/maintainer-list.nix. There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled 'maintainers: add alice', and reference maintainers with maintainers = with lib.maintainers; [ alice bob ]. - - - - - - priority - - - - The priority of the package, used by nix-env to resolve file name conflicts between packages. See the Nix manual page for nix-env for details. Example: "10" (a low-priority package). - - - - - - platforms - - - - The list of Nix platform types on which the package is supported. Hydra builds packages according to the platform specified. If no platform is specified, the package does not have prebuilt binaries. An example is: - -meta.platforms = lib.platforms.linux; - - Attribute Set lib.platforms defines various common lists of platforms types. - - - - - - tests - - - - - This attribute is special in that it is not actually under the meta attribute set but rather under the passthru attribute set. This is due to how meta attributes work, and the fact that they are supposed to contain only metadata, not derivations. - - - - An attribute set with as values tests. A test is a derivation, which builds successfully when the test passes, and fails to build otherwise. A derivation that is a test needs to have meta.timeout defined. - - - The NixOS tests are available as nixosTests in parameters of derivations. For instance, the OpenSMTPD derivation includes lines similar to: - -{ /* ... */, nixosTests }: -{ - # ... - passthru.tests = { - basic-functionality-and-dovecot-integration = nixosTests.opensmtpd; - }; -} - - - - - - - timeout - - - - A timeout (in seconds) for building the derivation. If the derivation takes longer than this time to build, it can fail due to breaking the timeout. However, all computers do not have the same computing power, hence some builders may decide to apply a multiplicative factor to this value. When filling this value in, try to keep it approximately consistent with other values already present in nixpkgs. - - - - - - hydraPlatforms - - - - The list of Nix platform types for which the Hydra instance at hydra.nixos.org will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of meta.platforms. Thus, the only reason to set meta.hydraPlatforms is if you want hydra.nixos.org to build the package on a subset of meta.platforms, or not at all, e.g. - -meta.platforms = lib.platforms.linux; -meta.hydraPlatforms = []; - - - - - - - broken - - - - If set to true, the package is marked as “broken”, meaning that it won’t show up in nix-env -qa, and cannot be built or installed. Such packages should be removed from Nixpkgs eventually unless they are fixed. - - - - - - updateWalker - - - - If set to true, the package is tested to be updated correctly by the update-walker.sh script without additional settings. Such packages have meta.version set and their homepage (or the page specified by meta.downloadPage) contains a direct link to the package tarball. - - - - -
-
- Licenses - - - The meta.license attribute should preferrably contain a value from lib.licenses defined in nixpkgs/lib/licenses.nix, or in-place license description of the same format if the license is unlikely to be useful in another expression. - - - - Although it's typically better to indicate the specific license, a few generic options are available: - - - - lib.licenses.free, "free" - - - - Catch-all for free software licenses not listed above. - - - - - - lib.licenses.unfreeRedistributable, "unfree-redistributable" - - - - Unfree package that can be redistributed in binary form. That is, it’s legal to redistribute the output of the derivation. This means that the package can be included in the Nixpkgs channel. - - - Sometimes proprietary software can only be redistributed unmodified. Make sure the builder doesn’t actually modify the original binaries; otherwise we’re breaking the license. For instance, the NVIDIA X11 drivers can be redistributed unmodified, but our builder applies patchelf to make them work. Thus, its license is "unfree" and it cannot be included in the Nixpkgs channel. - - - - - - lib.licenses.unfree, "unfree" - - - - Unfree package that cannot be redistributed. You can build it yourself, but you cannot redistribute the output of the derivation. Thus it cannot be included in the Nixpkgs channel. - - - - - - lib.licenses.unfreeRedistributableFirmware, "unfree-redistributable-firmware" - - - - This package supplies unfree, redistributable firmware. This is a separate value from unfree-redistributable because not everybody cares whether firmware is free. - - - - - -
- diff --git a/third_party/nixpkgs/doc/stdenv/multiple-output.chapter.md b/third_party/nixpkgs/doc/stdenv/multiple-output.chapter.md new file mode 100644 index 0000000000..90bc25bef7 --- /dev/null +++ b/third_party/nixpkgs/doc/stdenv/multiple-output.chapter.md @@ -0,0 +1,128 @@ +# Multiple-output packages {#chap-multiple-output} + +## Introduction {#sec-multiple-outputs-introduction} + +The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems. The outputs reside in separate Nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution. The exception is that building from source always produces all the outputs. + +The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less. + +::: note +The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb. +::: + +A number of attributes can be used to work with a derivation with multiple outputs. The attribute `outputs` is a list of strings, which are the names of the outputs. For each of these names, an identically named attribute is created, corresponding to that output. The attribute `meta.outputsToInstall` is used to determine the default set of outputs to install when using the derivation name unqualified. + +## Installing a split package {#sec-multiple-outputs-installing} + +When installing a package with multiple outputs, the package’s `meta.outputsToInstall` attribute determines which outputs are actually installed. `meta.outputsToInstall` is a list whose [default installs binaries and the associated man pages](https://github.com/NixOS/nixpkgs/blob/f1680774340d5443a1409c3421ced84ac1163ba9/pkgs/stdenv/generic/make-derivation.nix#L310-L320). The following sections describe ways to install different outputs. + +### Selecting outputs to install via NixOS {#sec-multiple-outputs-installing-nixos} + +NixOS provides two ways to select the outputs to install for packages listed in `environment.systemPackages`: + +- The configuration option `environment.extraOutputsToInstall` is appended to each package’s `meta.outputsToInstall` attribute to determine the outputs to install. It can for example be used to install `info` documentation or debug symbols for all packages. + +- The outputs can be listed as packages in `environment.systemPackages`. For example, the `"out"` and `"info"` outputs for the `coreutils` package can be installed by including `coreutils` and `coreutils.info` in `environment.systemPackages`. + +### Selecting outputs to install via `nix-env` {#sec-multiple-outputs-installing-nix-env} + +`nix-env` lacks an easy way to select the outputs to install. When installing a package, `nix-env` always installs the outputs listed in `meta.outputsToInstall`, even when the user explicitly selects an output. + +::: warning +`nix-env` silenty disregards the outputs selected by the user, and instead installs the outputs from `meta.outputsToInstall`. For example, + +```ShellSession +$ nix-env -iA nixpkgs.coreutils.info +``` + +installs the `"out"` output (`coreutils.meta.outputsToInstall` is `[ "out" ]`) instead of the requested `"info"`. +::: + +The only recourse to select an output with `nix-env` is to override the package’s `meta.outputsToInstall`, using the functions described in . For example, the following overlay adds the `"info"` output for the `coreutils` package: + +```nix +self: super: +{ + coreutils = super.coreutils.overrideAttrs (oldAttrs: { + meta = oldAttrs.meta // { outputsToInstall = oldAttrs.meta.outputsToInstall or [ "out" ] ++ [ "info" ]; }; + }); +} +``` + +## Using a split package {#sec-multiple-outputs-using-split-packages} + +In the Nix language the individual outputs can be reached explicitly as attributes, e.g. `coreutils.info`, but the typical case is just using packages as build inputs. + +When a multiple-output derivation gets into a build input of another derivation, the `dev` output is added if it exists, otherwise the first output is added. In addition to that, `propagatedBuildOutputs` of that package which by default contain `$outputBin` and `$outputLib` are also added. (See .) + +In some cases it may be desirable to combine different outputs under a single store path. A function `symlinkJoin` can be used to do this. (Note that it may negate some closure size benefits of using a multiple-output package.) + +## Writing a split derivation {#sec-multiple-outputs-} + +Here you find how to write a derivation that produces multiple outputs. + +In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in ``; it’s relatively well-readable. The whole machinery is triggered by defining the `outputs` attribute to contain the list of desired output names (strings). + +```nix +outputs = [ "bin" "dev" "out" "doc" ]; +``` + +Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. Typically you also want to have the main `out` output, as it catches any files that didn’t get elsewhere. + +::: note +There is a special handling of the `debug` output, described at . +::: + +### “Binaries first” {#multiple-output-file-binaries-first-convention} + +A commonly adopted convention in `nixpkgs` is that executables provided by the package are contained within its first output. This convention allows the dependent packages to reference the executables provided by packages in a uniform manner. For instance, provided with the knowledge that the `perl` package contains a `perl` executable it can be referenced as `${pkgs.perl}/bin/perl` within a Nix derivation that needs to execute a Perl script. + +The `glibc` package is a deliberate single exception to the “binaries first” convention. The `glibc` has `libs` as its first output allowing the libraries provided by `glibc` to be referenced directly (e.g. `${stdenv.glibc}/lib/ld-linux-x86-64.so.2`). The executables provided by `glibc` can be accessed via its `bin` attribute (e.g. `${stdenv.glibc.bin}/bin/ldd`). + +The reason for why `glibc` deviates from the convention is because referencing a library provided by `glibc` is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of `glibc` libraries from Nix packages (please see the documentation on [patchelf](https://github.com/NixOS/patchelf/blob/master/README) for more details). + +### File type groups {#multiple-output-file-type-groups} + +The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an `outputFoo` variable specifying the output name where they should go. If that variable isn’t defined by the derivation writer, it is guessed – a default output name is defined, falling back to other possibilities if the output isn’t defined. + +#### ` $outputDev` + +is for development-only files. These include C(++) headers (`include/`), pkg-config (`lib/pkgconfig/`), cmake (`lib/cmake/`) and aclocal files (`share/aclocal/`). They go to `dev` or `out` by default. + +#### ` $outputBin` + +is meant for user-facing binaries, typically residing in `bin/`. They go to `bin` or `out` by default. + +#### ` $outputLib` + +is meant for libraries, typically residing in `lib/` and `libexec/`. They go to `lib` or `out` by default. + +#### ` $outputDoc` + +is for user documentation, typically residing in `share/doc/`. It goes to `doc` or `out` by default. + +#### ` $outputDevdoc` + +is for _developer_ documentation. Currently we count gtk-doc and devhelp books, typically residing in `share/gtk-doc/` and `share/devhelp/`, in there. It goes to `devdoc` or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. + +#### ` $outputMan` + +is for man pages (except for section 3), typically residing in `share/man/man[0-9]/`. They go to `man` or `$outputBin` by default. + +#### ` $outputDevman` + +is for section 3 man pages, typically residing in `share/man/man[0-9]/`. They go to `devman` or `$outputMan` by default. + +#### ` $outputInfo` + +is for info pages, typically residing in `share/info/`. They go to `info` or `$outputBin` by default. + +### Common caveats {#sec-multiple-outputs-caveats} + +- Some configure scripts don’t like some of the parameters passed by default by the framework, e.g. `--docdir=/foo/bar`. You can disable this by setting `setOutputFlags = false;`. + +- The outputs of a single derivation can retain references to each other, but note that circular references are not allowed. (And each strongly-connected component would act as a single output anyway.) + +- Most of split packages contain their core functionality in libraries. These libraries tend to refer to various kind of data that typically gets into `out`, e.g. locale strings, so there is often no advantage in separating the libraries into `lib`, as keeping them in `out` is easier. + +- Some packages have hidden assumptions on install paths, which complicates splitting. diff --git a/third_party/nixpkgs/doc/stdenv/multiple-output.xml b/third_party/nixpkgs/doc/stdenv/multiple-output.xml deleted file mode 100644 index 5f2d2b8cfb..0000000000 --- a/third_party/nixpkgs/doc/stdenv/multiple-output.xml +++ /dev/null @@ -1,261 +0,0 @@ - - -]> - - Multiple-output packages -
- Introduction - - - The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems. The outputs reside in separate Nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution. The exception is that building from source always produces all the outputs. - - - - The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less. - - - - - The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb. - - - - - A number of attributes can be used to work with a derivation with multiple outputs. The attribute outputs is a list of strings, which are the names of the outputs. For each of these names, an identically named attribute is created, corresponding to that output. The attribute meta.outputsToInstall is used to determine the default set of outputs to install when using the derivation name unqualified. - -
-
- Installing a split package - - - When installing a package with multiple outputs, the package's meta.outputsToInstall attribute determines which outputs are actually installed. meta.outputsToInstall is a list whose default installs binaries and the associated man pages. The following sections describe ways to install different outputs. - - -
- Selecting outputs to install via NixOS - - - NixOS provides two ways to select the outputs to install for packages listed in environment.systemPackages: - - - - - - The configuration option environment.extraOutputsToInstall is appended to each package's meta.outputsToInstall attribute to determine the outputs to install. It can for example be used to install info documentation or debug symbols for all packages. - - - - - The outputs can be listed as packages in environment.systemPackages. For example, the "out" and "info" outputs for the coreutils package can be installed by including coreutils and coreutils.info in environment.systemPackages. - - - -
- -
- Selecting outputs to install via <command>nix-env</command> - - - nix-env lacks an easy way to select the outputs to install. When installing a package, nix-env always installs the outputs listed in meta.outputsToInstall, even when the user explicitly selects an output. - - - - - nix-env silenty disregards the outputs selected by the user, and instead installs the outputs from meta.outputsToInstall. For example, - -$ nix-env -iA nixpkgs.coreutils.info - - installs the "out" output (coreutils.meta.outputsToInstall is [ "out" ]) instead of the requested "info". - - - - - The only recourse to select an output with nix-env is to override the package's meta.outputsToInstall, using the functions described in . For example, the following overlay adds the "info" output for the coreutils package: - - -self: super: -{ - coreutils = super.coreutils.overrideAttrs (oldAttrs: { - meta = oldAttrs.meta // { outputsToInstall = oldAttrs.meta.outputsToInstall or [ "out" ] ++ [ "info" ]; }; - }); -} - -
-
-
- Using a split package - - - In the Nix language the individual outputs can be reached explicitly as attributes, e.g. coreutils.info, but the typical case is just using packages as build inputs. - - - - When a multiple-output derivation gets into a build input of another derivation, the dev output is added if it exists, otherwise the first output is added. In addition to that, propagatedBuildOutputs of that package which by default contain $outputBin and $outputLib are also added. (See .) - - - - In some cases it may be desirable to combine different outputs under a single store path. A function symlinkJoin can be used to do this. (Note that it may negate some closure size benefits of using a multiple-output package.) - -
-
- Writing a split derivation - - - Here you find how to write a derivation that produces multiple outputs. - - - - In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in <nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh>; it's relatively well-readable. The whole machinery is triggered by defining the outputs attribute to contain the list of desired output names (strings). - - -outputs = [ "bin" "dev" "out" "doc" ]; - - - Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. Typically you also want to have the main out output, as it catches any files that didn't get elsewhere. - - - - - There is a special handling of the debug output, described at . - - - -
- <quote>Binaries first</quote> - - - A commonly adopted convention in nixpkgs is that executables provided by the package are contained within its first output. This convention allows the dependent packages to reference the executables provided by packages in a uniform manner. For instance, provided with the knowledge that the perl package contains a perl executable it can be referenced as ${pkgs.perl}/bin/perl within a Nix derivation that needs to execute a Perl script. - - - - The glibc package is a deliberate single exception to the binaries first convention. The glibc has libs as its first output allowing the libraries provided by glibc to be referenced directly (e.g. ${stdenv.glibc}/lib/ld-linux-x86-64.so.2). The executables provided by glibc can be accessed via its bin attribute (e.g. ${stdenv.glibc.bin}/bin/ldd). - - - - The reason for why glibc deviates from the convention is because referencing a library provided by glibc is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of glibc libraries from Nix packages (please see the documentation on patchelf for more details). - -
- -
- File type groups - - - The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an outputFoo variable specifying the output name where they should go. If that variable isn't defined by the derivation writer, it is guessed – a default output name is defined, falling back to other possibilities if the output isn't defined. - - - - - - $outputDev - - - - is for development-only files. These include C(++) headers (include/), pkg-config (lib/pkgconfig/), cmake (lib/cmake/) and aclocal files (share/aclocal/). They go to dev or out by default. - - - - - - $outputBin - - - - is meant for user-facing binaries, typically residing in bin/. They go to bin or out by default. - - - - - - $outputLib - - - - is meant for libraries, typically residing in lib/ and libexec/. They go to lib or out by default. - - - - - - $outputDoc - - - - is for user documentation, typically residing in share/doc/. It goes to doc or out by default. - - - - - - $outputDevdoc - - - - is for developer documentation. Currently we count gtk-doc and devhelp books, typically residing in share/gtk-doc/ and share/devhelp/, in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. - - - - - - $outputMan - - - - is for man pages (except for section 3), typically residing in share/man/man[0-9]/. They go to man or $outputBin by default. - - - - - - $outputDevman - - - - is for section 3 man pages, typically residing in share/man/man3/. They go to devman or $outputMan by default. - - - - - - $outputInfo - - - - is for info pages, typically residing in share/info/. They go to info or $outputBin by default. - - - - -
- -
- Common caveats - - - - - Some configure scripts don't like some of the parameters passed by default by the framework, e.g. --docdir=/foo/bar. You can disable this by setting setOutputFlags = false;. - - - - - The outputs of a single derivation can retain references to each other, but note that circular references are not allowed. (And each strongly-connected component would act as a single output anyway.) - - - - - Most of split packages contain their core functionality in libraries. These libraries tend to refer to various kind of data that typically gets into out, e.g. locale strings, so there is often no advantage in separating the libraries into lib, as keeping them in out is easier. - - - - - Some packages have hidden assumptions on install paths, which complicates splitting. - - - -
-
- - diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md new file mode 100644 index 0000000000..b23c50e836 --- /dev/null +++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -0,0 +1,1215 @@ +# The Standard Environment {#chap-stdenv} + +The standard build environment in the Nix Packages collection provides an environment for building Unix packages that does a lot of common build tasks automatically. In fact, for Unix packages that use the standard `./configure; make; make install` build interface, you don’t need to write a build script at all; the standard environment does everything automatically. If `stdenv` doesn’t do what you need automatically, you can easily customise or override the various build phases. + +## Using `stdenv` {#sec-using-stdenv} + +To build a package with the standard environment, you use the function `stdenv.mkDerivation`, instead of the primitive built-in function `derivation`, e.g. + +```nix +stdenv.mkDerivation { + name = "libfoo-1.2.3"; + src = fetchurl { + url = "http://example.org/libfoo-1.2.3.tar.bz2"; + sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m"; + }; +} +``` + +(`stdenv` needs to be in scope, so if you write this in a separate Nix expression from `pkgs/all-packages.nix`, you need to pass it as a function argument.) Specifying a `name` and a `src` is the absolute minimum Nix requires. For convenience, you can also use `pname` and `version` attributes and `mkDerivation` will automatically set `name` to `"${pname}-${version}"` by default. Since [RFC 0035](https://github.com/NixOS/rfcs/pull/35), this is preferred for packages in Nixpkgs, as it allows us to reuse the version easily: + +```nix +stdenv.mkDerivation rec { + pname = "libfoo"; + version = "1.2.3"; + src = fetchurl { + url = "http://example.org/libfoo-source-${version}.tar.bz2"; + sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m"; + }; +} +``` + +Many packages have dependencies that are not provided in the standard environment. It’s usually sufficient to specify those dependencies in the `buildInputs` attribute: + +```nix +stdenv.mkDerivation { + name = "libfoo-1.2.3"; + ... + buildInputs = [libbar perl ncurses]; +} +``` + +This attribute ensures that the `bin` subdirectories of these packages appear in the `PATH` environment variable during the build, that their `include` subdirectories are searched by the C compiler, and so on. (See for details.) + +Often it is necessary to override or modify some aspect of the build. To make this easier, the standard environment breaks the package build into a number of *phases*, all of which can be overridden or modified individually: unpacking the sources, applying patches, configuring, building, and installing. (There are some others; see .) For instance, a package that doesn’t supply a makefile but instead has to be compiled "manually" could be handled like this: + +```nix +stdenv.mkDerivation { + name = "fnord-4.5"; + ... + buildPhase = '' + gcc foo.c -o foo + ''; + installPhase = '' + mkdir -p $out/bin + cp foo $out/bin + ''; +} +``` + +(Note the use of `''`-style string literals, which are very convenient for large multi-line script fragments because they don’t need escaping of `"` and `\`, and because indentation is intelligently removed.) + +There are many other attributes to customise the build. These are listed in . + +While the standard environment provides a generic builder, you can still supply your own build script: + +```nix +stdenv.mkDerivation { + name = "libfoo-1.2.3"; + ... + builder = ./builder.sh; +} +``` + +where the builder can do anything it wants, but typically starts with + +```bash +source $stdenv/setup +``` + +to let `stdenv` set up the environment (e.g., process the `buildInputs`). If you want, you can still use `stdenv`’s generic builder: + +```bash +source $stdenv/setup + +buildPhase() { + echo "... this is my custom build phase ..." + gcc foo.c -o foo +} + +installPhase() { + mkdir -p $out/bin + cp foo $out/bin +} + +genericBuild +``` + +## Tools provided by `stdenv` {#sec-tools-of-stdenv} + +The standard environment provides the following packages: + +- The GNU C Compiler, configured with C and C++ support. +- GNU coreutils (contains a few dozen standard Unix commands). +- GNU findutils (contains `find`). +- GNU diffutils (contains `diff`, `cmp`). +- GNU `sed`. +- GNU `grep`. +- GNU `awk`. +- GNU `tar`. +- `gzip`, `bzip2` and `xz`. +- GNU Make. +- Bash. This is the shell used for all builders in the Nix Packages collection. Not using `/bin/sh` removes a large source of portability problems. +- The `patch` command. + +On Linux, `stdenv` also includes the `patchelf` utility. + +## Specifying dependencies {#ssec-stdenv-dependencies} + +As described in the Nix manual, almost any `*.drv` store path in a derivation’s attribute set will induce a dependency on that derivation. `mkDerivation`, however, takes a few attributes intended to, between them, include all the dependencies of a package. This is done both for structure and consistency, but also so that certain other setup can take place. For example, certain dependencies need their bin directories added to the `PATH`. That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. See for details. + +Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation’s, and whether they are propagated. The platform distinctions are motivated by cross compilation; see for exactly what each platform means. [^footnote-stdenv-ignored-build-platform] But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. By default, the run-time/build-time distinction is just a hint for mental clarity, but with `strictDeps` set it is mostly enforced even in the native case. + +The extension of `PATH` with dependencies, alluded to above, proceeds according to the relative platforms alone. The process is carried out only for dependencies whose host platform matches the new derivation’s build platform i.e. dependencies which run on the platform where the new derivation will be built. [^footnote-stdenv-native-dependencies-in-path] For each dependency \ of those dependencies, `dep/bin`, if present, is added to the `PATH` environment variable. + +The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency. Nix itself already takes a package’s transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency. + +It is important to note that dependencies are not necessarily propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up. The exact rules for dependency propagation can be given by assigning to each dependency two integers based one how its host and target platforms are offset from the depending derivation’s platforms. Those offsets are given below in the descriptions of each dependency list attribute. Algorithmically, we traverse propagated inputs, accumulating every propagated dependency’s propagated dependencies and adjusting them to account for the “shift in perspective” described by the current dependency’s platform offsets. This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined. We also prune transitive dependencies whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd. + +We can define the process precisely with [Natural Deduction](https://en.wikipedia.org/wiki/Natural_deduction) using the inference rules. This probably seems a bit obtuse, but so is the bash code that actually implements it! [^footnote-stdenv-find-inputs-location] They’re confusing in very different ways so… hopefully if something doesn’t make sense in one presentation, it will in the other! + +``` +let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) + +propagated-dep(h0, t0, A, B) +propagated-dep(h1, t1, B, C) +h0 + h1 in {-1, 0, 1} +h0 + t1 in {-1, 0, 1} +-------------------------------------- Transitive property +propagated-dep(mapOffset(h0, t0, h1), + mapOffset(h0, t0, t1), + A, C) +``` + +``` +let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) + +dep(h0, _, A, B) +propagated-dep(h1, t1, B, C) +h0 + h1 in {-1, 0, 1} +h0 + t1 in {-1, 0, -1} +----------------------------- Take immediate dependencies' propagated dependencies +propagated-dep(mapOffset(h0, t0, h1), + mapOffset(h0, t0, t1), + A, C) +``` + +``` +propagated-dep(h, t, A, B) +----------------------------- Propagated dependencies count as dependencies +dep(h, t, A, B) +``` + +Some explanation of this monstrosity is in order. In the common case, the target offset of a dependency is the successor to the target offset: `t = h + 1`. That means that: + +``` +let f(h, t, i) = i + (if i <= 0 then h else t - 1) +let f(h, h + 1, i) = i + (if i <= 0 then h else (h + 1) - 1) +let f(h, h + 1, i) = i + (if i <= 0 then h else h) +let f(h, h + 1, i) = i + h +``` + +This is where “sum-like” comes in from above: We can just sum all of the host offsets to get the host offset of the transitive dependency. The target offset is the transitive dependency is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one; it can be ignored as it doesn’t add any new information. + +Because of the bounds checks, the uncommon cases are `h = t` and `h + 2 = t`. In the former case, the motivation for `mapOffset` is that since its host and target platforms are the same, no transitive dependency of it should be able to “discover” an offset greater than its reduced target offsets. `mapOffset` effectively “squashes” all its transitive dependencies’ offsets so that none will ever be greater than the target offset of the original `h = t` package. In the other case, `h + 1` is skipped over between the host and target offsets. Instead of squashing the offsets, we need to “rip” them apart so no transitive dependencies’ offset is that one. + +Overall, the unifying theme here is that propagation shouldn’t be introducing transitive dependencies involving platforms the depending package is unaware of. \[One can imagine the dependending package asking for dependencies with the platforms it knows about; other platforms it doesn’t know how to ask for. The platform description in that scenario is a kind of unforagable capability.\] The offset bounds checking and definition of `mapOffset` together ensure that this is the case. Discovering a new offset is discovering a new platform, and since those platforms weren’t in the derivation “spec” of the needing package, they cannot be relevant. From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency. + +### Variables specifying dependencies +#### `depsBuildBuild` {#var-stdenv-depsBuildBuild} + +A list of dependencies whose host and target platforms are the new derivation’s build platform. This means a `-1` host and `-1` target offset from the new derivation’s platforms. These are programs and libraries used at build time that produce programs and libraries also used at build time. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it in `nativeBuildInputs` instead. The most common use of this `buildPackages.stdenv.cc`, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries. + +Since these packages are able to be run at build-time, they are always added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future. + +#### `nativeBuildInputs` {#var-stdenv-nativeBuildInputs} + +A list of dependencies whose host platform is the new derivation’s build platform, and target platform is the new derivation’s host platform. This means a `-1` host offset and `0` target offset from the new derivation’s platforms. These are programs and libraries used at build-time that, if they are a compiler or similar tool, produce code to run at run-time—i.e. tools used to build the new derivation. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it here, rather than in `depsBuildBuild` or `depsBuildTarget`. This could be called `depsBuildHost` but `nativeBuildInputs` is used for historical continuity. + +Since these packages are able to be run at build-time, they are added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future. + +#### `depsBuildTarget` {#var-stdenv-depsBuildTarget} + +A list of dependencies whose host platform is the new derivation’s build platform, and target platform is the new derivation’s target platform. This means a `-1` host offset and `1` target offset from the new derivation’s platforms. These are programs used at build time that produce code to run with code produced by the depending package. Most commonly, these are tools used to build the runtime or standard library that the currently-being-built compiler will inject into any code it compiles. In many cases, the currently-being-built-compiler is itself employed for that task, but when that compiler won’t run (i.e. its build and host platform differ) this is not possible. Other times, the compiler relies on some other tool, like binutils, that is always built separately so that the dependency is unconditional. + +This is a somewhat confusing concept to wrap one’s head around, and for good reason. As the only dependency type where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage *two* away from the current one. It and its use-case go hand in hand and are both considered poor form: try to not need this sort of dependency, and try to avoid building standard libraries and runtimes in the same derivation as the compiler produces code using them. Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would. In short, do not use this attribute unless you are packaging a compiler and are sure it is needed. + +Since these packages are able to run at build time, they are added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future. + +#### `depsHostHost` {#var-stdenv-depsHostHost} + +A list of dependencies whose host and target platforms match the new derivation’s host platform. This means a `0` host offset and `0` target offset from the new derivation’s host platform. These are packages used at run-time to generate code also used at run-time. In practice, this would usually be tools used by compilers for macros or a metaprogramming system, or libraries used by the macros or metaprogramming code itself. It’s always preferable to use a `depsBuildBuild` dependency in the derivation being built over a `depsHostHost` on the tool doing the building for this purpose. + +#### `buildInputs` {#var-stdenv-buildInputs} + +A list of dependencies whose host platform and target platform match the new derivation’s. This means a `0` host offset and a `1` target offset from the new derivation’s host platform. This would be called `depsHostTarget` but for historical continuity. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it here, rather than in `depsBuildBuild`. + +These are often programs and libraries used by the new derivation at *run*-time, but that isn’t always the case. For example, the machine code in a statically-linked library is only used at run-time, but the derivation containing the library is only needed at build-time. Even in the dynamic case, the library may also be needed at build-time to appease the linker. + +#### `depsTargetTarget` {#var-stdenv-depsTargetTarget} + +A list of dependencies whose host platform matches the new derivation’s target platform. This means a `1` offset from the new derivation’s platforms. These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. It’s poor form in almost all cases for a package to depend on another from a future stage \[future stage corresponding to positive offset\]. Do not use this attribute unless you are packaging a compiler and are sure it is needed. + +#### `depsBuildBuildPropagated` {#var-stdenv-depsBuildBuildPropagated} + +The propagated equivalent of `depsBuildBuild`. This perhaps never ought to be used, but it is included for consistency \[see below for the others\]. + +#### `propagatedNativeBuildInputs` {#var-stdenv-propagatedNativeBuildInputs} + +The propagated equivalent of `nativeBuildInputs`. This would be called `depsBuildHostPropagated` but for historical continuity. For example, if package `Y` has `propagatedNativeBuildInputs = [X]`, and package `Z` has `buildInputs = [Y]`, then package `Z` will be built as if it included package `X` in its `nativeBuildInputs`. If instead, package `Z` has `nativeBuildInputs = [Y]`, then `Z` will be built as if it included `X` in the `depsBuildBuild` of package `Z`, because of the sum of the two `-1` host offsets. + +#### `depsBuildTargetPropagated` {#var-stdenv-depsBuildTargetPropagated} + +The propagated equivalent of `depsBuildTarget`. This is prefixed for the same reason of alerting potential users. + +#### `depsHostHostPropagated` {#var-stdenv-depsHostHostPropagated} + +The propagated equivalent of `depsHostHost`. + +#### `propagatedBuildInputs` {#var-stdenv-propagatedBuildInputs} + +The propagated equivalent of `buildInputs`. This would be called `depsHostTargetPropagated` but for historical continuity. + +#### `depsTargetTargetPropagated` {#var-stdenv-depsTargetTargetPropagated} + +The propagated equivalent of `depsTargetTarget`. This is prefixed for the same reason of alerting potential users. + +## Attributes {#ssec-stdenv-attributes} + +### Variables affecting `stdenv` initialisation + +#### `NIX_DEBUG` {#var-stdenv-NIX_DEBUG} + +A natural number indicating how much information to log. If set to 1 or higher, `stdenv` will print moderate debugging information during the build. In particular, the `gcc` and `ld` wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the `stdenv` setup script will be run with `set -x` tracing. If set to 7 or higher, the `gcc` and `ld` wrapper scripts will also be run with `set -x` tracing. + +### Attributes affecting build properties + +#### `enableParallelBuilding` {#var-stdenv-enableParallelBuilding} + +If set to `true`, `stdenv` will pass specific flags to `make` and other build tools to enable parallel building with up to `build-cores` workers. + +Unless set to `false`, some build systems with good support for parallel building including `cmake`, `meson`, and `qmake` will set it to `true`. + +### Special variables + +#### `passthru` {#var-stdenv-passthru} + +This is an attribute set which can be filled with arbitrary values. For example: + +```nix +passthru = { + foo = "bar"; + baz = { + value1 = 4; + value2 = 5; + }; +} +``` + +Values inside it are not passed to the builder, so you can change them without triggering a rebuild. However, they can be accessed outside of a derivation directly, as if they were set inside a derivation itself, e.g. `hello.baz.value1`. We don’t specify any usage or schema of `passthru` - it is meant for values that would be useful outside the derivation in other parts of a Nix expression (e.g. in other derivations). An example would be to convey some specific dependency of your derivation which contains a program with plugins support. Later, others who make derivations with plugins can use passed-through dependency to ensure that their plugin would be binary-compatible with built program. + +#### `passthru.updateScript` {#var-passthru-updateScript} + +A script to be run by `maintainers/scripts/update.nix` when the package is matched. It needs to be an executable file, either on the file system: + +```nix +passthru.updateScript = ./update.sh; +``` + +or inside the expression itself: + +```nix +passthru.updateScript = writeScript "update-zoom-us" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')" + update-source-version zoom-us "$version" +''; +``` + +The attribute can also contain a list, a script followed by arguments to be passed to it: + +```nix +passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]; +``` + +The script will be run with `UPDATE_NIX_ATTR_PATH` environment variable set to the attribute path it is supposed to update. + +::: note +The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running `git commit` or any other commands that cannot handle that. +::: + +For information about how to run the updates, execute `nix-shell maintainers/scripts/update.nix`. + +## Phases {#sec-stdenv-phases} + +The generic builder has a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Furthermore, it allows a nicer presentation of build logs in the Nix build farm. + +Each phase can be overridden in its entirety either by setting the environment variable `namePhase` to a string containing some shell commands to be executed, or by redefining the shell function `namePhase`. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to *add* some commands to a phase, e.g. by defining `postInstall` or `preFixup`, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file `pkgs/stdenv/generic/setup.sh`. + +### Controlling phases {#ssec-controlling-phases} + +There are a number of variables that control what phases are executed and in what order: + +#### Variables affecting phase control + +##### `phases` {#var-stdenv-phases} + +Specifies the phases. You can change the order in which phases are executed, or add new phases, by setting this variable. If it’s not set, the default value is used, which is `$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase fixupPhase installCheckPhase $preDistPhases distPhase $postPhases`. + +Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as `preInstallPhases`), as you then don’t specify all the normal phases. + +##### `prePhases` {#var-stdenv-prePhases} + +Additional phases executed before any of the default phases. + +##### `preConfigurePhases` {#var-stdenv-preConfigurePhases} + +Additional phases executed just before the configure phase. + +##### `preBuildPhases` {#var-stdenv-preBuildPhases} + +Additional phases executed just before the build phase. + +##### `preInstallPhases` {#var-stdenv-preInstallPhases} + +Additional phases executed just before the install phase. + +##### `preFixupPhases` {#var-stdenv-preFixupPhases} + +Additional phases executed just before the fixup phase. + +##### `preDistPhases` {#var-stdenv-preDistPhases} + +Additional phases executed just before the distribution phase. + +##### `postPhases` {#var-stdenv-postPhases} + +Additional phases executed after any of the default phases. + +### The unpack phase {#ssec-unpack-phase} + +The unpack phase is responsible for unpacking the source code of the package. The default implementation of `unpackPhase` unpacks the source files listed in the `src` environment variable to the current directory. It supports the following files by default: + +#### Tar files + +These can optionally be compressed using `gzip` (`.tar.gz`, `.tgz` or `.tar.Z`), `bzip2` (`.tar.bz2`, `.tbz2` or `.tbz`) or `xz` (`.tar.xz`, `.tar.lzma` or `.txz`). + +#### Zip files + +Zip files are unpacked using `unzip`. However, `unzip` is not in the standard environment, so you should add it to `nativeBuildInputs` yourself. + +#### Directories in the Nix store + +These are simply copied to the current directory. The hash part of the file name is stripped, e.g. `/nix/store/1wydxgby13cz...-my-sources` would be copied to `my-sources`. + +Additional file types can be supported by setting the `unpackCmd` variable (see below). + +#### Variables controlling the unpack phase +##### `srcs` / `src` {#var-stdenv-src} + +The list of source files or directories to be unpacked or copied. One of these must be set. + +##### `sourceRoot` {#var-stdenv-sourceRoot} + +After running `unpackPhase`, the generic builder changes the current directory to the directory created by unpacking the sources. If there are multiple source directories, you should set `sourceRoot` to the name of the intended directory. + +##### `setSourceRoot` {#var-stdenv-setSourceRoot} + +Alternatively to setting `sourceRoot`, you can set `setSourceRoot` to a shell command to be evaluated by the unpack phase after the sources have been unpacked. This command must set `sourceRoot`. + +##### `preUnpack` {#var-stdenv-preUnpack} + +Hook executed at the start of the unpack phase. + +##### `postUnpack` {#var-stdenv-postUnpack} + +Hook executed at the end of the unpack phase. + +##### `dontUnpack` {#var-stdenv-dontUnpack} + +Set to true to skip the unpack phase. + +##### `dontMakeSourcesWritable` {#var-stdenv-dontMakeSourcesWritable} + +If set to `1`, the unpacked sources are *not* made writable. By default, they are made writable to prevent problems with read-only sources. For example, copied store directories would be read-only without this. + +##### `unpackCmd` {#var-stdenv-unpackCmd} + +The unpack phase evaluates the string `$unpackCmd` for any unrecognised file. The path to the current source file is contained in the `curSrc` variable. + +### The patch phase {#ssec-patch-phase} + +The patch phase applies the list of patches defined in the `patches` variable. + +#### Variables controlling the patch phase + +##### `dontPatch` {#var-stdenv-dontPatch} + +Set to true to skip the patch phase. + +##### `patches` {#var-stdenv-patches} + +The list of patches. They must be in the format accepted by the `patch` command, and may optionally be compressed using `gzip` (`.gz`), `bzip2` (`.bz2`) or `xz` (`.xz`). + +##### `patchFlags` {#var-stdenv-patchFlags} + +Flags to be passed to `patch`. If not set, the argument `-p1` is used, which causes the leading directory component to be stripped from the file names in each patch. + +##### `prePatch` {#var-stdenv-prePatch} + +Hook executed at the start of the patch phase. + +##### `postPatch` {#var-stdenv-postPatch} + +Hook executed at the end of the patch phase. + +### The configure phase {#ssec-configure-phase} + +The configure phase prepares the source tree for building. The default `configurePhase` runs `./configure` (typically an Autoconf-generated script) if it exists. + +#### Variables controlling the configure phase + +##### `configureScript` {#var-stdenv-configureScript} + +The name of the configure script. It defaults to `./configure` if it exists; otherwise, the configure phase is skipped. This can actually be a command (like `perl ./Configure.pl`). + +##### `configureFlags` {#var-stdenv-configureFlags} + +A list of strings passed as additional arguments to the configure script. + +##### `dontConfigure` {#var-stdenv-dontConfigure} + +Set to true to skip the configure phase. + +##### `configureFlagsArray` {#var-stdenv-configureFlagsArray} + +A shell array containing additional arguments passed to the configure script. You must use this instead of `configureFlags` if the arguments contain spaces. + +##### `dontAddPrefix` {#var-stdenv-dontAddPrefix} + +By default, the flag `--prefix=$prefix` is added to the configure flags. If this is undesirable, set this variable to true. + +##### `prefix` {#var-stdenv-prefix} + +The prefix under which the package must be installed, passed via the `--prefix` option to the configure script. It defaults to `$out`. + +##### `prefixKey` {#var-stdenv-prefixKey} + +The key to use when specifying the prefix. By default, this is set to `--prefix=` as that is used by the majority of packages. + +##### `dontAddDisableDepTrack` {#var-stdenv-dontAddDisableDepTrack} + +By default, the flag `--disable-dependency-tracking` is added to the configure flags to speed up Automake-based builds. If this is undesirable, set this variable to true. + +##### `dontFixLibtool` {#var-stdenv-dontFixLibtool} + +By default, the configure phase applies some special hackery to all files called `ltmain.sh` before running the configure script in order to improve the purity of Libtool-based packages [^footnote-stdenv-sys-lib-search-path] . If this is undesirable, set this variable to true. + +##### `dontDisableStatic` {#var-stdenv-dontDisableStatic} + +By default, when the configure script has `--enable-static`, the option `--disable-static` is added to the configure flags. + +If this is undesirable, set this variable to true. + +##### `configurePlatforms` {#var-stdenv-configurePlatforms} + +By default, when cross compiling, the configure script has `--build=...` and `--host=...` passed. Packages can instead pass `[ "build" "host" "target" ]` or a subset to control exactly which platform flags are passed. Compilers and other tools can use this to also pass the target platform. [^footnote-stdenv-build-time-guessing-impurity] + +##### `preConfigure` {#var-stdenv-preConfigure} + +Hook executed at the start of the configure phase. + +##### `postConfigure` {#var-stdenv-postConfigure} + +Hook executed at the end of the configure phase. + +### The build phase {#build-phase} + +The build phase is responsible for actually building the package (e.g. compiling it). The default `buildPhase` simply calls `make` if a file named `Makefile`, `makefile` or `GNUmakefile` exists in the current directory (or the `makefile` is explicitly set); otherwise it does nothing. + +#### Variables controlling the build phase + +##### `dontBuild` {#var-stdenv-dontBuild} + +Set to true to skip the build phase. + +##### `makefile` {#var-stdenv-makefile} + +The file name of the Makefile. + +##### `makeFlags` {#var-stdenv-makeFlags} + +A list of strings passed as additional flags to `make`. These flags are also used by the default install and check phase. For setting make flags specific to the build phase, use `buildFlags` (see below). + +```nix +makeFlags = [ "PREFIX=$(out)" ]; +``` + +::: note +The flags are quoted in bash, but environment variables can be specified by using the make syntax. +::: + +##### `makeFlagsArray` {#var-stdenv-makeFlagsArray} + +A shell array containing additional arguments passed to `make`. You must use this instead of `makeFlags` if the arguments contain spaces, e.g. + +```nix +preBuild = '' + makeFlagsArray+=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") +''; +``` + +Note that shell arrays cannot be passed through environment variables, so you cannot set `makeFlagsArray` in a derivation attribute (because those are passed through environment variables): you have to define them in shell code. + +##### `buildFlags` / `buildFlagsArray` {#var-stdenv-buildFlags} + +A list of strings passed as additional flags to `make`. Like `makeFlags` and `makeFlagsArray`, but only used by the build phase. + +##### `preBuild` {#var-stdenv-preBuild} + +Hook executed at the start of the build phase. + +##### `postBuild` {#var-stdenv-postBuild} + +Hook executed at the end of the build phase. + +You can set flags for `make` through the `makeFlags` variable. + +Before and after running `make`, the hooks `preBuild` and `postBuild` are called, respectively. + +### The check phase {#ssec-check-phase} + +The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make check`, but only if the `doCheck` variable is enabled. + +#### Variables controlling the check phase + +##### `doCheck` {#var-stdenv-doCheck} + +Controls whether the check phase is executed. By default it is skipped, but if `doCheck` is set to true, the check phase is usually executed. Thus you should set + +```nix +doCheck = true; +``` + +in the derivation to enable checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how `doCheck` is set, as the newly-built program won’t run on the platform used to build it. + +##### `makeFlags` / `makeFlagsArray` / `makefile` + +See the [build phase](#var-stdenv-makeFlags) for details. + +##### `checkTarget` {#var-stdenv-checkTarget} + +The make target that runs the tests. Defaults to `check`. + +##### `checkFlags` / `checkFlagsArray` {#var-stdenv-checkFlags} + +A list of strings passed as additional flags to `make`. Like `makeFlags` and `makeFlagsArray`, but only used by the check phase. + +##### `checkInputs` {#var-stdenv-checkInputs} + +A list of dependencies used by the phase. This gets included in `nativeBuildInputs` when `doCheck` is set. + +##### `preCheck` {#var-stdenv-preCheck} + +Hook executed at the start of the check phase. + +##### `postCheck` {#var-stdenv-postCheck} + +Hook executed at the end of the check phase. + +### The install phase {#ssec-install-phase} + +The install phase is responsible for installing the package in the Nix store under `out`. The default `installPhase` creates the directory `$out` and calls `make install`. + +#### Variables controlling the install phase + +##### `dontInstall` {#var-stdenv-dontInstall} + +Set to true to skip the install phase. + +##### `makeFlags` / `makeFlagsArray` / `makefile` + +See the [build phase](#var-stdenv-makeFlags) for details. + +##### `installTargets` {#var-stdenv-installTargets} + +The make targets that perform the installation. Defaults to `install`. Example: + +```nix +installTargets = "install-bin install-doc"; +``` + +##### `installFlags` / `installFlagsArray` {#var-stdenv-installFlags} + +A list of strings passed as additional flags to `make`. Like `makeFlags` and `makeFlagsArray`, but only used by the install phase. + +##### `preInstall` {#var-stdenv-preInstall} + +Hook executed at the start of the install phase. + +##### `postInstall` {#var-stdenv-postInstall} + +Hook executed at the end of the install phase. + +### The fixup phase {#ssec-fixup-phase} + +The fixup phase performs some (Nix-specific) post-processing actions on the files installed under `$out` by the install phase. The default `fixupPhase` does the following: + +- It moves the `man/`, `doc/` and `info/` subdirectories of `$out` to `share/`. +- It strips libraries and executables of debug information. +- On Linux, it applies the `patchelf` command to ELF executables and libraries to remove unused directories from the `RPATH` in order to prevent unnecessary runtime dependencies. +- It rewrites the interpreter paths of shell scripts to paths found in `PATH`. E.g., `/usr/bin/perl` will be rewritten to `/nix/store/some-perl/bin/perl` found in `PATH`. + +#### Variables controlling the fixup phase + +##### `dontFixup` {#var-stdenv-dontFixup} + +Set to true to skip the fixup phase. + +##### `dontStrip` {#var-stdenv-dontStrip} + +If set, libraries and executables are not stripped. By default, they are. + +##### `dontStripHost` {#var-stdenv-dontStripHost} + +Like `dontStrip`, but only affects the `strip` command targetting the package’s host platform. Useful when supporting cross compilation, but otherwise feel free to ignore. + +##### `dontStripTarget` {#var-stdenv-dontStripTarget} + +Like `dontStrip`, but only affects the `strip` command targetting the packages’ target platform. Useful when supporting cross compilation, but otherwise feel free to ignore. + +##### `dontMoveSbin` {#var-stdenv-dontMoveSbin} + +If set, files in `$out/sbin` are not moved to `$out/bin`. By default, they are. + +##### `stripAllList` {#var-stdenv-stripAllList} + +List of directories to search for libraries and executables from which *all* symbols should be stripped. By default, it’s empty. Stripping all symbols is risky, since it may remove not just debug symbols but also ELF information necessary for normal execution. + +##### `stripAllFlags` {#var-stdenv-stripAllFlags} + +Flags passed to the `strip` command applied to the files in the directories listed in `stripAllList`. Defaults to `-s` (i.e. `--strip-all`). + +##### `stripDebugList` {#var-stdenv-stripDebugList} + +List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to `lib lib32 lib64 libexec bin sbin`. + +##### `stripDebugFlags` {#var-stdenv-stripDebugFlags} + +Flags passed to the `strip` command applied to the files in the directories listed in `stripDebugList`. Defaults to `-S` (i.e. `--strip-debug`). + +##### `dontPatchELF` {#var-stdenv-dontPatchELF} + +If set, the `patchelf` command is not used to remove unnecessary `RPATH` entries. Only applies to Linux. + +##### `dontPatchShebangs` {#var-stdenv-dontPatchShebangs} + +If set, scripts starting with `#!` do not have their interpreter paths rewritten to paths in the Nix store. + +##### `dontPruneLibtoolFiles` {#var-stdenv-dontPruneLibtoolFiles} + +If set, libtool `.la` files associated with shared libraries won’t have their `dependency_libs` field cleared. + +##### `forceShare` {#var-stdenv-forceShare} + +The list of directories that must be moved from `$out` to `$out/share`. Defaults to `man doc info`. + +##### `setupHook` {#var-stdenv-setupHook} + +A package can export a [setup hook](#ssec-setup-hooks) by setting this variable. The setup hook, if defined, is copied to `$out/nix-support/setup-hook`. Environment variables are then substituted in it using `substituteAll`. + +##### `preFixup` {#var-stdenv-preFixup} + +Hook executed at the start of the fixup phase. + +##### `postFixup` {#var-stdenv-postFixup} + +Hook executed at the end of the fixup phase. + +##### `separateDebugInfo` {#stdenv-separateDebugInfo} + +If set to `true`, the standard environment will enable debug information in C/C++ builds. After installation, the debug information will be separated from the executables and stored in the output named `debug`. (This output is enabled automatically; you don’t need to set the `outputs` attribute explicitly.) To be precise, the debug information is stored in `debug/lib/debug/.build-id/XX/YYYY…`, where \ is the \ of the binary — a SHA-1 hash of the contents of the binary. Debuggers like GDB use the build ID to look up the separated debug information. + +For example, with GDB, you can add + +``` +set debug-file-directory ~/.nix-profile/lib/debug +``` + +to `~/.gdbinit`. GDB will then be able to find debug information installed via `nix-env -i`. + +### The installCheck phase {#ssec-installCheck-phase} + +The installCheck phase checks whether the package was installed correctly by running its test suite against the installed directories. The default `installCheck` calls `make installcheck`. + +#### Variables controlling the installCheck phase + +##### `doInstallCheck` {#var-stdenv-doInstallCheck} + +Controls whether the installCheck phase is executed. By default it is skipped, but if `doInstallCheck` is set to true, the installCheck phase is usually executed. Thus you should set + +```nix +doInstallCheck = true; +``` + +in the derivation to enable install checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how `doInstallCheck` is set, as the newly-built program won’t run on the platform used to build it. + +##### `installCheckTarget` {#var-stdenv-installCheckTarget} + +The make target that runs the install tests. Defaults to `installcheck`. + +##### `installCheckFlags` / `installCheckFlagsArray` {#var-stdenv-installCheckFlags} + +A list of strings passed as additional flags to `make`. Like `makeFlags` and `makeFlagsArray`, but only used by the installCheck phase. + +##### `installCheckInputs` {#var-stdenv-installCheckInputs} + +A list of dependencies used by the phase. This gets included in `nativeBuildInputs` when `doInstallCheck` is set. + +##### `preInstallCheck` {#var-stdenv-preInstallCheck} + +Hook executed at the start of the installCheck phase. + +##### `postInstallCheck` {#var-stdenv-postInstallCheck} + +Hook executed at the end of the installCheck phase. + +### The distribution phase {#ssec-distribution-phase} + +The distribution phase is intended to produce a source distribution of the package. The default `distPhase` first calls `make dist`, then it copies the resulting source tarballs to `$out/tarballs/`. This phase is only executed if the attribute `doDist` is set. + +#### Variables controlling the distribution phase + +##### `distTarget` {#var-stdenv-distTarget} + +The make target that produces the distribution. Defaults to `dist`. + +##### `distFlags` / `distFlagsArray` {#var-stdenv-distFlags} + +Additional flags passed to `make`. + +##### `tarballs` {#var-stdenv-tarballs} + +The names of the source distribution files to be copied to `$out/tarballs/`. It can contain shell wildcards. The default is `*.tar.gz`. + +##### `dontCopyDist` {#var-stdenv-dontCopyDist} + +If set, no files are copied to `$out/tarballs/`. + +##### `preDist` {#var-stdenv-preDist} + +Hook executed at the start of the distribution phase. + +##### `postDist` {#var-stdenv-postDist} + +Hook executed at the end of the distribution phase. + +## Shell functions {#ssec-stdenv-functions} + +The standard environment provides a number of useful functions. + +### `makeWrapper` \ \ \ {#fun-makeWrapper} + +Constructs a wrapper for a program with various possible arguments. For example: + +```bash +# adds `FOOBAR=baz` to `$out/bin/foo`’s environment +makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz + +# prefixes the binary paths of `hello` and `git` +# Be advised that paths often should be patched in directly +# (via string replacements or in `configurePhase`). +makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello git ]} +``` + +There’s many more kinds of arguments, they are documented in `nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh`. + +`wrapProgram` is a convenience function you probably want to use most of the time. + +### `substitute` \ \ \ {#fun-substitute} + +Performs string substitution on the contents of \, writing the result to \. The substitutions in \ are of the following form: + +#### `--replace` \ \ + +Replace every occurrence of the string \ by \. + +#### `--subst-var` \ + +Replace every occurrence of `@varName@` by the contents of the environment variable \. This is useful for generating files from templates, using `@...@` in the template as placeholders. + +#### `--subst-var-by` \ \ + +Replace every occurrence of `@varName@` by the string \. + +Example: + +```shell +substitute ./foo.in ./foo.out \ + --replace /usr/bin/bar $bar/bin/bar \ + --replace "a string containing spaces" "some other text" \ + --subst-var someVar +``` + +### `substituteInPlace` \ \ {#fun-substituteInPlace} + +Like `substitute`, but performs the substitutions in place on the file \. + +### `substituteAll` \ \ {#fun-substituteAll} + +Replaces every occurrence of `@varName@`, where \ is any environment variable, in \, writing the result to \. For instance, if \ has the contents + +```bash +#! @bash@/bin/sh +PATH=@coreutils@/bin +echo @foo@ +``` + +and the environment contains `bash=/nix/store/bmwp0q28cf21...-bash-3.2-p39` and `coreutils=/nix/store/68afga4khv0w...-coreutils-6.12`, but does not contain the variable `foo`, then the output will be + +```bash +#! /nix/store/bmwp0q28cf21...-bash-3.2-p39/bin/sh +PATH=/nix/store/68afga4khv0w...-coreutils-6.12/bin +echo @foo@ +``` + +That is, no substitution is performed for undefined variables. + +Environment variables that start with an uppercase letter or an underscore are filtered out, to prevent global variables (like `HOME`) or private variables (like `__ETC_PROFILE_DONE`) from accidentally getting substituted. The variables also have to be valid bash "names", as defined in the bash manpage (alphanumeric or `_`, must not start with a number). + +### `substituteAllInPlace` \ {#fun-substituteAllInPlace} + +Like `substituteAll`, but performs the substitutions in place on the file \. + +### `stripHash` \ {#fun-stripHash} + +Strips the directory and hash part of a store path, outputting the name part to `stdout`. For example: + +```bash +# prints coreutils-8.24 +stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" +``` + +If you wish to store the result in another variable, then the following idiom may be useful: + +```bash +name="/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" +someVar=$(stripHash $name) +``` + +### `wrapProgram` \ \ {#fun-wrapProgram} + +Convenience function for `makeWrapper` that automatically creates a sane wrapper file. It takes all the same arguments as `makeWrapper`, except for `--argv0`. + +It cannot be applied multiple times, since it will overwrite the wrapper file. + +## Package setup hooks {#ssec-setup-hooks} + +Nix itself considers a build-time dependency as merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup. In most cases, that is fine, and the downstream derivation can deal with its own dependencies. But for a few common tasks, that would result in almost every package doing the same sort of setup work—depending not on the package itself, but entirely on which dependencies were used. + +In order to alleviate this burden, the setup hook mechanism was written, where any package can include a shell script that \[by convention rather than enforcement by Nix\], any downstream reverse-dependency will source as part of its build process. That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. No boilerplate mirroring the list of dependencies is needed. + +The setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. The combination of its power and implicit use may be expedient, but isn’t without costs. Nix itself is unchanged, but the spirit of added dependencies being effect-free is violated even if the letter isn’t. For example, if a derivation path is mentioned more than once, Nix itself doesn’t care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so. + +The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper’s setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of `envBuildBuildHooks`, `envBuildHostHooks`, `envBuildTargetHooks`, `envHostHostHooks`, `envHostTargetHooks`, or `envTargetTargetHooks`. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there’s 12 total but we ignore the propagated/non-propagated axis). + +Packages adding a hook should not hard code a specific hook, but rather choose a variable *relative* to how they are included. Returning to the C compiler wrapper example, if the wrapper itself is an `n` dependency, then it only wants to accumulate flags from `n + 1` dependencies, as only those ones match the compiler’s target platform. The `hostOffset` variable is defined with the current dependency’s host offset `targetOffset` with its target offset, before its setup hook is sourced. Additionally, since most environment hooks don’t care about the target platform, that means the setup hook can append to the right bash array by doing something like + +```{.bash} +addEnvHooks "$hostOffset" myBashFunction +``` + +The *existence* of setups hooks has long been documented and packages inside Nixpkgs are free to use this mechanism. Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. Because of the existing issues with this system, there’s little benefit from mandating it be stable for any period of time. + +First, let’s cover some setup hooks that are part of Nixpkgs default stdenv. This means that they are run for every package built using `stdenv.mkDerivation`. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa. + +### `move-docs.sh` + +This setup hook moves any installed documentation to the `/share` subdirectory directory. This includes the man, doc and info directories. This is needed for legacy programs that do not know how to use the `share` subdirectory. + +### `compress-man-pages.sh` + +This setup hook compresses any man pages that have been installed. The compression is done using the gzip program. This helps to reduce the installed size of packages. + +### `strip.sh` + +This runs the strip command on installed binaries and libraries. This removes unnecessary information like debug symbols when they are not needed. This also helps to reduce the installed size of packages. + +### `patch-shebangs.sh` + +This setup hook patches installed scripts to use the full path to the shebang interpreter. A shebang interpreter is the first commented line of a script telling the operating system which program will run the script (e.g `#!/bin/bash`). In Nix, we want an exact path to that interpreter to be used. This often replaces `/bin/sh` with a path in the Nix store. + +### `audit-tmpdir.sh` + +This verifies that no references are left from the install binaries to the directory used to build those binaries. This ensures that the binaries do not need things outside the Nix store. This is currently supported in Linux only. + +### `multiple-outputs.sh` + +This setup hook adds configure flags that tell packages to install files into any one of the proper outputs listed in `outputs`. This behavior can be turned off by setting `setOutputFlags` to false in the derivation environment. See for more information. + +### `move-sbin.sh` + +This setup hook moves any binaries installed in the `sbin/` subdirectory into `bin/`. In addition, a link is provided from `sbin/` to `bin/` for compatibility. + +### `move-lib64.sh` + +This setup hook moves any libraries installed in the `lib64/` subdirectory into `lib/`. In addition, a link is provided from `lib64/` to `lib/` for compatibility. + +### `move-systemd-user-units.sh` + +This setup hook moves any systemd user units installed in the `lib/` subdirectory into `share/`. In addition, a link is provided from `share/` to `lib/` for compatibility. This is needed for systemd to find user services when installed into the user profile. + +### `set-source-date-epoch-to-latest.sh` + +This sets `SOURCE_DATE_EPOCH` to the modification time of the most recent file. + +### Bintools Wrapper + +The Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin. \[The “Bintools” name is supposed to be a compromise between “Binutils” and “cctools” not denoting any specific implementation.\] Specifically, the underlying bintools package, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn (at run time) depends on the Bintools Wrapper. + +The Bintools Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out. For example, it shouldn’t care about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux). Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand. It is currently accomplished by collecting directories of host-platform dependencies (i.e. `buildInputs` and `nativeBuildInputs`) in environment variables. The Bintools Wrapper’s setup hook causes any `lib` and `lib64` subdirectories to be added to `NIX_LDFLAGS`. Since the CC Wrapper and the Bintools Wrapper use the same strategy, most of the Bintools Wrapper code is sparsely commented and refers to the CC Wrapper. But the CC Wrapper’s code, by contrast, has quite lengthy comments. The Bintools Wrapper merely cites those, rather than repeating them, to avoid falling out of sync. + +A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables fulfill which purpose. They are defined to just be the base name of the tools, under the assumption that the Bintools Wrapper’s binaries will be on the path. Firstly, this helps poorly-written packages, e.g. ones that look for just `gcc` when `CC` isn’t defined yet `clang` is to be used. Secondly, this helps packages not get confused when cross-compiling, in which case multiple Bintools Wrappers may simultaneously be in use. [^footnote-stdenv-per-platform-wrapper] `BUILD_`- and `TARGET_`-prefixed versions of the normal environment variable are defined for additional Bintools Wrappers, properly disambiguating them. + +A problem with this final task is that the Bintools Wrapper is honest and defines `LD` as `ld`. Most packages, however, firstly use the C compiler for linking, secondly use `LD` anyways, defining it as the C compiler, and thirdly, only so define `LD` when it is undefined as a fallback. This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won’t override yet doesn’t want to use. The workaround is to define, just for the problematic package, `LD` as the C compiler. A good way to do this would be `preConfigure = "LD=$CC"`. + +### CC Wrapper + +The CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the CC Wrapper. Packages typically depend on the CC Wrapper, which in turn (at run-time) depends on the Bintools Wrapper. + +Dependency finding is undoubtedly the main task of the CC Wrapper. This works just like the Bintools Wrapper, except that any `include` subdirectory of any relevant dependency is added to `NIX_CFLAGS_COMPILE`. The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished. + +Similarly, the CC Wrapper follows the Bintools Wrapper in defining standard environment variables with the names of the tools it wraps, for the same reasons described above. Importantly, while it includes a `cc` symlink to the c compiler for portability, the `CC` will be defined using the compiler’s “real name” (i.e. `gcc` or `clang`). This helps lousy build systems that inspect on the name of the compiler rather than run it. + +Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list. The mechanism is only to be used as a last resort, so it might cover most uses. + +### Perl {#setup-hook-perl} + +Adds the `lib/site_perl` subdirectory of each build input to the `PERL5LIB` environment variable. For instance, if `buildInputs` contains Perl, then the `lib/site_perl` subdirectory of each input is added to the `PERL5LIB` environment variable. + +### Python {#setup-hook-python} + +Adds the `lib/${python.libPrefix}/site-packages` subdirectory of each build input to the `PYTHONPATH` environment variable. + +### pkg-config {#setup-hook-pkg-config} + +Adds the `lib/pkgconfig` and `share/pkgconfig` subdirectories of each build input to the `PKG_CONFIG_PATH` environment variable. + +### Automake {#setup-hook-automake} + +Adds the `share/aclocal` subdirectory of each build input to the `ACLOCAL_PATH` environment variable. + +### Autoconf {#setup-hook-autoconf} + +The `autoreconfHook` derivation adds `autoreconfPhase`, which runs autoreconf, libtoolize and automake, essentially preparing the configure script in autotools-based builds. Most autotools-based packages come with the configure script pre-generated, but this hook is necessary for a few packages and when you need to patch the package’s configure scripts. + +### libxml2 {#setup-hook-libxml2} + +Adds every file named `catalog.xml` found under the `xml/dtd` and `xml/xsl` subdirectories of each build input to the `XML_CATALOG_FILES` environment variable. + +### teTeX / TeX Live + +Adds the `share/texmf-nix` subdirectory of each build input to the `TEXINPUTS` environment variable. + +### Qt 4 + +Sets the `QTDIR` environment variable to Qt’s path. + +### gdk-pixbuf {#setup-hook-gdk-pixbuf} + +Exports `GDK_PIXBUF_MODULE_FILE` environment variable to the builder. Add librsvg package to `buildInputs` to get svg support. See also the [setup hook description in GNOME platform docs](#ssec-gnome-hooks-gdk-pixbuf). + +### GHC + +Creates a temporary package database and registers every Haskell build input in it (TODO: how?). + +### GNOME platform + +Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in . + +### autoPatchelfHook {#setup-hook-autopatchelfhook} + +This is a special setup hook which helps in packaging proprietary software in that it automatically tries to find missing shared library dependencies of ELF files based on the given `buildInputs` and `nativeBuildInputs`. + +You can also specify a `runtimeDependencies` variable which lists dependencies to be unconditionally added to rpath of all executables. This is useful for programs that use dlopen 3 to load libraries at runtime. + +In certain situations you may want to run the main command (`autoPatchelf`) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the `dontAutoPatchelf` environment variable to a non-empty value. + +By default `autoPatchelf` will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the `autoPatchelfIgnoreMissingDeps` environment variable to a non-empty value. + +The `autoPatchelf` command also recognizes a `--no-recurse` command line flag, which prevents it from recursing into subdirectories. + +### breakpointHook + +This hook will make a build pause instead of stopping when a failure happens. It prevents nix from cleaning up the build environment immediately and allows the user to attach to a build environment using the `cntr` command. Upon build error it will print instructions on how to use `cntr`, which can be used to enter the environment for debugging. Installing cntr and running the command will provide shell access to the build sandbox of failed build. At `/var/lib/cntr` the sandboxed filesystem is mounted. All commands and files of the system are still accessible within the shell. To execute commands from the sandbox use the cntr exec subcommand. `cntr` is only supported on Linux-based platforms. To use it first add `cntr` to your `environment.systemPackages` on NixOS or alternatively to the root user on non-NixOS systems. Then in the package that is supposed to be inspected, add `breakpointHook` to `nativeBuildInputs`. + +```nix +nativeBuildInputs = [ breakpointHook ]; +``` + +When a build failure happens there will be an instruction printed that shows how to attach with `cntr` to the build sandbox. + +::: note +::: title +Caution with remote builds +::: + +This won’t work with remote builds as the build environment is on a different machine and can’t be accessed by `cntr`. Remote builds can be turned off by setting `--option builders ''` for `nix-build` or `--builders ''` for `nix build`. +::: + +### installShellFiles + +This hook helps with installing manpages and shell completion files. It exposes 2 shell functions `installManPage` and `installShellCompletion` that can be used from your `postInstall` hook. + +The `installManPage` function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with `.gz` suffix). This function will place them into the correct directory. + +The `installShellCompletion` function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of `--bash`, `--fish`, or `--zsh`. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag `--name NAME` before the path. If this flag is not provided, zsh completions will be renamed automatically such that `foobar.zsh` becomes `_foobar`. A root name may be provided for all paths using the flag `--cmd NAME`; this synthesizes the appropriate name depending on the shell (e.g. `--cmd foo` will synthesize the name `foo.bash` for bash and `_foo` for zsh). The path may also be a fifo or named fd (such as produced by `<(cmd)`), in which case the shell and name must be provided. + +```nix +nativeBuildInputs = [ installShellFiles ]; +postInstall = '' + installManPage doc/foobar.1 doc/barfoo.3 + # explicit behavior + installShellCompletion --bash --name foobar.bash share/completions.bash + installShellCompletion --fish --name foobar.fish share/completions.fish + installShellCompletion --zsh --name _foobar share/completions.zsh + # implicit behavior + installShellCompletion share/completions/foobar.{bash,fish,zsh} + # using named fd + installShellCompletion --cmd foobar \ + --bash <($out/bin/foobar --bash-completion) \ + --fish <($out/bin/foobar --fish-completion) \ + --zsh <($out/bin/foobar --zsh-completion) +''; +``` + +### libiconv, libintl + +A few libraries automatically add to `NIX_LDFLAGS` their library, making their symbols automatically available to the linker. This includes libiconv and libintl (gettext). This is done to provide compatibility between GNU Linux, where libiconv and libintl are bundled in, and other systems where that might not be the case. Sometimes, this behavior is not desired. To disable this behavior, set `dontAddExtraLibs`. + +### validatePkgConfig + +The `validatePkgConfig` hook validates all pkg-config (`.pc`) files in a package. This helps catching some common errors in pkg-config files, such as undefined variables. + +### cmake + +Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to CMAKE_PREFIX_PATH so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting configurePhase to a custom value, or by setting dontUseCmakeConfigure. cmakeFlags controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator. + +### xcbuildHook + +Overrides the build and install phases to run the "xcbuild" command. This hook is needed when a project only comes with build files for the XCode build system. You can disable this behavior by setting buildPhase and configurePhase to a custom value. xcbuildFlags controls flags passed only to xcbuild. + +### Meson + +Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, `enableParallelBuilding` is enabled as Meson supports parallel building almost everywhere. + +#### Variables controlling Meson + +##### `mesonFlags` + +Controls the flags passed to meson. + +##### `mesonBuildType` + +Which [`--buildtype`](https://mesonbuild.com/Builtin-options.html#core-options) to pass to Meson. We default to `plain`. + +##### `mesonAutoFeatures` + +What value to set [`-Dauto_features=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `enabled`. + +##### `mesonWrapMode` + +What value to set [`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `nodownload` as we disallow network access. + +##### `dontUseMesonConfigure` + +Disables using Meson’s `configurePhase`. + +### ninja + +Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the `dontUseNinjaBuild`, `dontUseNinjaInstall`, and `dontUseNinjaCheck`, respectively. Parallel building is enabled by default in Ninja. + +### unzip + +This setup hook will allow you to unzip .zip files specified in `$src`. There are many similar packages like `unrar`, `undmg`, etc. + +### wafHook + +Overrides the configure, build, and install phases. This will run the “waf” script used by many projects. If `wafPath` (default `./waf`) doesn’t exist, it will copy the version of waf available in Nixpkgs. `wafFlags` can be used to pass flags to the waf script. + +### scons + +Overrides the build, install, and check phases. This uses the scons build system as a replacement for make. scons does not provide a configure phase, so everything is managed at build and install time. + +## Purity in Nixpkgs {#sec-purity-in-nixpkgs} + +*Measures taken to prevent dependencies on packages outside the store, and what you can do to prevent them.* + +GCC doesn’t search in locations such as `/usr/include`. In fact, attempts to add such directories through the `-I` flag are filtered out. Likewise, the linker (from GNU binutils) doesn’t search in standard locations such as `/usr/lib`. Programs built on Linux are linked against a GNU C Library that likewise doesn’t search in the default system locations. + +## Hardening in Nixpkgs {#sec-hardening-in-nixpkgs} + +There are flags available to harden packages at compile or link-time. These can be toggled using the `stdenv.mkDerivation` parameters `hardeningDisable` and `hardeningEnable`. + +Both parameters take a list of flags as strings. The special `"all"` flag can be passed to `hardeningDisable` to turn off all hardening. These flags can also be used as environment variables for testing or development purposes. + +The following flags are enabled by default and might require disabling with `hardeningDisable` if the program to package is incompatible. + +### `format` + +Adds the `-Wformat -Wformat-security -Werror=format-security` compiler options. At present, this warns about calls to `printf` and `scanf` functions where the format string is not a string literal and there are no format arguments, as in `printf(foo);`. This may be a security hole if the format string came from untrusted input and contains `%n`. + +This needs to be turned off or fixed for errors similar to: + +``` +/tmp/nix-build-zynaddsubfx-2.5.2.drv-0/zynaddsubfx-2.5.2/src/UI/guimain.cpp:571:28: error: format not a string literal and no format arguments [-Werror=format-security] + printf(help_message); + ^ +cc1plus: some warnings being treated as errors +``` + +### `stackprotector` + +Adds the `-fstack-protector-strong --param ssp-buffer-size=4` compiler options. This adds safety checks against stack overwrites rendering many potential code injection attacks into aborting situations. In the best case this turns code injection vulnerabilities into denial of service or into non-issues (depending on the application). + +This needs to be turned off or fixed for errors similar to: + +``` +bin/blib.a(bios_console.o): In function `bios_handle_cup': +/tmp/nix-build-ipxe-20141124-5cbdc41.drv-0/ipxe-5cbdc41/src/arch/i386/firmware/pcbios/bios_console.c:86: undefined reference to `__stack_chk_fail' +``` + +### `fortify` + +Adds the `-O2 -D_FORTIFY_SOURCE=2` compiler options. During code generation the compiler knows a great deal of information about buffer sizes (where possible), and attempts to replace insecure unlimited length buffer function calls with length-limited ones. This is especially useful for old, crufty code. Additionally, format strings in writable memory that contain `%n` are blocked. If an application depends on such a format string, it will need to be worked around. + +Additionally, some warnings are enabled which might trigger build failures if compiler warnings are treated as errors in the package build. In this case, set `NIX_CFLAGS_COMPILE` to `-Wno-error=warning-type`. + +This needs to be turned off or fixed for errors similar to: + +``` +malloc.c:404:15: error: return type is an incomplete type +malloc.c:410:19: error: storage size of 'ms' isn't known + +strdup.h:22:1: error: expected identifier or '(' before '__extension__' + +strsep.c:65:23: error: register name not specified for 'delim' + +installwatch.c:3751:5: error: conflicting types for '__open_2' + +fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments +``` + +### `pic` + +Adds the `-fPIC` compiler options. This options adds support for position independent code in shared libraries and thus making ASLR possible. + +Most notably, the Linux kernel, kernel modules and other code not running in an operating system environment like boot loaders won’t build with PIC enabled. The compiler will is most cases complain that PIC is not supported for a specific build. + +This needs to be turned off or fixed for assembler errors similar to: + +``` +ccbLfRgg.s: Assembler messages: +ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF' +``` + +### `strictoverflow` + +Signed integer overflow is undefined behaviour according to the C standard. If it happens, it is an error in the program as it should check for overflow before it can happen, not afterwards. GCC provides built-in functions to perform arithmetic with overflow checking, which are correct and faster than any custom implementation. As a workaround, the option `-fno-strict-overflow` makes gcc behave as if signed integer overflows were defined. + +This flag should not trigger any build or runtime errors. + +### `relro` + +Adds the `-z relro` linker option. During program load, several ELF memory sections need to be written to by the linker, but can be turned read-only before turning over control to the program. This prevents some GOT (and .dtors) overwrite attacks, but at least the part of the GOT used by the dynamic linker (.got.plt) is still vulnerable. + +This flag can break dynamic shared object loading. For instance, the module systems of Xorg and OpenCV are incompatible with this flag. In almost all cases the `bindnow` flag must also be disabled and incompatible programs typically fail with similar errors at runtime. + +### `bindnow` + +Adds the `-z bindnow` linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to `relro`). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn’t be an issue for daemons. + +This flag can break dynamic shared object loading. For instance, the module systems of Xorg and PHP are incompatible with this flag. Programs incompatible with this flag often fail at runtime due to missing symbols, like: + +``` +intel_drv.so: undefined symbol: vgaHWFreeHWRec +``` + +The following flags are disabled by default and should be enabled with `hardeningEnable` for packages that take untrusted input like network services. + +### `pie` + +Adds the `-fPIE` compiler and `-pie` linker options. Position Independent Executables are needed to take advantage of Address Space Layout Randomization, supported by modern kernel versions. While ASLR can already be enforced for data areas in the stack and heap (brk and mmap), the code areas must be compiled as position-independent. Shared libraries already do this with the `pic` flag, so they gain ASLR automatically, but binary .text regions need to be build with `pie` to gain ASLR. When this happens, ROP attacks are much harder since there are no static locations to bounce off of during a memory corruption attack. + +For more in-depth information on these hardening flags and hardening in general, refer to the [Debian Wiki](https://wiki.debian.org/Hardening), [Ubuntu Wiki](https://wiki.ubuntu.com/Security/Features), [Gentoo Wiki](https://wiki.gentoo.org/wiki/Project:Hardened), and the [Arch Wiki](https://wiki.archlinux.org/index.php/DeveloperWiki:Security). + +[^footnote-stdenv-ignored-build-platform]: The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always *specified* as interfaces, not concrete implementation. +[^footnote-stdenv-native-dependencies-in-path]: Currently, this means for native builds all dependencies are put on the `PATH`. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the `depsBuild*` and `nativeBuildInputs` would be added to the `PATH`. +[^footnote-stdenv-find-inputs-location]: The `findInputs` function, currently residing in `pkgs/stdenv/generic/setup.sh`, implements the propagation logic. +[^footnote-stdenv-sys-lib-search-path]: It clears the `sys_lib_*search_path` variables in the Libtool script to prevent Libtool from using libraries in `/usr/lib` and such. +[^footnote-stdenv-build-time-guessing-impurity]: Eventually these will be passed building natively as well, to improve determinism: build-time guessing, as is done today, is a risk of impurity. +[^footnote-stdenv-per-platform-wrapper]: Each wrapper targets a single platform, so if binaries for multiple platforms are needed, the underlying binaries must be wrapped multiple times. As this is a property of the wrapper itself, the multiple wrappings are needed whether or not the same underlying binaries can target multiple platforms. diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.xml b/third_party/nixpkgs/doc/stdenv/stdenv.xml deleted file mode 100644 index b2004270e9..0000000000 --- a/third_party/nixpkgs/doc/stdenv/stdenv.xml +++ /dev/null @@ -1,2419 +0,0 @@ - - The Standard Environment - - The standard build environment in the Nix Packages collection provides an environment for building Unix packages that does a lot of common build tasks automatically. In fact, for Unix packages that use the standard ./configure; make; make install build interface, you don’t need to write a build script at all; the standard environment does everything automatically. If stdenv doesn’t do what you need automatically, you can easily customise or override the various build phases. - -
- Using <literal>stdenv</literal> - - - To build a package with the standard environment, you use the function stdenv.mkDerivation, instead of the primitive built-in function derivation, e.g. - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - src = fetchurl { - url = "http://example.org/libfoo-1.2.3.tar.bz2"; - sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m"; - }; -} - (stdenv needs to be in scope, so if you write this in a separate Nix expression from pkgs/all-packages.nix, you need to pass it as a function argument.) Specifying a name and a src is the absolute minimum Nix requires. For convenience, you can also use pname and version attributes and mkDerivation will automatically set name to "${pname}-${version}" by default. Since RFC 0035, this is preferred for packages in Nixpkgs, as it allows us to reuse the version easily: - -stdenv.mkDerivation rec { - pname = "libfoo"; - version = "1.2.3"; - src = fetchurl { - url = "http://example.org/libfoo-source-${version}.tar.bz2"; - sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m"; - }; -} - - - - Many packages have dependencies that are not provided in the standard environment. It’s usually sufficient to specify those dependencies in the buildInputs attribute: - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - ... - buildInputs = [libbar perl ncurses]; -} - This attribute ensures that the bin subdirectories of these packages appear in the PATH environment variable during the build, that their include subdirectories are searched by the C compiler, and so on. (See for details.) - - - - Often it is necessary to override or modify some aspect of the build. To make this easier, the standard environment breaks the package build into a number of phases, all of which can be overridden or modified individually: unpacking the sources, applying patches, configuring, building, and installing. (There are some others; see .) For instance, a package that doesn’t supply a makefile but instead has to be compiled “manually” could be handled like this: - -stdenv.mkDerivation { - name = "fnord-4.5"; - ... - buildPhase = '' - gcc foo.c -o foo - ''; - installPhase = '' - mkdir -p $out/bin - cp foo $out/bin - ''; -} - (Note the use of ''-style string literals, which are very convenient for large multi-line script fragments because they don’t need escaping of " and \, and because indentation is intelligently removed.) - - - - There are many other attributes to customise the build. These are listed in . - - - - While the standard environment provides a generic builder, you can still supply your own build script: - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - ... - builder = ./builder.sh; -} - where the builder can do anything it wants, but typically starts with - -source $stdenv/setup - - to let stdenv set up the environment (e.g., process the buildInputs). If you want, you can still use stdenv’s generic builder: - -source $stdenv/setup - -buildPhase() { - echo "... this is my custom build phase ..." - gcc foo.c -o foo -} - -installPhase() { - mkdir -p $out/bin - cp foo $out/bin -} - -genericBuild - - -
-
- Tools provided by <literal>stdenv</literal> - - - The standard environment provides the following packages: - - - - The GNU C Compiler, configured with C and C++ support. - - - - - GNU coreutils (contains a few dozen standard Unix commands). - - - - - GNU findutils (contains find). - - - - - GNU diffutils (contains diff, cmp). - - - - - GNU sed. - - - - - GNU grep. - - - - - GNU awk. - - - - - GNU tar. - - - - - gzip, bzip2 and xz. - - - - - GNU Make. - - - - - Bash. This is the shell used for all builders in the Nix Packages collection. Not using /bin/sh removes a large source of portability problems. - - - - - The patch command. - - - - - - - On Linux, stdenv also includes the patchelf utility. - -
-
- Specifying dependencies - - - As described in the Nix manual, almost any *.drv store path in a derivation's attribute set will induce a dependency on that derivation. mkDerivation, however, takes a few attributes intended to, between them, include all the dependencies of a package. This is done both for structure and consistency, but also so that certain other setup can take place. For example, certain dependencies need their bin directories added to the PATH. That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. See for details. - - - - Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation's, and whether they are propagated. The platform distinctions are motivated by cross compilation; see for exactly what each platform means. - - - The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always specified as interfaces, not concrete implementation. - - - But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. By default, the run-time/build-time distinction is just a hint for mental clarity, but with strictDeps set it is mostly enforced even in the native case. - - - - The extension of PATH with dependencies, alluded to above, proceeds according to the relative platforms alone. The process is carried out only for dependencies whose host platform matches the new derivation's build platform i.e. dependencies which run on the platform where the new derivation will be built. - - - Currently, this means for native builds all dependencies are put on the PATH. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the depsBuild* and nativeBuildInputs would be added to the PATH. - - - For each dependency dep of those dependencies, dep/bin, if present, is added to the PATH environment variable. - - - - The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency. Nix itself already takes a package's transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency. - - - - It is important to note that dependencies are not necessarily propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up. The exact rules for dependency propagation can be given by assigning to each dependency two integers based one how its host and target platforms are offset from the depending derivation's platforms. Those offsets are given below in the descriptions of each dependency list attribute. Algorithmically, we traverse propagated inputs, accumulating every propagated dependency's propagated dependencies and adjusting them to account for the "shift in perspective" described by the current dependency's platform offsets. This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined. We also prune transitive dependencies whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd. - - - - We can define the process precisely with Natural Deduction using the inference rules. This probably seems a bit obtuse, but so is the bash code that actually implements it! - - - The findInputs function, currently residing in pkgs/stdenv/generic/setup.sh, implements the propagation logic. - - - They're confusing in very different ways so... hopefully if something doesn't make sense in one presentation, it will in the other! - -let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) - -propagated-dep(h0, t0, A, B) -propagated-dep(h1, t1, B, C) -h0 + h1 in {-1, 0, 1} -h0 + t1 in {-1, 0, 1} --------------------------------------- Transitive property -propagated-dep(mapOffset(h0, t0, h1), - mapOffset(h0, t0, t1), - A, C) - -let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) - -dep(h0, _, A, B) -propagated-dep(h1, t1, B, C) -h0 + h1 in {-1, 0, 1} -h0 + t1 in {-1, 0, -1} ------------------------------ Take immediate dependencies' propagated dependencies -propagated-dep(mapOffset(h0, t0, h1), - mapOffset(h0, t0, t1), - A, C) - -propagated-dep(h, t, A, B) ------------------------------ Propagated dependencies count as dependencies -dep(h, t, A, B) - Some explanation of this monstrosity is in order. In the common case, the target offset of a dependency is the successor to the target offset: t = h + 1. That means that: - -let f(h, t, i) = i + (if i <= 0 then h else t - 1) -let f(h, h + 1, i) = i + (if i <= 0 then h else (h + 1) - 1) -let f(h, h + 1, i) = i + (if i <= 0 then h else h) -let f(h, h + 1, i) = i + h - - This is where "sum-like" comes in from above: We can just sum all of the host offsets to get the host offset of the transitive dependency. The target offset is the transitive dependency is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one; it can be ignored as it doesn't add any new information. - - - - Because of the bounds checks, the uncommon cases are h = t and h + 2 = t. In the former case, the motivation for mapOffset is that since its host and target platforms are the same, no transitive dependency of it should be able to "discover" an offset greater than its reduced target offsets. mapOffset effectively "squashes" all its transitive dependencies' offsets so that none will ever be greater than the target offset of the original h = t package. In the other case, h + 1 is skipped over between the host and target offsets. Instead of squashing the offsets, we need to "rip" them apart so no transitive dependencies' offset is that one. - - - - Overall, the unifying theme here is that propagation shouldn't be introducing transitive dependencies involving platforms the depending package is unaware of. [One can imagine the dependending package asking for dependencies with the platforms it knows about; other platforms it doesn't know how to ask for. The platform description in that scenario is a kind of unforagable capability.] The offset bounds checking and definition of mapOffset together ensure that this is the case. Discovering a new offset is discovering a new platform, and since those platforms weren't in the derivation "spec" of the needing package, they cannot be relevant. From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency. - - - - Variables specifying dependencies - - - depsBuildBuild - - - - A list of dependencies whose host and target platforms are the new derivation's build platform. This means a -1 host and -1 target offset from the new derivation's platforms. These are programs and libraries used at build time that produce programs and libraries also used at build time. If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it in nativeBuildInputs instead. The most common use of this buildPackages.stdenv.cc, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries. - - - Since these packages are able to be run at build-time, they are always added to the PATH, as described above. But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. This isn't currently enforced, but could be in the future. - - - - - - nativeBuildInputs - - - - A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's host platform. This means a -1 host offset and 0 target offset from the new derivation's platforms. These are programs and libraries used at build-time that, if they are a compiler or similar tool, produce code to run at run-time—i.e. tools used to build the new derivation. If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild or depsBuildTarget. This could be called depsBuildHost but nativeBuildInputs is used for historical continuity. - - - Since these packages are able to be run at build-time, they are added to the PATH, as described above. But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. This isn't currently enforced, but could be in the future. - - - - - - depsBuildTarget - - - - A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's target platform. This means a -1 host offset and 1 target offset from the new derivation's platforms. These are programs used at build time that produce code to run with code produced by the depending package. Most commonly, these are tools used to build the runtime or standard library that the currently-being-built compiler will inject into any code it compiles. In many cases, the currently-being-built-compiler is itself employed for that task, but when that compiler won't run (i.e. its build and host platform differ) this is not possible. Other times, the compiler relies on some other tool, like binutils, that is always built separately so that the dependency is unconditional. - - - This is a somewhat confusing concept to wrap one’s head around, and for good reason. As the only dependency type where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage two away from the current one. It and its use-case go hand in hand and are both considered poor form: try to not need this sort of dependency, and try to avoid building standard libraries and runtimes in the same derivation as the compiler produces code using them. Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would. In short, do not use this attribute unless you are packaging a compiler and are sure it is needed. - - - Since these packages are able to run at build time, they are added to the PATH, as described above. But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. This isn't currently enforced, but could be in the future. - - - - - - depsHostHost - - - - A list of dependencies whose host and target platforms match the new derivation's host platform. This means a 0 host offset and 0 target offset from the new derivation's host platform. These are packages used at run-time to generate code also used at run-time. In practice, this would usually be tools used by compilers for macros or a metaprogramming system, or libraries used by the macros or metaprogramming code itself. It's always preferable to use a depsBuildBuild dependency in the derivation being built over a depsHostHost on the tool doing the building for this purpose. - - - - - - buildInputs - - - - A list of dependencies whose host platform and target platform match the new derivation's. This means a 0 host offset and a 1 target offset from the new derivation's host platform. This would be called depsHostTarget but for historical continuity. If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild. - - - These are often programs and libraries used by the new derivation at run-time, but that isn't always the case. For example, the machine code in a statically-linked library is only used at run-time, but the derivation containing the library is only needed at build-time. Even in the dynamic case, the library may also be needed at build-time to appease the linker. - - - - - - depsTargetTarget - - - - A list of dependencies whose host platform matches the new derivation's target platform. This means a 1 offset from the new derivation's platforms. These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. It's poor form in almost all cases for a package to depend on another from a future stage [future stage corresponding to positive offset]. Do not use this attribute unless you are packaging a compiler and are sure it is needed. - - - - - - depsBuildBuildPropagated - - - - The propagated equivalent of depsBuildBuild. This perhaps never ought to be used, but it is included for consistency [see below for the others]. - - - - - - propagatedNativeBuildInputs - - - - The propagated equivalent of nativeBuildInputs. This would be called depsBuildHostPropagated but for historical continuity. For example, if package Y has propagatedNativeBuildInputs = [X], and package Z has buildInputs = [Y], then package Z will be built as if it included package X in its nativeBuildInputs. If instead, package Z has nativeBuildInputs = [Y], then Z will be built as if it included X in the depsBuildBuild of package Z, because of the sum of the two -1 host offsets. - - - - - - depsBuildTargetPropagated - - - - The propagated equivalent of depsBuildTarget. This is prefixed for the same reason of alerting potential users. - - - - - - depsHostHostPropagated - - - - The propagated equivalent of depsHostHost. - - - - - - propagatedBuildInputs - - - - The propagated equivalent of buildInputs. This would be called depsHostTargetPropagated but for historical continuity. - - - - - - depsTargetTargetPropagated - - - - The propagated equivalent of depsTargetTarget. This is prefixed for the same reason of alerting potential users. - - - - -
-
- Attributes - - - Variables affecting <literal>stdenv</literal> initialisation - - - NIX_DEBUG - - - - A natural number indicating how much information to log. If set to 1 or higher, stdenv will print moderate debugging information during the build. In particular, the gcc and ld wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the stdenv setup script will be run with set -x tracing. If set to 7 or higher, the gcc and ld wrapper scripts will also be run with set -x tracing. - - - - - - - Attributes affecting build properties - - - enableParallelBuilding - - - - If set to true, stdenv will pass specific flags to make and other build tools to enable parallel building with up to build-cores workers. - - - Unless set to false, some build systems with good support for parallel building including cmake, meson, and qmake will set it to true. - - - - - - - Special variables - - - passthru - - - - This is an attribute set which can be filled with arbitrary values. For example: - -passthru = { - foo = "bar"; - baz = { - value1 = 4; - value2 = 5; - }; -} - - - - Values inside it are not passed to the builder, so you can change them without triggering a rebuild. However, they can be accessed outside of a derivation directly, as if they were set inside a derivation itself, e.g. hello.baz.value1. We don't specify any usage or schema of passthru - it is meant for values that would be useful outside the derivation in other parts of a Nix expression (e.g. in other derivations). An example would be to convey some specific dependency of your derivation which contains a program with plugins support. Later, others who make derivations with plugins can use passed-through dependency to ensure that their plugin would be binary-compatible with built program. - - - - - - passthru.updateScript - - - - A script to be run by maintainers/scripts/update.nix when the package is matched. It needs to be an executable file, either on the file system: - -passthru.updateScript = ./update.sh; - - or inside the expression itself: - -passthru.updateScript = writeScript "update-zoom-us" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl pcre common-updater-scripts - - set -eu -o pipefail - - version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')" - update-source-version zoom-us "$version" -''; - - The attribute can also contain a list, a script followed by arguments to be passed to it: - -passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]; - - The script will be run with UPDATE_NIX_ATTR_PATH environment variable set to the attribute path it is supposed to update. - - - The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running git commit or any other commands that cannot handle that. - - - - - For information about how to run the updates, execute nix-shell maintainers/scripts/update.nix. - - - - -
-
- Phases - - - The generic builder has a number of phases. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Furthermore, it allows a nicer presentation of build logs in the Nix build farm. - - - - Each phase can be overridden in its entirety either by setting the environment variable namePhase to a string containing some shell commands to be executed, or by redefining the shell function namePhase. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to add some commands to a phase, e.g. by defining postInstall or preFixup, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file pkgs/stdenv/generic/setup.sh. - - -
- Controlling phases - - - There are a number of variables that control what phases are executed and in what order: - - Variables affecting phase control - - - phases - - - - Specifies the phases. You can change the order in which phases are executed, or add new phases, by setting this variable. If it’s not set, the default value is used, which is $prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase fixupPhase installCheckPhase $preDistPhases distPhase $postPhases. - - - Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as preInstallPhases), as you then don’t specify all the normal phases. - - - - - - prePhases - - - - Additional phases executed before any of the default phases. - - - - - - preConfigurePhases - - - - Additional phases executed just before the configure phase. - - - - - - preBuildPhases - - - - Additional phases executed just before the build phase. - - - - - - preInstallPhases - - - - Additional phases executed just before the install phase. - - - - - - preFixupPhases - - - - Additional phases executed just before the fixup phase. - - - - - - preDistPhases - - - - Additional phases executed just before the distribution phase. - - - - - - postPhases - - - - Additional phases executed after any of the default phases. - - - - - -
- -
- The unpack phase - - - The unpack phase is responsible for unpacking the source code of the package. The default implementation of unpackPhase unpacks the source files listed in the src environment variable to the current directory. It supports the following files by default: - - - - Tar files - - - - These can optionally be compressed using gzip (.tar.gz, .tgz or .tar.Z), bzip2 (.tar.bz2, .tbz2 or .tbz) or xz (.tar.xz, .tar.lzma or .txz). - - - - - - Zip files - - - - Zip files are unpacked using unzip. However, unzip is not in the standard environment, so you should add it to nativeBuildInputs yourself. - - - - - - Directories in the Nix store - - - - These are simply copied to the current directory. The hash part of the file name is stripped, e.g. /nix/store/1wydxgby13cz...-my-sources would be copied to my-sources. - - - - - Additional file types can be supported by setting the unpackCmd variable (see below). - - - - - - Variables controlling the unpack phase - - - srcs / src - - - - The list of source files or directories to be unpacked or copied. One of these must be set. - - - - - - sourceRoot - - - - After running unpackPhase, the generic builder changes the current directory to the directory created by unpacking the sources. If there are multiple source directories, you should set sourceRoot to the name of the intended directory. - - - - - - setSourceRoot - - - - Alternatively to setting sourceRoot, you can set setSourceRoot to a shell command to be evaluated by the unpack phase after the sources have been unpacked. This command must set sourceRoot. - - - - - - preUnpack - - - - Hook executed at the start of the unpack phase. - - - - - - postUnpack - - - - Hook executed at the end of the unpack phase. - - - - - - dontUnpack - - - - Set to true to skip the unpack phase. - - - - - - dontMakeSourcesWritable - - - - If set to 1, the unpacked sources are not made writable. By default, they are made writable to prevent problems with read-only sources. For example, copied store directories would be read-only without this. - - - - - - unpackCmd - - - - The unpack phase evaluates the string $unpackCmd for any unrecognised file. The path to the current source file is contained in the curSrc variable. - - - - -
- -
- The patch phase - - - The patch phase applies the list of patches defined in the patches variable. - - - - Variables controlling the patch phase - - - dontPatch - - - - Set to true to skip the patch phase. - - - - - - patches - - - - The list of patches. They must be in the format accepted by the patch command, and may optionally be compressed using gzip (.gz), bzip2 (.bz2) or xz (.xz). - - - - - - patchFlags - - - - Flags to be passed to patch. If not set, the argument is used, which causes the leading directory component to be stripped from the file names in each patch. - - - - - - prePatch - - - - Hook executed at the start of the patch phase. - - - - - - postPatch - - - - Hook executed at the end of the patch phase. - - - - -
- -
- The configure phase - - - The configure phase prepares the source tree for building. The default configurePhase runs ./configure (typically an Autoconf-generated script) if it exists. - - - - Variables controlling the configure phase - - - configureScript - - - - The name of the configure script. It defaults to ./configure if it exists; otherwise, the configure phase is skipped. This can actually be a command (like perl ./Configure.pl). - - - - - - configureFlags - - - - A list of strings passed as additional arguments to the configure script. - - - - - - dontConfigure - - - - Set to true to skip the configure phase. - - - - - - configureFlagsArray - - - - A shell array containing additional arguments passed to the configure script. You must use this instead of configureFlags if the arguments contain spaces. - - - - - - dontAddPrefix - - - - By default, the flag --prefix=$prefix is added to the configure flags. If this is undesirable, set this variable to true. - - - - - - prefix - - - - The prefix under which the package must be installed, passed via the option to the configure script. It defaults to . - - - - - - prefixKey - - - - The key to use when specifying the prefix. By default, this is set to as that is used by the majority of packages. - - - - - - dontAddDisableDepTrack - - - - By default, the flag --disable-dependency-tracking is added to the configure flags to speed up Automake-based builds. If this is undesirable, set this variable to true. - - - - - - dontFixLibtool - - - - By default, the configure phase applies some special hackery to all files called ltmain.sh before running the configure script in order to improve the purity of Libtool-based packages - - - It clears the sys_lib_*search_path variables in the Libtool script to prevent Libtool from using libraries in /usr/lib and such. - - - . If this is undesirable, set this variable to true. - - - - - - dontDisableStatic - - - - By default, when the configure script has , the option is added to the configure flags. - - - If this is undesirable, set this variable to true. - - - - - - configurePlatforms - - - - By default, when cross compiling, the configure script has and passed. Packages can instead pass [ "build" "host" "target" ] or a subset to control exactly which platform flags are passed. Compilers and other tools can use this to also pass the target platform. - - - Eventually these will be passed building natively as well, to improve determinism: build-time guessing, as is done today, is a risk of impurity. - - - - - - - - preConfigure - - - - Hook executed at the start of the configure phase. - - - - - - postConfigure - - - - Hook executed at the end of the configure phase. - - - - -
- -
- The build phase - - - The build phase is responsible for actually building the package (e.g. compiling it). The default buildPhase simply calls make if a file named Makefile, makefile or GNUmakefile exists in the current directory (or the makefile is explicitly set); otherwise it does nothing. - - - - Variables controlling the build phase - - - dontBuild - - - - Set to true to skip the build phase. - - - - - - makefile - - - - The file name of the Makefile. - - - - - - makeFlags - - - - A list of strings passed as additional flags to make. These flags are also used by the default install and check phase. For setting make flags specific to the build phase, use buildFlags (see below). - -makeFlags = [ "PREFIX=$(out)" ]; - - - - The flags are quoted in bash, but environment variables can be specified by using the make syntax. - - - - - - - - makeFlagsArray - - - - A shell array containing additional arguments passed to make. You must use this instead of makeFlags if the arguments contain spaces, e.g. - -preBuild = '' - makeFlagsArray+=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") -''; - - Note that shell arrays cannot be passed through environment variables, so you cannot set makeFlagsArray in a derivation attribute (because those are passed through environment variables): you have to define them in shell code. - - - - - - buildFlags / buildFlagsArray - - - - A list of strings passed as additional flags to make. Like makeFlags and makeFlagsArray, but only used by the build phase. - - - - - - preBuild - - - - Hook executed at the start of the build phase. - - - - - - postBuild - - - - Hook executed at the end of the build phase. - - - - - - - You can set flags for make through the makeFlags variable. - - - - Before and after running make, the hooks preBuild and postBuild are called, respectively. - -
- -
- The check phase - - - The check phase checks whether the package was built correctly by running its test suite. The default checkPhase calls make check, but only if the doCheck variable is enabled. - - - - Variables controlling the check phase - - - doCheck - - - - Controls whether the check phase is executed. By default it is skipped, but if doCheck is set to true, the check phase is usually executed. Thus you should set -doCheck = true; - in the derivation to enable checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how doCheck is set, as the newly-built program won't run on the platform used to build it. - - - - - - makeFlags / makeFlagsArray / makefile - - - - See the build phase for details. - - - - - - checkTarget - - - - The make target that runs the tests. Defaults to check. - - - - - - checkFlags / checkFlagsArray - - - - A list of strings passed as additional flags to make. Like makeFlags and makeFlagsArray, but only used by the check phase. - - - - - - checkInputs - - - - A list of dependencies used by the phase. This gets included in nativeBuildInputs when doCheck is set. - - - - - - preCheck - - - - Hook executed at the start of the check phase. - - - - - - postCheck - - - - Hook executed at the end of the check phase. - - - - -
- -
- The install phase - - - The install phase is responsible for installing the package in the Nix store under out. The default installPhase creates the directory $out and calls make install. - - - - Variables controlling the install phase - - - dontInstall - - - - Set to true to skip the install phase. - - - - - - makeFlags / makeFlagsArray / makefile - - - - See the build phase for details. - - - - - - installTargets - - - - The make targets that perform the installation. Defaults to install. Example: - -installTargets = "install-bin install-doc"; - - - - - - installFlags / installFlagsArray - - - - A list of strings passed as additional flags to make. Like makeFlags and makeFlagsArray, but only used by the install phase. - - - - - - preInstall - - - - Hook executed at the start of the install phase. - - - - - - postInstall - - - - Hook executed at the end of the install phase. - - - - -
- -
- The fixup phase - - - The fixup phase performs some (Nix-specific) post-processing actions on the files installed under $out by the install phase. The default fixupPhase does the following: - - - - It moves the man/, doc/ and info/ subdirectories of $out to share/. - - - - - It strips libraries and executables of debug information. - - - - - On Linux, it applies the patchelf command to ELF executables and libraries to remove unused directories from the RPATH in order to prevent unnecessary runtime dependencies. - - - - - It rewrites the interpreter paths of shell scripts to paths found in PATH. E.g., /usr/bin/perl will be rewritten to /nix/store/some-perl/bin/perl found in PATH. - - - - - - - Variables controlling the fixup phase - - - dontFixup - - - - Set to true to skip the fixup phase. - - - - - - dontStrip - - - - If set, libraries and executables are not stripped. By default, they are. - - - - - - dontStripHost - - - - Like dontStrip, but only affects the strip command targetting the package's host platform. Useful when supporting cross compilation, but otherwise feel free to ignore. - - - - - - dontStripTarget - - - - Like dontStrip, but only affects the strip command targetting the packages' target platform. Useful when supporting cross compilation, but otherwise feel free to ignore. - - - - - - dontMoveSbin - - - - If set, files in $out/sbin are not moved to $out/bin. By default, they are. - - - - - - stripAllList - - - - List of directories to search for libraries and executables from which all symbols should be stripped. By default, it’s empty. Stripping all symbols is risky, since it may remove not just debug symbols but also ELF information necessary for normal execution. - - - - - - stripAllFlags - - - - Flags passed to the strip command applied to the files in the directories listed in stripAllList. Defaults to (i.e. ). - - - - - - stripDebugList - - - - List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to lib lib32 lib64 libexec bin sbin. - - - - - - stripDebugFlags - - - - Flags passed to the strip command applied to the files in the directories listed in stripDebugList. Defaults to (i.e. ). - - - - - - dontPatchELF - - - - If set, the patchelf command is not used to remove unnecessary RPATH entries. Only applies to Linux. - - - - - - dontPatchShebangs - - - - If set, scripts starting with #! do not have their interpreter paths rewritten to paths in the Nix store. - - - - - - dontPruneLibtoolFiles - - - - If set, libtool .la files associated with shared libraries won't have their dependency_libs field cleared. - - - - - - forceShare - - - - The list of directories that must be moved from $out to $out/share. Defaults to man doc info. - - - - - - setupHook - - - - A package can export a setup hook by setting this variable. The setup hook, if defined, is copied to $out/nix-support/setup-hook. Environment variables are then substituted in it using substituteAll. - - - - - - preFixup - - - - Hook executed at the start of the fixup phase. - - - - - - postFixup - - - - Hook executed at the end of the fixup phase. - - - - - - separateDebugInfo - - - - If set to true, the standard environment will enable debug information in C/C++ builds. After installation, the debug information will be separated from the executables and stored in the output named debug. (This output is enabled automatically; you don’t need to set the outputs attribute explicitly.) To be precise, the debug information is stored in debug/lib/debug/.build-id/XX/YYYY…, where XXYYYY… is the build ID of the binary — a SHA-1 hash of the contents of the binary. Debuggers like GDB use the build ID to look up the separated debug information. - - - For example, with GDB, you can add - -set debug-file-directory ~/.nix-profile/lib/debug - - to ~/.gdbinit. GDB will then be able to find debug information installed via nix-env -i. - - - - -
- -
- The installCheck phase - - - The installCheck phase checks whether the package was installed correctly by running its test suite against the installed directories. The default installCheck calls make installcheck. - - - - Variables controlling the installCheck phase - - - doInstallCheck - - - - Controls whether the installCheck phase is executed. By default it is skipped, but if doInstallCheck is set to true, the installCheck phase is usually executed. Thus you should set -doInstallCheck = true; - in the derivation to enable install checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how doInstallCheck is set, as the newly-built program won't run on the platform used to build it. - - - - - - installCheckTarget - - - - The make target that runs the install tests. Defaults to installcheck. - - - - - - installCheckFlags / installCheckFlagsArray - - - - A list of strings passed as additional flags to make. Like makeFlags and makeFlagsArray, but only used by the installCheck phase. - - - - - - installCheckInputs - - - - A list of dependencies used by the phase. This gets included in nativeBuildInputs when doInstallCheck is set. - - - - - - preInstallCheck - - - - Hook executed at the start of the installCheck phase. - - - - - - postInstallCheck - - - - Hook executed at the end of the installCheck phase. - - - - -
- -
- The distribution phase - - - The distribution phase is intended to produce a source distribution of the package. The default distPhase first calls make dist, then it copies the resulting source tarballs to $out/tarballs/. This phase is only executed if the attribute doDist is set. - - - - Variables controlling the distribution phase - - - distTarget - - - - The make target that produces the distribution. Defaults to dist. - - - - - - distFlags / distFlagsArray - - - - Additional flags passed to make. - - - - - - tarballs - - - - The names of the source distribution files to be copied to $out/tarballs/. It can contain shell wildcards. The default is *.tar.gz. - - - - - - dontCopyDist - - - - If set, no files are copied to $out/tarballs/. - - - - - - preDist - - - - Hook executed at the start of the distribution phase. - - - - - - postDist - - - - Hook executed at the end of the distribution phase. - - - - -
-
-
- Shell functions - - - The standard environment provides a number of useful functions. - - - - - - makeWrapper executable wrapperfile args - - - - Constructs a wrapper for a program with various possible arguments. For example: - -# adds `FOOBAR=baz` to `$out/bin/foo`’s environment -makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz - -# prefixes the binary paths of `hello` and `git` -# Be advised that paths often should be patched in directly -# (via string replacements or in `configurePhase`). -makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello git ]} - - There’s many more kinds of arguments, they are documented in nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh. - - - wrapProgram is a convenience function you probably want to use most of the time. - - - - - - substitute infile outfile subs - - - - Performs string substitution on the contents of infile, writing the result to outfile. The substitutions in subs are of the following form: - - - - s1 s2 - - - - Replace every occurrence of the string s1 by s2. - - - - - - varName - - - - Replace every occurrence of @varName@ by the contents of the environment variable varName. This is useful for generating files from templates, using @...@ in the template as placeholders. - - - - - - varName s - - - - Replace every occurrence of @varName@ by the string s. - - - - - - - Example: - -substitute ./foo.in ./foo.out \ - --replace /usr/bin/bar $bar/bin/bar \ - --replace "a string containing spaces" "some other text" \ - --subst-var someVar - - - - - - - substituteInPlace file subs - - - - Like substitute, but performs the substitutions in place on the file file. - - - - - - substituteAll infile outfile - - - - Replaces every occurrence of @varName@, where varName is any environment variable, in infile, writing the result to outfile. For instance, if infile has the contents - -#! @bash@/bin/sh -PATH=@coreutils@/bin -echo @foo@ - - and the environment contains bash=/nix/store/bmwp0q28cf21...-bash-3.2-p39 and coreutils=/nix/store/68afga4khv0w...-coreutils-6.12, but does not contain the variable foo, then the output will be - -#! /nix/store/bmwp0q28cf21...-bash-3.2-p39/bin/sh -PATH=/nix/store/68afga4khv0w...-coreutils-6.12/bin -echo @foo@ - - That is, no substitution is performed for undefined variables. - - - Environment variables that start with an uppercase letter or an underscore are filtered out, to prevent global variables (like HOME) or private variables (like __ETC_PROFILE_DONE) from accidentally getting substituted. The variables also have to be valid bash “names”, as defined in the bash manpage (alphanumeric or _, must not start with a number). - - - - - - substituteAllInPlace file - - - - Like substituteAll, but performs the substitutions in place on the file file. - - - - - - stripHash path - - - - Strips the directory and hash part of a store path, outputting the name part to stdout. For example: - -# prints coreutils-8.24 -stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" - - If you wish to store the result in another variable, then the following idiom may be useful: - -name="/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" -someVar=$(stripHash $name) - - - - - - - wrapProgram executable makeWrapperArgs - - - - Convenience function for makeWrapper that automatically creates a sane wrapper file. It takes all the same arguments as makeWrapper, except for --argv0. - - - It cannot be applied multiple times, since it will overwrite the wrapper file. - - - - -
-
- Package setup hooks - - - Nix itself considers a build-time dependency as merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup. In most cases, that is fine, and the downstream derivation can deal with its own dependencies. But for a few common tasks, that would result in almost every package doing the same sort of setup work—depending not on the package itself, but entirely on which dependencies were used. - - - - In order to alleviate this burden, the setup hook mechanism was written, where any package can include a shell script that [by convention rather than enforcement by Nix], any downstream reverse-dependency will source as part of its build process. That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. No boilerplate mirroring the list of dependencies is needed. - - - - The setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. The combination of its power and implicit use may be expedient, but isn't without costs. Nix itself is unchanged, but the spirit of added dependencies being effect-free is violated even if the letter isn't. For example, if a derivation path is mentioned more than once, Nix itself doesn't care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so. - - - - The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of envBuildBuildHooks, envBuildHostHooks, envBuildTargetHooks, envHostHostHooks, envHostTargetHooks, or envTargetTargetHooks. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis). - - - - Packages adding a hook should not hard code a specific hook, but rather choose a variable relative to how they are included. Returning to the C compiler wrapper example, if the wrapper itself is an n dependency, then it only wants to accumulate flags from n + 1 dependencies, as only those ones match the compiler's target platform. The hostOffset variable is defined with the current dependency's host offset targetOffset with its target offset, before its setup hook is sourced. Additionally, since most environment hooks don't care about the target platform, that means the setup hook can append to the right bash array by doing something like - -addEnvHooks "$hostOffset" myBashFunction - - - - - The existence of setups hooks has long been documented and packages inside Nixpkgs are free to use this mechanism. Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. Because of the existing issues with this system, there's little benefit from mandating it be stable for any period of time. - - - - First, let’s cover some setup hooks that are part of Nixpkgs default stdenv. This means that they are run for every package built using stdenv.mkDerivation. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa. - - - - move-docs.sh - - - - This setup hook moves any installed documentation to the /share subdirectory directory. This includes the man, doc and info directories. This is needed for legacy programs that do not know how to use the share subdirectory. - - - - - - compress-man-pages.sh - - - - This setup hook compresses any man pages that have been installed. The compression is done using the gzip program. This helps to reduce the installed size of packages. - - - - - - strip.sh - - - - This runs the strip command on installed binaries and libraries. This removes unnecessary information like debug symbols when they are not needed. This also helps to reduce the installed size of packages. - - - - - - patch-shebangs.sh - - - - This setup hook patches installed scripts to use the full path to the shebang interpreter. A shebang interpreter is the first commented line of a script telling the operating system which program will run the script (e.g #!/bin/bash). In Nix, we want an exact path to that interpreter to be used. This often replaces /bin/sh with a path in the Nix store. - - - - - - audit-tmpdir.sh - - - - This verifies that no references are left from the install binaries to the directory used to build those binaries. This ensures that the binaries do not need things outside the Nix store. This is currently supported in Linux only. - - - - - - multiple-outputs.sh - - - - This setup hook adds configure flags that tell packages to install files into any one of the proper outputs listed in outputs. This behavior can be turned off by setting setOutputFlags to false in the derivation environment. See for more information. - - - - - - move-sbin.sh - - - - This setup hook moves any binaries installed in the sbin subdirectory into bin. In addition, a link is provided from sbin to bin for compatibility. - - - - - - move-lib64.sh - - - - This setup hook moves any libraries installed in the lib64 subdirectory into lib. In addition, a link is provided from lib64 to lib for compatibility. - - - - - - move-systemd-user-units.sh - - - - This setup hook moves any systemd user units installed in the lib subdirectory into share. In addition, a link is provided from share to lib for compatibility. This is needed for systemd to find user services when installed into the user profile. - - - - - - set-source-date-epoch-to-latest.sh - - - - This sets SOURCE_DATE_EPOCH to the modification time of the most recent file. - - - - - - Bintools Wrapper - - - - The Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin. [The "Bintools" name is supposed to be a compromise between "Binutils" and "cctools" not denoting any specific implementation.] Specifically, the underlying bintools package, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn (at run time) depends on the Bintools Wrapper. - - - The Bintools Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out. For example, it shouldn't care about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux). Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand. It is currently accomplished by collecting directories of host-platform dependencies (i.e. buildInputs and nativeBuildInputs) in environment variables. The Bintools Wrapper's setup hook causes any lib and lib64 subdirectories to be added to NIX_LDFLAGS. Since the CC Wrapper and the Bintools Wrapper use the same strategy, most of the Bintools Wrapper code is sparsely commented and refers to the CC Wrapper. But the CC Wrapper's code, by contrast, has quite lengthy comments. The Bintools Wrapper merely cites those, rather than repeating them, to avoid falling out of sync. - - - A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables fulfill which purpose. They are defined to just be the base name of the tools, under the assumption that the Bintools Wrapper's binaries will be on the path. Firstly, this helps poorly-written packages, e.g. ones that look for just gcc when CC isn't defined yet clang is to be used. Secondly, this helps packages not get confused when cross-compiling, in which case multiple Bintools Wrappers may simultaneously be in use. - - - Each wrapper targets a single platform, so if binaries for multiple platforms are needed, the underlying binaries must be wrapped multiple times. As this is a property of the wrapper itself, the multiple wrappings are needed whether or not the same underlying binaries can target multiple platforms. - - - BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for additional Bintools Wrappers, properly disambiguating them. - - - A problem with this final task is that the Bintools Wrapper is honest and defines LD as ld. Most packages, however, firstly use the C compiler for linking, secondly use LD anyways, defining it as the C compiler, and thirdly, only so define LD when it is undefined as a fallback. This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won't override yet doesn't want to use. The workaround is to define, just for the problematic package, LD as the C compiler. A good way to do this would be preConfigure = "LD=$CC". - - - - - - CC Wrapper - - - - The CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the CC Wrapper. Packages typically depend on the CC Wrapper, which in turn (at run-time) depends on the Bintools Wrapper. - - - Dependency finding is undoubtedly the main task of the CC Wrapper. This works just like the Bintools Wrapper, except that any include subdirectory of any relevant dependency is added to NIX_CFLAGS_COMPILE. The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished. - - - Similarly, the CC Wrapper follows the Bintools Wrapper in defining standard environment variables with the names of the tools it wraps, for the same reasons described above. Importantly, while it includes a cc symlink to the c compiler for portability, the CC will be defined using the compiler's "real name" (i.e. gcc or clang). This helps lousy build systems that inspect on the name of the compiler rather than run it. - - - - - - - - Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list. The mechanism is only to be used as a last resort, so it might cover most uses. - - - - Perl - - - - Adds the lib/site_perl subdirectory of each build input to the PERL5LIB environment variable. For instance, if buildInputs contains Perl, then the lib/site_perl subdirectory of each input is added to the PERL5LIB environment variable. - - - - - - Python - - - - Adds the lib/${python.libPrefix}/site-packages subdirectory of each build input to the PYTHONPATH environment variable. - - - - - - pkg-config - - - - Adds the lib/pkgconfig and share/pkgconfig subdirectories of each build input to the PKG_CONFIG_PATH environment variable. - - - - - - Automake - - - - Adds the share/aclocal subdirectory of each build input to the ACLOCAL_PATH environment variable. - - - - - - Autoconf - - - - The autoreconfHook derivation adds autoreconfPhase, which runs autoreconf, libtoolize and automake, essentially preparing the configure script in autotools-based builds. Most autotools-based packages come with the configure script pre-generated, but this hook is necessary for a few packages and when you need to patch the package’s configure scripts. - - - - - - libxml2 - - - - Adds every file named catalog.xml found under the xml/dtd and xml/xsl subdirectories of each build input to the XML_CATALOG_FILES environment variable. - - - - - - teTeX / TeX Live - - - - Adds the share/texmf-nix subdirectory of each build input to the TEXINPUTS environment variable. - - - - - - Qt 4 - - - - Sets the QTDIR environment variable to Qt’s path. - - - - - - gdk-pixbuf - - - - Exports GDK_PIXBUF_MODULE_FILE environment variable to the builder. Add librsvg package to buildInputs to get svg support. See also the setup hook description in GNOME platform docs. - - - - - - GHC - - - - Creates a temporary package database and registers every Haskell build input in it (TODO: how?). - - - - - - GNOME platform - - - - Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in . - - - - - - autoPatchelfHook - - - - This is a special setup hook which helps in packaging proprietary software in that it automatically tries to find missing shared library dependencies of ELF files based on the given buildInputs and nativeBuildInputs. - - - You can also specify a runtimeDependencies variable which lists dependencies to be unconditionally added to rpath of all executables. This is useful for programs that use - dlopen - 3 to load libraries at runtime. - - - In certain situations you may want to run the main command (autoPatchelf) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the dontAutoPatchelf environment variable to a non-empty value. - - - By default autoPatchelf will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the autoPatchelfIgnoreMissingDeps environment variable to a non-empty value. - - - The autoPatchelf command also recognizes a --no-recurse command line flag, which prevents it from recursing into subdirectories. - - - - - - breakpointHook - - - - This hook will make a build pause instead of stopping when a failure happens. It prevents nix from cleaning up the build environment immediately and allows the user to attach to a build environment using the cntr command. Upon build error it will print instructions on how to use cntr, which can be used to enter the environment for debugging. Installing cntr and running the command will provide shell access to the build sandbox of failed build. At /var/lib/cntr the sandboxed filesystem is mounted. All commands and files of the system are still accessible within the shell. To execute commands from the sandbox use the cntr exec subcommand. cntr is only supported on Linux-based platforms. To use it first add cntr to your environment.systemPackages on NixOS or alternatively to the root user on non-NixOS systems. Then in the package that is supposed to be inspected, add breakpointHook to nativeBuildInputs. - -nativeBuildInputs = [ breakpointHook ]; - - When a build failure happens there will be an instruction printed that shows how to attach with cntr to the build sandbox. - - - Caution with remote builds - - This won't work with remote builds as the build environment is on a different machine and can't be accessed by cntr. Remote builds can be turned off by setting --option builders '' for nix-build or --builders '' for nix build. - - - - - - - installShellFiles - - - - This hook helps with installing manpages and shell completion files. It exposes 2 shell functions installManPage and installShellCompletion that can be used from your postInstall hook. - - - The installManPage function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with .gz suffix). This function will place them into the correct directory. - - - The installShellCompletion function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of --bash, --fish, or --zsh. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag --name NAME before the path. If this flag is not provided, zsh completions will be renamed automatically such that foobar.zsh becomes _foobar. A root name may be provided for all paths using the flag --cmd NAME; this synthesizes the appropriate name depending on the shell (e.g. --cmd foo will synthesize the name foo.bash for bash and _foo for zsh). The path may also be a fifo or named fd (such as produced by <(cmd)), in which case the shell and name must be provided. - -nativeBuildInputs = [ installShellFiles ]; -postInstall = '' - installManPage doc/foobar.1 doc/barfoo.3 - # explicit behavior - installShellCompletion --bash --name foobar.bash share/completions.bash - installShellCompletion --fish --name foobar.fish share/completions.fish - installShellCompletion --zsh --name _foobar share/completions.zsh - # implicit behavior - installShellCompletion share/completions/foobar.{bash,fish,zsh} - # using named fd - installShellCompletion --cmd foobar \ - --bash <($out/bin/foobar --bash-completion) \ - --fish <($out/bin/foobar --fish-completion) \ - --zsh <($out/bin/foobar --zsh-completion) -''; - - - - - - - libiconv, libintl - - - - A few libraries automatically add to NIX_LDFLAGS their library, making their symbols automatically available to the linker. This includes libiconv and libintl (gettext). This is done to provide compatibility between GNU Linux, where libiconv and libintl are bundled in, and other systems where that might not be the case. Sometimes, this behavior is not desired. To disable this behavior, set dontAddExtraLibs. - - - - - - validatePkgConfig - - - - The validatePkgConfig hook validates all pkg-config (.pc) files in a package. This helps catching some common errors in pkg-config files, such as undefined variables. - - - - - - cmake - - - - Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to CMAKE_PREFIX_PATH so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting configurePhase to a custom value, or by setting dontUseCmakeConfigure. cmakeFlags controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator. - - - - - - xcbuildHook - - - - Overrides the build and install phases to run the “xcbuild” command. This hook is needed when a project only comes with build files for the XCode build system. You can disable this behavior by setting buildPhase and configurePhase to a custom value. xcbuildFlags controls flags passed only to xcbuild. - - - - - - Meson - - - - Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, enableParallelBuilding is enabled as Meson supports parallel building almost everywhere. - - - Variables controlling Meson - - - mesonFlags - - - - Controls the flags passed to meson. - - - - - - mesonBuildType - - - - Which --buildtype to pass to Meson. We default to plain. - - - - - - mesonAutoFeatures - - - - What value to set -Dauto_features= to. We default to enabled. - - - - - - mesonWrapMode - - - - What value to set -Dwrap_mode= to. We default to nodownload as we disallow network access. - - - - - - dontUseMesonConfigure - - - - Disables using Meson's configurePhase. - - - - - - - - - ninja - - - - Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the dontUseNinjaBuild, dontUseNinjaInstall, and dontUseNinjaCheck, respectively. Parallel building is enabled by default in Ninja. - - - - - - unzip - - - - This setup hook will allow you to unzip .zip files specified in $src. There are many similar packages like unrar, undmg, etc. - - - - - - wafHook - - - - Overrides the configure, build, and install phases. This will run the "waf" script used by many projects. If wafPath (default ./waf) doesn’t exist, it will copy the version of waf available in Nixpkgs. wafFlags can be used to pass flags to the waf script. - - - - - - scons - - - - Overrides the build, install, and check phases. This uses the scons build system as a replacement for make. scons does not provide a configure phase, so everything is managed at build and install time. - - - - - -
-
- Purity in Nixpkgs - - - [measures taken to prevent dependencies on packages outside the store, and what you can do to prevent them] - - - - GCC doesn't search in locations such as /usr/include. In fact, attempts to add such directories through the flag are filtered out. Likewise, the linker (from GNU binutils) doesn't search in standard locations such as /usr/lib. Programs built on Linux are linked against a GNU C Library that likewise doesn't search in the default system locations. - -
-
- Hardening in Nixpkgs - - - There are flags available to harden packages at compile or link-time. These can be toggled using the stdenv.mkDerivation parameters hardeningDisable and hardeningEnable. - - - - Both parameters take a list of flags as strings. The special "all" flag can be passed to hardeningDisable to turn off all hardening. These flags can also be used as environment variables for testing or development purposes. - - - - The following flags are enabled by default and might require disabling with hardeningDisable if the program to package is incompatible. - - - - - - format - - - - Adds the compiler options. At present, this warns about calls to printf and scanf functions where the format string is not a string literal and there are no format arguments, as in printf(foo);. This may be a security hole if the format string came from untrusted input and contains %n. - - - This needs to be turned off or fixed for errors similar to: - - -/tmp/nix-build-zynaddsubfx-2.5.2.drv-0/zynaddsubfx-2.5.2/src/UI/guimain.cpp:571:28: error: format not a string literal and no format arguments [-Werror=format-security] - printf(help_message); - ^ -cc1plus: some warnings being treated as errors - - - - - - stackprotector - - - - Adds the compiler options. This adds safety checks against stack overwrites rendering many potential code injection attacks into aborting situations. In the best case this turns code injection vulnerabilities into denial of service or into non-issues (depending on the application). - - - This needs to be turned off or fixed for errors similar to: - - -bin/blib.a(bios_console.o): In function `bios_handle_cup': -/tmp/nix-build-ipxe-20141124-5cbdc41.drv-0/ipxe-5cbdc41/src/arch/i386/firmware/pcbios/bios_console.c:86: undefined reference to `__stack_chk_fail' - - - - - - fortify - - - - Adds the compiler options. During code generation the compiler knows a great deal of information about buffer sizes (where possible), and attempts to replace insecure unlimited length buffer function calls with length-limited ones. This is especially useful for old, crufty code. Additionally, format strings in writable memory that contain '%n' are blocked. If an application depends on such a format string, it will need to be worked around. - - - Additionally, some warnings are enabled which might trigger build failures if compiler warnings are treated as errors in the package build. In this case, set to . - - - This needs to be turned off or fixed for errors similar to: - - -malloc.c:404:15: error: return type is an incomplete type -malloc.c:410:19: error: storage size of 'ms' isn't known - - -strdup.h:22:1: error: expected identifier or '(' before '__extension__' - - -strsep.c:65:23: error: register name not specified for 'delim' - - -installwatch.c:3751:5: error: conflicting types for '__open_2' - - -fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments - - - - - - pic - - - - Adds the compiler options. This options adds support for position independent code in shared libraries and thus making ASLR possible. - - - Most notably, the Linux kernel, kernel modules and other code not running in an operating system environment like boot loaders won't build with PIC enabled. The compiler will is most cases complain that PIC is not supported for a specific build. - - - This needs to be turned off or fixed for assembler errors similar to: - - -ccbLfRgg.s: Assembler messages: -ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF' - - - - - - strictoverflow - - - - Signed integer overflow is undefined behaviour according to the C standard. If it happens, it is an error in the program as it should check for overflow before it can happen, not afterwards. GCC provides built-in functions to perform arithmetic with overflow checking, which are correct and faster than any custom implementation. As a workaround, the option makes gcc behave as if signed integer overflows were defined. - - - This flag should not trigger any build or runtime errors. - - - - - - relro - - - - Adds the linker option. During program load, several ELF memory sections need to be written to by the linker, but can be turned read-only before turning over control to the program. This prevents some GOT (and .dtors) overwrite attacks, but at least the part of the GOT used by the dynamic linker (.got.plt) is still vulnerable. - - - This flag can break dynamic shared object loading. For instance, the module systems of Xorg and OpenCV are incompatible with this flag. In almost all cases the bindnow flag must also be disabled and incompatible programs typically fail with similar errors at runtime. - - - - - - bindnow - - - - Adds the linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to relro). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn't be an issue for daemons. - - - This flag can break dynamic shared object loading. For instance, the module systems of Xorg and PHP are incompatible with this flag. Programs incompatible with this flag often fail at runtime due to missing symbols, like: - - -intel_drv.so: undefined symbol: vgaHWFreeHWRec - - - - - - - The following flags are disabled by default and should be enabled with hardeningEnable for packages that take untrusted input like network services. - - - - - - pie - - - - Adds the compiler and linker options. Position Independent Executables are needed to take advantage of Address Space Layout Randomization, supported by modern kernel versions. While ASLR can already be enforced for data areas in the stack and heap (brk and mmap), the code areas must be compiled as position-independent. Shared libraries already do this with the pic flag, so they gain ASLR automatically, but binary .text regions need to be build with pie to gain ASLR. When this happens, ROP attacks are much harder since there are no static locations to bounce off of during a memory corruption attack. - - - - - - - For more in-depth information on these hardening flags and hardening in general, refer to the Debian Wiki, Ubuntu Wiki, Gentoo Wiki, and the Arch Wiki. - -
- diff --git a/third_party/nixpkgs/doc/using/overlays.xml b/third_party/nixpkgs/doc/using/overlays.xml index 1def8b0695..8f12aad2ad 100644 --- a/third_party/nixpkgs/doc/using/overlays.xml +++ b/third_party/nixpkgs/doc/using/overlays.xml @@ -230,7 +230,7 @@ self: super: - For BLAS/LAPACK switching to work correctly, all packages must depend on blas or lapack. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions versions of BLAS/LAPACK currently in the wild, LP64 (integer size = 32 bits) and ILP64 (integer size = 64 bits). Some software needs special flags or patches to work with ILP64. You can check if ILP64 is used in Nixpkgs with blas.isILP64 and lapack.isILP64. Some software does NOT work with ILP64, and derivations need to specify an assertion to prevent this. You can prevent ILP64 from being used with the following: + For BLAS/LAPACK switching to work correctly, all packages must depend on blas or lapack. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, LP64 (integer size = 32 bits) and ILP64 (integer size = 64 bits). Some software needs special flags or patches to work with ILP64. You can check if ILP64 is used in Nixpkgs with blas.isILP64 and lapack.isILP64. Some software does NOT work with ILP64, and derivations need to specify an assertion to prevent this. You can prevent ILP64 from being used with the following: diff --git a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py new file mode 100644 index 0000000000..79c79c0f09 --- /dev/null +++ b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py @@ -0,0 +1,526 @@ +# Used by pkgs/misc/vim-plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py + +# format: +# $ nix run nixpkgs.python3Packages.black -c black update.py +# type-check: +# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py +# linted: +# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py + +import argparse +import functools +import http +import json +import os +import subprocess +import sys +import time +import traceback +import urllib.error +import urllib.parse +import urllib.request +import xml.etree.ElementTree as ET +from datetime import datetime +from functools import wraps +from multiprocessing.dummy import Pool +from pathlib import Path +from typing import Dict, List, Optional, Tuple, Union, Any, Callable +from urllib.parse import urljoin, urlparse +from tempfile import NamedTemporaryFile + +import git + +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" # " + + +def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): + """Retry calling the decorated function using an exponential backoff. + http://www.saltycrane.com/blog/2009/11/trying-out-retry-decorator-python/ + original from: http://wiki.python.org/moin/PythonDecoratorLibrary#Retry + (BSD licensed) + :param ExceptionToCheck: the exception on which to retry + :param tries: number of times to try (not retry) before giving up + :param delay: initial delay between retries in seconds + :param backoff: backoff multiplier e.g. value of 2 will double the delay + each retry + """ + + def deco_retry(f: Callable) -> Callable: + @wraps(f) + def f_retry(*args: Any, **kwargs: Any) -> Any: + mtries, mdelay = tries, delay + while mtries > 1: + try: + return f(*args, **kwargs) + except ExceptionToCheck as e: + print(f"{str(e)}, Retrying in {mdelay} seconds...") + time.sleep(mdelay) + mtries -= 1 + mdelay *= backoff + return f(*args, **kwargs) + + return f_retry # true decorator + + return deco_retry + + +def make_request(url: str) -> urllib.request.Request: + token = os.getenv("GITHUB_API_TOKEN") + headers = {} + if token is not None: + headers["Authorization"] = f"token {token}" + return urllib.request.Request(url, headers=headers) + + +class Repo: + def __init__( + self, owner: str, name: str, branch: str, alias: Optional[str] + ) -> None: + self.owner = owner + self.name = name + self.branch = branch + self.alias = alias + self.redirect: Dict[str, str] = {} + + def url(self, path: str) -> str: + return urljoin(f"https://github.com/{self.owner}/{self.name}/", path) + + def __repr__(self) -> str: + return f"Repo({self.owner}, {self.name})" + + @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) + def has_submodules(self) -> bool: + try: + req = make_request(self.url(f"blob/{self.branch}/.gitmodules")) + urllib.request.urlopen(req, timeout=10).close() + except urllib.error.HTTPError as e: + if e.code == 404: + return False + else: + raise + return True + + @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) + def latest_commit(self) -> Tuple[str, datetime]: + commit_url = self.url(f"commits/{self.branch}.atom") + commit_req = make_request(commit_url) + with urllib.request.urlopen(commit_req, timeout=10) as req: + self.check_for_redirect(commit_url, req) + xml = req.read() + root = ET.fromstring(xml) + latest_entry = root.find(ATOM_ENTRY) + assert latest_entry is not None, f"No commits found in repository {self}" + commit_link = latest_entry.find(ATOM_LINK) + assert commit_link is not None, f"No link tag found feed entry {xml}" + url = urlparse(commit_link.get("href")) + updated_tag = latest_entry.find(ATOM_UPDATED) + assert ( + updated_tag is not None and updated_tag.text is not None + ), f"No updated tag found feed entry {xml}" + updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ") + return Path(str(url.path)).name, updated + + def check_for_redirect(self, url: str, req: http.client.HTTPResponse): + response_url = req.geturl() + if url != response_url: + new_owner, new_name = ( + urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2] + ) + end_line = "\n" if self.alias is None else f" as {self.alias}\n" + plugin_line = "{owner}/{name}" + end_line + + old_plugin = plugin_line.format(owner=self.owner, name=self.name) + new_plugin = plugin_line.format(owner=new_owner, name=new_name) + self.redirect[old_plugin] = new_plugin + + def prefetch_git(self, ref: str) -> str: + data = subprocess.check_output( + ["nix-prefetch-git", "--fetch-submodules", self.url(""), ref] + ) + return json.loads(data)["sha256"] + + def prefetch_github(self, ref: str) -> str: + data = subprocess.check_output( + ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")] + ) + return data.strip().decode("utf-8") + + +class Plugin: + def __init__( + self, + name: str, + commit: str, + has_submodules: bool, + sha256: str, + date: Optional[datetime] = None, + ) -> None: + self.name = name + self.commit = commit + self.has_submodules = has_submodules + self.sha256 = sha256 + self.date = date + + @property + def normalized_name(self) -> str: + return self.name.replace(".", "-") + + @property + def version(self) -> str: + assert self.date is not None + return self.date.strftime("%Y-%m-%d") + + def as_json(self) -> Dict[str, str]: + copy = self.__dict__.copy() + del copy["date"] + return copy + + +class Editor: + """The configuration of the update script.""" + + def __init__( + self, + name: str, + root: Path, + get_plugins: str, + generate_nix: Callable[[List[Tuple[str, str, Plugin]], str], None], + default_in: Optional[Path] = None, + default_out: Optional[Path] = None, + deprecated: Optional[Path] = None, + cache_file: Optional[str] = None, + ): + self.name = name + self.root = root + self.get_plugins = get_plugins + self.generate_nix = generate_nix + self.default_in = default_in or root.joinpath(f"{name}-plugin-names") + self.default_out = default_out or root.joinpath("generated.nix") + self.deprecated = deprecated or root.joinpath("deprecated.json") + self.cache_file = cache_file or f"{name}-plugin-cache.json" + + +class CleanEnvironment(object): + def __enter__(self) -> None: + self.old_environ = os.environ.copy() + local_pkgs = str(Path(__file__).parent.parent.parent) + os.environ["NIX_PATH"] = f"localpkgs={local_pkgs}" + self.empty_config = NamedTemporaryFile() + self.empty_config.write(b"{}") + self.empty_config.flush() + os.environ["NIXPKGS_CONFIG"] = self.empty_config.name + + def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None: + os.environ.update(self.old_environ) + self.empty_config.close() + + +def get_current_plugins(editor: Editor) -> List[Plugin]: + with CleanEnvironment(): + out = subprocess.check_output(["nix", "eval", "--json", editor.get_plugins]) + data = json.loads(out) + plugins = [] + for name, attr in data.items(): + p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"]) + plugins.append(p) + return plugins + + +def prefetch_plugin( + user: str, + repo_name: str, + branch: str, + alias: Optional[str], + cache: "Optional[Cache]" = None, +) -> Tuple[Plugin, Dict[str, str]]: + repo = Repo(user, repo_name, branch, alias) + commit, date = repo.latest_commit() + has_submodules = repo.has_submodules() + cached_plugin = cache[commit] if cache else None + if cached_plugin is not None: + cached_plugin.name = alias or repo_name + cached_plugin.date = date + return cached_plugin, repo.redirect + + print(f"prefetch {user}/{repo_name}") + if has_submodules: + sha256 = repo.prefetch_git(commit) + else: + sha256 = repo.prefetch_github(commit) + + return ( + Plugin(alias or repo_name, commit, has_submodules, sha256, date=date), + repo.redirect, + ) + + +def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin: + plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line)) + return plugin + + +def print_download_error(plugin: str, ex: Exception): + print(f"{plugin}: {ex}", file=sys.stderr) + ex_traceback = ex.__traceback__ + tb_lines = [ + line.rstrip("\n") + for line in traceback.format_exception(ex.__class__, ex, ex_traceback) + ] + print("\n".join(tb_lines)) + + +def check_results( + results: List[Tuple[str, str, Union[Exception, Plugin], Dict[str, str]]] +) -> Tuple[List[Tuple[str, str, Plugin]], Dict[str, str]]: + failures: List[Tuple[str, Exception]] = [] + plugins = [] + redirects: Dict[str, str] = {} + for (owner, name, result, redirect) in results: + if isinstance(result, Exception): + failures.append((name, result)) + else: + plugins.append((owner, name, result)) + redirects.update(redirect) + + print(f"{len(results) - len(failures)} plugins were checked", end="") + if len(failures) == 0: + print() + return plugins, redirects + else: + print(f", {len(failures)} plugin(s) could not be downloaded:\n") + + for (plugin, exception) in failures: + print_download_error(plugin, exception) + + sys.exit(1) + + +def parse_plugin_line(line: str) -> Tuple[str, str, str, Optional[str]]: + branch = "master" + alias = None + name, repo = line.split("/") + if " as " in repo: + repo, alias = repo.split(" as ") + alias = alias.strip() + if "@" in repo: + repo, branch = repo.split("@") + + return (name.strip(), repo.strip(), branch.strip(), alias) + + +def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, str, Optional[str]]]: + plugins = [] + with open(plugin_file) as f: + for line in f: + plugin = parse_plugin_line(line) + if not plugin[0]: + msg = f"Invalid repository {line}, must be in the format owner/repo[ as alias]" + print(msg, file=sys.stderr) + sys.exit(1) + plugins.append(plugin) + return plugins + + +def get_cache_path(cache_file_name: str) -> Optional[Path]: + xdg_cache = os.environ.get("XDG_CACHE_HOME", None) + if xdg_cache is None: + home = os.environ.get("HOME", None) + if home is None: + return None + xdg_cache = str(Path(home, ".cache")) + + return Path(xdg_cache, cache_file_name) + + +class Cache: + def __init__(self, initial_plugins: List[Plugin], cache_file_name: str) -> None: + self.cache_file = get_cache_path(cache_file_name) + + downloads = {} + for plugin in initial_plugins: + downloads[plugin.commit] = plugin + downloads.update(self.load()) + self.downloads = downloads + + def load(self) -> Dict[str, Plugin]: + if self.cache_file is None or not self.cache_file.exists(): + return {} + + downloads: Dict[str, Plugin] = {} + with open(self.cache_file) as f: + data = json.load(f) + for attr in data.values(): + p = Plugin( + attr["name"], attr["commit"], attr["has_submodules"], attr["sha256"] + ) + downloads[attr["commit"]] = p + return downloads + + def store(self) -> None: + if self.cache_file is None: + return + + os.makedirs(self.cache_file.parent, exist_ok=True) + with open(self.cache_file, "w+") as f: + data = {} + for name, attr in self.downloads.items(): + data[name] = attr.as_json() + json.dump(data, f, indent=4, sort_keys=True) + + def __getitem__(self, key: str) -> Optional[Plugin]: + return self.downloads.get(key, None) + + def __setitem__(self, key: str, value: Plugin) -> None: + self.downloads[key] = value + + +def prefetch( + args: Tuple[str, str, str, Optional[str]], cache: Cache +) -> Tuple[str, str, Union[Exception, Plugin], dict]: + assert len(args) == 4 + owner, repo, branch, alias = args + try: + plugin, redirect = prefetch_plugin(owner, repo, branch, alias, cache) + cache[plugin.commit] = plugin + return (owner, repo, plugin, redirect) + except Exception as e: + return (owner, repo, e, {}) + + +def rewrite_input( + input_file: Path, + deprecated: Path, + redirects: Dict[str, str] = None, + append: Tuple = (), +): + with open(input_file, "r") as f: + lines = f.readlines() + + lines.extend(append) + + if redirects: + lines = [redirects.get(line, line) for line in lines] + + cur_date_iso = datetime.now().strftime("%Y-%m-%d") + with open(deprecated, "r") as f: + deprecations = json.load(f) + for old, new in redirects.items(): + old_plugin = fetch_plugin_from_pluginline(old) + new_plugin = fetch_plugin_from_pluginline(new) + if old_plugin.normalized_name != new_plugin.normalized_name: + deprecations[old_plugin.normalized_name] = { + "new": new_plugin.normalized_name, + "date": cur_date_iso, + } + with open(deprecated, "w") as f: + json.dump(deprecations, f, indent=4, sort_keys=True) + + lines = sorted(lines, key=str.casefold) + + with open(input_file, "w") as f: + f.writelines(lines) + + +def parse_args(editor: Editor): + parser = argparse.ArgumentParser( + description=( + f"Updates nix derivations for {editor.name} plugins" + f"By default from {editor.default_in} to {editor.default_out}" + ) + ) + parser.add_argument( + "--add", + dest="add_plugins", + default=[], + action="append", + help=f"Plugin to add to {editor.name}Plugins from Github in the form owner/repo", + ) + parser.add_argument( + "--input-names", + "-i", + dest="input_file", + default=editor.default_in, + help="A list of plugins in the form owner/repo", + ) + parser.add_argument( + "--out", + "-o", + dest="outfile", + default=editor.default_out, + help="Filename to save generated nix code", + ) + parser.add_argument( + "--proc", + "-p", + dest="proc", + type=int, + default=30, + help="Number of concurrent processes to spawn.", + ) + return parser.parse_args() + + +def commit(repo: git.Repo, message: str, files: List[Path]) -> None: + repo.index.add([str(f.resolve()) for f in files]) + + if repo.index.diff("HEAD"): + print(f'committing to nixpkgs "{message}"') + repo.index.commit(message) + else: + print("no changes in working tree to commit") + + +def get_update(input_file: str, outfile: str, proc: int, editor: Editor): + cache: Cache = Cache(get_current_plugins(editor), editor.cache_file) + _prefetch = functools.partial(prefetch, cache=cache) + + def update() -> dict: + plugin_names = load_plugin_spec(input_file) + + try: + pool = Pool(processes=proc) + results = pool.map(_prefetch, plugin_names) + finally: + cache.store() + + plugins, redirects = check_results(results) + + editor.generate_nix(plugins, outfile) + + return redirects + + return update + + +def update_plugins(editor: Editor): + """The main entry function of this module. All input arguments are grouped in the `Editor`.""" + + args = parse_args(editor) + nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) + update = get_update(args.input_file, args.outfile, args.proc, editor) + + redirects = update() + rewrite_input(args.input_file, editor.deprecated, redirects) + commit(nixpkgs_repo, f"{editor.name}Plugins: update", [args.outfile]) + + if redirects: + update() + commit( + nixpkgs_repo, + f"{editor.name}Plugins: resolve github repository redirects", + [args.outfile, args.input_file, editor.deprecated], + ) + + for plugin_line in args.add_plugins: + rewrite_input(args.input_fil, editor.deprecated, append=(plugin_line + "\n",)) + update() + plugin = fetch_plugin_from_pluginline(plugin_line) + commit( + nixpkgs_repo, + "{editor}Plugins.{name}: init at {version}".format( + editor=editor.name, name=plugin.normalized_name, version=plugin.version + ), + [args.outfile, args.input_file], + ) 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 e052632eca..218bb3ae30 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 @@ -29,14 +29,24 @@ GNURadio 3.8 was - finnally + finally packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. Additionally, the attribute gnuradio and gnuradio3_7 now point to an externally wrapped by default derivations, that allow you to also add `extraPythonPackages` to the Python interpreter used by GNURadio. Missing environmental variables needed for operational GUI were also added - (#7547). + (#75478). + + + + + GNURadio has a + pkgs attribute set, and there's a gnuradio.callPackage + function that extends pkgs with a mkDerivation, and a + mkDerivationWith, like Qt5. Now all gnuradio.pkgs are + defined with gnuradio.callPackage and some packages that depend + on gnuradio are defined with this as well. @@ -57,6 +67,13 @@ for the motivation). + + + Kodi has been updated to version 19.0 "Matrix". See + the announcement for + further details. + + @@ -577,6 +594,37 @@ self: super: for your Kafka version. + + + The kodi package has been modified to allow concise addon management. Consider + the following configuration from previous releases of NixOS to install kodi, + including the kodiPackages.inputstream-adaptive and kodiPackages.vfs-sftp + addons: + + +environment.systemPackages = [ + pkgs.kodi +]; + +nixpkgs.config.kodi = { + enableInputStreamAdaptive = true; + enableVFSSFTP = true; +}; + + + All Kodi config flags have been removed, and as a result the above configuration + should now be written as: + + +environment.systemPackages = [ + (pkgs.kodi.withPackages (p: with p; [ + inputstream-adaptive + vfs-sftp + ])) +]; + + + diff --git a/third_party/nixpkgs/nixos/modules/misc/documentation.nix b/third_party/nixpkgs/nixos/modules/misc/documentation.nix index d81d6c6cb9..c88cc69306 100644 --- a/third_party/nixpkgs/nixos/modules/misc/documentation.nix +++ b/third_party/nixpkgs/nixos/modules/misc/documentation.nix @@ -98,7 +98,7 @@ in See "Multiple-output packages" chapter in the nixpkgs manual for more info. ''; - # which is at ../../../doc/multiple-output.xml + # which is at ../../../doc/multiple-output.chapter.md }; man.enable = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/misc/meta.nix b/third_party/nixpkgs/nixos/modules/misc/meta.nix index be3f4cbbcf..1410e33342 100644 --- a/third_party/nixpkgs/nixos/modules/misc/meta.nix +++ b/third_party/nixpkgs/nixos/modules/misc/meta.nix @@ -47,9 +47,9 @@ in doc = mkOption { type = docFile; internal = true; - example = "./meta.xml"; + example = "./meta.chapter.xml"; description = '' - Documentation prologe for the set of options of each module. This + Documentation prologue for the set of options of each module. This option should be defined at most once per module. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index f226194efd..3a1907ee20 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -638,6 +638,7 @@ ./services/networking/coredns.nix ./services/networking/corerad.nix ./services/networking/coturn.nix + ./services/networking/croc.nix ./services/networking/dante.nix ./services/networking/ddclient.nix ./services/networking/dhcpcd.nix diff --git a/third_party/nixpkgs/nixos/modules/services/games/factorio.nix b/third_party/nixpkgs/nixos/modules/services/games/factorio.nix index 73099ae336..a1aa5739d0 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/factorio.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/factorio.nix @@ -36,6 +36,7 @@ let 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)); modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods; @@ -193,6 +194,15 @@ in Autosave interval in minutes. ''; }; + nonBlockingSaving = mkOption { + type = types.bool; + default = false; + description = '' + Highly experimental feature, enable only at your own risk of losing your saves. + On UNIX systems, server will fork itself to create an autosave. + Autosaving on connected Windows clients will be disabled regardless of autosave_only_on_server option. + ''; + }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mautrix-telegram.nix b/third_party/nixpkgs/nixos/modules/services/misc/mautrix-telegram.nix index caeb4b0416..0ae5797fea 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mautrix-telegram.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mautrix-telegram.nix @@ -6,8 +6,9 @@ let dataDir = "/var/lib/mautrix-telegram"; registrationFile = "${dataDir}/telegram-registration.yaml"; cfg = config.services.mautrix-telegram; - # TODO: switch to configGen.json once RFC42 is implemented - settingsFile = pkgs.writeText "mautrix-telegram-settings.json" (builtins.toJSON cfg.settings); + settingsFormat = pkgs.formats.json {}; + settingsFileUnsubstituted = settingsFormat.generate "mautrix-telegram-config-unsubstituted.json" cfg.settings; + settingsFile = "${dataDir}/config.json"; in { options = { @@ -15,9 +16,8 @@ in { enable = mkEnableOption "Mautrix-Telegram, a Matrix-Telegram hybrid puppeting/relaybot bridge"; settings = mkOption rec { - # TODO: switch to types.config.json as prescribed by RFC42 once it's implemented - type = types.attrs; apply = recursiveUpdate default; + inherit (settingsFormat) type; default = { appservice = rec { database = "sqlite:///${dataDir}/mautrix-telegram.db"; @@ -124,6 +124,16 @@ in { after = [ "network-online.target" ] ++ cfg.serviceDependencies; preStart = '' + # Not all secrets can be passed as environment variable (yet) + # https://github.com/tulir/mautrix-telegram/issues/584 + [ -f ${settingsFile} ] && rm -f ${settingsFile} + old_umask=$(umask) + umask 0277 + ${pkgs.envsubst}/bin/envsubst \ + -o ${settingsFile} \ + -i ${settingsFileUnsubstituted} + umask $old_umask + # generate the appservice's registration file if absent if [ ! -f '${registrationFile}' ]; then ${pkgs.mautrix-telegram}/bin/mautrix-telegram \ @@ -159,6 +169,8 @@ in { --config='${settingsFile}' ''; }; + + restartTriggers = [ settingsFileUnsubstituted ]; }; }; 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 115ecbf12b..5811cda112 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -31,6 +31,7 @@ let "dovecot" "fritzbox" "json" + "jitsi" "keylight" "knot" "lnd" @@ -130,7 +131,7 @@ let inherit name port; } // extraOpts); } ({ config, ... }: mkIf config.openFirewall { - firewallFilter = mkOptionDefault "-p tcp -m tcp --dport ${toString config.port}"; + firewallFilter = mkDefault "-p tcp -m tcp --dport ${toString config.port}"; })]; internal = true; default = {}; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/jitsi.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/jitsi.nix new file mode 100644 index 0000000000..c93a8f98e5 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/jitsi.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.jitsi; +in +{ + port = 9700; + extraOpts = { + url = mkOption { + type = types.str; + default = "http://localhost:8080/colibri/stats"; + description = '' + Jitsi Videobridge metrics URL to monitor. + This is usually /colibri/stats on port 8080 of the jitsi videobridge host. + ''; + }; + interval = mkOption { + type = types.str; + default = "30s"; + example = "1min"; + description = '' + How often to scrape new data + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-jitsi-exporter}/bin/jitsiexporter \ + -url ${escapeShellArg cfg.url} \ + -host ${cfg.listenAddress} \ + -port ${toString cfg.port} \ + -interval ${toString cfg.interval} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/croc.nix b/third_party/nixpkgs/nixos/modules/services/networking/croc.nix new file mode 100644 index 0000000000..b218fab219 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/croc.nix @@ -0,0 +1,88 @@ +{ config, lib, pkgs, ... }: +let + inherit (lib) types; + cfg = config.services.croc; + rootDir = "/run/croc"; +in +{ + options.services.croc = { + enable = lib.mkEnableOption "croc relay"; + ports = lib.mkOption { + type = with types; listOf port; + default = [9009 9010 9011 9012 9013]; + description = "Ports of the relay."; + }; + pass = lib.mkOption { + type = with types; either path str; + default = "pass123"; + description = "Password or passwordfile for the relay."; + }; + openFirewall = lib.mkEnableOption "opening of the peer port(s) in the firewall"; + debug = lib.mkEnableOption "debug logs"; + }; + + config = lib.mkIf cfg.enable { + systemd.services.croc = { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.croc}/bin/croc --pass '${cfg.pass}' ${lib.optionalString cfg.debug "--debug"} relay --ports ${lib.concatMapStringsSep "," toString cfg.ports}"; + # The following options are only for optimizing: + # systemd-analyze security croc + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + DynamicUser = true; + # ProtectClock= adds DeviceAllow=char-rtc r + DeviceAllow = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + MountAPIVFS = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateNetwork = lib.mkDefault false; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "noaccess"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RootDirectory = rootDir; + # Avoid mounting rootDir in the own rootDir of ExecStart='s mount namespace. + InaccessiblePaths = [ "-+${rootDir}" ]; + BindReadOnlyPaths = [ + builtins.storeDir + ] ++ lib.optional (types.path.check cfg.pass) cfg.pass; + # This is for BindReadOnlyPaths= + # to allow traversal of directories they create in RootDirectory=. + UMask = "0066"; + # Create rootDir in the host's mount namespace. + RuntimeDirectory = [(baseNameOf rootDir)]; + RuntimeDirectoryMode = "700"; + SystemCallFilter = [ + "@system-service" + "~@aio" "~@chown" "~@keyring" "~@memlock" + "~@privileged" "~@resources" "~@setuid" + "~@sync" "~@timer" + ]; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + }; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall cfg.ports; + }; + + meta.maintainers = with lib.maintainers; [ hax404 julm ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix b/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix index b19cd07325..d2b36d9e75 100644 --- a/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix @@ -104,7 +104,7 @@ let ignoreCollisions = true; }; - filterGutenprint = pkgs: filter (pkg: pkg.meta.isGutenprint or false == true) pkgs; + filterGutenprint = filter (pkg: pkg.meta.isGutenprint or false == true); containsGutenprint = pkgs: length (filterGutenprint pkgs) > 0; getGutenprint = pkgs: head (filterGutenprint pkgs); diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix index 62906d5e6a..01710b1bd5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix @@ -14,17 +14,16 @@ let ADMIN_PASSWORD=password ''; - pgsu = "${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser}"; pgbin = "${config.services.postgresql.package}/bin"; preStart = pkgs.writeScript "miniflux-pre-start" '' #!${pkgs.runtimeShell} db_exists() { - [ "$(${pgsu} ${pgbin}/psql -Atc "select 1 from pg_database where datname='$1'")" == "1" ] + [ "$(${pgbin}/psql -Atc "select 1 from pg_database where datname='$1'")" == "1" ] } if ! db_exists "${dbName}"; then - ${pgsu} ${pgbin}/psql postgres -c "CREATE ROLE ${dbUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${dbPassword}'" - ${pgsu} ${pgbin}/createdb --owner "${dbUser}" "${dbName}" - ${pgsu} ${pgbin}/psql "${dbName}" -c "CREATE EXTENSION IF NOT EXISTS hstore" + ${pgbin}/psql postgres -c "CREATE ROLE ${dbUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${dbPassword}'" + ${pgbin}/createdb --owner "${dbUser}" "${dbName}" + ${pgbin}/psql "${dbName}" -c "CREATE EXTENSION IF NOT EXISTS hstore" fi ''; in @@ -73,15 +72,26 @@ in services.postgresql.enable = true; + systemd.services.miniflux-dbsetup = { + description = "Miniflux database setup"; + wantedBy = [ "multi-user.target" ]; + requires = [ "postgresql.service" ]; + after = [ "network.target" "postgresql.service" ]; + serviceConfig = { + Type = "oneshot"; + User = config.services.postgresql.superUser; + ExecStart = preStart; + }; + }; + systemd.services.miniflux = { description = "Miniflux service"; wantedBy = [ "multi-user.target" ]; requires = [ "postgresql.service" ]; - after = [ "network.target" "postgresql.service" ]; + after = [ "network.target" "postgresql.service" "miniflux-dbsetup.service" ]; serviceConfig = { ExecStart = "${pkgs.miniflux}/bin/miniflux"; - ExecStartPre = "+${preStart}"; DynamicUser = true; RuntimeDirectory = "miniflux"; RuntimeDirectoryMode = "0700"; diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 00e84a9df8..251f24a9a0 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -84,6 +84,7 @@ in couchdb = handleTest ./couchdb.nix {}; cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {}; custom-ca = handleTest ./custom-ca.nix {}; + croc = handleTest ./croc.nix {}; deluge = handleTest ./deluge.nix {}; dhparams = handleTest ./dhparams.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/croc.nix b/third_party/nixpkgs/nixos/tests/croc.nix new file mode 100644 index 0000000000..c1b6fc7232 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/croc.nix @@ -0,0 +1,51 @@ +import ./make-test-python.nix ({ pkgs, ... }: +let + client = { pkgs, ... }: { + environment.systemPackages = [ pkgs.croc ]; + }; + pass = pkgs.writeText "pass" "PassRelay"; +in { + name = "croc"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ hax404 julm ]; + }; + + nodes = { + relay = { + services.croc = { + enable = true; + pass = pass; + openFirewall = true; + }; + }; + sender = client; + receiver = client; + }; + + testScript = '' + start_all() + + # wait until relay is up + relay.wait_for_unit("croc") + relay.wait_for_open_port(9009) + relay.wait_for_open_port(9010) + relay.wait_for_open_port(9011) + relay.wait_for_open_port(9012) + relay.wait_for_open_port(9013) + + # generate testfiles and send them + sender.wait_for_unit("multi-user.target") + sender.execute("echo Hello World > testfile01.txt") + sender.execute("echo Hello Earth > testfile02.txt") + sender.execute( + "croc --pass ${pass} --relay relay send --code topSecret testfile01.txt testfile02.txt &" + ) + + # receive the testfiles and check them + receiver.succeed( + "croc --pass ${pass} --yes --relay relay topSecret" + ) + assert "Hello World" in receiver.succeed("cat testfile01.txt") + assert "Hello Earth" in receiver.succeed("cat testfile02.txt") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/miniflux.nix b/third_party/nixpkgs/nixos/tests/miniflux.nix index 9f8b52c3c8..797a2787d1 100644 --- a/third_party/nixpkgs/nixos/tests/miniflux.nix +++ b/third_party/nixpkgs/nixos/tests/miniflux.nix @@ -20,6 +20,13 @@ with lib; services.miniflux.enable = true; }; + withoutSudo = + { ... }: + { + services.miniflux.enable = true; + security.sudo.enable = false; + }; + customized = { ... }: { @@ -46,6 +53,13 @@ with lib; "curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep -q '\"is_admin\":true'" ) + withoutSudo.wait_for_unit("miniflux.service") + withoutSudo.wait_for_open_port(${toString defaultPort}) + withoutSudo.succeed("curl --fail 'http://localhost:${toString defaultPort}/healthcheck' | grep -q OK") + withoutSudo.succeed( + "curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep -q '\"is_admin\":true'" + ) + customized.wait_for_unit("miniflux.service") customized.wait_for_open_port(${toString port}) customized.succeed("curl --fail 'http://localhost:${toString port}/healthcheck' | grep -q OK") diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index 78a3afad0b..290cb87abb 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -233,6 +233,29 @@ let ''; }; + jitsi = { + exporterConfig = { + enable = true; + }; + metricProvider = { + systemd.services.prometheus-jitsi-exporter.after = [ "jitsi-videobridge2.service" ]; + services.jitsi-videobridge = { + enable = true; + apis = [ "colibri" "rest" ]; + }; + }; + exporterTest = '' + wait_for_unit("jitsi-videobridge2.service") + wait_for_open_port(8080) + wait_for_unit("prometheus-jitsi-exporter.service") + wait_for_open_port(9700) + wait_until_succeeds( + 'journalctl -eu prometheus-jitsi-exporter.service -o cat | grep -q "key=participants"' + ) + succeed("curl -sSf 'localhost:9700/metrics' | grep -q 'jitsi_participants 0'") + ''; + }; + json = { exporterConfig = { enable = true; diff --git a/third_party/nixpkgs/nixos/tests/spike.nix b/third_party/nixpkgs/nixos/tests/spike.nix index cb89df7387..09035a1564 100644 --- a/third_party/nixpkgs/nixos/tests/spike.nix +++ b/third_party/nixpkgs/nixos/tests/spike.nix @@ -17,6 +17,6 @@ in '' machine.wait_for_unit("multi-user.target") output = machine.succeed("spike -m64 $(which pk) $(which hello)") - assert output == "Hello, world!\n" + assert "Hello, world!" in output ''; }) diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/contrast/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/contrast/default.nix index 689ad27357..44bee86880 100644 --- a/third_party/nixpkgs/pkgs/applications/accessibility/contrast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/accessibility/contrast/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , fetchFromGitLab , cairo , dbus @@ -7,17 +8,17 @@ , glib , gtk3 , libhandy_0 +, libsass , meson , ninja , pango , pkg-config , python3 -, rustc , rustPlatform , wrapGAppsHook }: -rustPlatform.buildRustPackage rec { +stdenv.mkDerivation rec { pname = "contrast"; version = "0.0.3"; @@ -30,7 +31,11 @@ rustPlatform.buildRustPackage rec { sha256 = "0kk3mv7a6y258109xvgicmsi0lw0rcs00gfyivl5hdz7qh47iccy"; }; - cargoSha256 = "0vi8nv4hkhsgqgz36xacwkk5cxirg6li44nbmk3x7vx7c64hzybq"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-ePkPiWGn79PHrMsSEql5OXZW5uRMdTP+w0/DCcm2KG4="; + }; nativeBuildInputs = [ desktop-file-utils @@ -39,6 +44,9 @@ rustPlatform.buildRustPackage rec { ninja pkg-config python3 + rustPlatform.rust.cargo + rustPlatform.cargoSetupHook + rustPlatform.rust.rustc wrapGAppsHook glib # for glib-compile-resources ]; @@ -49,6 +57,7 @@ rustPlatform.buildRustPackage rec { glib gtk3 libhandy_0 + libsass pango ]; @@ -56,12 +65,6 @@ rustPlatform.buildRustPackage rec { patchShebangs build-aux/meson_post_install.py ''; - # Don't use buildRustPackage phases, only use it for rust deps setup - configurePhase = null; - buildPhase = null; - checkPhase = null; - installPhase = null; - meta = with lib; { description = "Checks whether the contrast between two colors meet the WCAG requirements"; homepage = "https://gitlab.gnome.org/World/design/contrast"; 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 fbd94ebd3d..6524700ae1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -1,11 +1,10 @@ -{ lib +{ stdenv +, lib , rustPlatform , fetchFromGitLab , meson , ninja , gettext -, cargo -, rustc , python3 , pkg-config , glib @@ -18,9 +17,9 @@ , wrapGAppsHook }: -rustPlatform.buildRustPackage rec { - version = "0.4.8"; +stdenv.mkDerivation rec { pname = "gnome-podcasts"; + version = "0.4.8"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -30,16 +29,21 @@ rustPlatform.buildRustPackage rec { sha256 = "0y2332zjq7vf1v38wzwz98fs19vpzy9kl7y0xbdzqr303l59hjb1"; }; - cargoSha256 = "1jbii9k4bkrivdk1ffr6556q1sgk9j4jbzwnn8vbxmksyl1x328q"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-GInRA/V61r42spb/JYlM8+mATSkmOxdm2zHPRWaKcck="; + }; nativeBuildInputs = [ meson ninja pkg-config gettext - cargo - rustc python3 + rustPlatform.rust.cargo + rustPlatform.cargoSetupHook + rustPlatform.rust.rustc wrapGAppsHook glib ]; @@ -57,12 +61,6 @@ rustPlatform.buildRustPackage rec { gst_all_1.gst-plugins-good ]; - # use Meson/Ninja phases - configurePhase = null; - buildPhase = null; - checkPhase = null; - installPhase = null; - # tests require network doCheck = false; @@ -74,7 +72,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Listen to your favorite podcasts"; homepage = "https://wiki.gnome.org/Apps/Podcasts"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/third_party/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix new file mode 100644 index 0000000000..9d891d3023 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -0,0 +1,82 @@ +{ lib, stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype +, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr +, nss, pango, udev, xorg +}: + +let + version = "4.7.1"; + + deps = [ + alsaLib + atk + at-spi2-atk + cairo + cups + dbus + expat + fontconfig + freetype + GConf + gdk-pixbuf + glib + gtk2 + gtk3 + libpulseaudio + nspr + nss + pango + stdenv.cc.cc + udev + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst + ]; + +in + +stdenv.mkDerivation { + pname = "google-play-music-desktop-player"; + inherit version; + + src = fetchurl { + url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; + sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r"; + }; + + dontBuild = true; + nativeBuildInputs = [ dpkg makeWrapper ]; + + unpackPhase = '' + dpkg -x $src . + ''; + + installPhase = '' + mkdir -p $out + cp -r ./usr/share $out + cp -r ./usr/bin $out + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + "$out/share/google-play-music-desktop-player/Google Play Music Desktop Player" + + wrapProgram $out/bin/google-play-music-desktop-player \ + --prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath deps}" + ''; + + meta = { + homepage = "https://www.googleplaymusicdesktopplayer.com/"; + description = "A beautiful cross platform Desktop Player for Google Play Music and YouTube Music"; + license = lib.licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ anna328p SuprDewd ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix index 6a5dbebeca..b43b770b24 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "musescore"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${version}"; - sha256 = "sha256-21ZI5rsc05ZWEyM0LeFr+212YViLYveZZBvVpskh8iA="; + sha256 = "sha256-GBGAD/qdOhoNfDzI+O0EiKgeb86GFJxpci35T6tZ+2s="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/rosegarden/default.nix b/third_party/nixpkgs/pkgs/applications/audio/rosegarden/default.nix index 5c7493ef7d..b95e5fdc76 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/rosegarden/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/rosegarden/default.nix @@ -3,12 +3,12 @@ , liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }: stdenv.mkDerivation (rec { - version = "20.06"; + version = "20.12"; pname = "rosegarden"; src = fetchurl { url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; - sha256 = "1i9x9rkqwwdrk77xl5ra8i48cjirbc7fbisnj0nnclccwaq0wk6r"; + sha256 = "sha256-iGaEr8WFipV4I00fhFGI2xMBFPf784IIxNXs2hUTHFs="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix b/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix index 96433221e9..36ee6c12ee 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/shortwave/default.nix @@ -1,10 +1,11 @@ -{ lib +{ stdenv +, lib , fetchFromGitLab -, cargo , dbus , desktop-file-utils , gdk-pixbuf , gettext +, gitMinimal , glib , gst_all_1 , gtk3 @@ -14,13 +15,12 @@ , openssl , pkg-config , python3 -, rustc , rustPlatform , sqlite , wrapGAppsHook }: -rustPlatform.buildRustPackage rec { +stdenv.mkDerivation rec { pname = "shortwave"; version = "1.1.1"; @@ -32,18 +32,24 @@ rustPlatform.buildRustPackage rec { sha256 = "1vlhp2ss06j41simjrrjg38alp85jddhqyvccy6bhfzm0gzynwld"; }; - cargoSha256 = "181699rlpr5dszc18wg0kbss3gfskxaz9lpxpgsc4yfb6ip89qnk"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-0+KEbjTLecL0u/3S9FWf2r2h9ZrgcRTY163kS3NKJqA="; + }; nativeBuildInputs = [ - cargo desktop-file-utils gettext + gitMinimal glib # for glib-compile-schemas meson ninja pkg-config python3 - rustc + rustPlatform.rust.cargo + rustPlatform.cargoSetupHook + rustPlatform.rust.rustc wrapGAppsHook ]; @@ -62,12 +68,6 @@ rustPlatform.buildRustPackage rec { gst-plugins-bad ]); - # Don't use buildRustPackage phases, only use it for rust deps setup - configurePhase = null; - buildPhase = null; - checkPhase = null; - installPhase = null; - postPatch = '' patchShebangs build-aux/meson/postinstall.py ''; diff --git a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/borg-path.patch b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/borg-path.patch new file mode 100644 index 0000000000..c4ed649ffc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/borg-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/borg/utils.rs b/src/borg/utils.rs +index 4e30913..30d7d6f 100644 +--- a/src/borg/utils.rs ++++ b/src/borg/utils.rs +@@ -223,7 +223,7 @@ impl BorgCall { + } + + pub fn cmd(&self) -> Command { +- let mut cmd = Command::new("borg"); ++ let mut cmd = Command::new("@borg@"); + + cmd.args(self.args()) + .stderr(Stdio::piped()) diff --git a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix new file mode 100644 index 0000000000..51f00d021c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchFromGitLab +, rustPlatform +, substituteAll +, desktop-file-utils +, meson +, ninja +, pkg-config +, python3 +, wrapGAppsHook +, borgbackup +, dbus +, gdk-pixbuf +, glib +, gtk3 +, libhandy +}: + +stdenv.mkDerivation rec { + pname = "pika-backup"; + version = "0.2.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "pika-backup"; + rev = "v${version}"; + sha256 = "0fm6vwpw0pa98v2yn8p3818rrlv9lk3pmgnal1b2kh52im5ll7m8"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "1f5s6a0wjrs2spsicirhbvb5xlz9iflwsaqchij9k02hfcsr308y"; + }; + + patches = [ + (substituteAll { + src = ./borg-path.patch; + borg = "${borgbackup}/bin/borg"; + }) + ]; + + postPatch = '' + patchShebangs build-aux + ''; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkg-config + python3 + wrapGAppsHook + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + dbus + gdk-pixbuf + glib + gtk3 + libhandy + ]; + + meta = with lib; { + description = "Simple backups based on borg"; + homepage = "https://wiki.gnome.org/Apps/PikaBackup"; + changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix index 6a8bebf617..77601aa3d5 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix @@ -1,23 +1,25 @@ { rust, rustPlatform, stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper -, cargo, pkg-config -, bash, curl, coreutils, boost17x, db62, libsodium, libevent, utf8cpp, util-linux +, fetchpatch, cargo, pkg-config, curl, coreutils, boost174, db62, hexdump +, libsodium, libevent, utf8cpp, util-linux, withWallet ? true, withDaemon ? true +, withUtils ? true }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { pname = "zcash"; - version = "4.1.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "185zrw276g545np0niw5hlhlppkjbf5a1r4rwhnbaimdjdii2dil"; + sha256 = "00pn1jw8j90y7i8nc92b51znz4gczphvdzbkbcjx63cf6vk7v4ks"; }; - cargoSha256 = "0qxr6asf8zsya0f1ri39z2cnfpjk96hgwjchz2c7j87vibbvg6dc"; + cargoSha256 = "1rl9sjbvpfrv1mlyb04vw1935qx0kz9cs177xl7izdva1ixk9blr"; - nativeBuildInputs = [ autoreconfHook cargo makeWrapper pkg-config ]; - buildInputs = [ bash boost17x db62 libevent libsodium utf8cpp ]; + nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ]; + buildInputs = [ boost174 libevent libsodium utf8cpp ] + ++ lib.optional withWallet db62; # Use the stdenv default phases (./configure; make) instead of the # ones from buildRustPackage. @@ -26,6 +28,14 @@ rustPlatform.buildRustPackage rec { checkPhase = "checkPhase"; installPhase = "installPhase"; + patches = [ + # See https://github.com/zcash/zcash/pull/5015 + (fetchpatch { + url = "https://github.com/zcash/zcash/commit/a0ac27ec6ed434a233c7ad2468258f6e6e7e9688.patch"; + sha256 = "0pmx1spql9p8vvpjgw7qf3qy46f4mh9ni16bq4ss1xz1z9zgjc4k"; + }) + ]; + postPatch = '' # Have to do this here instead of in preConfigure because # cargoDepsCopy gets unset after postPatch. @@ -34,10 +44,12 @@ rustPlatform.buildRustPackage rec { configureFlags = [ "--disable-tests" - "--with-boost-libdir=${lib.getLib boost17x}/lib" + "--with-boost-libdir=${lib.getLib boost174}/lib" "CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp" "RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}" - ]; + ] ++ lib.optional (!withWallet) "--disable-wallet" + ++ lib.optional (!withDaemon) "--without-daemon" + ++ lib.optional (!withUtils) "--without-utils"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index 0005fdb633..72f3867987 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lightdm-mini-greeter"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "prikhi"; repo = "lightdm-mini-greeter"; rev = version; - sha256 = "sha256-cVOnd3k+9hFQjROiwPpxZcCxD2NiH1eclJHF88eV6BM="; + sha256 = "sha256-Pm7ExfusFIPktX2C4UE07qgOVhcWhVxnaD3QARpmu7Y="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; 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 1cc47d5ca8..842b181cc4 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 @@ -636,16 +636,16 @@ license = lib.licenses.free; }; }) {}; - counsel = callPackage ({ elpaBuild, emacs, fetchurl, lib, swiper }: + counsel = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib, swiper }: elpaBuild { pname = "counsel"; ename = "counsel"; - version = "0.13.1"; + version = "0.13.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/counsel-0.13.1.tar"; - sha256 = "0m4dmhj33cxaapn9lf7bj1r680gi2wd7cw9xlssjklzvic29a6db"; + url = "https://elpa.gnu.org/packages/counsel-0.13.4.tar"; + sha256 = "094zfapfn1l8wjf3djkipk0d9nks0g77sbk107pfsbr3skkzh031"; }; - packageRequires = [ emacs swiper ]; + packageRequires = [ emacs ivy swiper ]; meta = { homepage = "https://elpa.gnu.org/packages/counsel.html"; license = lib.licenses.free; @@ -1295,10 +1295,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.0.9"; + version = "1.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.0.9.el"; - sha256 = "0xm1crhjcs14iqkf481igbf40wj2ib3hjzinw1gn8w1n0462ymp6"; + url = "https://elpa.gnu.org/packages/flymake-1.1.1.tar"; + sha256 = "0lk2v34b59b24j3hsmi8d0v7fgpwcipv7ka9i88cdgjmjjmzgz5q"; }; packageRequires = [ eldoc emacs ]; meta = { @@ -1714,10 +1714,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.13.1"; + version = "0.13.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-0.13.1.tar"; - sha256 = "0n0ixhdykbdpis4krkqq6zncbby28p34742q96n0l91w0p19slcx"; + url = "https://elpa.gnu.org/packages/ivy-0.13.4.tar"; + sha256 = "0qpza1c45mr8fcpnm32cck4v22fnzz1yb7kww05rzgq1k9iivx5v"; }; packageRequires = [ emacs ]; meta = { @@ -1725,6 +1725,21 @@ license = lib.licenses.free; }; }) {}; + ivy-avy = callPackage ({ avy, elpaBuild, emacs, fetchurl, ivy, lib }: + elpaBuild { + pname = "ivy-avy"; + ename = "ivy-avy"; + version = "0.13.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ivy-avy-0.13.4.tar"; + sha256 = "1q5caxm4rnh4jy5n88dhkdbx1afsshmfki5dl8xsqbdb3y0zq7yi"; + }; + packageRequires = [ avy emacs ivy ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ivy-avy.html"; + license = lib.licenses.free; + }; + }) {}; ivy-explorer = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }: elpaBuild { pname = "ivy-explorer"; @@ -1740,6 +1755,21 @@ license = lib.licenses.free; }; }) {}; + ivy-hydra = callPackage ({ elpaBuild, emacs, fetchurl, hydra, ivy, lib }: + elpaBuild { + pname = "ivy-hydra"; + ename = "ivy-hydra"; + version = "0.13.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ivy-hydra-0.13.5.tar"; + sha256 = "06rln9bnq5hli5rqlm47fb68b8llpqrmzwqqv4rn7mx3854i9a5x"; + }; + packageRequires = [ emacs hydra ivy ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ivy-hydra.html"; + license = lib.licenses.free; + }; + }) {}; ivy-posframe = callPackage ({ elpaBuild , emacs , fetchurl @@ -2019,10 +2049,10 @@ elpaBuild { pname = "map"; ename = "map"; - version = "2.1"; + version = "3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/map-2.1.el"; - sha256 = "0ydz5w1n4vwhhzxxj003s7jv8n1wjijwfryk5z93bwhnr0cak0i0"; + url = "https://elpa.gnu.org/packages/map-3.0.tar"; + sha256 = "00wf8lgh1b1i5l838y6di8194rf5gf5djklkhmxj1nlikz66j2ls"; }; packageRequires = [ emacs ]; meta = { @@ -2384,6 +2414,21 @@ license = lib.licenses.free; }; }) {}; + ob-haxe = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "ob-haxe"; + ename = "ob-haxe"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ob-haxe-1.0.tar"; + sha256 = "1x19b3aappv4d3mvpf01r505l1sfndbzbpr5sbid411g9g9k3rwr"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/ob-haxe.html"; + license = lib.licenses.free; + }; + }) {}; objed = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "objed"; @@ -2613,10 +2658,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.1.tar"; - sha256 = "11d1gsvvj26h9d7a28v87b022vbi3syzngn1x9v1d2g55iv01x38"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.2.tar"; + sha256 = "0ngh54jdh56563crgvf0r4gd6zfvhbkxs9prp12930gav8mdm3sh"; }; packageRequires = [ emacs ]; meta = { @@ -2658,10 +2703,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.8.5"; + version = "0.8.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.8.5.tar"; - sha256 = "0rls0rsj9clx4wd0gbdi5jzwyslparlf7phib649637gq6gs90ds"; + url = "https://elpa.gnu.org/packages/posframe-0.8.8.tar"; + sha256 = "1ij6brzcxv9viz37qafcinlfx5l20w8x8s6786r1rsda5n1xsmvd"; }; packageRequires = [ emacs ]; meta = { @@ -2673,10 +2718,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.5.3.el"; - sha256 = "0cpf69m41h8gfcqnq72h11925zdk35b7hw7bfy83xm83xwp12rxx"; + url = "https://elpa.gnu.org/packages/project-0.5.4.tar"; + sha256 = "0arjvhzzcf8b80w94yvpgfdlhsjwf5jk1r7vcai5a4dg3bi9cxyb"; }; packageRequires = [ emacs xref ]; meta = { @@ -2718,10 +2763,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "3.2"; + version = "3.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-3.2.tar"; - sha256 = "1rr9mq334dqf7mx1ii7910zkigw7chl63iws4sw0qsn014kjlb0a"; + url = "https://elpa.gnu.org/packages/pyim-3.5.tar"; + sha256 = "0593ds3zbmpd6235b8v33f3cb3sn8cwr6arb6zbf1ba97nawjxqs"; }; packageRequires = [ async emacs xr ]; meta = { @@ -2729,6 +2774,21 @@ license = lib.licenses.free; }; }) {}; + pyim-basedict = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "pyim-basedict"; + ename = "pyim-basedict"; + version = "0.5.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.0.tar"; + sha256 = "0h946wsnbbii32kl2kpv0k1kq118ymvpd5q1mphfsf126dz9sv78"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/pyim-basedict.html"; + license = lib.licenses.free; + }; + }) {}; python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "python"; @@ -3073,10 +3133,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "2.2"; + version = "2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rt-liberation-2.2.tar"; - sha256 = "01nkkrgygq5p5s0pfxpcn794jr6ln65ad809v9mvzz7972xw625s"; + url = "https://elpa.gnu.org/packages/rt-liberation-2.3.tar"; + sha256 = "0sqq5zfzx9dir6d6zvg7vj5v629b508bbxsp7j0sp21rr4fw9nn0"; }; packageRequires = []; meta = { @@ -3469,10 +3529,10 @@ elpaBuild { pname = "swiper"; ename = "swiper"; - version = "0.13.1"; + version = "0.13.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/swiper-0.13.1.tar"; - sha256 = "0k39pa89y0bfvdfqg3nc5pjq5mwxwimc4ma3z28vaf14zd38x9m1"; + url = "https://elpa.gnu.org/packages/swiper-0.13.4.tar"; + sha256 = "197pq2cvvskib87aky907wv2am55vilr7y5dabmmm07a8vr9py0v"; }; packageRequires = [ emacs ivy ]; meta = { @@ -3799,10 +3859,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2020.6.27.14326051"; + version = "2021.2.2.263931197"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2020.6.27.14326051.el"; - sha256 = "194gn8cj01jb9xcl0qq3gq6mzxfdyn459ysb35fnib7pcnafm188"; + url = "https://elpa.gnu.org/packages/verilog-mode-2021.2.2.263931197.tar"; + sha256 = "0rizadyzrsprc3mw3h2ag4760wapx5gxzsr11rgrllwzzqwin1ks"; }; packageRequires = []; meta = { 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 0308f8d976..95f9ee3245 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 = "20210301"; + version = "20210308"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210301.tar"; - sha256 = "0930km35lvbw89ifrqmcv96fjmp4fi12yv3spn51q27sfsmzqsrj"; + url = "https://orgmode.org/elpa/org-20210308.tar"; + sha256 = "1i5zga615inn5s547329g6paqbzcbhyj9hxv14c0c1m9bhra5bjs"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210301"; + version = "20210308"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210301.tar"; - sha256 = "11mwar5x848iwc1cdssr3vyx0amji840x6f0dmjpigngpcnj02m8"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210308.tar"; + sha256 = "1agbxhjkkmf4p8p8mwc6sv77ij22dr5fyhkpsnljvzkidiarfldf"; }; 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 a5707370ce..e7a530d46a 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 @@ -198,11 +198,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20210217, - 1642 + 20210303, + 1228 ], - "commit": "5064c60408c3ab45693c5f516003141d56a57629", - "sha256": "1m3rfagmwjc13fqcf0ysmzxy11j6b42h9bfc0yvnzchjdqgrm4db" + "commit": "dd58b7601ec536980a14540bddac53f5d1c1da08", + "sha256": "0ccvidz5zivmy3pkxn3mj3y3c7j6qr6im7cf2fz7n98wq1h2cpn1" }, "stable": { "version": [ @@ -302,16 +302,16 @@ "repo": "abstools/abs-mode", "unstable": { "version": [ - 20201021, - 958 + 20210303, + 1059 ], "deps": [ "erlang", "flymake", "maude-mode" ], - "commit": "9101779ef8861cb1f46d288946356e600359a4e0", - "sha256": "08ymmf030gsk7hfvbjp302micnz2fa087i6f44l2i7yz592myhsz" + "commit": "5a766c734fcdf3b6c2ad88bbeb5c1cd79cdeaf44", + "sha256": "10ywyz0g4nnkap66xc7ynr9lq9z9jpsd0i3qwxs3fqkjwixwylz5" }, "stable": { "version": [ @@ -1739,11 +1739,11 @@ "repo": "codesuki/add-node-modules-path", "unstable": { "version": [ - 20180710, - 2342 + 20210305, + 312 ], - "commit": "f31e69ccb681f882aebb806ce6e9478e3ac39708", - "sha256": "0p106bqmvdr8by5iv02bshm339qbrjcch2d15mrm4h3nav03v306" + "commit": "7d9be65b3be062842b7ead862dec15d6f25db4a2", + "sha256": "0za0jjba2qdpqdkcp5bch6ma8crf0vsi7bxj2rasn2icqgxyn89m" }, "stable": { "version": [ @@ -1918,8 +1918,8 @@ "annotation", "eri" ], - "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0", - "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8" + "commit": "f9a181685397517b5d14943ca88a1c0acacc2075", + "sha256": "10gk6052zdp28n9z3bjxwcgg0161sfcnz52h46w7s5jwibl1ymiw" }, "stable": { "version": [ @@ -2378,11 +2378,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210228, - 1440 + 20210307, + 1457 ], - "commit": "e685f7bc0808e23717637536ccffd79a40f0512d", - "sha256": "1gbpl6yxb08jlawy4a98bl6ap888f5lx451fvd80z19gjabiad7f" + "commit": "96772f87b0bd22573b9d6433e4c5e9f082616600", + "sha256": "1l329c754qlddzffgdnx5c50lz1v573lv3y4f053qp4d0az5m3js" }, "stable": { "version": [ @@ -2405,14 +2405,14 @@ "repo": "wyuenho/all-the-icons-dired", "unstable": { "version": [ - 20210211, - 1226 + 20210302, + 1410 ], "deps": [ "all-the-icons" ], - "commit": "dd685166818b92470bcccb3e398f2d443f513e63", - "sha256": "0yqcmy61ncybfjmbgyzcak9zn017lx6sd1s792y7g7l0klj1l2va" + "commit": "f401fe289cd93936e7747b1541aa98117b7ca96f", + "sha256": "1j5vbrsxy6blickkbblagyn6binvpalc2kxr7b438xhx8mgfbapv" } }, { @@ -2504,15 +2504,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20210126, - 1227 + 20210303, + 1747 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "f2b48400b2da0bbf64e9c749fa4a5d332ab7c91f", - "sha256": "1pdxz8arkhjc3sgg13s07fxlxxgq5y6amapg6daxafl1yvh99jrb" + "commit": "82877633366139cc858f243b9d7fdff83c1ebe62", + "sha256": "0jyqgp9hgxy8qc8hdzr6gi8vwxaw7sz9lg297rmqx6i1hnv247aq" }, "stable": { "version": [ @@ -2536,11 +2536,11 @@ "repo": "cryon/almost-mono-themes", "unstable": { "version": [ - 20200211, - 2126 + 20210306, + 1040 ], - "commit": "0b804c3ce21b9045d9b3093ef066d8269ac93990", - "sha256": "0bp38fwrgw5hr8vyn9shy1am2d224nbyjymdar6i2gh191y43rpm" + "commit": "a7dc21078e25dab2b054d64e5b40ecce2878edb2", + "sha256": "12q9wddkynl90hl8vcy69hwl2g9flfz7r4fsp81bwc3vv130s7cg" } }, { @@ -2761,25 +2761,25 @@ "repo": "DarwinAwardWinner/amx", "unstable": { "version": [ - 20210101, - 1921 + 20210305, + 118 ], "deps": [ "s" ], - "commit": "b99149715266b5c2c48f5a0fc43716d36575da5f", - "sha256": "14k1wrjfhawb18fyrfdv2lv0nwfpliw0f14hrhdb3kmshp5dsb3x" + "commit": "37f9c7ae55eb0331b27200fb745206fc58ceffc0", + "sha256": "0h1cxqqf0hixh25j679r57bq9dv0b20icf268wbnsim5xp88ngf8" }, "stable": { "version": [ 3, - 3 + 4 ], "deps": [ "s" ], - "commit": "394734e42aa8c43940df358e77a69248b42f2a9c", - "sha256": "0ikjzs119g57cwh2v3jmy63lggqc0ib99q5gsl93slkk4y2ihavw" + "commit": "37f9c7ae55eb0331b27200fb745206fc58ceffc0", + "sha256": "0h1cxqqf0hixh25j679r57bq9dv0b20icf268wbnsim5xp88ngf8" } }, { @@ -2790,8 +2790,8 @@ "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20210210, - 852 + 20210304, + 1723 ], "deps": [ "dash", @@ -2799,8 +2799,8 @@ "pythonic", "s" ], - "commit": "081f9d8f92f5b85b4f4ac01af7ee72582e689ce1", - "sha256": "01z4npw03rkpjl0gmxgryvpkndwn43bgmda398dyzfv00pl5cdar" + "commit": "344727c9e07e108896740c782689bf3588edcce5", + "sha256": "020ix7jlzx3k9g9flwcq8ddgplby62gcfj28wxhq0pcngy8fnqjz" }, "stable": { "version": [ @@ -3146,8 +3146,8 @@ 20200914, 644 ], - "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0", - "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8" + "commit": "f9a181685397517b5d14943ca88a1c0acacc2075", + "sha256": "10gk6052zdp28n9z3bjxwcgg0161sfcnz52h46w7s5jwibl1ymiw" }, "stable": { "version": [ @@ -3644,11 +3644,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20191220, - 2017 + 20210303, + 2006 ], - "commit": "543341f0836b24e001375c530c4706e9345ec1e3", - "sha256": "03917db85x4c2a1ba94wmik21wwnwf9xpz6wc0d0ay0zkkvqsn5g" + "commit": "cf12db35089836ee521ef248860ef8c48ea6ce4a", + "sha256": "0fqj5zc82nl2x3lsdaz7v1df366lzhymf0ji4d8a2cpbpliy1dh4" }, "stable": { "version": [ @@ -4212,8 +4212,8 @@ "let-alist", "websocket" ], - "commit": "d0414210c8eea8b80d293e79f2c8991948ab38cb", - "sha256": "1h4zf81gizi5qf86zxdsm9v0l2rvbsmw6fbr92ggw2r55cnqqrib" + "commit": "c73367d8aa660f2b3c3f70ef5c39f5b502d60404", + "sha256": "07bw5fjmszxsvvcb0415zfawfmzqwj0qdvaigxrbb5rinazwb0pn" }, "stable": { "version": [ @@ -4278,8 +4278,8 @@ "deps": [ "auctex" ], - "commit": "4e05ad8976f352e67d56d9a479a4a570dfe7ba73", - "sha256": "0zgd7yascqn2dwjd20f1v962q7b24wibla5fwnbl9df1x36asqhs" + "commit": "9a15742a6de1285831329eac93f9e35752472685", + "sha256": "1ra2qkr9wadnx5aqg6paxk8w4h9m6c4jrl4b7zb5l6s1csw1llj1" }, "stable": { "version": [ @@ -5454,8 +5454,8 @@ "avy", "embark" ], - "commit": "0c7323953e628c8797270a37c0f639fe23092175", - "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l" + "commit": "d267c11b2d6f510d9e173400ec90e18a471fc7b3", + "sha256": "1a8qj71jcy0cpywy6677kg9d3l2a4v96nvaw7kccm2xmsrhq6wa2" }, "stable": { "version": [ @@ -6821,8 +6821,8 @@ "deps": [ "biblio-core" ], - "commit": "eb9baf1d2bf6a073d24ccb717025baa693e98f3e", - "sha256": "0s7wld8ikfyn2rz8zr4g3lj59b2g95mj1jnqw6xvmxys0ahnb0r5" + "commit": "242c3f3ac1198b1e969e2a34d6348354a9d83345", + "sha256": "0m1ih8p7s3335wah1wzaiipqphvjd88nyig582ja3ra6xkvazf00" }, "stable": { "version": [ @@ -6862,16 +6862,16 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20200416, - 307 + 20210311, + 2310 ], "deps": [ "dash", "let-alist", "seq" ], - "commit": "eb9baf1d2bf6a073d24ccb717025baa693e98f3e", - "sha256": "0s7wld8ikfyn2rz8zr4g3lj59b2g95mj1jnqw6xvmxys0ahnb0r5" + "commit": "242c3f3ac1198b1e969e2a34d6348354a9d83345", + "sha256": "0m1ih8p7s3335wah1wzaiipqphvjd88nyig582ja3ra6xkvazf00" }, "stable": { "version": [ @@ -7761,8 +7761,8 @@ "repo": "boogie-org/boogie-friends", "unstable": { "version": [ - 20210131, - 8 + 20210311, + 620 ], "deps": [ "cl-lib", @@ -7771,8 +7771,8 @@ "flycheck", "yasnippet" ], - "commit": "8e906c41725bada06ff6e296af65cc463b028ea9", - "sha256": "1cf94hw1b50qkzjc88gxi5qhpf3pkaj2w3glr8dldnh0l5z8vfxg" + "commit": "7193bef7d45232bdbd0b42cbd8893c15f68ad0e5", + "sha256": "1wj5wak9vwq0jp2kvw78g07h9k48qcx7jn61yfn1n9rzyigaxa8a" } }, { @@ -7807,8 +7807,8 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20210228, - 1839 + 20210305, + 1714 ], "deps": [ "dash", @@ -7816,8 +7816,8 @@ "multiple-cursors", "pcre2el" ], - "commit": "58107055dadb735941537c90457753dbc1ea7005", - "sha256": "15x29jpfkfizkl3b9ghmd1wclvigcm05y6l7i9c6clclwqzzm5zw" + "commit": "948501463dc2c63e133dda3b3ed28f4c81d24d26", + "sha256": "05q98rzhmkjmqfkhxy6g7qaybvgc6ypxvz5yiajwm8gcwwch2han" }, "stable": { "version": [ @@ -8011,20 +8011,20 @@ "repo": "jadler/brazilian-holidays", "unstable": { "version": [ - 20201109, - 2052 + 20210302, + 107 ], - "commit": "d9e685b21be4d5264cbee0cf74a846af380af4d4", - "sha256": "10jp4yd2v7p8qg9x1s24z3ldbcf1klbxk1754vf25rrrzsxbb6il" + "commit": "68811fd5f3e9d9c0572995c3ca46ead2c35eb421", + "sha256": "03p3s5cxyi3dzi4ry9l30dwcs9a3rbg8ijsb595hj56al80k9y3q" }, "stable": { "version": [ 2, 1, - 1 + 2 ], - "commit": "d9e685b21be4d5264cbee0cf74a846af380af4d4", - "sha256": "10jp4yd2v7p8qg9x1s24z3ldbcf1klbxk1754vf25rrrzsxbb6il" + "commit": "68811fd5f3e9d9c0572995c3ca46ead2c35eb421", + "sha256": "03p3s5cxyi3dzi4ry9l30dwcs9a3rbg8ijsb595hj56al80k9y3q" } }, { @@ -8792,8 +8792,8 @@ "alert", "dash" ], - "commit": "d4b1fc8f6d32eb69c066775558442dcc84208ba0", - "sha256": "03qrfb2rzx2aqkzn7pm0z97l9sfv13znd1dndjjp5gdga0nr2wjz" + "commit": "eed66036d65b0ee26ce02371d14dce16a360acb4", + "sha256": "070p6mziljnyqzadbvwwmdv11gdmwi4h6q4rbnlp6dj91yiizksi" } }, { @@ -9430,8 +9430,8 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20200402, - 910 + 20210311, + 831 ], "deps": [ "anaconda-mode", @@ -9440,8 +9440,8 @@ "ivy", "tree-mode" ], - "commit": "2f47dcb65ed8dc5393df846b4175a4872e254c05", - "sha256": "0xn8xk2x3ih22vlfjvnl6853ddpk57q70z9b0vwhjvwmi4idz7xp" + "commit": "3e5c510c51dd8b3491a32a1d67ad6268033348ee", + "sha256": "1jj8bj9a05dq0igxd2ddf0p9gc9sbffcn0wy3b26qlcspcvbpm1h" }, "stable": { "version": [ @@ -9696,27 +9696,26 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210214, - 1455 + 20210309, + 2113 ], "deps": [ "ansi", "cl-lib", - "dash", "epl", "f", "package-build", "s", "shut-up" ], - "commit": "b81a3caa3fa3696fd385aa7072f8dc3a57408c4a", - "sha256": "18w7kdr140s2km0mphznrlvx5w06q93q6z370wf4spkaflks6cjy" + "commit": "afa7fd8a885ee76c9cc0dcf1425f01b98e4b2e48", + "sha256": "0vdrazjhlnpxjw6ah065713g15qmdx11mfcjjzr3004nvhksnmwh" }, "stable": { "version": [ 0, 8, - 5 + 6 ], "deps": [ "ansi", @@ -9728,8 +9727,8 @@ "s", "shut-up" ], - "commit": "6fd81cdbe2c4c0a13798a6f2a1e1a6392a4bbc86", - "sha256": "0wgm0f39diswmp1ccx5a0qwfpcy8hczzp8b2s7bpi5qb49al55d0" + "commit": "610894d57f467a55fb146ade4d6f8173e4e9579b", + "sha256": "1y12m5sjgws4a4bikr8d1ccysy55j7xx3cp1qii4pw62bkf9y2bq" } }, { @@ -9908,8 +9907,8 @@ 20200904, 1431 ], - "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac", - "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak" + "commit": "cec99365fb3ad725c44514b918696ab153596b8d", + "sha256": "0q1vxcm163cs0pwnpnbjanpm49hshiyfx4m915i1wxsa7q9vvv67" } }, { @@ -9957,8 +9956,8 @@ 20200904, 1431 ], - "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac", - "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak" + "commit": "cec99365fb3ad725c44514b918696ab153596b8d", + "sha256": "0q1vxcm163cs0pwnpnbjanpm49hshiyfx4m915i1wxsa7q9vvv67" } }, { @@ -10092,15 +10091,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20210226, - 2246 + 20210309, + 1822 ], "deps": [ "cl-lib", "powerline" ], - "commit": "5bbcc80778f6fd618f9f9c13dbc2c4f4ae1eef90", - "sha256": "0clz8d6w9j1pbqd6vk4pkan5mhidxpr802wfkh3sfq77r44hhl8x" + "commit": "df972095135de90b47413190f61ec4f5af33f9f1", + "sha256": "0is51bc9zd9lr0y59md2ci4ddlfylp5jb9hwyll9r6j8gn3lrzza" }, "stable": { "version": [ @@ -10227,8 +10226,8 @@ 20171115, 2108 ], - "commit": "79e9fb4d4b2b630f11d09c25fa560a0aacd68e53", - "sha256": "05ysyvb318ilwamx9v82rv6wrh1xnv74i4flpm4x6db7apkh4kma" + "commit": "80e18350c1c55906f624915f58e9eb3d87d2af92", + "sha256": "0qk2hn4w5k6a8147a46fzsyfyagq4kwiii4jgn19qwwzpfa1iijx" }, "stable": { "version": [ @@ -10928,8 +10927,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210227, - 546 + 20210302, + 849 ], "deps": [ "clojure-mode", @@ -10940,8 +10939,8 @@ "sesman", "spinner" ], - "commit": "ae03e85a0adcd301d220e7a500aec4d5a26fbfc7", - "sha256": "0lv422m1ym6m894mbwcbv1145dnh6xk1fa242cngvlkg7j5xksh6" + "commit": "15eaf42922e5e24b834e8078f953f9f51310f335", + "sha256": "0wx5w7vy81afyz3rh7vr3pzj6yhry9b9gi5p7738qgcblns076ad" }, "stable": { "version": [ @@ -11534,26 +11533,26 @@ "repo": "redguardtoo/cliphist", "unstable": { "version": [ - 20210129, - 313 + 20210301, + 748 ], "deps": [ "ivy" ], - "commit": "3682a114e7651fc53155451afef0026f25f01f64", - "sha256": "08ih6n6xmnv179z8lfvplgss3xvl9bxppcbj1qiqbvgnf2rqfpb3" + "commit": "1ef50459fa6044c4d571cec0009368948bcf5fc5", + "sha256": "0xba2gxwy1y8zl9nvga186873icvwfi0yan3qbw2vdkpzry5ifhk" }, "stable": { "version": [ 0, 5, - 6 + 7 ], "deps": [ "ivy" ], - "commit": "232ab0b3f6d502de61ebe76681a6a04d4223b877", - "sha256": "0is772r0b7i8rvra9zb94g9aczv8b6q0dmdk67wbli5rv5drfjyq" + "commit": "1ef50459fa6044c4d571cec0009368948bcf5fc5", + "sha256": "0xba2gxwy1y8zl9nvga186873icvwfi0yan3qbw2vdkpzry5ifhk" } }, { @@ -11639,8 +11638,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20210216, - 928 + 20210311, + 1802 ], "deps": [ "cider", @@ -11653,8 +11652,8 @@ "seq", "yasnippet" ], - "commit": "b24ce76acefe792975f00147c94b4dd784e65b80", - "sha256": "1pyskl9xcqrk6r2zbp5i9402inngqps7wwb4nbdbrgi4di9b8in7" + "commit": "2c700d76d46c92b9bb068230b27047321868b1fe", + "sha256": "1rnjxsgm6fsip9njdmpmdmlga2isi6kh41xdnmwi3m34i1fzl6md" }, "stable": { "version": [ @@ -11901,11 +11900,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20210226, - 1336 + 20210307, + 824 ], - "commit": "cccddea53b816c5d06c3f4fe0ba798b9f7047a63", - "sha256": "1yah2csfd932r0r7lb9pmc26y3f024vgdw477hfl83gfalc9n9by" + "commit": "b5c913af12ab3f55723fa3f57d373a4984655e8a", + "sha256": "1yc9cwibwh8kb97jjg1m46npafyvmss7msgma485829ddlaz8ipm" }, "stable": { "version": [ @@ -11931,8 +11930,8 @@ "deps": [ "clojure-mode" ], - "commit": "cccddea53b816c5d06c3f4fe0ba798b9f7047a63", - "sha256": "1yah2csfd932r0r7lb9pmc26y3f024vgdw477hfl83gfalc9n9by" + "commit": "b5c913af12ab3f55723fa3f57d373a4984655e8a", + "sha256": "1yc9cwibwh8kb97jjg1m46npafyvmss7msgma485829ddlaz8ipm" }, "stable": { "version": [ @@ -12234,8 +12233,8 @@ 20210104, 1831 ], - "commit": "569547f0c4931c1ce163146d95375ead258c09d9", - "sha256": "02iwd0yrz9b9aw2v5vvqf43cscch85wgia386bkp4xaq2dd9h31s" + "commit": "e3009f16e9a29e5fd29c8e19dfecb970c3783a55", + "sha256": "17fag7xl25apynprz2g5lldjmg5wwpla59f7ap9mp6g4pgpx1z92" }, "stable": { "version": [ @@ -12243,10 +12242,10 @@ 20, 0, -1, - 2 + 4 ], - "commit": "498b7da2e471fd8ef5a41433505358df4f117044", - "sha256": "1j7sray4d5zpfy6mkmhxg83scwjvkvr5q98nlaxsi01nir1ywxla" + "commit": "c69d4b177fb3f6ebd22cddec919dbe1c30f43714", + "sha256": "03ivc8pmhbfrba0nfy1b7j83mdcrg6qb0c98qns6gagw35s338d1" } }, { @@ -13518,8 +13517,8 @@ "repo": "tsukimizake/company-dcd", "unstable": { "version": [ - 20201009, - 1328 + 20210307, + 649 ], "deps": [ "cl-lib", @@ -13529,8 +13528,8 @@ "popwin", "yasnippet" ], - "commit": "26245d79b5ab38314dd3a90877e425b18854bcab", - "sha256": "1aqcbi99333qdyd27xw3x4n4r2q8yx0pb2wyzlff4qw1z90bpr9f" + "commit": "858500115d4f0285f963698ede9492f409a90e52", + "sha256": "1b7xcqx297dc5z1rc96gd7y9cx8a7yhgmqh5cpnwfb45hm5s71hs" } }, { @@ -13846,14 +13845,14 @@ "repo": "mguzmann89/company-ipa", "unstable": { "version": [ - 20210222, - 30 + 20210307, + 1838 ], "deps": [ "company" ], - "commit": "e9d919e0d15d3f986471d9d6cb46b67519f5088f", - "sha256": "1bg8y35rfyqdbn9y85iriq10iskc3dq0jgv3zqqykp5mriy5y8gd" + "commit": "8634021cac885f53f3274ef6dcce7eab19321046", + "sha256": "0629my156zxjb3h636iirdd2rr58z3vsdinhq0w0y6f3544i05hx" } }, { @@ -13965,19 +13964,18 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20171102, - 1454 + 20210305, + 1705 ], "deps": [ "company", "dash", - "dash-functional", "f", "lean-mode", "s" ], - "commit": "15bee87dc4080b87c543964375b7ce162317ab6f", - "sha256": "127b7ny5mr1y14yg54gy7an3lk3928w4y9a22295i4v4zgj704j4" + "commit": "5c50338ac149ca5225fc737be291db1f63c45f1d", + "sha256": "13vrg0pp7ca0lh4j9cyg4pgfnbvf2kvbrgvvcmn1h7l9py2n8alj" } }, { @@ -13998,42 +13996,6 @@ "sha256": "08cs8vd2vzpzk71wzcrghn48mzvbk6w2fzlb3if63klhfcfpngc8" } }, - { - "ename": "company-lsp", - "commit": "5125f53307c1af3d9ccf2bae3c25e7d23dfe1932", - "sha256": "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l", - "fetcher": "github", - "repo": "tigersoldier/company-lsp", - "unstable": { - "version": [ - 20190612, - 1553 - ], - "deps": [ - "company", - "dash", - "lsp-mode", - "s" - ], - "commit": "f921ffa0cdc542c21dc3dd85f2c93df4288e83bd", - "sha256": "0dd2plznnnc2l1gqhsxnvrs8n1scp6zbcd4457wrq9z2f7pb5ig2" - }, - "stable": { - "version": [ - 2, - 1, - 0 - ], - "deps": [ - "company", - "dash", - "lsp-mode", - "s" - ], - "commit": "4eb6949f19892be7bf682381cde005791a48583a", - "sha256": "1hy1x2w0yp5brm7714d1hziz3rpkywb5jp3yj78ibmi9ifny9vri" - } - }, { "ename": "company-lua", "commit": "c8191ab2aaa72041be46091e363d216cf1b73fde", @@ -14325,8 +14287,8 @@ "company", "phpactor" ], - "commit": "62d2372ea55c0c5fb4e77076988472ebb5d85f24", - "sha256": "1sfrdap157zc7lk9vwsy91p813ip8dmazgfjwh7jwzyvcj7dsimc" + "commit": "80788a817b0257363c1eee11a57cc0f873f0eef1", + "sha256": "1w4zxp6j77xd9qcz9skpj8jbl8ink1fgdd5f1dhx0486g882mi2l" }, "stable": { "version": [ @@ -14465,8 +14427,8 @@ "company", "prescient" ], - "commit": "b6da466e552a710a9362c73a3c1c265984de9790", - "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall" + "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b", + "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n" }, "stable": { "version": [ @@ -14862,8 +14824,8 @@ "repo": "TommyX12/company-tabnine", "unstable": { "version": [ - 20210228, - 435 + 20210310, + 2247 ], "deps": [ "cl-lib", @@ -14872,8 +14834,8 @@ "s", "unicode-escape" ], - "commit": "9226f887e6b5e86599283a3b0f0b1774eb34fd7e", - "sha256": "0ljswlm745459grkp9dvdb49z5j53ki8xp2nxz7szcqa7xgpfs64" + "commit": "98e9e8b38b6ca289fbe265b0a7b62c7fe38ed0e2", + "sha256": "162ca70xwmdd8lsdawzpykd6kaqfljflaxy2nwjn8f89f80ih3fg" } }, { @@ -15438,19 +15400,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210228, - 133 + 20210312, + 1143 ], - "commit": "c5d74b191fb4ee70509e2592fa16a9398f96977b", - "sha256": "0dl9q9hg9yn7fargckkyjgiibxiy72y5vc909dg03q6v4azsg1r9" + "commit": "bd58f2e3b7a9bd52145aa97997e62ec5d9e7e4d5", + "sha256": "007i3qxjkvqrkpwyx495s46xbfzjxp4hbzgfvg8ys7yi2qxnbsys" }, "stable": { "version": [ 0, - 5 + 6 ], - "commit": "947fa7067cb9a171251972f74b608d58df88faf5", - "sha256": "0840hm6nk6yzz8yp8xqzdrycf7wwklxaxp10q0d30wpxwcrsw5c2" + "commit": "3184edd6ccf9cfb300511feb297b9012ce902bbe", + "sha256": "09n3q3dyi83s4fk4z7csnjicbxd69ws4zp4371c1lbxcvvq2fdnd" } }, { @@ -15461,27 +15423,27 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210226, - 1214 + 20210301, + 2310 ], "deps": [ "consult", "flycheck" ], - "commit": "c5d74b191fb4ee70509e2592fa16a9398f96977b", - "sha256": "0dl9q9hg9yn7fargckkyjgiibxiy72y5vc909dg03q6v4azsg1r9" + "commit": "bd58f2e3b7a9bd52145aa97997e62ec5d9e7e4d5", + "sha256": "007i3qxjkvqrkpwyx495s46xbfzjxp4hbzgfvg8ys7yi2qxnbsys" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "consult", "flycheck" ], - "commit": "947fa7067cb9a171251972f74b608d58df88faf5", - "sha256": "0840hm6nk6yzz8yp8xqzdrycf7wwklxaxp10q0d30wpxwcrsw5c2" + "commit": "3184edd6ccf9cfb300511feb297b9012ce902bbe", + "sha256": "09n3q3dyi83s4fk4z7csnjicbxd69ws4zp4371c1lbxcvvq2fdnd" } }, { @@ -15492,15 +15454,15 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20210220, - 411 + 20210309, + 2100 ], "deps": [ "consult", "notmuch" ], - "commit": "823c1fefc4a393039bced29d6b4c9a9d2aa720fe", - "sha256": "0rhn1ha65xnrv03sn94ii5hl7ycpiz97xz13sxzchla64bwjqy75" + "commit": "f3f8ffe3d2e15e67ded5d7aaa7f50bf17c2b1aa4", + "sha256": "0gkvqwqi07saf8hy7bqbafi97ygp361jrn9qxp7k663jpj7b9d71" }, "stable": { "version": [ @@ -15848,28 +15810,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210226, - 1256 + 20210310, + 1746 ], "deps": [ "ivy", "swiper" ], - "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", - "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" + "commit": "8866138333f92c3d82062c5fa613beba38901504", + "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8" }, "stable": { "version": [ 0, 13, - 2 + 4 ], "deps": [ "ivy", "swiper" ], - "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", - "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" + "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6", + "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14" } }, { @@ -15949,15 +15911,15 @@ "repo": "hlissner/emacs-counsel-css", "unstable": { "version": [ - 20200331, - 632 + 20210310, + 452 ], "deps": [ "cl-lib", "counsel" ], - "commit": "6427dfcbda0d2bbd81db03f9d6b56b06c260ac02", - "sha256": "1g8gz5mz2qclia64qmgw02h5ivywgn46d6djlr7vcdfyp774cf64" + "commit": "f7647b4195b9b4e97f1ee1acede6054ae38df630", + "sha256": "06xvyf9cnyq9zlp7rkq0a0h85yk967icifhg1pfhsz17za97yg94" }, "stable": { "version": [ @@ -16854,14 +16816,14 @@ "repo": "bbatsov/crux", "unstable": { "version": [ - 20210224, - 910 + 20210309, + 838 ], "deps": [ "seq" ], - "commit": "a471cbed343dc5ff3a7150214726fe4ea0d3cf9e", - "sha256": "152c7x1zj4rwq9bj9d8xw4znspfik2g7aigazq9smv12fkmzvzrr" + "commit": "20c07848049716a0e1aa2560e23b5f4149f2a74f", + "sha256": "0v65zy9f5wsq9vpibfccyyv6ww4fwgyx3vc38vz83j0c5b2c9r6n" }, "stable": { "version": [ @@ -16965,16 +16927,16 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210128, - 841 + 20210311, + 1831 ], "deps": [ "tree-sitter", "tree-sitter-indent", "tree-sitter-langs" ], - "commit": "09b4d57d020a97e1696e89baa6d9855ff5c86014", - "sha256": "1k8qz7fivwr8jli5xid156m0cb00mszfxskblylh2rs2fswpg3la" + "commit": "43e591987f620479413defa3d0bc5b3cd7887159", + "sha256": "0mxdywffg4ww98905mc6kjhk9mfzhgwzsn98w0vmy0fckcarl3gl" }, "stable": { "version": [ @@ -17211,11 +17173,11 @@ "repo": "raxod502/ctrlf", "unstable": { "version": [ - 20210227, - 552 + 20210308, + 25 ], - "commit": "4fd7d9dffbbf91dfcaccccb54c571f53c279e94f", - "sha256": "076xjd8aia8q96hakcw861a4hmkfdx0aafhnkwww4fk7vv50b7qx" + "commit": "f9ef7a5e1b53f5ea9d486c93d47806e7d7f432ef", + "sha256": "0b5kyfr7qyv5id61d16r07k37yn690sx42rjnj2jk6q2rwib5zj7" }, "stable": { "version": [ @@ -17423,6 +17385,30 @@ "sha256": "0abpkcn2mcg0c4nycannwz9skvl6w7zgvbh1rx30qw0wl0i5svdm" } }, + { + "ename": "current-word-highlight", + "commit": "02d60c15b4624735ba7e62f7c27a27487f1c7caf", + "sha256": "0jrcgvc60hzcnd66b0na4rd0lnr92pgfrkwwfvih2qjzxf5lpl72", + "fetcher": "github", + "repo": "kijimaD/current-word-highlight", + "unstable": { + "version": [ + 20210228, + 1644 + ], + "commit": "1d185f88ffe8d5ddc788772c40d37cf7e99a03ba", + "sha256": "1da11j754pgshfibj7w9wixhbzcjzn1iqifblflz2mqgny3nsisd" + }, + "stable": { + "version": [ + 1, + 0, + 3 + ], + "commit": "2d7c5547e4b0da361b1533d2ff30e3f62f4b682c", + "sha256": "1d1mz0j51i09g2fn25iik7wk0cc9i6ps8qviik73fy7ivvxjn0vp" + } + }, { "ename": "cursor-test", "commit": "6439f7561cfab4f6f3beb132d2a65e94b3deba9e", @@ -17643,8 +17629,8 @@ 20210119, 1853 ], - "commit": "80fad305784b21a818683010bc27d48302ec7110", - "sha256": "0xz29ac8mpqkzgzdvhdv98aa4mrd6br4sr5fxwpb3kpidmqpa9h8" + "commit": "199743df55c6bfce3cdb08405bd8519768c8dfa9", + "sha256": "18jzrql5g2sd322w25phws7d1v8906lyc0ipn6cknlrv4pjmdazv" }, "stable": { "version": [ @@ -17771,8 +17757,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20210221, - 1947 + 20210301, + 1738 ], "deps": [ "company", @@ -17783,8 +17769,8 @@ "lcr", "s" ], - "commit": "7b1ab644214e03b86dcf7436fd22a65cce2fa858", - "sha256": "177d9gk2fayx1nmd1gs6cf3mi35jakxn2di785qlhk7h5alai9hc" + "commit": "8741419333fb85ed2c1d71f5902688f5201b0a40", + "sha256": "1i4rz1lp78wzn8x9xgjar8h66csdkf5836ny8lwd68m7z5gh0w21" }, "stable": { "version": [ @@ -17812,8 +17798,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20210222, - 419 + 20210305, + 1555 ], "deps": [ "bui", @@ -17825,8 +17811,8 @@ "posframe", "s" ], - "commit": "aa15b9c49b7e09bb23f9a4ff7855122f0eb19976", - "sha256": "02gws113c95567qp2zvxzqdhzapkcx9qnf00k2l0j52f7i0kz49b" + "commit": "7b67475361f7a89a1c3d5f6979d12209ad036f54", + "sha256": "0yvaplfrd6agi8balv1wnyvyi9n7wgc1raqw43qlzaz03bbdq1da" }, "stable": { "version": [ @@ -18013,11 +17999,11 @@ "repo": "bradyt/dart-mode", "unstable": { "version": [ - 20190827, - 2102 + 20210301, + 0 ], - "commit": "04fcd649f19d49390079fbf2920a10bf37f6a634", - "sha256": "1rpdrq8w8vishjpakxvj20dgnnp2qksi1nrd0qllllb5sjyih56d" + "commit": "43975c92080e307c4bc14a4773a61195d2062fd9", + "sha256": "0zpjrq3cra6q6pd52skm11wj0j75v8cnamv504hlq4rgd87vkz2p" }, "stable": { "version": [ @@ -18079,11 +18065,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210228, - 2221 + 20210308, + 2109 ], - "commit": "6a086fccc95e96db2a819346d1eaf504654d9713", - "sha256": "12b13p74p8iw8lxm2lh5lar15fs7j2mcyx837ddmag11qspdyy4p" + "commit": "a17b6b5409825891423b3867cd7bea84852d6ddd", + "sha256": "0swjqkz5bq1f9vphjc6a1mwr7b3rlr8j9jg56f9gwj9gcv9mgjab" }, "stable": { "version": [ @@ -18158,8 +18144,8 @@ "deps": [ "dash" ], - "commit": "6a086fccc95e96db2a819346d1eaf504654d9713", - "sha256": "12b13p74p8iw8lxm2lh5lar15fs7j2mcyx837ddmag11qspdyy4p" + "commit": "a17b6b5409825891423b3867cd7bea84852d6ddd", + "sha256": "0swjqkz5bq1f9vphjc6a1mwr7b3rlr8j9jg56f9gwj9gcv9mgjab" }, "stable": { "version": [ @@ -18182,14 +18168,14 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20210218, - 1550 + 20210306, + 1508 ], "deps": [ "page-break-lines" ], - "commit": "411ff9ff9368f03d09097ad1d395d632fd4d9f40", - "sha256": "0db8h1004ndn1b9cvh27fj5w5r6p83nmskcy983cw5qris02vrkx" + "commit": "1327fc36a0ba3136c7ffd3f1a1dda27f196631e6", + "sha256": "1zq3h3zgssvydxb9lmlcjn6wb2kri4jk96w43cl48myq27nsj5ri" }, "stable": { "version": [ @@ -18369,26 +18355,25 @@ "repo": "doublep/datetime", "unstable": { "version": [ - 20200621, - 2103 + 20210307, + 2203 ], "deps": [ "extmap" ], - "commit": "c51eeb6df180f6c7d1676d1c0af78255bb0fdf95", - "sha256": "11w32jnkc596ybbhqih5d4rbvqk50cc6yyc9759acnzlqfd188xs" + "commit": "276f9d4304180301edabc160d5d17f46532489a1", + "sha256": "0g6qgp6zvrbiaq6yfzqs3bmnry43xspp3ra3hm17x80b6izdsn90" }, "stable": { "version": [ 0, - 6, - 6 + 7 ], "deps": [ "extmap" ], - "commit": "55297bf409f35dbc4bcd26b458b83e349ed11452", - "sha256": "0a3q667pybpmsjkbgf6287jwgpnx8brp5314wb8zbczw6ncygnbi" + "commit": "276f9d4304180301edabc160d5d17f46532489a1", + "sha256": "0g6qgp6zvrbiaq6yfzqs3bmnry43xspp3ra3hm17x80b6izdsn90" } }, { @@ -18529,8 +18514,8 @@ "ccc", "cdb" ], - "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac", - "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak" + "commit": "cec99365fb3ad725c44514b918696ab153596b8d", + "sha256": "0q1vxcm163cs0pwnpnbjanpm49hshiyfx4m915i1wxsa7q9vvv67" } }, { @@ -19128,11 +19113,19 @@ "repo": "lassik/emacs-desktop-mail-user-agent", "unstable": { "version": [ - 20210228, - 1335 + 20210309, + 1355 ], - "commit": "cf45bbbdd77b105df8d2a51e27b46d480ef992c8", - "sha256": "0a18sfy9diwcrzhcykd7pnw990kmlfb60zdxbi0nmkyqzx5gj1hi" + "commit": "64d0a75491414b119e044ea8fdf771753491a8cc", + "sha256": "0gkx1sdplnnihfvqj2cwnfdcd08s13zxv3in3a68fi8w2l6cn7ki" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "6b665208bd9471cd8e4b4a81237b22c93a734528", + "sha256": "0i2j4i6xv3nrkc0v9ch2f6vw9hfg54ghwb1yqmdg2j7wqh3mm0hq" } }, { @@ -19455,6 +19448,35 @@ "sha256": "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a" } }, + { + "ename": "diffpdf", + "commit": "6a084a863fa9c680997efc02fdf69c95bfc3fed3", + "sha256": "0bd7aj4fxb7rg88mlwxryli54p5mxrzir7zj23d7xcvf82wb4aqa", + "fetcher": "github", + "repo": "ShuguangSun/diffpdf.el", + "unstable": { + "version": [ + 20210307, + 932 + ], + "deps": [ + "transient" + ], + "commit": "fdb37bb696aaec6cb2bcece3760866760e68edc4", + "sha256": "1ig7hk9vhlym91gzk4s6h2a6aj425nln29m6f2hpq9jh3qicgh9i" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "transient" + ], + "commit": "fdb37bb696aaec6cb2bcece3760866760e68edc4", + "sha256": "1ig7hk9vhlym91gzk4s6h2a6aj425nln29m6f2hpq9jh3qicgh9i" + } + }, { "ename": "diffscuss-mode", "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", @@ -20351,26 +20373,26 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20210227, - 1046 + 20210301, + 2158 ], "deps": [ "dired-subtree" ], - "commit": "beea35753bc7b0df86f1a966989d626e0aa20481", - "sha256": "16yi9k1lmmfyys2vgfjxpq3mh82g208c54b1nvm6cm8kqxy1x10q" + "commit": "92e7f77ec65c2089d75edb63ca312f55e3033be0", + "sha256": "0ad9r63jp257z95jb5537nbw64q6shdg4m5cmlx8asb7fp2wgsf8" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "dired-subtree" ], - "commit": "347f56480228c2aac97e14f4f5a762c4582d1323", - "sha256": "1ahmvbwwdnjddn8qk6gq5gjfkvi1mvm13a968n7zpcpnphk6ygzb" + "commit": "cfc70763131ae668ff7b4884651f894fd102ffb6", + "sha256": "090dqaqyjmkzrz4szjpk1iip0bdvb0frp4l79393f8ki8w7c16c1" } }, { @@ -20471,11 +20493,11 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20210113, - 1 + 20210312, + 758 ], - "commit": "491308566832a38c0c49a894f7b12b8ff62e7aa6", - "sha256": "1pa9k4y74rihh8d4ij6pdnpybs0ib2vcxvjp7ldlndxqpfzxaxxd" + "commit": "354b7a38d1e5778fa88287ddf2f54a8177bf78ad", + "sha256": "0wpv0ym6zs11pf30bj6b672hgaf0gsh9pxnlbyrbm5pgdwzfcxs0" }, "stable": { "version": [ @@ -20873,11 +20895,11 @@ "repo": "mnp/dispwatch", "unstable": { "version": [ - 20191130, - 52 + 20210305, + 342 ], - "commit": "6abf276b8d66df4996c7e98e7a40cbad8747beb7", - "sha256": "17163bncxf11295bxzbmji09qy0klxzb0w8vxaazij6sxlk90mnm" + "commit": "03abbac89a9f625aaa1a808dd49ae4906f466421", + "sha256": "0wf3cyf5clkmh620q83x361nsnh60jhyfp90iqmabk3qs9x8amgs" } }, { @@ -20952,14 +20974,14 @@ "repo": "unhammer/dix", "unstable": { "version": [ - 20200108, - 1057 + 20210312, + 1850 ], "deps": [ "cl-lib" ], - "commit": "391832823f3f9835d957bc0224e122b376e5d825", - "sha256": "1h7wxi1nk6051arzx8671sf3m178ci9gs3a78h4hp8z0jrz364kz" + "commit": "17f33f9a8bb50156261e10c045d54eb866ea84fa", + "sha256": "1aajxj4xvi8jpskfhh52n6388w1skj1y9aq2xdvwj7cizy57lqn2" }, "stable": { "version": [ @@ -20989,8 +21011,8 @@ "dix", "evil" ], - "commit": "391832823f3f9835d957bc0224e122b376e5d825", - "sha256": "1h7wxi1nk6051arzx8671sf3m178ci9gs3a78h4hp8z0jrz364kz" + "commit": "17f33f9a8bb50156261e10c045d54eb866ea84fa", + "sha256": "1aajxj4xvi8jpskfhh52n6388w1skj1y9aq2xdvwj7cizy57lqn2" }, "stable": { "version": [ @@ -21315,8 +21337,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20210208, - 1500 + 20210304, + 1614 ], "deps": [ "dash", @@ -21326,8 +21348,8 @@ "tablist", "transient" ], - "commit": "0ca910badf86ff2e2dbfdf3f18819dd72a3198fc", - "sha256": "0n21nv79z356wmz2sryq1r0f68ds2kwkgivi8z82lqrv9ndni2xv" + "commit": "85bc970dc2c1b81737c5ab89c62d6b75983388c2", + "sha256": "0y8zdvv11kxkbsrhnh3dl2sgxk6gbr3b7jz3d4kzgs36hyzv15l3" }, "stable": { "version": [ @@ -21521,14 +21543,14 @@ "repo": "jcs-elpa/docstr", "unstable": { "version": [ - 20210222, - 1525 + 20210301, + 1350 ], "deps": [ "s" ], - "commit": "6103a63385f5dfa828a3e759f3668f6be630cd54", - "sha256": "0w69m94i2aqhfcwnvvpkkfrz1vd871rf0fn68jm123mxg1hc76ac" + "commit": "a60b49ed37345c5f47604e857c97978a93e314bf", + "sha256": "0x8ih30m1d2m4za17zzfdjvc2h0qlpdh4nwzgz9laxwibgm499ds" }, "stable": { "version": [ @@ -21670,16 +21692,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210227, - 1747 + 20210308, + 1212 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "1d8d8f885d1e2cdde31c256e11fce95a5b1fcce3", - "sha256": "1irvb4s6y80jpi6lwr7fviwisfnv4nvay29dssbj66k2jqlwyjqz" + "commit": "0c2f2f0aa2911880b20b2a7e9a5ba20f19be7e24", + "sha256": "1i367ihnx3vspwx5ly7imj3rmx9f113jmf4i0siklxx0gb7r65n7" }, "stable": { "version": [ @@ -21723,14 +21745,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210226, - 1558 + 20210302, + 1549 ], "deps": [ "cl-lib" ], - "commit": "35b86f228f76ef4f782562c9d3188769e433b17b", - "sha256": "1xyykbygb0dajbwmfl50pq7azzhzis53nqg8az9c7rw1fd9bds9f" + "commit": "55f01ede533c800e6eb44ef5bdc2fe64d0400425", + "sha256": "19lhvf6gsvpadmx27lswdnl6y93sywn17d7yjbigva62lmr6yq0w" }, "stable": { "version": [ @@ -21832,14 +21854,14 @@ "repo": "zk-phi/download-region", "unstable": { "version": [ - 20200816, - 1009 + 20210306, + 415 ], "deps": [ "cl-lib" ], - "commit": "0dca3b224649bba80a7e9ecbf1d1b6f6be962455", - "sha256": "1yka864dzz8nxskcllqyxk04313hlyfc9a4p0apmk56q19fcpwgn" + "commit": "e0a721858a22896fa1d7f1d5689dd0878dbc58fa", + "sha256": "1hvnwqx61g4idqww1axs4xa3jxrd68lvipgvca22ybr2fpdny1xx" } }, { @@ -22237,11 +22259,11 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20210214, - 811 + 20210307, + 2140 ], - "commit": "95c08dc4841b37902fad63a5a976d20e7a5ce3b0", - "sha256": "11r68sh3yrrfib7pixnazispwsffrygmgplffrv8qq57xrqzyxih" + "commit": "37529fc7a98564164c87103e5107a6dca32b0e44", + "sha256": "1h2j25b6qayydl841zwbh73fw1177xgskrqm27cqmfx0bcpx7qq3" }, "stable": { "version": [ @@ -22319,16 +22341,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20210227, - 2100 + 20210303, + 1714 ], "deps": [ "dash", "popup", "s" ], - "commit": "782c2f9595d4288ac0f662d6620e23b8e33f0790", - "sha256": "0sczljv4isgc6r4x46g876kivgq8ywr8z4gb4w1cis9bivrlbdsf" + "commit": "8bc195000e17ce6c72755a8fb55ca0fcd36add76", + "sha256": "0dc31yy4r41nwwv57dzbd6zgwddizqh4q4qagpqx645l509s7k7i" }, "stable": { "version": [ @@ -22372,17 +22394,17 @@ 20210213, 757 ], - "commit": "a8c6ed8bb27af690955e51eabbef0382b7e2d41e", - "sha256": "1c2r9njzm4l3rvhz0854qymf70dbmawfiahm0iaf5gva480kjv3a" + "commit": "2d20e430437a09fb438d7294672e4c7f30a68504", + "sha256": "1rl8zrv7bwsvffbp9k7gqz2j5gmx7bs1rbq3vhq5aq2hw5k06an4" }, "stable": { "version": [ 2, 8, - 2 + 4 ], - "commit": "6c471da57bea666267a8a63034aed57962f378b0", - "sha256": "0b7mqcns4n614fq3p9kisffks3j2wzawxp4xccka7wgyn1q2pgr8" + "commit": "b6a3f66fb15378fc7170e94778f4d2c0b142ad92", + "sha256": "1p3r197cfb96675n2s7mbggndqspcxxmk9lkncirixm3k7ww36l1" } }, { @@ -22423,11 +22445,11 @@ "repo": "integral-dw/dw-passphrase-generator", "unstable": { "version": [ - 20210226, - 2028 + 20210307, + 1834 ], - "commit": "66d92f592b35fd168f23d7c58d698a1ed2dcaa0a", - "sha256": "1pfz1wwrdpdkd29309dryy7ficl1h1rfmgv7fbpy9p33vs9mdi9p" + "commit": "8c5b5c9d435de97ce9b95b9280feb1c0a57a60f8", + "sha256": "1793bwfn3c2f9dxcs8mmps3riy25y5baz1fvbpdr9pq19sl58bj5" }, "stable": { "version": [ @@ -22465,11 +22487,11 @@ "repo": "dylan-lang/dylan-mode", "unstable": { "version": [ - 20210227, - 1818 + 20210309, + 1456 ], - "commit": "fe965628177b0ee0bced7aa4fa42b6f5519c2d0e", - "sha256": "17q91qnxbmbmsdnq9pnhn7q8wmq4bafl2z701783ka7nwf4z3ihl" + "commit": "25dd620cf467a4a322461d9f9983db0fcca08e43", + "sha256": "0w70h20b33h6vykqkb0h3cb21hv1nd7rm4j9dcc66ihpisw9crkp" } }, { @@ -22865,28 +22887,28 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20201205, - 1908 + 20210303, + 2352 ], "deps": [ "popup", "request" ], - "commit": "eacc00637380fbd9a2cc95821e91969ab75e76eb", - "sha256": "12vlkbi15c54wpy0ak5mq89x354f86qk1y9g413bacafg5hxnn95" + "commit": "b3c9ca2a4e1d90013a7d990056d56cdf2bdf8e40", + "sha256": "1g48c2142yqs8ir2872q0zdl46qprx2mhhhd9jvcscakm4xv3cdf" }, "stable": { "version": [ 3, 9, - 50 + 55 ], "deps": [ "popup", "request" ], - "commit": "eacc00637380fbd9a2cc95821e91969ab75e76eb", - "sha256": "12vlkbi15c54wpy0ak5mq89x354f86qk1y9g413bacafg5hxnn95" + "commit": "b3c9ca2a4e1d90013a7d990056d56cdf2bdf8e40", + "sha256": "1g48c2142yqs8ir2872q0zdl46qprx2mhhhd9jvcscakm4xv3cdf" } }, { @@ -23043,25 +23065,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210219, - 1115 + 20210307, + 1125 ], "deps": [ "parsebib" ], - "commit": "32f97677bcfca2157583473af507c17e24f88f55", - "sha256": "1wd63jiik98ya5z4bkdpnznw03c1qri9wb8nn0w9smia9888a640" + "commit": "6a3351c4bee70517facf0eac457a17a1efc21144", + "sha256": "0ppp6a8qyllh1kjrh8fa8dvhv98wnq0w742mzh8gahkjbrsjdwcj" }, "stable": { "version": [ 2, - 29 + 30, + 1 ], "deps": [ "parsebib" ], - "commit": "dd18665862413fc1e1aea0becb318a9e6d281d10", - "sha256": "1d0xnhdcsz2ysq145k2l0f2r4vb0pkai1v6wl6sfba7xi5fc323i" + "commit": "6a3351c4bee70517facf0eac457a17a1efc21144", + "sha256": "0ppp6a8qyllh1kjrh8fa8dvhv98wnq0w742mzh8gahkjbrsjdwcj" } }, { @@ -23531,15 +23554,15 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20210221, - 1617 + 20210309, + 1345 ], "deps": [ "cl-lib", "nadvice" ], - "commit": "048c553999c90db0b6066b3ec647a79f4af9985d", - "sha256": "0i1h0p78dm256y7gg2fzhks4x8hq89s5i5m39pipfwy4srkp3d19" + "commit": "9da2dab6474e1f735a2e9fbc7f26a553497c58c2", + "sha256": "0vpspvng3g0l2lqig3fvmxhxl4dqqs9zcyfgymjak03nfcilm394" }, "stable": { "version": [ @@ -23890,8 +23913,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210227, - 1019 + 20210306, + 2312 ], "deps": [ "eldoc", @@ -23900,8 +23923,8 @@ "project", "xref" ], - "commit": "92b0c5d385cc6f3593f60c2f93917fd8b2d44207", - "sha256": "1rlgindfq43622gj8jsdkx3b590lhkr2zn18djyfd7g29j26b4wm" + "commit": "f0c770cfbbc75c7aeb22cd2b118bc3948596d7a7", + "sha256": "0qcjiawszs3v166q8nanifp465yd5ib2gl2ywrlmgk1l7ixr80wp" }, "stable": { "version": [ @@ -24561,11 +24584,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20200611, - 2314 + 20210311, + 256 ], - "commit": "01b26d1af2f33a7c7c5a1c24d8bfb6d40115a7b0", - "sha256": "1lj87zfcvmzm34rlq5s4y4x2nwckwg5qxlhlgl4qry3bf16bmkcf" + "commit": "9bea3248938b99498f5114f46441720e1d4b2f3a", + "sha256": "0l540rpw2vwjm9vh4bv673lcjw20v5gvfyf1xmxdsfhsf7m0rdns" } }, { @@ -24836,16 +24859,16 @@ "repo": "freesteph/elescope", "unstable": { "version": [ - 20210128, - 1509 + 20210312, + 1147 ], "deps": [ "ivy", "request", "seq" ], - "commit": "cd3ce082e47c0c13cfce34e6f6957c2275f9416b", - "sha256": "1pk8avmvvcxmv2gsl5n8g66jjwi92py1r9f5h9c0wjq0nrazapy1" + "commit": "36566c8c1f5f993f67eadc85d18539ff375c0f98", + "sha256": "0qpgkv0h71pkbm006ni56hbimmn9wfvciaicxylhpbcqkd7n1gc1" }, "stable": { "version": [ @@ -24893,11 +24916,11 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20210226, - 258 + 20210309, + 2323 ], - "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6", - "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1" + "commit": "e29c8b91450bd42d90041231f769c4e5fe5070da", + "sha256": "12m4q8zfmn6g0kz2v3vmch4kbmivxshj9xk58j2f3f3c8fvk6567" }, "stable": { "version": [ @@ -25012,26 +25035,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210226, - 106 + 20210302, + 2051 ], "deps": [ "elfeed" ], - "commit": "6f99f4b9338c1a4e64885a799ac01c5b9e1d3a0a", - "sha256": "1l7xmnn0j5h01416ras5fjb8x68ssq9hzkcz7p4539fgq5m0p9y0" + "commit": "f59cbc38c83007e160722347c8cb5438d5fe13a0", + "sha256": "07xid0a31ghknbfwj8dxzbqkg4sfayjhlqvp17p2bzlf1mj0zjyd" }, "stable": { "version": [ 0, 7, - 4 + 7 ], "deps": [ "elfeed" ], - "commit": "8c895a786be96db4caab476d4db30202c51b6c70", - "sha256": "0zkkrf7xl91c8156vq0njkqlbdx2949s8pmpy62w2xfl12f2wb98" + "commit": "f59cbc38c83007e160722347c8cb5438d5fe13a0", + "sha256": "07xid0a31ghknbfwj8dxzbqkg4sfayjhlqvp17p2bzlf1mj0zjyd" } }, { @@ -25049,8 +25072,8 @@ "elfeed", "simple-httpd" ], - "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6", - "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1" + "commit": "e29c8b91450bd42d90041231f769c4e5fe5070da", + "sha256": "12m4q8zfmn6g0kz2v3vmch4kbmivxshj9xk58j2f3f3c8fvk6567" }, "stable": { "version": [ @@ -25152,11 +25175,11 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20201128, - 1009 + 20210312, + 542 ], - "commit": "ed9578dfdbbdd6874d497fc9873ebfe09f869570", - "sha256": "1268wk05j0xjqah56x7mwxvkqbaal8nal894imy42ls043ppvqd3" + "commit": "924b07d28e4f5b82f0e1377bcde800068f0a6d9d", + "sha256": "1pf37rlpmr8fjaxqk47p7dv84nksgh3r63m23jpi1g49myvwfzgi" }, "stable": { "version": [ @@ -25725,11 +25748,11 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20210217, - 2309 + 20210304, + 1432 ], - "commit": "ceef14444a5d668ec2eac2954db9f3fa8971521c", - "sha256": "0nngpjgc98hb3aq8cq32n3n6qr59jnmm5c81i105x0ard3025jgk" + "commit": "893368d222faf94d0be66da8ab581c47e1c04082", + "sha256": "115wrc8rnslyssh2fwd1mc0a6l942rkjzfv6c4509h95b2xfdp8p" }, "stable": { "version": [ @@ -26125,14 +26148,14 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20210226, - 1928 + 20210303, + 1507 ], "deps": [ "cl-lib" ], - "commit": "18e88648cdac06e62b9470bba03c7512c7f6ad00", - "sha256": "0jwxiaf6ajiqd18albj1y7aqj2r6f5k813kbbwwhixqk1sjd4i0c" + "commit": "99997af93310128cc95b8ddceacb448daed2403a", + "sha256": "03syfvwsbrrmghdav3xkmpjvdfh1q1qr880a6f6wkri9iazg021g" } }, { @@ -26143,20 +26166,20 @@ "repo": "knu/emacsc", "unstable": { "version": [ - 20210226, - 555 + 20210302, + 806 ], - "commit": "75761078047f2a28d74eab527b881128faaa4b75", - "sha256": "190j3gmy9fwm5ibk1zpxczqakjl9vj1c7jc7aik88jrs3l711sn7" + "commit": "409fc548bb650c6e832b459c756b13de68147117", + "sha256": "04k3gnfhqy0i4vb03k1jr3r43sfpxs6dyx863gsgz6qnkkbqrydn" }, "stable": { "version": [ 1, 3, - 20210226 + 20210302 ], - "commit": "75761078047f2a28d74eab527b881128faaa4b75", - "sha256": "190j3gmy9fwm5ibk1zpxczqakjl9vj1c7jc7aik88jrs3l711sn7" + "commit": "409fc548bb650c6e832b459c756b13de68147117", + "sha256": "04k3gnfhqy0i4vb03k1jr3r43sfpxs6dyx863gsgz6qnkkbqrydn" } }, { @@ -26422,11 +26445,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210228, - 10 + 20210309, + 1632 ], - "commit": "0c7323953e628c8797270a37c0f639fe23092175", - "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l" + "commit": "d267c11b2d6f510d9e173400ec90e18a471fc7b3", + "sha256": "1a8qj71jcy0cpywy6677kg9d3l2a4v96nvaw7kccm2xmsrhq6wa2" }, "stable": { "version": [ @@ -26445,15 +26468,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210223, - 1919 + 20210308, + 1615 ], "deps": [ "consult", "embark" ], - "commit": "0c7323953e628c8797270a37c0f639fe23092175", - "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l" + "commit": "d267c11b2d6f510d9e173400ec90e18a471fc7b3", + "sha256": "1a8qj71jcy0cpywy6677kg9d3l2a4v96nvaw7kccm2xmsrhq6wa2" }, "stable": { "version": [ @@ -26620,15 +26643,15 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210228, - 1251 + 20210310, + 2103 ], "deps": [ "cl-lib", "seq" ], - "commit": "757043ba5c4d259df41f71fa6545a156de107ff8", - "sha256": "05y09nr3l8xh8zg301jbl37yvm213cdq99gwjgzjs1vmlg8hp0nb" + "commit": "de0c4079ccdf3e17b722e3ddf2a275e66703b6bb", + "sha256": "1m334c1c1b6jfh100xfdxfqs89i5q1vw6dwjf4alydl0d08q91lc" }, "stable": { "version": [ @@ -26958,8 +26981,8 @@ "ht", "seq" ], - "commit": "cfa00865388809363df3f884b4dd554a5d44f835", - "sha256": "0dw0wkirphwk7iv61b9z5qbg850nnyrivi6d2a80al1nmxkla2sg" + "commit": "1b726412f19896abf5e4857d4c32220e33400b55", + "sha256": "1g8dviwmwifzjvy9rvnhr9hsxwv37ksqikqccrbjyrpcyv57z1a5" }, "stable": { "version": [ @@ -27996,8 +28019,8 @@ 20200914, 644 ], - "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0", - "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8" + "commit": "f9a181685397517b5d14943ca88a1c0acacc2075", + "sha256": "10gk6052zdp28n9z3bjxwcgg0161sfcnz52h46w7s5jwibl1ymiw" }, "stable": { "version": [ @@ -28021,8 +28044,8 @@ 20210226, 1127 ], - "commit": "cd074622c9ed4c93d4f12ded40f2a36f91a26bc0", - "sha256": "0pf06a9wgzqm49xqyivddc3r3mc2g6rf3s7zsnxnnsp5wjx4amw3" + "commit": "13f941d2ed90b3dcb0f8fc97bbad79bcdc474f64", + "sha256": "1ikxsgynzs0k3yxxf442bxnvlpy5zkkri3i886sy03cik04yhjvq" }, "stable": { "version": [ @@ -28884,11 +28907,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210227, - 2101 + 20210307, + 735 ], - "commit": "4e9a04284d00232e20d44269195e2a524252ebe0", - "sha256": "07k091b04gkmk8mdbqjvr9br19v8b0blrn5ywxvimyy3vwrxb87r" + "commit": "a83206ab65ed5f0b1710de69241938f2fc7e3d25", + "sha256": "045004dmljnxfvalngjp8y0qdmii68gk5jp12r2fg0axd5rwxprk" }, "stable": { "version": [ @@ -29467,15 +29490,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210228, - 1738 + 20210305, + 1341 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "a50a15f4057dd474f274464842381aa44e550b4d", - "sha256": "05p49hgxqs650snivcnqrj3xlkaxcs1ki0k9ybf335nnxgdfg4zr" + "commit": "f5ab7ff7b5cfbcdc6953589954c9aadc2d81ff6a", + "sha256": "1na7y6d77rzsvcqqaadzvv3m99dsbj73vrnldabk89i3gngdcsvs" }, "stable": { "version": [ @@ -29669,15 +29692,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210209, - 629 + 20210302, + 124 ], "deps": [ "annalist", "evil" ], - "commit": "334670e29d964c5f591f75ccbf52b7b5faf4daba", - "sha256": "0drjcdclzy27ja95q9wp25p798nr2xwix2br50pp0s73rpfvv2sy" + "commit": "26493597c74a7e574364aa2ca751a1e70ee4e5eb", + "sha256": "123shmnxrc304ppa1xc4ckxsizw3j88llrvg2kjgafj7b7csmjcv" }, "stable": { "version": [ @@ -30370,20 +30393,20 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20210208, - 530 + 20210311, + 37 ], - "commit": "2730820b9ccedf758c8a0428ee2c994c9fc415dd", - "sha256": "1y5pn3rkqj8dxp5c7dsci621vnv6hsia74w2c1hybkkrjbka851q" + "commit": "b8ac35fe019df5602c31912f65303a3d8ad0066c", + "sha256": "1vyl8lidhjph7k86n8q09mwqpasaxsmwb8vi5i2gcd6klds9hg0d" }, "stable": { "version": [ 3, 5, - 3 + 4 ], - "commit": "2730820b9ccedf758c8a0428ee2c994c9fc415dd", - "sha256": "1y5pn3rkqj8dxp5c7dsci621vnv6hsia74w2c1hybkkrjbka851q" + "commit": "b8ac35fe019df5602c31912f65303a3d8ad0066c", + "sha256": "1vyl8lidhjph7k86n8q09mwqpasaxsmwb8vi5i2gcd6klds9hg0d" } }, { @@ -30992,8 +31015,8 @@ "deps": [ "evil" ], - "commit": "a50a15f4057dd474f274464842381aa44e550b4d", - "sha256": "05p49hgxqs650snivcnqrj3xlkaxcs1ki0k9ybf335nnxgdfg4zr" + "commit": "f5ab7ff7b5cfbcdc6953589954c9aadc2d81ff6a", + "sha256": "1na7y6d77rzsvcqqaadzvv3m99dsbj73vrnldabk89i3gngdcsvs" }, "stable": { "version": [ @@ -32283,19 +32306,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20210128, - 2108 + 20210303, + 1351 ], - "commit": "14a755f2f85e4db00978de76e1b7f404bfaa5e67", - "sha256": "0nxijsqwq3kvszv3f3r4z0vskxp9f0zjq5mx0c6gzfc4q82lvqkr" + "commit": "2db5c559ca7356189083fb698a053bb1fee922a9", + "sha256": "1gk2dxmxv0sgkng7zgakz0gq9i0zh3wrwzsi785s338vjyypwm3g" }, "stable": { "version": [ 2, - 16 + 17 ], - "commit": "e475a0805cd9f4bb0f7397e4d37b868f42d96c00", - "sha256": "1djgrjnqapxjpnjly3mk9xna27fgl53rj257slz2dm3svhyghk2n" + "commit": "2db5c559ca7356189083fb698a053bb1fee922a9", + "sha256": "1gk2dxmxv0sgkng7zgakz0gq9i0zh3wrwzsi785s338vjyypwm3g" } }, { @@ -32636,11 +32659,11 @@ "repo": "yqrashawn/fd-dired", "unstable": { "version": [ - 20201217, - 547 + 20210311, + 321 ], - "commit": "9fb966df33e7dde9360b8707f7a0197694f46abd", - "sha256": "0gx84kr8fnx8nic3iasqjdi1z6g9shfghin13kh5i9h7d8n83xkq" + "commit": "7d18938751d047eef18bfb5975195419f0d1e2d3", + "sha256": "0182hg9iayz371lv4flls3gwsvn7bad027h5bn7lizvxxmgg3c6s" }, "stable": { "version": [ @@ -32758,11 +32781,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20201221, - 543 + 20210301, + 1703 ], - "commit": "bebc9dd58a845928114082c5ab4538b9869b4fc7", - "sha256": "1dyzfxcaq0gzw957386gapha4kai2y0hv6qqpv7gs4hsilvr8vzb" + "commit": "b0ce628d253e0fcb648144081535bb8569532220", + "sha256": "0mqfwmqdfm3j4yjcmpwgikblsgfxmj15pagq537ds9yb960myxs1" }, "stable": { "version": [ @@ -33080,20 +33103,20 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20210227, - 546 + 20210310, + 426 ], - "commit": "28de73305f6e83e7eebd5a3e7f7ec2f3c0f4985a", - "sha256": "1afridpi5imdxcv257872nx3g4rgzzi1ld629774da3p36jpvdwl" + "commit": "ee471c23a5a890427b1afa55cd74ad27a42f46f7", + "sha256": "1zygz8imm0r0370imzksfc6257hcnyi1lri8ngdsspzz6hlrd2z1" }, "stable": { "version": [ 6, 0, - 1 + 2 ], - "commit": "06df008d5dc9eaced2dfc216f934a79c66b5cd5e", - "sha256": "1r9x8fzc2ccyqk24q3gijssa9jmfc6lsylayjh24xz42kdbw2kx8" + "commit": "ee471c23a5a890427b1afa55cd74ad27a42f46f7", + "sha256": "1zygz8imm0r0370imzksfc6257hcnyi1lri8ngdsspzz6hlrd2z1" } }, { @@ -33104,11 +33127,11 @@ "repo": "h/find-file-in-repository", "unstable": { "version": [ - 20210225, - 1929 + 20210301, + 2202 ], - "commit": "047eeeb8bf1958397a048d9ea8aaa43f80bac34e", - "sha256": "1czhnf4ayiygkv3nxw3gdaimy2l6pfy308msnp2sjy0q719ygc79" + "commit": "10f5bd919ce35691addc5ce0d281597a46813a79", + "sha256": "0x8f0nw7w9lvkcrxgyfmdb8apw5da57lkbkxxysc8z5z6qzngqrr" }, "stable": { "version": [ @@ -33943,11 +33966,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20201202, - 138 + 20210304, + 1341 ], - "commit": "696228a619f6078b16f9f77071112f6ad2a25c4e", - "sha256": "0c39jgxykl1z74r0q7xiamwcnh6slidxrwg2f8ksdvyppgnqldwh" + "commit": "960b63576a13b7bd3495d0ad1883ed736873543b", + "sha256": "0l6k8ydrdbwms8va45jw88514ichj1qxbxkq8mfvvacb3rkb0gj0" } }, { @@ -33965,8 +33988,8 @@ "flutter", "flycheck" ], - "commit": "696228a619f6078b16f9f77071112f6ad2a25c4e", - "sha256": "0c39jgxykl1z74r0q7xiamwcnh6slidxrwg2f8ksdvyppgnqldwh" + "commit": "960b63576a13b7bd3495d0ad1883ed736873543b", + "sha256": "0l6k8ydrdbwms8va45jw88514ichj1qxbxkq8mfvvacb3rkb0gj0" } }, { @@ -34775,15 +34798,15 @@ "repo": "flycheck/flycheck-eldev", "unstable": { "version": [ - 20210228, - 2234 + 20210305, + 2231 ], "deps": [ "dash", "flycheck" ], - "commit": "d222ce6a8e59385ffeeee7c3a36ee41cf9a8561e", - "sha256": "0lipvy48ilc8cxkzk64j7384rx0w57hjcgxbn9dp31c8i5pygj6y" + "commit": "2ed17db874da51fba3d2991a1e05cf375fca9619", + "sha256": "0kzcx6sjwxzamal0za2vnll77kpvshr12zwxc9czxvc9vpckf921" }, "stable": { "version": [ @@ -37217,14 +37240,14 @@ "repo": "juergenhoetzel/flymake-nasm", "unstable": { "version": [ - 20210107, - 524 + 20210310, + 1540 ], "deps": [ "flymake-quickdef" ], - "commit": "92b96ca659e88d25e21e711038332a5b4c199e61", - "sha256": "1s76s5y5lwdw84bkcbx3xawc748hm9p9g2sfpn33mmz1mc227kz5" + "commit": "27e58d7f3a48ca6fc12238fe6c888a3fdffc3f75", + "sha256": "0j4zai3par1i27szs2rws72qrqjcr3yz55pp56hl397r40kzwgmq" } }, { @@ -37592,11 +37615,11 @@ "repo": "federicotdn/flymake-shellcheck", "unstable": { "version": [ - 20200921, - 2341 + 20210307, + 1609 ], - "commit": "060da4097c1caadc1eb1d6feac4deaedaadb6dc0", - "sha256": "021qmkysx8gmwxnxcx6izs1q1h66ncvrwlvpk1wsxw9lf9symm7c" + "commit": "68c7da5b53be4a3cc4d4c85d9367ed2a47448aec", + "sha256": "00062bk5q5n5z733v18nk2b242azhqsvcy4jprpcmllpd9pmx7mv" } }, { @@ -37861,11 +37884,11 @@ "repo": "rolandwalker/flyspell-lazy", "unstable": { "version": [ - 20201028, - 111 + 20210308, + 1253 ], - "commit": "d57382cf06462931cb354f5630469425fce56396", - "sha256": "0ahq75izwjmkzdkj25k3iml76csgkqav912dnlairqsnc9il6bj8" + "commit": "0fc5996bcee20b46cbd227ae948d343c3bef7339", + "sha256": "1r9sz6p8p2g3n59pqfqllr5324pg7q3fji6lki9qpy0l5yd6j1p4" }, "stable": { "version": [ @@ -37932,16 +37955,15 @@ "repo": "troyp/fn.el", "unstable": { "version": [ - 20170210, - 204 + 20210304, + 1812 ], "deps": [ "cl-lib", - "dash", - "dash-functional" + "dash" ], - "commit": "f685fd0c08ec3b1d1b9974b37e62edd78a000cb8", - "sha256": "1k8pwlpcvlwr4pavg85ja8hdc7rrbafqs1mhhqr5gbq8cp822sja" + "commit": "98e3fe1b4785e162d9aca978a2db106baa79260f", + "sha256": "0qaxbqwqxxgvw1lb6icsv3mx215mg682n3jsrmqfsvgl9nc97ps6" }, "stable": { "version": [ @@ -38310,8 +38332,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210228, - 1555 + 20210303, + 2046 ], "deps": [ "closql", @@ -38323,8 +38345,8 @@ "markdown-mode", "transient" ], - "commit": "b4df041a25811daa2536f9502461b99379dc0f11", - "sha256": "0v5i3wnlajz7yznksml1rwl8avkjlqf3rbjl0gpr3ylv05hcra9k" + "commit": "8382fd3d43855de779c46da338dd59b1cb1d333e", + "sha256": "1ah4f5sy2ja33ibk37yqps7vmgdvkp36vahs2njqg0rg6zx057r3" }, "stable": { "version": [ @@ -38379,15 +38401,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210224, - 1954 + 20210305, + 809 ], "deps": [ "inheritenv", "language-id" ], - "commit": "8f25a5e72f81b60bcf27fdfd653b76e7c4773895", - "sha256": "0yfk59sbv8ydhc1sqwf3254h9qag7zmbs4h9f47kc9kp79a93i26" + "commit": "50e9def18f5cfa6bc7d30567dc05e4539ef3af8c", + "sha256": "0vi9r4sm8isi33dc2vnjq61vy1pxi1bqd5mxy2vfpg5sff3awgmg" }, "stable": { "version": [ @@ -39007,16 +39029,16 @@ "repo": "waymondo/frog-jump-buffer", "unstable": { "version": [ - 20201117, - 1803 + 20210308, + 2316 ], "deps": [ "avy", "dash", "frog-menu" ], - "commit": "39aeb02f5a38f3637b5e1d0560b366daa131d421", - "sha256": "1zgzvcrybcx5vvvqhxxhridsfcjggcyb2kxzsmp6fmd4bdhd4crx" + "commit": "3481626cccea8e77e4eee79b05f99c9171559f7b", + "sha256": "1v7p3ln8jw3qm2ka0jl55wq9smal5k31rzsina9i8c5mcslml1l2" } }, { @@ -39148,8 +39170,8 @@ "deps": [ "cl-lib" ], - "commit": "1488f29aa774326e5d6bf4f9c2823124606399b3", - "sha256": "1wyyxg3z7s7ga003pjik1116vrj5x9cssmk50s80b4xdxmw04viz" + "commit": "0ca6901328dbc4279d70dedf7201ceebdaab037c", + "sha256": "063wyg4mpq6g5h462l6zs7r2g2zavlxm4hv2lh7lr1asrmcf6rxm" }, "stable": { "version": [ @@ -39344,19 +39366,19 @@ "repo": "auto-complete/fuzzy-el", "unstable": { "version": [ - 20150730, - 337 + 20210301, + 1541 ], - "commit": "a36bde2f6e94d6b2bfaae68d73bbd39734e5b907", - "sha256": "1aj7r16bnx2jr2gpzwsmr3yqmfza5qbdcn78chcsfqxv5c8bgswa" + "commit": "122939ee0a82efa1bcf405de3134debe34e4a0b6", + "sha256": "07kpixgqc6vky91bi7j4r0q78ccc3azydwmkaz4z7lr3ncbc6ymj" }, "stable": { "version": [ 0, - 1 + 3 ], - "commit": "939f4e9a3f08d83925b41dd3d23b2321f3f6b09c", - "sha256": "1g7my9ha5cnwg3pjwa86wncg5gphv18xpnpmj3xc3vg7z5m45rss" + "commit": "122939ee0a82efa1bcf405de3134debe34e4a0b6", + "sha256": "07kpixgqc6vky91bi7j4r0q78ccc3azydwmkaz4z7lr3ncbc6ymj" } }, { @@ -39748,11 +39770,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20210221, - 2032 + 20210303, + 1351 ], - "commit": "26dd2f4ae0f44879b5273bf87cdd42b8ec4140a1", - "sha256": "05xv5amg5pffgnrlcl0yjlx37p9m5hxllq6xn96sf8dcpgsiprfs" + "commit": "8e61c27b628373523b7c467d5f71aac8c873258b", + "sha256": "1hnfyr4sbznmmqamk6zwwyq8z4a8vi628a0wfxmj8lyzjb2dqyi1" }, "stable": { "version": [ @@ -40039,18 +40061,18 @@ "repo": "mkjunker/ggo-mode", "unstable": { "version": [ - 20130524, - 1143 + 20210310, + 1345 ], - "commit": "e326899d9ed8217c7a4ea6cfdc4dd7aea61d6c1b", - "sha256": "0bwjiq4a4f5pg0ngvc3lmkk7aki8n9zqfa1dym0lk4vy6yfhcbhp" + "commit": "6a7617b5af3d13029e4d680a375e8107c40d0fac", + "sha256": "1l39j3vkjszn3xkg2dk7r8k4fy4hjn0gp5n3bm6wv25wc8946dx4" }, "stable": { "version": [ - 20130521 + 20210310 ], - "commit": "ea5097f87072309c7b77204888d459d084bf630f", - "sha256": "1m9ra9qp7bgf6anfqyn56n3xa9a25ran10k9wd355qknd5skq1zz" + "commit": "6a7617b5af3d13029e4d680a375e8107c40d0fac", + "sha256": "1l39j3vkjszn3xkg2dk7r8k4fy4hjn0gp5n3bm6wv25wc8946dx4" } }, { @@ -40602,16 +40624,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210206, - 2245 + 20210309, + 1106 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7", - "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356" + "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a", + "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56" }, "stable": { "version": [ @@ -40897,8 +40919,8 @@ 20210121, 235 ], - "commit": "f76bffd42fb4ed8ffe09d48c084f6577b0b99fa6", - "sha256": "0l7xmvmj5s93hc39wjjv75f22zbhahnmcxpmvx3dfvsbig9pmk75" + "commit": "d6eef8051003a9a0966e4524232648d110199c74", + "sha256": "1jc4acvlhgjdfh0ckalnv4hiv7nx8l1i6wh02zv2p9gxjxaqrj7x" }, "stable": { "version": [ @@ -43536,8 +43558,8 @@ "magit-popup", "s" ], - "commit": "ee5d4c3f398dbd307c06cb092361268ee4afc60c", - "sha256": "0nx4zgafgwhzddsyvb4im0rm0k6bvd0lialr9k21mvs2amxpwmq7" + "commit": "dc29aa29c61c0013bd00091654cc8ce48e888264", + "sha256": "1irrli6cx7c1hz53ipwhi87876m789anqpjkfhyii0vk9crq24r8" }, "stable": { "version": [ @@ -44514,14 +44536,14 @@ "repo": "tmalsburg/guess-language.el", "unstable": { "version": [ - 20210217, - 1507 + 20210308, + 1514 ], "deps": [ "cl-lib" ], - "commit": "e7decda098ee6819b37bacd958260c7c789962cb", - "sha256": "0d0348knda33qb9l729bz5ccig49hhw15dbjayl9y6l23nlwx7yg" + "commit": "7e511d23ee4315a79081c53596398c471572fb0f", + "sha256": "03bm6j8d1v5z1gz1chlpp7s3jzi0lnq6nqdw8r7z1ik5si59dvj5" } }, { @@ -45221,11 +45243,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20201230, - 342 + 20210303, + 1948 ], - "commit": "3a019e65b504861d7ea23afbfecd14e5ef63e846", - "sha256": "011x9mp4ili0g9dq6ql33dq7xgv479di37phai0q282hkh5487q0" + "commit": "20f72ccc17c8233dbb7c94ebf52a2a59e7d97730", + "sha256": "0lgm5hbzbzb9izpsryvhiygq26cg5dpwmkxbvldikj9scw1dp57i" }, "stable": { "version": [ @@ -45570,15 +45592,15 @@ "version": [ 3, 7, - 0 + 1 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "5ad6c83681fda7bfd5a745fedecaa924630253dd", - "sha256": "0lxq13bsbh7xawgsq08kjm7s28x9yl8mid3538flv5kcc1rv2b9y" + "commit": "8b0b9953a71ba07c24fdfc4d26fab21fb66e4d1f", + "sha256": "0b8sfpvy02ijk9xi9b44762b718jqfq063wcg75dk3q452d27s1h" } }, { @@ -45658,14 +45680,14 @@ "repo": "emacsorphanage/helm-ag", "unstable": { "version": [ - 20200915, - 1650 + 20210305, + 334 ], "deps": [ "helm" ], - "commit": "db52f860b50aa4d5edfa1c6c97802d36aef7f78b", - "sha256": "1l95vskrvk88a2glpn2pdylcpy7qxqg5qgmjnh9w24xfyc77g513" + "commit": "51e164b4bb1a9826fe8b39c0d02b4064c9352b9f", + "sha256": "0371s2y06pipjn0ka8c1a0r6g8migz5sbm8hqqilng1cr1dm3x7a" }, "stable": { "version": [ @@ -46476,13 +46498,13 @@ "version": [ 3, 7, - 0 + 1 ], "deps": [ "async" ], - "commit": "5ad6c83681fda7bfd5a745fedecaa924630253dd", - "sha256": "0lxq13bsbh7xawgsq08kjm7s28x9yl8mid3538flv5kcc1rv2b9y" + "commit": "8b0b9953a71ba07c24fdfc4d26fab21fb66e4d1f", + "sha256": "0b8sfpvy02ijk9xi9b44762b718jqfq063wcg75dk3q452d27s1h" } }, { @@ -47998,16 +48020,16 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20200620, - 915 + 20210305, + 1705 ], "deps": [ "dash", "helm", "lean-mode" ], - "commit": "15bee87dc4080b87c543964375b7ce162317ab6f", - "sha256": "127b7ny5mr1y14yg54gy7an3lk3928w4y9a22295i4v4zgj704j4" + "commit": "5c50338ac149ca5225fc737be291db1f63c45f1d", + "sha256": "13vrg0pp7ca0lh4j9cyg4pgfnbvf2kvbrgvvcmn1h7l9py2n8alj" } }, { @@ -50234,8 +50256,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20210219, - 728 + 20210307, + 206 ], "deps": [ "dash", @@ -50243,8 +50265,8 @@ "f", "s" ], - "commit": "0b6720145e1d1e037ec8658b83fddfad2c0ce923", - "sha256": "0rsxd62l81hkpvznclgwvd1r6ca66mx6xm7jlvv8id28jhrqv03w" + "commit": "88e53d3267e8168e056e96989e9cc8fb50d33c50", + "sha256": "1gcymjysbba56q7gkn6a9vpvv45az38c4cwsvxlsnb1sa16rbz88" }, "stable": { "version": [ @@ -50384,14 +50406,14 @@ "repo": "jojojames/hg-histedit", "unstable": { "version": [ - 20190707, - 11 + 20210302, + 2334 ], "deps": [ "with-editor" ], - "commit": "2448d00bc390fed3e53091d968ec1222c8e7e35b", - "sha256": "0qp29yiyplv8h0z2yk5h0473a7nj401h14gi3fqsxqq9brx3s9jy" + "commit": "a05149483b9c5f7848ece0ba6028c900595a6a25", + "sha256": "04zps0d4s99f5a8ahrpyf8b6qw0c1y7rd1bsaq9nc6m4qblsvwc8" } }, { @@ -50878,11 +50900,11 @@ "repo": "zk-phi/highlight-stages", "unstable": { "version": [ - 20161212, - 1457 + 20210306, + 418 ], - "commit": "29cbc5b78261916da042ddb107420083da49b271", - "sha256": "0r6nbcrr0dqpgm8dir8ahzjy7rw4nrac48byamzrq96r7ajlxlv0" + "commit": "95daa710f3d8fc83f42c5da38003fc71ae0da1fc", + "sha256": "0yhwsbpnlsfnbppviwnn0y3gm02rds684841301sbmawplz457z7" } }, { @@ -52625,27 +52647,27 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20210216, - 2116 + 20210304, + 1843 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "af9eaab39cc62869d3a3806cdb2c0b981417da16", - "sha256": "0h37yqdh7dx1d3mmzlc037d4ph7p740438x0kpxk36rqw1xp7xqp" + "commit": "759a63d373681e09d71e0f5522d063a811d7127e", + "sha256": "191cwfjrcv2yvgh0f6n0f2s64w6r2v19vvc41x4g1x48szzrzbg2" }, "stable": { "version": [ 0, - 4 + 6 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "af9eaab39cc62869d3a3806cdb2c0b981417da16", - "sha256": "0h37yqdh7dx1d3mmzlc037d4ph7p740438x0kpxk36rqw1xp7xqp" + "commit": "bc600ecb6e6134e98dfb67f10301bde5a4e07adf", + "sha256": "0j27iiwgzysd9ymb4nc0m1300sqz0gqmri7ky9zfgv2g5gpjs4w0" } }, { @@ -52821,10 +52843,10 @@ "stable": { "version": [ 1, - 1 + 3 ], - "commit": "ad9baaec10e06be3f85db97b6c8fd970cf20df77", - "sha256": "1ffmsmi31jc0gqnbdxrd8ipsy790bn6hgq3rmayylavmdpg3qfd5" + "commit": "d1244243e042b8d5b6b991db752a17a44ea169bc", + "sha256": "1gl646lj1i2yxmgrgwd0sz9abq3zqf9z4qkl6ilp49ijk4cks63g" } }, { @@ -53464,11 +53486,11 @@ "repo": "QiangF/imbot", "unstable": { "version": [ - 20210223, - 1226 + 20210307, + 731 ], - "commit": "b5d191c9168918a47373c70e97ae83ba46b946f6", - "sha256": "10qj11q35q9ck5dlkv26ra5zy5p3jckb24jl7y050af0fip1m0vd" + "commit": "0588a5dbb4926e09cd19415eaafb6f79168183d8", + "sha256": "0bbr5rjxbk1dci31b1y92i9cxy5x90y3awm4678zvmaa3xa7jzxl" } }, { @@ -53533,25 +53555,25 @@ "repo": "bmag/imenu-list", "unstable": { "version": [ - 20190115, - 2130 + 20210305, + 2206 ], "deps": [ "cl-lib" ], - "commit": "46008738f8fef578a763c308cf6695e5b4d4aa77", - "sha256": "14l3yw9y1nk103s7z5i1fmd6kvlb2p6ayi6sf9l1x1ydg9glrpl8" + "commit": "6cded436010a39592175238e4d02263a7cdb44c4", + "sha256": "09x1n2bgwgximcmnrfn32d5hr6wa0iz8acaj78a93azzx065xxgk" }, "stable": { "version": [ 0, - 8 + 9 ], "deps": [ "cl-lib" ], - "commit": "27170d27c9594989587c03c23f753a809f6a0e10", - "sha256": "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx" + "commit": "6cded436010a39592175238e4d02263a7cdb44c4", + "sha256": "09x1n2bgwgximcmnrfn32d5hr6wa0iz8acaj78a93azzx065xxgk" } }, { @@ -53824,11 +53846,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20210117, - 356 + 20210309, + 1151 ], - "commit": "ec9238bb204875d0d789e077c84c1d2ffe4e8173", - "sha256": "1r61jvbx57gqlfq2kkbxwz4rsidj6dig4czkxjnb01nigzp0y58c" + "commit": "383ea506a6e6145bbb6327a7b1e509b40edf446b", + "sha256": "1828wh72ij2dhrvlwzx70j6q2gjqs96dk2h6wk508pphqw3yn29x" }, "stable": { "version": [ @@ -53980,8 +54002,8 @@ "repo": "NicolasPetton/Indium", "unstable": { "version": [ - 20210222, - 1110 + 20210309, + 1210 ], "deps": [ "company", @@ -53990,8 +54012,8 @@ "json-process-client", "seq" ], - "commit": "32487a432d6c0728e1fd69db61c4a07b94bb5798", - "sha256": "11s3mn096bsbsrj14h9wpi0721yhlnnd434yswgj6m12k1wpdmzq" + "commit": "8499e156bf7286846c3a2bf8c9e0c4d4f24b224c", + "sha256": "1hii97gz1qpr9nbnpb6am4i6a6vwxnbzcy65gyjvsfc122m3qn03" }, "stable": { "version": [ @@ -54033,14 +54055,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20210213, - 2044 + 20210307, + 740 ], "deps": [ "clojure-mode" ], - "commit": "e144b335fae20418e783c4067463de38de56b65a", - "sha256": "0jjfgi77pkqissbqvghqwfqlxkzgg69k28q1phgpm06c56z2shnq" + "commit": "f4a279ef5b007c3d43b79e22fecca6a331c5f3f0", + "sha256": "0aq65zbqrxdcx797wcr537bsp9pvbr9ndwyfbaf4lhl3w03s31x6" }, "stable": { "version": [ @@ -55334,20 +55356,20 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210225, - 1251 + 20210311, + 1638 ], - "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", - "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" + "commit": "8866138333f92c3d82062c5fa613beba38901504", + "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8" }, "stable": { "version": [ 0, 13, - 2 + 4 ], - "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", - "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" + "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6", + "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14" } }, { @@ -55358,28 +55380,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210225, - 1251 + 20210310, + 1230 ], "deps": [ "avy", "ivy" ], - "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", - "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" + "commit": "8866138333f92c3d82062c5fa613beba38901504", + "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8" }, "stable": { "version": [ 0, 13, - 2 + 4 ], "deps": [ "avy", "ivy" ], - "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", - "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" + "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6", + "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14" } }, { @@ -55726,28 +55748,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210225, - 1251 + 20210311, + 1108 ], "deps": [ "hydra", "ivy" ], - "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", - "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" + "commit": "8866138333f92c3d82062c5fa613beba38901504", + "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8" }, "stable": { "version": [ 0, 13, - 2 + 4 ], "deps": [ "hydra", "ivy" ], - "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", - "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" + "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6", + "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14" } }, { @@ -55939,8 +55961,8 @@ "ivy", "prescient" ], - "commit": "b6da466e552a710a9362c73a3c1c265984de9790", - "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall" + "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b", + "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n" }, "stable": { "version": [ @@ -56561,14 +56583,14 @@ "repo": "zk-phi/jaword", "unstable": { "version": [ - 20200816, - 647 + 20210306, + 420 ], "deps": [ "tinysegmenter" ], - "commit": "45e350895fc55f087a2102fded5b306811089a7d", - "sha256": "02ncm22wldx8g3iibdw92gk4hdig0209f7bmhxrhgdv8xp544c2h" + "commit": "783544a265f91b2e568b52311afb36e3691d5ad3", + "sha256": "09gn08c9wz60jc8jh5y3bv7qymp0ciz62bk5sjwkwgnq5mkpsf49" } }, { @@ -57061,11 +57083,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20210206, - 1851 + 20210305, + 646 ], - "commit": "fd9be900549bb0c0a373d6fd1552295f1e8a1d08", - "sha256": "0g9bihlmq6bwbyzk9zr3gig5w0vaysz1gsdqacq604jls34ks491" + "commit": "2e5e85392532fea07848000089137d51d008f42a", + "sha256": "0dcgs0p01hk9aljmv8z36gxqcpcw4p77yl2nvz1gql66lb4p7h6s" } }, { @@ -57453,14 +57475,14 @@ }, { "ename": "js2-refactor", - "commit": "8935264dfea9bacc89fef312215624d1ad9fc437", - "sha256": "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r", + "commit": "974d846518908d21c0e8edfea6f26174ea044a0c", + "sha256": "09gdsy93vpmdk110yyljvbcalxhpwpxy8vgv1l1by11k0p10b7nc", "fetcher": "github", - "repo": "magnars/js2-refactor.el", + "repo": "js-emacs/js2-refactor.el", "unstable": { "version": [ - 20190630, - 2108 + 20210306, + 2003 ], "deps": [ "dash", @@ -57469,8 +57491,8 @@ "s", "yasnippet" ], - "commit": "d4c40b5fc86d3edd7c6a7d83ac86483ee1cb7a28", - "sha256": "08b25y3raz0p98zxk9xdd8nj9shqd6mzrqhbq1gg4cwsmi7h7ly1" + "commit": "a0977c4ce1918cc266db9d6cd7a2ab63f3a76b9a", + "sha256": "0pjadcb5i8g8wkaf4hvh270r5z3qcsksnpcq5gzacqbgz5j2qcaf" }, "stable": { "version": [ @@ -58173,6 +58195,30 @@ "sha256": "1sr007wsl2y6wqpzkmv3inbpwhvgdcb2nmqzgfg7w1awapi2r13p" } }, + { + "ename": "just-mode", + "commit": "4ae56fd7c24a37769aeaba2de086a126d6ff23d3", + "sha256": "0sm5l2jb0k17661738jfx6hz06j6kdadwsc86ck750mpw0pb391r", + "fetcher": "github", + "repo": "leon-barrett/just-mode.el", + "unstable": { + "version": [ + 20210311, + 2359 + ], + "commit": "45c248fe72d4a15c5a9f26bc0b27adb874265f53", + "sha256": "065nnm4r6n83lbsn47idrxn3j1vpwnik683fgc4afhi5mm4ij89b" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "commit": "8c0d9bec38f717be1549e74839360e35587739e0", + "sha256": "1568fwh6y9584lyx57iq9ncw0xn4j1ywdbq38sk9hlpgbpsy8ln4" + } + }, { "ename": "jvm-mode", "commit": "7cdb7d7d7b955405eb6357277b5d049df8aa85ce", @@ -58502,15 +58548,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20210225, - 725 + 20210301, + 1533 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "7f27dd887da0e2d2522f711f8954c997de366ac4", - "sha256": "134ijij23vhc5jw1bvfvkikl64lwvnsmbprqsv64791x1fvcbd6y" + "commit": "1f8204a40ab24cb54f22bc89345d7f603084688a", + "sha256": "1qfm5wc0rkyxnnm3dzba0q4hxc5s3s0agvsjqwwg1q90zw6q70j2" }, "stable": { "version": [ @@ -59287,8 +59333,8 @@ 20180702, 2029 ], - "commit": "de520e601fee568b03800e8069118730ccbbdb95", - "sha256": "1yk5ygmhkzhfwk770k6lhqx5hjcwsjrgnf99qzl59af74qxn3wya" + "commit": "6b8495e48328af5088a899372d93b6daabc75a02", + "sha256": "1wp0rqwakdx532lg2gacrarkg86w3d4pp4l2b43ik0343pr6bg00" }, "stable": { "version": [ @@ -59581,8 +59627,8 @@ "transient", "yaml-mode" ], - "commit": "b46933f9eadbe63162dd6e99e8af4355c60a3b4e", - "sha256": "1km8y1i4c68wxbvxfvnyznv8xd5ygjxnz9j9faaqhya2p60kpwni" + "commit": "0c118987feee05059629073228d966502f5d0e93", + "sha256": "07k14qr2z1mhshyrr5j5ij8q84bl79rdfmsbhk38nnh0kmhpldvs" }, "stable": { "version": [ @@ -59614,8 +59660,8 @@ "evil", "kubel" ], - "commit": "b46933f9eadbe63162dd6e99e8af4355c60a3b4e", - "sha256": "1km8y1i4c68wxbvxfvnyznv8xd5ygjxnz9j9faaqhya2p60kpwni" + "commit": "0c118987feee05059629073228d966502f5d0e93", + "sha256": "07k14qr2z1mhshyrr5j5ij8q84bl79rdfmsbhk38nnh0kmhpldvs" }, "stable": { "version": [ @@ -59822,6 +59868,38 @@ "sha256": "1s3fndzjhz0xvbhdb0y7raa7zqrpws1xm79blgfcxcrv2fbmbzan" } }, + { + "ename": "laas", + "commit": "db04bf3e4da0a51cbbab7db4c6070f1d06053c90", + "sha256": "1cpd9zflk57fb70xjlkfwr9ghv11xmvad5px0fzb6gf51gqh3g6x", + "fetcher": "github", + "repo": "tecosaur/LaTeX-auto-activating-snippets", + "unstable": { + "version": [ + 20210308, + 336 + ], + "deps": [ + "aas", + "auctex", + "yasnippet" + ], + "commit": "78b10f0e1629283f8ba0f5bd1e28cf9a606362fd", + "sha256": "077hnz3gzqzp1pnfksr88p2q33l4ghz6rlxlqajnmb42cv64rxv1" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "aas", + "yasnippet" + ], + "commit": "94be7523159ee261077a33094775c7f73218a900", + "sha256": "0qyj4xwsxhn78akkv08ka9k47aa3jssd4mgws7ccbnqj68fv78gg" + } + }, { "ename": "lab-themes", "commit": "c5817cb4cb3a573f93bacfb8ef340bef0e1c5df4", @@ -59899,16 +59977,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20210220, - 728 + 20210312, + 1104 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "e9aeee78c3aede7e39fec993b846e731d7790acf", - "sha256": "1dkbrwd1dchc9h650r7rfw9xcjr342xkyjjrq0lyxwa8v5s4558v" + "commit": "08755211c073f4216c34f8dd7864ce3b874415b4", + "sha256": "0k8gcap4bvqx04wl0ica3bkfxz8j4a42w9lgwacnchffs3l4gbpx" } }, { @@ -60284,11 +60362,11 @@ "repo": "pekingduck/launchctl-el", "unstable": { "version": [ - 20200531, - 1043 + 20210309, + 1113 ], - "commit": "96886b7e64d15ffd3319c8b4b04310ccdc648576", - "sha256": "0mw1c14ysh186lbgmmyp01hszdgjm605diqfq6a17a7dd7fn549a" + "commit": "86cbb8980de4641b552a792389cc2cb9b2718ee4", + "sha256": "08prmsx6ski5j1pnzr7v3hxvbdrb5by8x2dihwhz0wjgfsqj13mr" } }, { @@ -60396,11 +60474,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20210224, - 144 + 20210303, + 1613 ], - "commit": "fbe9bfba5ef4c99ee190b259a5e3341dd7a71935", - "sha256": "16rki5xzffws02l2nr2ra0kxapizqdix5373ny9f4hlkvp7bqgzi" + "commit": "b1fe4f20efa713b8beca97a27643456061c0fb3f", + "sha256": "16mzwr91k6bg8nfh2f2y9hzr6vlnx56afqh4795apzylqvwm8zd4" }, "stable": { "version": [ @@ -60432,6 +60510,25 @@ "sha256": "09g4ibd0afdv54cim45ab69cc7zsmx8n0100wqwakmhvpq8g4kf6" } }, + { + "ename": "leaf-defaults", + "commit": "326fab332b9dec9660414906aafd220986372906", + "sha256": "1a08xjjjf9w3scw2bzbvlxak4nmjjia9icnf01ilhcfmlqa3rwdc", + "fetcher": "github", + "repo": "conao3/leaf-defaults.el", + "unstable": { + "version": [ + 20210301, + 118 + ], + "deps": [ + "leaf", + "leaf-keywords" + ], + "commit": "96ce39d4f16736f1e654e24eac16a2603976c724", + "sha256": "1z56x3wnyakilgxak2yyf6rf35072996szxfz712lmdwqs6xfqv4" + } + }, { "ename": "leaf-keywords", "commit": "dfe671ccd5a87ba4157f55e2a16a39dfaa10c027", @@ -60531,18 +60628,17 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20210209, - 1734 + 20210305, + 1705 ], "deps": [ "dash", - "dash-functional", "f", "flycheck", "s" ], - "commit": "15bee87dc4080b87c543964375b7ce162317ab6f", - "sha256": "127b7ny5mr1y14yg54gy7an3lk3928w4y9a22295i4v4zgj704j4" + "commit": "5c50338ac149ca5225fc737be291db1f63c45f1d", + "sha256": "13vrg0pp7ca0lh4j9cyg4pgfnbvf2kvbrgvvcmn1h7l9py2n8alj" } }, { @@ -60951,8 +61047,8 @@ 20201007, 2214 ], - "commit": "5bb4b76b1d1d2453de69920b3a1a6b2a302aea07", - "sha256": "1dqpksmpnnpi591p76hhv95p5gmkmsw794vzny7rd4xkdgcc39jv" + "commit": "7be14cb23a72b2c445519281e4e2fb9b607f9a8b", + "sha256": "0scq5bmsw7smgn7pkfnw98zcn6by1iqn6qds24zrxl7fmgcvwjk7" }, "stable": { "version": [ @@ -61187,6 +61283,30 @@ "sha256": "04dik8z2mg6qr4d3fkd26kg29b4c5crvbnc1lfsrzyrik7ipvsi8" } }, + { + "ename": "ligo-mode", + "commit": "c8a86d223f5e764419aaf964d69a30350f74f904", + "sha256": "1289n7xbpx6ppil6rixck81xw3x0acrpcnxchml5yrwqrbr8czli", + "fetcher": "gitlab", + "repo": "ligolang/ligo", + "unstable": { + "version": [ + 20210303, + 1751 + ], + "commit": "4eb0953dc58193a945cfe77e532b2c4fc36cc78d", + "sha256": "0lklnwdbi8rnvia3a0xjyrgdlsm515j9v3y899hz7f05n6fplp7f" + }, + "stable": { + "version": [ + 0, + 11, + 0 + ], + "commit": "a9a0badd79d0d3d7077feaf8bb646154783d5b36", + "sha256": "0h5kzavv7r8w4kzqas8nnpyssal1rh8ax8jh4av5pjp67hcjnq94" + } + }, { "ename": "line-reminder", "commit": "6c2287c7b4c543e92ccfab120388b2c05174d2db", @@ -61496,14 +61616,11 @@ "repo": "lispunion/emacs-lisp-local", "unstable": { "version": [ - 20200409, - 1330 + 20210307, + 1545 ], - "deps": [ - "cl-lib" - ], - "commit": "ff745a937f79df51cac0209b3cc3c35ce1d1fc61", - "sha256": "0ffwjv5fpzia772iavn9ily5m7l73pxf0amgqizzmbx12rx3kkhg" + "commit": "3a3237a5c25db9526dfbe1b3ac1e7125f8f459b0", + "sha256": "1nm2kmilhk2hm9nfd1f6drhlpwkpk31s1072y8im16ci7i13lig4" }, "stable": { "version": [ @@ -62593,8 +62710,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210215, - 1558 + 20210307, + 1805 ], "deps": [ "dap-mode", @@ -62605,14 +62722,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "71902caafbb20edb672641e44eca4cdf173e8a4f", - "sha256": "0ml3gfg3swx9gilgbwax8hgpf88b36cmykp7b4d858drm43daiwr" + "commit": "31847020aa512019f542b566ed42a938a6325b32", + "sha256": "1pvw5if54mja9z4xxja7024izb67yvfmj0f36jad1lipz0ydy7mg" }, "stable": { "version": [ 1, 17, - 13 + 14 ], "deps": [ "dap-mode", @@ -62623,8 +62740,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "71902caafbb20edb672641e44eca4cdf173e8a4f", - "sha256": "0ml3gfg3swx9gilgbwax8hgpf88b36cmykp7b4d858drm43daiwr" + "commit": "31847020aa512019f542b566ed42a938a6325b32", + "sha256": "1pvw5if54mja9z4xxja7024izb67yvfmj0f36jad1lipz0ydy7mg" } }, { @@ -62686,26 +62803,28 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20210222, - 409 + 20210309, + 650 ], "deps": [ + "ht", "lsp-mode" ], - "commit": "699a0fda7b83953a19a30d235c6a4006f72f41fb", - "sha256": "0ip55ji04z9mmlmhrwywq7sw4j98jq79lfac2j3nz0q1qx8576w2" + "commit": "c89b8c44cb0738b04432120d9faf062aebed6fde", + "sha256": "1jms97aa10w2p9gz3d26q62725dp0n38kg9ydk18ffvj97vd8x50" }, "stable": { "version": [ 0, 1, - 0 + 2 ], "deps": [ + "ht", "lsp-mode" ], - "commit": "16825b8dde5dfb3042f4c6fb94be70d6f10b745d", - "sha256": "1byv93xasdpiyfhszi8vh6z7jmhdhxh6lj91xhlgif0s209nfbs9" + "commit": "c89b8c44cb0738b04432120d9faf062aebed6fde", + "sha256": "1jms97aa10w2p9gz3d26q62725dp0n38kg9ydk18ffvj97vd8x50" } }, { @@ -62786,8 +62905,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20210228, - 1108 + 20210309, + 1856 ], "deps": [ "dap-mode", @@ -62799,8 +62918,8 @@ "request", "treemacs" ], - "commit": "93db10d0b521435824732e1e46ac1fcf05c9893f", - "sha256": "0fskr9s7rp9dcarv3jz4pdkhhik0j6y19s10zp1fknwniql7kvj5" + "commit": "542aaf16d6d3a410b0e41861d80f3fd6b5be7bb9", + "sha256": "07kpx8gx9v9v6zhpl7kyg3q4dgpkxk1n089cn1hdxr5vapw7xac9" }, "stable": { "version": [ @@ -62879,15 +62998,15 @@ "repo": "non-Jedi/lsp-julia", "unstable": { "version": [ - 20200912, - 1106 + 20210310, + 1116 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "c523c250c4bd2777203101ab417e9b7312472f46", - "sha256": "0zgxgghsx9dw4b0i4p0l1kvp3bka7aw80iyr7x05sp1mwwchh2gb" + "commit": "c487ed715c49d863e8a8e76d13b37b6e694520d4", + "sha256": "0dqf34gq8rnskqj7m3vp8pxmzysg5bdchbyfhfz6h5yc0p52rvr4" }, "stable": { "version": [ @@ -62941,21 +63060,20 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20201230, - 706 + 20210217, + 1027 ], "deps": [ "dap-mode", "dash", - "dash-functional", "f", "ht", "lsp-mode", "lsp-treemacs", "treemacs" ], - "commit": "c76eeb6b580fadf6a16357be8c22c197d22574fd", - "sha256": "0r1sihiximsgjf7dyh9rndxwy26d5kfz04y13b0gq2lhvrgjbbkv" + "commit": "51a89c1861eb505882c20393227f303ac33276e4", + "sha256": "1l4ic84qpcn2z54knzhw1mj61s699gpyg6a01vbq9mbpx1sxs9lf" }, "stable": { "version": [ @@ -62984,8 +63102,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210228, - 1524 + 20210312, + 1745 ], "deps": [ "dash", @@ -62995,8 +63113,8 @@ "markdown-mode", "spinner" ], - "commit": "555bd9f0ee598f2c5601c7e33ef640f4fbe8e246", - "sha256": "0wjkcyq67447b79rif8hys2sy4gvzzb494jw6h8ab244zbkrrag9" + "commit": "63fac21fa222403972cf16734bd4f2d8b0297b7c", + "sha256": "0zggkz864p9pz9hjg9f3bfia6wcplyviq5p7qbn97w5x0vp63f6q" }, "stable": { "version": [ @@ -63732,14 +63850,14 @@ "repo": "zk-phi/magic-latex-buffer", "unstable": { "version": [ - 20200816, - 648 + 20210306, + 422 ], "deps": [ "cl-lib" ], - "commit": "8a6e33f79a930d2c1977409f1980afc4cc99b909", - "sha256": "1f052yx0fib6vv2kqr21fv1nlsxc1b0mlcxasppxr6kig1jbj2x9" + "commit": "903ec91872760e47c0e5715795f8465173615098", + "sha256": "0n2f3y6b6n8ipvk99ai1hwqddkwg5y97ks068wvp4rr4fspxkm9k" } }, { @@ -63774,8 +63892,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210228, - 1841 + 20210312, + 1012 ], "deps": [ "dash", @@ -63783,8 +63901,8 @@ "transient", "with-editor" ], - "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7", - "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356" + "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a", + "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56" }, "stable": { "version": [ @@ -63871,8 +63989,8 @@ "magit", "xterm-color" ], - "commit": "fc4de96e3faa1c983728239c5e41cc9f074b73a2", - "sha256": "0gyjsjjjdbns8vlbja8wvmba8sq85ah7cawqqm0xjinrpfrhh8b7" + "commit": "1164a6c3e501e944f1a6a2e91f15374a193bb8d3", + "sha256": "1a24qpqdk00prprm5s4gwfi1hvdljp2808rg33qaaa1087zdavqj" } }, { @@ -64130,8 +64248,8 @@ "libgit", "magit" ], - "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7", - "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356" + "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a", + "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56" } }, { @@ -64285,8 +64403,8 @@ "deps": [ "dash" ], - "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7", - "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356" + "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a", + "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56" }, "stable": { "version": [ @@ -65075,11 +65193,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210224, - 1404 + 20210310, + 1539 ], - "commit": "2387cba868a21f6c18244b8c84125221a866dfb5", - "sha256": "00pr1zw9si8if76pjvxvalxzwk42320y2k6fnkbpdfm8yv6pxkd1" + "commit": "e54aa0c4974905cc4da114c3bbcfb084486aa6e1", + "sha256": "1z6qcjbzm6r859fxspsm45cjfirrc68jwn729dvk1zz1h61l3xlv" }, "stable": { "version": [ @@ -65624,11 +65742,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20210225, - 1441 + 20210302, + 1630 ], - "commit": "00e25f897c56c91a18bb821cd502270cad91fa0c", - "sha256": "1zbwzfsqkw97ywl60h6ryvrlcq82z8407g29w93cigakfwg6ir6j" + "commit": "a47515461ae22fcb90b6f8e45a6304bcb44b953c", + "sha256": "0wffq7hn5vmgvyysvhkgngcp77mq5fddia1q3n90rmb0ql2z2qg2" } }, { @@ -66145,16 +66263,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210301, - 59 + 20210312, + 135 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "5f01f8be74853f27cff021ad6e750f4b31e9375d", - "sha256": "009kfsis6qib0ax9nlipcvwclqk4kyqwafvsymssvls0r7ar50f9" + "commit": "3eaefd6653d6cb1d1fa593a01f7c01354012bf5b", + "sha256": "1k2z72fn0i5knwifp8v8gm8m6fhwrk173l3r3jg0kd6mcxian3l7" } }, { @@ -66168,8 +66286,8 @@ 20210129, 1443 ], - "commit": "2a0dd5c16178efcc4b8132e3c3b3c2a6cc7b13ea", - "sha256": "0aa0izxahpyzv9vz3g8q6m332ndqb8kxgwx22bxnf01n9v90v2j7" + "commit": "6ede379616fbbe295a2368cc9813e5e24290ea02", + "sha256": "1nfmw48jhf9hgrgrf189x88qcyff72vaimpzaw971k65lbjj3kcy" }, "stable": { "version": [ @@ -66764,14 +66882,14 @@ "repo": "kiennq/emacs-mini-modeline", "unstable": { "version": [ - 20201221, - 1825 + 20210312, + 452 ], "deps": [ "dash" ], - "commit": "7dcd0ab81bb7c298377708061176f5c5a50f77db", - "sha256": "1bik23ci0h9gki7ysw7r5wj5z9ib56167qzk7sac2wqw9xmi8dbb" + "commit": "3e67b8e59d46659df4b37dedf75485a366c93600", + "sha256": "1iqdbm90qj90a522qmssbqn5im0kxdw1kxq7z821ss3fag960xw8" }, "stable": { "version": [ @@ -67122,8 +67240,8 @@ 20210215, 1755 ], - "commit": "40caa67262c78e7668147f86a2b7ca1dad4b2190", - "sha256": "0wcqj0wf1bhqsbvs52a7nwix71nmiy0xixvmmx2pkg7c7mxpm6v4" + "commit": "177a269d1f16dc5902f08d56d12a084ea028c8ab", + "sha256": "000h78k729irpn31xykq1r6kdnrcfvv5m9cc8g9l1lfp6pjhmd9c" } }, { @@ -67567,20 +67685,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210228, - 2012 + 20210312, + 2029 ], - "commit": "9d3538f8a5007e33640b8ac1a0b725afc6287174", - "sha256": "0h3y94gglkdlygdkhakxlp5gmpvhrl76z2cm22pads722j1jj5nw" + "commit": "ccca6b3369dd6c1ce90dac60d5b090c04f2ed885", + "sha256": "1vmq9477a3inq6qdafkwl21v1jxdh8lsnlbzkbd5cqhbbrflr621" }, "stable": { "version": [ 1, - 1, - 1 + 2, + 3 ], - "commit": "585659d36ac41dcc97ab335daa5bde566f088d4b", - "sha256": "1n716nasa1pccz7983kicagc9sqnxlyfmflvifqk4kza2ks0rh9m" + "commit": "0a36239baf908585cdf32c6188eb86713d9bf6c6", + "sha256": "1l392hz6zs6wg06x2zxnk7s0h5cpmvbkcynh68gjmqjj84l7mqrk" } }, { @@ -67591,11 +67709,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20210226, - 1623 + 20210308, + 1053 ], - "commit": "697864d14f4b620f1be579a975bf97b769d2199e", - "sha256": "19jqf6q2fl89hpf6jl53kl6a64aryf5q2hm1dg14fyiag883m9q9" + "commit": "d432815230f4e62d3f38a0819621ff227f780522", + "sha256": "1gfqx0xvxyyf35yngc5sgq7xb42xxv8wzvm36sgg2qqlkgvrh6fz" }, "stable": { "version": [ @@ -67923,20 +68041,20 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20210228, - 718 + 20210308, + 1721 ], - "commit": "a756418dde112a67c4c68355bee46ef17fc45d07", - "sha256": "0csv7afdyzvpnc1znh4fz3d7ddgi51dfkfbr3c1mv6wvwg844j2a" + "commit": "8e0fbcbe0c190cd98925d9cb5d5cad606c983a1c", + "sha256": "1wd5hm25d94s9s1wwdxjc1hm77rybbl4s80ialcmg4mr1jyba0vz" }, "stable": { "version": [ 1, - 4, + 5, 0 ], - "commit": "42d809ed57ad6ed63dde61f75e4b535b2700aaca", - "sha256": "0ln8qa51v1r5m2z4cjz7kfdmvq48lwgsdf7z43zmb1nzvn10gcvg" + "commit": "d0076ea22b2afc4c3faeea2138e836b1c8f08988", + "sha256": "0hz525xmv6kslss3yn8ibj6bi2xp442knad0030px7giia6y1pf6" } }, { @@ -68255,11 +68373,11 @@ "repo": "google/mozc", "unstable": { "version": [ - 20210109, - 642 + 20210306, + 1053 ], - "commit": "36c81efa69ecf6843e8b671a3caffb905a54f72f", - "sha256": "0smfhrcikxzaw4qbvq84ac51rdjw1mm5lm58zb8zyps7pzv3d9s8" + "commit": "884d9f4b64fe97597643247f1bed1d4fc9ca5bbf", + "sha256": "116l18wgp1xqdcn4rzscnah8qn6xvnqjbmaf5grvbf2g1gglcipg" }, "stable": { "version": [ @@ -70562,8 +70680,8 @@ 20181024, 1439 ], - "commit": "1a8015038d9a8c6bf0c04a42588fb2a26861be63", - "sha256": "08071i5zv0jg9yb83bq9r2sj6hyw31ziwzg79gsbyr7l8whz7cx8" + "commit": "ac0fe07d9e924661c6c443f4a9503d4f4308fb20", + "sha256": "06ifnn51pqsjx958rj8wwkq3dpw2gsfnqhhlfc27frf9zjk0qdwh" }, "stable": { "version": [ @@ -71267,8 +71385,8 @@ 20210205, 1412 ], - "commit": "4c79a2dabe38ac72eb9eb21620f2ffca5f1885c6", - "sha256": "1kfg503j44ivcx9zsqzgjl7ab936vwnw31gb6kpcjhd1kyha0mjm" + "commit": "97fadd0645e908ff8322577a983dc710bfda33d6", + "sha256": "0gigvw5awwmy87vm07l73va321lrsilihfa4k33sw542svqvmwjk" }, "stable": { "version": [ @@ -71601,8 +71719,8 @@ 20210129, 850 ], - "commit": "72fac3d4b7a1c42a71cb396d20cc22fca8a52ed5", - "sha256": "17ks8cmnwc313q9vcxbrsv9xmji2hdnw18jczc3xrgl441vkzds1" + "commit": "2aa3a96abbc76f007923f3fbb19a5246e29ae500", + "sha256": "0lhl49cs0sdr7p22spxf83sixp1pzjiq11plmxc8i0lqv735b9sn" }, "stable": { "version": [ @@ -71737,15 +71855,28 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20210301, - 25 + 20210305, + 2006 ], "deps": [ "dash", "s" ], - "commit": "8a7430de69650dbd2e91fd746c2f8fe1665e5a45", - "sha256": "1n26c8kj6w36v3cz15497r51rkb03ngsgkld5qcy75j8ha7mddwz" + "commit": "a8bc2a58220e7eb92d61a637c2c6d8cb2ccb270b", + "sha256": "1c2nhg00naqj2m4avjsk03bpdbkspsjkng5fdhf6nx58ny9xdj5p" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "dash", + "s" + ], + "commit": "1549f362fda96b75760f20cee9b471362823ef4e", + "sha256": "1d5ff42fifssb38qvmhr8p6rvgak7z1mjhandirla05bjb4cramp" } }, { @@ -72994,8 +73125,8 @@ 20201204, 945 ], - "commit": "7db8d1377a127b39e2bf985c91b6a9a8d6cbeff2", - "sha256": "1vwmw3dcqxg7sy0ki86gq4kpva5ncwzygzbl5ml9947xklvnw9in" + "commit": "02ea48f0d09a48fb2a25fdba75a8bf20872dadb5", + "sha256": "08klrrndkb961979wcp133swl2rckbm5z708zxgzsqf9lamqjc73" }, "stable": { "version": [ @@ -75001,8 +75132,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20210228, - 2038 + 20210304, + 803 ], "deps": [ "alert", @@ -75010,8 +75141,8 @@ "request", "request-deferred" ], - "commit": "133cca813abd2823a6e2a9ada295b7b8b115be4f", - "sha256": "1mwspxx1im87qa886w9ib8a104xzi02qky6z5pl8va0mrcnpl86i" + "commit": "ff55b2117c074288633c35bc38f21db13b476bbd", + "sha256": "01wr33ra6h254r123zy677bwf98jzgkb4qpsy90rgf0kjq7wb142" }, "stable": { "version": [ @@ -75525,15 +75656,14 @@ "repo": "dfeich/org-listcruncher", "unstable": { "version": [ - 20210130, - 1405 + 20210304, + 1602 ], "deps": [ - "cl-lib", "seq" ], - "commit": "291a824d8da1c14a883e21281b596ce9dcd11e1b", - "sha256": "0bz57dvydz67bk704q2daxkfpdygxmz9jf6ilycjip2v16lx37i1" + "commit": "b0269843f317b6715dbde8a4e955aac9c38cbdb6", + "sha256": "1ywwngjqfvppxbb0dghqzr0kg9dxyqidjgjrh4ncc0zc9iamcx2w" } }, { @@ -75577,14 +75707,14 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20201224, - 1404 + 20210309, + 1028 ], "deps": [ "cl-lib" ], - "commit": "b47811562ba5c0882e9bacf9124b18fb5d0f4a61", - "sha256": "0xnrgf5p9l920lfzfxa7msjfgm6ic7xfn4mycxjv9jmdnkdm85hw" + "commit": "eb21c02ba8f97fe69c14dc657a7883b982664649", + "sha256": "0bgrp39mi8pqfr8hfd2lgjil3br55bgilhj09hy3v6klzypbdviy" }, "stable": { "version": [ @@ -76510,8 +76640,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210225, - 1454 + 20210310, + 1855 ], "deps": [ "bibtex-completion", @@ -76526,8 +76656,8 @@ "pdf-tools", "s" ], - "commit": "7dbe3ace9bf8ba9bd7c28c73ff960b4732d09071", - "sha256": "0nyqhbdbawg0rfqzgfqhk38hk1mb0naksrmrgha669zzmha6vd29" + "commit": "0a46b63a8233374c8873cb0cd99b8b67244f8166", + "sha256": "1vv50h1zmr52pqmx900ia267flv2xfak3zphsnc43inf0c6jf4xb" }, "stable": { "version": [ @@ -76653,8 +76783,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210128, - 1341 + 20210308, + 457 ], "deps": [ "dash", @@ -76664,8 +76794,8 @@ "org", "s" ], - "commit": "b0fd12647b94ba6e3cf82a2a5b1ee7655ac07760", - "sha256": "0blpfwiff0sn39hfsk2zznmkj8ad0f4a65vcbgdqmmc9i56yahv1" + "commit": "8ad57b121831eda8d226faa14ff2ba7ab652849c", + "sha256": "162qhb6rkpl1n0l8yhnwgagsx56ykaj9lchsny1id5z1257kgw9w" }, "stable": { "version": [ @@ -76693,15 +76823,15 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210226, - 1227 + 20210302, + 805 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "356cb0f882ed925913dd41e1901dec0c2f86fb98", - "sha256": "0p616v191h10hz98la52qy19bg1ry4vy6y88hgw0i3ndh6k872s2" + "commit": "068d9c27650207447ecf7a41fcd5b7abc40f4c3c", + "sha256": "1jbg5cwp0yf36fv2w695m091m8ylkgg831bmgwvscrdhx1zq4lsi" }, "stable": { "version": [ @@ -76725,8 +76855,8 @@ "repo": "org-roam/org-roam-server", "unstable": { "version": [ - 20210201, - 1122 + 20210312, + 1125 ], "deps": [ "dash", @@ -76736,8 +76866,8 @@ "s", "simple-httpd" ], - "commit": "2093ea5a1a1f2d128dd377778472a481913717b4", - "sha256": "1jp8mkqx1l3w166b16l2d5zsqjcc836bkclplgjk4laysb6msry8" + "commit": "a9051e03a2fc3744aa6716ebb529142caa0af2f0", + "sha256": "0199ri3xabrc7xy746s0f87y6vy9hw90ylw5pj7ha29xvcrfh851" }, "stable": { "version": [ @@ -76974,8 +77104,8 @@ "repo": "ndwarshuis/org-sql", "unstable": { "version": [ - 20210220, - 2146 + 20210306, + 329 ], "deps": [ "dash", @@ -76983,13 +77113,13 @@ "org-ml", "s" ], - "commit": "87c712740cc0e934bbb9fd322386adf45f05c543", - "sha256": "02qdjj6msd023fpbcq2isjw71zx2vnbma343d2yg6x4bk6xrqz7z" + "commit": "c93834332a333f6a602d3bbe0b39c79abb2f78cb", + "sha256": "1wp3d3b1wdw8v5drwbrfxrbq8psf82bs9cwjin2psfgb4n1166dy" }, "stable": { "version": [ - 2, - 1, + 3, + 0, 0 ], "deps": [ @@ -76998,8 +77128,8 @@ "org-ml", "s" ], - "commit": "19eaba4dcadb3f1101a2363aac2a6d2430559c70", - "sha256": "02qdjj6msd023fpbcq2isjw71zx2vnbma343d2yg6x4bk6xrqz7z" + "commit": "1cc854e814f86bc35f536563837a97a832a06122", + "sha256": "1wp3d3b1wdw8v5drwbrfxrbq8psf82bs9cwjin2psfgb4n1166dy" } }, { @@ -77073,20 +77203,20 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20210222, - 1035 + 20210306, + 1316 ], - "commit": "9b9f7a994be54a10f5ac2a58221d52555574f78d", - "sha256": "1s3p7ig0swp1msvrzbkpyf6nv121rgschcacs3c5ps758yldg5lh" + "commit": "ea437f80de87ea72deff1d420854bd2c011ef4e5", + "sha256": "0y6i2cc99x5cl8ylyfarim1pka5cy4zqmv2m4x2s9bsar60nwmii" }, "stable": { "version": [ 1, - 4, + 5, 0 ], - "commit": "58019b6dd1ae1323b72d491e65bf9636a9278dd6", - "sha256": "00yhgxg87mfaflrkh0i905hr873yd03a7znw5hkrps43zxha9kb9" + "commit": "734dd263cf79e4d5a0077f8b5ce344ea45bf7f3d", + "sha256": "1p9v40mm8p25b9xgfahwqqx4c36aqnl9yyjjdhkp6x5xkhkdf7by" } }, { @@ -77298,15 +77428,15 @@ "repo": "stardiviner/org-tag-beautify", "unstable": { "version": [ - 20210202, - 628 + 20210304, + 1124 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "4a6de709ee0d4ee719c83df6dce86f38f9db1f75", - "sha256": "02qw4b750p4rav9kw3qwcvmril8wxkgdfqklbrfbws6wz2sjjv3l" + "commit": "e655ced70140cbec8fe12f9207614ca2b3a6c37c", + "sha256": "0853avvi2qpr19ca6c9ix8ls7r2r5v5f38nzkr4lbindmmxl6kpv" } }, { @@ -77769,17 +77899,16 @@ "repo": "akhramov/org-wild-notifier.el", "unstable": { "version": [ - 20200926, - 1502 + 20210308, + 1348 ], "deps": [ "alert", "async", - "dash", - "dash-functional" + "dash" ], - "commit": "b83d31422abcf9527d5ec0344f2fa2df5b76a357", - "sha256": "0cdd93sqx0ijajqa2z91bg6h6m1njsaqzwygr8q28dd2pazxq5xc" + "commit": "b616924f9b6e2c26c21e07ad6bccfc26826b7be3", + "sha256": "0ps3kzi95ybr7adrspmhflw9jw3h5d6lf0kl5cn45myyyjapckjj" }, "stable": { "version": [ @@ -78110,15 +78239,15 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20200714, - 1943 + 20210309, + 1906 ], "deps": [ "magit", "org" ], - "commit": "ac9b1a42863a864fde9d225890ef5464bffdc646", - "sha256": "08amzcvw483dpfq5r34ysn84wzd538qk0jblc94vgcaidspx6481" + "commit": "609fd0ccfb5268704b5bc7d7ac1014d4960b9707", + "sha256": "00rmp5pbn7bn4mrfzlkh9dc5m80qw72bs5jxdss9sk38v1gvxbr3" }, "stable": { "version": [ @@ -78252,8 +78381,8 @@ 20201129, 604 ], - "commit": "50ce687d0be602c86256211fc8f783f5ef7df8a5", - "sha256": "1hr476lr2lwh4hz8z9yi2n3gdyzaabchn364jzwkppjksq9q0q6h" + "commit": "5c065aa584d18257a58cd7c5439df5ce23d989c3", + "sha256": "1pmkkihnrch7z705mc94dmr8bxb4mgg7c5iirmrar4hhg84l13q2" }, "stable": { "version": [ @@ -78500,14 +78629,14 @@ "repo": "xuchunyang/osx-dictionary.el", "unstable": { "version": [ - 20191206, - 519 + 20210309, + 115 ], "deps": [ "cl-lib" ], - "commit": "1b79ff64c72485cb078db9ab7ee3256b11a99f4b", - "sha256": "1lnjpsb09w48ibjvabqkxqh997mv61zpvqhx3d35q4lw5sirgjxg" + "commit": "4d4cc19fdd4ac8408bd5acc7694e7a7096b1e3b3", + "sha256": "1zmng3qx7i4wkz1vrxw0vw3kyirnb8a0pn46zq6zhzj33ybn9582" }, "stable": { "version": [ @@ -79182,8 +79311,8 @@ "deps": [ "org" ], - "commit": "6805ccc23365620004034c18fbed22a8a07bd4dc", - "sha256": "12z1w6xsdx7p3q20h3bfap7ghxlj7awd6vpf4g3r7acd86fmxkjq" + "commit": "02140a294a8d0d15ca42a1956af794fd7ec18140", + "sha256": "1sjfiypk3707jh4r4ndym8chiahw0imlawkx7hsrv2ld65hc78lp" }, "stable": { "version": [ @@ -80424,28 +80553,27 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20210201, - 1150 + 20210308, + 2211 ], "deps": [ "dash", "hydra" ], - "commit": "69ec31fc4da30dca2d223ac9ed1bcb5f9d3801ba", - "sha256": "0c4j95c2axbhw0jnqsj9qxc62cdqwk2w3g4a2zgi64m2qlf3q4c9" + "commit": "500e80666fb779457be8771c5613c177187ba0cc", + "sha256": "1c3gay9fkikg7h46djw1nf86fzckmv7w1zbz5fbar20klcr12pbm" }, "stable": { "version": [ 2, - 30, - 1 + 31 ], "deps": [ "dash", "hydra" ], - "commit": "0630a112ae7d3eab1a4c47c7ef380915560a6bb2", - "sha256": "1k31pkvd9m798i6phcr0y3wd34fgq6ii41hx3lszmikvxb1yvm2y" + "commit": "500e80666fb779457be8771c5613c177187ba0cc", + "sha256": "1c3gay9fkikg7h46djw1nf86fzckmv7w1zbz5fbar20klcr12pbm" } }, { @@ -80711,11 +80839,11 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20210218, - 1650 + 20210308, + 2025 ], - "commit": "c825606e6aca4a2ed18c0af321df5f36a3c8c774", - "sha256": "1fix225ikfabsy9r4kc3znx6k4k5wbw5n45mkir3fdyis0pcwg6x" + "commit": "c19374a3cf9ce57a356a044731063040c552df32", + "sha256": "04mghs7wn6ml8nr75pvqzzrjljv9d5252j4qkcg2llbpvhkya75h" }, "stable": { "version": [ @@ -80774,26 +80902,26 @@ "repo": "jcs-elpa/parse-it", "unstable": { "version": [ - 20210222, - 1623 + 20210306, + 821 ], "deps": [ "s" ], - "commit": "b1b80d1bd1cb852d344a8daf6ba7142be2c9ee7b", - "sha256": "1dckhlzxzr8zj6hbccgs60igigcij9qrvsb3v80z5dqgj24mqab2" + "commit": "f910af3b1d98b88a0f41794bbe7fd57411e9b909", + "sha256": "02miw5sf4bbwmz58ya98ijjhqx92vamyzw8c5v2k6id3pxaypng4" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "s" ], - "commit": "580713c0c578f6c91f6851ae2120e8a9b7871bb0", - "sha256": "0c61gyks581xx47a4lrdjx64d1x1py7qmzsxklvwlcx0gq6pzalm" + "commit": "f910af3b1d98b88a0f41794bbe7fd57411e9b909", + "sha256": "02miw5sf4bbwmz58ya98ijjhqx92vamyzw8c5v2k6id3pxaypng4" } }, { @@ -81960,14 +82088,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20210104, - 2243 + 20210310, + 25 ], "deps": [ "cl-lib" ], - "commit": "697d95f24e055eb9725781d179d7db63d6afd2b5", - "sha256": "18sjkqc94kawgfv3q9ai8m0bq3h63mlyg47bxyv0zyn34n1mpc9l" + "commit": "cbdc3e5dc77ccb681f8719db0a85af8850b757d2", + "sha256": "0q5sxwf0dkm1glnwsgm8387vzfxjj14g48ih72dpvarxysrrv2ql" }, "stable": { "version": [ @@ -82169,14 +82297,14 @@ "repo": "zk-phi/phi-autopair", "unstable": { "version": [ - 20200914, - 355 + 20210306, + 424 ], "deps": [ "paredit" ], - "commit": "8bebd5d3018746812847b6c47ab7c79a36382e7c", - "sha256": "1mf5blmws9kc3h4d9iy7r38w6kvi5w2gvmlbrxlwmh95a3y1n3nz" + "commit": "6a67c37d31a3ff9261fc9f812547a0c86721fc90", + "sha256": "0m1n77sq7cr1j6chf13zf4x34qyjycbimfpwk0msq1zc6cqjcm7n" } }, { @@ -82187,14 +82315,14 @@ "repo": "zk-phi/phi-grep", "unstable": { "version": [ - 20200816, - 1027 + 20210306, + 425 ], "deps": [ "cl-lib" ], - "commit": "d9dbf69dcf0e06944dcfb89375b09d0d2b0ef4ee", - "sha256": "1lgixvg5668kb1y8a2xxm1nlbppj5a8sswjrcxasqnxmrif6lkls" + "commit": "7e2804c7ab4e875c7511917692c4b192662aa1ae", + "sha256": "1znim5mfd8s4dzwsg8gp2im1i837pw990r9r7mcv5zkzyll7wiq3" } }, { @@ -82419,20 +82547,20 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20210103, - 1738 + 20210310, + 1724 ], - "commit": "8cdc727e6d4eef81655b90574784e9540f407cda", - "sha256": "1v09ldgdjayj66q8vn97n6hh0zqk3pxqg100ibbcyz6vfrsa5pdm" + "commit": "a2bca9be4c34a9dc38393602cb2708df24587838", + "sha256": "1rc67f3jzjhqykcn16s2ibviibxmr7b9y2c20hdwg49r41ax4f9v" }, "stable": { "version": [ 1, - 23, + 24, 0 ], - "commit": "08c6e0f6719fafa60cf76f741d83524fd84163d6", - "sha256": "0wnkcxg6djy4jvxhshiy1iw6b5cf79pjwjhfd1a060cavhfm4v5c" + "commit": "7e1b55354ce41043148ce2d3270b032c318f0f90", + "sha256": "0bs9q62bd7885c39v7x1qz3w1fhpmpdgm72xwsk2yygw0ii425nn" } }, { @@ -82535,8 +82663,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20200618, - 1845 + 20210311, + 1615 ], "deps": [ "async", @@ -82544,8 +82672,8 @@ "f", "php-runtime" ], - "commit": "62d2372ea55c0c5fb4e77076988472ebb5d85f24", - "sha256": "1sfrdap157zc7lk9vwsy91p813ip8dmazgfjwh7jwzyvcj7dsimc" + "commit": "80788a817b0257363c1eee11a57cc0f873f0eef1", + "sha256": "1w4zxp6j77xd9qcz9skpj8jbl8ink1fgdd5f1dhx0486g882mi2l" }, "stable": { "version": [ @@ -84354,8 +84482,8 @@ "yafolding", "yasnippet" ], - "commit": "a1583287cbafce053d4345a1531c6358ce970a77", - "sha256": "0pdimil370rilynz437xw7s1a323g00hmcinzpsfbnvq4k4ajk8s" + "commit": "91ca19b2a93029a393f8873e273777b553d308e1", + "sha256": "07sn00k8krsb0bikbbypznvwrk13k4jdk6d66iai0a66s9dr84ys" }, "stable": { "version": [ @@ -84678,11 +84806,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20210208, - 229 + 20210311, + 937 ], - "commit": "3454a4cb9d218c38f9c5b88798dfb2f7f85ad936", - "sha256": "039a84gwb0phjm7jcklmji1pcpbxmp4s40djhac8sbzmwdv39zi4" + "commit": "fff21ccb706b576f4074883f9fa87d2bcc534096", + "sha256": "1r9i3jsdvzvbr8kggfradvk65i1d0wq96shs4dhfsr3pw7phaxv3" }, "stable": { "version": [ @@ -84964,8 +85092,8 @@ 20210227, 600 ], - "commit": "b6da466e552a710a9362c73a3c1c265984de9790", - "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall" + "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b", + "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n" }, "stable": { "version": [ @@ -85029,15 +85157,15 @@ "repo": "jscheid/prettier.el", "unstable": { "version": [ - 20210224, - 913 + 20210303, + 2119 ], "deps": [ "iter2", "nvm" ], - "commit": "d7ab018a9312979a415d27973890129586b13dc5", - "sha256": "1phkvmhrcszhc74l92syrsmjqg1pd233fl2hpfivyclwyapqky76" + "commit": "b4c23d108f10d6693c3e2766220fb7dd9c8de7b3", + "sha256": "1s1asp755ywkl6myk2rvr5xj5405w43p8fqzfm9zn51l4zdq5lg5" }, "stable": { "version": [ @@ -85594,14 +85722,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210225, - 1816 + 20210309, + 722 ], "deps": [ "pkg-info" ], - "commit": "f3f8a6505d50ca0f03f7deef99a1c8aa3bcd9e58", - "sha256": "014v34kxjz04jgd70kskh0iwms17ydapk43ywwp23f3m89ps1917" + "commit": "1528ed4f082e7aaca19f22394eb4bed879645b7c", + "sha256": "04x9gjjw1c4fiy631fkvwdp677s1p0yj1s4d5bw68832i1i5fq8y" }, "stable": { "version": [ @@ -85925,11 +86053,11 @@ "repo": "chuntaro/emacs-promise", "unstable": { "version": [ - 20200727, - 900 + 20210307, + 727 ], - "commit": "d7b59805e7a8da1f5edea9313b6e2d0f1115fec0", - "sha256": "08f30fwwh86mnymbjxr9gswkgvsfdxa1mqajsmsbkk5nvmz1jx0n" + "commit": "cec51feb5f957e8febe6325335cf57dc2db6be30", + "sha256": "1kxsdgg5byw9zddf8jkc3h87mb4k5pnjdpskaagkahc0xg3w18d7" }, "stable": { "version": [ @@ -86112,8 +86240,8 @@ 20200619, 1742 ], - "commit": "8080bebf1f2ff87ef96a24135afe7f82d2eb3d2a", - "sha256": "1i82kgi3pwz61a07kmqw2gv79ym32rffwqqx8rlljk139k9j57mc" + "commit": "9ad97629be72eeecf8bc9fe8145e55ceaeab6b78", + "sha256": "0li6vyr87vspya07j9rkj3m82s9qww6zrnx78yhkn1mznlf73v48" }, "stable": { "version": [ @@ -86540,14 +86668,14 @@ "repo": "voxpupuli/puppet-mode", "unstable": { "version": [ - 20210215, - 2347 + 20210305, + 645 ], "deps": [ "pkg-info" ], - "commit": "9f4fef6489ddd9251213f68c8389328ca75db9a6", - "sha256": "1syaxzsfwd6q9xkbr9mf9hy4k3bray6m3iybcxszqm1qmwdbl6qs" + "commit": "ab25cf379236f4e1bd4bc9c1d77a93c95800e9bf", + "sha256": "0djrq3wl7crpjd2p1zzzz1spqfdrfzf7991g5fi8zwbf3pi79gpd" }, "stable": { "version": [ @@ -86968,15 +87096,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20210228, - 653 + 20210312, + 545 ], "deps": [ "async", "xr" ], - "commit": "e55fd0d23f75d4f30ce268973d8909510fa01731", - "sha256": "1n25546nlc2vw3wb4znjvv490yi0j614hravzsj99ybwkl9bf094" + "commit": "a65a5c26a5e39420bf7bba54cb9e42d9ce32c90d", + "sha256": "1hjmk0jilqp61wskv4vlxagql5mx7yqqybs3kfd36dr88cg20pyx" }, "stable": { "version": [ @@ -86999,11 +87127,11 @@ "repo": "tumashu/pyim-basedict", "unstable": { "version": [ - 20190719, - 1252 + 20210311, + 159 ], - "commit": "d499104189a9462cb80f8efd9713e4064dc7093d", - "sha256": "0k1afdknyham46z6fv001rnlsxzl50183fz9skw3y0wxxv2v04r4" + "commit": "7495c974ada99f9fed96d8e85d8b97dabce9532c", + "sha256": "02asrh0adgjc5nn1ps7dq5zr38hkscnzc04sdpyjzvnmfcqsw7qb" }, "stable": { "version": [ @@ -87120,8 +87248,8 @@ 20200503, 1624 ], - "commit": "15396a14bc8f977a00b5288356e79467653a2c3c", - "sha256": "0j5dgaplar71lyx05ali8rhd6nmfc2dkphcq3wn0gdmd5qmwbwxk" + "commit": "890a9b91fbac1fbc8f40fc48a78b8cd6855dbbaa", + "sha256": "1p7ki0ww12vf14l2ccxax40032vhyf21vjkmdr0qbmgdqzwvpjgc" } }, { @@ -87362,11 +87490,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20210216, - 1205 + 20210301, + 812 ], - "commit": "689ff2ddb1102a7fae9491333e418740ea0c0cbc", - "sha256": "05a5qv98y2gbi9vycmcfnbzwnnzmdz2iv7fwd5c5qxfi9bsv24sv" + "commit": "fe7656a7c701eb988c2ec9192f1ce298818b5a92", + "sha256": "1ds4avwadwv20r8ihallyhg79r8cshgxnb2dv7kj0dgn9401djqj" }, "stable": { "version": [ @@ -87540,11 +87668,11 @@ "repo": "psaris/q-mode", "unstable": { "version": [ - 20201231, - 140 + 20210307, + 2102 ], - "commit": "3fef8d74bb45ec82f3c317d904a570c3b3318ce2", - "sha256": "03n6cyg1qkn2hglvv0iynlmq1gwhxgd59jil9rc1qka60pislpgz" + "commit": "a30a84afae9bb72bc601b213ae68821479b0bb03", + "sha256": "1q85vxvv76vmb9zhc91p2aqh333h1p48737spriv5sw9wvis0gdm" } }, { @@ -87970,8 +88098,8 @@ "repo": "racer-rust/emacs-racer", "unstable": { "version": [ - 20210119, - 225 + 20210307, + 243 ], "deps": [ "dash", @@ -87980,8 +88108,8 @@ "rust-mode", "s" ], - "commit": "f17f9d73c74ac86001a19d08735e6b966d6c5609", - "sha256": "1hi0ackw5pfqak5yl4z804z2vajhg7wkvzz20w9kbzcighz6vccq" + "commit": "1e63e98626737ea9b662d4a9b1ffd6842b1c648c", + "sha256": "12a429lajk09qp1jxgig54p8z6wndfgr4jwdmgkc9s2df9sw02d3" }, "stable": { "version": [ @@ -89265,8 +89393,8 @@ "repo": "thanhvg/emacs-reddigg", "unstable": { "version": [ - 20210225, - 1948 + 20210301, + 2307 ], "deps": [ "ht", @@ -89274,8 +89402,8 @@ "promise", "request" ], - "commit": "fab7b6881c1c93d96258596602531c2e2dafc1c4", - "sha256": "1wxig3bhifczi9an98rw57wzkxshq5z16n44dy72r37pkc6azax5" + "commit": "196200eeccc4e821c5200c2e04429aeaafe4d536", + "sha256": "06q6vb0gxq323zhrq3im7xadgxgb9b8h0bxqak8xfmcnny0mcjlr" } }, { @@ -90258,6 +90386,15 @@ 20200520, 853 ], + "commit": "2db53105f2f8ee533df903b7482e571e28ce3c7b", + "sha256": "19mjwk24nwhwn0ylr7m2f9vbyf91ksicznxj1w41jp5slh5h7pr0" + }, + "stable": { + "version": [ + 0, + 0, + 7 + ], "commit": "90add9a1f8c4a3c78029d38087ff4d22fe5372d3", "sha256": "05k2zp2hldzq5h6nl8gx79dd8lvfn507ad4x3naichdqgn2013nn" } @@ -90350,15 +90487,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20210227, - 1113 + 20210305, + 1621 ], "deps": [ "transient", "wgrep" ], - "commit": "8a537d9f033ba1b47f2ebe4d76f68b3dd74aefcb", - "sha256": "1gqh28fwyjxy4haclf23kzr755p8iyh2mvly3vmzpf55y2n1z8ib" + "commit": "10e64887c224002572e1f1e19c74453cba606c3f", + "sha256": "1519lh5j5zki2dfzd1a1hl1d24nap99hv80647rvpr3mzbcsg29s" }, "stable": { "version": [ @@ -90920,14 +91057,14 @@ "repo": "zk-phi/rpn-calc", "unstable": { "version": [ - 20200816, - 545 + 20210306, + 426 ], "deps": [ "popup" ], - "commit": "1554be19acc2644898a2175fa277d1159327c8dc", - "sha256": "1b4v9x8f9ykz2dqiv7p7c2f6kbl374i2723idmnvm2c9bc0hbpyv" + "commit": "320123ede874a8fc6cde542baa0d106950318071", + "sha256": "0fq7ym2wyfb5pgm75llc8wzyzr3kb5s3i2mw3ry076yk5c4gjsi2" } }, { @@ -91063,17 +91200,17 @@ }, { "ename": "rubocop", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "07ma4fv015wzpj5j4rdb0ckwwmhkxs3k5vy33qxgwghqmn6xby6x", + "commit": "d30b73ad1fea01f4f3a2c4f00f7119c6f52fa7e6", + "sha256": "1gc9z5pwjapq2jiykb1ry31wl8n4fsy4g8zbpy7g4z4rqikf32gn", "fetcher": "github", - "repo": "rubocop-hq/rubocop-emacs", + "repo": "rubocop/rubocop-emacs", "unstable": { "version": [ - 20210213, - 1215 + 20210309, + 1241 ], - "commit": "1372ee3fc1daf7dc8d96741b03e4aff5f7ae3906", - "sha256": "1svzp1ylc3j5mfp5bgivmxgy60wyfrzgahvcfzr1217dwjbf68jm" + "commit": "f5fd18aa810c3d3269188cbbd731ddc09006f8f5", + "sha256": "1kwxqryhhdj83jism19jw8fz0bgwxrmgq7f887yyjsm7b5glzvhx" }, "stable": { "version": [ @@ -91394,11 +91531,11 @@ "repo": "ideasman42/emacs-run-stuff", "unstable": { "version": [ - 20201109, - 351 + 20210308, + 453 ], - "commit": "80661d33cf705c1128975ab371b3ed4139e4e0f8", - "sha256": "1l66phlrrwzrykapd8hmkb0ppb2jqkvr7yc8bpbxk1dxjb9w9na2" + "commit": "e5ee96c50c350cf860982b7b5deff1ed8d488c8a", + "sha256": "0g60kk49dbn331z06gpi3c8pqjsb780iwd07bl87bgbcxcpa2fg9" } }, { @@ -91532,8 +91669,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210201, - 1846 + 20210308, + 2135 ], "deps": [ "dash", @@ -91546,8 +91683,8 @@ "spinner", "xterm-color" ], - "commit": "61d600e5598a37034b8b539bd50966c3eb557f10", - "sha256": "0d5z6wab62g5xyb2bpmpprny22gy7rm11vsgij0phhnsqb8fqiig" + "commit": "270bc5afda080ed656ad53aa132e8b1fb05083e6", + "sha256": "0f4ff3mpdkqxyi3dv5gm5987nlaaf0gb5k95likjm8i5n9qkk4x5" } }, { @@ -91990,11 +92127,11 @@ "repo": "hvesalai/emacs-sbt-mode", "unstable": { "version": [ - 20201021, - 1937 + 20210306, + 1603 ], - "commit": "7b121fce50430a44bd743583c87d7645bf157be2", - "sha256": "0jqq2a5rp6nfi4n2rpdxd8yzc01jhm2mfg3lmn7aacmnwi6554ji" + "commit": "0bdc36ba3b3955c1106a5cda69be98bd38195cb6", + "sha256": "03wikgh94a0qc3xyvrvzxi4rrrd713ykpgva8z4ly85mh193215s" }, "stable": { "version": [ @@ -92017,8 +92154,8 @@ 20200830, 301 ], - "commit": "cacada6203a860236aff831f6a863c92dbe2b878", - "sha256": "17k4n0kwfqrn172mi3d2f67jalgc13p6xr10zhs56mbd5bzwg958" + "commit": "4546119f2d0582cb03e772a785e5ff93829f2f68", + "sha256": "19g33m15b4rzf16acsiaf7rh9ck0dhyc4kj5zvzd9h21ihyg5sh7" } }, { @@ -92029,14 +92166,14 @@ "repo": "zk-phi/scad-preview", "unstable": { "version": [ - 20200816, - 549 + 20210306, + 426 ], "deps": [ "scad-mode" ], - "commit": "75fe00a9aaf875ac97930bdb334aef9e479e41d5", - "sha256": "0vdb9ib76fjdvm3f13v3kh7x04izq993crrzsqp0vs5nilbkrs8c" + "commit": "8b2e7feb722ab2bde1ce050fe040f72ae0b05cad", + "sha256": "13hsd3sh1azcrbdbjnr1z5q0n5xw3ifzhvsnfqbqdz2pkpr5mfig" } }, { @@ -92334,14 +92471,14 @@ "repo": "zk-phi/scratch-palette", "unstable": { "version": [ - 20200816, - 551 + 20210306, + 427 ], "deps": [ "popwin" ], - "commit": "c39cacb11992383887fa096ace85510baed94aef", - "sha256": "1va9c97cvdqf6404kixvgk0qwrlnc1lrz6khpkdp2w7w1brhf2f7" + "commit": "e4642ed8a2b744ba48a8e11ca83861f8e4b9c5b3", + "sha256": "1cvcsj6ayhfwdpp2mb75ja8bif33z085dip76bvyqliwjnjl2sgn" } }, { @@ -92683,6 +92820,21 @@ "sha256": "1h1b48s2iirswdlvfz41jbflm4x09ksc2lycrc1awzlwd6r8hdhg" } }, + { + "ename": "seen-mode", + "commit": "f29f5a7850d058984a39ecf6aaa81a9e465356f6", + "sha256": "0v2qjqf89fz9ss4m39zwrhpijk1flglmyys9wm4nxi5dp32pppji", + "fetcher": "git", + "url": "https://git.sr.ht/~shiorid/seen.el", + "unstable": { + "version": [ + 20210311, + 1935 + ], + "commit": "57c960d76ad3dc551ac5a57ebe8682ef9fdc6d31", + "sha256": "1bn6jrvnz4bh7jm0a4g9z29zld5lm6jc77gh0i5m9ia38wzr00jx" + } + }, { "ename": "seethru", "commit": "7945732d9789143b386603dd7c96ef14ba68ddaf", @@ -92806,11 +92958,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20210228, - 1401 + 20210311, + 2257 ], - "commit": "bcf371433f3593bfe911369a4c87fbf7287df866", - "sha256": "052323wgs7z68hzfp6y9x262qsd0l6la667hsjvrdc64x6mv0dii" + "commit": "a8806f71f9cc07daa0149c89a4dbdae0aa5aebff", + "sha256": "04q0blmgbwn9jhp4y3jn5vj1h5m1bip6hwa9rf1sywkdbj153n3s" }, "stable": { "version": [ @@ -92829,15 +92981,15 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210227, - 600 + 20210311, + 1613 ], "deps": [ "prescient", "selectrum" ], - "commit": "b6da466e552a710a9362c73a3c1c265984de9790", - "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall" + "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b", + "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n" }, "stable": { "version": [ @@ -93026,6 +93178,21 @@ "sha256": "0m429i3zy5aik0q91r6sbr5xpqh4fgx984szp01p8fmbyb7wsh67" } }, + { + "ename": "sequed", + "commit": "340eeeb2c21e313fedab8e1a28a1257374a7aea1", + "sha256": "1vym45gax05ay0naspwyqc1h48iwmqaq7b6vzxabsc72w8kw4sgs", + "fetcher": "github", + "repo": "brannala/sequed", + "unstable": { + "version": [ + 20210307, + 939 + ], + "commit": "bfd9109a4fe5625554a87988564403031e57f5d9", + "sha256": "1h2qqd39lj5kqn5yy7c93r5zh6ajbrnr0c5nmxfjb2llra6hlc1y" + } + }, { "ename": "sequences", "commit": "4cf716df68fb2d6a41fe75fac0b41e356bddcf30", @@ -94373,19 +94540,19 @@ "repo": "gexplorer/simple-modeline", "unstable": { "version": [ - 20201218, - 840 + 20210312, + 1048 ], - "commit": "38973dec2912e2136d8fde5f2667063863fee15a", - "sha256": "0y70hc3x8rxr8b5x8d0a23gpcadzrn43wmrsvqqxmmkqqp45n7gj" + "commit": "119d8224a8ae0ee17b09ac1fed6cdb9cb1d048fd", + "sha256": "1rnzrx7gcaw056cqvnb1wai4hala0r0gpk3a4kyyghyp9hmrxbb5" }, "stable": { "version": [ 1, - 2 + 4 ], - "commit": "f0b983ba3b5b44390ba2dbd419bb6f29908f95fb", - "sha256": "164f95pj38a9hz315fs91ppvgn32a26v7vjz1pnrsvmllricm4zp" + "commit": "119d8224a8ae0ee17b09ac1fed6cdb9cb1d048fd", + "sha256": "1rnzrx7gcaw056cqvnb1wai4hala0r0gpk3a4kyyghyp9hmrxbb5" } }, { @@ -95065,11 +95232,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20210224, - 1024 + 20210303, + 1148 ], - "commit": "fb84318c08f59bc786e047006fc81e2ace568309", - "sha256": "0z123k9ak7yjb9bxb5qx48f33ma8066rhkqh8xc14z7shk75jybj" + "commit": "5966d68727898fa6130fb6bb02208f70aa8d5ce3", + "sha256": "00yk9g0gi4gsa99n2gsq41mkwgvmih52mngmk4g8ajzxsv0pbwq0" }, "stable": { "version": [ @@ -95089,15 +95256,15 @@ "repo": "mmgeorge/sly-asdf", "unstable": { "version": [ - 20200306, - 433 + 20210308, + 332 ], "deps": [ "popup", "sly" ], - "commit": "32ce14994e8faee9321605cec36d156b02996c46", - "sha256": "09x8l37wwqw74xc2frwzbfdb1if8rb3szg5akdk3v2qhik4sm3dd" + "commit": "bcaeba9b73b582ae1c4fadc23c71ee7e38d9a64e", + "sha256": "09gs99244g45v4bkvl4a5wshjr24cvwd8dg2w7y6j6aw2aikczrh" }, "stable": { "version": [ @@ -95335,11 +95502,11 @@ "repo": "jojojames/smart-jump", "unstable": { "version": [ - 20210110, - 214 + 20210304, + 844 ], - "commit": "947499023b7c31b99fc172e2a4c1a105ad9c8555", - "sha256": "1yyyh1507lr4dlp39k8slwfz0fdjh2hx5ypn5zx5hyjjncw7x2r7" + "commit": "3392eb35e3cde37e6f5f2a48dc0db15ca535143c", + "sha256": "14yhln54mnh7257q49r86zypg04jy5bf6ahvmm1cbv6n25npawk5" } }, { @@ -96188,14 +96355,14 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20201006, - 22 + 20210309, + 2115 ], "deps": [ "cl-lib" ], - "commit": "c697925f7e03819a4046a233f6ab31664aca9d6a", - "sha256": "1fwyranv159sgfsc07h7vjn7c2js95zk2hw06d1dr1ddnl5hgrvf" + "commit": "a8fe09d8f5a9cb541c59dcd75a136f1d2a06b8bd", + "sha256": "1fwjy5m66nz2ipshmr7dky8v4pdwynq54282anb0rfa34dim4mrh" }, "stable": { "version": [ @@ -96931,11 +97098,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20210301, - 224 + 20210306, + 1600 ], - "commit": "63704d435255c1fe3d7579f0344e244c2fbdb706", - "sha256": "1fbpbj7jzm4djlbzvzjld2gs46wiy6gm9hd1pjg2rr987fl882rg" + "commit": "b9f49bab9551e8ca1232582acffdd0a90aaa35f3", + "sha256": "0k9dlkxns8yhv1yzfjlr5gkfc26ihhqjfsjchqg9fvfxqnd39pic" } }, { @@ -97489,22 +97656,25 @@ "repo": "purcell/sqlformat", "unstable": { "version": [ - 20210218, - 312 + 20210305, + 209 ], "deps": [ "reformatter" ], - "commit": "a7b38b20320b2b4f9ec109845fed3661da9b4a49", - "sha256": "164x6vskcby6h7jaz119wqn5x73pnsf53qq314v0q4ncw2917bym" + "commit": "0cdb882874ba0853f4f831a07a85b511258472b2", + "sha256": "07ka6fqcbvbvzsdmwris89cj3dpg3qcfhmww2h6qs69za3h7mify" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "b70b05bf469a27c1a2940eeaa1a5c8cc93d805fd", - "sha256": "14n2yjmi4ls8rmpvvw6d7cz5f6dcg7laaljxnhwbagfd5j4sdfrm" + "deps": [ + "reformatter" + ], + "commit": "0cdb882874ba0853f4f831a07a85b511258472b2", + "sha256": "07ka6fqcbvbvzsdmwris89cj3dpg3qcfhmww2h6qs69za3h7mify" } }, { @@ -97647,11 +97817,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210228, - 1834 + 20210306, + 18 ], - "commit": "12eec5df609b16f16b520eceb0681b74d9ae8aa6", - "sha256": "043mra5ysz00jxziqglzpkg5nmhc15lvv4n7q26c5yv2dn4nbdsq" + "commit": "78d65e571a811088d726858f8f60b9c55f26cfcb", + "sha256": "1wrzpzp98blwzbgfgfkz5kzc1chcbpgdl23zvs90m01yhhldmmnj" }, "stable": { "version": [ @@ -98024,14 +98194,14 @@ "repo": "Kungsgeten/steam.el", "unstable": { "version": [ - 20190916, - 627 + 20210307, + 1756 ], "deps": [ "cl-lib" ], - "commit": "f32951f4e0a4bc92813d0121d9df0257101b8992", - "sha256": "1fl4875992xxv0amcqj7b516f35k19h8fd7pij0by5b808k5ls6x" + "commit": "b0b79d9bd8f1f15c43ab60997f5a341a769651af", + "sha256": "144kkh1k09hfi7c8rn750m7p70jka4m0h8cakr16avkprrrpmxxc" } }, { @@ -98881,11 +99051,11 @@ "repo": "rougier/svg-tag-mode", "unstable": { "version": [ - 20210227, - 1105 + 20210301, + 2205 ], - "commit": "a34a2e1128fa99f999c34c3bc6642fb62b887f34", - "sha256": "01apd8agfdhr662lkiy5rh2xvr913754f9zz7f5hn4vkmfgambrh" + "commit": "95b5404997d7194b4946df0a475fd93203a36cb9", + "sha256": "06j19jx3bkdsds5rjqdvaqxfq42gsn8yanqd6jrd8rysncds8an0" } }, { @@ -99143,26 +99313,26 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210225, - 1251 + 20210310, + 1230 ], "deps": [ "ivy" ], - "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", - "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" + "commit": "8866138333f92c3d82062c5fa613beba38901504", + "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8" }, "stable": { "version": [ 0, 13, - 2 + 4 ], "deps": [ "ivy" ], - "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", - "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" + "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6", + "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14" } }, { @@ -99465,8 +99635,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210219, - 2348 + 20210310, + 214 ], "deps": [ "dash", @@ -99480,17 +99650,16 @@ "smartparens", "undo-tree" ], - "commit": "a8e573324a56e131b92967802a8df88bedd1ef6f", - "sha256": "015ijjzzrx6gjh1qgb7ja6fwffialck814y1japg6d6smkd8b82i" + "commit": "5c95dc5b19b6762b5541da784dbb24e8c9b662d7", + "sha256": "1gyisadxsx8a6dw3xncmzxhpc1m2qw08m2wzsqj78cp7m1waxicj" }, "stable": { "version": [ 0, - 8, - 1 + 9 ], "deps": [ - "dash-functional", + "dash", "evil", "evil-cleverparens", "evil-surround", @@ -99501,8 +99670,8 @@ "smartparens", "undo-tree" ], - "commit": "2c9d94cf44ffc1337729db13f7ea3e3e8c470dbd", - "sha256": "02848n7b0gswdv01mk85xz3khkf24c4y1c0rsw09arnjjkhjgzwh" + "commit": "741eee5f69af575e6dfd584baa78c37241f61646", + "sha256": "0l25vds6qjx36bxgy0iwfjqsgcasslhywl8gvb2wv7jpsmjdqg4q" } }, { @@ -100154,11 +100323,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20210228, - 2046 + 20210310, + 1632 ], - "commit": "62b112a335a62fbc6898401761275cff5d173821", - "sha256": "0xnjwsw6ri46i5gygmn5p9ashwp1lcxglqgnllrq8b918qrayww1" + "commit": "d6edb345f31a13918d603d44b90a4ce30b34632b", + "sha256": "0jx095yjpsh28r6a23w2fxqv0rysbwz49c22vri2s8hzw011m55p" }, "stable": { "version": [ @@ -100345,28 +100514,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210228, - 1348 + 20210312, + 1754 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "d3e5d654e1a86019f85dd8c41923fce29fab45d6", - "sha256": "116ff8d8ir7dnmmm6qiy82i9ikziyx0xmy35v2p3dz4qib32n0yh" + "commit": "d803588c9e845706f982b8e996343e1d627ce422", + "sha256": "0ihdkdhcn7pqlj329mis5akjrh9jd4hggnm6f9n3fdqjbcj63sdz" }, "stable": { "version": [ 0, 7, - 20 + 22 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "0ed5173a2eaf1c049f3393c1518bb534a3a9ac94", - "sha256": "0g0ffxd9p0l772p6bc3s2sr3rlvgmds5jvr0fn6fnv9sypvzplfq" + "commit": "3ed57544faf0fdd17dd8762126466b15dc471f8f", + "sha256": "1frljw1gipsr9l6cpb1skwi5b566x9yx3dhcc7bxfq11inh7bc74" } }, { @@ -100433,11 +100602,11 @@ "repo": "lassik/emacs-teletext", "unstable": { "version": [ - 20210222, - 901 + 20210312, + 1951 ], - "commit": "7092a52b18b4b13b36f4558fade98f89e182e00d", - "sha256": "15rhrkb454kby6n4i669d2l24n7m3xa7nm9p68nbqs04c4sinynq" + "commit": "7ec1118b9e4a8663fe9ec933e9e13f7c2d57e986", + "sha256": "1ffnxb088kvr3g0kjjwr6hdxd20pmlbi52bhpla3phmyzl8vz38k" } }, { @@ -100484,20 +100653,20 @@ "repo": "clarete/templatel", "unstable": { "version": [ - 20210218, - 1340 + 20210304, + 1358 ], - "commit": "c1bb14cbaf47a24b0765b68ac6f252d0b5e2809f", - "sha256": "1sk8g4gs9103f2sk76x6zx8i74zr79fr30mg87x4shlrnj6a54fq" + "commit": "d29c794e1648b4d862a3f48b9de713dd2d972519", + "sha256": "1yy1n4df7k49c5fvflq1myrxw88qk39rjcsm9p0pgd4akxbd3klj" }, "stable": { "version": [ 0, 1, - 4 + 5 ], - "commit": "1a7784e5ec9a5e43adae56674aa63e8b3cf7a2cd", - "sha256": "1k33h503038l2bcr8gs020z2cjxfs94lamkdgv52cvd9i20d0kqq" + "commit": "971153aa43addf88bfe0922bcac19cb0edd3f86d", + "sha256": "0ldb01sxzrvchjy160karvmksinicw3d14jazriy84dxks8i6w8a" } }, { @@ -101421,18 +101590,18 @@ 20200212, 1903 ], - "commit": "2a5e467de2a63fd59b15c347581f3c5dca349e2b", - "sha256": "0px46fq29xdsgys525l5ba0zbqq9d86c739zqlqnn3safvg5vrih" + "commit": "492a049c23cb86bfc2dc38762a95c6da41fcc7d8", + "sha256": "1v37lz2gqyb5jrmhkrxdyp3xxdz4a37n7638ql4jrvrvq31b8x9b" }, "stable": { "version": [ 2021, - 2, - 22, + 3, + 8, 0 ], - "commit": "a0eb44d20005e25284d0204f42387ff872bf52b9", - "sha256": "1294wsx9g3k2y5prgxr7w8ms6h0af8c0xijvh4fjil6bsx729c6b" + "commit": "e2b61c2a165b8fda48c43f02c6e9e78ec5b3cb37", + "sha256": "1miv1jgxk2vip63vwnsb9k6x1kp6rz9kj62y8asr0sszf6y1h8jk" } }, { @@ -101488,8 +101657,8 @@ "deps": [ "haskell-mode" ], - "commit": "839c9ae0db91509015d7638905d2d7a4811f877d", - "sha256": "1gm8i3bvqkdk2fmkl1lbra1hqlag18bi0fq1mi6grw5lkmmlhay2" + "commit": "d88a8ece548f932aa17cf09b36fa441135ca0cbd", + "sha256": "1ga1ybn81w68ma939s73m84ina0xh2f36bkpfxy4j7ahm0h6vlmb" }, "stable": { "version": [ @@ -102471,11 +102640,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210228, - 1207 + 20210311, + 1549 ], - "commit": "1e090b0cd4ea58c9fb5e807e4ebd7bdb9a7b66ba", - "sha256": "0ci7khr2cp185kv4lm4a87fd7sgrjzz12k7w1s4iicaqvfryw9l5" + "commit": "eff65f1d8515df3dc41fb628d54950990a30dbb0", + "sha256": "0zqicpbijvp2crmwk6c6ipkc6nlh2mkidxda7dc82ilyb9562fhk" }, "stable": { "version": [ @@ -102718,26 +102887,26 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20210116, - 621 + 20210310, + 1533 ], "deps": [ "tsc" ], - "commit": "1d44e10cf93f6b814fb0a2a69e689537edd530d7", - "sha256": "0vyqvi74d7sb3bv4frrqwfqkw3jhd5nfnw06wx630x13cyq1n6pg" + "commit": "e1052cb562a178061538397531be8ca6b11e7d15", + "sha256": "1m83kg4s0gibdq1kq43l9b2yaf35k203qx5bm32n0gi3b5l03qi3" }, "stable": { "version": [ 0, - 13, - 1 + 14, + 0 ], "deps": [ "tsc" ], - "commit": "d569763c143fdf4ba8480befbb4b8ce1e49df5e2", - "sha256": "1rw21nc78m4xngl3i3dmlzrzlqb8rgvlpal6d4f50zdlfbn4pa4v" + "commit": "e1052cb562a178061538397531be8ca6b11e7d15", + "sha256": "1m83kg4s0gibdq1kq43l9b2yaf35k203qx5bm32n0gi3b5l03qi3" } }, { @@ -102779,14 +102948,14 @@ "repo": "ubolonton/tree-sitter-langs", "unstable": { "version": [ - 20210228, - 1450 + 20210305, + 1109 ], "deps": [ "tree-sitter" ], - "commit": "fcd267f5d141b0de47f0da16306991ece93100a1", - "sha256": "0vyln2gh7x6fkn1wm5z81ibbn7ly440zb68yg7xmyvmxy8xyqfmm" + "commit": "8f1f22dc5923ef4b8e594a556acd0a3c878b0855", + "sha256": "1y5g9fp05zlnklflgkbibs64ypbrixcq591pw6fpg5lklij6h1r2" }, "stable": { "version": [ @@ -102845,8 +103014,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210228, - 1117 + 20210304, + 2130 ], "deps": [ "ace-window", @@ -102858,8 +103027,8 @@ "pfuture", "s" ], - "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", - "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" + "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", + "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" }, "stable": { "version": [ @@ -102888,15 +103057,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210118, - 1808 + 20210309, + 1844 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", - "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" + "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", + "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" } }, { @@ -102914,8 +103083,8 @@ "evil", "treemacs" ], - "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", - "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" + "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", + "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" }, "stable": { "version": [ @@ -102944,8 +103113,8 @@ "deps": [ "treemacs" ], - "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", - "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" + "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", + "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" }, "stable": { "version": [ @@ -102976,8 +103145,8 @@ "pfuture", "treemacs" ], - "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", - "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" + "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", + "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" }, "stable": { "version": [ @@ -103009,8 +103178,8 @@ "persp-mode", "treemacs" ], - "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", - "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" + "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", + "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" }, "stable": { "version": [ @@ -103042,8 +103211,8 @@ "perspective", "treemacs" ], - "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", - "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" + "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", + "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" } }, { @@ -103061,8 +103230,8 @@ "projectile", "treemacs" ], - "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", - "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" + "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", + "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" }, "stable": { "version": [ @@ -103316,20 +103485,20 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20210116, - 621 + 20210310, + 1533 ], - "commit": "1d44e10cf93f6b814fb0a2a69e689537edd530d7", - "sha256": "0vyqvi74d7sb3bv4frrqwfqkw3jhd5nfnw06wx630x13cyq1n6pg" + "commit": "e1052cb562a178061538397531be8ca6b11e7d15", + "sha256": "1m83kg4s0gibdq1kq43l9b2yaf35k203qx5bm32n0gi3b5l03qi3" }, "stable": { "version": [ 0, - 13, - 1 + 14, + 0 ], - "commit": "d569763c143fdf4ba8480befbb4b8ce1e49df5e2", - "sha256": "1rw21nc78m4xngl3i3dmlzrzlqb8rgvlpal6d4f50zdlfbn4pa4v" + "commit": "e1052cb562a178061538397531be8ca6b11e7d15", + "sha256": "1m83kg4s0gibdq1kq43l9b2yaf35k203qx5bm32n0gi3b5l03qi3" } }, { @@ -105403,11 +105572,11 @@ "repo": "plapadoo/vdf-mode", "unstable": { "version": [ - 20200713, - 1838 + 20210303, + 714 ], - "commit": "8fbf6157440345879a0543bcab233e790a7b60ee", - "sha256": "1m237py9jcxkm6z3wgsxzhikc3lidd28gfflcmr0wm588sdx48sl" + "commit": "0910d4f847e9c817eb8da5434b3879048ec4ac92", + "sha256": "0a69crh9m447kxy4g47y02lymdcp5abbsfh9v68hnwydwnwjxyap" }, "stable": { "version": [ @@ -105650,11 +105819,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20210112, - 2239 + 20210303, + 2314 ], - "commit": "91827971f655936d8a8df95c9d2f39eaee667c97", - "sha256": "1bvvj25shkasy4b14ifkvh195w401xggmhjkflld5frzp7pm6zvp" + "commit": "b8d2ecbf84b2a9b6a31124e7e4fc22f13e48e18e", + "sha256": "1hgs61gg75712d6q0sd51xlvmrpn8r6x9nnca8v5f7qnxhnyxv6p" }, "stable": { "version": [ @@ -106452,11 +106621,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20210217, - 737 + 20210308, + 1505 ], - "commit": "e19da61668783239e47b1a7390fca10f38ceffa9", - "sha256": "04x9514vl8315racjn3c4b1kp6wiy33d1q7b637zfzsf6w72ybpa" + "commit": "21c0c0fe8baddf69043d3173f9fdcf790187f570", + "sha256": "0caqcvs5ba5796isnvqmvrn81lpkqk11jybx1lhizcl23jv060jc" } }, { @@ -106587,6 +106756,39 @@ "sha256": "18qcw9mh57jrd6qrgcma82q28d1dab2dy6v8pi08kadcy4w95y10" } }, + { + "ename": "vulpea", + "commit": "cd29b11820d9d35717a9a03a7ed5b8f53cbe7bdb", + "sha256": "00kxpvysyzmc43d1pb8cdzp1nrwlzbl6wx9fw9c0sssjanchm3xn", + "fetcher": "github", + "repo": "d12frosted/vulpea", + "unstable": { + "version": [ + 20210308, + 751 + ], + "deps": [ + "org", + "org-roam", + "s" + ], + "commit": "39c514f307f70b5baa6d65163ec7140c9189e662", + "sha256": "1fxy0n1kv7lrqq4k58wpbbdi4m2rd93k5n66v7bz77qjxzsvpssf" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "org", + "org-roam", + "s" + ], + "commit": "4088c95bdd64ca1afbc59bacee571c7260988175", + "sha256": "03kynwkl4q91xz9wsmyx8g3aqgls1r8p5dxhixg586sr9xr4xck0" + } + }, { "ename": "vyper-mode", "commit": "492d42d60bc188a567c5e438b838a275a124c699", @@ -106879,16 +107081,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20210209, - 1125 + 20210312, + 843 ], "deps": [ "apel", "flim", "semi" ], - "commit": "3a3530b1c4e2a2aa02d683d166cf123e9cc16a0a", - "sha256": "09px7ns1k03frxx02gvkhjzbygz9sp214xq5qnain5mnz4vglcih" + "commit": "6e189fc944a9bbde76c5a6d9b6a38d57e85e6390", + "sha256": "0yphp7bqgmhd89hgqy8rg6kmkkzmhz3sjkzm9b1paic7fx9s0maj" } }, { @@ -107271,14 +107473,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210222, - 102 + 20210308, + 109 ], "deps": [ "templatel" ], - "commit": "96aa798389536eee543ffeb0fa3c34dbd123c359", - "sha256": "0mjgw2rs67h6jgpjnidsbb4xly8dmxwgblas5vi1ddqfppzchgfr" + "commit": "faf78dfe01f25a3f32d6dcf199b5944cfc46b2c7", + "sha256": "0j9hnk5kymwq81qskn5l319qiilk5zck9134r44z0wx3bl0rc5gf" }, "stable": { "version": [ @@ -107301,28 +107503,28 @@ "repo": "etu/webpaste.el", "unstable": { "version": [ - 20201129, - 1909 + 20210306, + 1215 ], "deps": [ "cl-lib", "request" ], - "commit": "a9c4aa418526dbaf19348325ca30c249e2cf8440", - "sha256": "1lwv4zqws7kkxzbcgppgsn93vv6njc4qfh9i15bxjsj7jx3lwkgm" + "commit": "87ea8b15f417037bb1a46ac849b2f60f08c0bfeb", + "sha256": "1ixvkxdf8sz2xxdjb28pc9bdnz321m736b1riffhfh4w755z7vzp" }, "stable": { "version": [ 3, 2, - 0 + 1 ], "deps": [ "cl-lib", "request" ], - "commit": "9662b1c9c40e822d90842c82a778f65c709d3358", - "sha256": "08545ihkzflw80rwklnxiswrpdrl8kr74xzxm5wsgrf36fkj9rn2" + "commit": "b063ddde87226281ce95f8ff0d7ce32d5dea29aa", + "sha256": "1d481pdnh7cnbyka7wn59czlci63zwfqms8n515svg92qm573ckd" } }, { @@ -107890,8 +108092,8 @@ "makey", "s" ], - "commit": "a0d8456b9f71fcb40a28ec9235132df506aa6ecc", - "sha256": "1bndpdzscb917sp32khmifk7vdkj4psh7c8rf4j5s5zs7033qwka" + "commit": "f57b7d182372c33a7e52a785363acf292422c8aa", + "sha256": "09zak7zqpvlxij4p1raz10wbc9x7qmik0y1xzcj7v2sh14z952iq" } }, { @@ -107971,8 +108173,8 @@ "org", "wikinfo" ], - "commit": "d1a95a62e90cff70d83a6a2ce611aa895adb9a58", - "sha256": "196hhbqpx233av4zfcz0ig5r0rbp6annr8w88j5i6bqrk0yzm2ws" + "commit": "2eb31ab00e4c8ad53dc15234f29527b9f0f54d71", + "sha256": "0sghvnvbbv3d7kdvcv2dbbzbv38b3jjzbrhjv6fn5lynyr929vqr" } }, { @@ -108142,15 +108344,15 @@ "repo": "bmag/emacs-purpose", "unstable": { "version": [ - 20210214, - 1451 + 20210309, + 1531 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "cb61b9381ef9865e725c4641588d7b8945d35003", - "sha256": "0ppx6kbc03l18z0dwd6y0anf8bqnf9vcpdz7h552q8sycrrwfq0h" + "commit": "655df549deb1a5895851c2b989a27bb281db00f4", + "sha256": "162w8isgpyma4wqgvznvvfdp8kyv5z4p8jfm57dgc8vb9aa1p2zp" }, "stable": { "version": [ @@ -108371,8 +108573,8 @@ 20210117, 2008 ], - "commit": "2848a90addae086b657605b84a7fbecf2c4c1c65", - "sha256": "0pcy9w0q4jlwcf4hhcdm2cjgpj9ca4b04cydwlv5pnm0qrnlrzpc" + "commit": "36e163ca80f74905ba3c1cf7b596a0ccc8bc5cac", + "sha256": "0sq1kpc1ia0vjqylfqi6g2d24fcz5a3yvc5m8x3knhyx8qj5nz5y" }, "stable": { "version": [ @@ -108695,8 +108897,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210224, - 1905 + 20210309, + 1513 ], "deps": [ "ace-link", @@ -108704,8 +108906,8 @@ "swiper", "zoutline" ], - "commit": "eed052db551f60483b4189e9c87cbb16f6d5947a", - "sha256": "1800q96gchagwqplpwscgjqb9f7zcc0qb2z07cbq6a17dc4rqcpl" + "commit": "fff12d4d3bb1ddf70cd0abb78aecd9133b367990", + "sha256": "1fbi0rv9pvh9bf72fjc3pfql9xfnw7zif0rsw0r2gn4sdn7202id" }, "stable": { "version": [ @@ -109154,11 +109356,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210224, - 2052 + 20210310, + 1652 ], - "commit": "df7001159f7e8c9a61c0e360e8ea47b51deb38d9", - "sha256": "1hcm86w7mkc3ms2hy1fljjnk88yin1lax6ww3aq7r2yijjsv9a4w" + "commit": "4196c9d06c5da12e9d10b1307e4e6aefb05f4686", + "sha256": "143j6fwvl6k9gf7m99bmh1y6c6sayr120ndyfbfx34c22wgfgbj4" } }, { @@ -109621,20 +109823,20 @@ }, { "ename": "xref-js2", - "commit": "b5dab444ead98210b4ab3a6f9a61d013aed6d5b7", - "sha256": "1mfyszdi1wx2lqd9fyqm0ra227dcsjs8asc1dw2li0alwh7n4xs3", + "commit": "940abb73967f518c5ff2724bfa1adabbe6ed8f0d", + "sha256": "08az9z1ahs0x8307zrxc1yrvbqj26y4ipcxzgbdbbcil36c27z63", "fetcher": "github", - "repo": "NicolasPetton/xref-js2", + "repo": "js-emacs/xref-js2", "unstable": { "version": [ - 20190915, - 2032 + 20210310, + 1238 ], "deps": [ "js2-mode" ], - "commit": "6f1ed5dae0c2485416196a51f2fa92f32e4b8262", - "sha256": "0pbnhliq3zivijksdhdqd7m3ndc3z7kw2g21zwihq28faps96ikj" + "commit": "fd6b723e7f1f9793d189a815e1904364dc026b03", + "sha256": "0iny4qswyicrax36d4sgyfrw3giwjd1440bmlksd36y8zjkqqym0" }, "stable": { "version": [ @@ -110840,10 +111042,10 @@ }, { "ename": "zenscript-mode", - "commit": "2879811c121d24f14f23fb45afabd31fbd4246e1", - "sha256": "141im3qrpssjzlpiy72zzdyhqdcshpn68yvdqdvcxajrakkh8d0w", + "commit": "c991dec83a2fdf5c9cdb4c291a8c80246591abef", + "sha256": "1vff9ax25j68gzdcnainynk55cb0brkg9rrv25ng9g6lixbrjs8a", "fetcher": "github", - "repo": "eutropius225/zenscript-mode", + "repo": "eutro/zenscript-mode", "unstable": { "version": [ 20210102, @@ -110938,8 +111140,8 @@ "deps": [ "all-the-icons" ], - "commit": "65a4b57d064cd4bfe61750d105206c3654ac5bba", - "sha256": "1jiyz68pswbmh5fbkwndw83kim150rg2wz7i2a5lac3vj7zqr0nc" + "commit": "ee49ea9e875d7a3da63386880ca3a9e10b1051e5", + "sha256": "06q1v0fkxyxadrpgy28gh85j19vi4ars2xrbbm1bz28xrcbnps04" }, "stable": { "version": [ @@ -111123,14 +111325,14 @@ "repo": "sshirokov/ZNC.el", "unstable": { "version": [ - 20160627, - 2032 + 20210304, + 2337 ], "deps": [ "cl-lib" ], - "commit": "ce468d185e4a949c45fdd7586313144bc69d4fe5", - "sha256": "0jh11lbzsndsz9i143av7510417nzwy4j3mmpq7cjixfbmnxdq06" + "commit": "e795739ec182d217ffaf3c595819c308911540ee", + "sha256": "108bw2k255rkngfkp5iff1frsirc06j70ar1gcrh9lc3fcxdawlp" } }, { diff --git a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix b/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix index 06013b50d6..81cba22162 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glow"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 = "1y5cdqmyc2z2qk74l0r2c4mnw0jfibrf2ry7qcnmh96nhalq9m7j"; + sha256 = "13ip29yxjc2fhsk12m6hj6mswrgc9a4m8gf0hiffd1nh5313mqxi"; }; - vendorSha256 = "11x6hshbqg1a39a1hwpfivgrhyk7ykw2aqylira3dqv039b1f639"; + vendorSha256 = "0i49b1yq9x5n59k29yacxyif928r0w7hl6azfvr5k3rssg0y4l7f"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/aliases.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/aliases.nix new file mode 100644 index 0000000000..5ff2a03441 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/aliases.nix @@ -0,0 +1,46 @@ +# Deprecated aliases - for backward compatibility + +lib: overriden: + +with overriden; + +let + # Removing recurseForDerivation prevents derivations of aliased attribute + # set to appear while listing all the packages available. + removeRecurseForDerivations = alias: with lib; + if alias.recurseForDerivations or false then + removeAttrs alias ["recurseForDerivations"] + else alias; + + # Disabling distribution prevents top-level aliases for non-recursed package + # sets from building on Hydra. + removeDistribute = alias: with lib; + if isDerivation alias then + dontDistribute alias + else alias; + + # Make sure that we are not shadowing something from + # all-packages.nix. + checkInPkgs = n: alias: if builtins.hasAttr n overriden + then throw "Alias ${n} is still in kakounePlugins" + else alias; + + mapAliases = aliases: + lib.mapAttrs (n: alias: removeDistribute + (removeRecurseForDerivations + (checkInPkgs n alias))) + aliases; + + deprecations = lib.mapAttrs (old: info: + throw "${old} was renamed to ${info.new} on ${info.date}. Please update to ${info.new}." + ) (builtins.fromJSON (builtins.readFile ./deprecated.json)); + +in +mapAliases ({ + kak-auto-pairs = auto-pairs-kak; # backwards compat, added 2021-01-04 + kak-buffers = kakoune-buffers; # backwards compat, added 2021-01-04 + kak-fzf = fzf-kak; # backwards compat, added 2021-01-04 + kak-powerline = powerline-kak; # backwards compat, added 2021-01-04 + kak-prelude = prelude-kak; # backwards compat, added 2021-01-04 + kak-vertical-selection = kakoune-vertical-selection; # backwards compat, added 2021-01-04 +} // deprecations) diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix new file mode 100644 index 0000000000..f35a175312 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, rtpPath ? "share/kak/autoload/plugins" }: +rec { + buildKakounePlugin = attrs@{ + name ? "${attrs.pname}-${attrs.version}", + namePrefix ? "kakplugin-", + src, + unpackPhase ? "", + configurePhase ? "", + buildPhase ? "", + preInstall ? "", + postInstall ? "", + path ? lib.getName name, + ... + }: + stdenv.mkDerivation ((builtins.removeAttrs attrs [ "namePrefix" "path" ]) // { + name = namePrefix + name; + + installPhase = '' + runHook preInstall + + target=$out/${rtpPath}/${path} + mkdir -p $out/${rtpPath} + cp -r . $target + + runHook postInstall + ''; + }); + + buildKakounePluginFrom2Nix = attrs: buildKakounePlugin ({ + buildPhase = ":"; + configurePhase = ":"; + } // attrs); +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix deleted file mode 100644 index 3fa91113bb..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitLab }: - -stdenv.mkDerivation { - name = "case.kak"; - version = "unstable-2020-04-06"; - - src = fetchFromGitLab { - owner = "FlyingWombat"; - repo = "case.kak"; - rev = "6f1511820aa3abfa118e0f856118adc8113e2185"; - sha256 = "002njrlwgakqgp74wivbppr9qyn57dn4n5bxkr6k6nglk9qndwdp"; - }; - - installPhase = '' - mkdir -p $out/share/kak/autoload/plugins - cp -r rc/case.kak $out/share/kak/autoload/plugins - ''; - - meta = with lib; { - description = "Case convention conversion for Kakoune"; - homepage = "https://gitlab.com/FlyingWombat/case.kak"; - license = licenses.unlicense; - maintainers = with maintainers; [ eraserhd ]; - platform = platforms.all; - }; -} - diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix index 98b77338b9..1fe16a4e60 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix @@ -1,17 +1,25 @@ -{ pkgs, parinfer-rust, rep, kak-lsp }: +{ callPackage, config, kakouneUtils, lib }: -{ - inherit parinfer-rust rep kak-lsp; +let - case-kak = pkgs.callPackage ./case.kak.nix { }; - kak-ansi = pkgs.callPackage ./kak-ansi.nix { }; - kak-auto-pairs = pkgs.callPackage ./kak-auto-pairs.nix { }; - kak-buffers = pkgs.callPackage ./kak-buffers.nix { }; - kak-fzf = pkgs.callPackage ./kak-fzf.nix { }; - kak-plumb = pkgs.callPackage ./kak-plumb.nix { }; - kak-powerline = pkgs.callPackage ./kak-powerline.nix { }; - kak-prelude = pkgs.callPackage ./kak-prelude.nix { }; - kak-vertical-selection = pkgs.callPackage ./kak-vertical-selection.nix { }; - openscad-kak = pkgs.callPackage ./openscad.kak.nix { }; - quickscope-kak = pkgs.callPackage ./quickscope.kak.nix { }; -} + inherit (kakouneUtils.override {}) buildKakounePluginFrom2Nix; + + plugins = callPackage ./generated.nix { + inherit buildKakounePluginFrom2Nix overrides; + }; + + # TL;DR + # * Add your plugin to ./kakoune-plugin-names + # * run ./update.py + # + # If additional modifications to the build process are required, + # add to ./overrides.nix. + overrides = callPackage ./overrides.nix { + inherit buildKakounePluginFrom2Nix; + }; + + aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib plugins); + +in + +plugins // aliases diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/deprecated.json b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/deprecated.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/deprecated.json @@ -0,0 +1 @@ +{} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix new file mode 100644 index 0000000000..3ea3ea5147 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix @@ -0,0 +1,211 @@ +# This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit! +{ lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: +let + packages = ( self: +{ + active-window-kak = buildKakounePluginFrom2Nix { + pname = "active-window-kak"; + version = "2020-05-13"; + src = fetchFromGitHub { + owner = "greenfork"; + repo = "active-window.kak"; + rev = "988db69cfbb88bd741d089bb43b0be551693e7c1"; + sha256 = "1fv1cp9q212gamf9z2papl5xcl2w31fpcmbgdzbxcxdl1pvfsqp8"; + }; + meta.homepage = "https://github.com/greenfork/active-window.kak/"; + }; + + auto-pairs-kak = buildKakounePluginFrom2Nix { + pname = "auto-pairs-kak"; + version = "2020-10-04"; + src = fetchFromGitHub { + owner = "alexherbo2"; + repo = "auto-pairs.kak"; + rev = "fd735ec149ef0d9ca5f628a95b1e52858b5afbdc"; + sha256 = "07795kv9njlnp6mckwv141ny2ns6wyf5r0dfjaxh9ngd105zgif1"; + }; + meta.homepage = "https://github.com/alexherbo2/auto-pairs.kak/"; + }; + + connect-kak = buildKakounePluginFrom2Nix { + pname = "connect-kak"; + version = "2021-02-13"; + src = fetchFromGitHub { + owner = "alexherbo2"; + repo = "connect.kak"; + rev = "0858c0e50c6ca6d214fb088f052385a242548e83"; + sha256 = "1w4pwybg3v916hcyc49gz0blygv54ivv81x8fxp44ck0sy98idr3"; + }; + meta.homepage = "https://github.com/alexherbo2/connect.kak/"; + }; + + fzf-kak = buildKakounePluginFrom2Nix { + pname = "fzf-kak"; + version = "2021-01-27"; + src = fetchFromGitHub { + owner = "andreyorst"; + repo = "fzf.kak"; + rev = "e10de405e2a98e910d0808059200d206ba80f865"; + sha256 = "1hbsm1k8k0cgv7gxqicvnl22n2lb1plhkanniggk694gll22lq68"; + }; + meta.homepage = "https://github.com/andreyorst/fzf.kak/"; + }; + + kakoune-buffer-switcher = buildKakounePluginFrom2Nix { + pname = "kakoune-buffer-switcher"; + version = "2020-12-27"; + src = fetchFromGitHub { + owner = "occivink"; + repo = "kakoune-buffer-switcher"; + rev = "6a27c45db87a23070c34fab36d2f8d812cd002a6"; + sha256 = "1rmwy317908v8p54806m721bpzm8sgygb9abri34537ka6r05y5j"; + }; + meta.homepage = "https://github.com/occivink/kakoune-buffer-switcher/"; + }; + + kakoune-buffers = buildKakounePluginFrom2Nix { + pname = "kakoune-buffers"; + version = "2020-06-11"; + src = fetchFromGitHub { + owner = "Delapouite"; + repo = "kakoune-buffers"; + rev = "67959fbad727ba8470fe8cd6361169560f4fb532"; + sha256 = "09prhzz4yzf6ryw0npd1gpcfp77681vgawpp1ilfvbf25xgbbz33"; + }; + meta.homepage = "https://github.com/Delapouite/kakoune-buffers/"; + }; + + kakoune-easymotion = buildKakounePluginFrom2Nix { + pname = "kakoune-easymotion"; + version = "2020-03-09"; + src = fetchFromGitHub { + owner = "danr"; + repo = "kakoune-easymotion"; + rev = "0ca75450023a149efc70e8e383e459b571355c70"; + sha256 = "15czvl0qj2k767pysr6xk2v31mkhvcbmv76xs2a8yrslchms70b5"; + }; + meta.homepage = "https://github.com/danr/kakoune-easymotion/"; + }; + + kakoune-extra-filetypes = buildKakounePluginFrom2Nix { + pname = "kakoune-extra-filetypes"; + version = "2021-01-15"; + src = fetchFromGitHub { + owner = "kakoune-editor"; + repo = "kakoune-extra-filetypes"; + rev = "c6f8aaccd8c9cd6b487964c8943416e21fbe7c18"; + sha256 = "1vkff8xbycfgxv8x09cvc79qcg5fdzn2x77mbmifmkq236khrwrg"; + }; + meta.homepage = "https://github.com/kakoune-editor/kakoune-extra-filetypes/"; + }; + + kakoune-rainbow = buildKakounePluginFrom2Nix { + pname = "kakoune-rainbow"; + version = "2020-09-01"; + src = fetchFromGitHub { + owner = "listentolist"; + repo = "kakoune-rainbow"; + rev = "d09103e8d268cf4621215bf162a0244c9482be3c"; + sha256 = "1i3id7xw0j4z1a14mscr68ckpgvcwsjpl86lr864wy7w7qcmblx6"; + }; + meta.homepage = "https://github.com/listentolist/kakoune-rainbow/"; + }; + + kakoune-registers = buildKakounePluginFrom2Nix { + pname = "kakoune-registers"; + version = "2020-06-19"; + src = fetchFromGitHub { + owner = "Delapouite"; + repo = "kakoune-registers"; + rev = "9531947baecd83c1d4c3bea0adf10f4462f1e120"; + sha256 = "08v9ndghh7wvr8rsrqm05gksk9ai5vnwvw9gwqasbppb48cv4a8c"; + }; + meta.homepage = "https://github.com/Delapouite/kakoune-registers/"; + }; + + kakoune-vertical-selection = buildKakounePluginFrom2Nix { + pname = "kakoune-vertical-selection"; + version = "2019-04-11"; + src = fetchFromGitHub { + owner = "occivink"; + repo = "kakoune-vertical-selection"; + rev = "c420f8b867ce47375fac303886e31623669a42b7"; + sha256 = "13jdyd2j45wvgqvxdzw9zww14ly93bqjb6700zzxj7mkbiff6wsb"; + }; + meta.homepage = "https://github.com/occivink/kakoune-vertical-selection/"; + }; + + openscad-kak = buildKakounePluginFrom2Nix { + pname = "openscad-kak"; + version = "2020-12-10"; + src = fetchFromGitHub { + owner = "mayjs"; + repo = "openscad.kak"; + rev = "ba51bbdcd96ccf94bb9239bef1481b6f37125849"; + sha256 = "15dybd6dnnwla6mj8sw83nwd62para1syxzifznl6rz6kp8vqjjj"; + }; + meta.homepage = "https://github.com/mayjs/openscad.kak/"; + }; + + powerline-kak = buildKakounePluginFrom2Nix { + pname = "powerline-kak"; + version = "2021-02-15"; + src = fetchFromGitHub { + owner = "jdugan6240"; + repo = "powerline.kak"; + rev = "322a760daa099d519ff50d14c29b27f3e2af00d1"; + sha256 = "0mb8f8p6g75p05ifp45i0gbq2mib8c8giz7r1xfd0yrwspp4aksc"; + }; + meta.homepage = "https://github.com/jdugan6240/powerline.kak/"; + }; + + prelude-kak = buildKakounePluginFrom2Nix { + pname = "prelude-kak"; + version = "2020-09-06"; + src = fetchFromGitHub { + owner = "alexherbo2"; + repo = "prelude.kak"; + rev = "f1e0f4d5cb62a36924e3f8ba6824d6aed8c19d23"; + sha256 = "1pncr8azqvl2z9yvzhc68p1s9fld8cvak8yz88zgrp5ypx2cxl8c"; + }; + meta.homepage = "https://github.com/alexherbo2/prelude.kak/"; + }; + + replace-mode-kak = buildKakounePluginFrom2Nix { + pname = "replace-mode-kak"; + version = "2020-10-07"; + src = fetchFromGitHub { + owner = "alexherbo2"; + repo = "replace-mode.kak"; + rev = "5f4c73cdbaf5aeb964ee35ad4b9081b233af90c0"; + sha256 = "1cmylx99bm7jwfb4hclb69sdc4n8f29ssyy2byjiw53ni9rnc8q0"; + }; + meta.homepage = "https://github.com/alexherbo2/replace-mode.kak/"; + }; + + sleuth-kak = buildKakounePluginFrom2Nix { + pname = "sleuth-kak"; + version = "2020-11-06"; + src = fetchFromGitHub { + owner = "alexherbo2"; + repo = "sleuth.kak"; + rev = "911db8bd208ad0d289b8fa15a2ac665ff39bd6bd"; + sha256 = "0g41c0038fpmihqva71xl4vfbmvsp13i47gp6fnmaikajpynzc51"; + }; + meta.homepage = "https://github.com/alexherbo2/sleuth.kak/"; + }; + + tabs-kak = buildKakounePluginFrom2Nix { + pname = "tabs-kak"; + version = "2021-02-16"; + src = fetchFromGitHub { + owner = "enricozb"; + repo = "tabs.kak"; + rev = "1aaa8cd89e404cbbd76d44ff8089de0951612fbf"; + sha256 = "0dfz6j6yxl65jbh4xvpiy2abr2sdjyalynzhl28y7l1gzqv4ni3j"; + }; + meta.homepage = "https://github.com/enricozb/tabs.kak/"; + }; + +}); +in lib.fix' (lib.extends overrides packages) diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix deleted file mode 100644 index f34ee6d299..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "kak-ansi"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "eraserhd"; - repo = "kak-ansi"; - rev = "v${version}"; - sha256 = "0ddjih8hfyf6s4g7y46p1355kklaw1ydzzh61141i0r45wyb2d0d"; - }; - - installPhase = '' - mkdir -p $out/bin $out/share/kak/autoload/plugins/ - cp kak-ansi-filter $out/bin/ - # Hard-code path of filter and don't try to build when Kakoune boots - sed ' - /^declare-option.* ansi_filter /i\ -declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter} - /^declare-option.* ansi_filter /,/^}/d - ' rc/ansi.kak >$out/share/kak/autoload/plugins/ansi.kak - ''; - - meta = with lib; { - description = "Kakoune support for rendering ANSI code"; - homepage = "https://github.com/eraserhd/kak-ansi"; - license = licenses.unlicense; - maintainers = with maintainers; [ eraserhd ]; - platforms = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix deleted file mode 100644 index 36842f999a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "kak-auto-pairs"; - version = "2020-07-14"; - src = fetchFromGitHub { - owner = "alexherbo2"; - repo = "auto-pairs.kak"; - rev = "5b4b3b723c34c8b7f40cee60868204974349bf9f"; - sha256 = "1wgrv03f1lkzflbbaz8n23glij5rvfxf8pcqysd668mbx1hcrk9i"; - }; - - installPhase = '' - mkdir -p $out/share/kak/autoload/plugins - cp -r rc $out/share/kak/autoload/plugins/auto-pairs - ''; - - meta = with lib; - { description = "Kakoune extension to enable automatic closing of pairs"; - homepage = "https://github.com/alexherbo2/auto-pairs.kak"; - license = licenses.unlicense; - maintainers = with maintainers; [ nrdxp ]; - platform = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix deleted file mode 100644 index 7075ae3ef0..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchFromGitHub, lib }: -stdenv.mkDerivation { - name = "kak-buffers"; - version = "2019-04-03"; - src = fetchFromGitHub { - owner = "Delapouite"; - repo = "kakoune-buffers"; - rev = "3b35b23ac2be661a37c085d34dd04d066450f757"; - sha256 = "0f3g0v1sjinii3ig9753jjj35v2km4h9bcfw9xgzwz8b10d75bax"; - }; - - installPhase = '' - mkdir -p $out/share/kak/autoload/plugins - cp -r buffers.kak $out/share/kak/autoload/plugins - ''; - - meta = with lib; - { description = "Ease navigation between opened buffers in Kakoune"; - homepage = "https://github.com/Delapouite/kakoune-buffers"; - license = licenses.mit; - maintainers = with maintainers; [ nrdxp ]; - platform = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix deleted file mode 100644 index b52584b445..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fzf }: - -assert lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ]; - -stdenv.mkDerivation { - name = "kak-fzf"; - version = "2020-07-26"; - - src = fetchFromGitHub { - owner = "andreyorst"; - repo = "fzf.kak"; - rev = "f23daa698ad95493fbd675ae153e3cac13ef34e9"; - hash = "sha256-BfXHTJ371ThOizMI/4BAbdJoaltGSP586hz4HqX1KWA="; - }; - - configurePhase = '' - if [[ -x "${fzf}/bin/fzf" ]]; then - fzfImpl='${fzf}/bin/fzf' - else - fzfImpl='${fzf}/bin/sk' - fi - - substituteInPlace rc/fzf.kak \ - --replace \'fzf\' \'"$fzfImpl"\' - ''; - - installPhase = '' - mkdir -p $out/share/kak/autoload/plugins - cp -r rc $out/share/kak/autoload/plugins/fzf - ''; - - meta = with lib; - { description = "Kakoune plugin that brings integration with fzf"; - homepage = "https://github.com/andreyorst/fzf.kak"; - license = licenses.mit; - maintainers = with maintainers; [ nrdxp ]; - platform = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix deleted file mode 100644 index 0c59ca9a08..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, kakoune-unwrapped, plan9port, ... }: - -stdenv.mkDerivation rec { - pname = "kak-plumb"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "eraserhd"; - repo = "kak-plumb"; - rev = "v${version}"; - sha256 = "1rz6pr786slnf1a78m3sj09axr4d2lb5rg7sfa4mfg1zcjh06ps6"; - }; - - installPhase = '' - mkdir -p $out/bin $out/share/kak/autoload/plugins/ - substitute rc/plumb.kak $out/share/kak/autoload/plugins/plumb.kak \ - --replace '9 plumb' '${plan9port}/bin/9 plumb' - substitute edit-client $out/bin/edit-client \ - --replace '9 9p' '${plan9port}/bin/9 9p' \ - --replace 'kak -p' '${kakoune-unwrapped}/bin/kak -p' - chmod +x $out/bin/edit-client - ''; - - meta = with lib; { - description = "Kakoune integration with the Plan 9 plumber"; - homepage = "https://github.com/eraserhd/kak-plumb"; - license = licenses.unlicense; - maintainers = with maintainers; [ eraserhd ]; - platforms = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix deleted file mode 100644 index 318ae2958b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, git, fetchFromGitHub, lib }: -stdenv.mkDerivation { - name = "kak-powerline"; - version = "2020-08-22"; - src = fetchFromGitHub { - owner = "jdugan6240"; - repo = "powerline.kak"; - rev = "d641b2cd8024f872bcda23f9256e7aff36da02ae"; - sha256 = "65948f5ef3ab2f46f6d186ad752665c251d887631d439949decc2654a67958a4"; - }; - - configurePhase = '' - substituteInPlace rc/modules/git.kak \ - --replace \'git\' \'${git}/bin/git\' - ''; - - installPhase = '' - mkdir -p $out/share/kak/autoload/plugins - cp -r rc $out/share/kak/autoload/plugins/powerline - ''; - - meta = with lib; - { description = "Kakoune modeline, but with passion"; - homepage = "https://github.com/jdugan6240/powerline.kak"; - license = licenses.mit; - maintainers = with maintainers; [ nrdxp ]; - platform = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix deleted file mode 100644 index e6f06f4b8e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "kak-prelude"; - version = "2020-06-09"; - - src = fetchFromGitHub { - owner = "alexherbo2"; - repo = "prelude.kak"; - rev = "f1e0f4d5cb62a36924e3f8ba6824d6aed8c19d23"; - sha256 = "1pncr8azqvl2z9yvzhc68p1s9fld8cvak8yz88zgrp5ypx2cxl8c"; - }; - - installPhase = '' - mkdir -p $out/share/kak/autoload/plugins - cp -r rc $out/share/kak/autoload/plugins/prelude - ''; - - meta = with lib; - { description = "Prelude of shell blocks for Kakoune."; - homepage = "https://github.com/alexherbo2/prelude.kak"; - license = licenses.unlicense; - maintainers = with maintainers; [ buffet ]; - platform = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix deleted file mode 100644 index 2ef9d44854..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchFromGitHub, lib }: -stdenv.mkDerivation { - name = "kak-vertical-selection"; - version = "2019-04-11"; - src = fetchFromGitHub { - owner = "occivink"; - repo = "kakoune-vertical-selection"; - rev = "c420f8b867ce47375fac303886e31623669a42b7"; - sha256 = "13jdyd2j45wvgqvxdzw9zww14ly93bqjb6700zzxj7mkbiff6wsb"; - }; - - installPhase = '' - mkdir -p $out/share/kak/autoload/plugins - cp -r vertical-selection.kak $out/share/kak/autoload/plugins - ''; - - meta = with lib; - { description = "Select up and down lines that match the same pattern in Kakoune"; - homepage = "https://github.com/occivink/kakoune-vertical-selection"; - license = licenses.unlicense; - maintainers = with maintainers; [ nrdxp ]; - platform = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names new file mode 100644 index 0000000000..6cd856cb6c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names @@ -0,0 +1,17 @@ +alexherbo2/auto-pairs.kak +alexherbo2/connect.kak +alexherbo2/prelude.kak +alexherbo2/replace-mode.kak +alexherbo2/sleuth.kak +andreyorst/fzf.kak +danr/kakoune-easymotion +Delapouite/kakoune-buffers +Delapouite/kakoune-registers +enricozb/tabs.kak@main +greenfork/active-window.kak +jdugan6240/powerline.kak +kakoune-editor/kakoune-extra-filetypes +listentolist/kakoune-rainbow +mayjs/openscad.kak +occivink/kakoune-buffer-switcher +occivink/kakoune-vertical-selection diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-utils.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-utils.nix new file mode 100644 index 0000000000..11a1cc130d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-utils.nix @@ -0,0 +1,4 @@ +{ lib, stdenv }: +{ + inherit (import ./build-kakoune-plugin.nix { inherit lib stdenv; }) buildKakounePlugin buildKakounePluginFrom2Nix; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix deleted file mode 100644 index 57c1033ebb..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "openscad.kak"; - version = "unstable-2019-11-08"; - - src = fetchFromGitHub { - owner = "mayjs"; - repo = "openscad.kak"; - rev = "d9143d5e7834e3356b49720664d5647cab9db7cc"; - sha256 = "0j4dqhrn56z77hdalfdxagwz8h6nwr8s9i4w0bs2644k72lsm2ix"; - }; - - installPhase = '' - install -Dm644 rc/openscad.kak -t $out/share/kak/autoload/plugins/ - ''; - - meta = with lib; { - description = "Syntax highlighting for OpenSCAD files"; - homepage = "https://github.com/mayjs/openscad.kak"; - license = licenses.unlicense; - maintainers = with maintainers; [ eraserhd ]; - platforms = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/overrides.nix new file mode 100644 index 0000000000..d75dcc9ac9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/overrides.nix @@ -0,0 +1,161 @@ +{ lib, stdenv, fetchFromGitHub, fetchFromGitLab, fetchgit +, buildKakounePluginFrom2Nix +, kak-lsp, parinfer-rust, rep +, fzf, git, guile, kakoune-unwrapped, lua5_3, plan9port +}: + +self: super: { + inherit kak-lsp parinfer-rust rep; + + case-kak = buildKakounePluginFrom2Nix { + pname = "case-kak"; + version = "2020-04-06"; + src = fetchFromGitLab { + owner = "FlyingWombat"; + repo = "case.kak"; + rev = "6f1511820aa3abfa118e0f856118adc8113e2185"; + sha256 = "002njrlwgakqgp74wivbppr9qyn57dn4n5bxkr6k6nglk9qndwdp"; + }; + meta.homepage = "https://gitlab.com/FlyingWombat/case.kak"; + }; + + fzf-kak = super.fzf-kak.overrideAttrs(oldAttrs: rec { + preFixup = '' + if [[ -x "${fzf}/bin/fzf" ]]; then + fzfImpl='${fzf}/bin/fzf' + else + fzfImpl='${fzf}/bin/sk' + fi + + substituteInPlace $out/share/kak/autoload/plugins/fzf-kak/rc/fzf.kak \ + --replace \'fzf\' \'"$fzfImpl"\' + ''; + }); + + kak-ansi = stdenv.mkDerivation rec { + pname = "kak-ansi"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "eraserhd"; + repo = "kak-ansi"; + rev = "v${version}"; + sha256 = "0ddjih8hfyf6s4g7y46p1355kklaw1ydzzh61141i0r45wyb2d0d"; + }; + + installPhase = '' + mkdir -p $out/bin $out/share/kak/autoload/plugins/ + cp kak-ansi-filter $out/bin/ + # Hard-code path of filter and don't try to build when Kakoune boots + sed ' + /^declare-option.* ansi_filter /i\ +declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter} + /^declare-option.* ansi_filter /,/^}/d + ' rc/ansi.kak >$out/share/kak/autoload/plugins/ansi.kak + ''; + + meta = with lib; { + description = "Kakoune support for rendering ANSI code"; + homepage = "https://github.com/eraserhd/kak-ansi"; + license = licenses.unlicense; + maintainers = with maintainers; [ eraserhd ]; + platforms = platforms.all; + }; + }; + + kak-plumb = stdenv.mkDerivation rec { + pname = "kak-plumb"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "eraserhd"; + repo = "kak-plumb"; + rev = "v${version}"; + sha256 = "1rz6pr786slnf1a78m3sj09axr4d2lb5rg7sfa4mfg1zcjh06ps6"; + }; + + installPhase = '' + mkdir -p $out/bin $out/share/kak/autoload/plugins/ + substitute rc/plumb.kak $out/share/kak/autoload/plugins/plumb.kak \ + --replace '9 plumb' '${plan9port}/bin/9 plumb' + substitute edit-client $out/bin/edit-client \ + --replace '9 9p' '${plan9port}/bin/9 9p' \ + --replace 'kak -p' '${kakoune-unwrapped}/bin/kak -p' + chmod +x $out/bin/edit-client + ''; + + meta = with lib; { + description = "Kakoune integration with the Plan 9 plumber"; + homepage = "https://github.com/eraserhd/kak-plumb"; + license = licenses.unlicense; + maintainers = with maintainers; [ eraserhd ]; + platforms = platforms.all; + }; + }; + + kakoune-rainbow = super.kakoune-rainbow.overrideAttrs(oldAttrs: rec { + preFixup = '' + mkdir -p $out/bin + mv $out/share/kak/autoload/plugins/kakoune-rainbow/bin/kak-rainbow.scm $out/bin + substituteInPlace $out/bin/kak-rainbow.scm \ + --replace '/usr/bin/env -S guile' '${guile}/bin/guile' + substituteInPlace $out/share/kak/autoload/plugins/kakoune-rainbow/rainbow.kak \ + --replace '%sh{dirname "$kak_source"}' "'$out'" + ''; + }); + + kakoune-state-save = buildKakounePluginFrom2Nix { + pname = "kakoune-state-save"; + version = "2020-02-09"; + + src = fetchFromGitLab { + owner = "Screwtapello"; + repo = "kakoune-state-save"; + rev = "ab7c0c765326a4a80af78857469ee8c80814c52a"; + sha256 = "AAOCG0TY3G188NnkkwMCSbkkNe487F4gwiFWwG9Yo+A="; + }; + + meta = with lib; { + description = "Help Kakoune save and restore state between sessions"; + homepage = "https://gitlab.com/Screwtapello/kakoune-state-save"; + license = licenses.mit; + maintainers = with maintainers; [ Flakebi ]; + platforms = platforms.all; + }; + }; + + powerline-kak = super.powerline-kak.overrideAttrs(oldAttrs: rec { + preFixup = '' + substituteInPlace $out/share/kak/autoload/plugins/powerline-kak/rc/modules/git.kak \ + --replace ' git ' ' ${git}/bin/git ' + ''; + }); + + quickscope-kak = buildKakounePluginFrom2Nix rec { + pname = "quickscope-kak"; + version = "1.0.0"; + + src = fetchgit { + url = "https://git.sr.ht/~voroskoi/quickscope.kak"; + rev = "v${version}"; + sha256 = "0y1g3zpa2ql8l9rl5i2w84bka8a09kig9nq9zdchaff5pw660mcx"; + }; + + buildInputs = [ lua5_3 ]; + + installPhase = '' + mkdir -p $out/share/kak/autoload/plugins/ + cp quickscope.* $out/share/kak/autoload/plugins/ + # substituteInPlace does not like the pipe + sed -e 's,[|] *lua,|${lua5_3}/bin/lua,' quickscope.kak >$out/share/kak/autoload/plugins/quickscope.kak + ''; + + meta = with lib; { + description = "Highlight f and t jump positions"; + homepage = "https://sr.ht/~voroskoi/quickscope.kak/"; + license = licenses.unlicense; + maintainers = with maintainers; [ eraserhd ]; + platforms = platforms.all; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix deleted file mode 100644 index 8e60e17e79..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchgit, lua5_3 }: - -stdenv.mkDerivation rec { - pname = "quickscope-kak"; - version = "1.0.0"; - - src = fetchgit { - url = "https://git.sr.ht/~voroskoi/quickscope.kak"; - rev = "v${version}"; - sha256 = "0y1g3zpa2ql8l9rl5i2w84bka8a09kig9nq9zdchaff5pw660mcx"; - }; - - buildInputs = [ lua5_3 ]; - - installPhase = '' - mkdir -p $out/share/kak/autoload/plugins/ - cp quickscope.* $out/share/kak/autoload/plugins/ - # substituteInPlace does not like the pipe - sed -e 's,[|] *lua,|${lua5_3}/bin/lua,' quickscope.kak >$out/share/kak/autoload/plugins/quickscope.kak - ''; - - meta = with lib; { - description = "Highlight f and t jump positions"; - homepage = "https://sr.ht/~voroskoi/quickscope.kak/"; - license = licenses.unlicense; - maintainers = with maintainers; [ eraserhd ]; - platforms = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py new file mode 100755 index 0000000000..b6a4bfe4f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py @@ -0,0 +1,91 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p nix-prefetch-git -p python3 -p python3Packages.GitPython nix -i python3 + +# format: +# $ nix run nixpkgs.python3Packages.black -c black update.py +# type-check: +# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py +# linted: +# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py + +import inspect +import os +import sys +from typing import List, Tuple +from pathlib import Path + +# Import plugin update library from maintainers/scripts/pluginupdate.py +ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) +sys.path.insert( + 0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts") +) +import pluginupdate + +GET_PLUGINS = f"""(with import {{}}; +let + inherit (kakouneUtils.override {{}}) buildKakounePluginFrom2Nix; + generated = callPackage {ROOT}/generated.nix {{ + inherit buildKakounePluginFrom2Nix; + }}; + hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value; + getChecksum = name: value: + if hasChecksum value then {{ + submodules = value.src.fetchSubmodules or false; + sha256 = value.src.outputHash; + rev = value.src.rev; + }} else null; + checksums = lib.mapAttrs getChecksum generated; +in lib.filterAttrs (n: v: v != null) checksums)""" + +HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!" + + +def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): + sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) + + with open(outfile, "w+") as f: + f.write(HEADER) + f.write( + """ +{ lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: +let + packages = ( self: +{""" + ) + for owner, repo, plugin in sorted_plugins: + if plugin.has_submodules: + submodule_attr = "\n fetchSubmodules = true;" + else: + submodule_attr = "" + + f.write( + f""" + {plugin.normalized_name} = buildKakounePluginFrom2Nix {{ + pname = "{plugin.normalized_name}"; + version = "{plugin.version}"; + src = fetchFromGitHub {{ + owner = "{owner}"; + repo = "{repo}"; + rev = "{plugin.commit}"; + sha256 = "{plugin.sha256}";{submodule_attr} + }}; + meta.homepage = "https://github.com/{owner}/{repo}/"; + }}; +""" + ) + f.write( + """ +}); +in lib.fix' (lib.extends overrides packages) +""" + ) + print(f"updated {outfile}") + + +def main(): + editor = pluginupdate.Editor("kakoune", ROOT, GET_PLUGINS, generate_nix) + pluginupdate.update_plugins(editor) + + +if __name__ == "__main__": + main() diff --git a/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix index 87990b6eae..9db68f71ea 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix @@ -1,27 +1,19 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , qtscript, poppler, hunspell , withLua ? true, lua , withPython ? true, python3 }: mkDerivation rec { pname = "texworks"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "TeXworks"; repo = "texworks"; rev = "release-${version}"; - sha256 = "1lw1p4iyzxypvjhnav11g6rwf6gx7kyzwy2iprvv8zzpqcdkjp2z"; + sha256 = "0l8jl1b8lpas7yz6m0qc2nikyn54lx2ljzmjjz3zgxgd6l502006"; }; - patches = [ - (fetchpatch { - name = "fix-compilation-with-qt-5.15.patch"; - url = "https://github.com/TeXworks/texworks/commit/a5352a3a94e3685125650b65e6197de060326cc2.patch"; - sha256 = "0pf7h1m11x0s039bxknm7rxdp9b4g8ch86y38jlyy56c74mw97i6"; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qtscript poppler hunspell ] ++ lib.optional withLua lua 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 a6b4af7892..de96650167 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.12-1"; + version = "6.9.12-3"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "1s1zr0fqnm9jl1ni07if2klvf2lfg26dgxdbspksq5xdhsxxn841"; + sha256 = "sha256-h9c0N9AcFVpNYpKl+95q1RVJWuacN4N4kbAJIKJp8Jc="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { changelog = "https://legacy.imagemagick.org/script/changelog.php"; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ erictapen ]; license = licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/photoflare/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/photoflare/default.nix index 0c25364b76..b0719631c0 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/photoflare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/photoflare/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "photoflare"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitHub { owner = "PhotoFlare"; repo = "photoflare"; rev = "v${version}"; - sha256 = "07lrlxagv1bljj607s8m0zsbzx9jrvi18bnxahnm7r4i5car5x2d"; + sha256 = "sha256-Gx3YP29NrNHp0p05a1O4Xb9kqkA6pQLTJZ3/wOx+BWY="; }; nativeBuildInputs = [ qmake qttools ]; @@ -19,13 +19,11 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick"; - enableParallelBuilding = true; - meta = with lib; { description = "A cross-platform image editor with a powerful features and a very friendly graphical user interface"; homepage = "https://photoflare.io"; maintainers = [ maintainers.omgbebebe ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; 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 c51794881e..626610728a 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.11"; + version = "1.12"; pname = "renderdoc"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "01r4fq03fpyhwvn47wx3dw29vcadcd0qml00h36q38cq3pi9x42j"; + sha256 = "4k0WsTsz4WwPZC8Dj85l2ntJOZkLgmBBOJcX9Bb4U7I="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/caerbannog/default.nix b/third_party/nixpkgs/pkgs/applications/misc/caerbannog/default.nix index 451980352c..6f4558b868 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/caerbannog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/caerbannog/default.nix @@ -1,5 +1,5 @@ { lib -, fetchgit +, fetchFromSourcehut , python3 , glib , gobject-introspection @@ -18,8 +18,9 @@ python3.pkgs.buildPythonApplication rec { version = "0.3"; format = "other"; - src = fetchgit { - url = "https://git.sr.ht/~craftyguy/caerbannog"; + src = fetchFromSourcehut { + owner = "~craftyguy"; + repo = "caerbannog"; rev = version; sha256 = "0wqkb9zcllxm3fdsr5lphknkzy8r1cr80f84q200hbi99qql1dxh"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix index 7f2ee5a288..5d57ff9a5b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -26,11 +26,11 @@ mkDerivation rec { pname = "calibre"; - version = "5.12.0"; + version = "5.13.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-N3/y1kSWyM36LpwbimftJ67h4zfk2j9hcvUi/pQL3YU="; + sha256 = "sha256-GDFAZxZmkio7e7kVjhYqhNdhXIlUPJF0iMWVl0uWVCM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix index 3db4872c0e..fbfd592db4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix @@ -46,13 +46,13 @@ let in mkDerivation rec { pname = "crow-translate"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "crow-translate"; repo = "crow-translate"; rev = version; - sha256 = "sha256-YOsp/noGsYthre18fMyBj9s+YFzdHJfIJzJSm43wiZ0="; + sha256 = "sha256-kpr3Xn1ZLBS1fVhhJ/sxo8UgB4M+SdOVhddnU8pNUfA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix b/third_party/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix index 35627b28d1..5d77f301c8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix @@ -7,19 +7,25 @@ , gtk3 , gobject-introspection , libxml2 +, fetchpatch }: stdenv.mkDerivation rec { pname = "deadd-notification-center"; - version = "1.7.3"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "phuhl"; repo = "linux_notification_center"; - rev = version; - sha256 = "QaOLrtlhQyhMOirk6JO1yMGRrgycHmF9FAdKNbN2TRk="; + rev = "640ce0f"; + sha256 = "12ldr8vppylr90849g3mpjphmnr4lp0vsdkj01a5f4bv4ksx35fm"; }; - dontUnpack = true; + patches = [ + (fetchpatch { + url = "https://github.com/phuhl/linux_notification_center/commit/5244e1498574983322be97925e1ff7ebe456d974.patch"; + sha256 = "sha256-hbqbgBmuewOhtx0na2tmFa5W128ZrBvDcyPme/mRzlI="; + }) + ]; nativeBuildInputs = [ autoPatchelfHook @@ -33,15 +39,18 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; - installPhase = '' - mkdir -p $out/bin $out/share/dbus-1/services + buildFlags = [ + # Exclude stack from `make all` to use the prebuilt binary from .out/ + "service" + ]; - cp $src/.out/${pname} $out/bin/ - chmod +x $out/bin/${pname} - - sed "s|##PREFIX##|$out|g" $src/${pname}.service.in > \ - $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service - ''; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "SERVICEDIR_SYSTEMD=${placeholder "out"}/etc/systemd/user" + "SERVICEDIR_DBUS=${placeholder "out"}/share/dbus-1/services" + # Override systemd auto-detection. + "SYSTEMD=1" + ]; meta = with lib; { description = "A haskell-written notification center for users that like a desktop with style"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix b/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix index 5810607e8d..c48e151e8a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - sha256 = "jzNopLndYH9dIdm30pyDaZNksHwS4i5LTZUXRmcrTp8="; + sha256 = "sha256-Htk2NHgYVL622URx67BUtounAUopLTahaSqfAqd3+ZI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gphoto2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gphoto2/default.nix index 5635aadda9..8d612ceb41 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gphoto2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gphoto2/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "gphoto2"; - version = "2.5.26"; + version = "2.5.27"; src = fetchFromGitHub { owner = "gphoto"; repo = "gphoto2"; rev = "v${version}"; - sha256 = "1w01j3qvjl2nlfs38rnsmjvn3r0r2xf7prxz1i6yarbpj3fzwqqc"; + sha256 = "sha256-zzlyA2IedyBZ4/TdSmrqbe2le8rFMQ6tY6jF5skJ7l4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix index bd5d96c599..f82881eb5b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4604"; + version = "4608"; src = fetchurl { url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "HmQwi3kIVhZOQpSfG3V48vUTbncsJLb/YCqsXrmtmQM="; + sha256 = "uj/iZZHML4nqEKdFBQSDdegkalZFJdzEE4xQrOruEp0="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 66fef3361e..53aa786e06 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.11.3"; + version = "0.11.5"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "brpNQiWpIbvnPuCXrNJhBjgqPlhIb3dz3LFRf0M4K0Q="; + sha256 = "FxhvRRxV8oxRwvImftoSTqrus2x5p90NfuvddZjdBNU="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix index 37905b8e44..404c95f52a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "sha256-fbcU3NZdQ8NR5tLjEJyOPneVWNMBddLdttLeVwIUtpg="; + sha256 = "sha256-WmJ+atndIXm5Z6RvRVSvf2de1Gda+cs5kSw4iotPVfU="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix index dd46c566cd..cc1ae14350 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -1,20 +1,22 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, SystemConfiguration, libiconv }: rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yOUVDq/wRY35ZQjQVwTLYHKukkKpoggN51wBDdZnhI4="; + sha256 = "sha256-wcOF34GzlB6YKISkjDgYgsaN1NmWBMIntfT23A6byx8="; }; - cargoSha256 = "sha256-56jJ8IjxWTBlaDd1CVit4RP659Mgw2j2wMWcSDYVihM="; + cargoSha256 = "sha256-7SJjtHNSabE/VqdiSwKZ/yNzk6GSMNsQLaSx/MjN5NA="; nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration libiconv ]; + checkFlags = [ "--skip=test_single_huge_payload" "--skip=test_create_unix_socket" ]; postInstall = '' @@ -27,6 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A daemon for managing long running shell commands"; homepage = "https://github.com/Nukesor/pueue"; + changelog = "https://github.com/Nukesor/pueue/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index 2a395a227b..dc4569c6fc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -19,24 +19,29 @@ }: mkDerivation rec { - version = "1.1.2"; + version = "1.1.3"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-I5QhnYp4ga3ERJ3w4qjh5gFFU+S1Htw26vHK/2M8j5s="; + sha256 = "sha256-ovit2XSkxSjcbpqQUv8IzMqfsfItbtXLbx0/Vy0+J0Y="; }; buildInputs = [ qtbase cpp-utilities qtutilities ] ++ lib.optionals webviewSupport [ qtwebengine ] ++ lib.optionals jsSupport [ qtdeclarative ] ++ lib.optionals kioPluginSupport [ kio ] - ++ lib.optionals plasmoidSupport [ extra-cmake-modules plasma-framework ] + ++ lib.optionals plasmoidSupport [ plasma-framework ] ; - nativeBuildInputs = [ cmake qttools ]; + nativeBuildInputs = [ + cmake + qttools + ] + ++ lib.optionals plasmoidSupport [ extra-cmake-modules ] + ; # No tests are available by upstream, but we test --help anyway doInstallCheck = true; @@ -56,7 +61,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://github.com/Martchus/syncthingtray"; description = "Tray application and Dolphin/Plasma integration for Syncthing"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix index d024eb031e..fd37a692d8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ticker"; - version = "3.1.9"; + version = "4.0.3"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/OpDcsRIwuj1bvtpPyk1Qc9QZGJMLiOLj8NBfbT7hdo="; + sha256 = "sha256-YVpspFBwao/7M2nTVMw+ANc0roL0vBO4DpNUb7Thp3Q="; }; - vendorSha256 = "sha256-aUBj7ZGWBeWc71y1CWm/KCw+El5TwH29S+KxyZGH1Zo="; + vendorSha256 = "sha256-nidOIjrTL4llV5GORebXOOPGeL6TxkurDY82cIc7+mU="; preBuild = '' buildFlagsArray+=("-ldflags" "-s -w -X github.com/achannarasappa/ticker/cmd.Version=v${version}") diff --git a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix index c789dbdce7..fb6bfc6efe 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FbbxkAP1RQVYL91mlAw0PcEWUDxgCrCd9QjLPE+bqmo="; + sha256 = "sha256-8m4mIXTqc6rDMIjODbHJL7ipH5Y4WwgsWcSmw/SaiIo="; }; - cargoSha256 = "sha256-94U84/UxHAf5yrCnqpxjwHi/ekFHbFBs9b7pBewKvjw="; + cargoSha256 = "sha256-ZcRFQT2CxqpO35UqK79g2Jq5SPOLZ88WiG36issC5kY="; nativeBuildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix b/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix index f7ca725941..945b0b3249 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, libsecret }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_11, libsecret }: stdenv.mkDerivation rec { pname = "todoist-electron"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_11}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/worker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/worker/default.nix index 12ac72b602..20ed6d55f3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/worker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "worker"; - version = "4.5.0"; + version = "4.7.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "02xrdg1v784p4gfqjm1mlxqwi40qlbzhp68p5ksj96cjv6av5b5s"; + sha256 = "sha256-9x/nHd2nUeFSH7a2qH4qlyH4FRH/NfNvTE1LEaMMSwU="; }; buildInputs = [ libX11 ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix index 98c8a8afae..6702fdaf7a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, rustPlatform, fetchurl, pkg-config, ncurses, openssl, Security }: +{ lib, stdenv, rustPlatform, fetchFromSourcehut, pkg-config, ncurses, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "asuka"; version = "0.8.1"; - src = fetchurl { - url = "https://git.sr.ht/~julienxx/${pname}/archive/${version}.tar.gz"; - sha256 = "07i80qmdpwfdgwrk1gzs10wln91v23qjrsk0x134xf5mjnakxc06"; + src = fetchFromSourcehut { + owner = "~julienxx"; + repo = pname; + rev = version; + sha256 = "1y8v4qc5dng3v9k0bky1xlf3qi9pk2vdsi29lff4ha5310467f0k"; }; cargoSha256 = "0p0x4ch04kydg76bfal5zqzr9hvn5268wf3k2v9h7g8r4y8xqlhw"; 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 98fe339773..8caa446b04 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": "89.0.4389.82", - "sha256": "0yg33d6zldz3j1jghhdci63fn46i10dkz3nb95jdrbv8gd018jfz", - "sha256bin64": "1sqzzillq38qyh85449ncz8bni93mjxb6r4z8y5h8k2w3j38jc0q", + "version": "89.0.4389.90", + "sha256": "16i7bgk2jbcqs2p28nk5mlf0k6wah594pcsfm8b154nxbyf0iihi", + "sha256bin64": "1hgpx7isp9krarj7jpbhs97ym4i9j9a1srywv9pdfzbhw6cid2pk", "deps": { "gn": { "version": "2021-01-07", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "90.0.4430.19", - "sha256": "174isyx4g62d8ggn9imp41dfklcbxi3y5nfprm4jbjmn5cb7v8xa", - "sha256bin64": "1155mk933xvhd8141dp210akkmbcchly3q4cr7v176id50dvpnxl", + "version": "91.0.4442.4", + "sha256": "0cmm2pimkghb6s956bkqf2k77lj69dz51nlydgkqbvw0sc8n784k", + "sha256bin64": "1hbfx8n51p7dwwz1vbp94jdmlb96vvxrbql2af4kmvx1bmzr2ism", "deps": { "gn": { "version": "2021-02-09", 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 f1b1b26ae3..72e9746421 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 @@ -33,6 +33,7 @@ , nspr , nss , pango +, pciutils , libheimdal , libpulseaudio , systemd @@ -125,6 +126,7 @@ stdenv.mkDerivation { nspr nss pango + pciutils libheimdal libpulseaudio systemd 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 7518e39938..a42bfb502d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -127,8 +127,9 @@ buildStdenv.mkDerivation ({ inherit src unpackPhase meta; patches = [ - ./env_var_for_system_dir.patch ] ++ + lib.optional (lib.versionOlder ffversion "86") ./env_var_for_system_dir-ff85.patch ++ + lib.optional (lib.versionAtLeast ffversion "86") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++ lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++ lib.optional (ltoSupport && lib.versionOlder ffversion "84") ./lto-dependentlibs-generation-ffx83.patch ++ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff85.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch rename to third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff85.patch diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch new file mode 100644 index 0000000000..f7a9cb7734 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch @@ -0,0 +1,21 @@ +diff -r 22fc47c968f2 toolkit/xre/nsXREDirProvider.cpp +--- a/toolkit/xre/nsXREDirProvider.cpp Mon Dec 14 15:09:17 2020 +0000 ++++ b/toolkit/xre/nsXREDirProvider.cpp Tue Feb 23 23:38:56 2021 +0100 +@@ -11,6 +11,7 @@ + + #include "jsapi.h" + #include "xpcpublic.h" ++#include "prenv.h" + + #include "nsIAppStartup.h" + #include "nsIFile.h" +@@ -305,7 +306,8 @@ + "/usr/lib/mozilla"_ns + # endif + ; +- rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); ++ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR"); ++ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast(dirname), false, getter_AddRefs(localDir)); + # endif + + if (NS_SUCCEEDED(rv)) { 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 86d91d21e3..925374d38e 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 = "85.0.2"; + ffversion = "86.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2m46li5ni1m4xv42h99rn2hhhv2mqy229wihmzxmgvws1rh2h11yf6x2a07akkjrsp2dmwxmmkhmf9dhakgj9i55z5qqi99azyx07df"; + sha512 = "e613cdcadfd71a01800a72c08c590032605ca8a8a0ba93326ffba93c2819f629fd620c23d00ca1274b203adc20acfe5d7913fee240ff14819fb1377ed08b1214"; }; meta = { 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 c5e5aff77e..b208ebf2ab 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 @@ -39,6 +39,12 @@ , gsettings-desktop-schemas , gnome3 + +# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder) +, libvaSupport ? true, libva + +# For Vulkan support (--enable-features=Vulkan) +, vulkanSupport ? true, vulkan-loader }: with lib; @@ -63,6 +69,8 @@ let kerberos libdrm mesa coreutils libxkbcommon wayland ] ++ optional pulseSupport libpulseaudio + ++ optional libvaSupport libva + ++ optional vulkanSupport vulkan-loader ++ [ gtk3 ]; suffix = if channel != "stable" then "-" + channel else ""; 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 effd1eae49..6e5d05ff0d 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 = "2.12.9"; + version = "2.12.10"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-WfyP48qOdFZfQ0+8AZDYokw7WK7lSx5di7z07gsRPZk="; + sha256 = "sha256-A4s6D3/1FsqrJ+Jaql4IuyD9ySChL3SXqVvl8wUDRDE="; }; vendorSha256 = "sha256-4XPMixVNj6PUKobNLwpsOBT7Zs/7pkhDtQacLIB5EfE="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index 5da9e9220a..501956ec93 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "helm"; - version = "3.5.2"; + version = "3.5.3"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-XFWJtzKQrZL6lcr8JNiEQ8ldG5289x5pE21E8XgoYkA="; + sha256 = "sha256-7xO07JDy6ujWlDF+5Xd3myRQ8ajTppCXz9fNe4yizVw="; }; - vendorSha256 = "sha256-mjWQxCCtTgj1VCFjnuJWgDjwMt/r4jiFC9Of+CXRgPg="; + vendorSha256 = "sha256-lpEoUgABtJczwShNdvD+zYAPDFTJqILSei2YY6mQ2mw="; doCheck = false; 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 561bcbf7ad..4fda7db9f1 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.17.0"; in +let version = "0.18.0"; in buildGoPackage { pname = "kubecfg"; @@ -10,7 +10,7 @@ buildGoPackage { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "sha256-/91im204vBS3NjrMOvwTVO6tEBgdpirqJFqCnbIB+iQ="; + sha256 = "sha256-TJbuJZDj9ZwEaN8LV/M30+5+IgN8EZCTTBBDB0OgdEE="; }; goPackagePath = "github.com/bitnami/kubecfg"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 581af59f0c..847e3f64ca 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,23 +2,20 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-IY9iJa4HcZ60jDPdP47jjC0FiOJesvf2vEENMAYVd4Q="; + sha256 = "sha256-IyYlmatgcVbUj1WCPAFVOIgn1iHM80P4ie6d1YD3ISM="; }; vendorSha256 = null; - buildFlagsArray = [ - "-ldflags=" - "-s" - "-w" - "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}" - ]; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}") + ''; nativeBuildInputs = [ installShellFiles ]; @@ -40,6 +37,14 @@ buildGoModule rec { --zsh <($out/bin/tkn completion zsh) ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/tkn --help + $out/bin/tkn version | grep "Client version: ${version}" + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://tekton.dev"; changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}"; 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 6191089592..6cb13a01ee 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.28.9"; + version = "0.28.11"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sqwR+bXx5ab5OsmW44C5MIXjzQFM1QsBvsM0R3pL3H8="; + sha256 = "sha256-qlmiQ73MRXcdXXC50pewUMt9YFbzXIbjnZTV5gIcvGs="; }; - vendorSha256 = "sha256-9DBCP/4mp/Gr2ie0nk7WGfL+M7snMEztdHZzxdIFbzM="; + vendorSha256 = "sha256-SVrDBDGK809O+RaE3gOa9U1agY6hSGI/k3FUCgm+5PA="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix index 6c13543932..ac7af8e53b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -20,19 +20,19 @@ stdenv.mkDerivation rec { pname = "newsflash"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = version; - hash = "sha256-Vu8PXdnayrglAFVfO+WZTzk4Qrb/3uqzQIwClnRHto8="; + hash = "sha256-EInI5Unaz9m8/gJ7vAzJVyMynJGq0KZh12dNK8r1wnY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-dWumQi/Bk7w2C8zVVExxguWchZU+K2qTC02otsiK9jA="; + hash = "sha256-xrWZhjfYnO6M3LMTP6l3+oZOusvUWuRBDesIlsiEJ6s="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix index 14cf45e97b..9f5cd6f69b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -1,12 +1,9 @@ { lib, stdenv , fetchFromGitLab , nix-update-script -, fetchpatch , meson , ninja , gettext -, cargo -, rustc , python3 , rustPlatform , pkg-config @@ -24,7 +21,7 @@ , wrapGAppsHook }: -rustPlatform.buildRustPackage rec { +stdenv.mkDerivation rec { pname = "fractal"; version = "4.4.0"; @@ -36,16 +33,21 @@ rustPlatform.buildRustPackage rec { sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw="; }; - cargoSha256 = "xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc="; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc="; + }; nativeBuildInputs = [ - cargo gettext meson ninja pkg-config python3 - rustc + rustPlatform.rust.cargo + rustPlatform.cargoSetupHook + rustPlatform.rust.rustc wrapGAppsHook glib ]; @@ -76,12 +78,6 @@ rustPlatform.buildRustPackage rec { patchShebangs scripts/meson_post_install.py scripts/test.sh ''; - # Don't use buildRustPackage phases, only use it for rust deps setup - configurePhase = null; - buildPhase = null; - checkPhase = null; - installPhase = null; - passthru = { updateScript = nix-update-script { attrPath = pname; @@ -91,7 +87,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Matrix group messaging app"; homepage = "https://gitlab.gnome.org/GNOME/fractal"; - license = licenses.gpl3; + license = licenses.gpl3Plus; broken = stdenv.isDarwin; maintainers = with maintainers; [ dtzWill worldofpeace ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index feffbe312d..d10c5359e3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -2,19 +2,20 @@ , fetchurl , appimageTools , makeWrapper -, electron_10 +, electron_12 +, xorg }: let - electron = electron_10; + electron = electron_12; in stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.4.2"; + version = "2.7.0"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "1lv3ca9qlggyb8vcg8zlxv46i8fgx5qrx7i7y71dlqblajalf42p"; + sha256 = "1g8was4anrsdpv4h11z544mi0v79him2xjyknixyrqfy87cbh97n"; name = "${pname}-${version}.AppImage"; }; @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXtst ]}" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix index 1625878a2d..9e7a1f8154 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "teams"; - version = "1.3.00.30857"; + version = "1.4.00.4855"; src = fetchurl { url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "06r48h1fr2si2g5ng8hsnbcmr70iapnafj21v5bzrzzrigzb2n2h"; + sha256 = "1g0lsydz4l536qf890drdz6g86xb0sm3326hz3ymj9pi8vvbs7d9"; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ]; @@ -38,9 +38,13 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin:${xdg-utils}/bin") + gappsWrapperArgs+=(--add-flags --disable-namespace-sandbox) + gappsWrapperArgs+=(--add-flags --disable-setuid-sandbox) ''; installPhase = '' + runHook preInstall + mkdir -p $out/{opt,bin} mv share/teams $out/opt/ @@ -54,6 +58,8 @@ stdenv.mkDerivation rec { # Work-around screen sharing bug # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay + + runHook postInstall ''; dontAutoPatchelf = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix index 8f4b2200cc..77935b30f0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "zulip-term"; - version = "0.5.2"; + version = "0.6.0"; # no tests on PyPI src = fetchFromGitHub { owner = "zulip"; repo = "zulip-terminal"; rev = version; - sha256 = "1xhhy3v4wck74a83avil0rnmsi2grrh03cww19n5mv80p2q1cjmf"; + sha256 = "sha256-nlvZaGMVRRCu8PZHxPWjNSxkqhZs0T/tE1js/3pDUFk="; }; patches = [ @@ -26,7 +26,9 @@ python3.pkgs.buildPythonApplication rec { urwid-readline beautifulsoup4 lxml - mypy-extensions + typing-extensions + python-dateutil + tzlocal ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix index 3124239b0d..09ce39027b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchurl +{ lib, buildGoModule, fetchFromSourcehut , ncurses, notmuch, scdoc , python3, w3m, dante }: @@ -7,9 +7,11 @@ buildGoModule rec { pname = "aerc"; version = "0.5.2"; - src = fetchurl { - url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz"; - sha256 = "h7kiRA5TuZ8mDSMymWU33stFLIOMd06TQLYzKW+faO4="; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = pname; + rev = version; + sha256 = "1ja639qry8h2d6y7qshf62ypkzs2rzady59p81scqh8nx0g9bils"; }; runVend = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index e038fba6d8..7242a1a7ff 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.29"; + version = "2.31"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-wyqshtL3wGrmb1oEMOMk2QmDXW9M5tt9d1QEtMFiXa4="; + sha256 = "sha256-0s/hcRUuskU4TZqk5h4A51mkEJ6uUZS42mKDQvSx3I4="; }; - vendorSha256 = "sha256-uT/Y/TfpqDyOUElc4M/w/v77bWF3tTJz+Yu0KRMcxk4="; + vendorSha256 = "sha256-QpGRQQbNchj0T9USRnALjvOGd2cV+JUgJeRgfjK8n5o="; subPackages = [ "weed" ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix index f48a21db75..4675760186 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, fetchFromGitHub , armadillo -, boost , cmake +, gmp , glog , gmock , openssl , gflags -, gnuradio +, gnuradio3_8 +, libpcap , orc , pkg-config -, pythonPackages , uhd , log4cpp , blas, lapack @@ -18,7 +19,7 @@ , protobuf }: -stdenv.mkDerivation rec { +gnuradio3_8.pkgs.mkDerivation rec { pname = "gnss-sdr"; version = "0.0.13"; @@ -29,27 +30,32 @@ stdenv.mkDerivation rec { sha256 = "0a3k47fl5dizzhbqbrbmckl636lznyjby2d2nz6fz21637hvrnby"; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + gnuradio3_8.unwrapped.python + gnuradio3_8.unwrapped.python.pkgs.Mako + gnuradio3_8.unwrapped.python.pkgs.six + ]; + buildInputs = [ + gmp armadillo - boost.dev + gnuradio3_8.unwrapped.boost glog gmock - openssl.dev + openssl gflags - gnuradio orc - pythonPackages.Mako - pythonPackages.six - # UHD support is optional, but gnuradio is built with it, so there's # nothing to be gained by leaving it out. - uhd + gnuradio3_8.unwrapped.uhd log4cpp blas lapack matio pugixml protobuf + gnuradio3_8.pkgs.osmosdr + libpcap ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.7.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.7.nix index a48efb9aa6..50993dd6f8 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.7.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.7.nix @@ -5,6 +5,7 @@ # Remove gcc and python references , removeReferencesTo , pkg-config +, volk , cppunit , swig , orc @@ -43,11 +44,12 @@ minor = "14"; patch = "0"; } -, fetchSubmodules ? true +# We use our build of volk and not the one bundled with the release +, fetchSubmodules ? false }: let - sourceSha256 = "1nh4f9dmygprlbqybd3j1byg9fsr6065n140mvc4b0v8qqygmhrc"; + sourceSha256 = "BiUDibXV/5cEYmAAaIxT4WTxF/ni4MJumF5oJ/vuOyc="; featuresInfo = { # Needed always basic = { @@ -61,6 +63,9 @@ let }; volk = { cmakeEnableFlag = "VOLK"; + runtime = [ + volk + ]; }; doxygen = { native = [ doxygen ]; @@ -213,19 +218,29 @@ let qt = qt4; gtk = gtk2; }); + inherit (shared) hasFeature; # function +in + +stdenv.mkDerivation rec { + inherit pname; inherit (shared) version src - hasFeature # function nativeBuildInputs buildInputs disallowedReferences postInstall - passthru doCheck dontWrapPythonPrograms meta ; + + passthru = shared.passthru // { + # Deps that are potentially overriden and are used inside GR plugins - the same version must + inherit boost volk; + } // lib.optionalAttrs (hasFeature "gr-uhd" features) { + inherit uhd; + }; cmakeFlags = shared.cmakeFlags # From some reason, if these are not set, libcodec2 and gsm are # not detected properly (slightly different then what's in @@ -236,6 +251,9 @@ let "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" "-DLIBGSM_INCLUDE_DIR=${gsm}/include/gsm" ] + ++ lib.optionals (hasFeature "volk" features && volk != null) [ + "-DENABLE_INTERNAL_VOLK=OFF" + ] ; stripDebugList = shared.stripDebugList # gr-fcd feature was dropped in 3.8 @@ -250,15 +268,6 @@ let + lib.optionalString (hasFeature "gnuradio-companion" features) '' sed -i 's/.*pygtk_version.*/set(PYGTK_FOUND TRUE)/g' grc/CMakeLists.txt '' - # If python-support is disabled, don't install volk's (git submodule) - # volk_modtool - it references python. - # - # NOTE: The same is done for 3.8, but we don't put this string in - # ./shared.nix since on the next release of 3.8 it won't be needed there, - # but it will be needed for 3.7, probably for ever. - + lib.optionalString (!hasFeature "python-support" features) '' - sed -i -e "/python\/volk_modtool/d" volk/CMakeLists.txt - '' ; patches = [ # Don't install python referencing files if python support is disabled. @@ -272,24 +281,4 @@ let sha256 = "2Pitgu8accs16B5X5+/q51hr+IY9DMsA15f56gAtBs8="; }) ]; -in - -stdenv.mkDerivation rec { - inherit - pname - version - src - nativeBuildInputs - buildInputs - cmakeFlags - preConfigure - # disallowedReferences - stripDebugList - patches - postInstall - passthru - doCheck - dontWrapPythonPrograms - meta - ; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix new file mode 100644 index 0000000000..799b429800 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix @@ -0,0 +1,284 @@ +{ lib, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +# Remove gcc and python references +, removeReferencesTo +, pkg-config +, volk +, cppunit +, swig +, orc +, boost +, log4cpp +, mpir +, doxygen +, python +, codec2 +, gsm +, fftwFloat +, alsaLib +, libjack2 +, CoreAudio +, uhd +, SDL +, gsl +, cppzmq +, zeromq +# Needed only if qt-gui is disabled, from some reason +, icu +# GUI related +, gtk3 +, pango +, gobject-introspection +, cairo +, qt5 +, libsForQt5 +# Features available to override, the list of them is in featuresInfo. They +# are all turned on by default. +, features ? {} +# If one wishes to use a different src or name for a very custom build +, overrideSrc ? {} +, pname ? "gnuradio" +, versionAttr ? { + major = "3.8"; + minor = "2"; + patch = "0"; +} +# We use our build of volk and not the one bundled with the release +, fetchSubmodules ? false +}: + +let + sourceSha256 = "SFDjtyQRp0fXijZukpLYtISpx8imxedlYN9mRibv1eA="; + featuresInfo = { + # Needed always + basic = { + native = [ + cmake + pkg-config + orc + ]; + runtime = [ + boost + log4cpp + mpir + ] + # when gr-qtgui is disabled, icu needs to be included, otherwise + # building with boost 1.7x fails + ++ lib.optionals (!(hasFeature "gr-qtgui" features)) [ icu ]; + pythonNative = with python.pkgs; [ + Mako + six + ]; + }; + volk = { + cmakeEnableFlag = "VOLK"; + runtime = [ + volk + ]; + }; + doxygen = { + native = [ doxygen ]; + cmakeEnableFlag = "DOXYGEN"; + }; + sphinx = { + pythonNative = with python.pkgs; [ sphinx ]; + cmakeEnableFlag = "SPHINX"; + }; + python-support = { + pythonRuntime = [ python.pkgs.six ]; + native = [ + swig + python + ]; + cmakeEnableFlag = "PYTHON"; + }; + testing-support = { + native = [ cppunit ]; + cmakeEnableFlag = "TESTING"; + }; + gnuradio-runtime = { + cmakeEnableFlag = "GNURADIO_RUNTIME"; + }; + gr-ctrlport = { + # Thrift support is not really working well, and even the patch they + # recommend applying on 0.9.2 won't apply. See: + # https://github.com/gnuradio/gnuradio/blob/v3.8.2.0/gnuradio-runtime/lib/controlport/thrift/README + cmakeEnableFlag = "GR_CTRLPORT"; + native = [ + swig + ]; + }; + gnuradio-companion = { + pythonRuntime = with python.pkgs; [ + pyyaml + Mako + numpy + pygobject3 + ]; + runtime = [ + gtk3 + pango + gobject-introspection + cairo + ]; + cmakeEnableFlag = "GRC"; + }; + gr-blocks = { + cmakeEnableFlag = "GR_BLOCKS"; + }; + gr-fec = { + cmakeEnableFlag = "GR_FEC"; + }; + gr-fft = { + runtime = [ fftwFloat ]; + cmakeEnableFlag = "GR_FFT"; + }; + gr-filter = { + runtime = [ fftwFloat ]; + cmakeEnableFlag = "GR_FILTER"; + }; + gr-analog = { + cmakeEnableFlag = "GR_ANALOG"; + }; + gr-digital = { + cmakeEnableFlag = "GR_DIGITAL"; + }; + gr-dtv = { + cmakeEnableFlag = "GR_DTV"; + }; + gr-audio = { + runtime = [] + ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ] + ++ lib.optionals stdenv.isDarwin [ CoreAudio ] + ; + cmakeEnableFlag = "GR_AUDIO"; + }; + gr-channels = { + cmakeEnableFlag = "GR_CHANNELS"; + }; + gr-qtgui = { + runtime = [ qt5.qtbase libsForQt5.qwt ]; + pythonRuntime = [ python.pkgs.pyqt5 ]; + cmakeEnableFlag = "GR_QTGUI"; + }; + gr-trellis = { + cmakeEnableFlag = "GR_TRELLIS"; + }; + gr-uhd = { + runtime = [ uhd ]; + cmakeEnableFlag = "GR_UHD"; + }; + gr-utils = { + cmakeEnableFlag = "GR_UTILS"; + }; + gr-modtool = { + pythonRuntime = with python.pkgs; [ + click + click-plugins + ]; + cmakeEnableFlag = "GR_MODTOOL"; + }; + gr-video-sdl = { + runtime = [ SDL ]; + cmakeEnableFlag = "GR_VIDEO_SDL"; + }; + gr-vocoder = { + runtime = [ codec2 gsm ]; + cmakeEnableFlag = "GR_VOCODER"; + }; + gr-wavelet = { + cmakeEnableFlag = "GR_WAVELET"; + runtime = [ gsl ]; + }; + gr-zeromq = { + runtime = [ cppzmq zeromq ]; + cmakeEnableFlag = "GR_ZEROMQ"; + }; + }; + shared = (import ./shared.nix { + inherit + stdenv + lib + python + removeReferencesTo + featuresInfo + features + versionAttr + sourceSha256 + overrideSrc + fetchFromGitHub + fetchSubmodules + ; + qt = qt5; + gtk = gtk3; + }); + inherit (shared) hasFeature; # function +in + +stdenv.mkDerivation rec { + inherit pname; + inherit (shared) + version + src + nativeBuildInputs + buildInputs + disallowedReferences + stripDebugList + doCheck + dontWrapPythonPrograms + dontWrapQtApps + meta + ; + passthru = shared.passthru // { + # Deps that are potentially overriden and are used inside GR plugins - the same version must + inherit boost volk; + } // lib.optionalAttrs (hasFeature "gr-uhd" features) { + inherit uhd; + } // lib.optionalAttrs (hasFeature "gr-qtgui" features) { + inherit (libsForQt5) qwt; + }; + cmakeFlags = shared.cmakeFlags + # From some reason, if these are not set, libcodec2 and gsm are not + # detected properly. NOTE: qradiolink needs libcodec2 to be detected in + # order to build, see https://github.com/qradiolink/qradiolink/issues/67 + ++ lib.optionals (hasFeature "gr-vocoder" features) [ + "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" + "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" + "-DLIBCODEC2_HAS_FREEDV_API=ON" + "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" + "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" + ] + ++ lib.optionals (hasFeature "volk" features && volk != null) [ + "-DENABLE_INTERNAL_VOLK=OFF" + ] + ; + + postInstall = shared.postInstall + # This is the only python reference worth removing, if needed (3.7 doesn't + # set that reference). + + lib.optionalString (!hasFeature "python-support" features) '' + ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake + '' + ; + patches = [ + # Don't install python referencing files if python support is disabled. + # See: https://github.com/gnuradio/gnuradio/pull/3839 + (fetchpatch { + url = "https://github.com/gnuradio/gnuradio/commit/4a4fd570b398b0b50fe875fcf0eb9c9db2ea5c6e.diff"; + sha256 = "xz2E0ji6zfdOAhjfPecAcaVOIls1XP8JngLkBbBBW5Q="; + }) + (fetchpatch { + url = "https://github.com/gnuradio/gnuradio/commit/dbc8ad7e7361fddc7b1dbc267c07a776a3f9664b.diff"; + sha256 = "tQcCpcUbJv3yqAX8rSHN/pAuBq4ueEvoVo7sNzZGvf4="; + }) + # Needed to use boost 1.7x, see: + # https://github.com/gnuradio/gnuradio/issues/3720 + # https://github.com/gnuradio/gnuradio/pull/3967 + (fetchpatch { + url = "https://github.com/gnuradio/gnuradio/commit/cbcb968358fad56f3646619b258f18b0e6693a07.diff"; + sha256 = "1ajf4797f869lqv436xw61s29qdbn7f01i0970kfxv3yahd34p9v"; + }) + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix deleted file mode 100644 index 8d6e850977..0000000000 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, boost -, gnuradio -, makeWrapper -, cppunit -, gr-osmosdr -, log4cpp -, pythonSupport ? true -, python -, swig -, fetchpatch -}: - -stdenv.mkDerivation { - pname = "gr-ais"; - version = "2015-12-20"; - - src = fetchFromGitHub { - owner = "bistromath"; - repo = "gr-ais"; - rev = "cdc1f52745853f9c739c718251830eb69704b26e"; - sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054.patch"; - sha256 = "1cwalphldvf6dbhzwz1gi53z0cb4921qsvlz4138q7m6dxccvssg"; - }) - ]; - - nativeBuildInputs = [ cmake makeWrapper pkg-config ]; - buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ] - ++ lib.optionals pythonSupport [ python swig ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") - done - ''; - - meta = with lib; { - description = "Gnuradio block for ais"; - homepage = "https://github.com/bistromath/gr-ais"; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix index 9bc1511968..bcb2560144 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix @@ -5,8 +5,8 @@ # Remove gcc and python references , removeReferencesTo , pkg-config +, volk , cppunit -, swig , orc , boost , log4cpp @@ -22,8 +22,13 @@ , uhd , SDL , gsl +, libsodium +, libsndfile +, libunwind , cppzmq , zeromq +# Needed only if qt-gui is disabled, from some reason +, icu # GUI related , gtk3 , pango @@ -38,16 +43,15 @@ , overrideSrc ? {} , pname ? "gnuradio" , versionAttr ? { - major = "3.8"; - minor = "2"; + major = "3.9"; + minor = "0"; patch = "0"; } -# Should be false on the release after 3.8.2.0 -, fetchSubmodules ? true +, fetchSubmodules ? false }: let - sourceSha256 = "1mnfwdy7w3160vi6110x2qkyq8l78qi8771zwak9n72bl7lhhpnf"; + sourceSha256 = "ZjQzioAuWrd8jsYOnLNH1mK4n9EbrjgvPX3mTzVFdLk="; featuresInfo = { # Needed always basic = { @@ -57,32 +61,26 @@ let orc ]; runtime = [ + volk boost log4cpp mpir - ]; + ] + # when gr-qtgui is disabled, icu needs to be included, otherwise + # building with boost 1.7x fails + ++ lib.optionals (!(hasFeature "gr-qtgui" features)) [ icu ]; pythonNative = with python.pkgs; [ Mako six ]; }; - # NOTE: Should be removed on the release after 3.8.2.0, see: - # https://github.com/gnuradio/gnuradio/commit/80c04479d - volk = { - cmakeEnableFlag = "VOLK"; - }; doxygen = { native = [ doxygen ]; cmakeEnableFlag = "DOXYGEN"; }; - sphinx = { - pythonNative = with python.pkgs; [ sphinx ]; - cmakeEnableFlag = "SPHINX"; - }; python-support = { pythonRuntime = [ python.pkgs.six ]; native = [ - swig python ]; cmakeEnableFlag = "PYTHON"; @@ -91,17 +89,23 @@ let native = [ cppunit ]; cmakeEnableFlag = "TESTING"; }; + post-install = { + cmakeEnableFlag = "POSTINSTALL"; + }; gnuradio-runtime = { cmakeEnableFlag = "GNURADIO_RUNTIME"; + pythonRuntime = [ + python.pkgs.pybind11 + ]; }; gr-ctrlport = { # Thrift support is not really working well, and even the patch they # recommend applying on 0.9.2 won't apply. See: - # https://github.com/gnuradio/gnuradio/blob/v3.8.2.0/gnuradio-runtime/lib/controlport/thrift/README - cmakeEnableFlag = "GR_CTRLPORT"; - native = [ - swig + # https://github.com/gnuradio/gnuradio/blob/v3.9.0.0/gnuradio-runtime/lib/controlport/thrift/README + runtime = [ + libunwind ]; + cmakeEnableFlag = "GR_CTRLPORT"; }; gnuradio-companion = { pythonRuntime = with python.pkgs; [ @@ -110,11 +114,15 @@ let numpy pygobject3 ]; + native = [ + python.pkgs.pytest + ]; runtime = [ gtk3 pango gobject-introspection cairo + libsndfile ]; cmakeEnableFlag = "GRC"; }; @@ -160,7 +168,9 @@ let cmakeEnableFlag = "GR_TRELLIS"; }; gr-uhd = { - runtime = [ uhd ]; + runtime = [ + uhd + ]; cmakeEnableFlag = "GR_UHD"; }; gr-utils = { @@ -173,22 +183,29 @@ let ]; cmakeEnableFlag = "GR_MODTOOL"; }; + gr-blocktool = { + cmakeEnableFlag = "GR_BLOCKTOOL"; + }; gr-video-sdl = { runtime = [ SDL ]; cmakeEnableFlag = "GR_VIDEO_SDL"; }; - gr-vocoder = { - runtime = [ codec2 gsm ]; - cmakeEnableFlag = "GR_VOCODER"; - }; + # codec2 and gsm support is broken with gr3.9: https://github.com/gnuradio/gnuradio/issues/4278 + # gr-vocoder = { + # runtime = [ codec2 gsm ]; + # cmakeEnableFlag = "GR_VOCODER"; + # }; gr-wavelet = { cmakeEnableFlag = "GR_WAVELET"; - runtime = [ gsl ]; + runtime = [ gsl libsodium ]; }; gr-zeromq = { runtime = [ cppzmq zeromq ]; cmakeEnableFlag = "GR_ZEROMQ"; }; + gr-network = { + cmakeEnableFlag = "GR_NETWORK"; + }; }; shared = (import ./shared.nix { inherit @@ -207,84 +224,42 @@ let qt = qt5; gtk = gtk3; }); - inherit (shared) - version - src - hasFeature # function - nativeBuildInputs - buildInputs - disallowedReferences - stripDebugList - passthru - doCheck - dontWrapPythonPrograms - dontWrapQtApps - meta - ; - cmakeFlags = shared.cmakeFlags - # From some reason, if these are not set, libcodec2 and gsm are not - # detected properly. NOTE: qradiolink needs libcodec2 to be detected in - # order to build, see https://github.com/qradiolink/qradiolink/issues/67 - ++ lib.optionals (hasFeature "gr-vocoder" features) [ - "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" - "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" - "-DLIBCODEC2_HAS_FREEDV_API=ON" - "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" - "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" - ] - ; - - postInstall = shared.postInstall - # This is the only python reference worth removing, if needed (3.7 doesn't - # set that reference). - + lib.optionalString (!hasFeature "python-support" features) '' - ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake - '' - ; - preConfigure = "" - # If python-support is disabled, don't install volk's (git submodule) - # volk_modtool - it references python. - # - # NOTE: on the next release, volk will always be required to be installed - # externally (submodule removed upstream). Hence this hook will fail and - # we'll need to package volk while able to tell it to install or not - # install python referencing files. When we'll be there, this will help: - # https://github.com/gnuradio/volk/pull/404 - + lib.optionalString (!hasFeature "python-support" features) '' - sed -i -e "/python\/volk_modtool/d" volk/CMakeLists.txt - '' - ; - patches = [ - # Don't install python referencing files if python support is disabled. - # See: https://github.com/gnuradio/gnuradio/pull/3839 - (fetchpatch { - url = "https://github.com/gnuradio/gnuradio/commit/4a4fd570b398b0b50fe875fcf0eb9c9db2ea5c6e.diff"; - sha256 = "xz2E0ji6zfdOAhjfPecAcaVOIls1XP8JngLkBbBBW5Q="; - }) - (fetchpatch { - url = "https://github.com/gnuradio/gnuradio/commit/dbc8ad7e7361fddc7b1dbc267c07a776a3f9664b.diff"; - sha256 = "tQcCpcUbJv3yqAX8rSHN/pAuBq4ueEvoVo7sNzZGvf4="; - }) - ]; + inherit (shared) hasFeature; # function in stdenv.mkDerivation rec { - inherit - pname + inherit pname; + inherit (shared) version src nativeBuildInputs buildInputs cmakeFlags - preConfigure - # disallowedReferences + disallowedReferences stripDebugList - patches - postInstall - passthru doCheck dontWrapPythonPrograms dontWrapQtApps meta ; + passthru = shared.passthru // { + # Deps that are potentially overriden and are used inside GR plugins - the same version must + inherit boost volk; + } // lib.optionalAttrs (hasFeature "gr-uhd" features) { + inherit uhd; + } // lib.optionalAttrs (hasFeature "gr-qtgui" features) { + inherit (libsForQt5) qwt; + }; + + postInstall = shared.postInstall + # This is the only python reference worth removing, if needed. + # Even if python support is enabled, and we don't care about this + # reference, pybind's path is not properly set. See: + # https://github.com/gnuradio/gnuradio/issues/4380 + + lib.optionalString (!hasFeature "python-support" features) '' + ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake + ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so) + ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake + '' + ; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix deleted file mode 100644 index 28c5045081..0000000000 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, log4cpp -, makeWrapper, cppunit, libosmocore, gr-osmosdr -, pythonSupport ? true, python, swig -}: - -assert pythonSupport -> python != null && swig != null; - -stdenv.mkDerivation { - pname = "gr-gsm"; - version = "2016-08-25"; - - src = fetchFromGitHub { - owner = "ptrkrysik"; - repo = "gr-gsm"; - rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d"; - sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ - boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr log4cpp - ] ++ lib.optionals pythonSupport [ python swig ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:${gr-osmosdr}/lib/${python.libPrefix}/site-packages:$(toPythonPath "$out") - done - ''; - - meta = with lib; { - description = "Gnuradio block for gsm"; - homepage = "https://github.com/ptrkrysik/gr-gsm"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix deleted file mode 100644 index afe3de6452..0000000000 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio -, pythonSupport ? true, python, swig, limesuite, log4cpp -} : - -assert pythonSupport -> python != null && swig != null; - -let - version = "2.0.0"; - -in stdenv.mkDerivation { - pname = "gr-limesdr"; - inherit version; - - src = fetchFromGitHub { - owner = "myriadrf"; - repo = "gr-limesdr"; - rev = "v${version}"; - sha256 = "0ldqvfwl0gil89l9s31fjf9d7ki0dk572i8vna336igfaz348ypq"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ] ++ lib.optionals pythonSupport [ swig ]; - - buildInputs = [ - boost gnuradio limesuite log4cpp - ] ++ lib.optionals pythonSupport [ python ]; - - - meta = with lib; { - description = "Gnuradio source and sink blocks for LimeSDR"; - homepage = "https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.markuskowa ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix deleted file mode 100644 index 436c4309a5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchgit, cmake, pkg-config, makeWrapper -, boost -, pythonSupport ? true, python, swig -, airspy -, gnuradio -, hackrf -, libbladeRF -, rtl-sdr -, soapysdr-with-plugins -, uhd -, log4cpp -}: - -assert pythonSupport -> python != null && swig != null; - -stdenv.mkDerivation rec { - pname = "gr-osmosdr"; - version = "0.1.5"; - - src = fetchgit { - url = "git://git.osmocom.org/gr-osmosdr"; - rev = "v${version}"; - sha256 = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv"; - }; - - nativeBuildInputs = [ cmake makeWrapper pkg-config ]; - buildInputs = [ - boost log4cpp airspy gnuradio hackrf libbladeRF rtl-sdr uhd - ] ++ lib.optionals stdenv.isLinux [ soapysdr-with-plugins ] - ++ lib.optionals pythonSupport [ python swig python.pkgs.cheetah ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") - done - ''; - - meta = with lib; { - description = "Gnuradio block for OsmoSDR and rtl-sdr"; - homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR"; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix deleted file mode 100644 index 4f15f2a961..0000000000 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, log4cpp -, makeWrapper, pythonSupport ? true, python, swig -}: - -assert pythonSupport -> python != null && swig != null; - -stdenv.mkDerivation rec { - pname = "gr-rds"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "bastibl"; - repo = "gr-rds"; - rev = "v${version}"; - sha256 = "0jkzchvw0ivcxsjhi1h0mf7k13araxf5m4wi5v9xdgqxvipjzqfy"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ - boost gnuradio makeWrapper log4cpp - ] ++ lib.optionals pythonSupport [ python swig ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") - done - ''; - - meta = with lib; { - description = "Gnuradio block for radio data system"; - homepage = "https://github.com/bastibl/gr-rds"; - license = licenses.gpl2Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix index 9b354d5b96..f8ea2f0b16 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix @@ -85,9 +85,6 @@ rec { ; postInstall = "" # Gcc references - + lib.optionalString (hasFeature "volk" features) '' - ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) - '' + lib.optionalString (hasFeature "gnuradio-runtime" features) '' ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime.so) '' @@ -103,9 +100,11 @@ rec { features featuresInfo python - qt - gtk ; + } // lib.optionalAttrs (hasFeature "gr-qtgui" features) { + inherit qt; + } // lib.optionalAttrs (hasFeature "gnuradio-companion" features) { + inherit gtk; }; # Wrapping is done with an external wrapper dontWrapPythonPrograms = true; diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix index aaf74abc2c..d255b199bc 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix @@ -1,9 +1,16 @@ { lib , stdenv +# The unwrapped gnuradio derivation , unwrapped +# If it's a minimal build, we don't want to wrap it with lndir and +# wrapProgram.. +, wrap ? true +# For the wrapper , makeWrapper # For lndir , xorg +# To define a the gnuradio.pkgs scope +, newScope # For Emulating wrapGAppsHook , gsettings-desktop-schemas , glib @@ -37,12 +44,16 @@ let [] ) ) unwrapped.featuresInfo) - ++ lib.optionals (unwrapped.hasFeature "python-support" unwrapped.features) [ - # Add unwrapped itself as a python module - (unwrapped.python.pkgs.toPythonModule unwrapped) - ] + ++ lib.optionals + (unwrapped.hasFeature "python-support" unwrapped.features) + ( + # Add unwrapped itself as a python module + [ (unwrapped.python.pkgs.toPythonModule unwrapped) ] + # Add all extraPackages as python modules + ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) + ) ; - python3Env = unwrapped.python.withPackages(ps: pythonPkgs); + pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs); name = (lib.appendToName "wrapped" unwrapped).name; makeWrapperArgs = builtins.concatStringsSep " " ([ @@ -88,48 +99,84 @@ let (if unwrapped.versionAttr.major == "3.8" then [ "--prefix" "QT_PLUGIN_PATH" ":" - "${lib.getBin unwrapped.qt.qtbase}/${unwrapped.qt.qtbase.qtPluginPrefix}" + "${ + lib.makeSearchPath + unwrapped.qt.qtbase.qtPluginPrefix + (builtins.map lib.getBin [ + unwrapped.qt.qtbase + unwrapped.qt.qtwayland + ]) + }" "--prefix" "QML2_IMPORT_PATH" ":" - "${lib.getBin unwrapped.qt.qtbase}/${unwrapped.qt.qtbase.qtQmlPrefix}" + "${ + lib.makeSearchPath + unwrapped.qt.qtbase.qtQmlPrefix + (builtins.map lib.getBin [ + unwrapped.qt.qtbase + unwrapped.qt.qtwayland + ]) + }" ] else - # TODO: Add here qt4 related environment for 3.7? + # Add here qt4 related environment for 3.7? [ ] ) ++ extraMakeWrapperArgs ); -in -stdenv.mkDerivation { - inherit name; - buildInputs = [ - makeWrapper - xorg.lndir - ]; - - passthru = { - inherit python3Env pythonPkgs unwrapped; + packages = import ../../../top-level/gnuradio-packages.nix { + inherit lib stdenv newScope; + gnuradio = unwrapped; }; - - buildCommand = '' - mkdir $out - cd $out - lndir -silent ${unwrapped} - for i in $out/bin/*; do - if [[ ! -x "$i" ]]; then - continue - fi - cp -L "$i" "$i".tmp - mv -f "$i".tmp "$i" - if head -1 "$i" | grep -q ${unwrapped.python}; then - substituteInPlace "$i" \ - --replace ${unwrapped.python} ${python3Env} - fi - wrapProgram "$i" ${makeWrapperArgs} - done - ''; - - inherit (unwrapped) meta; -} + passthru = unwrapped.passthru // { + inherit + pythonEnv + pythonPkgs + unwrapped + ; + pkgs = packages; + }; + self = if wrap then + stdenv.mkDerivation { + inherit name passthru; + buildInputs = [ + makeWrapper + xorg.lndir + ]; + buildCommand = '' + mkdir $out + cd $out + lndir -silent ${unwrapped} + ${lib.optionalString + (extraPackages != []) + (builtins.concatStringsSep "\n" + (builtins.map (pkg: '' + if [[ -d ${lib.getBin pkg}/bin/ ]]; then + lndir -silent ${pkg}/bin ./bin + fi + '') extraPackages) + ) + } + for i in $out/bin/*; do + if [[ ! -x "$i" ]]; then + continue + fi + cp -L "$i" "$i".tmp + mv -f "$i".tmp "$i" + if head -1 "$i" | grep -q ${unwrapped.python}; then + substituteInPlace "$i" \ + --replace ${unwrapped.python} ${pythonEnv} + fi + wrapProgram "$i" ${makeWrapperArgs} + done + ''; + inherit (unwrapped) meta; + } + else + unwrapped.overrideAttrs(_: { + inherit passthru; + }) + ; +in self diff --git a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix index 217818f67c..cccdff1f3c 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix @@ -1,13 +1,23 @@ -{ lib, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr -, mkDerivation +{ lib +, fetchFromGitHub +, cmake +, pkg-config +, qt5 +, gnuradio3_8Minimal +, log4cpp +, mpir +, fftwFloat +, alsaLib +, libjack2 # drivers (optional): -, rtl-sdr, hackrf +, rtl-sdr +, hackrf , pulseaudioSupport ? true, libpulseaudio }: assert pulseaudioSupport -> libpulseaudio != null; -mkDerivation rec { +gnuradio3_8Minimal.pkgs.mkDerivation rec { pname = "gqrx"; version = "2.14.4"; @@ -18,9 +28,23 @@ mkDerivation rec { sha256 = "sha256-mMaxu0jq2GaNLWjLsJQXx+zCxtyiCAZQJJZ8GJtnllQ="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + qt5.wrapQtAppsHook + ]; buildInputs = [ - qtbase qtsvg gnuradio boost gr-osmosdr rtl-sdr hackrf + log4cpp + mpir + fftwFloat + alsaLib + libjack2 + gnuradio3_8Minimal.unwrapped.boost + qt5.qtbase + qt5.qtsvg + gnuradio3_8Minimal.pkgs.osmosdr + rtl-sdr + hackrf ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/radio/inspectrum/default.nix b/third_party/nixpkgs/pkgs/applications/radio/inspectrum/default.nix index 37131a686b..9d61ab4b60 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/inspectrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/inspectrum/default.nix @@ -1,17 +1,14 @@ { lib -, mkDerivation +, gnuradio3_8Minimal , fetchFromGitHub , pkg-config , cmake -, boost , fftwFloat -, gnuradio +, qt5 , liquid-dsp -, qtbase -, wrapQtAppsHook }: -mkDerivation rec { +gnuradio3_8Minimal.pkgs.mkDerivation rec { pname = "inspectrum"; version = "0.2.3"; @@ -22,13 +19,15 @@ mkDerivation rec { sha256 = "1x6nyn429pk0f7lqzskrgsbq09mq5787xd4piic95add6n1cc355"; }; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + qt5.wrapQtAppsHook + pkg-config + ]; buildInputs = [ fftwFloat - boost - gnuradio liquid-dsp - qtbase + qt5.qtbase ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/radio/qradiolink/default.nix b/third_party/nixpkgs/pkgs/applications/radio/qradiolink/default.nix index 24c5f987f1..2dbd9f1aba 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/qradiolink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/qradiolink/default.nix @@ -1,51 +1,71 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib, boost -, qt4, libpulseaudio, codec2, libconfig -, gnuradio, gr-osmosdr, gsm -, libopus, libjpeg, protobuf, qwt, speex -} : +{ lib +, fetchFromGitHub +, libpulseaudio +, libconfig +# Needs a gnuradio built with qt gui support +, gnuradio3_8 +# Not gnuradioPackages' +, codec2 +, log4cpp +, gmp +, gsm +, libopus +, libjpeg +, libsndfile +, libftdi +, protobuf +, speex +, speexdsp +}: -let - version = "0.5.0"; - -in stdenv.mkDerivation { +gnuradio3_8.pkgs.mkDerivation rec { pname = "qradiolink"; - inherit version; + version = "0.8.5-2"; src = fetchFromGitHub { - owner = "kantooon"; + owner = "qradiolink"; repo = "qradiolink"; rev = version; - sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi"; + sha256 = "MgHfKR3AJW3pIN9oCBr4BWxk1fGSCpLmMzjxvuTmuFA="; }; preBuild = '' - cd ext + cd src/ext protoc --cpp_out=. Mumble.proto protoc --cpp_out=. QRadioLink.proto - cd .. + cd ../.. qmake ''; installPhase = '' - mkdir -p $out/bin - cp qradiolink $out/bin + install -D qradiolink $out/bin/qradiolink + install -Dm644 src/res/icon.png $out/share/pixmaps/qradiolink.png + install -Dm644 qradiolink.desktop $out/share/applications/qradiolink.desktop ''; buildInputs = [ - qt4 - alsaLib - boost - libpulseaudio + gnuradio3_8.unwrapped.boost codec2 + log4cpp + gmp + libpulseaudio libconfig gsm - gnuradio - gr-osmosdr + gnuradio3_8.pkgs.osmosdr libopus libjpeg - protobuf speex - qwt + speexdsp + gnuradio3_8.qt.qtbase + gnuradio3_8.qt.qtmultimedia + libftdi + libsndfile + gnuradio3_8.qwt + ]; + nativeBuildInputs = [ + protobuf + gnuradio3_8.qt.qmake + gnuradio3_8.qt.wrapQtAppsHook ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/radio/svxlink/default.nix b/third_party/nixpkgs/pkgs/applications/radio/svxlink/default.nix index 19e635da5a..d6a82049a2 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/svxlink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/svxlink/default.nix @@ -14,13 +14,13 @@ let in stdenv.mkDerivation rec { pname = "svxlink"; - version = "19.09.1"; + version = "19.09.2"; src = fetchFromGitHub { owner = "sm0svx"; repo = pname; rev = version; - sha256 = "0xmbac821w9kl7imlz0mra19mlhi0rlpbyyay26w1y7h98j4g4yp"; + sha256 = "sha256-riyFEuEmJ7+jYT3UoTTsMUwFdO3y5mjo4z0fcC3O8gY="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/uhd/3.5.nix b/third_party/nixpkgs/pkgs/applications/radio/uhd/3.5.nix new file mode 100644 index 0000000000..d913927a7b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/radio/uhd/3.5.nix @@ -0,0 +1,159 @@ +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, cmake +, pkg-config +# See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations +, boost +, enableLibuhd_C_api ? true +# requires numpy +, enableLibuhd_Python_api ? false +, python3 +, enableExamples ? false +, enableUtils ? false +, enableLiberio ? false +, liberio +, libusb1 +, enableDpdk ? false +, dpdk +# Devices +, enableOctoClock ? true +, enableMpmd ? true +, enableB100 ? true +, enableB200 ? true +, enableUsrp1 ? true +, enableUsrp2 ? true +, enableX300 ? true +, enableN230 ? true +, enableN300 ? true +, enableN320 ? true +, enableE300 ? true +, enableE320 ? true +}: + +let + onOffBool = b: if b then "ON" else "OFF"; + inherit (lib) optionals; +in + +stdenv.mkDerivation rec { + pname = "uhd"; + # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz + # and xxx.yyy.zzz. Hrmpf... style keeps changing + version = "3.15.0.0"; + + src = fetchFromGitHub { + owner = "EttusResearch"; + repo = "uhd"; + rev = "v${version}"; + sha256 = "0jknln88a69fh244670nb7qrflbyv0vvdxfddb5g8ncpb6hcg8qf"; + }; + # Firmware images are downloaded (pre-built) from the respective release on Github + uhdImagesSrc = fetchurl { + url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz"; + sha256 = "1fir1a13ac07mqhm4sr34cixiqj2difxq0870qv1wr7a7cbfw6vp"; + }; + + cmakeFlags = [ + "-DENABLE_LIBUHD=ON" + "-DENABLE_USB=ON" + "-DENABLE_TESTS=ON" # This installs tests as well so we delete them via postPhases + "-DENABLE_EXAMPLES=${onOffBool enableExamples}" + "-DENABLE_UTILS=${onOffBool enableUtils}" + "-DENABLE_LIBUHD_C_API=${onOffBool enableLibuhd_C_api}" + "-DENABLE_LIBUHD_PYTHON_API=${onOffBool enableLibuhd_Python_api}" + "-DENABLE_LIBERIO=${onOffBool enableLiberio}" + "-DENABLE_DPDK=${onOffBool enableDpdk}" + # Devices + "-DENABLE_OCTOCLOCK=${onOffBool enableOctoClock}" + "-DENABLE_MPMD=${onOffBool enableMpmd}" + "-DENABLE_B100=${onOffBool enableB100}" + "-DENABLE_B200=${onOffBool enableB200}" + "-DENABLE_USRP1=${onOffBool enableUsrp1}" + "-DENABLE_USRP2=${onOffBool enableUsrp2}" + "-DENABLE_X300=${onOffBool enableX300}" + "-DENABLE_N230=${onOffBool enableN230}" + "-DENABLE_N300=${onOffBool enableN300}" + "-DENABLE_N320=${onOffBool enableN320}" + "-DENABLE_E300=${onOffBool enableE300}" + "-DENABLE_E320=${onOffBool enableE320}" + ] + # TODO: Check if this still needed + # ABI differences GCC 7.1 + # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector::iterator {aka __gnu_cxx::__normal_iterator >}' changed in GCC 7.1 + ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] + ; + + # Python + Mako are always required for the build itself but not necessary for runtime. + pythonEnv = python3.withPackages (ps: with ps; [ Mako ] + ++ optionals (enableLibuhd_Python_api) [ numpy setuptools ] + ++ optionals (enableUtils) [ requests six ] + ); + + nativeBuildInputs = [ + cmake + pkg-config + ] + # If both enableLibuhd_Python_api and enableUtils are off, we don't need + # pythonEnv in buildInputs as it's a 'build' dependency and not a runtime + # dependency + ++ optionals (!enableLibuhd_Python_api && !enableUtils) [ pythonEnv ] + ; + buildInputs = [ + boost + libusb1 + ] + # However, if enableLibuhd_Python_api *or* enableUtils is on, we need + # pythonEnv for runtime as well. The utilities' runtime dependencies are + # handled at the environment + ++ optionals (enableLibuhd_Python_api || enableUtils) [ pythonEnv ] + ++ optionals (enableLiberio) [ liberio ] + ++ optionals (enableDpdk) [ dpdk ] + ; + + doCheck = true; + + # Build only the host software + preConfigure = "cd host"; + # TODO: Check if this still needed, perhaps relevant: + # https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm + patches = if stdenv.isAarch32 then ./neon.patch else null; + + postPhases = [ "installFirmware" "removeInstalledTests" ] + ++ optionals (enableUtils) [ "moveUdevRules" ] + ; + + # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` + installFirmware = '' + mkdir -p "$out/share/uhd/images" + tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out/share/uhd/images" + ''; + + # -DENABLE_TESTS=ON installs the tests, we don't need them in the output + removeInstalledTests = '' + rm -r $out/lib/uhd/tests + ''; + + # Moves the udev rules to the standard location, needed only if utils are + # enabled + moveUdevRules = '' + mkdir -p $out/lib/udev/rules.d + mv $out/lib/uhd/utils/uhd-usrp.rules $out/lib/udev/rules.d/ + ''; + + meta = with lib; { + description = "USRP Hardware Driver (for Software Defined Radio)"; + longDescription = '' + The USRP Hardware Driver (UHD) software is the hardware driver for all + USRP (Universal Software Radio Peripheral) devices. + + USRP devices are designed and sold by Ettus Research, LLC and its parent + company, National Instruments. + ''; + homepage = "https://uhd.ettus.com/"; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ bjornfor fpletz tomberek ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix index bafb2f637d..9f2f39aab2 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , fetchFromGitHub , cmake @@ -8,14 +9,14 @@ , enableLibuhd_C_api ? true # requires numpy , enableLibuhd_Python_api ? false -, python3 ? null +, python3 , enableExamples ? false , enableUtils ? false , enableLiberio ? false -, liberio ? null -, libusb1 ? null +, liberio +, libusb1 , enableDpdk ? false -, dpdk ? null +, dpdk # Devices , enableOctoClock ? true , enableMpmd ? true @@ -40,18 +41,18 @@ stdenv.mkDerivation rec { pname = "uhd"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... style keeps changing - version = "3.15.0.0"; + version = "4.0.0.0"; src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; rev = "v${version}"; - sha256 = "0jknln88a69fh244670nb7qrflbyv0vvdxfddb5g8ncpb6hcg8qf"; + sha256 = "NCyiI4pIPw0nBRFdUGpgZ/x2mWz+Qm78ZGACUnSbGSs="; }; # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz"; - sha256 = "1fir1a13ac07mqhm4sr34cixiqj2difxq0870qv1wr7a7cbfw6vp"; + sha256 = "Xfx0bsHUQ5+Dp+xk0sVWWP83oyXQcUH5AX4PNEE7fY4="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix index ec381693ae..9fd3510dc9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SPAdes"; - version = "3.14.1"; + version = "3.15.1"; src = fetchurl { url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; - sha256 = "1ji3afn6yvx7ysg7p9j0d1g28zrnxg1b7x90mhs2bj3lgs7vfafn"; + sha256 = "sha256-2wZzdFRZ7zyhWwYL+c/5qhKDgj+LPtnge3UNHWJ9Ykk="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix index c208d80d57..16091514f1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.53"; + version = "2.55"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "1zchds205nwdqch1246953dr8c0019yas178qbq3jypbxvmgq7pf"; + sha256 = "sha256-p8L0F3A+GdNsPgTQNn9Em5EjFCc9f7gUvyLIRCTd05c="; }; buildInputs = [ zlib ]; 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 27f9a5c2ab..93e8e62ac7 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.32"; + version = "14.31.34"; 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-lY4DvtSAC8VDYwzZVZVHNXnyJiSn1vo829DEsLEG/hM="; + sha256 = "sha256-i+c4qS/IdLDPHk5ZHRhjOwkdvh8srU/mhOiHIkCN5Vo="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/pcb/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/pcb/default.nix index 69ff7b2e69..d28f1d1812 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/pcb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/pcb/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "pcb"; - version = "4.2.2"; + version = "4.3.0"; src = fetchurl { url = "mirror://sourceforge/pcb/${pname}-${version}.tar.gz"; - sha256 = "0pbfyfadbia1jf9ywkf02j8mfdh8c3mj390c2jdqnl70vcdszvhw"; + sha256 = "sha256-roUvRq+Eq6f1HYE/uRb8f82+6kP3E08VBQcCThdD+14="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix index da8985818e..defe218b11 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -1,11 +1,8 @@ { lib, fetchzip, makeWrapper, makeDesktopItem, stdenv -, gtk, libXtst, glib, zlib +, gtk3, libXtst, glib, zlib }: let - version = "1.7.0"; - arch = "x86_64"; - desktopItem = makeDesktopItem rec { name = "TLA+Toolbox"; exec = "tla-toolbox"; @@ -20,12 +17,12 @@ let }; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { pname = "tla-toolbox"; - inherit version; + version = "1.7.1"; src = fetchzip { - url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; - sha256 = "0v15wscawair5bghr5ixb4i062kmh9by1m0hnz2r1sawlqyafz02"; + url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.x86_64.zip"; + sha256 = "02a2y2mkfab5cczw8g604m61h4xr0apir49zbd1aq6mmgcgngw80"; }; nativeBuildInputs = [ makeWrapper ]; @@ -33,6 +30,8 @@ in stdenv.mkDerivation { phases = [ "installPhase" ]; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" cp -r "$src" "$out/toolbox" chmod -R +w "$out/toolbox" @@ -43,12 +42,17 @@ in stdenv.mkDerivation { patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "${lib.makeLibraryPath [ zlib ]}:$(patchelf --print-rpath $(find "$out/toolbox" -name java))" \ "$(find "$out/toolbox" -name java)" + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$(find "$out/toolbox" -name jspawnhelper)" + makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ --run "set -x; cd $out/toolbox" \ --add-flags "-data ~/.tla-toolbox" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk libXtst glib zlib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}" echo -e "\nCreating TLA Toolbox icons..." pushd "$src" @@ -63,6 +67,8 @@ in stdenv.mkDerivation { echo -e "\nCreating TLA Toolbox desktop entry..." cp -r "${desktopItem}/share/applications"* "$out/share/applications" + + runHook postInstall ''; meta = { @@ -75,7 +81,7 @@ in stdenv.mkDerivation { ''; # http://lamport.azurewebsites.net/tla/license.html license = with lib.licenses; [ mit ]; - platforms = lib.platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix index 456ce878e4..2df68b49e6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.12.8.2"; + version = "2.12.9.0"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-yKe4PASm7qWH/nYv8BtYbi9m3xPpA0SZ02Hahj8DJC8="; + sha256 = "sha256-334WUhPG30U72hwzpHAZRNdmr/uBleOvEhu3rW9d5dM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/search/doodle/default.nix b/third_party/nixpkgs/pkgs/applications/search/doodle/default.nix index 83dbb65114..c4f6362465 100644 --- a/third_party/nixpkgs/pkgs/applications/search/doodle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/search/doodle/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, libextractor, gettext }: stdenv.mkDerivation rec { - name = "doodle-0.7.1"; + name = "doodle-0.7.2"; buildInputs = [ libextractor gettext ]; src = fetchurl { url = "https://grothoff.org/christian/doodle/download/${name}.tar.gz"; - sha256 = "086va4q8swiablv5x72yikrdh5swhy7kzmg5wlszi5a7vjya29xw"; + sha256 = "sha256-dtRPfUjhBNgN+5zHMYmszISmBv1+K6yjKsbQBiAXWRA="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kgx/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kgx/default.nix new file mode 100644 index 0000000000..9f8b3444ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kgx/default.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, genericBranding ? false +, fetchFromGitLab +, gettext +, gnome3 +, gtk3 +, libhandy +, pcre2 +, vte +, appstream-glib +, desktop-file-utils +, git +, meson +, ninja +, pkg-config +, python3 +, sassc +, wrapGAppsHook +}: + +stdenv.mkDerivation { + pname = "kgx"; + version = "unstable-2021-03-13"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "ZanderBrown"; + repo = "kgx"; + rev = "105adb6a8d09418a3ce622442aef6ae623dee787"; + sha256 = "0m34y0nbcfkyicb40iv0iqaq6f9r3f66w43lr803j3351nxqvcz2"; + }; + + buildInputs = [ + gettext + gnome3.libgtop + gnome3.nautilus + gtk3 + libhandy + pcre2 + vte + ]; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + git + meson + ninja + pkg-config + python3 + sassc + wrapGAppsHook + ]; + + mesonFlags = lib.optional genericBranding "-Dgeneric=true"; + + postPatch = '' + chmod +x build-aux/meson/postinstall.py + patchShebangs build-aux/meson/postinstall.py + ''; + + preFixup = '' + substituteInPlace $out/share/applications/org.gnome.zbrown.KingsCross.desktop \ + --replace "Exec=kgx" "Exec=$out/bin/kgx" + ''; + + meta = with lib; { + description = "Simple user-friendly terminal emulator for the GNOME desktop"; + homepage = "https://gitlab.gnome.org/ZanderBrown/kgx"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ zhaofengli ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 4bfe06fee7..74e2a34aec 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = version; - sha256 = "sha256-OoNHKDxYKTmfm1rrQxG7PnH7DINa2M/NKc/5iKaUybg="; + sha256 = "sha256-HkOMG7VG8jyvr1W1T/62murtNYE8wyT/p3lDtuxfm5M="; }; doCheck = false; 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 7a23ec678a..8e7e739e61 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.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wOeWqgN0VYmTXPTU3z5Utau8diW18QKV7w/2y86R8U0="; + sha256 = "sha256-KkkP/qkIrwJUxmZTY8zxJKMbOiaGl8XqJhHAU7oejGs="; }; - vendorSha256 = "sha256-Ge3nwI0cY2JxRTn3EZtlal5c6A6TIKfH/CkJnQ1C6PY="; + vendorSha256 = "sha256-DO8eH0DAitxX0NOYQBs4/ME9TFQYfXedwbld1DnBWXk="; runVend = true; # Tests are trying to access /homeless-shelter diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix index da338e1758..55ba84cc45 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix @@ -1,250 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper -, pkg-config, cmake, gnumake, yasm, python3Packages -, libgcrypt, libgpgerror, libunistring -, boost, avahi, lame -, gettext, pcre-cpp, yajl, fribidi, which -, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless -, gtest, ncurses, spdlog -, libxml2, systemd -, alsaLib, libGLU, libGL, fontconfig, freetype, ftgl -, libjpeg, libpng, libtiff -, libmpeg2, libsamplerate, libmad -, libogg, libvorbis, flac, libxslt -, lzo, libcdio, libmodplug, libass, libbluray -, sqlite, libmysqlclient, nasm, gnutls, libva, libdrm -, curl, bzip2, zip, unzip, glxinfo -, libcec, libcec_platform, dcadec, libuuid -, libcrossguid, libmicrohttpd -, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1 -, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson -, lirc -, x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp -, dbusSupport ? true, dbus ? null -, joystickSupport ? true, cwiid ? null -, nfsSupport ? true, libnfs ? null -, pulseSupport ? true, libpulseaudio ? null -, rtmpSupport ? true, rtmpdump ? null -, sambaSupport ? true, samba ? null -, udevSupport ? true, udev ? null -, usbSupport ? false, libusb-compat-0_1 ? null -, vdpauSupport ? true, libvdpau ? null -, useWayland ? false, wayland ? null, wayland-protocols ? null -, waylandpp ? null, libxkbcommon ? null -, useGbm ? false, mesa ? null, libinput ? null -, buildPackages -}: - -assert dbusSupport -> dbus != null; -assert nfsSupport -> libnfs != null; -assert pulseSupport -> libpulseaudio != null; -assert rtmpSupport -> rtmpdump != null; -assert sambaSupport -> samba != null; -assert udevSupport -> udev != null; -assert usbSupport -> libusb-compat-0_1 != null && ! udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable -assert vdpauSupport -> libvdpau != null; -assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null; -assert useGbm || useWayland || x11Support; - +{ callPackage, ... } @ args: let - kodiReleaseDate = "20210219"; - kodiVersion = "19.0"; - rel = "Matrix"; - - kodi_src = fetchFromGitHub { - owner = "xbmc"; - repo = "xbmc"; - rev = "${kodiVersion}-${rel}"; - sha256 = "097dg6a7v4ia85jx1pmlpwzdpqcqxlrmniqd005q73zvgj67zc2p"; - }; - - ffmpeg = stdenv.mkDerivation rec { - pname = "kodi-ffmpeg"; - version = "4.3.1"; - src = fetchFromGitHub { - owner = "xbmc"; - repo = "FFmpeg"; - rev = "${version}-${rel}-Beta1"; - sha256 = "1c5rwlxn6xj501iw7masdv2p6wb9rkmd299lmlkx97sw1kvxvg2w"; + unwrapped = callPackage ./unwrapped.nix (removeAttrs args [ "callPackage" ]); + kodiPackages = callPackage ./packages.nix { kodi = unwrapped; }; +in + unwrapped.overrideAttrs (oldAttrs: { + passthru = oldAttrs.passthru // { + packages = kodiPackages; + withPackages = func: callPackage ./wrapper.nix { + kodi = unwrapped; + addons = kodiPackages.requiredKodiAddons (func kodiPackages); + }; }; - preConfigure = '' - cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . - sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt - sed -i 's/--strip=''${CMAKE_STRIP}/--strip=''${CMAKE_STRIP} --ranlib=''${CMAKE_RANLIB}/' CMakeLists.txt - ''; - cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DCROSSCOMPILING=ON" - "-DCPU=${stdenv.hostPlatform.parsed.cpu.name}" - "-DOS=${stdenv.hostPlatform.parsed.kernel.name}" - "-DPKG_CONFIG_EXECUTABLE=pkg-config" - ]; - buildInputs = [ libidn libtasn1 p11-kit zlib libva ] - ++ lib.optional vdpauSupport libvdpau; - nativeBuildInputs = [ cmake nasm pkg-config gnutls ]; - }; - - # We can build these externally but FindLibDvd.cmake forces us to build it - # them, so we currently just use them for the src. - libdvdcss = fetchFromGitHub { - owner = "xbmc"; - repo = "libdvdcss"; - rev = "1.4.2-${rel}-Beta-5"; - sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"; - }; - - libdvdnav = fetchFromGitHub { - owner = "xbmc"; - repo = "libdvdnav"; - rev = "6.0.0-${rel}-Alpha-3"; - sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"; - }; - - libdvdread = fetchFromGitHub { - owner = "xbmc"; - repo = "libdvdread"; - rev = "6.0.0-${rel}-Alpha-3"; - sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"; - }; - - kodi_platforms = - lib.optional useGbm "gbm" ++ - lib.optional useWayland "wayland" ++ - lib.optional x11Support "x11" - ; - -in stdenv.mkDerivation { - name = "kodi-${lib.optionalString useWayland "wayland-"}${kodiVersion}"; - - src = kodi_src; - - buildInputs = [ - gnutls libidn libtasn1 nasm p11-kit - libxml2 python3Packages.python - boost libmicrohttpd - gettext pcre-cpp yajl fribidi libva libdrm - openssl gperf tinyxml2 taglib libssh - gtest ncurses spdlog - alsaLib libGL libGLU fontconfig freetype ftgl - libjpeg libpng libtiff - libmpeg2 libsamplerate libmad - libogg libvorbis flac libxslt systemd - lzo libcdio libmodplug libass libbluray - sqlite libmysqlclient avahi lame - curl bzip2 zip unzip glxinfo - libcec libcec_platform dcadec libuuid - libgcrypt libgpgerror libunistring - libcrossguid libplist - bluez giflib glib harfbuzz lcms2 libpthreadstubs - ffmpeg flatbuffers fmt fstrcmp rapidjson - lirc - ] - ++ lib.optional x11Support [ - libX11 xorgproto libXt libXmu libXext.dev libXdmcp - libXinerama libXrandr.dev libXtst libXfixes - ] - ++ lib.optional dbusSupport dbus - ++ lib.optional joystickSupport cwiid - ++ lib.optional nfsSupport libnfs - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional rtmpSupport rtmpdump - ++ lib.optional sambaSupport samba - ++ lib.optional udevSupport udev - ++ lib.optional usbSupport libusb-compat-0_1 - ++ lib.optional vdpauSupport libvdpau - ++ lib.optionals useWayland [ - wayland - waylandpp.dev - wayland-protocols - # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise - libxkbcommon.dev - ] - ++ lib.optional useGbm [ - libxkbcommon.dev - mesa.dev - libinput.dev - ]; - - nativeBuildInputs = [ - cmake - doxygen - makeWrapper - which - pkg-config gnumake - autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 - jre_headless yasm gettext python3Packages.python flatbuffers - - # for TexturePacker - giflib zlib libpng libjpeg lzo - ] ++ lib.optionals useWayland [ wayland-protocols waylandpp.bin ]; - - depsBuildBuild = [ - buildPackages.stdenv.cc - ]; - - cmakeFlags = [ - "-DAPP_RENDER_SYSTEM=${if useGbm then "gles" else "gl"}" - "-Dlibdvdcss_URL=${libdvdcss}" - "-Dlibdvdnav_URL=${libdvdnav}" - "-Dlibdvdread_URL=${libdvdread}" - "-DGIT_VERSION=${kodiReleaseDate}" - "-DENABLE_EVENTCLIENTS=ON" - "-DENABLE_INTERNAL_CROSSGUID=OFF" - "-DENABLE_OPTICAL=ON" - "-DLIRC_DEVICE=/run/lirc/lircd" - "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" - "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc" - "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python" - ] ++ lib.optional useWayland [ - "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++" - ]; - - # 14 tests fail but the biggest issue is that every test takes 30 seconds - - # I'm guessing there is a thing waiting to time out - doCheck = false; - - preConfigure = '' - cmakeFlagsArray+=("-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}") - '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - # Need these tools on the build system when cross compiling, - # hacky, but have found no other way. - CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder - cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin" - - CXX=${stdenv.cc.targetPrefix}c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker - cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin" - ''; - - postPatch = '' - substituteInPlace xbmc/platform/posix/PosixTimezone.cpp \ - --replace 'usr/share/zoneinfo' 'etc/zoneinfo' - ''; - - postInstall = '' - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ] ++ lib.optional x11Support xdpyinfo ++ lib.optional sambaSupport samba)}" \ - --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath - ([ curl systemd libmad libvdpau libcec libcec_platform libass ] - ++ lib.optional nfsSupport libnfs - ++ lib.optional rtmpSupport rtmpdump)}" - done - - substituteInPlace $out/share/xsessions/kodi.desktop \ - --replace kodi-standalone $out/bin/kodi-standalone - ''; - - doInstallCheck = true; - - installCheckPhase = "$out/bin/kodi --version"; - - passthru = { - pythonPackages = python3Packages; - }; - - meta = with lib; { - description = "Media center"; - homepage = "https://kodi.tv/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ titanous edwtjo peterhoeg sephalon ]; - }; -} + }) diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/packages.nix similarity index 80% rename from third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix rename to third_party/nixpkgs/pkgs/applications/video/kodi/packages.nix index 3aea028e9f..8e0ecbf9b9 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/packages.nix @@ -1,5 +1,5 @@ { lib, stdenv, callPackage, fetchFromGitHub -, cmake, kodiPlain, libcec_platform, tinyxml, pugixml +, cmake, kodi, libcec_platform, tinyxml, pugixml , steam, udev, libusb1, jsoncpp, libhdhomerun, zlib , python3Packages, expat, glib, nspr, nss, openssl , libssh, libarchive, lzma, bzip2, lz4, lzo }: @@ -8,32 +8,27 @@ with lib; let self = rec { - pluginDir = "/share/kodi/addons"; + addonDir = "/share/kodi/addons"; rel = "Matrix"; - kodi = kodiPlain; + inherit kodi; # Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix - toKodiPlugin = drv: drv.overrideAttrs(oldAttrs: { + toKodiAddon = drv: drv.overrideAttrs(oldAttrs: { # Use passthru in order to prevent rebuilds when possible. passthru = (oldAttrs.passthru or {})// { - kodiPluginFor = kodi; - requiredKodiPlugins = requiredKodiPlugins drv.propagatedBuildInputs; + kodiAddonFor = kodi; + requiredKodiAddons = requiredKodiAddons drv.propagatedBuildInputs; }; }); - # Check whether a derivation provides a Kodi plugin. - hasKodiPlugin = drv: drv ? kodiPluginFor && drv.kodiPluginFor == kodi; + # Check whether a derivation provides a Kodi addon. + hasKodiAddon = drv: drv ? kodiAddonFor && drv.kodiAddonFor == kodi; - # Get list of required Kodi plugins given a list of derivations. - requiredKodiPlugins = drvs: let - modules = filter hasKodiPlugin drvs; - in unique (modules ++ concatLists (catAttrs "requiredKodiPlugins" modules)); - - kodiWithPlugins = func: callPackage ./wrapper.nix { - inherit kodi; - plugins = requiredKodiPlugins (func self); - }; + # Get list of required Kodi addons given a list of derivations. + requiredKodiAddons = drvs: let + modules = filter hasKodiAddon drvs; + in unique (modules ++ concatLists (catAttrs "requiredKodiAddons" modules)); kodi-platform = stdenv.mkDerivation rec { project = "kodi-platform"; @@ -48,36 +43,45 @@ let self = rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ kodiPlain libcec_platform tinyxml ]; + buildInputs = [ kodi libcec_platform tinyxml ]; }; - mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args: - toKodiPlugin (stdenv.mkDerivation ({ - name = "kodi-plugin-${plugin}-${version}"; + buildKodiAddon = + { name ? "${attrs.pname}-${attrs.version}" + , namespace + , sourceDir ? "" + , ... } @ attrs: + toKodiAddon (stdenv.mkDerivation ({ + name = "kodi-" + name; dontStrip = true; extraRuntimeDependencies = [ ]; installPhase = '' - ${if sourceDir == null then "" else "cd $src/$sourceDir"} - d=$out${pluginDir}/${namespace} + cd $src/$sourceDir + d=$out${addonDir}/${namespace} mkdir -p $d sauce="." [ -d ${namespace} ] && sauce=${namespace} cp -R "$sauce/"* $d ''; - } // args)); + } // attrs)); - mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], - extraRuntimeDependencies ? [], extraInstallPhase ? "", ... }@args: - toKodiPlugin (stdenv.mkDerivation ({ - name = "kodi-plugin-${plugin}-${version}"; + buildKodiBinaryAddon = + { name ? "${attrs.pname}-${attrs.version}" + , namespace + , version + , extraBuildInputs ? [] + , extraRuntimeDependencies ? [] + , extraInstallPhase ? "", ... } @ attrs: + toKodiAddon (stdenv.mkDerivation ({ + name = "kodi-" + name; dontStrip = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ kodiPlain kodi-platform libcec_platform ] ++ extraBuildInputs; + buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs; inherit extraRuntimeDependencies; @@ -86,25 +90,25 @@ let self = rec { "-DOVERRIDE_PATHS=1" ]; - # kodi checks for plugin .so libs existance in the addon folder (share/...) + # kodi checks for addon .so libs existance in the addon folder (share/...) # and the non-wrapped kodi lib/... folder before even trying to dlopen # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use installPhase = let n = namespace; in '' make install - ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version} + ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version} ${extraInstallPhase} ''; - } // args)); + } // attrs)); - advanced-launcher = mkKodiPlugin rec { + advanced-launcher = buildKodiAddon rec { - plugin = "advanced-launcher"; + pname = "advanced-launcher"; namespace = "plugin.program.advanced.launcher"; version = "2.5.8"; src = fetchFromGitHub { owner = "edwtjo"; - repo = plugin; + repo = pname; rev = version; sha256 = "142vvgs37asq5m54xqhjzqvgmb0xlirvm0kz6lxaqynp0vvgrkx2"; }; @@ -127,9 +131,9 @@ let self = rec { }; - advanced-emulator-launcher = mkKodiPlugin rec { + advanced-emulator-launcher = buildKodiAddon rec { - plugin = "advanced-emulator-launcher"; + pname = "advanced-emulator-launcher"; namespace = "plugin.program.advanced.emulator.launcher"; version = "0.9.6"; @@ -175,8 +179,8 @@ let self = rec { }; mkController = controller: { - ${controller} = mkKodiPlugin rec { - plugin = pname + "-" + controller; + ${controller} = buildKodiAddon rec { + pname = pname + "-" + controller; namespace = "game.controller." + controller; sourceDir = "addons/" + namespace; inherit version src meta; @@ -209,23 +213,22 @@ let self = rec { broken = true; # requires port to python3 }; in { - service = mkKodiPlugin { - plugin = pname + "-service"; + service = buildKodiAddon { + pname = pname + "-service"; version = "1.2.1"; namespace = "service.hyper.launcher"; inherit src meta; }; - plugin = mkKodiPlugin { - plugin = pname; + plugin = buildKodiAddon { namespace = "plugin.hyper.launcher"; - inherit version src meta; + inherit pname version src meta; }; }; - joystick = mkKodiABIPlugin rec { + joystick = buildKodiBinaryAddon rec { + pname = namespace; namespace = "peripheral.joystick"; version = "1.7.1"; - plugin = namespace; src = fetchFromGitHub { owner = "xbmc"; @@ -243,8 +246,8 @@ let self = rec { extraBuildInputs = [ tinyxml udev ]; }; - simpleplugin = mkKodiPlugin rec { - plugin = "simpleplugin"; + simpleplugin = buildKodiAddon rec { + pname = "simpleplugin"; namespace = "script.module.simpleplugin"; version = "2.3.2"; @@ -263,16 +266,16 @@ let self = rec { }; }; - svtplay = mkKodiPlugin rec { + svtplay = buildKodiAddon rec { - plugin = "svtplay"; + pname = "svtplay"; namespace = "plugin.video.svtplay"; version = "5.1.12"; src = fetchFromGitHub { - name = plugin + "-" + version + ".tar.gz"; + name = pname + "-" + version + ".tar.gz"; owner = "nilzen"; - repo = "xbmc-" + plugin; + repo = "xbmc-" + pname; rev = "v${version}"; sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6"; }; @@ -292,10 +295,10 @@ let self = rec { }; - steam-controller = mkKodiABIPlugin rec { + steam-controller = buildKodiBinaryAddon rec { + pname = namespace; namespace = "peripheral.steamcontroller"; version = "0.11.0"; - plugin = namespace; src = fetchFromGitHub { owner = "kodi-game"; @@ -314,9 +317,9 @@ let self = rec { }; - steam-launcher = mkKodiPlugin { + steam-launcher = buildKodiAddon { - plugin = "steam-launcher"; + pname = "steam-launcher"; namespace = "script.steam.launcher"; version = "3.5.1"; @@ -343,8 +346,8 @@ let self = rec { }; }; - pdfreader = mkKodiPlugin rec { - plugin = "pdfreader"; + pdfreader = buildKodiAddon rec { + pname = "pdfreader"; namespace = "plugin.image.pdf"; version = "2.0.2"; @@ -362,9 +365,9 @@ let self = rec { }; }; - pvr-hts = mkKodiABIPlugin rec { + pvr-hts = buildKodiBinaryAddon rec { - plugin = "pvr-hts"; + pname = "pvr-hts"; namespace = "pvr.hts"; version = "8.2.2"; @@ -384,9 +387,9 @@ let self = rec { }; - pvr-hdhomerun = mkKodiABIPlugin rec { + pvr-hdhomerun = buildKodiBinaryAddon rec { - plugin = "pvr-hdhomerun"; + pname = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; version = "7.1.0"; @@ -408,9 +411,9 @@ let self = rec { }; - pvr-iptvsimple = mkKodiABIPlugin rec { + pvr-iptvsimple = buildKodiBinaryAddon rec { - plugin = "pvr-iptvsimple"; + pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; version = "7.4.2"; @@ -432,9 +435,9 @@ let self = rec { extraBuildInputs = [ zlib pugixml ]; }; - osmc-skin = mkKodiPlugin rec { + osmc-skin = buildKodiAddon rec { - plugin = "osmc-skin"; + pname = "osmc-skin"; namespace = "skin.osmc"; version = "18.0.0"; @@ -454,8 +457,8 @@ let self = rec { }; }; - yatp = python3Packages.toPythonModule (mkKodiPlugin rec { - plugin = "yatp"; + yatp = python3Packages.toPythonModule (buildKodiAddon rec { + pname = "yatp"; namespace = "plugin.video.yatp"; version = "3.3.2"; @@ -482,9 +485,9 @@ let self = rec { }; }); - inputstream-adaptive = mkKodiABIPlugin rec { + inputstream-adaptive = buildKodiBinaryAddon rec { - plugin = "inputstream-adaptive"; + pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; version = "2.6.7"; @@ -500,7 +503,7 @@ let self = rec { extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; extraInstallPhase = let n = namespace; in '' - ln -s $out/lib/addons/${n}/libssd_wv.so $out/${pluginDir}/${n}/libssd_wv.so + ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so ''; meta = { @@ -511,10 +514,10 @@ let self = rec { }; }; - vfs-sftp = mkKodiABIPlugin rec { + vfs-sftp = buildKodiBinaryAddon rec { + pname = namespace; namespace = "vfs.sftp"; version = "2.0.0"; - plugin = namespace; src = fetchFromGitHub { owner = "xbmc"; @@ -533,10 +536,10 @@ let self = rec { extraBuildInputs = [ openssl libssh zlib ]; }; - vfs-libarchive = mkKodiABIPlugin rec { + vfs-libarchive = buildKodiBinaryAddon rec { + pname = namespace; namespace = "vfs.libarchive"; version = "2.0.0"; - plugin = namespace; src = fetchFromGitHub { owner = "xbmc"; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix new file mode 100644 index 0000000000..2a713324c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix @@ -0,0 +1,242 @@ +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper +, pkg-config, cmake, gnumake, yasm, python3Packages +, libgcrypt, libgpgerror, libunistring +, boost, avahi, lame +, gettext, pcre-cpp, yajl, fribidi, which +, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless +, gtest, ncurses, spdlog +, libxml2, systemd +, alsaLib, libGLU, libGL, fontconfig, freetype, ftgl +, libjpeg, libpng, libtiff +, libmpeg2, libsamplerate, libmad +, libogg, libvorbis, flac, libxslt +, lzo, libcdio, libmodplug, libass, libbluray +, sqlite, libmysqlclient, nasm, gnutls, libva, libdrm +, curl, bzip2, zip, unzip, glxinfo +, libcec, libcec_platform, dcadec, libuuid +, libcrossguid, libmicrohttpd +, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1 +, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson +, lirc +, x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp +, dbusSupport ? true, dbus +, joystickSupport ? true, cwiid +, nfsSupport ? true, libnfs +, pulseSupport ? true, libpulseaudio +, rtmpSupport ? true, rtmpdump +, sambaSupport ? true, samba +, udevSupport ? true, udev +, usbSupport ? false, libusb-compat-0_1 +, vdpauSupport ? true, libvdpau +, waylandSupport ? false, wayland, wayland-protocols +, waylandpp ? null, libxkbcommon +, gbmSupport ? false, mesa, libinput +, buildPackages +}: + +assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable +assert gbmSupport || waylandSupport || x11Support; + +let + kodiReleaseDate = "20210219"; + kodiVersion = "19.0"; + rel = "Matrix"; + + kodi_src = fetchFromGitHub { + owner = "xbmc"; + repo = "xbmc"; + rev = "${kodiVersion}-${rel}"; + sha256 = "097dg6a7v4ia85jx1pmlpwzdpqcqxlrmniqd005q73zvgj67zc2p"; + }; + + ffmpeg = stdenv.mkDerivation rec { + pname = "kodi-ffmpeg"; + version = "4.3.1"; + src = fetchFromGitHub { + owner = "xbmc"; + repo = "FFmpeg"; + rev = "${version}-${rel}-Beta1"; + sha256 = "1c5rwlxn6xj501iw7masdv2p6wb9rkmd299lmlkx97sw1kvxvg2w"; + }; + preConfigure = '' + cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . + sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt + sed -i 's/--strip=''${CMAKE_STRIP}/--strip=''${CMAKE_STRIP} --ranlib=''${CMAKE_RANLIB}/' CMakeLists.txt + ''; + cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCROSSCOMPILING=ON" + "-DCPU=${stdenv.hostPlatform.parsed.cpu.name}" + "-DOS=${stdenv.hostPlatform.parsed.kernel.name}" + "-DPKG_CONFIG_EXECUTABLE=pkg-config" + ]; + buildInputs = [ libidn libtasn1 p11-kit zlib libva ] + ++ lib.optional vdpauSupport libvdpau; + nativeBuildInputs = [ cmake nasm pkg-config gnutls ]; + }; + + # We can build these externally but FindLibDvd.cmake forces us to build it + # them, so we currently just use them for the src. + libdvdcss = fetchFromGitHub { + owner = "xbmc"; + repo = "libdvdcss"; + rev = "1.4.2-${rel}-Beta-5"; + sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"; + }; + + libdvdnav = fetchFromGitHub { + owner = "xbmc"; + repo = "libdvdnav"; + rev = "6.0.0-${rel}-Alpha-3"; + sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"; + }; + + libdvdread = fetchFromGitHub { + owner = "xbmc"; + repo = "libdvdread"; + rev = "6.0.0-${rel}-Alpha-3"; + sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"; + }; + + kodi_platforms = lib.optional gbmSupport "gbm" + ++ lib.optional waylandSupport "wayland" + ++ lib.optional x11Support "x11"; + +in stdenv.mkDerivation { + pname = "kodi"; + version = kodiVersion; + + src = kodi_src; + + buildInputs = [ + gnutls libidn libtasn1 nasm p11-kit + libxml2 python3Packages.python + boost libmicrohttpd + gettext pcre-cpp yajl fribidi libva libdrm + openssl gperf tinyxml2 taglib libssh + gtest ncurses spdlog + alsaLib libGL libGLU fontconfig freetype ftgl + libjpeg libpng libtiff + libmpeg2 libsamplerate libmad + libogg libvorbis flac libxslt systemd + lzo libcdio libmodplug libass libbluray + sqlite libmysqlclient avahi lame + curl bzip2 zip unzip glxinfo + libcec libcec_platform dcadec libuuid + libgcrypt libgpgerror libunistring + libcrossguid libplist + bluez giflib glib harfbuzz lcms2 libpthreadstubs + ffmpeg flatbuffers fmt fstrcmp rapidjson + lirc + ] + ++ lib.optional x11Support [ + libX11 xorgproto libXt libXmu libXext.dev libXdmcp + libXinerama libXrandr.dev libXtst libXfixes + ] + ++ lib.optional dbusSupport dbus + ++ lib.optional joystickSupport cwiid + ++ lib.optional nfsSupport libnfs + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional rtmpSupport rtmpdump + ++ lib.optional sambaSupport samba + ++ lib.optional udevSupport udev + ++ lib.optional usbSupport libusb-compat-0_1 + ++ lib.optional vdpauSupport libvdpau + ++ lib.optionals waylandSupport [ + wayland + waylandpp.dev + wayland-protocols + # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise + libxkbcommon.dev + ] + ++ lib.optional gbmSupport [ + libxkbcommon.dev + mesa.dev + libinput.dev + ]; + + nativeBuildInputs = [ + cmake + doxygen + makeWrapper + which + pkg-config gnumake + autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 + jre_headless yasm gettext python3Packages.python flatbuffers + + # for TexturePacker + giflib zlib libpng libjpeg lzo + ] ++ lib.optionals waylandSupport [ wayland-protocols waylandpp.bin ]; + + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; + + cmakeFlags = [ + "-DAPP_RENDER_SYSTEM=${if gbmSupport then "gles" else "gl"}" + "-Dlibdvdcss_URL=${libdvdcss}" + "-Dlibdvdnav_URL=${libdvdnav}" + "-Dlibdvdread_URL=${libdvdread}" + "-DGIT_VERSION=${kodiReleaseDate}" + "-DENABLE_EVENTCLIENTS=ON" + "-DENABLE_INTERNAL_CROSSGUID=OFF" + "-DENABLE_OPTICAL=ON" + "-DLIRC_DEVICE=/run/lirc/lircd" + "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" + "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc" + "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python" + ] ++ lib.optional waylandSupport [ + "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++" + ]; + + # 14 tests fail but the biggest issue is that every test takes 30 seconds - + # I'm guessing there is a thing waiting to time out + doCheck = false; + + preConfigure = '' + cmakeFlagsArray+=("-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}") + '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # Need these tools on the build system when cross compiling, + # hacky, but have found no other way. + CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder + cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin" + + CXX=${stdenv.cc.targetPrefix}c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker + cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin" + ''; + + postPatch = '' + substituteInPlace xbmc/platform/posix/PosixTimezone.cpp \ + --replace 'usr/share/zoneinfo' 'etc/zoneinfo' + ''; + + postInstall = '' + for p in $(ls $out/bin/) ; do + wrapProgram $out/bin/$p \ + --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ] + ++ lib.optional x11Support xdpyinfo ++ lib.optional sambaSupport samba)}" \ + --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath + ([ curl systemd libmad libvdpau libcec libcec_platform libass ] + ++ lib.optional nfsSupport libnfs + ++ lib.optional rtmpSupport rtmpdump)}" + done + + substituteInPlace $out/share/xsessions/kodi.desktop \ + --replace kodi-standalone $out/bin/kodi-standalone + ''; + + doInstallCheck = true; + + installCheckPhase = "$out/bin/kodi --version"; + + passthru = { + pythonPackages = python3Packages; + }; + + meta = with lib; { + description = "Media center"; + homepage = "https://kodi.tv/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ titanous edwtjo peterhoeg sephalon ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix index 80a36df3de..2b4abbb500 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix @@ -1,11 +1,9 @@ -{ lib, makeWrapper, buildEnv, kodi, plugins }: +{ lib, makeWrapper, buildEnv, kodi, addons }: -let - drvName = builtins.parseDrvName kodi.name; -in buildEnv { - name = "${drvName.name}-with-plugins-${drvName.version}"; +buildEnv { + name = "${kodi.name}-env"; - paths = [ kodi ] ++ plugins; + paths = [ kodi ] ++ addons; pathsToLink = [ "/share" ]; buildInputs = [ makeWrapper ]; @@ -15,16 +13,11 @@ in buildEnv { for exe in kodi{,-standalone} do makeWrapper ${kodi}/bin/$exe $out/bin/$exe \ - --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \ + --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath addons} \ --prefix KODI_HOME : $out/share/kodi \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath (lib.concatMap - (plugin: plugin.extraRuntimeDependencies or []) plugins)}" + (plugin: plugin.extraRuntimeDependencies or []) addons)}" done ''; - - meta = kodi.meta // { - description = kodi.meta.description - + " (with plugins: ${lib.concatMapStringsSep ", " (x: x.name) plugins})"; - }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 39d2f1e21c..d26acfd7c0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "53.0.0"; + version = "55.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "04wjs3sgb3gn85gl8y1svx177d1213hswx37zdsj80giw1k5df79"; + sha256 = "129azp4cpdd05f6072gkxdjj811aqs29nbw6v6qm8vv47gfvjcf7"; }; nativeBuildInputs = [ @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { ]; CXXFLAGS = optional stdenv.cc.isClang "-std=c++17"; + LDFLAGS = optional stdenv.cc.isClang "-lc++fs"; dontWrapQtApps = true; postFixup = optionalString withGUI '' @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform tools for Matroska"; homepage = "http://www.bunkus.org/videotools/mkvtoolnix/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ codyopel rnhmjoj ]; platforms = platforms.linux ++ optionals (!withGUI) platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/applications/video/qstopmotion/default.nix b/third_party/nixpkgs/pkgs/applications/video/qstopmotion/default.nix index 53b46ceeb0..9a5bb5eb46 100644 --- a/third_party/nixpkgs/pkgs/applications/video/qstopmotion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/qstopmotion/default.nix @@ -24,11 +24,11 @@ mkDerivation rec { pname = "qstopmotion"; - version = "2.4.1"; + version = "2.5.2"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${pname}-${version}-Source.tar.gz"; - sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh"; + sha256 = "sha256-jyBUyadkSuQKXOrr5XZ1jy6of1Qw8S2HPxuOrPc7RnE="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix index a8d2aaaff0..007ef4262e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix @@ -1,26 +1,53 @@ -{ lib, mkDerivation, fetchurl, qmake, qtscript }: +{ lib +, stdenv +, fetchurl +, qmake +, qtscript +, wrapQtAppsHook +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "smplayer"; - version = "20.6.0"; + version = "21.1.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0c59gfgm2ya8yb2nx7gy1zc0nrr4206213xy86y7jw0bk9mmjxmy"; + hash = "sha256-Y0uq32XoQ8fpIJDScRfA7p3RYd6x1PWZSsYyAYYKf/c="; }; + nativeBuildInputs = [ qmake wrapQtAppsHook ]; buildInputs = [ qtscript ]; - nativeBuildInputs = [ qmake ]; dontUseQmakeConfigure = true; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; - meta = { - description = "A complete front-end for MPlayer"; - longDescription = "Either mplayer or mpv should also be installed for smplayer to play medias"; + meta = with lib; { homepage = "https://www.smplayer.info"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; + description = "A complete front-end for MPlayer"; + longDescription = '' + SMPlayer is a free media player for Windows and Linux with built-in codecs + that can play virtually all video and audio formats. It doesn't need any + external codecs. Just install SMPlayer and you'll be able to play all + formats without the hassle to find and install codec packs. + + One of the most interesting features of SMPlayer: it remembers the + settings of all files you play. So you start to watch a movie but you have + to leave... don't worry, when you open that movie again it will be resumed + at the same point you left it, and with the same settings: audio track, + subtitles, volume... + + SMPlayer is a graphical user interface (GUI) for the award-winning + MPlayer, which is capable of playing almost all known video and audio + formats. But apart from providing access for the most common and useful + options of MPlayer, SMPlayer adds other interesting features like the + possibility to play Youtube videos or download subtitles. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; }; } +# TODO [ AndersonTorres ]: some form of wrapping mplayer/mpv around it diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix index a51a58d21e..28e28fa591 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-gtLGUGNWAZXsNFUZMb48MluV6OIAnpJ1X9farTRuCDw="; + sha256 = "sha256-NpFiIuJvuTRATwdm4P82jtrDbX/DHKVx9fYJRmYJBms="; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/spike/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/spike/default.nix index 12dfc713fd..054918dabf 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/spike/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/spike/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, dtc, nixosTests }: +{ lib, stdenv, fetchgit, dtc, nixosTests, fetchpatch }: stdenv.mkDerivation rec { pname = "spike"; @@ -13,7 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dtc ]; enableParallelBuilding = true; - patchPhase = '' + patches = [ + # Add missing headers to fix build. + (fetchpatch { + url = "https://github.com/riscv/riscv-isa-sim/commit/b3855682c2d744c613d2ffd6b53e3f021ecea4f3.patch"; + sha256 = "1v1mpp4iddf5n4h3kmj65g075m7xc31bxww7gldnmgl607ma7cnl"; + }) + ]; + + postPatch = '' patchShebangs scripts/*.sh patchShebangs tests/ebreak.py ''; diff --git a/third_party/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix b/third_party/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix index e74e51a95d..6cceee558a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -14,14 +14,14 @@ }: let - version = "13.0.1"; + version = "13.0.2"; twemojiSrc = fetchFromGitHub { name = "twemoji"; owner = "twitter"; repo = "twemoji"; rev = "v${version}"; - sha256 = "0acinlv2l3s1jga2i9wh16mvgkxw4ipzgvjx8c80zd104lpdpgd9"; + sha256 = "069pyq09jfzwp3xla8vmhbyyam32x2iyp0s29xcxlkj22p99bg6d"; }; pythonEnv = diff --git a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix index 5c44619e02..ff907e91bf 100644 --- a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1gggsd7scf15vrpgzvskx4p3jifnjdx0aqndqhvpc6ksdbh3nzqd"; + sha256 = "11g740x1asy7jbfn52gp1zx7hzhklw6f97m469wgyi9yf954js15"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix index 6092d3faee..ec0fa407d7 100644 --- a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20210215"; + version = "20210312"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-HIM3sq47+0nImiaw+CjjjgYnBIorwmA6UxaNefjYNZg="; + sha256 = "sha256-dUjsCeRFynN4xc65njntyohX+Ck4MeCzy1WPQjCHDhA="; }; nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/orchis/default.nix b/third_party/nixpkgs/pkgs/data/themes/orchis/default.nix index ee315427e2..cf479021fb 100644 --- a/third_party/nixpkgs/pkgs/data/themes/orchis/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/orchis/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "orchis"; - version = "2021-01-22"; + version = "2021-02-28"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - sha256 = "1m0wilvrscg2xnkp6a90j0iccxd8ywvfpza1345sc6xmml9gvjzc"; + sha256 = "sha256-HmC2e34n1eThFGgw9OzSgp5VFJOylyozpXgk9SO84+I="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index cfe8197a90..b943a02a56 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,8 +1,8 @@ { fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, 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, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib -, glib, gtk3, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas }: +, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit +, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja +, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber +, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas, boost, protobuf }: stdenv.mkDerivation rec { pname = "evolution-data-server"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { glib libsoup libxml2 gtk3 gnome-online-accounts gcr p11-kit libgweather libgdata libaccounts-glib json-glib icu sqlite kerberos openldap webkitgtk glib-networking - libcanberra-gtk3 pcre + libcanberra-gtk3 pcre libphonenumber boost protobuf ]; propagatedBuildInputs = [ libsecret nss nspr libical db libsoup ]; @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { "-DENABLE_INTROSPECTION=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" + "-DWITH_PHONENUMBER=ON" ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix index bb0bd25726..8369c571f5 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "hitori"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/hitori/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0gjbbh4gym8wwa4jjg7wwifjh2h7bf6m0x23c5jjxvrf3vln9gfq"; + sha256 = "Ar0sQh1OIYAmVxToVL0S79PG0Vbd8h95599gAR1OQYQ="; }; nativeBuildInputs = [ 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 4432b1fe89..d44f28f892 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.8"; + version = "1.15.10"; 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 = "1hlphkrsvb5nza5ajm24x4nrhyg4b0afs88kk4jd310hg2vhl32l"; + sha256 = "0rfx20y13cflv68nn8jci1fx34vfdn7qgyavm5hivd0h15pcmny1"; }; # 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 8267e9745d..d6690a7108 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"; + version = "1.16.2"; 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 = "0nn98xiw8zrvxf9f36p8dzc7ihrrkakr0g9jiy4haqb5alyhd23n"; + sha256 = "1sl33wkhp6pi9f15f6khp5a7l7xwmpc3sp1zmji8pjr3g8l19jip"; }; # perl is used for testing go vet diff --git a/third_party/nixpkgs/pkgs/development/compilers/opa/default.nix b/third_party/nixpkgs/pkgs/development/compilers/opa/default.nix index 5e648c9de4..8e70ca8dac 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/opa/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/opa/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3"; }; - patches = [ ./ocaml-4.03.patch ]; + patches = [ ./ocaml-4.03.patch ./ocaml-4.04.patch ]; # Paths so the opa compiler code generation will use the same programs as were # used to build opa. diff --git a/third_party/nixpkgs/pkgs/development/compilers/opa/ocaml-4.04.patch b/third_party/nixpkgs/pkgs/development/compilers/opa/ocaml-4.04.patch new file mode 100644 index 0000000000..45cae411fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/opa/ocaml-4.04.patch @@ -0,0 +1,75 @@ +diff --git a/compiler/libbsl/bslLib.ml b/compiler/libbsl/bslLib.ml +index b9f75bd1..171af065 100644 +--- a/compiler/libbsl/bslLib.ml ++++ b/compiler/libbsl/bslLib.ml +@@ -726,7 +726,7 @@ struct + let root elt = !(elt.root) + let elt_name elt = elt.name + let elts e = e +- let children = List.map (fun e -> e.name, e) ++ let children m = List.map (fun e -> e.name, e) m + let is_root e = Path.is_root e.pwd + + let parent e = +diff --git a/compiler/passes/surfaceAstDependencies.ml b/compiler/passes/surfaceAstDependencies.ml +index f4354a3f..81253d32 100644 +--- a/compiler/passes/surfaceAstDependencies.ml ++++ b/compiler/passes/surfaceAstDependencies.ml +@@ -66,7 +66,6 @@ open SurfaceAst + + (* shorthands *) + module SAH = SurfaceAstHelper +-module C = SurfaceAstCons.ExprIdentCons + module D = SurfaceAstDecons + module S = SurfaceAst + +diff --git a/compiler/passes/surfaceAstPasses.ml b/compiler/passes/surfaceAstPasses.ml +index 10edf5cb..00de59fa 100644 +--- a/compiler/passes/surfaceAstPasses.ml ++++ b/compiler/passes/surfaceAstPasses.ml +@@ -25,7 +25,6 @@ open SurfaceAstPassesTypes + + (* alias *) + module C = SurfaceAstCons.ExprIdentCons +-module CS = SurfaceAstCons.StringCons + + + +diff --git a/compiler/qmlslicer/qmlSimpleSlicer.ml b/compiler/qmlslicer/qmlSimpleSlicer.ml +index 2eebd96b..04ce77c8 100644 +--- a/compiler/qmlslicer/qmlSimpleSlicer.ml ++++ b/compiler/qmlslicer/qmlSimpleSlicer.ml +@@ -17,7 +17,6 @@ + *) + module Format = Base.Format + module List = Base.List +-module String = Base.String + module Q = QmlAst + module Package = ObjectFiles.Package + +diff --git a/ocamllib/libbase/baseObj.mli b/ocamllib/libbase/baseObj.mli +index da2d9736..82d72963 100644 +--- a/ocamllib/libbase/baseObj.mli ++++ b/ocamllib/libbase/baseObj.mli +@@ -21,7 +21,7 @@ type t = Obj.t + external repr : 'a -> t = "%identity" + external obj : t -> 'a = "%identity" + external magic : 'a -> 'b = "%identity" +-external is_block : t -> bool = "caml_obj_is_block" ++val [@inline always] is_block : t -> bool + external is_int : t -> bool = "%obj_is_int" + external tag : t -> int = "caml_obj_tag" + external set_tag : t -> int -> unit = "caml_obj_set_tag" +diff --git a/ocamllib/libbase/baseString.ml b/ocamllib/libbase/baseString.ml +index 640ce2fa..6931c608 100644 +--- a/ocamllib/libbase/baseString.ml ++++ b/ocamllib/libbase/baseString.ml +@@ -20,7 +20,7 @@ + (* depends *) + module Char = BaseChar + +-include Bytes ++include String + + let compare_int (a:int) b = Pervasives.compare a b + diff --git a/third_party/nixpkgs/pkgs/development/compilers/solc/0.7.nix b/third_party/nixpkgs/pkgs/development/compilers/solc/0.7.nix new file mode 100644 index 0000000000..99b67b5651 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/solc/0.7.nix @@ -0,0 +1,78 @@ +{ 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 546697d8ef..c8f0c50d8a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix @@ -1,6 +1,16 @@ -{ lib, gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils -, z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null -, cln ? null, gmp ? null +{ lib, gccStdenv, fetchzip +, boost +, cmake +, coreutils +, fetchpatch +, ncurses +, python3 +, z3Support ? true +, z3 ? null +, cvc4Support ? true +, cvc4 ? null +, cln ? null +, gmp ? null }: # compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin, @@ -10,69 +20,88 @@ assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.6.0"; assert cvc4Support -> cvc4 != null && cln != null && gmp != null; let - jsoncppVersion = "1.9.4"; + jsoncppVersion = "1.9.3"; jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz"; jsoncpp = fetchzip { url = jsoncppUrl; - sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"; + sha256 = "1vbhi503rgwarf275ajfdb8vpdcbn1f7917wjkf8jghqwb1c24lq"; + }; + + range3Version = "0.11.0"; + range3Url = "https://github.com/ericniebler/range-v3/archive/${range3Version}.tar.gz"; + range3 = fetchzip { + url = range3Url; + sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh"; + }; + + solc = gccStdenv.mkDerivation rec { + pname = "solc"; + version = "0.8.2"; + + # 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 = "11w7sa1y2dirzh84k04fkwbfc6xpjp5jr65w1pmb2pnkjvvf46xq"; + }; + + postPatch = '' + substituteInPlace cmake/jsoncpp.cmake \ + --replace "${jsoncppUrl}" ${jsoncpp} + substituteInPlace cmake/range-v3.cmake \ + --replace "${range3Url}" ${range3} + ''; + + 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 ]; + + # tests take 60+ minutes to complete, only run as part of passthru tests + doCheck = false; + + 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 ./test/*.py; do + patchShebangs "$i" + done + TERM=xterm ./scripts/tests.sh + popd + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/solc --version > /dev/null + ''; + + passthru.tests = { + solcWithTests = solc.overrideAttrs (attrs: { doCheck = true; }); + }; + + 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; + }; }; 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; - maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; - inherit version; - }; -} + solc diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 7d63c90379..003727c608 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -1,17 +1,24 @@ { coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, mathcomp-real-closed, - lib, version ? null }: + hierarchy-builder, lib, version ? null }: -with lib; mkCoqDerivation { +with lib; +let mca = mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "analysis"; owner = "math-comp"; + release."0.3.6".sha256 = "0g2j7b2hca4byz62ssgg90bkbc8wwp7xkb2d3225bbvihi92b4c5"; + release."0.3.4".sha256 = "18mgycjgg829dbr7ps77z6lcj03h3dchjbj5iir0pybxby7gd45c"; + release."0.3.3".sha256 = "1m2mxcngj368vbdb8mlr91hsygl430spl7lgyn9qmn3jykack867"; release."0.3.1".sha256 = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8"; release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.6"; } + { cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; } + { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; } { cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; } { cases = [ (range "8.8" "8.11") (range "1.8" "1.10") ]; out = "0.2.3"; } ] null; @@ -25,4 +32,12 @@ with lib; mkCoqDerivation { maintainers = [ maintainers.cohencyril ]; license = licenses.cecill-c; }; -} +}; in +mca.overrideAttrs (o: + let ext = { propagatedBuildInputs = o.propagatedBuildInputs + ++ [ hierarchy-builder ]; }; + in with versions; switch o.version [ + {case = "dev"; out = ext;} + {case = isGe "0.3.4"; out = ext;} + ] {} +) diff --git a/third_party/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix b/third_party/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix new file mode 100644 index 0000000000..0770d83f21 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, python +, boost +, cppunit +, log4cpp +, osmosdr +}: + +mkDerivation rec { + pname = "gr-ais"; + version = "2015-12-20"; + src = fetchFromGitHub { + owner = "bistromath"; + repo = "gr-ais"; + rev = "cdc1f52745853f9c739c718251830eb69704b26e"; + sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; + }; + disabledForGRafter = "3.8"; + + nativeBuildInputs = [ + cmake + pkg-config + python + ]; + + buildInputs = [ + cppunit + osmosdr + boost + log4cpp + ]; + + meta = with lib; { + description = "Gnuradio block for ais"; + homepage = "https://github.com/bistromath/gr-ais"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/gnuradio-modules/gsm/default.nix b/third_party/nixpkgs/pkgs/development/gnuradio-modules/gsm/default.nix new file mode 100644 index 0000000000..835c545666 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/gnuradio-modules/gsm/default.nix @@ -0,0 +1,48 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, cppunit +, swig +, boost +, log4cpp +, python +, libosmocore +, osmosdr +}: + +mkDerivation { + pname = "gr-gsm"; + version = "2016-08-25"; + src = fetchFromGitHub { + owner = "ptrkrysik"; + repo = "gr-gsm"; + rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d"; + sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx"; + }; + disabledForGRafter = "3.8"; + + nativeBuildInputs = [ + cmake + pkg-config + swig + python + ]; + + buildInputs = [ + cppunit + log4cpp + boost + libosmocore + osmosdr + ]; + + meta = with lib; { + description = "Gnuradio block for gsm"; + homepage = "https://github.com/ptrkrysik/gr-gsm"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/gnuradio-modules/limesdr/default.nix b/third_party/nixpkgs/pkgs/development/gnuradio-modules/limesdr/default.nix new file mode 100644 index 0000000000..c10ab9df39 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/gnuradio-modules/limesdr/default.nix @@ -0,0 +1,61 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, gnuradio +, cmake +, pkg-config +, doxygen +, swig +, python +, log4cpp +, mpir +, boost +, gmp +, icu +, limesuite +}: + +let + version = { + "3.7" = "2.0.0"; + "3.8" = "3.0.1"; + "3.9" = null; + }.${gnuradio.versionAttr.major}; + src = fetchFromGitHub { + owner = "myriadrf"; + repo = "gr-limesdr"; + rev = "v${version}"; + sha256 = { + "3.7" = "0ldqvfwl0gil89l9s31fjf9d7ki0dk572i8vna336igfaz348ypq"; + "3.8" = "ffs+8TU0yr6IW1xZJ/abQ1CQWGZM+zYqPRJxy3ZvM9U="; + "3.9" = null; + }.${gnuradio.versionAttr.major}; + }; +in mkDerivation { + pname = "gr-limesdr"; + inherit version src; + disabledForGRafter = "3.9"; + + nativeBuildInputs = [ + cmake + pkg-config + swig + python + ]; + buildInputs = [ + log4cpp + mpir + boost + gmp + icu + limesuite + ]; + + meta = with lib; { + description = "Gnuradio source and sink blocks for LimeSDR"; + homepage = "https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.markuskowa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/gnuradio-modules/mkDerivation.nix b/third_party/nixpkgs/pkgs/development/gnuradio-modules/mkDerivation.nix new file mode 100644 index 0000000000..014968f82c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/gnuradio-modules/mkDerivation.nix @@ -0,0 +1,25 @@ +{ lib +, unwrapped +}: + +mkDerivation: + +args: + +# Check if it's supposed to not get built for the current gnuradio version +if (builtins.hasAttr "disabledForGRafter" args) && +(lib.versionAtLeast unwrapped.versionAttr.major args.disabledForGRafter) then +let name = args.name or "${args.pname}"; in +throw "Package ${name} is incompatible with GNURadio ${unwrapped.versionAttr.major}" +else + +let + args_ = { + enableParallelBuilding = args.enableParallelBuilding or true; + nativeBuildInputs = (args.nativeBuildInputs or []); + # We add gnuradio and volk itself by default - most gnuradio based packages + # will not consider it a depenency worth mentioning and it will almost + # always be needed + buildInputs = (args.buildInputs or []) ++ [ unwrapped unwrapped.volk ]; + }; +in mkDerivation (args // args_) diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix b/third_party/nixpkgs/pkgs/development/gnuradio-modules/nacl/default.nix similarity index 50% rename from third_party/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix rename to third_party/nixpkgs/pkgs/development/gnuradio-modules/nacl/default.nix index f6c21e7945..1ffb0afee0 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix +++ b/third_party/nixpkgs/pkgs/development/gnuradio-modules/nacl/default.nix @@ -1,31 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, uhd -, makeWrapper, libsodium, cppunit, log4cpp -, pythonSupport ? true, python, swig +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, cppunit +, swig +, boost +, log4cpp +, python +, libsodium }: -assert pythonSupport -> python != null && swig != null; - -stdenv.mkDerivation { +mkDerivation { pname = "gr-nacl"; version = "2017-04-10"; - src = fetchFromGitHub { owner = "stwunsch"; repo = "gr-nacl"; rev = "15276bb0fcabf5fe4de4e58df3d579b5be0e9765"; sha256 = "018np0qlk61l7mlv3xxx5cj1rax8f1vqrsrch3higsl25yydbv7v"; }; + disabledForGRafter = "3.8"; + + nativeBuildInputs = [ + cmake + pkg-config + swig + python + ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - boost gnuradio uhd makeWrapper libsodium cppunit log4cpp - ] ++ lib.optionals pythonSupport [ python swig ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") - done - ''; + cppunit + log4cpp + boost + libsodium + ]; meta = with lib; { description = "Gnuradio block for encryption"; diff --git a/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix b/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix new file mode 100644 index 0000000000..0e1cf244c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -0,0 +1,86 @@ +{ lib +, mkDerivation +, fetchgit +, gnuradio +, cmake +, pkg-config +, log4cpp +, mpir +, boost +, gmp +, fftwFloat +, python +, swig +, uhd +, icu +, airspy +, hackrf +, libbladeRF +, rtl-sdr +, soapysdr-with-plugins +}: + +let + version = { + "3.7" = "0.1.5"; + "3.8" = "0.2.2"; + "3.9" = null; + }.${gnuradio.versionAttr.major}; + src = fetchgit { + url = "git://git.osmocom.org/gr-osmosdr"; + rev = "v${version}"; + sha256 = { + "3.7" = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv"; + "3.8" = "HT6xlN6cJAnvF+s1g2I1uENhBJJizdADlLXeSD0rEqs="; + "3.9" = null; + }.${gnuradio.versionAttr.major}; + }; +in mkDerivation { + pname = "gr-osmosdr"; + inherit version src; + disabledForGRafter = "3.9"; + + buildInputs = [ + log4cpp + mpir + boost + fftwFloat + gmp + icu + airspy + hackrf + libbladeRF + rtl-sdr + soapysdr-with-plugins + ] ++ lib.optional (gnuradio.hasFeature "gr-uhd" gnuradio.features) [ + uhd + ]; + cmakeFlags = [ + (if (gnuradio.hasFeature "python-support" gnuradio.features) then + "-DENABLE_PYTHON=ON" + else + "-DENABLE_PYTHON=OFF" + ) + ]; + nativeBuildInputs = [ + cmake + pkg-config + swig + ] ++ lib.optionals (gnuradio.hasFeature "python-support" gnuradio.features) [ + (if (gnuradio.versionAttr.major == "3.7") then + python.pkgs.cheetah + else + python.pkgs.Mako + ) + python + ] + ; + + meta = with lib; { + description = "Gnuradio block for OsmoSDR and rtl-sdr"; + homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/gnuradio-modules/rds/default.nix b/third_party/nixpkgs/pkgs/development/gnuradio-modules/rds/default.nix new file mode 100644 index 0000000000..c068d6af81 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/gnuradio-modules/rds/default.nix @@ -0,0 +1,59 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, gnuradio +, cmake +, pkg-config +, swig +, python +, log4cpp +, mpir +, boost +, gmp +, icu +}: + +let + version = { + "3.7" = "1.1.0"; + "3.8" = "3.8.0"; + "3.9" = null; + }.${gnuradio.versionAttr.major}; + src = fetchFromGitHub { + owner = "bastibl"; + repo = "gr-rds"; + rev = "v${version}"; + sha256 = { + "3.7" = "0jkzchvw0ivcxsjhi1h0mf7k13araxf5m4wi5v9xdgqxvipjzqfy"; + "3.8" = "+yKLJu2bo7I2jkAiOdjvdhZwxFz9NFgTmzcLthH9Y5o="; + "3.9" = null; + }.${gnuradio.versionAttr.major}; + }; +in mkDerivation { + pname = "gr-rds"; + inherit version src; + disabledForGRafter = "3.9"; + + buildInputs = [ + log4cpp + mpir + boost + gmp + icu + ]; + + nativeBuildInputs = [ + cmake + pkg-config + swig + python + ]; + + meta = with lib; { + description = "Gnuradio block for radio data system"; + homepage = "https://github.com/bastibl/gr-rds"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-opengl/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-opengl/default.nix index effa651b99..5ada5d41c7 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-opengl/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-opengl/default.nix @@ -18,6 +18,6 @@ in stdenv.mkDerivation { homepage = "https://www.gnu.org/software/guile-opengl/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } 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 441410ce13..ad242777ec 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1lvl6i3ym7dyg215fkmslf3rnk29hz7f21jn91y1mghrhch7hvhl"; + sha256 = "1y9js3n8ml2g492nivy7gk371rdmibwydb4fwzzwbviya280akaq"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -727,8 +727,19 @@ self: super: { # The tests spuriously fail libmpd = dontCheck super.libmpd; + # 2021-03-12: All of this libraries have to restrictive upper bounds + # https://github.com/diagrams/diagrams-core/issues/112 + active = doJailbreak super.active; + statestack = doJailbreak super.statestack; + force-layout = doJailbreak super.force-layout; + size-based = doJailbreak super.size-based; + dual-tree = doJailbreak super.dual-tree; + diagrams-core = doJailbreak super.diagrams-core; + diagrams-postscript = doJailbreak super.diagrams-postscript; + diagrams-svg = doJailbreak super.diagrams-svg; + diagrams-contrib = doJailbreak super.diagrams-contrib; # https://github.com/diagrams/diagrams-lib/issues/288 - diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; }); + diagrams-lib = doJailbreak (overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; })); # https://github.com/danidiaz/streaming-eversion/issues/1 streaming-eversion = dontCheck super.streaming-eversion; @@ -1413,17 +1424,21 @@ self: super: { # https://github.com/haskell/haskell-language-server/issues/611 haskell-language-server = dontCheck super.haskell-language-server; - # 2021-02-11: Jailbreaking because of syntax error on bound revision - hls-explicit-imports-plugin = doJailbreak super.hls-explicit-imports-plugin; + # 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); - # 2021-02-08: Overrides because nightly is to old for hls 0.9.0 - lsp-test = doDistribute (dontCheck self.lsp-test_0_11_0_7); - haskell-lsp = doDistribute self.haskell-lsp_0_23_0_0; - haskell-lsp-types = doDistribute self.haskell-lsp-types_0_23_0_0; + # 2021-03-09: Golden tests seem to be missing in hackage release: + # https://github.com/haskell/haskell-language-server/issues/1536 + hls-tactics-plugin = dontCheck super.hls-tactics-plugin; - # 1. test requires internet - # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute - ghcide = doDistribute (unmarkBroken (dontCheck super.ghcide)); + # 2021-03-21 Test hangs + # https://github.com/haskell/haskell-language-server/issues/1562 + ghcide = dontCheck super.ghcide; + + # 2020-03-09: Tests broken in hackage release + # fixed on upstream, but not released in hiedb 0.3.0.1 + # https://github.com/wz1000/HieDb/issues/30 + hiedb = dontCheck super.hiedb; data-tree-print = doJailbreak super.data-tree-print; @@ -1515,8 +1530,25 @@ self: super: { # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129 servant-swagger = dontCheck super.servant-swagger; - # 2020-11-27: cxx-options is broken in Cabal 3.2.0.0 - hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0; + hercules-ci-agent = super.hercules-ci-agent.override { + cachix = + # https://github.com/cachix/cachix/pull/361 + (appendPatch + (addBuildDepend super.cachix super.hercules-ci-cnix-store) + (pkgs.fetchpatch { + name = "cachix-361.patch"; + url = "https://patch-diff.githubusercontent.com/raw/cachix/cachix/pull/361.patch"; + sha256 = "0wwlcpmnqmvk1css5f723dzgjvg4jr7i58ifhni5zg9h5iwycdfr"; + stripLen = 1; + includes = ["*.cabal" "*.hs"]; + }) + ); + }; + + hercules-ci-cli = generateOptparseApplicativeCompletion "hci" ( + # See hercules-ci-optparse-applicative in non-hackage-packages.nix. + addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative + ); # 2020-12-05: http-client is fixed on too old version essence-of-live-coding-warp = super.essence-of-live-coding-warp.override { @@ -1602,4 +1634,31 @@ self: super: { ]; }); + # cabal-install switched to build type simple in 3.2.0.0 + # as a result, the cabal(1) man page is no longer installed + # automatically. Instead we need to use the `cabal man` + # command which generates the man page on the fly and + # install it to $out/share/man/man1 ourselves in this + # override. + # The commit that introduced this change: + # https://github.com/haskell/cabal/commit/91ac075930c87712eeada4305727a4fa651726e7 + cabal-install = overrideCabal super.cabal-install (old: { + postInstall = old.postInstall + '' + mkdir -p "$out/share/man/man1" + "$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1" + ''; + }); + + # while waiting for a new release: https://github.com/brendanhay/amazonka/pull/572 + amazonka = appendPatches (doJailbreak super.amazonka) [ + (pkgs.fetchpatch { + stripLen = 1; + url = "https://github.com/brendanhay/amazonka/commit/43ddd87b1ebd6af755b166e16336259ec025b337.patch"; + sha256 = "1x9l5xgvrh908di6whpavyp08cys11v3yn6rc21zw87xiyigdbi3"; + }) + ]; + + # Test suite does not compile. + feed = dontCheck super.feed; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 5e39a8047b..f1af62b1f5 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -50,6 +50,12 @@ self: super: { random = super.random_1_2_0; }; + # cabal-install-parsers is written for Cabal 3.4 + cabal-install-parsers = super.cabal-install-parsers.override { + Cabal = super.Cabal_3_4_0_0; + base16-bytestring = super.base16-bytestring_1_0_1_0; + }; + # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; system-fileio = doJailbreak super.system-fileio; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index e6e0f690fe..996d218260 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -52,9 +52,15 @@ self: super: { haddock = self.haddock_2_23_1; haddock-api = self.haddock-api_2_23_1; - # These builds need Cabal 3.2.x. + # These builds need newer versions of Cabal. cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; }; - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); + cabal-install = super.cabal-install.override { + Cabal = super.Cabal_3_4_0_0; + hackage-security = super.hackage-security.override { Cabal = super.Cabal_3_4_0_0; }; + # Using dontCheck to break test dependency cycles + edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; }); + random = super.random_1_2_0; + }; # Ignore overly restrictive upper version bounds. aeson-diff = doJailbreak super.aeson-diff; 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 0a41a91aaa..e3099bfe51 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 @@ -93,4 +93,7 @@ self: super: { # The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x. unordered-containers = dontCheck super.unordered-containers; + # The test suite seems pretty broken. + base64-bytestring = dontCheck super.base64-bytestring; + } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ca8b927cc1..263cf833b1 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -73,15 +73,8 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # Don't update yet to remain compatible with haskell-language-server-0.9.0. - - ghcide < 0.7.4 - - hls-class-plugin < 1 - - hls-explicit-imports-plugin < 0.1.0.1 - - hls-haddock-comments-plugin < 1 - - hls-plugin-api < 0.7.1.0 - - hls-retrie-plugin < 0.1.1.1 - - hls-tactics-plugin < 1 - # Stackage Nightly 2021-03-01 + + # Stackage Nightly 2021-03-12 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -215,8 +208,8 @@ default-package-overrides: - amazonka-waf ==1.6.1 - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - - amqp ==0.20.0.1 - - amqp-utils ==0.4.5.1 + - amqp ==0.21.0 + - amqp-utils ==0.6.1.0 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.10.3 - ansi-wl-pprint ==0.6.9 @@ -229,7 +222,7 @@ default-package-overrides: - ap-normalize ==0.1.0.0 - appar ==0.1.8 - appendmap ==0.1.5 - - apply-refact ==0.9.1.0 + - apply-refact ==0.9.2.0 - apportionment ==0.0.0.3 - approximate ==0.3.4 - approximate-equality ==1.1.0.2 @@ -271,7 +264,7 @@ default-package-overrides: - attoparsec-path ==0.0.0.1 - audacity ==0.0.2 - aur ==7.0.6 - - aura ==3.2.3 + - aura ==3.2.4 - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 @@ -306,6 +299,8 @@ default-package-overrides: - basic-prelude ==0.7.0 - bazel-runfiles ==0.12 - bbdb ==0.8 + - bcp47 ==0.2.0.3 + - bcp47-orphans ==0.1.0.2 - bcrypt ==0.0.11 - bech32 ==1.1.0 - bech32-th ==1.0.2 @@ -348,11 +343,11 @@ default-package-overrides: - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.2.1 - blaze-html ==0.9.1.2 - - blaze-markup ==0.8.2.7 + - 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.0 + - BNFC ==2.9.1 - board-games ==0.3 - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 @@ -427,7 +422,7 @@ default-package-overrides: - cassava-megaparsec ==2.0.2 - cast ==0.1.0.2 - category ==0.2.5.0 - - cayley-client ==0.4.13 + - cayley-client ==0.4.14 - cborg ==0.2.4.0 - cborg-json ==0.2.2.0 - cereal ==0.5.8.1 @@ -462,7 +457,7 @@ default-package-overrides: - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - circular ==0.3.1.1 - - citeproc ==0.3.0.7 + - citeproc ==0.3.0.8 - clash-ghc ==1.2.5 - clash-lib ==1.2.5 - clash-prelude ==1.2.5 @@ -525,17 +520,17 @@ default-package-overrides: - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - - conduit ==1.3.4 + - 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.0.0.1 - - conferer-aeson ==1.0.0.0 - - conferer-hspec ==1.0.0.0 - - conferer-warp ==1.0.0.0 + - conferer ==1.1.0.0 + - conferer-aeson ==1.1.0.0 + - 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 @@ -547,7 +542,7 @@ default-package-overrides: - constraint ==0.1.4.0 - constraints ==0.12 - constraint-tuples ==0.1.2 - - construct ==0.3 + - construct ==0.3.0.1 - contravariant ==1.5.3 - contravariant-extras ==0.3.5.2 - control-bool ==0.2.1 @@ -658,7 +653,7 @@ default-package-overrides: - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 - deepseq-instances ==0.1.0.1 - - deferred-folds ==0.9.16 + - deferred-folds ==0.9.17 - dejafu ==2.4.0.1 - dense-linear-algebra ==0.1.0.0 - depq ==0.4.1.0 @@ -700,6 +695,7 @@ default-package-overrides: - 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-lib ==0.1 - doldol ==0.4.1.2 @@ -815,6 +811,7 @@ default-package-overrides: - 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 @@ -823,7 +820,7 @@ default-package-overrides: - feature-flags ==0.1.0.1 - fedora-dists ==1.1.2 - fedora-haskell-tools ==0.9 - - feed ==1.3.0.1 + - feed ==1.3.2.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - fgl ==5.7.0.3 @@ -840,7 +837,7 @@ default-package-overrides: - FindBin ==0.0.5 - fingertree ==0.1.4.2 - finite-typelits ==0.1.4.2 - - first-class-families ==0.8.0.0 + - first-class-families ==0.8.0.1 - first-class-patterns ==0.3.2.5 - fitspec ==0.4.8 - fixed ==0.3 @@ -916,6 +913,7 @@ default-package-overrides: - generic-optics ==2.0.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 @@ -934,8 +932,14 @@ default-package-overrides: - 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 @@ -1006,7 +1010,7 @@ default-package-overrides: - gluturtle ==0.0.58.1 - gnuplot ==0.5.6.1 - google-isbn ==1.0.3 - - gothic ==0.1.5 + - gothic ==0.1.6 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graphite ==0.10.0.1 @@ -1028,9 +1032,9 @@ default-package-overrides: - hackage-db ==2.1.0 - hackage-security ==0.6.0.1 - haddock-library ==1.9.0 - - hadolint ==1.22.1 + - hadolint ==1.23.0 - hadoop-streaming ==0.2.0.3 - - hakyll-convert ==0.3.0.3 + - hakyll-convert ==0.3.0.4 - half ==0.3.1 - hall-symbols ==0.1.0.6 - hamtsolo ==1.0.3 @@ -1074,7 +1078,7 @@ default-package-overrides: - hdaemonize ==0.5.6 - HDBC ==2.4.0.3 - HDBC-session ==0.1.2.0 - - headroom ==0.3.2.0 + - headroom ==0.4.0.0 - heap ==1.0.4 - heaps ==0.3.6.1 - hebrew-time ==0.1.2 @@ -1109,7 +1113,7 @@ default-package-overrides: - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.10.1 - - hmatrix ==0.20.1 + - hmatrix ==0.20.2 - hmatrix-backprop ==0.1.3.0 - hmatrix-gsl ==0.19.0.1 - hmatrix-gsl-stats ==0.4.1.8 @@ -1163,6 +1167,7 @@ default-package-overrides: - hspec-core ==2.7.8 - hspec-discover ==2.7.8 - hspec-expectations ==0.8.2 + - hspec-expectations-json ==1.0.0.2 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.5 - hspec-golden ==0.1.0.3 @@ -1274,7 +1279,7 @@ default-package-overrides: - immortal-queue ==0.1.0.1 - inbox ==0.1.0 - include-file ==0.1.0.4 - - incremental-parser ==0.5.0.1 + - incremental-parser ==0.5.0.2 - indents ==0.5.0.1 - indexed ==0.1.3 - indexed-containers ==0.1.0.2 @@ -1290,7 +1295,7 @@ default-package-overrides: - inline-c-cpp ==0.4.0.3 - inline-r ==0.10.4 - inliterate ==0.1.0 - - input-parsers ==0.1.0.1 + - input-parsers ==0.2.1 - insert-ordered-containers ==0.2.4 - inspection-testing ==0.4.3.0 - instance-control ==0.1.2.0 @@ -1317,7 +1322,7 @@ default-package-overrides: - io-streams ==1.5.2.0 - io-streams-haproxy ==1.0.1.0 - ip6addr ==1.0.1 - - iproute ==1.7.10 + - iproute ==1.7.11 - IPv6Addr ==1.1.5 - ipynb ==0.1.0.1 - ipython-kernel ==0.10.2.1 @@ -1546,16 +1551,16 @@ default-package-overrides: - mixed-types-num ==0.4.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - - mmark ==0.0.7.2 + - mmark ==0.0.7.3 - mmark-cli ==0.0.5.0 - - mmark-ext ==0.2.1.2 + - 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.1 - model ==0.5 - - modern-uri ==0.3.4.0 + - modern-uri ==0.3.4.1 - modular ==0.1.0.8 - monad-chronicle ==1.0.0.1 - monad-control ==1.0.2.3 @@ -1673,8 +1678,9 @@ default-package-overrides: - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.3 - - nri-env-parser ==0.1.0.4 - - nri-prelude ==0.4.0.0 + - nri-env-parser ==0.1.0.5 + - nri-observability ==0.1.0.0 + - nri-prelude ==0.5.0.0 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 @@ -1690,7 +1696,7 @@ default-package-overrides: - ObjectName ==1.1.0.1 - o-clock ==1.2.0.1 - odbc ==0.2.2 - - oeis2 ==1.0.4 + - oeis2 ==1.0.5 - ofx ==0.4.4.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 @@ -1702,7 +1708,7 @@ default-package-overrides: - oo-prototypes ==0.1.0.0 - opaleye ==0.7.1.0 - OpenAL ==1.7.0.5 - - openapi3 ==3.0.1.0 + - openapi3 ==3.0.2.0 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 @@ -1733,10 +1739,10 @@ default-package-overrides: - packcheck ==0.5.1 - packdeps ==0.6.0.0 - pager ==0.1.1.0 - - pagination ==0.2.1 + - pagination ==0.2.2 - pagure-cli ==0.2 - pandoc ==2.11.4 - - pandoc-plot ==1.0.2.1 + - pandoc-plot ==1.1.0 - pandoc-types ==1.22 - pantry ==0.5.1.4 - parallel ==3.2.2.0 @@ -1907,7 +1913,7 @@ default-package-overrides: - pureMD5 ==2.1.3 - purescript-bridge ==0.14.0.0 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==2.0.0.3 + - pusher-http-haskell ==2.1.0.0 - pvar ==1.0.0.0 - PyF ==0.9.0.3 - qchas ==1.1.0.1 @@ -1968,7 +1974,7 @@ default-package-overrides: - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - rebase ==1.6.1 - - record-dot-preprocessor ==0.2.9 + - record-dot-preprocessor ==0.2.10 - record-hasfield ==1.0 - records-sop ==0.1.0.3 - record-wrangler ==0.1.1.0 @@ -2042,6 +2048,7 @@ default-package-overrides: - 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.1 - safe-decimal ==0.2.0.0 - safe-exceptions ==0.1.7.1 @@ -2095,7 +2102,7 @@ default-package-overrides: - seqalign ==0.2.0.4 - seqid ==0.6.2 - seqid-streams ==0.7.2 - - sequence-formats ==1.6.0 + - sequence-formats ==1.6.1 - sequenceTools ==1.4.0.5 - serf ==0.1.1.0 - serialise ==0.2.3.0 @@ -2216,7 +2223,7 @@ default-package-overrides: - squeal-postgresql ==0.7.0.1 - squeather ==0.6.0.0 - srcloc ==0.5.1.2 - - stache ==2.2.0 + - stache ==2.2.1 - stackcollapse-ghc ==0.0.1.3 - stack-templatizer ==0.1.0.2 - stateref ==0.3 @@ -2265,14 +2272,14 @@ default-package-overrides: - string-random ==0.1.4.0 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 - - stripe-concepts ==1.0.2.4 + - 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.13 - structs ==0.1.5 - - structured ==0.1 + - structured ==0.1.0.1 - structured-cli ==2.6.0.0 - subcategories ==0.1.0.0 - sum-type-boilerplate ==0.1.1 @@ -2284,6 +2291,12 @@ default-package-overrides: - 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 @@ -2531,13 +2544,14 @@ default-package-overrides: - utility-ht ==0.0.15 - uuid ==1.3.14 - uuid-types ==1.0.4 - - validation ==1.1 + - validation ==1.1.1 - validation-selective ==0.1.0.0 - 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 @@ -2669,16 +2683,17 @@ default-package-overrides: - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - - yamlparse-applicative ==0.1.0.2 + - yamlparse-applicative ==0.1.0.3 - yesod ==1.6.1.0 - yesod-auth ==1.6.10.1 - yesod-auth-hashdb ==1.7.1.5 - - yesod-auth-oauth2 ==0.6.1.7 + - yesod-auth-oauth2 ==0.6.2.3 - yesod-bin ==1.6.1 - yesod-core ==1.6.18.8 - yesod-fb ==0.6.1 - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 + - yesod-markdown ==0.12.6.6 - yesod-newsfeed ==1.7.0.0 - yesod-page-cursor ==2.0.0.4 - yesod-paginator ==1.1.1.0 @@ -2790,8 +2805,12 @@ package-maintainers: 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 @@ -2807,6 +2826,7 @@ package-maintainers: - releaser - taskwarrior - haskell-language-server + - shake-bench sorki: - cayene-lpp - data-stm32 @@ -3070,7 +3090,6 @@ broken-packages: - acme-zero - acousticbrainz-client - ActionKid - - active - activehs - activehs-base - activitypub @@ -3181,7 +3200,6 @@ broken-packages: - amazon-emailer - amazon-emailer-client-snap - amazon-products - - amazonka - amazonka-s3-streaming - amby - AMI @@ -3837,7 +3855,6 @@ broken-packages: - cabal-install-bundle - cabal-install-ghc72 - cabal-install-ghc74 - - cabal-install-parsers - cabal-lenses - cabal-meta - cabal-mon @@ -3988,7 +4005,6 @@ broken-packages: - character-cases - charade - chart-cli - - Chart-diagrams - Chart-fltkhs - chart-histogram - Chart-simple @@ -4679,27 +4695,21 @@ broken-packages: - dhrun - dia-base - dia-functions - - diagrams - diagrams-boolean - diagrams-braille - diagrams-builder - diagrams-cairo - diagrams-canvas - - diagrams-contrib - - diagrams-core - diagrams-graphviz - diagrams-gtk - diagrams-haddock - diagrams-html5 - - diagrams-lib - diagrams-pandoc - diagrams-pdf - diagrams-pgf - - diagrams-postscript - diagrams-qrcode - diagrams-rasterific - diagrams-rubiks-cube - - diagrams-svg - diagrams-tikz - diagrams-wx - dib @@ -4807,7 +4817,6 @@ broken-packages: - docrecords - DocTest - doctest-discover-configurator - - doctest-driver-gen - doctest-prop - docusign-base - docusign-base-minimal @@ -4870,7 +4879,6 @@ broken-packages: - dtd - dtd-text - dtw - - dual-tree - dualizer - duet - dumb-cas @@ -5151,8 +5159,6 @@ broken-packages: - FailureT - fake - fake-type - - fakedata - - fakedata-quickcheck - faktory - falling-turnip - fallingblocks @@ -5344,7 +5350,6 @@ broken-packages: - foo - for-free - forbidden-fruit - - force-layout - fordo - forecast-io - foreign-var @@ -6454,7 +6459,6 @@ broken-packages: - hid-examples - hidden-char - hie-core - - hiedb - hieraclus - hierarchical-clustering-diagrams - hierarchical-exceptions @@ -8165,7 +8169,6 @@ broken-packages: - Monocle - monoid - monoid-absorbing - - monoid-extras - monoid-owns - monoidplus - monoids @@ -10002,6 +10005,7 @@ broken-packages: - sha1 - shade - shadower + - shake-bench - shake-bindist - shake-cabal-build - shake-dhall @@ -10115,7 +10119,6 @@ broken-packages: - sirkel - sitepipe - sixfiguregroup - - size-based - sized-grid - sized-types - sized-vector @@ -10395,7 +10398,6 @@ broken-packages: - state-plus - state-record - stateful-mtl - - statestack - static-canvas - static-closure - static-tensor @@ -10484,7 +10486,6 @@ broken-packages: - strictly - string-isos - string-quote - - string-random - string-typelits - stringlike - stringtable-atom @@ -10542,12 +10543,10 @@ broken-packages: - sv-svfactor - SVD2HS - svfactor - - svg-builder - svg-builder-fork - SVG2Q - svg2q - svgcairo - - SVGFonts - svgone - svgutils - svm-light-utils @@ -10746,7 +10745,6 @@ broken-packages: - testbench - testCom - testcontainers - - testing-feat - testloop - testpack - testpattern 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 21aa86ee5a..492b8ac72d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -446,9 +446,6 @@ self: super: builtins.intersectAttrs super { # requires an X11 display in test suite gi-gtk-declarative = dontCheck super.gi-gtk-declarative; - # depends on 'hie' executable - lsp-test = dontCheck super.lsp-test; - # tests depend on executable ghcide = overrideCabal super.ghcide (drv: { preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"''; @@ -812,4 +809,11 @@ self: super: builtins.intersectAttrs super { # hadolint enables static linking by default in the cabal file, so we have to explicitly disable it. # https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b hadolint = disableCabalFlag super.hadolint "static"; + + # Test suite tries to execute the build product "doctest-driver-gen", but it's not in $PATH. + doctest-driver-gen = dontCheck super.doctest-driver-gen; + + # Tests access internet + prune-juice = dontCheck super.prune-juice; + } 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 44f0b4ec51..81fc634193 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -1278,34 +1278,6 @@ self: { }) {}; "BNFC" = callPackage - ({ mkDerivation, alex, array, base, Cabal, cabal-doctest - , containers, deepseq, directory, doctest, filepath, happy, hspec - , hspec-discover, HUnit, mtl, pretty, process, QuickCheck - , string-qq, temporary, time - }: - mkDerivation { - pname = "BNFC"; - version = "2.9.0"; - sha256 = "1h5365978q43r4sik1kmbrxnxa6lxnb54lhp7bi9599rnav8nw0z"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array base containers deepseq directory filepath mtl pretty process - string-qq time - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - array base containers deepseq directory doctest filepath hspec - HUnit mtl pretty process QuickCheck string-qq temporary time - ]; - testToolDepends = [ alex happy hspec-discover ]; - description = "A compiler front-end generator"; - license = lib.licenses.bsd3; - }) {}; - - "BNFC_2_9_1" = callPackage ({ mkDerivation, alex, array, base, Cabal, cabal-doctest , containers, deepseq, directory, doctest, filepath, happy, hspec , hspec-discover, HUnit, mtl, pretty, process, QuickCheck @@ -1331,7 +1303,6 @@ self: { testToolDepends = [ alex happy hspec-discover ]; description = "A compiler front-end generator"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "BNFC-meta" = callPackage @@ -3071,8 +3042,6 @@ self: { ]; description = "Diagrams backend for Charts"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Chart-fltkhs" = callPackage @@ -10969,8 +10938,8 @@ self: { pname = "HsYAML"; version = "0.2.1.0"; sha256 = "10qzhsg789h37q22hm9p27dx4rhbykcbxp7p3pvkws8fr7ajgxv0"; - revision = "1"; - editedCabalFile = "0bfwdwwj5wgqrrbw1cwaxwxy9970dzln7w20f21mlg2l374wnqvf"; + revision = "2"; + editedCabalFile = "0f7867jfzlmlqnkv3fjrzjvvfzjlvhbm10kmg7n0qk69ic8grkbc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11857,8 +11826,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.2"; sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p"; - revision = "5"; - editedCabalFile = "0aar0h109fiy6pads3rlmhjsaj5528yn4zay5ps0zf8yb9dyd82s"; + revision = "6"; + editedCabalFile = "0np8wqf0s0pwqnjfhs8zw9h133p2x173xbv984c4dn5a1xhn0azq"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -17363,8 +17332,8 @@ self: { }: mkDerivation { pname = "RtMidi"; - version = "0.4.0.0"; - sha256 = "075j6d7vmihyz33b5ikv2l0c0alnhjzy1wpnzdrca6l201vab2mw"; + version = "0.5.0.0"; + sha256 = "0yb52a4c03x28nbq8shpzqsczr04ngi0fa1hw0mflhql5rzd7yy5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq unliftio-core vector ]; @@ -17911,8 +17880,6 @@ self: { ]; description = "Fonts from the SVG-Font format"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SVGPath" = callPackage @@ -22010,6 +21977,8 @@ self: { pname = "Z-Data"; version = "0.7.0.0"; sha256 = "1b4ycsq5g459ynp989kldq6r3ssawr64a2hp3dzy804pwrp8v62m"; + revision = "1"; + editedCabalFile = "057si6f4hz5kda3gyr2b8kni17dmv28z82b64qi142gjr3gx415i"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -22036,8 +22005,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.6.4.0"; - sha256 = "1d651q0xda38652n249swh84kkn2jgw63db01aia00304h9cbcgf"; + version = "0.7.0.0"; + sha256 = "1yw0ym2iw1hi3jn2xrp1hwi6vbv69d0fpvvz3n2328v4i0ryjdjf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23910,8 +23879,6 @@ self: { ]; description = "Abstractions for animation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "activehs" = callPackage @@ -25337,15 +25304,19 @@ self: { }) {}; "aeson-via" = callPackage - ({ mkDerivation, aeson, aeson-casing, base, newtype-generics, text + ({ mkDerivation, aeson, aeson-casing, base, newtype-generics, tasty + , tasty-hunit, text }: mkDerivation { pname = "aeson-via"; - version = "0.1.0"; - sha256 = "0zlx4pxfh3qll8ymfya0rfqx3gd7ag0wag86fa8fvni6h07ynryf"; + version = "0.1.1"; + sha256 = "18b1pxvkrva6531v8x38vhqmyj48iddi49vgc79s0jx8sgb39l8d"; libraryHaskellDepends = [ aeson aeson-casing base newtype-generics text ]; + testHaskellDepends = [ + aeson aeson-casing base newtype-generics tasty tasty-hunit text + ]; description = "Wrappers to derive-via Aeson ToJSON/FromJSON typeclasses"; license = lib.licenses.bsd3; }) {}; @@ -26547,17 +26518,17 @@ self: { "algorithmic-composition-basic" = callPackage ({ mkDerivation, base, bytestring, directory, foldable-ix , mmsyn2-array, mmsyn3, mmsyn7l, mmsyn7ukr-common - , phonetic-languages-simplified-base, process + , phonetic-languages-simplified-base, process, process-sequential , ukrainian-phonetics-basic-array }: mkDerivation { pname = "algorithmic-composition-basic"; - version = "0.2.2.0"; - sha256 = "0ij3yh29mxkj9zph33g3r46afh3s4vhqxmhkpnm2mgzad7xqca2m"; + version = "0.3.1.0"; + sha256 = "0vpqi398nhlawh7dipfzvq6zsk1g9gpjbr35mizm5rms4sj3mfsk"; libraryHaskellDepends = [ base bytestring directory foldable-ix mmsyn2-array mmsyn3 mmsyn7l mmsyn7ukr-common phonetic-languages-simplified-base process - ukrainian-phonetics-basic-array + process-sequential ukrainian-phonetics-basic-array ]; description = "Helps to create experimental music from a file (or its part) and a Ukrainian text"; license = lib.licenses.mit; @@ -26599,6 +26570,17 @@ self: { license = lib.licenses.mit; }) {}; + "algorithmic-composition-overtones" = callPackage + ({ mkDerivation, algorithmic-composition-basic, base }: + mkDerivation { + pname = "algorithmic-composition-overtones"; + version = "0.1.0.0"; + sha256 = "0phdwds12jmv7dp88z6lk6h58jayn9cpjn1sgrglymgww87h88d9"; + libraryHaskellDepends = [ algorithmic-composition-basic base ]; + description = "Some variants of the overtones functions to generate a timbre"; + license = lib.licenses.mit; + }) {}; + "align" = callPackage ({ mkDerivation, base, containers, transformers, vector }: mkDerivation { @@ -27196,8 +27178,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Comprehensive Amazon Web Services SDK"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "amazonka-alexa-business" = callPackage @@ -29674,8 +29654,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.20.0.1"; - sha256 = "10qj4776b3sjifij3qic2bafd01jn8s0pfgm1yd74nyhjx50s19p"; + version = "0.21.0"; + sha256 = "1sni1bl2rmc2fq2zla0h093acd7yisfdizd5wrxclammzav7x0gk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29740,8 +29720,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.4.5.1"; - sha256 = "15bsp34wqblmds51gvrliqfm4jax3swk7i58ichaliq454cn16ap"; + version = "0.6.1.0"; + sha256 = "0h0mjgaiyhhx8y6zd3zxm1jzd0vgc6crq3980l5cal0zv6vs9zc1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29753,27 +29733,6 @@ self: { license = lib.licenses.gpl3; }) {}; - "amqp-utils_0_5_0_0" = 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.5.0.0"; - sha256 = "140awzxj14h9wa13wfl15dqndqvyy046zmyg0q643r40nbyggl8r"; - 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.gpl3; - hydraPlatforms = lib.platforms.none; - }) {}; - "amqp-worker" = callPackage ({ mkDerivation, aeson, amqp, base, bytestring, data-default , exceptions, monad-control, monad-loops, mtl, resource-pool @@ -31943,8 +31902,8 @@ self: { }: mkDerivation { pname = "apply-refact"; - version = "0.9.1.0"; - sha256 = "1b9ib5ix643aagzsw5vk8d789a784pggsm6qv36bxkcsx89s2bjm"; + version = "0.9.2.0"; + sha256 = "1j0afdl6g51wyb3g47wss15v0yl50n23k3icbyla8h89rxh74lcx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33697,6 +33656,8 @@ self: { pname = "asciidiagram"; version = "1.3.3.3"; sha256 = "09k1kdaa0xi2fx9vfdlv2w2nxx5x1vnlkz7gp8s998a325w1x7q1"; + revision = "1"; + editedCabalFile = "1j7p9smyfmkayx6n7inssxcg9cr4zdm6329fpvba7504b96aprdk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35504,8 +35465,8 @@ self: { }: mkDerivation { pname = "aura"; - version = "3.2.3"; - sha256 = "1gq4nkwil64h4armg39vbl3wjsbnqsa0vg5b41kq19dp9rmpfsp5"; + version = "3.2.4"; + sha256 = "0d3v3kpy4acd7pyysy5dw25b4154v7jwgydipmrczfxicrf02aa0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36601,8 +36562,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime-wai"; - version = "2.0.0"; - sha256 = "1m95hcfl72v9rrks0clzrz3md35jsk5jgc5ds81vrknzxr0b0fgj"; + version = "2.0.1"; + sha256 = "13h0cxmxzr7bgma1ry1yj9dhqzqvh5sgzv6nqyvb0xy8n3gysbcn"; libraryHaskellDepends = [ aeson aws-lambda-haskell-runtime base binary bytestring case-insensitive http-types iproute network text @@ -38471,8 +38432,8 @@ self: { pname = "basement"; version = "0.0.11"; sha256 = "0srlws74yiraqaapgcjd9p5d1fwb3zr9swcz74jpjm55fls2nn37"; - revision = "2"; - editedCabalFile = "1l95bzmn23cmx386hk3d3r0ykdaibh9rp489lcnba5g56kiy4hxg"; + revision = "3"; + editedCabalFile = "1indgsrk0yhkbqlxj39qqb5xqicwkmcliggb8wn87vgfswxpi1dn"; libraryHaskellDepends = [ base ghc-prim ]; description = "Foundation scrap box of array & string"; license = lib.licenses.bsd3; @@ -40476,6 +40437,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-generic-combinators" = callPackage + ({ mkDerivation, base, binary, generic-arbitrary, hspec, QuickCheck + }: + mkDerivation { + pname = "binary-generic-combinators"; + version = "0.4.2.0"; + sha256 = "1z1ngjcssb0nrkyd1chklmv19xf2qz7vqh2idsvkxa67ryp5g4a3"; + libraryHaskellDepends = [ base binary QuickCheck ]; + testHaskellDepends = [ + base binary generic-arbitrary hspec QuickCheck + ]; + description = "Combinators and utilities to make Generic-based deriving of Binary easier and more expressive"; + license = lib.licenses.bsd3; + }) {}; + "binary-ieee754" = callPackage ({ mkDerivation, array, base, binary }: mkDerivation { @@ -40784,8 +40760,8 @@ self: { pname = "binary-tagged"; version = "0.3"; sha256 = "1bvzwhdjxxr7b3lk23rwcygi34d6a5mairi2j2gh7k3p8983fgss"; - revision = "1"; - editedCabalFile = "1swaxiyz16wmsi0qdm9nfs56ld37hg9vqp73j3lvdq84f1s0ck2l"; + revision = "2"; + editedCabalFile = "0h397jzajqiw01nf7fkjmqzsmzd08d1z6f9ff2rvcj4s6wsqkik8"; libraryHaskellDepends = [ array base base16-bytestring binary bytestring containers structured tagged @@ -43581,6 +43557,8 @@ self: { pname = "blaze-html"; version = "0.9.1.2"; sha256 = "0k1r1hddjgqighazcazxrx6xfhvy2gm8il8l82ainv3cai13yl30"; + revision = "1"; + editedCabalFile = "0wvlfb3rd9cm3p894p5rl9kggrsr5da3n8x9ydrbagx91yvkxns9"; libraryHaskellDepends = [ base blaze-builder blaze-markup bytestring text ]; @@ -43664,23 +43642,6 @@ self: { }) {}; "blaze-markup" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "blaze-markup"; - version = "0.8.2.7"; - sha256 = "1r4fij8qs1z4dfrh6cjzjbnx9f3jyx01zgj15wvy961d8bnqjr4b"; - libraryHaskellDepends = [ base blaze-builder bytestring text ]; - testHaskellDepends = [ - base blaze-builder bytestring containers HUnit QuickCheck tasty - tasty-hunit tasty-quickcheck text - ]; - description = "A blazingly fast markup combinator library for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "blaze-markup_0_8_2_8" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text }: @@ -43695,7 +43656,6 @@ self: { ]; description = "A blazingly fast markup combinator library for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "blaze-shields" = callPackage @@ -48851,8 +48811,6 @@ self: { ]; description = "Utilities to work with cabal-install files"; license = "GPL-2.0-or-later AND BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cabal-lenses" = callPackage @@ -50254,8 +50212,8 @@ self: { }: mkDerivation { pname = "camfort"; - version = "1.0"; - sha256 = "1lgsn1jin57677j8xia7ga4pdvs0yrs9spdmm9rbncxcz5c3nf52"; + version = "1.0.1"; + sha256 = "1jwlkrf4aja71sbxxlxsd7syh6sb4vgv2pb18mvj5ppm6al2ykp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52033,8 +51991,8 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.4.13"; - sha256 = "1sak0rg9gydcwk7ahx51czp3akispxrkkfgq94n6hgg3dqvm646l"; + version = "0.4.14"; + sha256 = "1hczhvqqpx8kqg90h5qb2vjindn4crxmq6lwbj8ix45fnkijv4xg"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -54861,32 +54819,6 @@ self: { }) {}; "citeproc" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring - , case-insensitive, containers, data-default, Diff, directory - , file-embed, filepath, mtl, pandoc-types, pretty, rfc5051, safe - , scientific, text, timeit, transformers, uniplate, vector - , xml-conduit - }: - mkDerivation { - pname = "citeproc"; - version = "0.3.0.7"; - sha256 = "03cc3d7a1rf3k23150b19y4mx1c6vk53l9c59vv9npf39id33g7s"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring case-insensitive containers - data-default file-embed filepath pandoc-types rfc5051 safe - scientific text transformers uniplate vector xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath mtl pretty - text timeit transformers - ]; - description = "Generates citations and bibliography from CSL styles"; - license = lib.licenses.bsd2; - }) {}; - - "citeproc_0_3_0_8" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, containers, data-default, Diff, directory , file-embed, filepath, mtl, pandoc-types, pretty, rfc5051, safe @@ -54910,7 +54842,6 @@ self: { ]; description = "Generates citations and bibliography from CSL styles"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "citeproc-hs" = callPackage @@ -55293,6 +55224,38 @@ self: { broken = true; }) {}; + "clash-ghc_1_4_0" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, Cabal + , clash-lib, clash-prelude, concurrent-supply, containers, deepseq + , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim + , ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp + , lens, mtl, primitive, process, reflection, split + , template-haskell, text, time, transformers, uniplate, unix + , unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "clash-ghc"; + version = "1.4.0"; + sha256 = "18nm5x6rk69pd506yqp4pwp1i56x81bb56ly9x7adkmjk7j3l6y2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bifunctors bytestring Cabal clash-lib clash-prelude + concurrent-supply containers deepseq directory exceptions extra + filepath ghc ghc-boot ghc-prim ghc-typelits-extra + ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable + haskeline integer-gmp lens mtl primitive process reflection split + template-haskell text time transformers uniplate unix + unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ base ]; + description = "Clash: a functional hardware description language - GHC frontend"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "clash-lib" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary , bytestring, clash-prelude, concurrent-supply, containers @@ -55332,6 +55295,50 @@ self: { broken = true; }) {}; + "clash-lib_1_4_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array + , attoparsec, base, base16-bytestring, binary, bytestring + , clash-prelude, concurrent-supply, containers, cryptohash-sha256 + , data-binary-ieee754, data-default, deepseq, directory, dlist + , errors, exceptions, extra, filepath, ghc, ghc-boot-th + , ghc-typelits-knownnat, hashable, haskell-src-exts + , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl + , ordered-containers, parsers, pretty-show, prettyprinter + , primitive, process, quickcheck-text, reducers, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, terminal-size + , text, text-show, time, transformers, trifecta + , unordered-containers, utf8-string, vector + , vector-binary-instances + }: + mkDerivation { + pname = "clash-lib"; + version = "1.4.0"; + sha256 = "1i0zmz26p35hfp89s45s6g7x2rvhyjc3lrx35r06cnllw6xvp60z"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal array attoparsec base + base16-bytestring binary bytestring clash-prelude concurrent-supply + containers cryptohash-sha256 data-binary-ieee754 data-default + deepseq directory dlist errors exceptions extra filepath ghc + ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate + lens mtl ordered-containers parsers pretty-show prettyprinter + primitive process reducers template-haskell temporary terminal-size + text text-show time transformers trifecta unordered-containers + utf8-string vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson aeson-pretty base base16-bytestring bytestring clash-prelude + concurrent-supply containers data-default deepseq ghc + ghc-typelits-knownnat haskell-src-exts lens pretty-show + quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell + text transformers unordered-containers + ]; + description = "Clash: a functional hardware description language - As a library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "clash-multisignal" = callPackage ({ mkDerivation, base, clash-prelude, deepseq , ghc-typelits-knownnat, QuickCheck @@ -55388,6 +55395,48 @@ self: { broken = true; }) {}; + "clash-prelude_1_4_0" = callPackage + ({ mkDerivation, array, arrows, base, bifunctors, binary + , bytestring, Cabal, cabal-doctest, constraints, containers + , criterion, data-binary-ieee754, data-default-class, deepseq + , doctest, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, half, hashable, hedgehog, hint + , integer-gmp, interpolate, lens, QuickCheck + , quickcheck-classes-base, recursion-schemes, reflection + , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck + , tasty-th, template-haskell, text, text-show, th-abstraction + , th-lift, th-orphans, time, transformers, type-errors, uniplate + , vector + }: + mkDerivation { + pname = "clash-prelude"; + version = "1.4.0"; + sha256 = "168gjdjj9v69gr4d44njly70qr30nz3z4gfdy4nd4pay377i6vlw"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array arrows base bifunctors binary bytestring constraints + containers data-binary-ieee754 data-default-class deepseq ghc-prim + ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise + half hashable integer-gmp interpolate lens QuickCheck + recursion-schemes reflection singletons template-haskell text + text-show th-abstraction th-lift th-orphans time transformers + type-errors uniplate vector + ]; + testHaskellDepends = [ + base deepseq doctest ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base + tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th + template-haskell + ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "Clash: a functional hardware description language - Prelude library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "clash-prelude-quickcheck" = callPackage ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { @@ -57539,8 +57588,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.17"; - sha256 = "1x289bmzrj1yrr934b51v3amldhjdanjv4kxnay89n8avix899yw"; + version = "0.1.3.18"; + sha256 = "1xyri98rlg4ph9vyjicivq8vb1kk085pbpv43ydw6qvpqlp97wk5"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -58053,8 +58102,8 @@ self: { }: mkDerivation { pname = "coinbase-pro"; - version = "0.9.0.0"; - sha256 = "1wnjpm49gy75nl3m01bablchbk7clsgf4x53xqx5k2bsvn1xd1n1"; + version = "0.9.2.0"; + sha256 = "0x7wmm123rf7zk9802bymx1b9pbsnmzhkabyacwini01gb56bwxy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60869,34 +60918,6 @@ self: { }) {}; "conduit" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, gauge, hspec, kan-extensions - , mono-traversable, mtl, mwc-random, primitive, QuickCheck - , resourcet, safe, silently, split, text, transformers, unix - , unliftio, unliftio-core, vector - }: - mkDerivation { - pname = "conduit"; - version = "1.3.4"; - sha256 = "1w30chhqryhkv82mvwqi1q09fvfxva70280q3nf4h97amld860lz"; - libraryHaskellDepends = [ - base bytestring directory exceptions filepath mono-traversable mtl - primitive resourcet text transformers unix unliftio-core vector - ]; - testHaskellDepends = [ - base bytestring containers directory exceptions filepath hspec - mono-traversable mtl QuickCheck resourcet safe silently split text - transformers unliftio vector - ]; - benchmarkHaskellDepends = [ - base containers deepseq gauge hspec kan-extensions mwc-random - transformers vector - ]; - description = "Streaming data processing library"; - license = lib.licenses.mit; - }) {}; - - "conduit_1_3_4_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, gauge, hspec, kan-extensions , mono-traversable, mtl, mwc-random, primitive, QuickCheck @@ -60922,7 +60943,6 @@ self: { ]; description = "Streaming data processing library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "conduit-algorithms" = callPackage @@ -61423,25 +61443,6 @@ self: { }) {}; "conferer" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , filepath, hspec, QuickCheck, text - }: - mkDerivation { - pname = "conferer"; - version = "1.0.0.1"; - sha256 = "0cfn6aj265qs1qk5z942g5l2cz2gsj35bapxynj4c90wjl89wz5r"; - libraryHaskellDepends = [ - base bytestring containers directory filepath text - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory filepath hspec - QuickCheck text - ]; - description = "Configuration management library"; - license = lib.licenses.mpl20; - }) {}; - - "conferer_1_1_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , filepath, hspec, QuickCheck, text }: @@ -61458,30 +61459,9 @@ self: { ]; description = "Configuration management library"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "conferer-aeson" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer - , directory, hspec, text, unordered-containers, vector - }: - mkDerivation { - pname = "conferer-aeson"; - version = "1.0.0.0"; - sha256 = "0adqblmpbyqfqybgmjnnwsnaxw8qiqvw5c2bj4avsikz7fhcp0nl"; - libraryHaskellDepends = [ - aeson base bytestring conferer directory text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson aeson-qq base bytestring conferer directory hspec text - unordered-containers vector - ]; - description = "conferer's source for reading json files"; - license = lib.licenses.mpl20; - }) {}; - - "conferer-aeson_1_1_0_0" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer , directory, hspec, text, unordered-containers, vector }: @@ -61489,6 +61469,8 @@ self: { pname = "conferer-aeson"; version = "1.1.0.0"; sha256 = "0kslxj2wcycygj07x7v06fcx2i47dwp96da9djws6mjdmr1a9i96"; + revision = "1"; + editedCabalFile = "1ic6nichx1c3s7fnr2q90hzm1qykg8rkqfwl2k5yhhwb1fdnhb6q"; libraryHaskellDepends = [ aeson base bytestring conferer directory text unordered-containers vector @@ -61499,7 +61481,6 @@ self: { ]; description = "conferer's source for reading json files"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "conferer-dhall" = callPackage @@ -61510,6 +61491,8 @@ self: { pname = "conferer-dhall"; version = "1.1.0.0"; sha256 = "0whxxjz5askw1qxcxdn5094bqm2hy3zp49567v57gqikgv6rcnp1"; + revision = "1"; + editedCabalFile = "1bbc5a3iy5fcp7ahxndhfg8v0sk74q0hs00miiv8gqg7f3l5b20j"; libraryHaskellDepends = [ base bytestring conferer conferer-aeson dhall dhall-json directory text @@ -61528,8 +61511,8 @@ self: { ({ mkDerivation, base, conferer, hedis, hspec, text }: mkDerivation { pname = "conferer-hedis"; - version = "1.0.0.0"; - sha256 = "0x150z08x1grzr80fdpkbxprldn08908fgz2mpg3qg219nx4r5n2"; + version = "1.1.0.0"; + sha256 = "10rk5w3f99ql46yvzg7a0ac59dvpyfhdpv138w0w5ghgz5azcd19"; libraryHaskellDepends = [ base conferer hedis text ]; testHaskellDepends = [ base conferer hedis hspec text ]; description = "conferer's FromConfig instances for hedis settings"; @@ -61540,8 +61523,8 @@ self: { ({ mkDerivation, base, conferer, hspec, hspec-core, text }: mkDerivation { pname = "conferer-hspec"; - version = "1.0.0.0"; - sha256 = "02c4z2999pa04r78n8xzx7idvgg028wlb2fgyk0878wb1gahzsxp"; + version = "1.1.0.0"; + sha256 = "0q9v26df3c2rxll6rk2zmmd9yrpqz1j1wdp59qlw2s6c2w7dxq35"; libraryHaskellDepends = [ base conferer hspec-core text ]; testHaskellDepends = [ base conferer hspec hspec-core text ]; description = "conferer's FromConfig instances for hspec Config"; @@ -61620,6 +61603,8 @@ self: { pname = "conferer-snap"; version = "1.0.0.0"; sha256 = "15gz77b5jf35hmcnd6kza1wgzpbgk3pcvhi7mp7yk64ybksld98r"; + revision = "1"; + editedCabalFile = "08bji5mw7lzxpx9s1mlim5nfcz7j6828zj75pn670jfip0in4j19"; libraryHaskellDepends = [ base conferer snap-core snap-server text ]; @@ -61698,8 +61683,8 @@ self: { }: mkDerivation { pname = "conferer-warp"; - version = "1.0.0.0"; - sha256 = "14wrd50dfgc2m6lyfvsx4w605r8krf6ha96j3685vgy6fylff1bd"; + version = "1.1.0.0"; + sha256 = "0zbgxq229jr7xwzw6q20rwnslbci07b1vk324izm8hxcp3kb76mj"; libraryHaskellDepends = [ base conferer http-types text wai warp ]; testHaskellDepends = [ base conferer hspec http-types text wai warp @@ -61714,6 +61699,8 @@ self: { pname = "conferer-yaml"; version = "1.1.0.0"; sha256 = "0pqxwwaskj96virs65p7cb6shkjbczmnqwla7rbfga2l0rw9ww0r"; + revision = "1"; + editedCabalFile = "0lw22wp8ivza6inm17pbjvr9mwj6p778wn6w6975hb8gf3wa8grf"; libraryHaskellDepends = [ base conferer conferer-aeson yaml ]; testHaskellDepends = [ base conferer conferer-aeson hspec yaml ]; description = "Configuration for reading yaml files"; @@ -61837,10 +61824,10 @@ self: { }: mkDerivation { pname = "config-schema"; - version = "1.2.1.0"; - sha256 = "1p5nhvhq7q5s67l4h4zb19ali5jbxrz9mb5cwzhykqmqji56n5vf"; + version = "1.2.2.0"; + sha256 = "10mp76j2gxcb51865lb6cf3nkc2nc7fwarkghb6yz71q6sbrg3yx"; revision = "1"; - editedCabalFile = "056iks8k9lhbv34pqk8nisqc7vwzqq0shknixbpkd3vgbd3yksyf"; + editedCabalFile = "0wswgb6m2whyxddm214fbrq69d9i2wrr6j2hhq1dn8p3gx91q3kv"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -62616,8 +62603,8 @@ self: { }: mkDerivation { pname = "construct"; - version = "0.3"; - sha256 = "06h3b1lbq0gdpzz2q5ga0dpgbvyh186z1brzslrwdmkp8qxx883x"; + version = "0.3.0.1"; + sha256 = "09x70cvfvkl2rw3r850whw3rbc47yp2w66qmfjzdd9fki31612kc"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -63710,15 +63697,14 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.2"; - sha256 = "1d1b70kal17aiflhvzz59ahc6iyyln3d70xvhjjjh7j7la03xm8h"; + version = "3.2.1"; + sha256 = "1gxa2sc6n7hswkzqrr9dzzgwynw7sdvccyigfhm7gcy1l79gl3iq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base copilot-c99 copilot-core copilot-language copilot-libraries copilot-theorem directory filepath optparse-applicative ]; - executableHaskellDepends = [ base copilot-c99 copilot-libraries ]; description = "A stream DSL for writing embedded C programs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -63733,8 +63719,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.2"; - sha256 = "0q0v8xwmcbvi2yvz0nn1kc3ms0i3g74f2k66gwhnznnvldr99qh2"; + version = "3.2.1"; + sha256 = "0wi4bd0hmh05z6m7mjl69z1arhnw08v75hnwzxl6dibkrymmq286"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty @@ -63771,8 +63757,8 @@ self: { ({ mkDerivation, base, dlist, mtl, pretty }: mkDerivation { pname = "copilot-core"; - version = "3.2"; - sha256 = "0l13zqycini9fkiy90i0dzi831lqv8lwpdk0dzrk9r0c545iy2ga"; + version = "3.2.1"; + sha256 = "1h9wqv75s49vvqagcdkxx8n5vwn0fsh271v2jm60msssdd7ljwp6"; libraryHaskellDepends = [ base dlist mtl pretty ]; description = "An intermediate representation for Copilot"; license = lib.licenses.bsd3; @@ -63784,8 +63770,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.2"; - sha256 = "1vx2i20ndphcb7gl252wnk2bim2dcg3552yfa0rpkh8axkiwmnpa"; + version = "3.2.1"; + sha256 = "03r50k3i24rzjkc1maklq7351flzjv3cc2i6d1shib3dklzjsw8l"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify ghc-prim mtl @@ -63802,8 +63788,8 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "3.2"; - sha256 = "0sjl6bk2fzba2zj0m41si0i2jr8pcwf96zc1vscwmhfg48hqxjg1"; + version = "3.2.1"; + sha256 = "1grcpc9lmqvsi3cb9j45w6hvqdljv7z0yylxf3i2i5y931gj6gpv"; libraryHaskellDepends = [ array base containers copilot-language data-reify mtl parsec ]; @@ -63831,17 +63817,19 @@ self: { }) {}; "copilot-theorem" = callPackage - ({ mkDerivation, ansi-terminal, base, bimap, containers - , copilot-core, data-default, directory, mtl, parsec, pretty - , process, random, transformers, xml + ({ mkDerivation, ansi-terminal, base, bimap, bv-sized, containers + , copilot-core, data-default, directory, filepath, mtl, panic + , parameterized-utils, parsec, pretty, process, random + , transformers, what4, xml }: mkDerivation { pname = "copilot-theorem"; - version = "3.2"; - sha256 = "1l0vmxlrygvxq23nvjss8x53qlfhbshp5vlh3cs6mviv1hmpbg7v"; + version = "3.2.1"; + sha256 = "1vns5bavlm95hc57qwwjpzaq0xj5pv3dk2n1ac0rbjdbpsa3dl4l"; libraryHaskellDepends = [ - ansi-terminal base bimap containers copilot-core data-default - directory mtl parsec pretty process random transformers xml + ansi-terminal base bimap bv-sized containers copilot-core + data-default directory filepath mtl panic parameterized-utils + parsec pretty process random transformers what4 xml ]; description = "k-induction for Copilot"; license = lib.licenses.bsd3; @@ -65711,8 +65699,8 @@ self: { pname = "crypt-sha512"; version = "0"; sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2"; - revision = "4"; - editedCabalFile = "0a4282bhh21l7vk79hpgcz7kj9n05r0ilgdksjkimkydg7sxgldb"; + revision = "5"; + editedCabalFile = "0gyfz45izn6s7syd028bbwczp4a8qfhbkbvpir5ssfhqbql4qsv1"; libraryHaskellDepends = [ attoparsec base bytestring cryptohash-sha512 ]; @@ -66815,8 +66803,8 @@ self: { }: mkDerivation { pname = "css-selectors"; - version = "0.2.0.0"; - sha256 = "1wyc06f14nj5v5ysjly3jimja3y47pvnm8vm2knlw3sli1h0pgxi"; + version = "0.2.1.0"; + sha256 = "1kcxbvp96imhkdrd7w9g2z4d586lmdcpnbgl8g5w04ri85qsq162"; libraryHaskellDepends = [ aeson array base blaze-markup data-default Decimal QuickCheck shakespeare template-haskell text @@ -72128,28 +72116,6 @@ self: { }) {}; "deferred-folds" = callPackage - ({ mkDerivation, base, bytestring, containers, foldl, hashable - , primitive, QuickCheck, quickcheck-instances, rerebase, tasty - , tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "deferred-folds"; - version = "0.9.16"; - sha256 = "0727pknxn5vib9ri7h39d6gbqxgczqcfdmqaqj9i0lv6wbwn5ar1"; - libraryHaskellDepends = [ - base bytestring containers foldl hashable primitive text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Abstractions over deferred folds"; - license = lib.licenses.mit; - }) {}; - - "deferred-folds_0_9_17" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable , primitive, QuickCheck, quickcheck-instances, rerebase, tasty , tasty-hunit, tasty-quickcheck, text, transformers @@ -72169,7 +72135,6 @@ self: { ]; description = "Abstractions over deferred folds"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "definitive-base" = callPackage @@ -74328,8 +74293,6 @@ self: { doHaddock = false; description = "Embedded domain-specific language for declarative vector graphics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-boolean" = callPackage @@ -74474,8 +74437,6 @@ self: { ]; description = "Collection of user contributions to diagrams EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-core" = callPackage @@ -74495,8 +74456,6 @@ self: { ]; description = "Core libraries for diagrams EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-graphviz" = callPackage @@ -74633,8 +74592,6 @@ self: { benchmarkHaskellDepends = [ base criterion diagrams-core ]; description = "Embedded domain-specific language for declarative graphics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-pandoc" = callPackage @@ -74722,8 +74679,6 @@ self: { ]; description = "Postscript backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-qrcode" = callPackage @@ -74836,8 +74791,6 @@ self: { ]; description = "SVG backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-tikz" = callPackage @@ -76005,8 +75958,8 @@ self: { pname = "directory"; version = "1.3.6.1"; sha256 = "00cr2sshzjmn57rpvjj8wvgr60x2mk8c7w1nd40wxqs8s9xaa1bi"; - revision = "1"; - editedCabalFile = "1rf2w9gx0vy74mgsf5q1y82bhm5ngb9mi0i2v2h6ss9gscyvgb7j"; + revision = "2"; + editedCabalFile = "14kwmqa1pf1bij7qang5aihw38ch7m5prsics0p0y72jkxx98y48"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -78357,8 +78310,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Generate driver file for doctest's cabal integration"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "doctest-exitcode-stdio" = callPackage @@ -79845,20 +79796,20 @@ self: { "dsv" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cassava, containers - , doctest, foldl, hedgehog, pipes, pipes-bytestring, pipes-safe + , foldl, hedgehog, pipes, pipes-bytestring, pipes-safe , safe-exceptions, template-haskell, text, validation, vector }: mkDerivation { pname = "dsv"; - version = "1.0.0.0"; - sha256 = "0fjfpa8qfaiy7wxmq9lsacxywrsqahl8s8wamxfiai7mzq2201gn"; + version = "1.0.0.1"; + sha256 = "1lf6fan0mis0hs30yfpslfyj0gpk028z24wca3lylq877pq7z6nz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring cassava containers foldl pipes pipes-bytestring pipes-safe template-haskell text validation vector ]; testHaskellDepends = [ - base bytestring containers doctest foldl hedgehog safe-exceptions + base bytestring containers foldl hedgehog pipes safe-exceptions text vector ]; description = "DSV (delimiter-separated values)"; @@ -80014,8 +79965,6 @@ self: { ]; description = "Rose trees with cached and accumulating monoidal annotations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dualizer" = callPackage @@ -88484,8 +88433,6 @@ self: { ]; description = "Library for producing fake data"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fakedata-parser" = callPackage @@ -88513,8 +88460,6 @@ self: { ]; description = "Fake a -> Gen a"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fakefs" = callPackage @@ -88565,8 +88510,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.0.2.0"; - sha256 = "1i16g4sj5qrbyldyylggcammr2fs0dvi9hc986ijpv3iy0ryqkmw"; + version = "1.0.2.1"; + sha256 = "0n1pcchzb5bxhykdjdri84g0hnbrzd76brpqqx8f6yhwll5vaxsq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89740,27 +89685,25 @@ self: { }) {}; "feed" = callPackage - ({ mkDerivation, base, base-compat, bytestring, HUnit - , markdown-unlit, old-locale, old-time, safe, syb, test-framework - , test-framework-hunit, text, time, time-locale-compat, utf8-string - , xml-conduit, xml-types + ({ mkDerivation, base, base-compat, bytestring, doctest + , doctest-driver-gen, HUnit, markdown-unlit, old-locale, old-time + , safe, syb, test-framework, test-framework-hunit, text, time + , time-locale-compat, utf8-string, xml-conduit, xml-types }: mkDerivation { pname = "feed"; - version = "1.3.0.1"; - sha256 = "0fdylvbrjlshgx398xpxx3y7mnrmpi1l2534mcv299afpm91yqcj"; - revision = "1"; - editedCabalFile = "0wlffsawz87ks8zf686q01qvcwzi3352l45f1yww5w063ih6j7ld"; + version = "1.3.2.0"; + sha256 = "0kv3vx3njqlhwvkmf12m1gmwl8jj97kfa60da2362vwdavhcf4dk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring old-locale old-time safe text time time-locale-compat utf8-string xml-conduit xml-types ]; testHaskellDepends = [ - base base-compat HUnit old-time syb test-framework - test-framework-hunit text time xml-conduit xml-types + base base-compat doctest doctest-driver-gen HUnit old-time syb + test-framework test-framework-hunit text time xml-conduit xml-types ]; - testToolDepends = [ markdown-unlit ]; + testToolDepends = [ doctest-driver-gen markdown-unlit ]; description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; license = lib.licenses.bsd3; }) {}; @@ -90680,8 +90623,8 @@ self: { pname = "file-embed-lzma"; version = "0"; sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78"; - revision = "5"; - editedCabalFile = "1rkya7m491b3asfhpygwz97gzfh46f9h1bi6b4isbslpj50k2h6l"; + revision = "6"; + editedCabalFile = "0m2ay6krrjs2cgmy7divlavx0wvgwhwgba97f1m3ppcxxm1y4ikv"; libraryHaskellDepends = [ base base-compat bytestring directory filepath lzma template-haskell text th-lift-instances transformers @@ -91550,16 +91493,14 @@ self: { }) {}; "first-class-families" = callPackage - ({ mkDerivation, base, doctest, Glob }: + ({ mkDerivation, base }: mkDerivation { pname = "first-class-families"; - version = "0.8.0.0"; - sha256 = "190jl3vs7glkbm8ap90x9yzlj01yzxd818s3i0w4pz21b6d6sxav"; - revision = "1"; - editedCabalFile = "02z6wixk9kdgshxsz99lag29lb70kadg9wn6vsgk906wj014fv52"; + version = "0.8.0.1"; + sha256 = "0wnsq69f2br9h9hnf8sx41pchwjag86hb41ivjl7wx81psyqy72a"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - description = "First class type families"; + testHaskellDepends = [ base ]; + description = "First-class type families"; license = lib.licenses.mit; }) {}; @@ -91766,6 +91707,24 @@ self: { broken = true; }) {}; + "fix-whitespace" = callPackage + ({ mkDerivation, base, directory, extra, filepath, filepattern + , text, yaml + }: + mkDerivation { + pname = "fix-whitespace"; + version = "0.0.5"; + sha256 = "1774h18dqarkbsdq47cx1zrxx0k1a7asxngz85yz5vrc2aa37hy7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory extra filepath filepattern text yaml + ]; + description = "Fixes whitespace issues"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "fixed" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -92757,10 +92716,8 @@ self: { }: mkDerivation { pname = "flock"; - version = "0.3.1.8"; - sha256 = "1g1gf7qnlqkl57h28nzxnbzj7v2h73czffp5y7s7jm9vbihcwd4n"; - revision = "6"; - editedCabalFile = "04cz4avwglnjgmsbkaadlfrzaadcfkcqzrbc4x9nbzi695zs8k21"; + version = "0.3.2"; + sha256 = "0zi04gmrjda11zp8y7zx6r9hkz00wplvjj7sn6q7lbm2h5kv20xr"; libraryHaskellDepends = [ base lifted-base monad-control transformers unix ]; @@ -93928,8 +93885,6 @@ self: { ]; description = "Simple force-directed layout"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fordo" = callPackage @@ -99901,6 +99856,32 @@ self: { license = lib.licenses.mit; }) {}; + "genvalidity-persistent" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, genvalidity + , genvalidity-containers, genvalidity-criterion, genvalidity-hspec + , hspec, persistent, persistent-template, QuickCheck + , validity-containers, validity-persistent + }: + mkDerivation { + pname = "genvalidity-persistent"; + version = "0.0.0.0"; + sha256 = "01gnwvfa1hlyr35rafvdb9rz8axbnqw7nl182wf6j4pjy40iff17"; + libraryHaskellDepends = [ + base containers genvalidity genvalidity-containers persistent + QuickCheck validity-containers validity-persistent + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec persistent + persistent-template QuickCheck validity-containers + ]; + benchmarkHaskellDepends = [ + base criterion deepseq genvalidity genvalidity-criterion persistent + persistent-template + ]; + description = "GenValidity support for Persistent"; + license = lib.licenses.mit; + }) {}; + "genvalidity-property" = callPackage ({ mkDerivation, base, directory, doctest, filepath, genvalidity , hspec, pretty-show, QuickCheck, validity @@ -99935,6 +99916,107 @@ self: { license = lib.licenses.mit; }) {}; + "genvalidity-sydtest" = callPackage + ({ mkDerivation, base, genvalidity, pretty-show, QuickCheck + , sydtest, sydtest-discover, validity + }: + mkDerivation { + pname = "genvalidity-sydtest"; + version = "0.0.0.0"; + sha256 = "1jgrhdjxin1zwgf2b03fpcfivyq30idnh2qcw3604bsq5cn0wca0"; + libraryHaskellDepends = [ + base genvalidity pretty-show QuickCheck sydtest validity + ]; + testHaskellDepends = [ base genvalidity QuickCheck sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "Standard properties for functions on `Validity` types for the sydtest framework"; + license = lib.licenses.mit; + }) {}; + + "genvalidity-sydtest-aeson" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, genvalidity + , genvalidity-aeson, genvalidity-sydtest, genvalidity-text + , QuickCheck, sydtest, sydtest-discover, text, validity + }: + mkDerivation { + pname = "genvalidity-sydtest-aeson"; + version = "0.0.0.0"; + sha256 = "1lpiinb06hl8y91nxp4n4id2vyxs3yww5wb5jczpr9fk1fbb6qbz"; + libraryHaskellDepends = [ + aeson base bytestring deepseq genvalidity genvalidity-sydtest + QuickCheck sydtest + ]; + testHaskellDepends = [ + aeson base genvalidity genvalidity-aeson genvalidity-sydtest + genvalidity-text QuickCheck sydtest text validity + ]; + testToolDepends = [ sydtest-discover ]; + description = "Standard spec's for aeson-related instances in sydtest"; + license = lib.licenses.mit; + }) {}; + + "genvalidity-sydtest-hashable" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-sydtest, hashable + , QuickCheck, sydtest, sydtest-discover, validity + }: + mkDerivation { + pname = "genvalidity-sydtest-hashable"; + version = "0.0.0.0"; + sha256 = "0ii3s69alncyrjz410d1cvx5rgdff1cyc9ddin0xrsrz23sxi06m"; + libraryHaskellDepends = [ + base genvalidity genvalidity-sydtest hashable QuickCheck sydtest + validity + ]; + testHaskellDepends = [ + base genvalidity genvalidity-sydtest hashable QuickCheck sydtest + validity + ]; + testToolDepends = [ sydtest-discover ]; + description = "Standard spec's for Hashable instances for sydtest"; + license = lib.licenses.mit; + }) {}; + + "genvalidity-sydtest-lens" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-sydtest, microlens + , QuickCheck, sydtest, sydtest-discover, validity + }: + mkDerivation { + pname = "genvalidity-sydtest-lens"; + version = "0.0.0.0"; + sha256 = "1f8wb0pa703r6hgdbhi343rfjcf2q78qfn6x3dmc94d3vd17wyvj"; + libraryHaskellDepends = [ + base genvalidity genvalidity-sydtest microlens QuickCheck sydtest + ]; + testHaskellDepends = [ + base genvalidity genvalidity-sydtest microlens sydtest validity + ]; + testToolDepends = [ sydtest-discover ]; + description = "Standard spec's for lens for sydtest"; + license = lib.licenses.mit; + }) {}; + + "genvalidity-sydtest-persistent" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-sydtest + , genvalidity-text, persistent, QuickCheck, sydtest + , sydtest-discover, text, validity + }: + mkDerivation { + pname = "genvalidity-sydtest-persistent"; + version = "0.0.0.1"; + sha256 = "07y7478lcmpb44bwj7pppv4pfb44wh9hynwawx1czkjf6jnggwcm"; + libraryHaskellDepends = [ + base genvalidity genvalidity-sydtest persistent QuickCheck sydtest + text + ]; + testHaskellDepends = [ + base genvalidity genvalidity-sydtest genvalidity-text persistent + QuickCheck sydtest text validity + ]; + testToolDepends = [ sydtest-discover ]; + description = "Standard spec's for persistent-related instances for sydtest"; + license = lib.licenses.mit; + }) {}; + "genvalidity-text" = callPackage ({ mkDerivation, array, base, criterion, genvalidity , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck @@ -100749,6 +100831,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-events_0_16_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers, text + , vector + }: + mkDerivation { + pname = "ghc-events"; + version = "0.16.0"; + sha256 = "0cr6aj4v9j2fadwhhifjlbg4anyc05phfmy3pvd9h7gn12a2ydr9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers text vector + ]; + executableHaskellDepends = [ base containers ]; + testHaskellDepends = [ base ]; + description = "Library and tool for parsing .eventlog files from GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-events-analyze" = callPackage ({ mkDerivation, base, blaze-svg, bytestring, containers , diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens @@ -101054,14 +101156,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_9_0_0_3" = callPackage + "ghc-lib-parser-ex_9_0_0_4" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "9.0.0.3"; - sha256 = "1kc6p5ciymq8rbgk4jj1hawmjhkj1yjzkxj9jjyqlgzs09i3dsw3"; + version = "9.0.0.4"; + sha256 = "11j1k26h7px9fydrwi5x9d9ckivc4xdsw4gzb7xhpzdq60f8af66"; libraryHaskellDepends = [ base bytestring containers ghc-lib-parser uniplate ]; @@ -101507,6 +101609,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-syntax-highlighter_0_0_7_0" = callPackage + ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text + }: + mkDerivation { + pname = "ghc-syntax-highlighter"; + version = "0.0.7.0"; + sha256 = "123kvcdlzx18n14122xbpp587byfd8w0z886grlxkzinb53bmzg6"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ghc-lib-parser text ]; + testHaskellDepends = [ base hspec text ]; + testToolDepends = [ hspec-discover ]; + description = "Syntax highlighter for Haskell using lexer of GHC itself"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-tags-core" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cpphs, criterion , deepseq, directory, filepath, filepath-bytestring, ghc, lattices @@ -101957,68 +102075,6 @@ self: { }) {}; "ghcide" = callPackage - ({ mkDerivation, aeson, array, async, base, base16-bytestring - , binary, bytestring, case-insensitive, containers, cryptohash-sha1 - , data-default, deepseq, 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, haskell-lsp, haskell-lsp-types - , heapsize, hie-bios, hie-compat, hls-plugin-api, hp2pretty - , hslogger, implicit-hie-cradle, lens, lsp-test, 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, stm, syb, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unordered-containers - , utf8-string, vector, yaml - }: - mkDerivation { - pname = "ghcide"; - version = "0.7.3.0"; - sha256 = "0iak2bwkp0x66cl9axcxq00vmf4yn6y0h8ih4wq6mnavmplbyi3b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array async base base16-bytestring binary bytestring - case-insensitive containers cryptohash-sha1 data-default deepseq - directory dlist extra filepath fingertree fuzzy ghc ghc-boot - ghc-boot-th ghc-check ghc-exactprint ghc-paths Glob haddock-library - hashable haskell-lsp haskell-lsp-types heapsize hie-bios hie-compat - hls-plugin-api hslogger implicit-hie-cradle lens mtl network-uri - opentelemetry parallel prettyprinter prettyprinter-ansi-terminal - regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake - sorted-list stm syb text time transformers unix - unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory extra - filepath gitrev hashable haskell-lsp haskell-lsp-types heapsize - hie-bios hls-plugin-api lens lsp-test 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 - haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test - network-uri optparse-applicative process QuickCheck - quickcheck-instances record-dot-preprocessor record-hasfield - rope-utf16-splay safe safe-exceptions shake tasty - tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun - text - ]; - benchmarkHaskellDepends = [ - aeson base directory filepath shake shake-bench text yaml - ]; - benchmarkToolDepends = [ hp2pretty ]; - description = "The core of an IDE"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {shake-bench = null;}; - - "ghcide_1_0_0_0" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring , binary, bytestring, bytestring-encoding, case-insensitive , containers, cryptohash-sha1, data-default, deepseq, dependent-map @@ -102079,9 +102135,7 @@ self: { benchmarkToolDepends = [ hp2pretty implicit-hie ]; description = "The core of an IDE"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {shake-bench = null;}; + }) {}; "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: @@ -103804,8 +103858,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20210223"; - sha256 = "07wxf44pdh9d1pxqympgyfbkk8vk0pqbgxma0mkadlkdr6c9z832"; + version = "8.20210310"; + sha256 = "1a4pr9z2li3wns1xycz7735nzzsv3cs8milr0q74k5qcqk5f22nx"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -105346,15 +105400,15 @@ self: { , bytestring, Cabal, config-schema, config-value, containers , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL , HUnit, irc-core, kan-extensions, lens, network, process, psqueues - , random, regex-tdfa, semigroupoids, split, stm, template-haskell - , text, time, transformers, unix, unordered-containers, vector, vty + , random, regex-tdfa, split, stm, template-haskell, text, time + , transformers, unix, unordered-containers, vector, vty }: mkDerivation { pname = "glirc"; - version = "2.37"; - sha256 = "1222dz42lyk44xgs10wwjpd2qn4l0ak3v98vj103xh535hki9ibn"; + version = "2.38"; + sha256 = "1azykkb9rc4q97v9xiqfjv0iys0wswa3nsy10smdkpp7yvv4mca7"; revision = "1"; - editedCabalFile = "19y9hhn24w6lqdwv1skijrvj5plqs3xqcz3h8wv1ax8g8ak07xsx"; + editedCabalFile = "04f35w57jq6gpi6d3d83c9bswwl724rbd0dbl835ilhl18kpfscj"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -105362,8 +105416,8 @@ self: { async attoparsec base base64-bytestring bytestring config-schema config-value containers directory filepath free gitrev hashable hookup HsOpenSSL irc-core kan-extensions lens network process - psqueues random regex-tdfa semigroupoids split stm template-haskell - text time transformers unix unordered-containers vector vty + psqueues random regex-tdfa split stm template-haskell text time + transformers unix unordered-containers vector vty ]; executableHaskellDepends = [ base lens text vty ]; testHaskellDepends = [ base HUnit ]; @@ -109208,8 +109262,8 @@ self: { }: mkDerivation { pname = "gothic"; - version = "0.1.5"; - sha256 = "1f8n15cxh4c5m3pylssfksiw3qary8jkl7wabq4gl5zqw2r9ki62"; + version = "0.1.6"; + sha256 = "0p1hc4gpgn0djvyksc9nyi4r4lqapk6x5vfv2x514szw8z11h44s"; libraryHaskellDepends = [ aeson base binary bytestring connection exceptions hashable http-client http-client-tls http-conduit http-types lens lens-aeson @@ -109497,22 +109551,22 @@ self: { }) {}; "grammatical-parsers" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, Cabal, cabal-doctest - , checkers, containers, criterion, deepseq, doctest, input-parsers + ({ mkDerivation, attoparsec, base, Cabal, cabal-doctest, checkers + , containers, criterion, deepseq, doctest, input-parsers , markdown-unlit, monoid-subclasses, parsers, QuickCheck , rank2classes, size-based, tasty, tasty-quickcheck, testing-feat - , text, transformers + , text, transformers, witherable-class }: mkDerivation { pname = "grammatical-parsers"; - version = "0.5"; - sha256 = "1kf3wwbk1skp6cm78h6fs2494597sdz82gaq5zx3cwfzgn4swmgx"; + version = "0.5.1"; + sha256 = "1y5w49bcfbadchy580q5dnkgl0k5daqykc2jhz8yai94pr43ishg"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - attoparsec base bytestring containers input-parsers - monoid-subclasses parsers rank2classes transformers + attoparsec base containers input-parsers monoid-subclasses parsers + rank2classes transformers witherable-class ]; executableHaskellDepends = [ base containers monoid-subclasses parsers rank2classes @@ -113444,8 +113498,8 @@ self: { pname = "hackage-repo-tool"; version = "0.1.1.2"; sha256 = "1zgsmibi24w2wsd828hnls1yv9lrl9xwsi2aay3d603j8mg8vd0r"; - revision = "1"; - editedCabalFile = "1x8cqmfyc168jrmvg2c8as1gj4qys10hyr71nmcyskvqrk5bsxf8"; + revision = "2"; + editedCabalFile = "1djx6x1y6d7j319ba211hl7scwh4pfyd7vrrbvhdralwnwsx5zkp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -113471,8 +113525,8 @@ self: { pname = "hackage-security"; version = "0.6.0.1"; sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli"; - revision = "4"; - editedCabalFile = "06d4xqmpqarisxlm0sp87w2z9rl62p08z5ra5swkvfwn36i9zr15"; + revision = "5"; + editedCabalFile = "0vr2fcgp3pjjnp0sy7mvbabqh92215alw62f70pjys9i4z1ks977"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -113496,6 +113550,8 @@ self: { pname = "hackage-security-HTTP"; version = "0.1.1.1"; sha256 = "14hp7gssf80b9937j7m56w8sxrv3hrzjf2s9kgfk76v6llgx79k2"; + revision = "1"; + editedCabalFile = "18b22jjg5nbfvb83yc36gy25y9v5d1p4z2n89cazzn16hlf813xk"; libraryHaskellDepends = [ base bytestring hackage-security HTTP mtl network network-uri zlib ]; @@ -113990,35 +114046,6 @@ self: { }) {}; "hadolint" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , cryptonite, directory, filepath, gitrev, hspec, HsYAML, HUnit - , language-docker, megaparsec, mtl, optparse-applicative, parallel - , ShellCheck, split, text, void - }: - mkDerivation { - pname = "hadolint"; - version = "1.22.1"; - sha256 = "0138hn6c7lrq9xjsmngdj1h2m2ayxx6wqqgjw66pv7sgxsfy0zji"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base bytestring containers cryptonite directory - filepath HsYAML language-docker megaparsec mtl parallel ShellCheck - split text void - ]; - executableHaskellDepends = [ - base containers gitrev language-docker megaparsec - optparse-applicative text - ]; - testHaskellDepends = [ - aeson base bytestring hspec HsYAML HUnit language-docker megaparsec - ShellCheck split text - ]; - description = "Dockerfile Linter JavaScript API"; - license = lib.licenses.gpl3; - }) {}; - - "hadolint_1_23_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, colourista , containers, cryptonite, deepseq, directory, filepath, gitrev , hspec, HsYAML, HUnit, ilist, language-docker, megaparsec, mtl @@ -114045,7 +114072,6 @@ self: { ]; description = "Dockerfile Linter JavaScript API"; license = lib.licenses.gpl3; - hydraPlatforms = lib.platforms.none; }) {}; "hadoop-formats" = callPackage @@ -114753,10 +114779,8 @@ self: { }: mkDerivation { pname = "hakyll-convert"; - version = "0.3.0.3"; - sha256 = "0i5g4xs0az8znisl8vm60r3m2y3s9dhh8cdb0bl8c5ikqcrlscjf"; - revision = "2"; - editedCabalFile = "0jzc6c8z173mcvrndxny5dx24mx5p10p7pkp68lkl1jl135np6bp"; + version = "0.3.0.4"; + sha256 = "09fqr05mvs0qs53psq97kn1s4axinwn1vr5d6af4sqj3zc5k6k39"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118541,49 +118565,51 @@ self: { }) {}; "haskell-language-server" = callPackage - ({ mkDerivation, aeson, base, binary, blaze-markup, brittany - , bytestring, containers, data-default, deepseq, directory, extra - , filepath, floskell, fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths - , ghcide, gitrev, hashable, haskell-lsp, hie-bios, 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-test + ({ 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, stm, stylish-haskell, tasty - , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit - , tasty-rerun, temporary, text, transformers, unordered-containers - , with-utf8, yaml + , 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 { pname = "haskell-language-server"; - version = "0.9.0.0"; - sha256 = "0wzwadmrw57dqp9mszr4nmcnrwa01kav70z0wqkh8g2ag0kv3nfm"; - revision = "7"; - editedCabalFile = "11dfc9887aq521ywm0m5gpmihvvkypkr3y1cfk6afg210ij6ka40"; + version = "1.0.0.0"; + sha256 = "0jchps7rwsbfq1fsyyf4jgxb4b11d8c3iaq2p4c5vz7vz2d6w1s3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-default directory extra filepath ghc ghcide - gitrev haskell-lsp hls-plugin-api hslogger optparse-applicative - optparse-simple process shake text unordered-containers + 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 base binary brittany bytestring containers deepseq directory - extra filepath floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths - ghcide gitrev hashable haskell-lsp hie-bios 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 - lens mtl optparse-applicative optparse-simple ormolu process - regex-tdfa safe-exceptions shake stylish-haskell temporary text - transformers unordered-containers with-utf8 + 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 + 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 ]; testHaskellDepends = [ - aeson base blaze-markup bytestring containers data-default - directory extra filepath ghcide haskell-lsp hie-bios hls-plugin-api - hslogger hspec hspec-core hspec-expectations lens lsp-test process - stm tasty tasty-ant-xml tasty-expected-failure tasty-golden + 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 ]; @@ -119439,21 +119465,21 @@ self: { "haskell-to-elm" = callPackage ({ mkDerivation, aeson, base, bound, elm-syntax, generics-sop, text - , time, unordered-containers + , time, unordered-containers, vector }: mkDerivation { pname = "haskell-to-elm"; - version = "0.3.1.0"; - sha256 = "0gplmz0s874zi8y8m06mlr3lipyffw0p6lfz6snl0sgdmynjg786"; + version = "0.3.2.0"; + sha256 = "17r1yf2xp1idpq22f67192i511w7ydpfw728f5g3fz67lbahpq3k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bound elm-syntax generics-sop text time - unordered-containers + unordered-containers vector ]; testHaskellDepends = [ aeson base bound elm-syntax generics-sop text time - unordered-containers + unordered-containers vector ]; description = "Generate Elm types and JSON encoders and decoders from Haskell types"; license = lib.licenses.bsd3; @@ -120806,8 +120832,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.17.1"; - sha256 = "07p58jf2vn7hyk260ijimg2lyg3jcsqnza8v6kjcn6rjlsvcakvp"; + version = "0.17.2"; + sha256 = "04i8016qrrwzbz8yxnppfzlrba1d86zp2j71dqd0p7lc3341caa8"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe @@ -120891,8 +120917,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.47.3"; - sha256 = "0z3rhxfnk1985lmfzajipkzajya2vrfh0p5c66kk03vysvssjzpi"; + version = "0.49.0"; + sha256 = "126krbi29jxi978my3wg8cl2gqpr0xn0fmbz6fxqcbbcwi75fa30"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120937,8 +120963,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.47.3"; - sha256 = "0i7jf832q2lv8h82sf4y3a81j8y4ipw653q32jfnxhjjbnfxccly"; + version = "0.49.0"; + sha256 = "1v9zb3m1pvhbqm6pxzy2w8ipyxnv80gw8xlsr25fj0g2ylifkjb2"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -123272,18 +123298,16 @@ self: { , 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 + , megaparsec, microlens, monad-metrics, mtl, mwc-random, network , optparse-applicative, psqueues, random, random-access-file - , scotty, stm, stm-containers, store, template-haskell, text - , text-format-heavy, unix, unix-bytestring, unordered-containers - , yaml + , random-shuffle, 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.0"; - sha256 = "17px41lgaqxpwmmj315s49hnchq5pn017k58wcla8cmw4n3a2aw0"; - revision = "1"; - editedCabalFile = "1bfm9wndgwz18gxws456h4faw3fa6d1020kxjc7b3rzb9c0nr2vq"; + version = "0.1.0.1"; + sha256 = "1l4cj7v4scnz5cq05294ym4gyv163ry09bpxp1vg1m1v88ww5i2w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -123291,9 +123315,10 @@ self: { 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 optparse-applicative psqueues random random-access-file - scotty stm stm-containers store template-haskell text - text-format-heavy unix unix-bytestring unordered-containers yaml + 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 ]; description = "Implementation of checkers (\"draughts\") board game - server application"; license = lib.licenses.bsd3; @@ -124019,33 +124044,6 @@ self: { }) {}; "headroom" = callPackage - ({ mkDerivation, aeson, base, data-default-class, doctest, either - , file-embed, hspec, hspec-discover, microlens, microlens-th - , mustache, optparse-applicative, pcre-heavy, pcre-light - , QuickCheck, rio, template-haskell, time, yaml - }: - mkDerivation { - pname = "headroom"; - version = "0.3.2.0"; - sha256 = "0770d1b8ikijkmqqnb6nygqj7cv6fphz1165x478ry61sr3i6hs3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base data-default-class either file-embed microlens - microlens-th mustache optparse-applicative pcre-heavy pcre-light - rio template-haskell time yaml - ]; - executableHaskellDepends = [ base optparse-applicative rio ]; - testHaskellDepends = [ - aeson base doctest hspec optparse-applicative pcre-light QuickCheck - rio time - ]; - testToolDepends = [ hspec-discover ]; - description = "License Header Manager"; - license = lib.licenses.bsd3; - }) {}; - - "headroom_0_4_0_0" = callPackage ({ mkDerivation, aeson, base, doctest, either, file-embed , generic-data, hspec, hspec-discover, microlens, microlens-th, mtl , mustache, optparse-applicative, pcre-heavy, pcre-light @@ -124070,7 +124068,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "License Header Manager"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "heap" = callPackage @@ -124450,6 +124447,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "hedgehog_1_0_5" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring + , concurrent-output, containers, deepseq, directory, erf + , exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show + , primitive, random, resourcet, stm, template-haskell, text, time + , transformers, transformers-base, wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "1.0.5"; + sha256 = "1qsqs8lmxa3wmw228cwi98vvvh9hqbc9d43i1sy2c9igw9xlhfi6"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring concurrent-output containers + deepseq directory erf exceptions lifted-async mmorph monad-control + mtl pretty-show primitive random resourcet stm template-haskell + text time transformers transformers-base wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers mmorph mtl pretty-show text transformers + ]; + description = "Release with confidence"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hedgehog-checkers" = callPackage ({ mkDerivation, base, containers, either, hedgehog, semigroupoids , semigroups @@ -125406,40 +125428,41 @@ self: { , bdw-gc, binary, binary-conduit, boost, bytestring, cachix , cachix-api, conduit, conduit-extra, containers, directory, dlist , exceptions, filepath, hercules-ci-api-agent, hercules-ci-api-core - , hostname, hspec, http-client, http-client-tls, http-conduit - , inline-c, inline-c-cpp, katip, lens, lens-aeson, lifted-async - , lifted-base, monad-control, mtl, network, network-uri, nix - , optparse-applicative, process, protolude, safe-exceptions - , servant, servant-auth-client, servant-client, servant-client-core - , stm, temporary, text, time, tomland, transformers - , transformers-base, unbounded-delays, unix, unliftio + , hercules-ci-cnix-expr, hercules-ci-cnix-store, hostname, hspec + , http-client, http-client-tls, http-conduit, inline-c + , inline-c-cpp, katip, lens, lens-aeson, lifted-async, lifted-base + , monad-control, mtl, network, network-uri, nix + , optparse-applicative, process, process-extras, protolude + , safe-exceptions, servant, servant-auth-client, servant-client + , servant-client-core, stm, temporary, text, time, tomland + , transformers, transformers-base, unbounded-delays, unix, unliftio , unliftio-core, unordered-containers, uuid, vector, websockets , wuss }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.7.5"; - sha256 = "0v3wyz8fm3n6rwanjgfxws6f18kp3qmgwx5g4f0xy00mxjzswjrq"; + version = "0.8.0"; + sha256 = "1nwdi442ccm1x2isxdlh3rpcw627wjccdb4y40w2qna6dchx7v9z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base binary binary-conduit bytestring cachix conduit - containers dlist exceptions hercules-ci-api-agent inline-c - inline-c-cpp katip lifted-async lifted-base monad-control mtl - network-uri optparse-applicative process protolude safe-exceptions - stm text time transformers-base unbounded-delays unliftio - unliftio-core uuid websockets wuss + aeson async base binary binary-conduit bytestring conduit + containers directory dlist exceptions filepath + hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-store + katip lens lens-aeson lifted-async lifted-base monad-control mtl + network-uri process process-extras protolude safe-exceptions stm + temporary text time transformers-base unbounded-delays unix + unliftio unliftio-core uuid websockets wuss ]; - librarySystemDepends = [ boost ]; - libraryPkgconfigDepends = [ bdw-gc nix ]; executableHaskellDepends = [ aeson async attoparsec base base64-bytestring binary binary-conduit bytestring cachix cachix-api conduit conduit-extra containers directory dlist exceptions filepath hercules-ci-api-agent - hercules-ci-api-core hostname http-client http-client-tls - http-conduit inline-c inline-c-cpp katip lens lens-aeson - lifted-async lifted-base monad-control mtl network network-uri - optparse-applicative process protolude safe-exceptions servant + hercules-ci-api-core hercules-ci-cnix-expr hercules-ci-cnix-store + hostname http-client http-client-tls http-conduit inline-c + inline-c-cpp katip lens lens-aeson lifted-async lifted-base + monad-control mtl network network-uri optparse-applicative process + process-extras protolude safe-exceptions servant servant-auth-client servant-client servant-client-core stm temporary text time tomland transformers transformers-base unix unliftio unliftio-core unordered-containers uuid vector websockets @@ -125450,41 +125473,69 @@ self: { testHaskellDepends = [ aeson async attoparsec base binary binary-conduit bytestring conduit containers exceptions filepath hercules-ci-api-agent - hercules-ci-api-core hspec katip lifted-async lifted-base - monad-control optparse-applicative process protolude + hercules-ci-api-core hercules-ci-cnix-store hspec katip + lifted-async lifted-base monad-control process protolude safe-exceptions text transformers-base unliftio-core ]; - doHaddock = false; description = "Runs Continuous Integration tasks on your machines"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ roberth ]; }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;}; + "hercules-ci-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, cookie + , exceptions, hashable, hercules-ci-api-core, http-api-data + , http-media, lens, lens-aeson, memory, network-uri, profunctors + , servant, servant-auth, servant-auth-swagger, servant-swagger + , servant-swagger-ui-core, string-conv, swagger2, text, time, uuid + }: + mkDerivation { + pname = "hercules-ci-api"; + version = "0.6.0.0"; + sha256 = "11ha3jvwg501n9all4v5r057qr9m9qbmbrkiv5l04mrsi5pvhpw7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers cookie exceptions hashable + hercules-ci-api-core http-api-data http-media lens lens-aeson + memory network-uri profunctors servant servant-auth + servant-auth-swagger servant-swagger servant-swagger-ui-core + string-conv swagger2 text time uuid + ]; + executableHaskellDepends = [ + aeson base bytestring containers cookie exceptions hashable + http-api-data http-media lens memory network-uri profunctors + servant servant-auth servant-auth-swagger servant-swagger + servant-swagger-ui-core string-conv swagger2 text time uuid + ]; + description = "Hercules CI API definition with Servant"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ roberth ]; + }) {}; + "hercules-ci-api-agent" = callPackage ({ mkDerivation, aeson, base, base64-bytestring-type, bytestring - , containers, cookie, exceptions, hashable, hercules-ci-api-core - , hspec, http-api-data, http-media, lens, lens-aeson, memory - , network-uri, profunctors, QuickCheck, servant, servant-auth - , servant-auth-swagger, servant-swagger, servant-swagger-ui-core - , string-conv, swagger2, text, time, uuid, vector + , containers, cookie, deepseq, exceptions, hashable + , hercules-ci-api-core, hspec, http-api-data, http-media, lens + , lens-aeson, memory, network-uri, profunctors, QuickCheck + , quickcheck-classes, servant, servant-auth, string-conv, swagger2 + , text, time, uuid, vector }: mkDerivation { pname = "hercules-ci-api-agent"; - version = "0.2.2.0"; - sha256 = "1pp0ink132wwj2wzj7ficxzxhj09bl3fm62fmslrl3l579ycbp7d"; + version = "0.3.0.0"; + sha256 = "161ghlz5n6na4sviwyxxq78hj37yk89kri0367xx9dbsllgfc7g6"; libraryHaskellDepends = [ aeson base base64-bytestring-type bytestring containers cookie - exceptions hashable hercules-ci-api-core http-api-data http-media - lens lens-aeson memory servant servant-auth servant-auth-swagger - servant-swagger servant-swagger-ui-core string-conv swagger2 text - time uuid vector + deepseq exceptions hashable hercules-ci-api-core http-api-data + http-media lens lens-aeson memory servant servant-auth string-conv + swagger2 text time uuid vector ]; testHaskellDepends = [ aeson base bytestring containers cookie exceptions hashable hspec http-api-data http-media lens memory network-uri profunctors - QuickCheck servant servant-auth servant-auth-swagger - servant-swagger servant-swagger-ui-core string-conv swagger2 text - time uuid + QuickCheck quickcheck-classes servant servant-auth string-conv + swagger2 text time uuid vector ]; description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise"; license = lib.licenses.asl20; @@ -125493,17 +125544,17 @@ self: { "hercules-ci-api-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, cookie - , exceptions, hashable, http-api-data, http-media, katip, lens - , lifted-base, memory, monad-control, safe-exceptions, servant - , servant-auth, servant-auth-swagger, servant-swagger + , deepseq, exceptions, hashable, http-api-data, http-media, katip + , lens, lifted-base, memory, monad-control, safe-exceptions + , servant, servant-auth, servant-auth-swagger, servant-swagger , servant-swagger-ui-core, string-conv, swagger2, text, time, uuid }: mkDerivation { pname = "hercules-ci-api-core"; - version = "0.1.1.0"; - sha256 = "19qxbarnl65gqg52ysl12nggyc64860chdcl0vm3i3fny4vsqbcq"; + version = "0.1.2.0"; + sha256 = "1p2vv5dviac73qi42x7kf09wgc3qjdkpldn7yj5vhmxhcnj7yj6x"; libraryHaskellDepends = [ - aeson base bytestring containers cookie exceptions hashable + aeson base bytestring containers cookie deepseq exceptions hashable http-api-data http-media katip lens lifted-base memory monad-control safe-exceptions servant servant-auth servant-auth-swagger servant-swagger servant-swagger-ui-core @@ -125514,6 +125565,67 @@ self: { maintainers = with lib.maintainers; [ roberth ]; }) {}; + "hercules-ci-cli" = callPackage + ({ mkDerivation, aeson, aeson-pretty, atomic-write, attoparsec + , base, bytestring, conduit, containers, data-has, directory + , exceptions, filepath, hercules-ci-agent, hercules-ci-api + , hercules-ci-api-core, hercules-ci-cnix-expr + , hercules-ci-cnix-store, hercules-ci-optparse-applicative + , hostname, hspec, http-client, http-client-tls, http-types, katip + , lifted-base, monad-control, network-uri, process, protolude + , QuickCheck, rio, safe-exceptions, servant, servant-auth-client + , servant-client, servant-client-core, servant-conduit, temporary + , text, transformers-base, unix, unliftio, unordered-containers + }: + mkDerivation { + pname = "hercules-ci-cli"; + version = "0.1.0"; + sha256 = "1fcg1fd2jd0334nhwsipyf468a4kkdhbibyhhjyspqagswaanm9q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty atomic-write attoparsec base bytestring conduit + containers data-has directory exceptions filepath hercules-ci-agent + hercules-ci-api hercules-ci-api-core hercules-ci-cnix-expr + hercules-ci-cnix-store hercules-ci-optparse-applicative hostname + http-client http-client-tls http-types katip lifted-base + monad-control network-uri process protolude rio safe-exceptions + servant servant-auth-client servant-client servant-client-core + servant-conduit temporary text transformers-base unix unliftio + unordered-containers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring containers hspec protolude QuickCheck + unordered-containers + ]; + description = "The hci command for working with Hercules CI"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ roberth ]; + broken = true; + }) {hercules-ci-optparse-applicative = null;}; + + "hercules-ci-cnix-expr" = callPackage + ({ mkDerivation, aeson, base, bdw-gc, boost, bytestring, conduit + , containers, exceptions, hercules-ci-cnix-store, inline-c + , inline-c-cpp, nix, protolude, text + }: + mkDerivation { + pname = "hercules-ci-cnix-expr"; + version = "0.1.0.0"; + sha256 = "1f9pq6z5xvmq7hd136dshazybazydsmah5f5h8w82yi12ccyqlaz"; + libraryHaskellDepends = [ + aeson base bytestring conduit containers exceptions + hercules-ci-cnix-store inline-c inline-c-cpp protolude text + ]; + librarySystemDepends = [ boost ]; + libraryPkgconfigDepends = [ bdw-gc nix ]; + description = "Bindings for the Nix evaluator"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ roberth ]; + }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;}; + "hercules-ci-cnix-store" = callPackage ({ mkDerivation, base, boost, bytestring, conduit, containers , inline-c, inline-c-cpp, nix, protolude, unliftio-core @@ -125530,6 +125642,7 @@ self: { libraryPkgconfigDepends = [ nix ]; description = "Haskell bindings for Nix's libstore"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ roberth ]; }) {inherit (pkgs) boost; inherit (pkgs) nix;}; "here" = callPackage @@ -127416,8 +127529,6 @@ self: { ]; description = "Generates a references DB from .hie files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hieraclus" = callPackage @@ -129114,8 +129225,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.20.4"; - sha256 = "1fsdh4k0lrlx3n81hns8h2dh917i0cmh1iax55d9q7jlxvy5bq95"; + version = "1.21"; + sha256 = "07fcfkmv4cy92njnf2qc7jh0naz96q962hxldcd7hk4k7ddv0mss"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129240,10 +129351,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.12"; - sha256 = "0klrqss2ch4yi50m1rybznzsjg4ahbx7rg9n8w5svpf34fdlp048"; - revision = "2"; - editedCabalFile = "1n43j7fh3d9f8jn1y40vhkfh7yfwb4sixm3wyrfj20mkr7yyr732"; + version = "1.3.13"; + sha256 = "19i5cr11zm4d27x2gddxy4993jgmf4ghgpvx8fw4acadwbvlnjvg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129271,10 +129380,8 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.6.0"; - sha256 = "0s0pmdm1vk4ib5ncs9mxyzr3dx5m6ji9778kddzqwxc9y9gvq5sq"; - revision = "1"; - editedCabalFile = "10v3fwyzbaqzrldaswvn031hncxy2sra302n10k4zkxg41bz7f73"; + version = "1.6.1"; + sha256 = "0i97y7rs5kd2dqk3qwd2jg17vs9ib4yvkaqlljnb32x16gphpvhc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -129311,20 +129418,20 @@ self: { , cassava, cassava-megaparsec, cmdargs, containers, data-default , Decimal, directory, doctest, extra, file-embed, filepath, Glob , hashtables, megaparsec, mtl, old-time, parser-combinators - , pretty-simple, regex-tdfa, safe, split, tabular, tasty - , tasty-hunit, template-haskell, text, time, timeit, transformers - , uglymemo, unordered-containers, utf8-string + , pretty-simple, regex-tdfa, safe, tabular, tasty, tasty-hunit + , template-haskell, text, time, timeit, transformers, uglymemo + , unordered-containers, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.20.4"; - sha256 = "17fs3jh3wx1hgzijqpw0s57hq6hq43fadplmqkcjw1ikgm8h0zyw"; + version = "1.21"; + sha256 = "00prslqk8vnbyz388cpc0nsamzy8xcjzday5q9n3m9lx4p2dhb5y"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers data-default Decimal directory extra file-embed filepath Glob hashtables megaparsec mtl old-time parser-combinators - pretty-simple regex-tdfa safe split tabular tasty tasty-hunit + pretty-simple regex-tdfa safe tabular tasty tasty-hunit template-haskell text time timeit transformers uglymemo unordered-containers utf8-string ]; @@ -129333,9 +129440,9 @@ self: { blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers data-default Decimal directory doctest extra file-embed filepath Glob hashtables megaparsec mtl old-time - parser-combinators pretty-simple regex-tdfa safe split tabular - tasty tasty-hunit template-haskell text time timeit transformers - uglymemo unordered-containers utf8-string + parser-combinators pretty-simple regex-tdfa safe tabular tasty + tasty-hunit template-haskell text time timeit transformers uglymemo + unordered-containers utf8-string ]; description = "A reusable library providing the core functionality of hledger"; license = lib.licenses.gpl3; @@ -129394,8 +129501,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.20.4"; - sha256 = "0y9jyv4mphzyla70z365l5dwg50chsng011bazzpfwr6w889803i"; + version = "1.21"; + sha256 = "1h9d686z0y8cvq6780g6r8fdrs76y9649js0c350b6xnhzggbx0l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -129441,8 +129548,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.20.4"; - sha256 = "06psp5r6blj3s1z8zg515jgw58pyxy43qinh5cl161fxcl8ldfn4"; + version = "1.21"; + sha256 = "0ivszqcypw0j2wn4r7fv7dqm1pvr0b1y6rqpxagzyk8cxn3ic9g2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129710,23 +129817,6 @@ self: { }) {}; "hls-class-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint - , ghcide, haskell-lsp, hls-plugin-api, lens, shake, text - , transformers, unordered-containers - }: - mkDerivation { - pname = "hls-class-plugin"; - version = "0.1.0.1"; - sha256 = "198r8kly4fgm9xsngkzhljbq1j764asc0xba757zasmgndvri2r7"; - libraryHaskellDepends = [ - aeson base containers ghc ghc-exactprint ghcide haskell-lsp - hls-plugin-api lens shake text transformers unordered-containers - ]; - description = "Class/instance management plugin for Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-class-plugin_1_0_0_0" = callPackage ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint , ghcide, hls-plugin-api, lens, lsp, shake, text, transformers , unordered-containers @@ -129741,27 +129831,26 @@ self: { ]; description = "Class/instance management plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-eval-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory , dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide - , hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api, lens - , megaparsec, mtl, parser-combinators, pretty-simple, QuickCheck - , safe-exceptions, shake, temporary, text, time, transformers + , 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 }: mkDerivation { pname = "hls-eval-plugin"; - version = "0.2.0.0"; - sha256 = "0l85qia3gsdafxmkidr26sxgajvp46hcphkb1l8vm6q7h6jgj0d5"; + version = "1.0.0.0"; + sha256 = "0pslyhgvs6xrwijkyf4jdh873mnsb8iijmkbc9aq3dljdy080fdg"; libraryHaskellDepends = [ aeson base containers deepseq Diff directory dlist extra filepath - ghc ghc-boot-th ghc-paths ghcide hashable haskell-lsp - haskell-lsp-types hls-plugin-api lens megaparsec mtl - parser-combinators pretty-simple QuickCheck safe-exceptions shake - temporary text time transformers unordered-containers + 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 ]; description = "Eval plugin for Haskell Language Server"; license = lib.licenses.asl20; @@ -129785,58 +129874,22 @@ self: { }) {}; "hls-explicit-imports-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide - , haskell-lsp-types, hls-plugin-api, shake, text - , unordered-containers - }: - mkDerivation { - pname = "hls-explicit-imports-plugin"; - version = "0.1.0.0"; - sha256 = "0il51ndiw16h5kgclwzx8p1pwv6ph808406bh52nq1bjyadlwkk2"; - revision = "1"; - editedCabalFile = "1mmsgs0n0x0q8zdzc617pi24wadgjr7hxrwqw6ihv004ahzdmjms"; - libraryHaskellDepends = [ - aeson base containers deepseq ghc ghcide haskell-lsp-types - hls-plugin-api shake text unordered-containers - ]; - description = "Explicit imports plugin for Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-explicit-imports-plugin_0_1_0_2" = 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 = "0.1.0.2"; - sha256 = "0cfkb7ph6ryakybjxmyf6cc615p57wzv6ys2zy4fak1iib8bzwyx"; + version = "1.0.0.0"; + sha256 = "14j89l8pkxrffllg06fj6215xqdswrbndyv5xa22f0g00acmwi6w"; 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; - hydraPlatforms = lib.platforms.none; }) {}; "hls-haddock-comments-plugin" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide - , haskell-lsp-types, hls-plugin-api, text, unordered-containers - }: - mkDerivation { - pname = "hls-haddock-comments-plugin"; - version = "0.1.1.0"; - sha256 = "1kqkdbwx34k109dk3bl57hk2mcqw1cjj7l5382qfwy5bky4zjihn"; - libraryHaskellDepends = [ - base containers ghc ghc-exactprint ghcide haskell-lsp-types - hls-plugin-api text unordered-containers - ]; - description = "Haddock comments plugin for Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-haddock-comments-plugin_1_0_0_0" = callPackage ({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide , hls-plugin-api, lsp-types, text, unordered-containers }: @@ -129850,49 +129903,30 @@ self: { ]; description = "Haddock comments plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-hlint-plugin" = callPackage ({ mkDerivation, aeson, apply-refact, base, binary, bytestring , containers, data-default, deepseq, Diff, directory, extra - , filepath, ghc, ghc-exactprint, ghcide, hashable, haskell-lsp - , hlint, hls-plugin-api, hslogger, lens, regex-tdfa, shake - , temporary, text, transformers, unordered-containers + , filepath, ghc, ghc-exactprint, ghcide, hashable, hlint + , hls-plugin-api, hslogger, lens, lsp, regex-tdfa, shake, temporary + , text, transformers, unordered-containers }: mkDerivation { pname = "hls-hlint-plugin"; - version = "0.2.0.0"; - sha256 = "0v822s8m6iy7s0sld06gwh3ly20na0624s5g4642kkb2facbhm7d"; + version = "1.0.0.1"; + sha256 = "0hnfh6x8l20nrj54hpkkq2yj8xkgw15xcba27hagapam2yxi1xga"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc ghc-exactprint ghcide - hashable haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa - shake temporary text transformers unordered-containers + hashable hlint hls-plugin-api hslogger lens lsp regex-tdfa shake + temporary text transformers unordered-containers ]; description = "Hlint integration plugin with Haskell Language Server"; license = lib.licenses.asl20; }) {}; "hls-plugin-api" = callPackage - ({ mkDerivation, aeson, base, containers, data-default, Diff - , hashable, haskell-lsp, hslogger, lens, process, regex-tdfa, shake - , text, unix, unordered-containers - }: - mkDerivation { - pname = "hls-plugin-api"; - version = "0.7.0.0"; - sha256 = "1cpl65ay55k3lvwsvqzwbg0c6lkzmiki2qvk6lj2dn6rcry9gk55"; - libraryHaskellDepends = [ - aeson base containers data-default Diff hashable haskell-lsp - hslogger lens process regex-tdfa shake text unix - unordered-containers - ]; - description = "Haskell Language Server API for plugin communication"; - license = lib.licenses.asl20; - }) {}; - - "hls-plugin-api_1_0_0_0" = callPackage ({ mkDerivation, aeson, base, containers, data-default , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix @@ -129909,37 +129943,17 @@ self: { ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-retrie-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, directory, extra - , ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types - , hls-plugin-api, retrie, safe-exceptions, shake, text - , transformers, unordered-containers - }: - mkDerivation { - pname = "hls-retrie-plugin"; - version = "0.1.1.0"; - sha256 = "0wlrqqx2230xxvc1bl5gyx3cavs74c74bl4v3ib4v48wffgswbbj"; - libraryHaskellDepends = [ - aeson base containers deepseq directory extra ghc ghcide hashable - haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions - shake text transformers unordered-containers - ]; - description = "Retrie integration plugin for Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-retrie-plugin_0_1_1_1" = 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 = "0.1.1.1"; - sha256 = "1k85wgnd5f1jqjd09y9gacc5w8kypy84qaly32411xsw4hfsil8a"; + 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 @@ -129947,56 +129961,27 @@ 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, foldl, ghc - , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, retrie - , shake, syb, text, transformers, unordered-containers + ({ 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 { pname = "hls-splice-plugin"; - version = "0.3.0.0"; - sha256 = "1mi9951hgq7mcwry5mdi4ywxk3jkzs47x7q4nvm2svkpvgnbfhdv"; + version = "1.0.0.0"; + sha256 = "1xm9ji64g89fn4b81gd5g0ijv88b2zhyn303hr3jxhydqpfcipjb"; libraryHaskellDepends = [ - aeson base containers dlist foldl ghc ghc-exactprint ghcide - haskell-lsp hls-plugin-api lens retrie shake syb text transformers - unordered-containers + aeson base containers dlist extra foldl ghc ghc-exactprint ghcide + hls-plugin-api lens lsp retrie shake syb text transformers + unliftio-core unordered-containers ]; description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes"; license = lib.licenses.asl20; }) {}; "hls-tactics-plugin" = callPackage - ({ mkDerivation, aeson, base, checkers, containers, deepseq - , directory, extra, filepath, fingertree, generic-lens, ghc - , ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide, haskell-lsp - , hie-bios, hls-plugin-api, hspec, hspec-discover, lens, mtl - , QuickCheck, refinery, retrie, shake, syb, text, transformers - }: - mkDerivation { - pname = "hls-tactics-plugin"; - version = "0.5.1.0"; - sha256 = "150hbhdj0rxiyslqfvwzqiyyc0pdvkbfjizv33ldbq8gmwn6lf52"; - revision = "1"; - editedCabalFile = "03g175y8hg962w7npphw9laaq9j0xf6nw6p04jd4y6d20pnjn1dl"; - libraryHaskellDepends = [ - aeson base containers deepseq directory extra filepath fingertree - generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide - haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text - transformers - ]; - testHaskellDepends = [ - base checkers containers ghc hie-bios hls-plugin-api hspec mtl - QuickCheck - ]; - testToolDepends = [ hspec-discover ]; - description = "Tactics plugin for Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-tactics-plugin_1_0_0_0" = 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 @@ -130031,7 +130016,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Wingman plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hlwm" = callPackage @@ -130109,8 +130093,8 @@ self: { }: mkDerivation { pname = "hmatrix"; - version = "0.20.1"; - sha256 = "0v690zml7yqj6ndjszwqpfsad2vma3m6rdkjs6bnb9k2v35l905i"; + version = "0.20.2"; + sha256 = "05462prqkbqpxfbzsgsp8waf0sirg2qz6lzsk7r1ll752n7gqkbg"; configureFlags = [ "-fdisable-default-paths" "-fopenblas" ]; libraryHaskellDepends = [ array base binary bytestring deepseq primitive random semigroups @@ -130641,18 +130625,19 @@ self: { "hmp3-ng" = callPackage ({ mkDerivation, array, base, binary, bytestring, clock, containers - , directory, hscurses, monad-extras, mtl, ncurses, pcre-light - , process, random, unix, utf8-string, zlib + , directory, filepath, hscurses, monad-extras, mtl, ncurses + , pcre-light, process, random, unix, utf8-string, zlib }: mkDerivation { pname = "hmp3-ng"; - version = "2.9.3"; - sha256 = "0h1lg4faffqf86wk2hi68x3f0y2r2nypqcvb879wal24whh31v7v"; + version = "2.11.0"; + sha256 = "1wxjxx7ijw7fsvsfjvfdss5cg8yyd885i3wpnzryv0bhqqa96i1d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base binary bytestring clock containers directory hscurses - monad-extras mtl pcre-light process random unix utf8-string zlib + array base binary bytestring clock containers directory filepath + hscurses monad-extras mtl pcre-light process random unix + utf8-string zlib ]; executableSystemDepends = [ ncurses ]; description = "A 2019 fork of an ncurses mp3 player written in Haskell"; @@ -131952,8 +131937,8 @@ self: { }: mkDerivation { pname = "hookup"; - version = "0.5"; - sha256 = "1kpwg5jik2z8xrw192mglacgnm2clg9yca68jzk4gk0569krysnf"; + version = "0.6"; + sha256 = "09rhsq0j2m1j87qsbsd3l1q3dv2zs4wrhcz2jhn4a6dx273w5528"; libraryHaskellDepends = [ async attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network stm @@ -132930,8 +132915,8 @@ self: { }: mkDerivation { pname = "hpath"; - version = "0.11.0"; - sha256 = "07p5h68sz079rvhbz9sig4146127l29xsrphd1i3y4gskzwdvy1a"; + version = "0.12.1"; + sha256 = "1v5i8gdsb05s2klsrby82ms4sphvgk6k1xvhj2c7g2r3zsn6rxws"; libraryHaskellDepends = [ base bytestring deepseq exceptions hpath-filepath template-haskell utf8-string word8 @@ -132948,8 +132933,8 @@ self: { }: mkDerivation { pname = "hpath-directory"; - version = "0.14.0"; - sha256 = "1rv2f0vqbivzqgpk3msxgymqmwp159bi6h2hcdgf65v5j3rhv52n"; + version = "0.14.2"; + sha256 = "04lkan37v8i1clw459csn8jvkzasz0p8ik8q8slqb9g3a5j68hjy"; libraryHaskellDepends = [ base bytestring exceptions hpath-filepath hpath-posix IfElse safe-exceptions streamly streamly-bytestring streamly-posix time @@ -132981,8 +132966,8 @@ self: { }: mkDerivation { pname = "hpath-io"; - version = "0.14.0"; - sha256 = "12awqghnway7fhcyzyy6dj5f9p1z15gbp31r1781n892w3vvk4l9"; + version = "0.14.2"; + sha256 = "1xbxkzajzf46qdbhnyn866v12rkynhbsk610ypcfgaj2rm413flr"; libraryHaskellDepends = [ base bytestring exceptions hpath hpath-directory hpath-posix safe-exceptions streamly time unix @@ -132995,8 +132980,8 @@ self: { ({ mkDerivation, base, bytestring, hpath-filepath, unix }: mkDerivation { pname = "hpath-posix"; - version = "0.13.2"; - sha256 = "1gxqrlxcm01ysd3hs61rhzfa3inxsj1w0hncydf1q66skshabzmf"; + version = "0.13.3"; + sha256 = "1qnz2y6k5axy1pzgx1hgygxv6rdqx9w9kzjmaf890zifv0vv46as"; libraryHaskellDepends = [ base bytestring hpath-filepath unix ]; description = "Some low-level POSIX glue code, that is not in 'unix'"; license = lib.licenses.bsd3; @@ -141327,8 +141312,8 @@ self: { }: mkDerivation { pname = "hurl"; - version = "2.1.0.0"; - sha256 = "0n467hgj8ybgqa69snsj6c199f0ipavxwjn2pb47q1vns6prlwd0"; + version = "2.1.0.1"; + sha256 = "16j7kxxp60i0nbiscc1x5a14s7n8qyv8rzjm6a03pqdpbmfzrrwq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142543,6 +142528,26 @@ self: { license = lib.licenses.mit; }) {}; + "hw-tar" = callPackage + ({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog + , hw-hspec-hedgehog, process + }: + mkDerivation { + pname = "hw-tar"; + version = "0.0.0.1"; + sha256 = "0hzmw0xb10h09q3h25f4lk2pygl0w7nckysa04qr1c26n4hsvrq2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hedgehog hspec hw-hedgehog hw-hspec-hedgehog process + ]; + testToolDepends = [ hspec-discover ]; + description = "Library for creating and extracting tar archives"; + license = lib.licenses.bsd3; + }) {}; + "hw-uri" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-optparse-applicative, antiope-s3, base @@ -146186,8 +146191,8 @@ self: { }: mkDerivation { pname = "incremental-parser"; - version = "0.5.0.1"; - sha256 = "1j0x52rwp44wdjdyxw3jh6m61vhwa2bf80dfxhqi6iniyc8qzm68"; + version = "0.5.0.2"; + sha256 = "15437dkn8j17ba71c3h6ck2f6sbnmp3acg2grg97awb962azm9fj"; libraryHaskellDepends = [ base input-parsers monoid-subclasses parsers rank2classes transformers @@ -146659,8 +146664,8 @@ self: { }: mkDerivation { pname = "infernal"; - version = "0.5.0"; - sha256 = "0zn4zj9c9jhvchg6yli3ig2c0hnwpk9na2r0bbizjlngzky6vfrr"; + version = "0.6.0"; + sha256 = "1qk0d5k7kjkhqxpkm1fnah1syd0la1z88l5mwv3z6ly5njvj78fl"; libraryHaskellDepends = [ aeson base binary bytestring case-insensitive exceptions hashable http-client http-types little-logger little-rio microlens @@ -146796,6 +146801,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "influxdb_1_9_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, clock, containers, doctest, foldl, http-client + , http-types, lens, network, optional-args, raw-strings-qq + , scientific, tagged, tasty, tasty-hunit, template-haskell, text + , time, unordered-containers, vector + }: + mkDerivation { + pname = "influxdb"; + version = "1.9.1.1"; + sha256 = "1qdfrl5ragkn726ymh16p0shgc6sn72gd1hh6a6bw19m527pdcc0"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock containers foldl http-client + http-types lens network optional-args scientific tagged text time + unordered-containers vector + ]; + testHaskellDepends = [ + base containers doctest lens raw-strings-qq tasty tasty-hunit + template-haskell time vector + ]; + description = "InfluxDB client library for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "informative" = callPackage ({ mkDerivation, base, containers, csv, highlighting-kate , http-conduit, monad-logger, pandoc, persistent @@ -147122,8 +147155,8 @@ self: { }: mkDerivation { pname = "input-parsers"; - version = "0.1.0.1"; - sha256 = "0wqp98ly2f9vnqd97q9jphmxqr284aal40dlrgi4hwy216p67vzz"; + version = "0.2.1"; + sha256 = "0hxadh4p007785knx8vah3b2bawaidvi7z4kgyyahj98a5k7qr18"; libraryHaskellDepends = [ attoparsec base binary bytestring monoid-subclasses parsec parsers text transformers @@ -147243,16 +147276,17 @@ self: { "instana-haskell-trace-sdk" = callPackage ({ mkDerivation, aeson, aeson-extra, base, binary, bytestring - , containers, directory, ekg-core, exceptions, hslogger - , http-client, http-client-tls, http-types, HUnit, network, process - , random, regex-base, regex-compat, regex-pcre, regex-tdfa, retry - , scientific, servant, servant-server, stm, sysinfo, text, time - , transformers, unix, unordered-containers, wai, warp + , case-insensitive, containers, directory, ekg-core, exceptions + , hslogger, http-client, http-client-tls, http-types, HUnit + , network, process, random, regex-base, regex-compat, regex-pcre + , regex-tdfa, retry, scientific, servant, servant-server, stm + , sysinfo, text, time, transformers, unix, unordered-containers + , wai, warp }: mkDerivation { pname = "instana-haskell-trace-sdk"; - version = "0.5.0.1"; - sha256 = "1414c9jahmkszpag40iyzrr0g346dp9l1ssz60693ivcm0q16pii"; + version = "0.6.0.0"; + sha256 = "0b27fvvq1xxici2w33m823xnj7fwq1irjhwrcaav1khz3h93qv85"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147262,9 +147296,9 @@ self: { scientific stm sysinfo text time unix unordered-containers wai ]; executableHaskellDepends = [ - aeson base binary bytestring hslogger http-client http-types - servant servant-server text time transformers unix - unordered-containers wai warp + aeson base binary bytestring case-insensitive containers hslogger + http-client http-types servant servant-server text time + transformers unix unordered-containers wai warp ]; testHaskellDepends = [ aeson aeson-extra base bytestring directory ekg-core exceptions @@ -148294,25 +148328,25 @@ self: { }) {}; "inventory" = callPackage - ({ mkDerivation, appendmap, base, bytestring, containers, directory - , filepath, ghc, ghc-paths, mtl, tasty, tasty-hunit + ({ mkDerivation, appendmap, array, base, bytestring, containers + , directory, filepath, ghc, ghc-paths, mtl, tasty, tasty-hunit }: mkDerivation { pname = "inventory"; - version = "0.1.0.2"; - sha256 = "1ykfxlsgnim45b4birflpwj0p3grjw8y4p9vwqnmhss6krl2qk3x"; + version = "0.1.0.3"; + sha256 = "1zja3w6xkah7ydzkn5ydibagn4g3fa16xdjsqvkrkv6yfq54g2j7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - appendmap base bytestring containers directory filepath ghc + appendmap array base bytestring containers directory filepath ghc ghc-paths mtl ]; executableHaskellDepends = [ - appendmap base bytestring containers directory filepath ghc + appendmap array base bytestring containers directory filepath ghc ghc-paths mtl ]; testHaskellDepends = [ - appendmap base bytestring containers directory filepath ghc + appendmap array base bytestring containers directory filepath ghc ghc-paths mtl tasty tasty-hunit ]; description = "Project statistics and definition analysis"; @@ -148870,22 +148904,23 @@ self: { ({ mkDerivation, aeson, base, bytestring, directory, directory-tree , doctest, envy, flow, Glob, http-media, ip, lens, lens-aeson , monad-logger, QuickCheck, regex-compat, rio, servant - , servant-client, servant-server, swagger2, text, vector, yaml + , servant-client, servant-multipart, servant-server, swagger2, text + , vector, yaml }: mkDerivation { pname = "ipfs"; - version = "1.2.0.0"; - sha256 = "12aibxpdkgwym8k8hibb8a77bbf7wd6z5czwpakg48x9gxmvhygn"; + version = "1.3.0.0"; + sha256 = "1ag3rx7p4gp39rhgwap083ny5x00z5p8aks1lwvrsmdlvn83ym6l"; libraryHaskellDepends = [ aeson base bytestring envy flow Glob http-media ip lens - monad-logger regex-compat rio servant servant-client servant-server - swagger2 text vector + monad-logger regex-compat rio servant servant-client + servant-multipart servant-server swagger2 text vector ]; testHaskellDepends = [ aeson base bytestring directory directory-tree doctest envy flow Glob http-media ip lens lens-aeson monad-logger QuickCheck - regex-compat rio servant servant-client servant-server swagger2 - text vector yaml + regex-compat rio servant servant-client servant-multipart + servant-server swagger2 text vector yaml ]; description = "Access IPFS locally and remotely"; license = lib.licenses.asl20; @@ -148975,10 +149010,8 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.7.10"; - sha256 = "0libq5v22cm6bj1lga1rrkgww50bhnpns7rz7da90yycqv2k7d5m"; - revision = "1"; - editedCabalFile = "02nh8r0c1p8gzq2y82q8n210y3bs146kjv2v7mr8z0m3k0sh5qqs"; + version = "1.7.11"; + sha256 = "12wa59b1zgjqp8dmygq2x44ml0cb89fhn1k0zkj4aqz7rhkwsp90"; libraryHaskellDepends = [ appar base byteorder bytestring containers network ]; @@ -149164,10 +149197,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.9"; - sha256 = "1n1fd46am795bsb96jnq2kj3gn787q5j41115g1smfp01zbnjp1b"; - revision = "1"; - editedCabalFile = "12z28f96iw9jni57rdzy8kz7sa1zwfs5k3fvfmf6sgx6wzhwcm6h"; + version = "2.10"; + sha256 = "1x1vmpzmgwxkwcza20yzmymgb7bj04f17xiqvcqg29h53pimnvxj"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -152860,13 +152891,13 @@ self: { "jsonrpc-conduit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit - , conduit-extra, hspec, mtl, text, transformers + , conduit-extra, hspec, hspec-discover, mtl, text, transformers , unordered-containers }: mkDerivation { pname = "jsonrpc-conduit"; - version = "0.3.0"; - sha256 = "0kh1s78zqgb4zdy18vckhzjadg33lr98jzpcqgad51phlbkhf94y"; + version = "0.3.2"; + sha256 = "00ssz471iv1vc67cbn3q3ghfd0ic8rjrsvkidx7vd6jd1mgw94ga"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra mtl text transformers unordered-containers @@ -152874,6 +152905,7 @@ self: { testHaskellDepends = [ aeson base bytestring conduit conduit-extra hspec text ]; + testToolDepends = [ hspec-discover ]; description = "JSON-RPC 2.0 server over a Conduit."; license = lib.licenses.gpl3; hydraPlatforms = lib.platforms.none; @@ -154404,8 +154436,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "keep-alive"; - version = "0.1.1.0"; - sha256 = "1h1x28adh7y561pmmbw064vyz9qx013spkcr8pwg9hjcnzn03yvw"; + version = "0.2.0.0"; + sha256 = "1hkmm1933y6dlzr88p75kkl6qiw5jnb1f4klfbwbl2d3jx8fg92k"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "TCP keep alive implementation"; @@ -159666,8 +159698,8 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "leanpub-concepts"; - version = "1.1"; - sha256 = "0zy26sccxyqhmlk6dfbd7jghwmfi9zkcljb9rcl82ysw7cwyl3qw"; + version = "1.1.0.1"; + sha256 = "0ip2kkkkbjf95h9dk9h4c21jz5ygpl1r1rsjdm47dmbvwih6v14c"; libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Leanpub API"; license = lib.licenses.mit; @@ -159675,15 +159707,17 @@ self: { "leanpub-wreq" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions - , leanpub-concepts, lens, rando, text, time, transformers + , leanpub-concepts, mwc-random, text, time, transformers , unordered-containers, wreq }: mkDerivation { pname = "leanpub-wreq"; - version = "1.1"; - sha256 = "1mk188r1bxg3qhv24nxkqw5vk5jyifxvg171h8bx93s9mmrikzdv"; + version = "1.1.0.2"; + sha256 = "1d1lj4ppvir8s2pv0zcsnadhns30h2axzppf6pkgbcnyis75an1h"; + revision = "1"; + editedCabalFile = "0zmwi2sfxv29rj28lri4xky0rbz8xky7jnwmbsynqckzn767a2k9"; libraryHaskellDepends = [ - aeson base bytestring exceptions leanpub-concepts lens rando text + aeson base bytestring exceptions leanpub-concepts mwc-random text time transformers unordered-containers wreq ]; description = "Use the Leanpub API via Wreq"; @@ -160217,6 +160251,8 @@ self: { pname = "lens-family"; version = "2.0.0"; sha256 = "1nq3dwkrjyqafbv4gvwwgz6ih8y4x9bks11jhljh43q3qnjz54v7"; + revision = "1"; + editedCabalFile = "1nf0zxhwqkg54mc3kimnqcvg9b732rn35r1rjs1fzf0vwssla3zw"; libraryHaskellDepends = [ base containers lens-family-core mtl transformers ]; @@ -160224,14 +160260,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "lens-family_2_1_0" = callPackage + "lens-family_2_1_1" = callPackage ({ mkDerivation, base, containers, lens-family-core, mtl , transformers }: mkDerivation { pname = "lens-family"; - version = "2.1.0"; - sha256 = "06imgyd97zyvhd3ifq7wvfvfs10x6gsg4cw4a0y9wa0rm81960hl"; + version = "2.1.1"; + sha256 = "1ra31r3y672nyqf7147kxws1qvksgics8pgd6fasyf1v0l3c798j"; libraryHaskellDepends = [ base containers lens-family-core mtl transformers ]; @@ -167752,8 +167788,8 @@ self: { pname = "lzma"; version = "0.0.0.3"; sha256 = "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg"; - revision = "5"; - editedCabalFile = "1m1a3w8cjqz8h4iibkgykzgmrmkxxgz9sm0zn52dbvczdiqbs5y5"; + revision = "6"; + editedCabalFile = "1sh2g5wkh0m6646cxnii0k20f0crwdcnprfl9jfg7gxn5875bkip"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ lzma ]; testHaskellDepends = [ @@ -170035,8 +170071,8 @@ self: { }: mkDerivation { pname = "mason"; - version = "0.2.3"; - sha256 = "0iwbdkrlbjn44gj0g43lfajx35jbihw4in5pc8by33ajwix43y5j"; + version = "0.2.4"; + sha256 = "1ic2h2mj31hb972x146wn7p29hlmx9p30f5gi2ccqv2ww96l56fv"; libraryHaskellDepends = [ array base bytestring ghc-prim integer-gmp network text ]; @@ -172337,9 +172373,7 @@ self: { ]; description = "Support for using mergeful from persistent-based databases"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {genvalidity-persistent = null; validity-persistent = null;}; + }) {}; "mergeless" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, mtl, validity @@ -172377,9 +172411,7 @@ self: { ]; description = "Support for using mergeless from persistent-based databases"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {genvalidity-persistent = null;}; + }) {}; "merkle-log" = callPackage ({ mkDerivation, base, bytestring, cereal, criterion, cryptonite @@ -174755,6 +174787,24 @@ self: { broken = true; }) {}; + "mit-3qvpPyAi6mH" = callPackage + ({ mkDerivation, base, base64, clock, directory, process + , record-dot-preprocessor, record-hasfield, text, text-ansi, unix + }: + mkDerivation { + pname = "mit-3qvpPyAi6mH"; + version = "2"; + sha256 = "1cdax4sjjpv7jiszv1319b7n26510pcir1icl6rfq4qbynrg4l00"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base base64 clock directory process record-dot-preprocessor + record-hasfield text text-ansi unix + ]; + description = "A git wrapper with a streamlined UX"; + license = lib.licenses.mit; + }) {}; + "miv" = callPackage ({ mkDerivation, async, base, bytestring, concurrent-output , containers, directory, filepath, filepattern, ghc-prim, hspec @@ -174977,10 +175027,8 @@ self: { }: mkDerivation { pname = "mmark"; - version = "0.0.7.2"; - sha256 = "1wwszzba6fvg0r4q5z2dzashim0nkaxzx4rmjl216kdi08jkp7mm"; - revision = "3"; - editedCabalFile = "1ffa76pz544pa3s764lnc38rdmfccyn8z6zn1w76pqb01p0f9k9p"; + version = "0.0.7.3"; + sha256 = "1gfl9jhqm1jaqxi0yxd8r4z3ai5c3f1wv53vjs0ln84qjpcqp30s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -175031,10 +175079,8 @@ self: { }: mkDerivation { pname = "mmark-ext"; - version = "0.2.1.2"; - sha256 = "1s44vznj8hkk7iymnzczbglxnw1q84gmm8q9yiwh0jkiw4kdi91c"; - revision = "3"; - editedCabalFile = "02i6577qislr0qvgmfamcixpxgb7bh68lg18n3vkq6xbnjxdpwpx"; + version = "0.2.1.3"; + sha256 = "1hc95gvw4dyjlf2y4nli68zavjd0aj9br55n7417r7g70si1m82s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri @@ -175504,32 +175550,6 @@ self: { }) {}; "modern-uri" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant - , criterion, deepseq, exceptions, hspec, hspec-discover - , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck - , reflection, tagged, template-haskell, text, weigh - }: - mkDerivation { - pname = "modern-uri"; - version = "0.3.4.0"; - sha256 = "1jb1bj2jgxhhvkc50h1c11c3zd66bpbi67b1h6b8773h0yiqffvk"; - libraryHaskellDepends = [ - base bytestring containers contravariant deepseq exceptions - megaparsec mtl profunctors QuickCheck reflection tagged - template-haskell text - ]; - testHaskellDepends = [ - base bytestring hspec hspec-megaparsec megaparsec QuickCheck text - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq megaparsec text weigh - ]; - description = "Modern library for working with URIs"; - license = lib.licenses.bsd3; - }) {}; - - "modern-uri_0_3_4_1" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant , criterion, deepseq, exceptions, hspec, hspec-discover , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck @@ -175553,7 +175573,6 @@ self: { ]; description = "Modern library for working with URIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "modify-fasta" = callPackage @@ -177113,8 +177132,8 @@ self: { ({ mkDerivation, base, base-compat, stm }: mkDerivation { pname = "monad-var"; - version = "0.2.1.0"; - sha256 = "1amlkcwwmgqscq0w660lawnwz07swlmiz8g61qn0fb1vmfpvas88"; + version = "0.2.2.0"; + sha256 = "0idmp912pwlahl5rb9bfx8fr088h9im8pz32bjqm2141b9ci10h8"; libraryHaskellDepends = [ base base-compat stm ]; description = "Generic operations over variables"; license = lib.licenses.bsd3; @@ -177741,8 +177760,6 @@ self: { benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "monoid-owns" = callPackage @@ -177809,6 +177826,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "monoid-subclasses_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, primes, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "monoid-subclasses"; + version = "1.1"; + sha256 = "1bv0ripdw53121aj39zalczkfwrajpzzd1i99jn49sr4bfwgy3p4"; + libraryHaskellDepends = [ + base bytestring containers primes text vector + ]; + testHaskellDepends = [ + base bytestring containers primes QuickCheck quickcheck-instances + tasty tasty-quickcheck text vector + ]; + description = "Subclasses of Monoid"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monoid-transformer" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { @@ -177967,22 +178004,18 @@ self: { }) {}; "months" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, cassava - , deepseq, hashable, http-api-data, intervals, lens, lucid - , QuickCheck, swagger2, text, time-compat + ({ mkDerivation, aeson, attoparsec, base, base-compat, deepseq + , hashable, intervals, QuickCheck, text, time-compat }: mkDerivation { pname = "months"; - version = "0.1"; - sha256 = "000fqmd5j3pxmfa5bpyk5fd0hbn9iq3g5v1slk4hrjdjm8k19wa0"; - revision = "4"; - editedCabalFile = "0rww4x5c4a9n1yrs6ll1irwn1c1fm8s9k1zri3n2n1d6x75brny5"; + version = "0.2"; + sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija"; libraryHaskellDepends = [ - aeson attoparsec base base-compat cassava deepseq hashable - http-api-data intervals lens lucid QuickCheck swagger2 text - time-compat + aeson attoparsec base base-compat deepseq hashable intervals + QuickCheck text time-compat ]; - description = "Month, YearMonth, Quarter, YearQuarter types"; + description = "MonthName"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -179729,8 +179762,8 @@ self: { }: mkDerivation { pname = "mu-graphql"; - version = "0.5.0.1"; - sha256 = "1mcm8db1q0sjzxyjhxd140l966vq6yh8hj1p2xx8yzqmagsfv7kx"; + version = "0.5.0.2"; + sha256 = "0kr8gqi34zgg8vj5x0c0mx3xjkhjr4ynparplysga7qzzj58a7f3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -185922,8 +185955,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.7.3"; - sha256 = "18pdvmyhqil98d5mzh8a4r5i3pc4vyj13jcrjjw4q73prcj4mg6p"; + version = "1.7.4"; + sha256 = "11qmyj0cdmj9il2w5b25k45q59f1paia5yc98z999lj1fw7x27w6"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -186457,8 +186490,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.1.5"; - sha256 = "1iymfgffafqh57m0b8mrsrcd8m6x3wycwm2lly0bz1q4z784k66v"; + version = "0.1.6"; + sha256 = "0v8ll12z073g1c9zrgniljvrvniv1nf8p2ak6f24sixnhr8f2hhl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -187197,6 +187230,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "nonempty-zipper" = callPackage + ({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }: + mkDerivation { + pname = "nonempty-zipper"; + version = "1.0.0.0"; + sha256 = "0qqdrp1rr1qmgxxzwn21gy1gc9mwdhliyp72d74bndqr3yki46fm"; + libraryHaskellDepends = [ base comonad deepseq safe ]; + testHaskellDepends = [ base comonad deepseq doctest Glob safe ]; + description = "A non-empty comonadic list zipper"; + license = lib.licenses.mit; + }) {}; + "nonemptymap" = callPackage ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { @@ -187681,20 +187726,6 @@ self: { }) {}; "nri-env-parser" = callPackage - ({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text - }: - mkDerivation { - pname = "nri-env-parser"; - version = "0.1.0.4"; - sha256 = "01s2346rdccnqrymxb947kx68jqdyh29v3s2mq3c707pvmxlhw4y"; - libraryHaskellDepends = [ - base modern-uri network-uri nri-prelude text - ]; - description = "Read environment variables as settings to build 12-factor apps"; - license = lib.licenses.bsd3; - }) {}; - - "nri-env-parser_0_1_0_5" = callPackage ({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text }: mkDerivation { @@ -187706,7 +187737,6 @@ self: { ]; description = "Read environment variables as settings to build 12-factor apps"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nri-observability" = callPackage @@ -187734,32 +187764,6 @@ self: { }) {}; "nri-prelude" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async - , auto-update, base, bytestring, containers, directory, exceptions - , filepath, ghc, hedgehog, junit-xml, pretty-diff, pretty-show - , safe-exceptions, terminal-size, text, time, vector - }: - mkDerivation { - pname = "nri-prelude"; - version = "0.4.0.0"; - sha256 = "032j7wy9wjjv0pbn1g16vdj15j03brkkwa3ssjv7g0v61hjaq4z7"; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal async auto-update base bytestring - containers directory exceptions filepath ghc hedgehog junit-xml - pretty-diff pretty-show safe-exceptions terminal-size text time - vector - ]; - testHaskellDepends = [ - aeson aeson-pretty ansi-terminal async auto-update base bytestring - containers directory exceptions filepath ghc hedgehog junit-xml - pretty-diff pretty-show safe-exceptions terminal-size text time - vector - ]; - description = "A Prelude inspired by the Elm programming language"; - license = lib.licenses.bsd3; - }) {}; - - "nri-prelude_0_5_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async , auto-update, base, bytestring, containers, directory, exceptions , filepath, ghc, hedgehog, junit-xml, pretty-diff, pretty-show @@ -187783,7 +187787,6 @@ self: { ]; description = "A Prelude inspired by the Elm programming language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nsis" = callPackage @@ -189366,8 +189369,8 @@ self: { }: mkDerivation { pname = "oeis2"; - version = "1.0.4"; - sha256 = "1parmfwdxrmvzz81dy8mb9ry4bbp1bvsqsr593zld7hnfx6cvlh9"; + version = "1.0.5"; + sha256 = "1incjy5si6lwsvh2hfdw61m3jq9qad06nrrylj5b8n5yj54wzna8"; libraryHaskellDepends = [ aeson base containers http-conduit lens lens-aeson text vector ]; @@ -189823,14 +189826,13 @@ self: { }) {}; "one-line-aeson-text" = callPackage - ({ mkDerivation, aeson, base, doctest, text, unordered-containers - }: + ({ mkDerivation, aeson, base, text, unordered-containers }: mkDerivation { pname = "one-line-aeson-text"; - version = "0.1.0.0"; - sha256 = "026qycb9nvc2v648p2cc74h6xqczkv9mvpawq54zx4r3vlc4lppn"; + version = "0.1.0.2"; + sha256 = "033dqj6qc0fjq9nq22mbdrhn8nllmx95x785dwv5l7yj7q1rm7q9"; libraryHaskellDepends = [ aeson base text unordered-containers ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ aeson base text ]; description = "Pretty-printing short Aeson values as text"; license = lib.licenses.asl20; }) {}; @@ -190386,45 +190388,6 @@ self: { }) {}; "openapi3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries - , bytestring, Cabal, cabal-doctest, containers, cookie, doctest - , generics-sop, Glob, hashable, hspec, hspec-discover, http-media - , HUnit, insert-ordered-containers, lens, mtl, network, optics-core - , optics-th, QuickCheck, quickcheck-instances, scientific - , template-haskell, text, time, transformers, unordered-containers - , utf8-string, uuid-types, vector - }: - mkDerivation { - pname = "openapi3"; - version = "3.0.1.0"; - sha256 = "03icxn4zbk6yasj6wca7qdg5cac5fadr4qcxyn4gblkffmqkb5lc"; - revision = "1"; - editedCabalFile = "017mikhl12iyrgn40mmis3m05bfjxmg9y09nsk7i8xfjzkqcnly0"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat-batteries bytestring containers - cookie generics-sop hashable http-media insert-ordered-containers - lens mtl network optics-core optics-th QuickCheck scientific - template-haskell text time transformers unordered-containers - uuid-types vector - ]; - executableHaskellDepends = [ aeson base lens text ]; - testHaskellDepends = [ - aeson base base-compat-batteries bytestring containers doctest Glob - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - quickcheck-instances template-haskell text time - unordered-containers utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "OpenAPI 3.0 data model"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "openapi3_3_0_2_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries , bytestring, Cabal, cabal-doctest, containers, cookie, doctest , generics-sop, Glob, hashable, hspec, hspec-discover, http-media @@ -192852,23 +192815,26 @@ self: { "overloaded" = callPackage ({ mkDerivation, assoc, base, bin, boring, bytestring, constraints , containers, fin, generic-lens-lite, ghc, hmatrix, HUnit, lens - , optics-core, QuickCheck, ral, record-hasfield, singleton-bool - , sop-core, split, syb, symbols, tasty, tasty-hunit - , tasty-quickcheck, text, time, vec + , optics-core, profunctors, QuickCheck, ral, record-hasfield + , semigroupoids, singleton-bool, sop-core, split, splitmix, syb + , symbols, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text, th-compat, time, vec }: mkDerivation { pname = "overloaded"; - version = "0.2.1"; - sha256 = "1qa2xq2hf792ivi92mimznwj86x9y1dpwz7rwcz99zvfk7a3hsis"; + version = "0.3"; + sha256 = "151xnpk7l1jg63m4bwr91h3dh1xb0d4xinc4vn1jsbhr96p662ap"; libraryHaskellDepends = [ - assoc base bin bytestring containers fin ghc optics-core ral - record-hasfield sop-core split syb symbols text time vec + assoc base bin bytestring containers fin ghc optics-core + profunctors ral record-hasfield semigroupoids sop-core split syb + symbols template-haskell text th-compat time vec ]; testHaskellDepends = [ assoc base bin boring bytestring constraints containers fin generic-lens-lite hmatrix HUnit lens optics-core QuickCheck ral - record-hasfield singleton-bool sop-core symbols tasty tasty-hunit - tasty-quickcheck text time vec + record-hasfield singleton-bool sop-core splitmix symbols tasty + tasty-hunit tasty-quickcheck template-haskell text th-compat time + vec ]; doHaddock = false; description = "Overloaded pragmas as a plugin"; @@ -193331,10 +193297,8 @@ self: { ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }: mkDerivation { pname = "pagination"; - version = "0.2.1"; - sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48"; - revision = "2"; - editedCabalFile = "0wvwi3hymp2vhhpzpycdc65zbsqmi2h0c6r0nf8p5nkgsk4pm1k2"; + version = "0.2.2"; + sha256 = "0k5rd55ssrk2f4vfzwnz09az6p1d6igbfmyyyjvnwwjrgcsmynig"; libraryHaskellDepends = [ base deepseq exceptions ]; testHaskellDepends = [ base exceptions hspec QuickCheck ]; description = "Framework-agnostic pagination boilerplate"; @@ -193565,6 +193529,65 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "pandoc_2_12" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, citeproc, commonmark, commonmark-extensions + , commonmark-pandoc, connection, containers, data-default, deepseq + , Diff, directory, doclayout, doctemplates, emojis, exceptions + , executable-path, file-embed, filepath, Glob, haddock-library + , hslua, hslua-module-path, hslua-module-system, hslua-module-text + , HsYAML, HTTP, http-client, http-client-tls, http-types, ipynb + , jira-wiki-markup, JuicyPixels, mtl, network, network-uri + , pandoc-types, parsec, process, QuickCheck, random, safe + , scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-transforms, unix, unordered-containers, xml + , xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.12"; + sha256 = "0z7j6hqfjis0a9bng7dlkwilksrambdcr72gj3aijv827hmz45sm"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive citeproc + commonmark commonmark-extensions commonmark-pandoc connection + containers data-default deepseq directory doclayout doctemplates + emojis exceptions file-embed filepath Glob haddock-library hslua + hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP + http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels mtl network network-uri pandoc-types parsec process + random safe scientific SHA skylighting skylighting-core split syb + tagsoup temporary texmath text text-conversions time + unicode-transforms unix unordered-containers xml xml-conduit + zip-archive zlib + ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ + base base64-bytestring bytestring containers Diff directory + doctemplates exceptions executable-path filepath Glob hslua mtl + pandoc-types process QuickCheck tasty tasty-golden tasty-hunit + tasty-lua tasty-quickcheck temporary text time xml zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers mtl tasty tasty-bench text time + ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -193626,8 +193649,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.9.1"; - sha256 = "0kyml1bmzjp6by86inlmyx8qkl4f92yibmhc477sglv9m8haw0wx"; + version = "0.3.10.0"; + sha256 = "1yymm8y9hzkbjff7cn63qsvpfks1f1n741vfdiiga66kml8v0zdm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -193944,40 +193967,6 @@ self: { }) {}; "pandoc-plot" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , data-default, directory, filepath, githash, hashable, hspec - , hspec-expectations, lifted-async, lifted-base, mtl - , optparse-applicative, pandoc, pandoc-types, shakespeare, tagsoup - , tasty, tasty-hspec, tasty-hunit, template-haskell, text - , typed-process, yaml - }: - mkDerivation { - pname = "pandoc-plot"; - version = "1.0.2.1"; - sha256 = "0yi1dh6d1zxzrpmh32v0c7v921qjyxmmapzv56vh0ih8mi3ggbji"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers data-default directory filepath hashable - lifted-async lifted-base mtl pandoc pandoc-types shakespeare - tagsoup template-haskell text typed-process yaml - ]; - executableHaskellDepends = [ - base containers directory filepath githash optparse-applicative - pandoc pandoc-types template-haskell text typed-process - ]; - testHaskellDepends = [ - base containers directory filepath hspec hspec-expectations - pandoc-types tasty tasty-hspec tasty-hunit text - ]; - benchmarkHaskellDepends = [ - base criterion pandoc-types template-haskell text - ]; - description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; - license = lib.licenses.gpl2Plus; - }) {}; - - "pandoc-plot_1_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, directory, filepath, githash, hashable, hspec , hspec-expectations, lifted-async, lifted-base, mtl @@ -194009,7 +193998,6 @@ self: { ]; description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; }) {}; "pandoc-pyplot" = callPackage @@ -194167,8 +194155,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.3.7"; - sha256 = "0laqf7mfzdpdbg583l3mr25qxdqryq1cd1141gl713d5m9s1b4fs"; + version = "0.3.8"; + sha256 = "093m8hds7x5i2kh478l7vcjjv60x68z96dzyxllaw9aijxrw9h3p"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -195339,8 +195327,8 @@ self: { pname = "parsec"; version = "3.1.14.0"; sha256 = "132waj2cpn892midbhpkfmb74qq83v0zv29v885frlp1gvh94b67"; - revision = "2"; - editedCabalFile = "1xyjd06nns0k65k4ig2azrijy43gnbvpcfwb3jpd8vmn2fnk0yib"; + revision = "3"; + editedCabalFile = "1qclpv599691710g321x1864js3gqyfv35xbh6kxlshjdrzcbmbj"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ base HUnit mtl test-framework test-framework-hunit @@ -196104,6 +196092,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "password_3_0_0_0" = callPackage + ({ mkDerivation, base, base-compat, base64, bytestring, Cabal + , cabal-doctest, cryptonite, doctest, memory, password-types + , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text + }: + mkDerivation { + pname = "password"; + version = "3.0.0.0"; + sha256 = "0x6f4zkqqsa6vi5dvy5sj0f7pqkqq9zw3ph9f0d8vl631zcs2inb"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base64 bytestring cryptonite memory password-types + template-haskell text + ]; + testHaskellDepends = [ + base base-compat bytestring cryptonite doctest memory + password-types QuickCheck quickcheck-instances scrypt tasty + tasty-hunit tasty-quickcheck template-haskell text + ]; + description = "Hashing and checking of passwords"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "password-instances" = callPackage ({ mkDerivation, aeson, base, base-compat, Cabal, cabal-doctest , doctest, http-api-data, password, persistent, QuickCheck @@ -196127,6 +196140,49 @@ self: { license = lib.licenses.bsd3; }) {}; + "password-instances_3_0_0_0" = callPackage + ({ mkDerivation, aeson, base, base-compat, Cabal, cabal-doctest + , doctest, http-api-data, password, password-types, persistent + , QuickCheck, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text + }: + mkDerivation { + pname = "password-instances"; + version = "3.0.0.0"; + sha256 = "08y42r165n3d7lry160rdmn8akhhfyx76fwjhsqb25zc5a9d5glj"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base http-api-data password-types persistent text + ]; + testHaskellDepends = [ + aeson base base-compat doctest http-api-data password + password-types persistent QuickCheck quickcheck-instances tasty + tasty-hunit tasty-quickcheck template-haskell text + ]; + description = "typeclass instances for password package"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "password-types" = callPackage + ({ mkDerivation, base, base-compat, bytestring, Cabal + , cabal-doctest, doctest, memory, QuickCheck, quickcheck-instances + , tasty, tasty-quickcheck, template-haskell, text + }: + mkDerivation { + pname = "password-types"; + version = "1.0.0.0"; + sha256 = "090aqq2xs6m5djvr9zfdj7rxafbmj8d05vij5rchj1f9c46dclb5"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base bytestring memory text ]; + testHaskellDepends = [ + base base-compat doctest QuickCheck quickcheck-instances tasty + tasty-quickcheck template-haskell text + ]; + description = "Types for handling passwords"; + license = lib.licenses.bsd3; + }) {}; + "passwords" = callPackage ({ mkDerivation, base, containers, MonadRandom, random }: mkDerivation { @@ -196328,6 +196384,8 @@ self: { pname = "path"; version = "0.8.0"; sha256 = "0vzsa41q5sxs1ni72yv1vfpnc6r5mjdwnmdb6jrs6cszb2xlkjr4"; + revision = "1"; + editedCabalFile = "02vhx94mqapyigvayb6cj7p7snn354pb542n3qyvsm0gih52wlja"; libraryHaskellDepends = [ aeson base deepseq exceptions filepath hashable template-haskell text @@ -198591,6 +198649,8 @@ self: { pname = "persistent-mysql"; version = "2.10.3.1"; sha256 = "00gs2ym5vw2cqahv48cx8fhi3kx06rn0s1pafm8pdlr98snvwif7"; + revision = "1"; + editedCabalFile = "1nd3l499kpv2rfhqqjw1b3qsn558rwz3794cy2x493l98rsspszp"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text @@ -205659,8 +205719,8 @@ self: { pname = "postgresql-simple-url"; version = "0.2.1.0"; sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk"; - revision = "3"; - editedCabalFile = "02l1g5jiw6idnnax7q2lzayjycgi029pv41njdmwdch57k59vai5"; + revision = "4"; + editedCabalFile = "092gkvwzdf0nmm6q6lgjb81j8vpn5d3pybavs39ya2v92mbhrpmm"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -208443,8 +208503,8 @@ self: { ({ mkDerivation, base, directory, mmsyn3, process, sublists }: mkDerivation { pname = "process-sequential"; - version = "0.1.0.0"; - sha256 = "11s6ki1cgqav8i06np63cj2l6z1wdszjrq2rslx1pk7af5dxz9r0"; + version = "0.1.1.0"; + sha256 = "19dv9sk1hk4ny0zh8amr9bddmjxc94r8h3cims9ylhrrb34zz90f"; libraryHaskellDepends = [ base directory mmsyn3 process sublists ]; description = "A test suite for the complex multi files multi level processment"; license = lib.licenses.mit; @@ -210196,17 +210256,18 @@ self: { }) {}; "proton" = callPackage - ({ mkDerivation, adjunctions, base, bifunctors, comonad - , compactable, containers, contravariant, distributive, linear, mtl - , profunctors, tagged + ({ mkDerivation, adjunctions, async, base, bifunctors, comonad + , compactable, containers, contravariant, distributive, folds + , linear, mtl, profunctors, tagged, transformers }: mkDerivation { pname = "proton"; - version = "0.0.1"; - sha256 = "0l3176d1vjvknns2dx7qnwi7n45mc6v4qx9iv3z4488msjfqx6gf"; + version = "0.0.3"; + sha256 = "0w68v8sglyg99jni1p1cz6x87cm6x1ayll08wlijaiwpqc2pma2n"; libraryHaskellDepends = [ - adjunctions base bifunctors comonad compactable containers - contravariant distributive linear mtl profunctors tagged + adjunctions async base bifunctors comonad compactable containers + contravariant distributive folds linear mtl profunctors tagged + transformers ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -210336,6 +210397,36 @@ self: { broken = true; }) {}; + "prune-juice" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal + , cabal-install-parsers, containers, directory, file-embed + , file-path-th, filepath, hspec, megaparsec, monad-logger, mtl + , optparse-applicative, process, text, yaml + }: + mkDerivation { + pname = "prune-juice"; + version = "0.6"; + sha256 = "0g7gn0158hkr5b27iqlzmhnarb05y5id92qk2jl6azqnzrb2p5j7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal cabal-install-parsers containers + directory filepath megaparsec monad-logger mtl process text yaml + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal cabal-install-parsers containers + directory filepath megaparsec monad-logger mtl optparse-applicative + process text yaml + ]; + testHaskellDepends = [ + aeson base bytestring Cabal cabal-install-parsers containers + directory file-embed file-path-th filepath hspec megaparsec + monad-logger mtl process text yaml + ]; + description = "Prune unused Haskell dependencies"; + license = lib.licenses.mit; + }) {}; + "psc-ide" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , edit-distance, either, filepath, fsnotify, hspec, http-client @@ -211499,27 +211590,6 @@ self: { }) {}; "pusher-http-haskell" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-client-tls - , http-types, memory, QuickCheck, text, time, unordered-containers - }: - mkDerivation { - pname = "pusher-http-haskell"; - version = "2.0.0.3"; - sha256 = "0h53y0jxk1nyqwyr4f0nry0gl64s1w8ay15fips4drql37apbq1v"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-client-tls http-types memory text time - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec QuickCheck text unordered-containers - ]; - description = "Haskell client library for the Pusher Channels HTTP API"; - license = lib.licenses.mit; - }) {}; - - "pusher-http-haskell_2_1_0_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, hashable, hspec, http-client, http-client-tls , http-types, memory, QuickCheck, text, time, unordered-containers @@ -211538,7 +211608,6 @@ self: { ]; description = "Haskell client library for the Pusher Channels HTTP API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -214932,8 +215001,8 @@ self: { pname = "range-set-list"; version = "0.1.3.1"; sha256 = "0m8c8qhpk9vaykqfy6gsv1csmvdclm27zv9l56ipv152k75xks0j"; - revision = "1"; - editedCabalFile = "0ma1gxmk2in2fj4rxhwshy2zq690ylw1zz0c9cnyin8mxkp96inc"; + revision = "2"; + editedCabalFile = "08b5zlc2q3nyxxjzzigjbjygvd2001i2w3vslacib3kxm4569n8v"; libraryHaskellDepends = [ base containers deepseq hashable ]; testHaskellDepends = [ base containers deepseq hashable tasty tasty-quickcheck @@ -215339,8 +215408,8 @@ self: { pname = "rasterific-svg"; version = "0.3.3.2"; sha256 = "1i0pl1hin1ipi3l0074ywd1khacpbvz3x0frx0j0hmbfiv4n3nq2"; - revision = "1"; - editedCabalFile = "19i9wlk951d85dqnmbgrnz0fg4xcw7cbv9cs2h8b440lycj3p4cv"; + revision = "2"; + editedCabalFile = "1938sp9m0yi7ypxk74bzrbkp9b4yk6hsaqhlhbraf9yb7w61228v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216637,8 +216706,8 @@ self: { }: mkDerivation { pname = "reanimate"; - version = "1.1.3.3"; - sha256 = "1d348fpfzfqi3vm8qzdxbbdrx62awxx0hrnj3vw1szp41an6ya30"; + version = "1.1.4.0"; + sha256 = "0gz651ipn5w6w7adxkvkcgi6nb1d2vs72l8glz5jdll44mchdk55"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring @@ -216851,23 +216920,6 @@ self: { }) {}; "record-dot-preprocessor" = callPackage - ({ mkDerivation, base, extra, filepath, ghc, record-hasfield - , uniplate - }: - mkDerivation { - pname = "record-dot-preprocessor"; - version = "0.2.9"; - sha256 = "02g36p14waf66lwwy2s4jy19pmkxv46kqfkkipy7qix3vaffbzir"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base extra ghc uniplate ]; - executableHaskellDepends = [ base extra ]; - testHaskellDepends = [ base extra filepath record-hasfield ]; - description = "Preprocessor to allow record.field syntax"; - license = lib.licenses.bsd3; - }) {}; - - "record-dot-preprocessor_0_2_10" = callPackage ({ mkDerivation, base, extra, filepath, ghc, record-hasfield , uniplate }: @@ -216882,7 +216934,6 @@ self: { testHaskellDepends = [ base extra filepath record-hasfield ]; description = "Preprocessor to allow record.field syntax"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "record-encode" = callPackage @@ -217049,6 +217100,26 @@ self: { broken = true; }) {}; + "recover-rtti" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, ghc-heap + , ghc-prim, mtl, QuickCheck, sop-core, stm, tasty, tasty-quickcheck + , text, vector + }: + mkDerivation { + pname = "recover-rtti"; + version = "0.1.0.0"; + sha256 = "19bf4279nfq8sv20v56sah30mv2g10zy2yxcylhc33w85d9jkisl"; + libraryHaskellDepends = [ + aeson base bytestring containers ghc-heap mtl sop-core stm text + ]; + testHaskellDepends = [ + aeson base bytestring containers ghc-heap ghc-prim mtl QuickCheck + sop-core stm tasty tasty-quickcheck text vector + ]; + description = "Recover run-time type information from the GHC heap"; + license = lib.licenses.bsd3; + }) {}; + "recursion" = callPackage ({ mkDerivation, base, composition-prelude }: mkDerivation { @@ -218931,6 +219002,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "regex-pcre-builtin_0_95_2_3_8_43" = callPackage + ({ mkDerivation, array, base, bytestring, containers, regex-base + , text + }: + mkDerivation { + pname = "regex-pcre-builtin"; + version = "0.95.2.3.8.43"; + sha256 = "02c6vzxcy1zkqwy6w4dsc97xvvdwlh8xr7imrlx2qs2521rvswr7"; + libraryHaskellDepends = [ + array base bytestring containers regex-base text + ]; + description = "PCRE Backend for \"Text.Regex\" (regex-base)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "regex-pcre-text" = callPackage ({ mkDerivation, array, base, bytestring, regex-base , regex-pcre-builtin, regex-tdfa-text, text @@ -221081,8 +221168,8 @@ self: { }: mkDerivation { pname = "rescue"; - version = "0.3.0"; - sha256 = "0lfvd5x845m2by8n67lgcybp22ppf7yxgglcqzwwfmmpa9qnchq2"; + version = "0.4.0"; + sha256 = "0hv2q8mkd94ksxgvijn83bkxf9lgnqn92g6k4ryl05z21sc8wl8d"; libraryHaskellDepends = [ base exceptions ghc mtl text transformers transformers-base world-peace @@ -222610,8 +222697,8 @@ self: { }: mkDerivation { pname = "ridley"; - version = "0.3.1.4"; - sha256 = "120yqfrkp4ziz8yn6xgzzhdszrvq1dk1szzh3q2m8w36c0g2qdhy"; + version = "0.3.2.1"; + sha256 = "14k7cmbcwqxf4d7r6yz77wpj88q3v9vx90agx16wd8dk1zzmcbx5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base containers ekg-core ekg-prometheus-adapter inline-c @@ -222636,8 +222723,8 @@ self: { }: mkDerivation { pname = "ridley-extras"; - version = "0.1.0.2"; - sha256 = "0ckc9amxp6picp1xmpxgplnxsn39p5h6j0y8h3mj5ik3720qn6c8"; + version = "0.1.1.0"; + sha256 = "1syqjc1002cxdk8bsa3k2c232dkmhlw9r4bi5h68a0ddvi86x0ha"; libraryHaskellDepends = [ base ekg-prometheus-adapter microlens mtl prometheus ridley shelly text transformers @@ -225275,6 +225362,17 @@ self: { broken = true; }) {}; + "safe-coloured-text" = callPackage + ({ mkDerivation, base, bytestring, terminfo, text }: + mkDerivation { + pname = "safe-coloured-text"; + version = "0.0.0.0"; + sha256 = "0c07527g35gpxif8ia07x766pmzcf4m1cgjz9lkac973n12iwllx"; + libraryHaskellDepends = [ base bytestring terminfo text ]; + description = "Safely output coloured text"; + license = lib.licenses.mit; + }) {}; + "safe-decimal" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest , exceptions, hspec, hspec-discover, QuickCheck, scientific @@ -226609,30 +226707,30 @@ self: { "sbv" = callPackage ({ mkDerivation, array, async, base, bench-show, bytestring - , containers, crackNum, deepseq, directory, doctest, filepath - , gauge, Glob, hlint, mtl, pretty, process, QuickCheck, random - , silently, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , containers, deepseq, directory, doctest, filepath, gauge, Glob + , hlint, libBF, mtl, pretty, process, QuickCheck, random, silently + , syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck , template-haskell, text, time, transformers, uniplate, z3 }: mkDerivation { pname = "sbv"; - version = "8.10"; - sha256 = "1j9hy840dl78rr1ixhlz24wwymbpiv46hpz8i6dd0gngrfha09ji"; + version = "8.12"; + sha256 = "0qr9z5vm4py072a23nc263ma7k5hg6n9xy2pq9pra8z16sq4bnb3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array async base containers crackNum deepseq directory filepath mtl + array async base containers deepseq directory filepath libBF mtl pretty process QuickCheck random syb template-haskell text time transformers uniplate ]; testHaskellDepends = [ - base bytestring containers crackNum directory doctest filepath Glob - hlint mtl QuickCheck random tasty tasty-golden tasty-hunit + base bytestring containers directory doctest filepath Glob hlint + mtl QuickCheck random tasty tasty-golden tasty-hunit tasty-quickcheck ]; testSystemDepends = [ z3 ]; benchmarkHaskellDepends = [ - base bench-show containers crackNum deepseq directory filepath - gauge mtl process random silently syb text time + base bench-show containers deepseq directory filepath gauge mtl + process random silently syb text time ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; @@ -230088,8 +230186,8 @@ self: { }: mkDerivation { pname = "sequence-formats"; - version = "1.6.0"; - sha256 = "1vy2wwzpnqd2c0ma3jm46gx3w3al0j61ncr22bcahsb1nrgmg0dq"; + version = "1.6.1"; + sha256 = "0r2p8aap9z82yhw6gagl1h7s8v05zf6w82qzhqr6p1msv183fm2a"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe @@ -232819,13 +232917,15 @@ self: { }) {}; "servant-to-elm" = callPackage - ({ mkDerivation, aeson, base, bound, elm-syntax, haskell-to-elm - , http-types, servant, servant-multipart, text + ({ mkDerivation, aeson, base, bound, bytestring, directory + , elm-syntax, filepath, generics-sop, haskell-to-elm, hspec + , http-types, prettyprinter, process, servant, servant-multipart + , temporary, text, unordered-containers }: mkDerivation { pname = "servant-to-elm"; - version = "0.4.1.0"; - sha256 = "0kxkyijkxvpb5jv815i9s6pg7rnq437jj7hrwr0xprxd709mc648"; + version = "0.4.2.0"; + sha256 = "1hbz6c9233wgpgmgnplg9qv5hrniynkn5n4zsmkyansw07gmaw05"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232833,8 +232933,9 @@ self: { servant-multipart text ]; testHaskellDepends = [ - aeson base bound elm-syntax haskell-to-elm http-types servant - servant-multipart text + aeson base bound bytestring directory elm-syntax filepath + generics-sop haskell-to-elm hspec http-types prettyprinter process + servant servant-multipart temporary text unordered-containers ]; description = "Automatically generate Elm clients for Servant APIs"; license = lib.licenses.bsd3; @@ -234155,6 +234256,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "shake-bench" = callPackage + ({ mkDerivation, aeson, base, Chart, Chart-diagrams, diagrams + , diagrams-svg, directory, extra, filepath, shake, text + }: + mkDerivation { + pname = "shake-bench"; + version = "0.1.0.0"; + sha256 = "09lgmiw77nr3xycxksvzmcw1c2j66h51d5vxpm0lngv1dnsrad64"; + libraryHaskellDepends = [ + aeson base Chart Chart-diagrams diagrams diagrams-svg directory + extra filepath shake text + ]; + description = "Build rules for historical benchmarking"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "shake-bindist" = callPackage ({ mkDerivation, archive-sig, base, bytestring, bz2, lzlib, shake , zlib, zstd @@ -235517,6 +235636,8 @@ self: { pname = "shower"; version = "0.2.0.2"; sha256 = "0flad49vvqww2pbf6j8557szffd7wb3z375avhvzwqyklimwipgn"; + revision = "1"; + editedCabalFile = "0d5vfb65lq6f36lagsf89dj45gs68dyv6cc6lqxz0c23bv91qarc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base megaparsec pretty ]; @@ -237516,8 +237637,6 @@ self: { ]; description = "Sized functors, for size-based enumerations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sized" = callPackage @@ -243880,42 +243999,6 @@ self: { }) {}; "stache" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, directory, file-embed, filepath, gitrev, hspec - , hspec-discover, hspec-megaparsec, megaparsec, mtl - , optparse-applicative, template-haskell, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "stache"; - version = "2.2.0"; - sha256 = "09cfj8hs2249gqf0nrlv9b8vg8gmxabs7ndxasphxdd0rb1y3z3g"; - revision = "3"; - editedCabalFile = "1wjdn7qsrfnz2cqwx2pggi8ak3pj01zsmax14gvb8xsq4w9crdvx"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory filepath - megaparsec mtl template-haskell text unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base filepath gitrev optparse-applicative text - unordered-containers yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed hspec hspec-megaparsec - megaparsec template-haskell text yaml - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - aeson base criterion deepseq megaparsec text - ]; - description = "Mustache templates for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "stache_2_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, directory, file-embed, filepath, gitrev, hspec , hspec-discover, hspec-megaparsec, megaparsec, mtl @@ -243947,7 +244030,6 @@ self: { ]; description = "Mustache templates for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "stack" = callPackage @@ -244368,6 +244450,8 @@ self: { pname = "stack2cabal"; version = "1.0.12"; sha256 = "0424qz4fy8218a0zr8pw5kbaldrb3wddvsb87sjqbb4q5qcm7rj7"; + revision = "1"; + editedCabalFile = "12i5fnjf393jnfqq1qchfd0bpa0isj4j0bzs14wp80s7sh8f10kz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245186,8 +245270,6 @@ self: { ]; description = "Simple State-like monad transformer with saveable and restorable state"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "statethread" = callPackage @@ -248181,8 +248263,6 @@ self: { ]; description = "A library for generating random string from a regular experession"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "string-similarity" = callPackage @@ -248380,8 +248460,8 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "stripe-concepts"; - version = "1.0.2.4"; - sha256 = "0n4q3hsgqrqypmkkim8mcksdlljgldr908wqxlcz6k1wsv9klyc6"; + version = "1.0.2.6"; + sha256 = "0vz8kiwg9q27jhr6gfvhqy9gykrl3zgy3m2ldk1np4v7y4fg7906"; libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Stripe API"; license = lib.licenses.mit; @@ -248422,8 +248502,8 @@ self: { }: mkDerivation { pname = "stripe-hs"; - version = "0.2.1.0"; - sha256 = "1f8snldj183yz20f50kkwg6kqcr5zigp3n9k32hxa6dah8xvvnh1"; + version = "0.3.0.0"; + sha256 = "0hcni1fqvw2p7jyvl5nmaxp5dhp52dqyp4x3wk8i2j3ix4zjn6xi"; libraryHaskellDepends = [ aeson base bytestring casing cpphs cryptonite http-client http-types memory safe servant servant-client stripe-servant text @@ -248488,8 +248568,8 @@ self: { }: mkDerivation { pname = "stripe-scotty"; - version = "1.0.0.6"; - sha256 = "1x7dsk2m66ka8qd76mj5aww52rjs0b49vx1lws5bl2xl0asyb03v"; + version = "1.0.0.8"; + sha256 = "1r91lf3yjivfcxdnqy1ayfzs2ckszyx8x6f6fn8rjiz0gfv1v6hn"; libraryHaskellDepends = [ aeson base bytestring http-types scotty stripe-concepts stripe-signature text unordered-containers @@ -248506,8 +248586,8 @@ self: { }: mkDerivation { pname = "stripe-servant"; - version = "0.2.1.0"; - sha256 = "0vvzf4wh2d9bv5af2al2hdgvy5ds7v7p8w14l018cn3f3iynwh3f"; + version = "0.3.0.0"; + sha256 = "0zk9pbf498liq9sxqsb0hfk6w3jv03m4amlqqxr4dh3l98i03cli"; libraryHaskellDepends = [ aeson base casing http-api-data servant text time unordered-containers vector @@ -248522,8 +248602,8 @@ self: { }: mkDerivation { pname = "stripe-signature"; - version = "1.0.0.6"; - sha256 = "0lp3fli9g5yvlxy8f0md2d3wv6z45mw0929b8c0y2xkcsdjvpp5l"; + version = "1.0.0.8"; + sha256 = "0cybjsvzknsldqhf7fjd4ar2qjyym43x2ymmgw01f9a1ixyaxgmn"; libraryHaskellDepends = [ base base16-bytestring bytestring cryptonite memory stripe-concepts text @@ -248556,8 +248636,8 @@ self: { }: mkDerivation { pname = "stripe-wreq"; - version = "1.0.1.6"; - sha256 = "1lwwyzj4gi6rav8al3mkld4vq8rdvi4ir1y51nywflkcfiqjjjsx"; + version = "1.0.1.8"; + sha256 = "1km0h94d1clgba0yy520yx54axdkf4xl5p5hnmn8ghg40r0pax73"; libraryHaskellDepends = [ aeson base bytestring lens stripe-concepts text unordered-containers wreq @@ -248723,10 +248803,8 @@ self: { }: mkDerivation { pname = "structured"; - version = "0.1"; - sha256 = "0xm0m7jxwrbz8jgcn2dl5vhlz0gcg7wxcbbgaqidm2msmnc6fqww"; - revision = "2"; - editedCabalFile = "0l9ls0r1v5bjcznjd0jcpml8vpr4iq8shp4dm4jkv96i3x277gdv"; + version = "0.1.0.1"; + sha256 = "1ai760kzx0y901zwimsgiwbms88cyhg9mblhpqr0813dxqy31d5f"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers hashable scientific tagged text time-compat transformers @@ -249009,8 +249087,8 @@ self: { pname = "stylist"; version = "2.4.0.0"; sha256 = "0nkz6jnfx7si473lz0b907lq6zjpw2apbcph61s2aw44j5zgdg96"; - revision = "1"; - editedCabalFile = "18amb2sbp4qh2lszc21vpvnyqsbsy7s9396ivkcw7dmg7hljvk9a"; + revision = "2"; + editedCabalFile = "104rdqv33v54sj6yf8438sk7d0x0964b3gr1cj42qlxa8wl2idx0"; libraryHaskellDepends = [ async base css-syntax hashable network-uri regex-tdfa text unordered-containers @@ -250086,8 +250164,6 @@ self: { ]; description = "DSL for building SVG"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "svg-builder-fork" = callPackage @@ -250634,28 +250710,135 @@ self: { "sydtest" = callPackage ({ mkDerivation, async, base, bytestring, containers, Diff, dlist , envparse, MonadRandom, mtl, optparse-applicative, path, path-io - , pretty-show, QuickCheck, quickcheck-io, rainbow, random-shuffle - , safe, split, stm, sydtest-discover, text, yaml + , pretty-show, QuickCheck, quickcheck-io, random-shuffle, safe + , safe-coloured-text, split, stm, sydtest-discover, text, yaml , yamlparse-applicative }: mkDerivation { pname = "sydtest"; - version = "0.0.0.0"; - sha256 = "0ii5fmhksfhl7a6a8bkqih4y20q8964879x3fb5nzv6dah5qq7x5"; + version = "0.1.0.0"; + sha256 = "1r5p9vai0krzcnwxyicw9b00vzdqdm8zpj70y8snn4mdxxvhvyvq"; libraryHaskellDepends = [ async base bytestring containers Diff dlist envparse MonadRandom mtl optparse-applicative path path-io pretty-show QuickCheck - quickcheck-io rainbow random-shuffle safe split text yaml - yamlparse-applicative + quickcheck-io random-shuffle safe safe-coloured-text split text + yaml yamlparse-applicative ]; testHaskellDepends = [ - base bytestring path path-io QuickCheck rainbow stm text + base bytestring path path-io QuickCheck safe-coloured-text stm text ]; testToolDepends = [ sydtest-discover ]; - description = "An advanced modern testing framework for Haskell with good defaults and advanced testing features"; + description = "A modern testing framework for Haskell with good defaults and advanced testing features"; license = "unknown"; hydraPlatforms = lib.platforms.none; - }) {sydtest-discover = null;}; + }) {}; + + "sydtest-discover" = callPackage + ({ mkDerivation, base, filepath, optparse-applicative, path + , path-io + }: + mkDerivation { + pname = "sydtest-discover"; + version = "0.0.0.0"; + sha256 = "1kyjcvi9paax0hi05d2qab8pdkvvabq8s0gl772qiq8rhmrmazsx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath optparse-applicative path path-io + ]; + executableHaskellDepends = [ base ]; + description = "Automatic test suite discovery for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-persistent-sqlite" = callPackage + ({ mkDerivation, base, monad-logger, mtl, persistent + , persistent-sqlite, persistent-template, sydtest, sydtest-discover + }: + mkDerivation { + pname = "sydtest-persistent-sqlite"; + version = "0.0.0.0"; + sha256 = "0p9xy2pdjnzd61dadvrzrnnxxz04xm0ypn2h1ssmrilfglic80iz"; + libraryHaskellDepends = [ + base monad-logger mtl persistent persistent-sqlite + persistent-template sydtest + ]; + testHaskellDepends = [ + base persistent persistent-sqlite persistent-template sydtest + ]; + testToolDepends = [ sydtest-discover ]; + description = "A persistent-sqlite companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-servant" = callPackage + ({ mkDerivation, base, http-client, servant, servant-client + , servant-server, stm, sydtest, sydtest-discover, sydtest-wai + }: + mkDerivation { + pname = "sydtest-servant"; + version = "0.0.0.0"; + sha256 = "147v5s10qvpp67aq7c240rsc4f356hvznc5gb538slh03d5vas4j"; + libraryHaskellDepends = [ + base http-client servant servant-client servant-server sydtest + sydtest-wai + ]; + testHaskellDepends = [ + base servant servant-client servant-server stm sydtest + ]; + testToolDepends = [ sydtest-discover ]; + description = "A servant companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-wai" = callPackage + ({ mkDerivation, base, http-client, http-types, stm, sydtest + , sydtest-discover, wai, warp + }: + mkDerivation { + pname = "sydtest-wai"; + version = "0.0.0.0"; + sha256 = "01fqys32zj1rg9ciq04l7d4av3i1ynw3yinkgc84c3ia330i98ws"; + libraryHaskellDepends = [ base http-client sydtest wai warp ]; + testHaskellDepends = [ + base http-client http-types stm sydtest wai + ]; + testToolDepends = [ sydtest-discover ]; + description = "A wai companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-yesod" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , conduit, containers, cookie, exceptions, http-client, http-types + , monad-logger, mtl, persistent, persistent-sqlite + , persistent-template, pretty-show, QuickCheck, resourcet, sydtest + , sydtest-discover, sydtest-persistent-sqlite, sydtest-wai, text + , time, wai, xml-conduit, yesod, yesod-core, yesod-form, yesod-test + }: + mkDerivation { + pname = "sydtest-yesod"; + version = "0.0.0.0"; + sha256 = "0mknn114q495f1bh829fi6c9gag58048c0m06yw0bkl0ikz32k67"; + libraryHaskellDepends = [ + base blaze-builder bytestring case-insensitive containers cookie + exceptions http-client http-types mtl pretty-show sydtest + sydtest-wai text time wai xml-conduit yesod-core yesod-test + ]; + testHaskellDepends = [ + base bytestring conduit cookie http-client http-types monad-logger + mtl persistent persistent-sqlite persistent-template QuickCheck + resourcet sydtest sydtest-persistent-sqlite text yesod yesod-form + ]; + testToolDepends = [ sydtest-discover ]; + description = "A yesod companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; "syfco" = callPackage ({ mkDerivation, array, base, containers, convertible, directory @@ -256711,8 +256894,6 @@ self: { ]; description = "Functional Enumeration of Algebraic Types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "testing-type-modifiers" = callPackage @@ -258101,6 +258282,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-compat_0_1_2" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover, mtl + , template-haskell + }: + mkDerivation { + pname = "th-compat"; + version = "0.1.2"; + sha256 = "009qc0yy5iq61kgnp9n6vdlqh8zmk4bjawcvpigccgfyk40mvi1b"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ + base base-compat hspec mtl template-haskell + ]; + testToolDepends = [ hspec-discover ]; + description = "Backward- (and forward-)compatible Quote and Code types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-constraint-compat" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -258208,6 +258407,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-expand-syns_0_4_7_0" = callPackage + ({ mkDerivation, base, containers, syb, template-haskell }: + mkDerivation { + pname = "th-expand-syns"; + version = "0.4.7.0"; + sha256 = "1gmb89pgy3i0jpd760xmzx254xpg8pczfa8glgw9z1wak09kwv54"; + revision = "1"; + editedCabalFile = "0zh77kg86qmr285sn0xhhi2hbn8b9dx2pgmf2fipij8zj32k9ny4"; + libraryHaskellDepends = [ base containers syb template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + description = "Expands type synonyms in Template Haskell ASTs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-extras" = callPackage ({ mkDerivation, base, syb, template-haskell }: mkDerivation { @@ -267482,6 +267696,8 @@ self: { pname = "ucl"; version = "0.2.0.0"; sha256 = "1ccf9zavmsk0msq4gz6alv5z32qwnap8a4zvajmqps69bh66b9wv"; + revision = "1"; + editedCabalFile = "1gyhy1311wqj5s10pgkpc0vsmvcqja23p4nqn3nv0mbc9fajal2n"; libraryHaskellDepends = [ base bytestring containers text time ]; libraryPkgconfigDepends = [ libucl ]; testHaskellDepends = [ base containers ]; @@ -271845,24 +272061,6 @@ self: { }) {}; "validation" = callPackage - ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens - , semigroupoids, semigroups - }: - mkDerivation { - pname = "validation"; - version = "1.1"; - sha256 = "1acj7mh3581ks405xswxw6667z7y1y0slisg6jvp6chc191ji9l5"; - revision = "1"; - editedCabalFile = "1rrjg9z399k6pb55nv85mlr5bkmdqbjwkvl1cy7ydccdx6ks4syp"; - libraryHaskellDepends = [ - base bifunctors deepseq lens semigroupoids semigroups - ]; - testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; - description = "A data-type like Either but with an accumulating Applicative"; - license = lib.licenses.bsd3; - }) {}; - - "validation_1_1_1" = callPackage ({ mkDerivation, assoc, base, bifunctors, deepseq, hedgehog, HUnit , lens, semigroupoids, semigroups }: @@ -271876,7 +272074,6 @@ self: { testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; description = "A data-type like Either but with an accumulating Applicative"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "validation-selective" = callPackage @@ -272017,6 +272214,17 @@ self: { license = lib.licenses.mit; }) {}; + "validity-persistent" = callPackage + ({ mkDerivation, base, hspec, persistent, validity }: + mkDerivation { + pname = "validity-persistent"; + version = "0.0.0.0"; + sha256 = "02kyiwnj53kk11p0178m98gbfs7508lpk0bi4yd1svpj3vryhf6c"; + libraryHaskellDepends = [ base hspec persistent validity ]; + description = "Validity instances for persistent-related types"; + license = lib.licenses.mit; + }) {}; + "validity-primitive" = callPackage ({ mkDerivation, base, primitive, validity }: mkDerivation { @@ -278088,6 +278296,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk24x-gtk3;}; + "webmention" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, either + , exceptions, hspec, http-client, http-client-tls, http-types + , modern-uri, tagsoup, text + }: + mkDerivation { + pname = "webmention"; + version = "0.1.0.0"; + sha256 = "12lm7w0isb1dfs28r6yr8pz5czpmw5p6krdbz0rpp4hr487sz9pb"; + libraryHaskellDepends = [ + base bytestring case-insensitive either exceptions hspec + http-client http-client-tls http-types modern-uri tagsoup text + ]; + testHaskellDepends = [ + base bytestring case-insensitive either exceptions hspec + http-client http-client-tls http-types modern-uri tagsoup text + ]; + description = "Types and functions for working with Webmentions"; + license = lib.licenses.bsd3; + }) {}; + "webp" = callPackage ({ mkDerivation, base, bytestring, c2hs, JuicyPixels, libwebp , tasty, tasty-hunit, vector @@ -282016,8 +282245,8 @@ self: { pname = "xml-conduit-stylist"; version = "2.3.0.0"; sha256 = "15iznb6xpas8044p03w3vll4vv7zwpcbbrh59ywwjr8m45659p4w"; - revision = "1"; - editedCabalFile = "0ydqjrk5q3zzgrwk9cqcjlk3vafzcnxjvb7p74ywm5wfnhmfvmyn"; + revision = "2"; + editedCabalFile = "16hky6q4v5zmxyarj464i5hlq7s4c9b3vb7skxn2yi66vfy03a32"; libraryHaskellDepends = [ base containers css-syntax network-uri stylist text unordered-containers xml-conduit @@ -284158,26 +284387,18 @@ self: { "yamlparse-applicative" = callPackage ({ mkDerivation, aeson, base, bytestring, containers - , genvalidity-aeson, genvalidity-containers, genvalidity-hspec - , genvalidity-scientific, genvalidity-text - , genvalidity-unordered-containers, hspec, optparse-applicative - , path, path-io, prettyprinter, QuickCheck, scientific, text - , unordered-containers, validity, validity-text, vector, yaml + , optparse-applicative, path, path-io, prettyprinter + , safe-coloured-text, scientific, text, unordered-containers + , validity, validity-text, vector, yaml }: mkDerivation { pname = "yamlparse-applicative"; - version = "0.1.0.2"; - sha256 = "1bzf3kbhccxzg88amyk3ys3bwfi99fhmfa843sxn53nrbgphdw09"; + version = "0.1.0.3"; + sha256 = "14fp7qyfh9ax2cqp5amvj2hi8fl9imdq25j8bx5mil8f2jxqr6bi"; libraryHaskellDepends = [ aeson base bytestring containers optparse-applicative path path-io - prettyprinter scientific text unordered-containers validity - validity-text vector yaml - ]; - testHaskellDepends = [ - aeson base containers genvalidity-aeson genvalidity-containers - genvalidity-hspec genvalidity-scientific genvalidity-text - genvalidity-unordered-containers hspec QuickCheck scientific text - unordered-containers + prettyprinter safe-coloured-text scientific text + unordered-containers validity validity-text vector yaml ]; description = "Declaritive configuration parsing with free docs"; license = lib.licenses.mit; @@ -285247,30 +285468,6 @@ self: { }) {}; "yesod-auth-oauth2" = callPackage - ({ mkDerivation, aeson, base, bytestring, cryptonite, errors - , hoauth2, hspec, http-client, http-conduit, http-types, memory - , microlens, safe-exceptions, text, uri-bytestring, yesod-auth - , yesod-core - }: - mkDerivation { - pname = "yesod-auth-oauth2"; - version = "0.6.1.7"; - sha256 = "11z4zgzj9j15agnqj9dpfavmi2ns9d6aa4inazk1kig1wai2inp1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring cryptonite errors hoauth2 http-client - http-conduit http-types memory microlens safe-exceptions text - uri-bytestring yesod-auth yesod-core - ]; - testHaskellDepends = [ base hspec uri-bytestring ]; - description = "OAuth 2.0 authentication plugins"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "yesod-auth-oauth2_0_6_2_3" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, errors , hoauth2, hspec, http-client, http-conduit, http-types, memory , microlens, safe-exceptions, text, uri-bytestring, yesod-auth @@ -286063,8 +286260,8 @@ self: { }: mkDerivation { pname = "yesod-markdown"; - version = "0.12.6.5"; - sha256 = "1bs0npryigf7k8gj48i8r8snylc49qdca96610msi6df843c6s6g"; + version = "0.12.6.6"; + sha256 = "1myjm5fjcqkzh90bz14mn5rrhy41wfg0i76dihhbkhx7g15z4nwz"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare text xss-sanitize yesod-core yesod-form 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 4d66478f33..86123d8a70 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 @@ -28,4 +28,8 @@ self: super: { graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser {}; # cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine {}; + + # Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth + # cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix + hercules-ci-optparse-applicative = self.callPackage ../misc/haskell/hercules-ci-optparse-applicative.nix {}; } 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 42aa28b65e..812a59ec8a 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.15"; - sha256 = "0mvp7b16sy9j36v9v1mhixwz16hi8mhax7rwpqy3sv24jc1bxmqv"; + version = "7.4.16"; + sha256 = "0gnfb4vaj71fiap0q9lk6vs1xs7l6sha60isw6aaw3zxgh00ywc5"; }); 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 a4aa4842df..233b0da438 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.2"; - sha256 = "1rm3gc2h9l0zd1ccawpg1wxqm8v8rllq417f2w5pqcdf7sgah3q0"; + version = "8.0.3"; + sha256 = "04mh5sznbgwv67x9p0qz4i377zwdb5cc6r1mb3925y1lkqfn5y4m"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix index 65189fda07..3bf8ffab0e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -50,7 +50,7 @@ let # - If you run: # ruby -e "puts RbConfig::CONFIG['configure_args']" # - In: - # $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb + # $out/${passthru.libPath}/${stdenv.hostPlatform.system}/rbconfig.rb # 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 @@ -175,7 +175,7 @@ let $out/lib/libruby* ${removeReferencesTo}/bin/remove-references-to \ -t ${stdenv.cc} \ - $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb + $out/${passthru.libPath}/${stdenv.hostPlatform.system}/rbconfig.rb '' } # Bundler tries to create this directory @@ -187,7 +187,7 @@ let addRubyLibPath() { addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir} - addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.targetPlatform.system} + addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.hostPlatform.system} } addEnvHooks "$hostOffset" addGemPath diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index 8a8ab23d49..24ad128a58 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q1.4"; + version = "2021.Q1.5"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "mA7YalgcfjfYdmKPk8L4mfDJWn0rimPDoDB9/S3pyNM="; + sha256 = "OSX4alrR49jqIu2QZcTieurUnyWQJ0wheDwFiNd9QcY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 6094c0b8f4..22264fe01f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.2.2"; + version = "10.3.0"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-lClfxi7MQ3PlqWx7Yrkj/XGoHzFaqVl7KCqv2FWelDU="; + sha256 = "sha256-qx7/+lr5AAChGhmjkwL9+8XEq/b6tXipvQ6clc+B5Mc="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/clucene-core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clucene-core/default.nix index 20b0a3b547..8d5b389150 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clucene-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/clucene-core/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; homepage = "http://clucene.sourceforge.net"; - platforms = platforms.linux; + platforms = platforms.unix; license = with licenses; [ asl20 lgpl2 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 36c946e06f..13a33f68d2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchurl , autoreconfHook -, docbook_xml_dtd_412 , docbook_xml_dtd_45 , docbook-xsl-nons , which @@ -53,14 +52,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.10.1"; + version = "1.10.2"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1"; + sha256 = "sha256-2xUnOdBy+P8pnk6IjYljobRTjaexDguGUlvkOPLh3eQ="; }; patches = [ @@ -105,9 +104,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libxml2 - # Remove 4.1.2 again once the following is merged - # https://github.com/flatpak/flatpak/pull/4102 - docbook_xml_dtd_412 docbook_xml_dtd_45 docbook-xsl-nons which diff --git a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix index 955b7e0d16..c930adbe9b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix @@ -1,6 +1,7 @@ { fetchurl , lib, stdenv , pkg-config +, fetchpatch , meson , ninja , glib @@ -42,6 +43,15 @@ stdenv.mkDerivation rec { sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn"; }; + 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}" @@ -92,6 +102,13 @@ stdenv.mkDerivation rec { doCheck = true; + # Prevents e-d-s add-contacts-stress-test from timing out + checkPhase = '' + runHook preCheck + meson test --timeout-multiplier 4 + runHook postCheck + ''; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix index 8c02919126..6c1cf1612f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -7,14 +7,13 @@ with lib; stdenv.mkDerivation rec { pname = "gdal"; - # broken with poppler 20.08, however, can't fetch patches cleanly - version = "3.1.2.post2020-08-26"; + version = "3.2.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; - rev = "9a8df672204a8b3b33c36e09a32f747e21166fe9"; - sha256 = "1n25jma4x1l7slwxk702q77r84vxr90fyn4c3zpkr07q1b8wqql9"; + rev = "a33784291d19015217ea2604988e53d448e14a07"; + sha256 = "sha256-ynCju3chDfYtyrGmUE0n3kkaH2Mpm+/DDHHxCahjhSQ="; }; sourceRoot = "source/gdal"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix index d7cca43841..ddab0046b6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } 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 2dad33949f..09fae015b5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix @@ -1,8 +1,8 @@ { lib, stdenv , fetchurl -, fetchpatch -, autoreconfHook , pkg-config +, meson +, ninja , gettext , gobject-introspection , gtk-doc @@ -15,26 +15,19 @@ stdenv.mkDerivation rec { pname = "gupnp-igd"; - version = "0.2.5"; + version = "1.2.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb"; + sha256 = "sha256-S1EgCYqhPt0ngYup7k1/6WG/VAv1DQVv9wPGFUXgK+E="; }; - patches = [ - # Add gupnp-1.2 compatibility - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e.patch"; - sha256 = "0s8lkyy9fnnnnkkqwbk6gxb7795bb1kl1swk5ldjnlrzhfcy1ab2"; - }) - ]; - nativeBuildInputs = [ pkg-config - autoreconfHook + meson + ninja gettext gobject-introspection gtk-doc @@ -47,8 +40,8 @@ stdenv.mkDerivation rec { gupnp ]; - configureFlags = [ - "--enable-gtk-doc" + mesonFlags = [ + "-Dgtk_doc=true" ]; doCheck = true; @@ -62,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to handle UPnP IGD port mapping"; homepage = "http://www.gupnp.org/"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix index 286834112f..d9072e46e4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { pname = "htmlcxx"; @@ -9,12 +9,13 @@ stdenv.mkDerivation rec { sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07"; }; + buildInputs = [ libiconv ]; patches = [ ./ptrdiff.patch ]; meta = with lib; { homepage = "http://htmlcxx.sourceforge.net/"; description = "A simple non-validating css1 and html parser for C++"; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/iniparser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/iniparser/default.nix index 8c7fdfd04d..62deaeb1c2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/iniparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/iniparser/default.nix @@ -36,6 +36,9 @@ stdenv.mkDerivation rec { cp libiniparser.a $out/lib cp libiniparser.so.1 $out/lib ln -s libiniparser.so.1 $out/lib/libiniparser.so + + mkdir -p $out/lib/pkgconfig + substituteAll ${./iniparser.pc.in} $out/lib/pkgconfig/iniparser.pc ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/iniparser/iniparser.pc.in b/third_party/nixpkgs/pkgs/development/libraries/iniparser/iniparser.pc.in new file mode 100644 index 0000000000..fb94188fff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/iniparser/iniparser.pc.in @@ -0,0 +1,12 @@ +prefix=@out@ +exec_prefix=@out@ +libdir=${exec_prefix}/lib +includedir=${prefix}/include +datarootdir=${prefix}/share +datadir=${datarootdir} + +Name: libiniparser +Description: Iniparser library +Version: @version@ +Libs: -L${libdir} -liniparser +Cflags: -I${includedir} diff --git a/third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix new file mode 100644 index 0000000000..fa4421b941 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "jasper"; + version = "2.0.26"; + + src = fetchFromGitHub { + owner = "jasper-software"; + repo = pname; + rev = "version-${version}"; + hash = "sha256-zmoC8nIsQm2u2cSzu2prdyofo3JFNzJ1bjbIZ3YaAn4="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + meta = with lib; { + homepage = "https://jasper-software.github.io/jasper/"; + description = "Image processing/coding toolkit"; + longDescription = '' + JasPer is a software toolkit for the handling of image data. The software + provides a means for representing images, and facilitates the manipulation + of image data, as well as the import/export of such data in numerous + formats (e.g., JPEG-2000 JP2, JPEG, PNM, BMP, Sun Rasterfile, and + PGX). The import functionality supports the auto-detection (i.e., + automatic determination) of the image format, eliminating the need to + explicitly identify the format of coded input data. A simple color + management engine is also provided in order to allow the accurate + representation of color. Partial support is included for the ICC color + profile file format, an industry standard for specifying color. + + The JasPer software consists of a library and several application + programs. The code is written in the C programming language. This language + was chosen primarily due to the availability of C development environments + for most computing platforms when JasPer was first developed, circa 1999. + ''; + license = licenses.free; # MIT-like + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/kissfft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kissfft/default.nix index 5395ac4ab9..fe52adfa20 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kissfft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kissfft/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + substituteInPlace Makefile \ + --replace "gcc" "${stdenv.cc.targetPrefix}cc" \ + --replace "ar" "${stdenv.cc.targetPrefix}ar" + ''; makeFlags = [ "PREFIX=${placeholder "out"}" "DATATYPE=double" @@ -40,6 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mborgerding/kissfft"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/levmar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/levmar/default.nix index c5d6877a84..ed945d9e5a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/levmar/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/levmar/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { }; patchPhase = '' - sed -i 's/define HAVE_LAPACK/undef HAVE_LAPACK/' levmar.h + substituteInPlace levmar.h --replace "define HAVE_LAPACK" "undef HAVE_LAPACK" sed -i 's/LAPACKLIBS=.*/LAPACKLIBS=/' Makefile + substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" ''; installPhase = '' @@ -23,6 +24,6 @@ stdenv.mkDerivation rec { description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; homepage = "https://www.ics.forth.gr/~lourakis/levmar/"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcec/platform.nix b/third_party/nixpkgs/pkgs/development/libraries/libcec/platform.nix index 15972272a1..61eccf1f40 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcec/platform.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcec/platform.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { homepage = "https://github.com/Pulse-Eight/platform"; repositories.git = "https://github.com/Pulse-Eight/platform.git"; license = lib.licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.titanous ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcli/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcli/default.nix index ceb0338e5c..8aa06bfb19 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcli/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcli/default.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" "PREFIX=$(out)" ]; meta = with lib; { description = "Emulate a Cisco-style telnet command-line interface"; homepage = "http://sites.dparrish.com/libcli"; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcredis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcredis/default.nix index 902f5a6ee2..247d341bce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcredis/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { description = "C client library for Redis (key-value database)"; homepage = "https://code.google.com/archive/p/credis/"; license = licenses.bsd3; # from homepage - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcsptr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcsptr/default.nix index e30165054a..a8f33deda3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcsptr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcsptr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Smart pointer constructs for the (GNU) C programming language"; homepage = "https://github.com/Snaipe/libcsptr"; license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.all; maintainers = [ maintainers.fragamus ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index f7170fa7f1..5b2914c141 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.4"; + version = "3.14.5"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "1x72icq5lp5cfv6kyxqc3863wa164s0g41nbi6gldr8syprzdk1l"; + sha256 = "sha256-PSrYoz5ID88pYs/4rP2kz0NpI0pK6wcnx62HokE0g20="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix index e7a877962c..6a04201213 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix @@ -2,19 +2,20 @@ stdenv.mkDerivation rec { pname = "libebml"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libebml"; rev = "release-${version}"; - sha256 = "04bn1i7g4vwmkv3hv26rmcb59zkl2rh37qnfjm52j560bjlyd7im"; + sha256 = "1hiilnabar826lfxsaflqjhgsdli6hzzhjv8q2nmw36fvvlyks25"; }; nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=YES" + "-DCMAKE_INSTALL_PREFIX=" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix index daacf325e9..c7d84d9d8a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.26.0"; + version = "0.27.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-F+0iZZPo5GbOPD+M5YOzbHnxYxierVTWMWE8w9pcgL0="; + sha256 = "sha256-c3ClGHyrNgqhubLA2njRrebjupN1tIKniF3OBNZJqXs="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix index 2cd7da0784..fdaace2dc4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libgdata"; - version = "0.18.0"; + version = "0.18.1"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "8MIBEvpTcrYsASVvJorvUTGhYd/COGjzk+z3uLN1JYA="; + sha256 = "3YWS7rZRKtCoz1yL6McudvdL/msj5N2T8HVu4HFoBMc="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix index 43092f71c5..4532edfd88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.0.3"; + version = "1.2.0"; outputs = [ "out" "dev" "devdoc" "glade" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VZuzrMLDYkiJF+ty7SW9wYH0riaslNF3Y0zF00yGf3o="; + sha256 = "sha256-OfWQriCRDnb+HAYHsuvliXUPRWENau7Fww4u5gKiCyU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libisoburn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libisoburn/default.nix index 1e2ae41f3f..44367aad1f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libisoburn/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libisoburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libisoburn"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1v4hanapr02wf2i6rncc62z8cyc18078nb2y6q4hp3hxa74hnwnc"; + sha256 = "sha256-LYmEbUOIDxf6WRxTs76kL/uANijk5jDGgPwskYT3kTI="; }; buildInputs = [ attr zlib libburn libisofs ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblcf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblcf/default.nix index 2c7f098928..1e6f57368b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblcf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblcf/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/EasyRPG/liblcf"; license = licenses.mit; maintainers = with maintainers; [ yegortimoshenko ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblinear/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblinear/default.nix index caf0369601..aa2dcd648b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblinear/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblinear/default.nix @@ -4,13 +4,13 @@ let soVersion = "4"; in stdenv.mkDerivation rec { pname = "liblinear"; - version = "2.42"; + version = "2.43"; src = fetchFromGitHub { owner = "cjlin1"; repo = "liblinear"; rev = "v${builtins.replaceStrings ["."] [""] version}"; - sha256 = "0p0hpjajfkskhd7jiv5zwhfa8hi49q3mgifjlkqvy99xspv98ijj"; + sha256 = "sha256-qcSMuWHJgsapWs1xgxv3fKSXcx18q8cwyIn3E4RCGKA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix index 1dec830566..2208606a81 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.16.1"; + version = "3.17.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "0q9ixy8cjgd2d2lzxgkfd4chzr5j1bz783mg10pnwviyg6k630m5"; + sha256 = "sha256-rcySznUeoiUZnyVAmg/oYkUkLrZhBI8FEtiff0eHa+k="; }; outputs = [ "out" "dev" "man" "info" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix index 1d3cf4032d..a89bf9fc4a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libmatroska"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libmatroska"; rev = "release-${version}"; - sha256 = "0yhr9hhgljva1fx3b0r4s3wkkypdfgsysbl35a4g3krkbhaa9rsd"; + sha256 = "01dg12ndxfdqgjx5v2qy4mff6xjdxglywyg82sr3if5aw6rp3dji"; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=YES" + "-DCMAKE_INSTALL_PREFIX=" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix index dd902c0021..11b8d66b4a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1"; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "gcc" "${stdenv.cc.targetPrefix}cc" \ + --replace "ar" "${stdenv.cc.targetPrefix}ar" + ''; + makeFlags = [ "INSTALLPREFIX=$(out)" ]; meta = with lib; { @@ -17,6 +23,6 @@ stdenv.mkDerivation rec { description = "NAT-PMP client"; license = licenses.bsd3; maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnest2d/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnest2d/default.nix index 567598500d..1e666758f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnest2d/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnest2d/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { "2D irregular bin packaging and nesting library written in modern C++"; homepage = "https://github.com/Ultimaker/libnest2d"; license = licenses.lgpl3; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/liboauth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liboauth/default.nix index caab0a83fc..5fe5ba86be 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liboauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liboauth/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - platforms = platforms.linux; + platforms = platforms.all; description = "C library implementing the OAuth secure authentication protocol"; homepage = "http://liboauth.sourceforge.net/"; repositories.git = "https://github.com/x42/liboauth.git"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix index f46a203946..dc40086ad0 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.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "LibOFX"; repo = pname; rev = version; - sha256 = "sha256-gdLh5ZUciN4FCJwTCaJSKJ5RjXgNDXnDOUWkyTZwf2c="; + sha256 = "sha256-QIasZKwSD9YCidHCxT/HOThxE5HEQWD0I2/loDP6mlU="; }; preConfigure = "./autogen.sh"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpostal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpostal/default.nix index e6c507ad2b..d32cb2731a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpostal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpostal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpostal"; - version = "1.0.0"; + version = "1.1"; src = fetchFromGitHub { owner = "openvenues"; repo = "libpostal"; rev = "v${version}"; - sha256 = "0qf5nkfkfjl2ylkrnw7kzax71y85gkr8i24glyp9rflyzmpj6giy"; + sha256 = "sha256-gQTD2LQibaB2TK0SbzoILAljAGExURvDcF3C/TfDXqk="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix index f88f5614cc..c62aa77c61 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix @@ -35,6 +35,7 @@ let # Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation # is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE license = with licenses; [ mit publicDomain bsd3 asl20 ]; + maintainers = with maintainers; [ mindavi ]; platforms = platforms.all; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmi/default.nix index 037e7036f4..b9a2b6de3c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmi/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { description = "Library for rasterizing 2-D vector graphics"; homepage = "https://www.gnu.org/software/libxmi/"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix index b958f018b6..161833a928 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.2.1"; + version = "0.3.0"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "XD66YfD8fjaqp5pkcR8qNh7Srjh+atAIC2qkDTF7KdM="; + sha256 = "sha256-prHsigfjifwiuBSUHaCWhjJIaw1LkOGHJu20cdPgH9c="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmp/default.nix index 0b953f95d7..31a14ff6ae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT). ''; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.all; }; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/libraries/lightning/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lightning/default.nix index 5fdc06bce0..5f8c71fa6a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lightning/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lightning/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; license = licenses.lgpl3Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix index 0245417bbf..a8d9b23cc8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A lightweight C library for the Jabber protocol"; - platforms = platforms.linux; + platforms = platforms.all; downloadPage = "http://mcabber.com/files/loudmouth/"; downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$"; updateWalker = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lrdf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lrdf/default.nix index 51b2635b89..bd78a4329a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lrdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lrdf/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/lrdf/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/metal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/metal/default.nix index b98ae8e217..2f43485e05 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/metal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/metal/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/brunocodutra/metal"; license = licenses.mit; maintainers = with maintainers; [ pmiddend ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix index 93c03b31a8..9bf5235db8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A small XML library"; homepage = "https://www.msweet.org/mxml/"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/msgpuck/default.nix b/third_party/nixpkgs/pkgs/development/libraries/msgpuck/default.nix index 53fb3bec90..cc7b056bb9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/msgpuck/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/msgpuck/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "A simple and efficient MsgPack binary serialization library in a self-contained header file"; homepage = "https://github.com/rtsisyk/msgpuck"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ izorkin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix index 7b02e3497f..81a51c7bea 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.60"; + version = "3.62"; 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 = "0ggyj3ax3kal65sl1vl4nfhx2s08blg4dg8iwlxcax5qb9bxbaw4"; + sha256 = "0y2ld90bncjjggrn64c7g7mq9i03z6dc3r2kz978snz2xiydzml6"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index c87fc4fca7..c7b8339e71 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "2.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "sha256-PZ8r1eNfz4dVxlbtQJSrxiw/Hk6E6wSDapkMy7ux9fI="; + sha256 = "sha256-8nXzsY4+XnhKbuYyDWehiWqQEWoEcDBF4KagOg1WlN8="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix b/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix index 5c9c2c8da7..157769c777 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "0l035zbzyv623h5186rk6iq1097rxx64iwnk4s2c7l9gzv9wyapp"; + sha256 = "sha256-tArXiXmoWHd42IGBZKtc4QJIBy3USPlSeW+Dv5xl1EU="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/osip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/osip/default.nix index 322ed30a84..b7cfc5da9d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/osip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/osip/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/osip/"; description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/prime-server/default.nix b/third_party/nixpkgs/pkgs/development/libraries/prime-server/default.nix index e50b855ddd..4f30a9f005 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/prime-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/prime-server/default.nix @@ -3,19 +3,22 @@ stdenv.mkDerivation rec { pname = "prime-server"; - version = "0.6.7"; + version = "0.7.0"; src = fetchFromGitHub { owner = "kevinkreiser"; repo = "prime_server"; rev = version; - sha256 = "027w3cqfnciyy2x78hfclpb77askn773fab37mzwf6r3mcc7vyl5"; + sha256 = "0izmmvi3pvidhlrgfpg4ccblrw6fil3ddxg5cfxsz4qbh399x83w"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ curl zeromq czmq libsodium ]; + # https://github.com/kevinkreiser/prime_server/issues/95 + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-variable" ]; + meta = with lib; { description = "Non-blocking (web)server API for distributed computing and SOA based on zeromq"; homepage = "https://github.com/kevinkreiser/prime_server"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pxlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pxlib/default.nix index 3acaf8bac1..4b6b9ada7a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pxlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pxlib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Library to read and write Paradox files"; homepage = "http://pxlib.sourceforge.net/"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.winpat ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/redkite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/redkite/default.nix index bc82e95be7..eb3d7629a4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/redkite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/redkite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "redkite"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "16j9zp5i7svq3g38rfb6h257qfgnd2brrxi7cjd2pdax9xxwj40y"; + sha256 = "sha256-bf8kz9RyhDDuUHKiKvLiQLBIEXbIyoy3yuKfSpSYYv0="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/safefile/default.nix b/third_party/nixpkgs/pkgs/development/libraries/safefile/default.nix index db18621d8e..293a13dbdd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/safefile/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/safefile/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "File open routines to safely open a file when in the presence of an attack"; license = lib.licenses.asl20 ; maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; homepage = "https://research.cs.wisc.edu/mist/safefile/"; updateWalker = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/shhmsg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/shhmsg/default.nix index 0c736e4cb9..704df3dc5e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/shhmsg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/shhmsg/default.nix @@ -8,13 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0ax02fzqpaxr7d30l5xbndy1s5vgg1ag643c7zwiw2wj1czrxil8"; }; + postPatch = '' + substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" + ''; + installFlags = [ "INSTBASEDIR=$(out)" ]; meta = with lib; { description = "A library for displaying messages"; homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; - platforms = platforms.linux; + platforms = platforms.all; }; } - diff --git a/third_party/nixpkgs/pkgs/development/libraries/shhopt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/shhopt/default.nix index da1b820fcd..0657b13e55 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/shhopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/shhopt/default.nix @@ -8,12 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds"; }; + postPatch = '' + substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" + ''; + installFlags = [ "INSTBASEDIR=$(out)" ]; meta = with lib; { description = "A library for parsing command line options"; homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/spglib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spglib/default.nix index 12d696b65a..3d1236a03d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spglib/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://atztogo.github.io/spglib/"; license = licenses.bsd3; maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix index 07b670a271..1eaa3398e4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://www.spice-space.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bluescreen303 ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/tidyp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tidyp/default.nix index 5c0ad8463b..f4c24a126e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tidyp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tidyp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program that can validate your HTML, as well as modify it to be more clean and standard"; homepage = "http://tidyp.com/"; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ pSub ]; license = licenses.bsd3; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/volk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/volk/default.nix new file mode 100644 index 0000000000..574a90d227 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/volk/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, cppunit +, python3 +, enableModTool ? true +, removeReferencesTo +}: + +stdenv.mkDerivation rec { + pname = "volk"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "gnuradio"; + repo = pname; + rev = "v${version}"; + sha256 = "fuHJ+p5VN4ThdbQFbzB08VCuy/Zo7m/I1Gs5EQGPeNY="; + fetchSubmodules = true; + }; + + patches = [ + # Fixes a failing test: https://github.com/gnuradio/volk/pull/434 + (fetchpatch { + url = "https://github.com/gnuradio/volk/pull/434/commits/bce8531b6f1a3c5abe946ed6674b283d54258281.patch"; + sha256 = "OLW9uF6iL47z63kjvYqwsWtkINav8Xhs+Htqg6Kr4uI="; + }) + ]; + cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ]; + postInstall = '' + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) + ''; + + nativeBuildInputs = [ + cmake + python3 + python3.pkgs.Mako + ]; + + doCheck = true; + + meta = with lib; { + homepage = "http://libvolk.org/"; + description = "The Vector Optimized Library of Kernels"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix new file mode 100644 index 0000000000..aa7db78c4c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +}: + +stdenv.mkDerivation rec { + pname = "zxing-cpp"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "nu-book"; + repo = pname; + rev = "v${version}"; + hash = "sha256-N2FTzsjxm3EE5Wqz7xt+FS4zQ60Ow4WbdX6Eo08ktek="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + cmakeFlags = [ + "-DBUILD_EXAMPLES=OFF" + ]; + + meta = with lib; { + homepage = "https://github.com/nu-book/zxing-cpp"; + description = "C++ port of zxing (a Java barcode image processing library)"; + longDescription = '' + ZXing-C++ ("zebra crossing") is an open-source, multi-format 1D/2D barcode + image processing library implemented in C++. + + It was originally ported from the Java ZXing Library but has been + developed further and now includes many improvements in terms of quality + and performance. It can both read and write barcodes in a number of + formats. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} 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 new file mode 100644 index 0000000000..7f49430c15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix @@ -0,0 +1,21 @@ +{ mkDerivation, ansi-wl-pprint, base, fetchgit, lib, process, QuickCheck +, transformers, transformers-compat +}: +mkDerivation { + pname = "hercules-ci-optparse-applicative"; + version = "0.16.1.0"; + src = fetchgit { + url = "https://github.com/hercules-ci/optparse-applicative.git"; + sha256 = "0v0r11jaav95im82if976256kncp0ji7nfdrlpbgmwxnkj1hxl48"; + rev = "f9d1242f9889d2e09ff852db9dc2d231d9a3e8d8"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + ansi-wl-pprint base process transformers transformers-compat + ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/hercules-ci/optparse-applicative"; + description = "Utilities and combinators for parsing command line options (fork)"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ roberth ]; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix index bddf2a2448..eed6b158d4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,31 +1,26 @@ -{ lib, stdenv, fetchurl -, ocaml, findlib, pkg-config, perl +{ lib, stdenv, fetchFromGitHub +, ocaml, findlib, pkg-config , gmp }: -let source = - if lib.versionAtLeast ocaml.version "4.02" - then { - version = "1.11"; - url = "https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz"; - sha256 = "111n33flg4aq5xp5jfksqm4yyz6mzxx9ps9a4yl0dz8h189az5pr"; - } else { - version = "1.3"; - url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz"; - sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll"; - }; -in +if !lib.versionAtLeast ocaml.version "4.04" +then throw "zarith is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-zarith-${version}"; - inherit (source) version; - src = fetchurl { inherit (source) url sha256; }; + pname = "ocaml${ocaml.version}-zarith"; + version = "1.12"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "Zarith"; + rev = "release-${version}"; + sha256 = "1jslm1rv1j0ya818yh23wf3bb6hz7qqj9pn5fwl45y9mqyqa01s9"; + }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib perl ]; + buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ gmp ]; - patchPhase = "patchShebangs ./z_pp.pl"; dontAddPrefix = true; configureFlags = [ "-installdir ${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix index a142c69512..9f1ce65db0 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "php-cs-fixer"; - version = "2.18.2"; + version = "2.18.3"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-451be1O/y92ib5hZNVbf8iCkD+e9DoK47Z7IkMnwuo0="; + sha256 = "sha256-Bdk1+X+SKcVS/zxEqlgnR3zjq/l0ht7icE4sQ1hjn8g="; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index 5a7a856f3a..0e536d5713 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "0.12.79"; + version = "0.12.81"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-H6JmjdJtcCrNvad0ZbJ73OdRXimeTIJMVPuk8K6X6v8="; + sha256 = "sha256-mdqVrTrxWE2AuLVqgumA7V+JjzGW9ukkFM7klJSLeDE="; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix new file mode 100644 index 0000000000..b3d43acd1b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPecl, php, valgrind, pcre' }: + +buildPecl { + pname = "swoole"; + + version = "4.6.4"; + sha256 = "0hgndnn27q7fbsb0nw6bfdg0kyy5di9vrmf7g53jc6lsnf73ha31"; + + buildInputs = [ valgrind pcre' ]; + internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; + + doCheck = true; + checkTarget = "tests"; + + meta = with lib; { + description = "Coroutine-based concurrency library for PHP"; + license = licenses.asl20; + homepage = "https://www.swoole.co.uk/"; + maintainers = teams.php.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix index b5996a13d9..eb4dae8e3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, libspatialindex, numpy }: +{ lib, + stdenv, + buildPythonPackage, + fetchPypi, + libspatialindex, + numpy, + pytestCheckHook +}: buildPythonPackage rec { pname = "Rtree"; @@ -9,21 +16,23 @@ buildPythonPackage rec { sha256 = "be8772ca34699a9ad3fb4cfe2cfb6629854e453c10b3328039301bbfc128ca3e"; }; - propagatedBuildInputs = [ libspatialindex ]; + buildInputs = [ libspatialindex ]; patchPhase = '' - substituteInPlace rtree/core.py --replace \ + substituteInPlace rtree/finder.py --replace \ "find_library('spatialindex_c')" "'${libspatialindex}/lib/libspatialindex_c${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; - # Tests appear to be broken due to mysterious memory unsafe issues. See #36760 - doCheck = false; - checkInputs = [ numpy ]; + checkInputs = [ + numpy + pytestCheckHook + ]; + pythonImportsCheck = [ "rtree" ]; meta = with lib; { description = "R-Tree spatial index for Python GIS"; homepage = "https://toblerity.org/rtree/"; - license = licenses.lgpl21; + license = licenses.mit; maintainers = with maintainers; [ bgamari ]; }; } 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 22d2bfda81..3879aed84d 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,11 +6,11 @@ buildPythonPackage rec { pname = "Adafruit-PlatformDetect"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F5p3RO9847YQ7tDzb0r3+6dSCEAWoyxtMGBwhywR3/0="; + sha256 = "sha256-+rZUIZA2P7NZ4jbJsenGlD0OZi5fXFQ/Y5vJo4bmvMo="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix index b3cbfd212b..dfa576e657 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix @@ -1,24 +1,49 @@ -{ aiohttp, aresponses, buildPythonPackage, fetchFromGitHub, isPy3k, lib -, pytest-asyncio, pytestCheckHook, yarl }: +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, yarl +}: buildPythonPackage rec { pname = "adguardhome"; - version = "0.4.2"; - - disabled = !isPy3k; + version = "0.5.0"; + format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "frenck"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "0lcf3yg27amrnqvgn5nw4jn2j0vj4yfmyl5p5yncmn7dh6bdbsp8"; + sha256 = "sha256-f8uZF4DXbfiL1nL82shjGNpo6lXSUomRgO1YnNT/GDw="; }; - propagatedBuildInputs = [ aiohttp yarl ]; - checkInputs = [ aresponses pytest-asyncio pytestCheckHook ]; + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml --replace "--cov" "" + ''; + + pythonImportsCheck = [ "adguardhome" ]; meta = with lib; { - description = "Asynchronous Python client for the AdGuard Home API."; + description = "Python client for the AdGuard Home API"; homepage = "https://github.com/frenck/python-adguardhome"; license = licenses.mit; maintainers = with maintainers; [ jamiemagee ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix index 7bbfc623d3..890f44b4ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , isPy27 -, fetchFromGitHub +, fetchPypi , agate , sqlalchemy , crate @@ -15,11 +15,9 @@ buildPythonPackage rec { disabled = isPy27; - src = fetchFromGitHub { - owner = "wireservice"; - repo = "agate-sql"; - rev = version; - sha256 = "16rijcnvxrvw9mmyk4228dalrr2qb74y649g1l6qifiabx5ij78s"; + src = fetchPypi { + inherit pname version; + sha256 = "056dc9e587fbdfdf3f1c9950f4793a5ee87622c19deba31aa0a6d6681816dcde"; }; propagatedBuildInputs = [ agate sqlalchemy ]; 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 e91a0fb074..2bcb4d4264 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.10.0"; + version = "1.12.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b9cddf3eb239e32b14cf44750b21d7bc8d78b82aa53d57628523598dcd006803"; + sha256 = "adf2b1c6ef150a92295b4b405f982a9d2c55c4846728cb14760ca592acbb09ec"; }; 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 9781fcecaa..9d413cf7a6 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 @@ -3,23 +3,25 @@ , fetchPypi , msrest , azure-common +, azure-core , msrestazure }: buildPythonPackage rec { pname = "azure-eventgrid"; - version = "1.3.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c82c4bf6ea59aeec69ce8f95f1b6a4edc6d733874aeb056669c9d2806168c86e"; + sha256 = "a8b1d4aa9386efa923bad1a07da9f9098facd3b654d036a900a54de77d06eabe"; }; propagatedBuildInputs = [ + azure-common + azure-core msrest msrestazure - azure-common ]; # has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 7330ef5fb3..2685d8803b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -1,28 +1,29 @@ { lib , buildPythonPackage -, python , fetchPypi , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-applicationinsights"; - version = "0.3.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3c788a54db4fbca1a8850151462ec1471ff59c86b3a10d6082952bbdaa7e6651"; + sha256 = "c287a2c7def4de19f92c0c31ba02867fac6f5b8df71b5dbdab19288bb455fc5b"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core msrest msrestazure - azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; 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 e8a45ebf5a..2bfa56dc81 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 @@ -1,20 +1,18 @@ { lib , buildPythonPackage , fetchPypi -, python , azure-mgmt-common , azure-mgmt-core -, isPy3k }: buildPythonPackage rec { - version = "18.1.0"; + version = "19.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "02de691c5ce7237993e65b0ae6154b3bf8ec32bcb15f13ade72bc7f3cb3183d4"; + sha256 = "65afe759c6ee87dd89d65d59c8da4b2c04d197c07c1fbfdc56ef1aea468e4525"; }; 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 93c78c401f..c5adc61ea2 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 @@ -1,21 +1,27 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "0.10.0"; + version = "1.0.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "09e8d4928e19d12feb374adb47651b474f3ee3bc6a12704e4b70c9b38e3bcd9e"; + sha256 = "fa3ede0ebd6489bbf993f420bcb5fc63d9fad2a1e945c3c49b26fa012bb3534e"; 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-network/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix index b15fd3afa0..f70c8420c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage rec { - version = "17.1.0"; + version = "18.0.0"; pname = "azure-mgmt-network"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f47852836a5960447ab534784a9285696969f007744ba030828da2eab92621ab"; + sha256 = "85fdeb7a1a8d89be9b585396796b218b31b681590d57d82d3ea14cf1f2d20b4a"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 18e4a12d3b..c277122755 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -1,5 +1,4 @@ -{ lib, python, buildPythonPackage, fetchPypi, isPy27 -, fetchpatch +{ lib, buildPythonPackage, fetchPypi, isPy27 , azure-common , azure-core , msrest @@ -8,13 +7,13 @@ }: buildPythonPackage rec { - version = "0.4.1"; + version = "0.6.0"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0h7bzaqwyl3j9xqzjbnwxp59kmg6shxk76pml9kvvqbwsq9w6fx3"; + sha256 = "d805a91b295edf52057ffab26b714160905406bdd5d7a1a3f93f6cdc3ede8412"; }; propagatedBuildInputs = [ @@ -25,14 +24,6 @@ buildPythonPackage rec { requests ]; - # Fix to actually install the package - patches = [ - (fetchpatch { - url = "https://github.com/Azure/azure-multiapi-storage-python/pull/29/commits/1c8b08dfc9c5445498de3475dec8820eafbd0ca1.patch"; - sha256 = "1f80sdbw4pagrlp9dhcimhp23sdmy0whiba07aa84agkpv4df9ny"; - }) - ]; - # fix namespace pythonNamespaces = [ "azure.multiapi" ]; 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 cd42be98f9..7367e9604b 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.7.1"; + version = "12.8.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c6249f211684929ea6c9d34b5151b06d039775344f0d48fcf479736ed4c11b9e"; + sha256 = "36b85a3423379d4a93f663022487cf53aa3043a355f8414321dde878c00cb577"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beniget/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beniget/default.nix new file mode 100644 index 0000000000..c5508fb330 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/beniget/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, gast +}: + +buildPythonPackage rec { + pname = "beniget"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "062c893be9cdf87c3144fb15041cce4d81c67107c1591952cd45fdce789a0ff1"; + }; + + propagatedBuildInputs = [ + gast + ]; + + meta = { + description = "Extract semantic information about static Python code"; + homepage = "https://github.com/serge-sans-paille/beniget"; + license = lib.licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix index 17f996bfd7..1854bd4f71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bip_utils"; - version = "1.6.0"; + version = "1.7.0"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = pname; rev = "v${version}"; - sha256 = "0zbjrgl4dd65r3liyp8syxr106z1wn7ngfcm5dlfcxqwj8zkf56m"; + sha256 = "1dj0c9sj0c4dkdf7rbz3s1z5kfzw22hpncm4bnwqigjzi6nrk81z"; }; propagatedBuildInputs = [ ecdsa pysha3 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index 53633b041f..b287e7be98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "e31b472ac92e04ea943723cf781ec168e15049d91a3052203defb81652d2b086"; + sha256 = "e4de977d708b7024760266d827b8285e4405dce4293f25508c4556970139018a"; }; pythonImportsCheck = [ "bitarray" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/broadlink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/broadlink/default.nix index dcb1368f41..2418d282ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/broadlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/broadlink/default.nix @@ -1,25 +1,29 @@ -{ lib, fetchPypi, buildPythonPackage -, cryptography, pyaes, pycrc }: +{ lib +, buildPythonPackage +, fetchPypi +, cryptography +}: buildPythonPackage rec { pname = "broadlink"; - version = "0.16.0"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "637dabc6f47b283b72bc521322554462da7a247f04614e458d65df8574d03a41"; + sha256 = "bfd1ff007d0d1187c17ae52be938afc8137fbd1ed6a794426e975df10d167571"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace pyaes==1.6.0 pyaes - ''; - - propagatedBuildInputs = [ cryptography pyaes pycrc ]; + propagatedBuildInputs = [ + cryptography + ]; # no tests available doCheck = false; + pythonImportsCheck = [ + "broadlink" + ]; + meta = with lib; { description = "Python API for controlling Broadlink IR controllers"; homepage = "https://github.com/mjg59/python-broadlink"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix index 72334390bc..bc8cbe1f2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, toPythonModule , isPy3k , pythonOlder , pythonAtLeast @@ -23,7 +24,7 @@ }: let - pythonocc-core-cadquery = stdenv.mkDerivation { + pythonocc-core-cadquery = toPythonModule (stdenv.mkDerivation { pname = "pythonocc-core-cadquery"; version = "0.18.2"; @@ -61,7 +62,7 @@ let "-DSMESH_LIB_PATH=${smesh}/lib" "-DPYTHONOCC_WRAP_SMESH=TRUE" ]; - }; + }); in buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix index 3888bb7ec6..2b50b5f296 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "caldav"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "python-caldav"; repo = pname; rev = "v${version}"; - sha256 = "1shfj67kq6qzd0ngyfk09hpzfggybcfxv5s7hqs87nq9l51bssv8"; + sha256 = "11q3svns3a2ywfci739krxbh67cx691qja772wq22606blyygyjy"; }; nativeBuildInputs = lib.optionals (pythonOlder "3.5") [ mock ]; @@ -34,6 +34,10 @@ buildPythonPackage rec { tzlocal ]; + checkPhase = '' + nosetests tests + ''; + # xandikos and radicale is only a optional test dependency, not available for python3 postPatch = '' substituteInPlace setup.py \ @@ -45,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "This project is a CalDAV (RFC4791) client library for Python."; - homepage = "https://pythonhosted.org/caldav/"; + homepage = "https://github.com/python-caldav/caldav"; license = licenses.asl20; maintainers = with maintainers; [ marenz ]; #broken = true; # requires radicale which is not packaged yet diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix index d6e33ff8cb..6d86ccb954 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.18.2"; + version = "0.18.3"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0gi7qm02sdlmmmz6vi8d7b7kibgw4q67kix55y4jsvi0bvwc0i8w"; + sha256 = "1wbwccwizndiww9a3x1jhixzpcg2qmqlxidk2rqnrzvp04lb8b0q"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ciscomobilityexpress/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ciscomobilityexpress/default.nix index 86a2bd8aa8..d48ba03ad5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ciscomobilityexpress/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ciscomobilityexpress/default.nix @@ -1,20 +1,34 @@ -{ buildPythonPackage, fetchPypi, lib, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +, python +}: buildPythonPackage rec { pname = "ciscomobilityexpress"; - version = "1.0.0"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "fd3fe893d8a44f5ac1d46580af88e07f1066e73744763aca4ef2226f87d575ff"; + sha256 = "d8787245598e8371a83baa4db1df949d8a942c43f13454fa26ee3b09c3ccafc0"; }; propagatedBuildInputs = [ requests ]; - meta = { + # tests directory is set up, but has no tests + checkPhase = '' + ${python.interpreter} -m unittest + ''; + + pythonImportsCheck = [ + "ciscomobilityexpress" + ]; + + meta = with lib; { description = "Module to interact with Cisco Mobility Express APIs to fetch connected devices"; - homepage = "https://pypi.python.org/pypi/${pname}/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ uvnikita ]; + homepage = "https://github.com/fbradyirl/ciscomobilityexpress"; + license = licenses.mit; + maintainers = with maintainers; [ uvnikita ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix index 0dee95541b..cc26142d36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix @@ -9,8 +9,7 @@ buildPythonPackage rec { pname = "convertdate"; - version = "2.3.0"; - + version = "2.3.2"; disabled = isPy27; # Tests are not available in the PyPI tarball so use GitHub instead. @@ -18,7 +17,7 @@ buildPythonPackage rec { owner = "fitnr"; repo = pname; rev = "v${version}"; - sha256 = "17j188zlp46zmq8qyy4z4f9v25l3zibkwzj8wp4fxqgimjnfj2nr"; + sha256 = "0k7j59sbqwyi72vcjx5vsh3qb6hxfnkfjkd2i6f6lckdr1bkh7fz"; }; propagatedBuildInputs = [ @@ -30,6 +29,8 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ "convertdate" ]; + meta = with lib; { homepage = "https://github.com/fitnr/convertdate"; description = "Utils for converting between date formats and calculating holidays"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix index 1038431d31..32624e54c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { nativeBuildInputs = lib.optionals (!isPyPy) [ cffi + ] ++ [ rustPlatform.cargoSetupHook setuptools-rust ] ++ (with rustPlatform; [ rust.cargo rust.rustc ]); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix index 4766d04c1f..11d32adf3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , six, pyyaml, mock , pytestCheckHook , enum34 @@ -10,21 +9,13 @@ buildPythonPackage rec { pname = "ddt"; - version = "1.4.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "0595e70d074e5777771a45709e99e9d215552fb1076443a25fad6b23d8bf38da"; + sha256 = "sha256-ZKZzZqJxXmNriGlMxgdcwC2ykvAQmLjjhTl8iU05U3g="; }; - patches = [ - # fix tests with recent PyYAML, https://github.com/datadriventests/ddt/pull/96 - (fetchpatch { - url = "https://github.com/datadriventests/ddt/commit/97f0a2315736e50f1b34a015447cd751da66ecb6.patch"; - sha256 = "1g7l5h7m7s4yqfxlygrg7nnhb9xhz1drjld64ssi3fbsmn7klf0a"; - }) - ]; - checkInputs = [ six pyyaml mock pytestCheckHook ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix index 0d81110dee..c29737595a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix @@ -1,22 +1,30 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, vcver }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, setuptools-scm +, vcver +, pytestCheckHook +}: buildPythonPackage rec { pname = "deepmerge"; - version = "0.1.1"; + version = "0.2.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fa1d44269786bcc12d30a7471b0b39478aa37a43703b134d7f12649792f92c1f"; + sha256 = "082bvlk65pkf9qzkzzl8fq7s6zfz1b2v5pcb0ikwg1nx0xspggaz"; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ + setuptools-scm vcver ]; - # depends on https://pypi.org/project/uranium/ - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "deepmerge" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix index 36025e85bf..100c7ee6fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "defcon"; - version = "0.8.0"; + version = "0.8.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "028j7i39m75fnbyc6jsvwwiz31vq4slxwf47y6yszy1qn61xkcna"; + sha256 = "1sj9yhwkyvzchglpy07pkx5362mwlap581ibv150b5l9s5mxn2j1"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix new file mode 100644 index 0000000000..0f38faf573 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix @@ -0,0 +1,34 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "evohome-async"; + version = "0.3.8"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "zxdavb"; + repo = pname; + rev = version; + sha256 = "04xy72k79cnb8pc19v5jzkc0djazfm6pbm10ysphx06ndwvxr9mn"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "evohomeasync2" ]; + + meta = with lib; { + description = "Python client for connecting to Honeywell's TCC RESTful API"; + homepage = "https://github.com/zxdavb/evohome-async"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fluent-logger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fluent-logger/default.nix index 70c9173f4d..00cc8bf58a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fluent-logger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fluent-logger/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fluent-logger"; - version = "0.9.6"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "a7d47eae4d2a11c8cb0df10ae3d034d95b0b8cef9d060e59e7519ad1f82ffa73"; + sha256 = "678bda90c513ff0393964b64544ce41ef25669d2089ce6c3b63d9a18554b9bfa"; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix index 83fe052a54..94516e25a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "520dfe2ee04d28f3088c9c582fa2a534fc272647d5e2e59acc903c0152e61696"; + sha256 = "874defad583e90e55a3e83aff27eb5fe108d9197d839cd45f3eacf2395881806"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 228f3b68b6..2aa615a221 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.10.0"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "fac9adb1394d948e259fba1df4e86a6c34cfccaf19af7bdbdf9640cf6e313a71"; + sha256 = "d8f8464188e3eb03925a4f4acbf4e8fbfbde84a06145bd8a52c6b736113713ae"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 095e01fbbd..4308408bc5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "07rv2kgbaqkbd71k5i2zn9kcxasfzkkyai8jnbszhkf92k0lmi41"; + sha256 = "09e53889a60d84a71c505fe77174d242f00f28f989977aea91f6005cadfa466b"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix index 94d8d4738f..dcb820640a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "07zvagy9hwaccwvg1xad5nkalgkria0maa5yxiwqf1yk9f7gbyq1"; + sha256 = "c993129ecb1db6ab9b49cacfa11f368f30c7d897640c56f52558edf542c08ade"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix index 86fbc360d7..8787eb6779 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1f67mr473vzv0qgjm4hycfnrjgiqrsv47vqrynwjy9yrca2130y7"; + sha256 = "957f436986275dcc82483906b424dcabe8d1f8c08ae5c9677bf7547a314b0a59"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix index 102ab3a254..0397a2d762 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-ewWw3PyJGRHP23J6WBBWs9YGl4vTb9/j/soZ6n5wbLM="; + sha256 = "sha256-vDgjuNgwNp9cDgiCNxhACOcuaxcrR+0DW/U5OaSW0n4="; }; postPatch = '' @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/NabuCasa/hass-nabucasa"; description = "Home Assistant cloud integration by Nabu Casa, inc."; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ Scriptkiddi ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix index 68b1090c35..f75a84c01b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "howdoi"; - version = "2.0.12"; + version = "2.0.14"; src = fetchPypi { inherit pname version; - sha256 = "bab3eab349ec0b534cf1b05a563d45e4d301b914c53a7f2c3446fdcc60497c93"; + sha256 = "9416be3c8a319fc0764a743a2ad05fa374876dab71dbe15ce86c3a05ece44a0a"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/incomfort-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/incomfort-client/default.nix new file mode 100644 index 0000000000..d281ece246 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/incomfort-client/default.nix @@ -0,0 +1,34 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "incomfort-client"; + version = "0.4.5"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "zxdavb"; + repo = pname; + rev = version; + sha256 = "0r9f15fcjwhrq6ldji1dzbb76wsvinpkmyyaj7n55rl6ibnsyrwp"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "incomfortclient" ]; + + meta = with lib; { + description = "Python module to poll Intergas boilers via a Lan2RF gateway"; + homepage = "https://github.com/zxdavb/incomfort-client"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaggle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaggle/default.nix index 8ff1296373..6b67818dec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kaggle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaggle/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "kaggle"; - version = "1.5.10"; + version = "1.5.12"; src = fetchPypi { inherit pname version; - sha256 = "05a2a3d4adeebc8a465d037999ba8db2cb471a24b41d623d4bcb80aac02ddbc9"; + sha256 = "b4d87d107bff743aaa805c2b382c3661c4c175cdb159656d4972be2a9cef42cb"; }; # The version bounds in the setup.py file are unnecessarily restrictive. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix index 9d42d97e0d..e9f0eda56c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix @@ -22,16 +22,18 @@ buildPythonPackage rec { pname = "labgrid"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; rev = "v${version}"; - sha256 = "15298prs2f4wiyn8lf475qicp3y22lcjdcpwp2fmrya642vnr6w5"; + sha256 = "sha256-wMYsgZXNP8kTt/x8c4e96BXrbjIZZ6RsH04BfD0zGwo="; }; patches = [ + # Pyserial within Nixpkgs already includes the necessary fix, remove the + # pyserial version check from labgrid. ./0001-serialdriver-remove-pyserial-version-check.patch ]; 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 37266df5f2..3df0527589 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.8.0"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1dcc737ca517df53438bc9a3fae97f17d93d7a93fa1389e6bc44e82eee81ab83"; + sha256 = "582e92e3b9fa68084dca6ecfd8db866ddc75cd9043de267c79d6b6277dd27f55"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix index 21b93bf5bf..acdcf69e30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "0.6.19"; + version = "0.6.21"; pname = "msrest"; # no tests in PyPI tarball @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrest-for-python"; rev = "v${version}"; - sha256 = "sha256-hcUJrWw5EU0aO5Gyhn5+LmuRQN9Bom59cTz3maQ0jvw="; + sha256 = "sha256-IlBwlVQ/v+vJmCWNbFZKGL6a9K09z4AYrPm3kwaA/nI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix index a85bd0f8fc..dc7ba5d8b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 +, poetry-core , textfsm , pytestCheckHook , ruamel_yaml @@ -10,22 +11,36 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "1.6.0"; + version = "2.0.0"; + format = "pyproject"; disabled = isPy27; src = fetchFromGitHub { owner = "networktocode"; repo = pname; - rev = "dc27599b0c5f3bb6ff23049e781b5dab2849c2c3"; # not tagged - sha256 = "1vg5y5c51vc9dj3b8qcffh6dz85ri11zb1azxmyvgbq86pcvbx9f"; + rev = "v${version}"; + sha256 = "05ifbzps9jxrrkrqybsdbm67jhynfcjc298pqkhp21q5jwnlrl72"; }; - propagatedBuildInputs = [ textfsm ]; + nativeBuildInputs = [ + poetry-core + ]; - checkInputs = [ pytestCheckHook ruamel_yaml yamllint ]; + propagatedBuildInputs = [ + textfsm + ]; + + checkInputs = [ + pytestCheckHook + ruamel_yaml + yamllint + ]; # https://github.com/networktocode/ntc-templates/issues/743 - disabledTests = [ "test_raw_data_against_mock" "test_verify_parsed_and_reference_data_exists" ]; + disabledTests = [ + "test_raw_data_against_mock" + "test_verify_parsed_and_reference_data_exists" + ]; meta = with lib; { description = "TextFSM templates for parsing show commands of network devices"; 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 810bd1ffed..1686887a15 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.4.0"; + version = "4.4.1"; disabled = isPy27; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "0wzdzi5afncinavz5g77ximdr9y2ndzwb0gl819n0l6pnvbxdwp2"; + sha256 = "11zarqnrpis6xpsjdvfl3pczv1l9rzbgkawkv2lhfvzlnc00d7df"; }; 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 f4be0e5140..289f1871f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.8.5"; + version = "0.9.3"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = version; - sha256 = "1gviyy31l1j8z0if2id3m13r43kw4mcgd8921813yfhmf174piq4"; + sha256 = "sha256-MZ4R55vGUyWmR0Md83eNerzsgtYMch1vfQ3sqbm12bM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix index 63f5feada5..292c44cf58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix @@ -13,14 +13,14 @@ # TODO: bzr support is missing because nixpkgs switched to `breezy` buildPythonPackage rec { - version = "2.8.1"; + version = "2.8.2"; pname = "powerline"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0xscckcbw75pbcl4546ndrjs4682pn2sqqrd6qvqm0s6zswg7a0y"; + sha256 = "sha256-6V8ozl5KJQvytfflBmKJlIZQ5m3hkpCzMBtWZ2SzcQ0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix new file mode 100644 index 0000000000..77308a1966 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pydicom +, pyfakefs +, pytestCheckHook +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "pynetdicom"; + version = "1.5.5"; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = pname; + rev = "v${version}"; + sha256 = "0zjpscxdhlcv99py7jx5r6dw32nzbcr49isrzkdr6g3zwyxwzbfm"; + }; + + propagatedBuildInputs = [ + pydicom + ]; + + checkInputs = [ + pyfakefs + pytestCheckHook + sqlalchemy + ]; + + disabledTests = [ + # Some tests needs network capabilities + "test_str_types_empty" + "TestEchoSCP" + "TestEchoSCPCLI" + "TestStoreSCP" + "TestStoreSCPCLI" + "TestStoreSCU" + "TestStoreSCUCLI" + "TestQRGetServiceClass" + "TestQRMoveServiceClass" + ]; + + pythonImportsCheck = [ "pynetdicom" ]; + + meta = with lib; { + description = "Python implementation of the DICOM networking protocol"; + homepage = "https://github.com/pydicom/pynetdicom"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + # Tests are not passing on Darwin, thus it's assumed that it doesn't work + broken = stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix new file mode 100644 index 0000000000..864234a37e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestrunner +, ply +, networkx +, decorator +, gast +, six +, numpy +, beniget +, pytestCheckHook +, scipy +, isPy3k +}: + +buildPythonPackage rec { + pname = "pythran"; + version = "0.9.8post3"; + + src = fetchFromGitHub { + owner = "serge-sans-paille"; + repo = "pythran"; + rev = version; + sha256 = "sha256-GCWjJlf7zpFzELR6wTF8FoJzJ3F/WdT1hHjY5A5h/+4="; + }; + + nativeBuildInputs = [ + pytestrunner + ]; + + propagatedBuildInputs = [ + ply + networkx + decorator + gast + six + numpy + beniget + ]; + + pythonImportsCheck = [ + "pythran" + "pythran.backend" + "pythran.middlend" + "pythran.passmanager" + "pythran.toolchain" + "pythran.spec" + ]; + + checkInputs = [ + pytestCheckHook + numpy + scipy + ]; + + # Test suite is huge. + # Also, in the future scipy will rely on it resulting in a circular test dependency + doCheck = false; + + disabled = !isPy3k; + + meta = { + description = "Ahead of Time compiler for numeric kernels"; + homepage = https://github.com/serge-sans-paille/pythran; + license = lib.licenses.bsd3; + }; + +} 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 72a5474886..b1a1afbe20 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.17.1"; + version = "0.17.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-FNI6zodwlYdJDxncCOubClG9L1U6HGkQxdEEp0LdW04="; + sha256 = "sha256-DJglvcpqGBVkycEjq+Oa9gz9Keop39+UR9SctX0lg/A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/coan/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/coan/default.nix index 1e0b79e0da..3ef6c2b845 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/coan/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/coan/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { ''; homepage = "http://coan2.sourceforge.net/"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.all; }; } 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 fb5d5b0c53..77992b9909 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.4.4"; + version = "2.4.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-ZwGOk4HxURlPwGcWGHg6rqPh9ONPx9iJ2EB6lWKOMiY="; + sha256 = "sha256-FM7fcjbZilp1spy0HxDhEAzs7Qe2r/HObKB80o4mSiw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index f5450be16b..09a77d0f93 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.39.5"; + version = "0.39.6"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RDvwZyltPD21CQwZISOrLPVgQeRmPQc6/yssptS4XMw="; + sha256 = "sha256-2P+/y3iP/eMGGc0W1lHWWxO+uMy5gvlvjKzZ/8maJ9o="; }; goPackagePath = "github.com/tfsec/tfsec"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix index 73c23b8875..7e46e39b43 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qbs"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "0sd4qwl1wh8b1hck846plrgddkrdwdfqwk2dgh5hdsrlrvx5xjrr"; + sha256 = "sha256-W1ky3PWPzfKygY+diBld+BqTAxJvNw9mqw3owcQ6no4="; }; nativeBuildInputs = [ qmake ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix new file mode 100644 index 0000000000..dfca0c4d38 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix @@ -0,0 +1,23 @@ +{ haskell, haskellPackages, lib, makeWrapper, runc, stdenv }: +let + inherit (haskell.lib) overrideCabal addBuildDepends; + inherit (lib) makeBinPath; + bundledBins = lib.optional stdenv.isLinux runc; + + pkg = + # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 + overrideCabal + (addBuildDepends (haskell.lib.justStaticExecutables haskellPackages.hercules-ci-cli) [ makeWrapper ]) + (o: { + postInstall = '' + ${o.postInstall or ""} + mkdir -p $out/libexec + mv $out/bin/hci $out/libexec + makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${makeBinPath bundledBins} + ''; + }); +in pkg // { + meta = pkg.meta // { + position = toString ./default.nix + ":1"; + }; + } 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 c8316f4bb5..ccb8b4eba6 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,7 +1,9 @@ -{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper }: +{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, runc, stdenv }: let inherit (haskell.lib) overrideCabal addBuildDepends; inherit (lib) makeBinPath; + bundledBins = [ gnutar gzip git ] ++ lib.optional stdenv.isLinux runc; + pkg = # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 overrideCabal @@ -11,7 +13,7 @@ let ${o.postInstall or ""} mkdir -p $out/libexec mv $out/bin/hercules-ci-agent $out/libexec - makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath [ gnutar gzip git ]} + makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath bundledBins} ''; }); in pkg // { diff --git a/third_party/nixpkgs/pkgs/development/tools/gofumpt/default.nix b/third_party/nixpkgs/pkgs/development/tools/gofumpt/default.nix index e55cea0895..4249426633 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gofumpt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gofumpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gofumpt"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; rev = "v${version}"; - sha256 = "0xln0a5n8na3p6b7l8im3bh4ys5rr3k413ibzk8mnp471f5h1558"; + sha256 = "sha256-MHNxJ9DPBWrLkaEEfXOmRqo2h2ugwgZT/SIe7bi3J2E="; }; - vendorSha256 = "05qdwz1icl8in0j94gx9pgplidm2v29hsn4kgg5gw35bsbn1c7id"; + vendorSha256 = "sha256-LR4W7NKrDP7Ke5NYDZPYorZI77upP5IksBFRFsPnDRc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix index c10fa46f67..37763c7260 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.66.1"; + version = "0.67.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-D7xZbuxSdE1zcyVZ9hqNOgq1oZDSFjBeITNqKXEpjyU="; + sha256 = "sha256-ZwjgdOmpLl2kTpQU1mqfwq0nBLmK/Ej5ckDItQWeDKY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix index 6a94d40c20..07446c21b5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "k6"; - version = "0.30.0"; + version = "0.31.0"; goPackagePath = "github.com/loadimpact/k6"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "loadimpact"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eUvkW6IBmUp4/zYNlQKrNrxMszdzU8v6tCc2o4DN1As="; + sha256 = "sha256-UAVbYN4uDUMqUspycEZ2VGHzxFD7IlIW6m91U8ccZXw="; }; subPackages = [ "./" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix index 10e701d1e9..f741ca3382 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.25.1"; + version = "0.26"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A4Nim1jnyMHd5hxyLu8oZkQ9nDWxTmaX/25WX714ry4="; + sha256 = "sha256-9CiXbMYb+EoxBrVFiPuWAlRJvYAq8hpxVDFcymk7Ud0="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix index 69ed17ab4b..764fa66773 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { description = "Exploit Development and Reverse Engineering with GDB Made Easy"; homepage = "https://github.com/pwndbg/pwndbg"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ mic92 ]; }; } 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 eb823904ee..54adb5f829 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.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p9q+cSnMN6Na+XZoYSHfE4SCNYOEavXE+eWIaxcD73k="; + sha256 = "sha256-/g62LSlaIK67oY6dI8S3Lni85eBBI6piqP2Fsq3HXWQ="; }; - vendorSha256 = "sha256-XOIs5Ng0FYz7OfwbrNiVN3GTIABqxlO8ITKGfnC+kWo="; + vendorSha256 = "sha256-U0jVdyY4SifPWkOkq3ohY/LvfGcYm4rI+tW1QEm39oo="; # 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/ocaml/ocamlformat/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix index 57061cfe12..c3b4182a0b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -48,5 +48,9 @@ rec { version = "0.16.0"; }; - ocamlformat = ocamlformat_0_16_0; + ocamlformat_0_17_0 = mkOCamlformat { + version = "0.17.0"; + }; + + ocamlformat = ocamlformat_0_17_0; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 24527fcf41..69f26c5b88 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -20,6 +20,7 @@ let src = "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; "0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a"; "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr"; + "0.17.0" = "0f1lxp697yq61z8gqxjjaqd2ns8fd1vjfggn55x0gh9dx098p138"; }."${version}"; } ; in @@ -36,12 +37,33 @@ buildDunePackage rec { pname = "ocamlformat"; inherit src version; - minimumOCamlVersion = "4.06"; + minimumOCamlVersion = + if lib.versionAtLeast version "0.17.0" + then "4.08" + else "4.06"; useDune2 = true; buildInputs = - if lib.versionAtLeast version "0.15.1" + if lib.versionAtLeast version "0.17.0" + then [ + base + cmdliner + fpath + odoc + re + stdio + uuseg + uutf + fix + menhir + dune-build-info + ocaml-version + # Changed since 0.16.0: + (ppxlib.override { version = "0.22.0"; }) + ocaml-migrate-parsetree-2-1 + ] + else if lib.versionAtLeast version "0.15.1" then [ base cmdliner diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index 8491abac19..a73907cd25 100644 --- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-WMCd7+SUpKagoutBqI98KnoOd/UwJqFrSh0RAJQvuSo="; + sha256 = "sha256-IiPUmLgkD50LxOT+ZEf/UZJ0192GYOy9xk8U94Q0BWc="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix b/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix index 22bf5fbe90..ccf1d4a37d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix @@ -2,18 +2,20 @@ buildGoModule rec { pname = "renderizer"; - version = "2.0.9"; + version = "2.0.12"; src = fetchFromGitHub { owner = "gomatic"; repo = pname; - rev = version; - sha256 = "1bip12pcn8bqgph7vd7bzzadwbyqh80fx7gqciv9fchycwsj04rf"; + rev = "v${version}"; + sha256 = "sha256-Ji+wTTXLp17EYRIjUiVgd33ZeBdT8K2O8R2Ejq2Ll5I="; }; - vendorSha256 = "13z357ww4j5bmmy8ag6d6gd5b2dib8kby73q8317pqnqzaxrrbcj"; + buildFlagsArray = [ + "-ldflags=-s -w -X main.version=${version} -X main.commitHash=${src.rev} -X main.date=19700101T000000" + ]; - doCheck = false; + vendorSha256 = null; meta = with lib; { description = "CLI to render Go template text files"; diff --git a/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix b/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix index 828b8e5b1c..a3599d9ee9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nexus"; - version = "3.29.2-02"; + version = "3.30.0-01"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "sha256-vHy7V32xlYaPJdc8oi3j98weOdc4R5S64Dwo9YI8o6c="; + sha256 = "sha256-axhuw1FNut+JqS1WCxyQmP08qh0tXn9UAvz2Gj1kGPs="; }; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix index 931fb8fd98..664f3688ea 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-criterion"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "bheisler"; repo = pname; rev = version; - sha256 = "0czagclrn4yhlvlh06wsyiybz69r7mmk3182fywzn9vd0xlclxpi"; + sha256 = "sha256-NiuK+PexfF2wmA8drqqkv/RQlVwYLT3q2QWvV0ghJwg="; }; - cargoSha256 = "sha256-XZuZ81hB/GQDopJyfSkxQiehSwJz7VWoJR6/m3WLil8="; + cargoSha256 = "sha256-A6Kkm/4MSAEJfehA6zSQJU+JwVIhKPcfMZCO9S6Zyx4="; meta = with lib; { description = "Cargo extension for running Criterion.rs benchmarks"; 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 5080905533..da552600cd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -1,23 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, python3Packages, Security }: rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "19bwllrajks286wl4zc5axgh4m9qqxdnc5024c30hyk0xnjffd0c"; + sha256 = "1w9gf6fl1ncm2zlh0p29lislfsd35zd1mhns2mrxl2n734zavaqf"; }; - cargoSha256 = "1lzzckzcgj496chbfd6lhwxcangv0krx8m5k2jwffnb9mfgac7hx"; + cargoSha256 = "12jw1m842gzy0ma4drgmwk1jac663vysllfpl9cglr039j1sfsx2"; buildInputs = lib.optional stdenv.isDarwin Security; + checkInputs = [ + python3Packages.cython + ]; + checkFlags = [ + # Disable tests that require rust unstable features # https://github.com/eqrion/cbindgen/issues/338 "--skip test_expand" + "--skip test_bitfield" + "--skip lib_default_uses_debug_build" + "--skip lib_explicit_debug_build" + "--skip lib_explicit_release_build" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix index 0f4f1740fa..eea5dc9b10 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.24"; + version = "1.0.26"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dqjZQyh7SWkD2dBcB32pR3PgWPMGQYPo7AkOQURt0hs="; + sha256 = "sha256-JQeqCvnGWE0VesLQ6HbH7gikwAP3im19nBnwr1ruQqk="; }; vendorSha256 = "sha256-3KNYG6RBnfFRgIoIyAe7QwAB56ZMF8bHdgt9Ghtod20="; diff --git a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix index f43a0a369d..0458f63fdd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.13.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "0xhldarzb71x4k7ydk4yd6g0qv6y2l0mn2lc43hvl9jm29pnz95q"; + sha256 = "sha256-/5iIdEUbesX+IRQQzeJazt3i/xAtghblct718EmYci4="; }; - cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk"; + cargoSha256 = "sha256-6XWFhfY8QIl4S6zDyyM2YvFUoGMnKZQ3d/GT4yQWb7A="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix index b3a9ac0ce7..b9dcfa4fc8 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 = "2020.5.2"; + version = "2021.1.0"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "03j76a0dj3ak5h6malwxqf7cdc2ycwgyr6993bhiq75yhxhblhc4"; + sha256 = "sha256-3T334t+Oje6LOzUBqQCK6wdJ/4Mi4WLmW5vcHig8zj4="; }; nativeBuildInputs = diff --git a/third_party/nixpkgs/pkgs/games/cbonsai/default.nix b/third_party/nixpkgs/pkgs/games/cbonsai/default.nix index 4702991c29..9e318b92fa 100644 --- a/third_party/nixpkgs/pkgs/games/cbonsai/default.nix +++ b/third_party/nixpkgs/pkgs/games/cbonsai/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitLab, ncurses, pkg-config, nix-update-script }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.0.1"; pname = "cbonsai"; src = fetchFromGitLab { owner = "jallbrit"; repo = pname; rev = "v${version}"; - sha256 = "1jc34j627pnyjgs8hjxqaa89j24gyf0rq9w61mkhgg0kria62as7"; + sha256 = "sha256-UTjbc0kGHOQse4sZF94p4LAwMk9vsZg1QHq8iuDcTDk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json index 21aa2f6d20..1f8b201022 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/versions.json +++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.26.tar.xz", + "name": "factorio_alpha_x64-1.1.27.tar.xz", "needsAuth": true, - "sha256": "0wv1yv5v77h09nk2skfabqmxys40d806x09kac3jja1lhhr4hzl2", + "sha256": "0s8qnr2p819r4pjby71jp5in679yvsz235iy1csmjjm2d2q6igln", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.26/alpha/linux64", - "version": "1.1.26" + "url": "https://factorio.com/get-download/1.1.27/alpha/linux64", + "version": "1.1.27" }, "stable": { - "name": "factorio_alpha_x64-1.1.25.tar.xz", + "name": "factorio_alpha_x64-1.1.27.tar.xz", "needsAuth": true, - "sha256": "1xz03xr144grf5pa194j8pvyniiw77lsidkl32wha9x85fln5jhi", + "sha256": "0s8qnr2p819r4pjby71jp5in679yvsz235iy1csmjjm2d2q6igln", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.25/alpha/linux64", - "version": "1.1.25" + "url": "https://factorio.com/get-download/1.1.27/alpha/linux64", + "version": "1.1.27" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.26.tar.xz", + "name": "factorio_demo_x64-1.1.27.tar.xz", "needsAuth": false, - "sha256": "1b6rjyhjvdhdb0d3drjpjc1v8398amcz8wmh3d84gl3aafflfl1x", + "sha256": "0cgnv6w8bxxskf0gxqcg9hq0zl4idnwh5d61b0510axah1m6i57z", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.26/demo/linux64", - "version": "1.1.26" + "url": "https://factorio.com/get-download/1.1.27/demo/linux64", + "version": "1.1.27" }, "stable": { - "name": "factorio_demo_x64-1.1.25.tar.xz", + "name": "factorio_demo_x64-1.1.27.tar.xz", "needsAuth": false, - "sha256": "1v3rpi9cfx4bg4jqq3h8zwknb5wsidk3lf3qkf55kf4xw6fnkzcj", + "sha256": "0cgnv6w8bxxskf0gxqcg9hq0zl4idnwh5d61b0510axah1m6i57z", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.25/demo/linux64", - "version": "1.1.25" + "url": "https://factorio.com/get-download/1.1.27/demo/linux64", + "version": "1.1.27" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.26.tar.xz", + "name": "factorio_headless_x64-1.1.27.tar.xz", "needsAuth": false, - "sha256": "08hnyycwsj6srp2kcvnh5rixlcifk17r2814fr1g7jbdx7rp14mj", + "sha256": "08bny927jiph0zj101yx2wirm16194sap3ifk9rs582s506i1p2w", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.26/headless/linux64", - "version": "1.1.26" + "url": "https://factorio.com/get-download/1.1.27/headless/linux64", + "version": "1.1.27" }, "stable": { - "name": "factorio_headless_x64-1.1.25.tar.xz", + "name": "factorio_headless_x64-1.1.27.tar.xz", "needsAuth": false, - "sha256": "0xirxdf41sdsgcknvhdfg6rm12bwmg86bl4ml6ap1skifk8dlia1", + "sha256": "08bny927jiph0zj101yx2wirm16194sap3ifk9rs582s506i1p2w", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.25/headless/linux64", - "version": "1.1.25" + "url": "https://factorio.com/get-download/1.1.27/headless/linux64", + "version": "1.1.27" } } } diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index 5bffe2a490..90901bf2ee 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.226.0"; + version = "2021.312.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sK7FFyOb3JdsqIqvDNexhg3ZPNRpCE4hH0BADYeFHoU="; + sha256 = "xMq4KrEfSNuXpi4h+BDaHOuWBBPcWNByiKxxsR6EJwA="; }; 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 a1bbc6d051..c378e817e2 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -299,6 +299,11 @@ version = "5.0.2"; sha256 = "0qy4wamhcpxi9aqwq9kivhsj4rvhbch2wfwv11610psygb5457vk"; }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Connections.Abstractions"; + version = "5.0.3"; + sha256 = "1p4vzsx4q1lx93m2v1iy2z1i2dg2q5s2f6gznw5afbn5rqqqbsff"; + }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; version = "5.0.2"; @@ -314,6 +319,11 @@ version = "5.0.2"; sha256 = "1rprpj1aw9z501rpb9415maqcqnk6pirbdl8yv5n9wpqgcnjizk8"; }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http.Features"; + version = "5.0.3"; + sha256 = "0c6c5wpwkprf7a7mp1h10bvi2gg94lkpr3lznzpry3zjb5g7mk84"; + }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client"; version = "5.0.2"; @@ -329,6 +339,11 @@ version = "5.0.2"; sha256 = "1sbwp00hq0ng891wdj6yhah8hr9hw34zvqr1xzs86g3gpmssgcj5"; }) + (fetchNuGet { + name = "Microsoft.AspNetCore.SignalR.Common"; + version = "5.0.3"; + sha256 = "1g19vkc3g76r2fpjy7c1fkbvbihk9pfmx4wfsgpjflvydmvhqf9m"; + }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "5.0.2"; @@ -336,8 +351,8 @@ }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; - version = "5.0.2"; - sha256 = "1f0mjw0swiaxk4iqf7n598d51w40lwdbap4nlc0sv0vw3nklnlzp"; + version = "5.0.3"; + sha256 = "0wf53knadwxyww85wc6m82paj0wdgsq4kbg7a3v95r6vbh4pav45"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; @@ -494,6 +509,11 @@ version = "2.2.0"; sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "5.0.0"; + sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; + }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; @@ -546,8 +566,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; - version = "5.0.2"; - sha256 = "0asbw0l5syfgk2qb26czggvdix43d6043kl25ihdqdlhghcyy806"; + version = "5.0.3"; + sha256 = "1slfc4ncl83dl2g1xm95qb04bkyir26zhvz26lkph1jff0ycx2wb"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; @@ -706,8 +726,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.226.0"; - sha256 = "0875lcd28vmx4f40k8m957lcpg0ilkzm3da12j94xaqk88mx4j7c"; + version = "2021.309.0"; + sha256 = "1da0jgdcxd4zq0fzqhbm31gg66l8sgdgypis8xlch2xny1g854z6"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -841,8 +861,8 @@ }) (fetchNuGet { name = "Sentry"; - version = "3.0.1"; - sha256 = "1nmqwprp2xv9d8llfncyw94nfws9nwb7zj0sqrd6lv1mfgaxraql"; + version = "3.0.7"; + sha256 = "1wlfia0ihyx2jd07faz4jqbldxq9bx4hv787xkfk1469h7f2vvwk"; }) (fetchNuGet { name = "SharpCompress"; @@ -851,8 +871,8 @@ }) (fetchNuGet { name = "SharpCompress"; - version = "0.27.1"; - sha256 = "1lhljszs94i1ssl831ik1a51n2pshf27nsjm78acnw1y1qnkm5pd"; + version = "0.28.1"; + sha256 = "1h7gx7apafdd0jnv12fppca9b6cpq205kjkcipclxp1lli0i7qvw"; }) (fetchNuGet { name = "SharpFNT"; @@ -861,8 +881,8 @@ }) (fetchNuGet { name = "SixLabors.ImageSharp"; - version = "1.0.2"; - sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; + version = "1.0.3"; + sha256 = "1y43zvhjgi9rhylc8451784hhdi5b551hf7fsa6187b83wgxc47g"; }) (fetchNuGet { name = "Splat"; diff --git a/third_party/nixpkgs/pkgs/games/pentobi/default.nix b/third_party/nixpkgs/pkgs/games/pentobi/default.nix index 656bde2ac7..deb59eb237 100644 --- a/third_party/nixpkgs/pkgs/games/pentobi/default.nix +++ b/third_party/nixpkgs/pkgs/games/pentobi/default.nix @@ -3,14 +3,14 @@ }: mkDerivation rec { - version = "18.4"; + version = "18.5"; pname = "pentobi"; src = fetchFromGitHub { owner = "enz"; repo = "pentobi"; rev = "v${version}"; - sha256 = "1wawy6s3i4pcc6n6kfspn5b4g957ds0728mgwzw19agp5yyid73b"; + sha256 = "sha256-iVgG2Ee1nJWpuquX2ntFHAJrPA0u9YnutmOC+cMrgZg="; }; nativeBuildInputs = [ cmake docbook_xsl qttools ]; diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix index 6692f9bd9b..3600b2f144 100644 --- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -143,10 +143,10 @@ in buildFHSUserEnv rec { vulkan-loader expat wayland - xlibs.libxcb - xlibs.libXdamage - xlibs.libxshmfence - xlibs.libXxf86vm + xorg.libxcb + xorg.libXdamage + xorg.libxshmfence + xorg.libXxf86vm llvm_11.lib libelf ] ++ (if (!nativeOnly) then [ diff --git a/third_party/nixpkgs/pkgs/games/unciv/default.nix b/third_party/nixpkgs/pkgs/games/unciv/default.nix index 1632f7c41d..a7411c331a 100644 --- a/third_party/nixpkgs/pkgs/games/unciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "3.12.14"; + version = "3.13.7-patch2"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-FE6oPtEerjVusK3fpxLwcpvKjIAQl6oCrBj8GIkuVwU="; + sha256 = "sha256-5QYUYTnRblWWLYnhR1DBzoAt4d9EiYeXhzJRODmDHUA="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/games/vassal/default.nix b/third_party/nixpkgs/pkgs/games/vassal/default.nix index 2a916094af..cc9e9bd985 100644 --- a/third_party/nixpkgs/pkgs/games/vassal/default.nix +++ b/third_party/nixpkgs/pkgs/games/vassal/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "http://www.vassalengine.org/"; license = licenses.lgpl21Only; maintainers = with maintainers; [ tvestelind ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix index 754c0f4d1d..0d6ec276b5 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix @@ -1,4 +1,5 @@ -{lib, stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, pkgsi686Linux, zlib }: +{ lib, stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups +, ghostscript, pkgsi686Linux, zlib }: let @@ -20,7 +21,7 @@ in stdenv.mkDerivation { pname = "canon-cups-ufr2"; - version = version; + inherit version; src = src_canon; phases = [ "unpackPhase" "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/hll2340dw/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/hll2340dw/default.nix index 35d81b3da0..e61d3ace5f 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/hll2340dw/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/hll2340dw/default.nix @@ -1,4 +1,6 @@ -{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, perl, gnugrep, which}: +{ lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file +, a2ps, coreutils, perl, gnugrep, which +}: let version = "3.2.0-1"; diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix b/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix deleted file mode 100644 index 68f48a2db6..0000000000 --- a/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchgit, lilypond, ghostscript, gyre-fonts }: - -let - - version = "2.19.83"; - -in - -lilypond.overrideAttrs (oldAttrs: { - inherit version; - - src = fetchgit { - url = "https://git.savannah.gnu.org/r/lilypond.git"; - rev = "release/${version}-1"; - sha256 = "1ycyx9x76d79jh7wlwyyhdjkyrwnhzqpw006xn2fk35s0jrm2iz0"; - }; - - meta = oldAttrs.meta // { - broken = stdenv.isDarwin; - }; -}) diff --git a/third_party/nixpkgs/pkgs/misc/riscv-pk/default.nix b/third_party/nixpkgs/pkgs/misc/riscv-pk/default.nix index 4dd2626b56..66b7321c78 100644 --- a/third_party/nixpkgs/pkgs/misc/riscv-pk/default.nix +++ b/third_party/nixpkgs/pkgs/misc/riscv-pk/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, payload ? null }: let - rev = "e5846a2bc707eaa58dc8ab6a8d20a090c6ee8570"; - sha256 = "1clynpp70fnbgsjgxx7xi0vrdrj1v0h8zpv0x26i324kp2gwylf4"; - revCount = "438"; - shortRev = "e5846a2"; -in stdenv.mkDerivation { - name = "riscv-pk-0.1pre${revCount}_${shortRev}"; +{ lib, stdenv, fetchFromGitHub, autoreconfHook, payload ? null }: + +stdenv.mkDerivation rec { + pname = "riscv-pk"; + version = "1.0.0"; src = fetchFromGitHub { owner = "riscv"; repo = "riscv-pk"; - inherit rev sha256; + rev = "v${version}"; + sha256 = "1cc0rz4q3a1zw8756b8yysw8lb5g4xbjajh5lvqbjix41hbdx6xz"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py b/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py index f5d7434fe2..1180b4572d 100755 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py @@ -6,180 +6,18 @@ # type-check: # $ nix run nixpkgs.python3Packages.mypy -c mypy update.py # linted: -# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py +# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py -import argparse -import functools -import http -import json +import inspect import os -import subprocess import sys -import time -import traceback -import urllib.error -import urllib.parse -import urllib.request -import xml.etree.ElementTree as ET -from datetime import datetime -from functools import wraps -from multiprocessing.dummy import Pool +from typing import List, Tuple from pathlib import Path -from typing import Dict, List, Optional, Tuple, Union, Any, Callable -from urllib.parse import urljoin, urlparse -from tempfile import NamedTemporaryFile - -import git - -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" # " - -ROOT = Path(__file__).parent -DEFAULT_IN = ROOT.joinpath("vim-plugin-names") -DEFAULT_OUT = ROOT.joinpath("generated.nix") -DEPRECATED = ROOT.joinpath("deprecated.json") - -def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): - """Retry calling the decorated function using an exponential backoff. - http://www.saltycrane.com/blog/2009/11/trying-out-retry-decorator-python/ - original from: http://wiki.python.org/moin/PythonDecoratorLibrary#Retry - (BSD licensed) - :param ExceptionToCheck: the exception on which to retry - :param tries: number of times to try (not retry) before giving up - :param delay: initial delay between retries in seconds - :param backoff: backoff multiplier e.g. value of 2 will double the delay - each retry - """ - - def deco_retry(f: Callable) -> Callable: - @wraps(f) - def f_retry(*args: Any, **kwargs: Any) -> Any: - mtries, mdelay = tries, delay - while mtries > 1: - try: - return f(*args, **kwargs) - except ExceptionToCheck as e: - print(f"{str(e)}, Retrying in {mdelay} seconds...") - time.sleep(mdelay) - mtries -= 1 - mdelay *= backoff - return f(*args, **kwargs) - - return f_retry # true decorator - - return deco_retry - -def make_request(url: str) -> urllib.request.Request: - token = os.getenv("GITHUB_API_TOKEN") - headers = {} - if token is not None: - headers["Authorization"] = f"token {token}" - return urllib.request.Request(url, headers=headers) - -class Repo: - def __init__( - self, owner: str, name: str, branch: str, alias: Optional[str] - ) -> None: - self.owner = owner - self.name = name - self.branch = branch - self.alias = alias - self.redirect: Dict[str, str] = {} - - def url(self, path: str) -> str: - return urljoin(f"https://github.com/{self.owner}/{self.name}/", path) - - def __repr__(self) -> str: - return f"Repo({self.owner}, {self.name})" - - @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) - def has_submodules(self) -> bool: - try: - req = make_request(self.url(f"blob/{self.branch}/.gitmodules")) - urllib.request.urlopen(req, timeout=10).close() - except urllib.error.HTTPError as e: - if e.code == 404: - return False - else: - raise - return True - - @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) - def latest_commit(self) -> Tuple[str, datetime]: - commit_url = self.url(f"commits/{self.branch}.atom") - commit_req = make_request(commit_url) - with urllib.request.urlopen(commit_req, timeout=10) as req: - self.check_for_redirect(commit_url, req) - xml = req.read() - root = ET.fromstring(xml) - latest_entry = root.find(ATOM_ENTRY) - assert latest_entry is not None, f"No commits found in repository {self}" - commit_link = latest_entry.find(ATOM_LINK) - assert commit_link is not None, f"No link tag found feed entry {xml}" - url = urlparse(commit_link.get("href")) - updated_tag = latest_entry.find(ATOM_UPDATED) - assert ( - updated_tag is not None and updated_tag.text is not None - ), f"No updated tag found feed entry {xml}" - updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ") - return Path(str(url.path)).name, updated - - def check_for_redirect(self, url: str, req: http.client.HTTPResponse): - response_url = req.geturl() - if url != response_url: - new_owner, new_name = ( - urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2] - ) - end_line = "\n" if self.alias is None else f" as {self.alias}\n" - plugin_line = "{owner}/{name}" + end_line - - old_plugin = plugin_line.format(owner=self.owner, name=self.name) - new_plugin = plugin_line.format(owner=new_owner, name=new_name) - self.redirect[old_plugin] = new_plugin - - def prefetch_git(self, ref: str) -> str: - data = subprocess.check_output( - ["nix-prefetch-git", "--fetch-submodules", self.url(""), ref] - ) - return json.loads(data)["sha256"] - - def prefetch_github(self, ref: str) -> str: - data = subprocess.check_output( - ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")] - ) - return data.strip().decode("utf-8") - - -class Plugin: - def __init__( - self, - name: str, - commit: str, - has_submodules: bool, - sha256: str, - date: Optional[datetime] = None, - ) -> None: - self.name = name - self.commit = commit - self.has_submodules = has_submodules - self.sha256 = sha256 - self.date = date - - @property - def normalized_name(self) -> str: - return self.name.replace(".", "-") - - @property - def version(self) -> str: - assert self.date is not None - return self.date.strftime("%Y-%m-%d") - - def as_json(self) -> Dict[str, str]: - copy = self.__dict__.copy() - del copy["date"] - return copy +# Import plugin update library from maintainers/scripts/pluginupdate.py +ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) +sys.path.insert(0, os.path.join(ROOT.parent.parent.parent, "maintainers", "scripts")) +import pluginupdate GET_PLUGINS = f"""(with import {{}}; let @@ -197,204 +35,16 @@ let checksums = lib.mapAttrs getChecksum generated; in lib.filterAttrs (n: v: v != null) checksums)""" - -class CleanEnvironment(object): - def __enter__(self) -> None: - self.old_environ = os.environ.copy() - local_pkgs = str(ROOT.joinpath("../../..")) - os.environ["NIX_PATH"] = f"localpkgs={local_pkgs}" - self.empty_config = NamedTemporaryFile() - self.empty_config.write(b"{}") - self.empty_config.flush() - os.environ["NIXPKGS_CONFIG"] = self.empty_config.name - - def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None: - os.environ.update(self.old_environ) - self.empty_config.close() - - -def get_current_plugins() -> List[Plugin]: - with CleanEnvironment(): - out = subprocess.check_output(["nix", "eval", "--json", GET_PLUGINS]) - data = json.loads(out) - plugins = [] - for name, attr in data.items(): - p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"]) - plugins.append(p) - return plugins - - -def prefetch_plugin( - user: str, - repo_name: str, - branch: str, - alias: Optional[str], - cache: "Optional[Cache]" = None, -) -> Tuple[Plugin, Dict[str, str]]: - repo = Repo(user, repo_name, branch, alias) - commit, date = repo.latest_commit() - has_submodules = repo.has_submodules() - cached_plugin = cache[commit] if cache else None - if cached_plugin is not None: - cached_plugin.name = alias or repo_name - cached_plugin.date = date - return cached_plugin, repo.redirect - - print(f"prefetch {user}/{repo_name}") - if has_submodules: - sha256 = repo.prefetch_git(commit) - else: - sha256 = repo.prefetch_github(commit) - - return ( - Plugin(alias or repo_name, commit, has_submodules, sha256, date=date), - repo.redirect, - ) - - -def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin: - plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line)) - return plugin - - -def print_download_error(plugin: str, ex: Exception): - print(f"{plugin}: {ex}", file=sys.stderr) - ex_traceback = ex.__traceback__ - tb_lines = [ - line.rstrip("\n") - for line in traceback.format_exception(ex.__class__, ex, ex_traceback) - ] - print("\n".join(tb_lines)) - - -def check_results( - results: List[Tuple[str, str, Union[Exception, Plugin], Dict[str, str]]] -) -> Tuple[List[Tuple[str, str, Plugin]], Dict[str, str]]: - failures: List[Tuple[str, Exception]] = [] - plugins = [] - redirects: Dict[str, str] = {} - for (owner, name, result, redirect) in results: - if isinstance(result, Exception): - failures.append((name, result)) - else: - plugins.append((owner, name, result)) - redirects.update(redirect) - - print(f"{len(results) - len(failures)} plugins were checked", end="") - if len(failures) == 0: - print() - return plugins, redirects - else: - print(f", {len(failures)} plugin(s) could not be downloaded:\n") - - for (plugin, exception) in failures: - print_download_error(plugin, exception) - - sys.exit(1) - - -def parse_plugin_line(line: str) -> Tuple[str, str, str, Optional[str]]: - branch = "master" - alias = None - name, repo = line.split("/") - if " as " in repo: - repo, alias = repo.split(" as ") - alias = alias.strip() - if "@" in repo: - repo, branch = repo.split("@") - - return (name.strip(), repo.strip(), branch.strip(), alias) - - -def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, str, Optional[str]]]: - plugins = [] - with open(plugin_file) as f: - for line in f: - plugin = parse_plugin_line(line) - if not plugin[0]: - msg = f"Invalid repository {line}, must be in the format owner/repo[ as alias]" - print(msg, file=sys.stderr) - sys.exit(1) - plugins.append(plugin) - return plugins - - -def get_cache_path() -> Optional[Path]: - xdg_cache = os.environ.get("XDG_CACHE_HOME", None) - if xdg_cache is None: - home = os.environ.get("HOME", None) - if home is None: - return None - xdg_cache = str(Path(home, ".cache")) - - return Path(xdg_cache, "vim-plugin-cache.json") - - -class Cache: - def __init__(self, initial_plugins: List[Plugin]) -> None: - self.cache_file = get_cache_path() - - downloads = {} - for plugin in initial_plugins: - downloads[plugin.commit] = plugin - downloads.update(self.load()) - self.downloads = downloads - - def load(self) -> Dict[str, Plugin]: - if self.cache_file is None or not self.cache_file.exists(): - return {} - - downloads: Dict[str, Plugin] = {} - with open(self.cache_file) as f: - data = json.load(f) - for attr in data.values(): - p = Plugin( - attr["name"], attr["commit"], attr["has_submodules"], attr["sha256"] - ) - downloads[attr["commit"]] = p - return downloads - - def store(self) -> None: - if self.cache_file is None: - return - - os.makedirs(self.cache_file.parent, exist_ok=True) - with open(self.cache_file, "w+") as f: - data = {} - for name, attr in self.downloads.items(): - data[name] = attr.as_json() - json.dump(data, f, indent=4, sort_keys=True) - - def __getitem__(self, key: str) -> Optional[Plugin]: - return self.downloads.get(key, None) - - def __setitem__(self, key: str, value: Plugin) -> None: - self.downloads[key] = value - - -def prefetch( - args: Tuple[str, str, str, Optional[str]], cache: Cache -) -> Tuple[str, str, Union[Exception, Plugin], dict]: - assert len(args) == 4 - owner, repo, branch, alias = args - try: - plugin, redirect = prefetch_plugin(owner, repo, branch, alias, cache) - cache[plugin.commit] = plugin - return (owner, repo, plugin, redirect) - except Exception as e: - return (owner, repo, e, {}) - - -header = ( +HEADER = ( "# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!" ) -def generate_nix(plugins: List[Tuple[str, str, Plugin]], outfile: str): +def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) with open(outfile, "w+") as f: - f.write(header) + f.write(HEADER) f.write( """ { lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: @@ -432,136 +82,9 @@ in lib.fix' (lib.extends overrides packages) print(f"updated {outfile}") -def rewrite_input( - input_file: Path, redirects: Dict[str, str] = None, append: Tuple = () -): - with open(input_file, "r") as f: - lines = f.readlines() - - lines.extend(append) - - if redirects: - lines = [redirects.get(line, line) for line in lines] - - cur_date_iso = datetime.now().strftime("%Y-%m-%d") - with open(DEPRECATED, "r") as f: - deprecations = json.load(f) - for old, new in redirects.items(): - old_plugin = fetch_plugin_from_pluginline(old) - new_plugin = fetch_plugin_from_pluginline(new) - if old_plugin.normalized_name != new_plugin.normalized_name: - deprecations[old_plugin.normalized_name] = { - "new": new_plugin.normalized_name, - "date": cur_date_iso, - } - with open(DEPRECATED, "w") as f: - json.dump(deprecations, f, indent=4, sort_keys=True) - - lines = sorted(lines, key=str.casefold) - - with open(input_file, "w") as f: - f.writelines(lines) - - -def parse_args(): - parser = argparse.ArgumentParser( - description=( - "Updates nix derivations for vim plugins" - f"By default from {DEFAULT_IN} to {DEFAULT_OUT}" - ) - ) - parser.add_argument( - "--add", - dest="add_plugins", - default=[], - action="append", - help="Plugin to add to vimPlugins from Github in the form owner/repo", - ) - parser.add_argument( - "--input-names", - "-i", - dest="input_file", - default=DEFAULT_IN, - help="A list of plugins in the form owner/repo", - ) - parser.add_argument( - "--out", - "-o", - dest="outfile", - default=DEFAULT_OUT, - help="Filename to save generated nix code", - ) - parser.add_argument( - "--proc", - "-p", - dest="proc", - type=int, - default=30, - help="Number of concurrent processes to spawn.", - ) - return parser.parse_args() - - -def commit(repo: git.Repo, message: str, files: List[Path]) -> None: - repo.index.add([str(f.resolve()) for f in files]) - - if repo.index.diff("HEAD"): - print(f'committing to nixpkgs "{message}"') - repo.index.commit(message) - else: - print("no changes in working tree to commit") - - -def get_update(input_file: str, outfile: str, proc: int): - cache: Cache = Cache(get_current_plugins()) - _prefetch = functools.partial(prefetch, cache=cache) - - def update() -> dict: - plugin_names = load_plugin_spec(input_file) - - try: - pool = Pool(processes=proc) - results = pool.map(_prefetch, plugin_names) - finally: - cache.store() - - plugins, redirects = check_results(results) - - generate_nix(plugins, outfile) - - return redirects - - return update - - def main(): - args = parse_args() - nixpkgs_repo = git.Repo(ROOT, search_parent_directories=True) - update = get_update(args.input_file, args.outfile, args.proc) - - redirects = update() - rewrite_input(args.input_file, redirects) - commit(nixpkgs_repo, "vimPlugins: update", [args.outfile]) - - if redirects: - update() - commit( - nixpkgs_repo, - "vimPlugins: resolve github repository redirects", - [args.outfile, args.input_file, DEPRECATED], - ) - - for plugin_line in args.add_plugins: - rewrite_input(args.input_file, append=(plugin_line + "\n",)) - update() - plugin = fetch_plugin_from_pluginline(plugin_line) - commit( - nixpkgs_repo, - "vimPlugins.{name}: init at {version}".format( - name=plugin.normalized_name, version=plugin.version - ), - [args.outfile, args.input_file], - ) + editor = pluginupdate.Editor("vim", ROOT, GET_PLUGINS, generate_nix) + pluginupdate.update_plugins(editor) if __name__ == "__main__": diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index e932ab552f..75d6bf8022 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -365,8 +365,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.201"; - sha256 = "1hjck1r2byc45rp28gn15wbmcrl1wjng7kn5lyhr6mgjjwqh5pa8"; + version = "0.0.204"; + sha256 = "0gqgbvr7fs5znxyi1sjd40x14ppwswgnb3v9a7fkd9ap02ak831r"; }; meta = with lib; { license = licenses.mit; 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 7e7d0c618b..801c0a10e9 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.8.1"; + version = "2.8.2"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix"; - sha256 = "1pdpl8diqybqf68jvfk4kq9wg4k6c38811mh8iq12j4ba31cig9s"; + sha256 = "0f1ck3h8ckvr75j27w2lxjbwnr24nc6fjki0gnn715ynkqg7w9bi"; }; patches = [ ./fix-terraform-ls.patch ]; 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 a7f754a53a..61044526e4 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.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = version; - sha256 = "0lxfqin2bw9235yah8ylb4p8lc3755050sjg30z3gy7bab0lfyg9"; + sha256 = "sha256-1daYCVGz8Zd42j2QMFL5EAULKkmBnbE828i5NV9Kcb8="; }; 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 6801256c7d..6e7f8d89dd 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 @@ -6,7 +6,7 @@ stdenvNoCC.mkDerivation rec { src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = lib.replaceStrings ["-"] [""] version; + rev = "refs/tags/" + lib.replaceStrings ["-"] [""] version; sha256 = "0c85cd659312isfz1r87qswsgfhy0rljagcwspnvjljqrh9bsgzq"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/windows/mcfgthreads/default.nix b/third_party/nixpkgs/pkgs/os-specific/windows/mcfgthreads/default.nix index 122848a4e6..45c80ab897 100644 --- a/third_party/nixpkgs/pkgs/os-specific/windows/mcfgthreads/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/windows/mcfgthreads/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "lhmouse"; repo = "mcfgthread"; - rev = "9570e5ca7b98002d707c502c919d951bf256b9c6"; - sha256 = "10y2x3x601a7c1hkd6zlr3xpfsnlr05xl28v23clf619756a5755"; + rev = "c446cf4fcdc262fc899a188a4bb7136284c34222"; + sha256 = "1ib90lrd4dz8irq4yvzwhxqa86i5vxl2q2z3z04sf1i8hw427p2f"; }; outputs = [ "out" "dev" ]; @@ -18,10 +18,6 @@ stdenv.mkDerivation { rm -r "$sourceRoot/debug" "$sourceRoot/release" ''; - postPatch = '' - substituteInPlace Makefile.am --replace '-Werror' "" - ''; - nativeBuildInputs = [ autoreconfHook ]; 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 347dd2137c..98fba35b9f 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.3.3"; + version = "2021.3.4"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -236,7 +236,7 @@ "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; [ ]; # missing inputs: evohome-async + "evohome" = ps: with ps; [ evohome-async ]; "ezviz" = ps: with ps; [ ]; # missing inputs: pyezviz "faa_delays" = ps: with ps; [ faadelays ]; "facebook" = ps: with ps; [ ]; @@ -385,7 +385,7 @@ "image_processing" = ps: with ps; [ aiohttp-cors ]; "imap" = ps: with ps; [ aioimaplib ]; "imap_email_content" = ps: with ps; [ ]; - "incomfort" = ps: with ps; [ ]; # missing inputs: incomfort-client + "incomfort" = ps: with ps; [ incomfort-client ]; "influxdb" = ps: with ps; [ influxdb-client influxdb ]; "input_boolean" = ps: with ps; [ ]; "input_datetime" = 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 34a8f7f6c0..dc61317876 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -66,7 +66,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.3.3"; + hassVersion = "2021.3.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -85,7 +85,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0kfvjpzz6ynw8bwd91nm0aiw1pkrmaydwf1r93dnwi8rmzq10zpb"; + sha256 = "110pvin39lr40zd3lhb8zvh2wafl0k0dy3nbmc483yafy31xa4kw"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix index cf83b2946a..49259f49f2 100644 --- a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.16.0"; + version = "2.16.2"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-HUWDwUt/yHgwzqtQKsQ3DrBAfL8PBqGhFLMwS7ix5qE="; + sha256 = "sha256-wr4yOrzZT/4WtRze9Yp+M18jusxdddoDd4xs5P7d5oQ="; rev = "v${version}"; }; - vendorSha256 = "sha256-A03Qdwxv/uUKI4Lfmatqwu1RDH9vKU63Y+x25AdfZXs="; + vendorSha256 = "sha256-7IpMgsATQ1SMuBOF9agHIN2Lx6OKxRr0Zk5SRFxHiQ4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix index caca89bfd0..6b67ef939d 100644 --- a/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix @@ -18,34 +18,36 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.6.4"; + version = "10.7.0"; # 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 = "OqN070aUKPk0dXAy8R/lKUnSWen+si/AJ6tkYh5ibqo="; + sha256 = "sha256-63T1EBjtTWxg41W5gBDYCthgnokZ/e/B1s6BmymO32w="; }; - buildInputs = [ + nativeBuildInputs = [ unzip makeWrapper ]; propagatedBuildInputs = [ - dotnetCorePackages.aspnetcore_3_1 + dotnetCorePackages.aspnetcore_5_0 sqlite ]; preferLocalBuild = true; installPhase = '' + runHook preInstall install -dm 755 "$out/opt/jellyfin" cp -r * "$out/opt/jellyfin" - makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/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" + runHook postInstall ''; passthru.tests = { @@ -55,7 +57,8 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "The Free Software Media System"; homepage = "https://jellyfin.org/"; - license = licenses.gpl2; + # https://github.com/jellyfin/jellyfin/issues/610#issuecomment-537625510 + license = licenses.gpl2Plus; maintainers = with maintainers; [ nyanloutre minijackson purcell ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/kapowbang/default.nix b/third_party/nixpkgs/pkgs/servers/kapowbang/default.nix index 94a1832bd8..efd2b17d7e 100644 --- a/third_party/nixpkgs/pkgs/servers/kapowbang/default.nix +++ b/third_party/nixpkgs/pkgs/servers/kapowbang/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kapowbang"; - version = "0.6.0"; + version = "0.7.0"; subPackages = [ "." ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "BBVA"; repo = "kapow"; rev = "v${version}"; - sha256 = "sha256-+GZarnG+SlxynoXYTvI1f9eki3DobiDt7vUdWlC0ECk="; + sha256 = "sha256-0ftdc3ol1g0WnZgicXl46Xpph4cUYk/G/eeu+9JnPyA="; }; - vendorSha256 = "sha256-vXu64o/MTmw9oZL4MIHB+PEfYLcKVh5A5iGZ1RW1Xd4="; + vendorSha256 = "sha256-41Jk3aTe4EA5dwkriEo48QNJg2k3T/R/8i8XWcURcG8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/default.nix index f3dbaa1573..f68be9f8e6 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/default.nix @@ -3,4 +3,5 @@ { matrix-synapse-ldap3 = callPackage ./ldap3.nix { }; matrix-synapse-pam = callPackage ./pam.nix { }; + matrix-synapse-shared-secret-auth = callPackage ./shared-secret-auth.nix { }; } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix new file mode 100644 index 0000000000..5c0dc1e2ce --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix @@ -0,0 +1,18 @@ +{ buildPythonPackage, fetchFromGitHub, twisted }: + +buildPythonPackage rec { + pname = "matrix-synapse-shared-secret-auth"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "devture"; + repo = "matrix-synapse-shared-secret-auth"; + rev = version; + sha256 = "0cnxp3bp8mmk01a0g3lzgvaawyywjg754j4nb9iwkmm3c2nqvnpz"; + }; + + doCheck = false; + pythonImportsCheck = [ "shared_secret_authenticator" ]; + + propagatedBuildInputs = [ twisted ]; +} diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index 0758a863fc..a2ffe32acd 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2021-03-10T05-11-33Z"; + version = "2021-03-12T00-00-47Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-YwlVZE7TO9qr/8lwLXdZqjxy4NGxTkmLyKFDVlTZPqQ="; + sha256 = "sha256-7KHEmnrTw6SBhsImMjcv+b1wvFEg8AXgsuZTGp5iVis="; }; - vendorSha256 = "sha256-E+j+ysBKKSyTITmJwHieBcpXdF3+rtt4YS7OVPMC6vI="; + vendorSha256 = "sha256-tMt6XRj1dd+AHqWA6WGm5GBFGx+IsP1ijYCj8cmUXy0="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 370006a591..d6e7983132 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -2,14 +2,14 @@ }: buildGoModule rec { - version = "2.1.0"; + version = "2.2.0"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "O/3079a67j1i9pgf18SBx0iJcQPVmb0H+K/PzQVBCDQ="; + sha256 = "sha256-mEu9z3lhHSE0NMXXViX4OBbIiNba7/RPr+AFmIM77g4="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix new file mode 100644 index 0000000000..b68b168191 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchgit, nixosTests }: + +buildGoModule rec { + pname = "jitsiexporter"; + version = "0.2.18"; + + src = fetchgit { + url = "https://git.xsfx.dev/prometheus/jitsiexporter"; + rev = "v${version}"; + sha256 = "1cf46wp96d9dwlwlffcgbcr0v3xxxfdv6il0zqkm2i7cfsfw0skf"; + }; + + vendorSha256 = null; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) jitsi; }; + + meta = with lib; { + description = "Export Jitsi Videobridge metrics to Prometheus"; + homepage = "https://git.xsfx.dev/prometheus/jitsiexporter"; + license = licenses.mit; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix index 40a304bafb..bf6d95b65d 100644 --- a/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix @@ -4,14 +4,14 @@ with lib; buildGoPackage rec { pname = "nats-streaming-server"; - version = "0.21.0"; + version = "0.21.1"; goPackagePath = "github.com/nats-io/${pname}"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-vZFX5YDf722c7xc4oh4SoL91s7XuZsXzFxW+i//mOUw="; + sha256 = "sha256-GqnIGnXcOcfbAgUruVxsTSvi6pH1E3QugEmZr3tPiIY="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix index 1cb5e37cb9..cf96edfe96 100644 --- a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pnMUUxV4DM2YClwc24l+5Ehh5zc+qEOLTtiqh7c+8PI="; + sha256 = "sha256-U0wZ0NrvCQjMLDDjO6Jf6uu5FlHar7Td2zhoU2+MMkM="; }; - vendorSha256 = "sha256-oWWUEPEpMLqXucQwUvM6fyGCwttTIV6ZcCM2VZXnKuM="; + vendorSha256 = "sha256-dfAuq4iw3NQ4xaabPv7MQ88CYXgivRBeyvbmJ3SSjbI="; # Tests need docker doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 8f922baea6..8e9e06d7ef 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "1.15.3"; + version = "1.16.0"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TbQanXNdomEjp11izowy4763NsQWUe5rLxoEmuHKFn0="; + sha256 = "sha256-ZZvRrt2JaAWruAT4FXB6ChS0jLKpUEDCF2UmAAH4BRQ="; }; buildInputs = [ postgresql ]; diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index f09f99e66b..6053b09731 100644 --- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix +++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.4.6"; + version = "2.4.7"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "1f2gj9axmdisp4yza5pa60x2s79vdybgsb5ddyfwkl5m89sh0r2z"; + sha256 = "sha256-K1uSfsi/uC41ukDGaWaYIKX6A+SU59x3a/DYip9/LPI="; stripRoot = false; }; - vendorSha256 = "1w9crp4bk5dk0ph558w9mj8cylm2z6bc81hghmv86ild524a0l9v"; + vendorSha256 = "sha256-MCQbSy2TOSkZoqC2POIq8mDRld4fe245m0Xe0drxEq8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix index af565e6292..4cc51baace 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ] }: let - version = "3.10.1"; + version = "3.10.2"; stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version)); in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "sha256-VHlz8twsp7mSwZPatJkciHaDOP0r0EudeG5i3gjPUT8="; + sha256 = "sha256-s20GtwqV1BAVr2q+DxG6hqKnDqM0dVm6TbokmPC8Hrs="; }; phpConfig = writeText "config.php" '' diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index 5b0ba490bf..3b570c89ae 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Ms3ofPU7pd1qOxTJ7jImT2DawTcFLeI7Fi+xihsWhKY="; + sha256 = "sha256-8mS4Yvzyka85ZkV2LT68h4EGmumQtYpOxCIDRqa3fk0="; }; - cargoSha256 = "sha256-cJ+P/AaptZGOyjIu+66M1/rMYpVPFZGQDPeakUws3CQ="; + cargoSha256 = "sha256-jbziXOrmHkZPp3YkPJypNj7l62Q6nKyamBBYjlfYiVE="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/shells/powershell/default.nix b/third_party/nixpkgs/pkgs/shells/powershell/default.nix index 3f9d713081..dfc4f94e12 100644 --- a/third_party/nixpkgs/pkgs/shells/powershell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/powershell/default.nix @@ -4,8 +4,8 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "0zv02h3njphrs8kgmicy7w40mmhmigdfl38f2dpwrs6z67f8vrm2" - else if stdenv.isLinux then "0dka2q8ijg3ryzwmxapf8aq55d0sgaj6jj0rzj2738in9g4w2hbh" + platformSha = if stdenv.isDarwin then "0w44ws8b6zfixf7xz93hmplqsx18279n9x8j77y4rbzs13fldvsn" + else if stdenv.isLinux then "0xm7l49zhkz2fly3d751kjd5cy3ws9zji9i0061lkd06dvkch7jy" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.1.0"; + version = "7.1.3"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; 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 6379fa94bd..0c41f4127c 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.18.0"; + version = "2.20.0"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-3qQKQePyLYwIS3yO3exHNd0uoPr7y4iZ12+GaiHfqz8="; + sha256 = "sha256-unG17oiqZZJNGg8QCg7xY0GzuMu2gaAIIgGF8TlMBQQ="; }; # put packages that needs to be overriden in the py package scope @@ -137,6 +137,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { psutil requests scp + semver six sshtunnel urllib3 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 8decd2f80f..e81815b065 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 @@ -61,6 +61,7 @@ let azure-mgmt-core azure-mgmt-resource colorama + cryptography humanfriendly jmespath knack @@ -85,7 +86,8 @@ let postPatch = '' substituteInPlace setup.py \ - --replace "azure-mgmt-core==1.2.1" "azure-mgmt-core~=1.2" + --replace "azure-mgmt-core==1.2.1" "azure-mgmt-core~=1.2" \ + --replace "cryptography>=3.2,<3.4" "cryptography" ''; doCheck = stdenv.isLinux; @@ -136,8 +138,8 @@ let azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "1.0.0" "zip" "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0"; - azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.2.0" "zip" - "sha256-sh2IWOaaoW0luQjEARah93PBJ+xN1gLLuFQuvzmlXYM="; + azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.3.0" "zip" + "f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1"; azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip" "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd"; @@ -148,8 +150,8 @@ let azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip" "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1"; - azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" - "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; + azure-mgmt-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="; @@ -160,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 "18.0.0" "zip" - "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879e"; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "19.0.0" "zip" + "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879a"; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; @@ -175,8 +177,8 @@ let azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip" "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998"; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "1.0.0" "zip" - "08xp04mkl5ajwyr0l62c8bfb4n8p9s9fp6szynb2bdp6m2p3g2z0"; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "3.0.0" "zip" + "sha256-/WV5vxXOg9CUT+NAnhpOG7f+QBGfUlTNVO26LTtuIoM="; azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; @@ -190,8 +192,8 @@ let azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.12.0" "zip" "187z0w5by7d9a2zsz3kidmzjw591akpc6dwhps4jyb4skcmyw86s"; - azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "3.0.0" "zip" - "0iq04hvivq3fvg2lhax95gx0x35avk5hps42227z3qna5i2cznpn"; + azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "4.1.0" "zip" + "e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6"; azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" "1pmcdgimd66h964a3d5m2j2fbydshcwhrk87wblhwhfl3xwbgf4y"; @@ -199,23 +201,23 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.14.0" "zip" - "0f8m7j8sdm1rfrwizz3qfk4lyb2x02af3v66as5yqjriipk1bnbg"; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.15.0" "zip" + "sha256-XpjDYGCad7RDsv5DHgM35ctwW08C0CBHkfmYX3zmiDY="; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; - azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.7.0" "zip" - "18n2lqvrhq40gdqhlzzg8mc03571i02c7qq7jv771lc58rqpzysh"; + azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "8.0.0" "zip" + "3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "17.0.0" "zip" - "3694f2675e152afccb1588a6cc7bb4b4795d442a4e5d7082cdf1f4e32a779199"; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "17.1.0" "zip" + "f47852836a5960447ab534784a9285696969f007744ba030828da2eab92621ab"; azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "0.1.0" "zip" "sha256-baEkJcurDMYvJG5yZrTWev9r3QMey+UMdULC8rJECtQ="; - azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "2.1.0" "zip" - "1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm"; + azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "3.0.0" "zip" + "sha256-iUR3VyXFJTYU0ldXbYQe5or6NPVwsFwJJKf3Px2yiiQ="; azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; @@ -232,8 +234,8 @@ let azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip" "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; - azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "2.0.0" "zip" - "14v8ja8har2xrb00v98610pqvakcdvnzw8hkd6wbr1np3f3dxi8f"; + azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "8.0.0" "zip" + "a96d50c88507233a293e757202deead980c67808f432b8e897c4df1ca088da7e"; azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.6.0" "zip" "9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3"; @@ -241,14 +243,14 @@ let azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "0.4.0" "zip" "09n12ligh301z4xwixl50n8f1rgd2k6lpsxqzr6n6jvgkpdds0v5"; - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.21.0" "zip" - "0023q32z4vn94l5aqf7h6ld4ai12a703y7glnl02lls25qfs9xvv"; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.26.0" "zip" + "sha256-tmsxhHt6mRWNOXDebckZSXt4L8+757NRKSDu6wVMqRE="; azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip" "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm"; - azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.5.0" "zip" - "0dr8xml9zlsnag761zx7ifvdkhsv4syzxpmdn4gbf9c5qcq65dsf"; + azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.6.0" "zip" + "sha256-+By1KyIHdKq5P/zyW9wX4D/YS2kWg2ZAeJ+G+/Y2uYQ="; azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "4.1.0" "zip" "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4"; @@ -262,14 +264,14 @@ let azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "8.0.0" "zip" "2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d"; - azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.2.0" "zip" - "10b8y1b5qlyr666x7yimnwis9386ciphrxdnmmyzk90qg6h0niry"; + azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "7.0.0" "zip" + "sha256-6abJoZs5cbodve75bApaLDWUYzp1R6YOa/y4Azhk7jg="; azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc16" "zip" "eT5gH0K4q2Qr1lEpuqjxQhOUrA6bEsAktj+PKsfMXTo="; - azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.11.0" "zip" - "05jhn66d4sl1qi6w34rqd8wl500jndismiwhdmzzmprdvn1zxqf6"; + azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip" + "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82"; azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "2.0.1" "zip" "1wsfkprdrn22mwm24y2zlcms8ppp7jwq3s86r3ymbl29pbaxca8r"; @@ -280,8 +282,8 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "16.0.0" "zip" - "2f9d714d9722b1ef4bac6563676612e6e795c4e90f6f3cd323616fdadb0a99e5"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "17.0.0" "zip" + "c0e3fd99028d98c80dddabe1c22dfeb3d694e5c1393c6de80766eb240739e4bc"; azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip" "1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj"; @@ -289,11 +291,11 @@ let azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip" "0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap"; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.0.0" "zip" - "fd47029f2423e45ec4d311f651dc972043b98e960f186f5c6508c6fdf6eb2fe8"; + 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.5.2" "tar.gz" - "09y075mc7kig4dlb0xdvdvl9xbr931bi7kv60xaqnf31pf4pb7gf"; + azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.6.0" "tar.gz" + "sha256-2AWpGyle31IFf/qya3FBYJBUBr3V16Gj+T9s3D7ehBI="; azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; @@ -371,12 +373,12 @@ let }); azure-keyvault-administration = super.azure-keyvault-administration.overridePythonAttrs(oldAttrs: rec { - version = "4.0.0b1"; + version = "4.0.0b3"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; extension = "zip"; - sha256 = "1kmf2x3jdmfm9c7ldvajzckkm79gxxvl1l2968lizjwiyjbbsih5"; + sha256 = "sha256-d3tJWObM3plRurzfqWmHkn5CqVL9ekQfn9AeDc/KxLQ="; }; }); @@ -415,6 +417,17 @@ let ''; }); + semver = super.semver.overridePythonAttrs(oldAttrs: rec { + version = "2.13.0"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-+g/ici7hw/V+rEeIIMOlri9iSvgmTL35AAyYD/f3Xj8="; + }; + }); + + knack = super.knack.overridePythonAttrs(oldAttrs: rec { version = "0.8.0rc2"; @@ -425,26 +438,6 @@ let }; }); - msal = super.msal.overridePythonAttrs(oldAttrs: rec { - version = "1.0.0"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "0h33wayvakggr684spdyhiqvrwraavcbk3phmcbavb3zqxd3zgpc"; - }; - }); - - msal-extensions = super.msal-extensions.overridePythonAttrs(oldAttrs: rec { - version = "0.1.3"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "1p05cbfksnhijx1il7s24js2ydzgxbpiasf607qdpb5sljlp3qar"; - }; - }); - sshtunnel = super.sshtunnel.overridePythonAttrs(oldAttrs: rec { name = "sshtunnel-${version}"; version = "0.1.5"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix index 9460144998..1ab4795dd6 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.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uGvcr7TG/NCi0YoYZnQU11zOxXDhFTnCmLQVxOqmXLY="; + sha256 = "sha256-ztp3t55EOUQqTAEUZtHvHK8nTTVOAmYR9vN2hXLhpVw="; }; - vendorSha256 = "sha256-CO4U8uSQeHXLPj5PH/SsOI/LjT2Rs/mBHsvNTudx72I="; + vendorSha256 = "sha256-+0jp/TvUjpeJJxEs2drVkUb/ua9qqqxome4M9TkpfP4="; 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 6e1da0b591..db6b1de456 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.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-mq1/e9FW0jP6dY6zCBlPz5dBidKLS6IROBKESfHDvPI="; + sha256 = "sha256-2kxJcQ0kzIbXUSecDR5CRlgp0y59wftFPUwU1MSHOn0="; }; - vendorSha256 = "sha256-ANOeU3cFSwLcpdbpApM+j4r296ZGj/tuDV8oiMA7kMo="; + vendorSha256 = "sha256-m+qldNgY3+DKTFjxwKo4Sbi0F7y4xomiIuR+apek61Q="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix index afdbbbe945..022496cbd5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OaHsNxrOrPlAwtFDY3Tnx+nOabax98xcGQeNds32iOA="; + sha256 = "sha256-jqcI0ne6fZkgr4bWJ0ysVNvB7q9ErYbsmZoXI38XUng="; }; - cargoSha256 = "sha256-miOfm1Sw6tIICkT9T2V82cdGG2STo9vuLPWsAN/8wuM="; + cargoSha256 = "sha256-0s5MeWX+rXTyftwg6sReNMRgBzhUMIdHu5buKwg1Yi4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix index 708cd85bb2..01722fa907 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kCyfVeGTXBzdwmTTDJM1eaR6ANoIXAydj1ePmrZehqE="; + sha256 = "sha256-n89rfZwR8B6SKeLtzmbeHRyw2G9NIQ1BY6JvJuZmC/w="; }; - cargoSha256 = "sha256-juxaL/zjfqzFMqZe9tpevdjjVU7fPK8zalksAARWHC8="; + cargoSha256 = "sha256-RqtJLfBF9hfPh049uyc9K+uNBh+P3VMznuA2UtOwK3M="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix index e1437e3843..2da5a725e7 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -22,9 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./playtests-darwin.patch - ] # This I didn't upstream because if you use posix threads with MinGW it will - # work fine, and I'm not sure how to write the condition. - ++ lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch; + ]; postPatch = lib.optionalString (!static) '' substituteInPlace build/cmake/CMakeLists.txt \ diff --git a/third_party/nixpkgs/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch b/third_party/nixpkgs/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch deleted file mode 100644 index 69921c0c7b..0000000000 --- a/third_party/nixpkgs/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/programs/Makefile b/programs/Makefile -index 7882fe8c..1e8237bb 100644 ---- a/programs/Makefile -+++ b/programs/Makefile -@@ -107,7 +107,7 @@ HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter Windows%,$(OS - ifeq ($(HAVE_THREAD), 1) - THREAD_MSG := ==> building with threading support - THREAD_CPP := -DZSTD_MULTITHREAD --THREAD_LD := -pthread -+THREAD_LD := - else - THREAD_MSG := $(NO_THREAD_MSG) - endif diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix index 6c101dbc9c..1552505701 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "v${version}"; - sha256 = "1k5xjz353ry0vbmq1ql7brb9g4wwsijzix2zh5zpd768xl8nc1z8"; + sha256 = "0704022gbm987q6x6vcflq4b4p4hvcqm5ikiyndy5n8fj1q8lq95"; }; propagatedBuildInputs = [ docopt anytree ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix index 46c0120f64..961a286729 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,13 +1,13 @@ {lib, stdenv, fetchurl, libaal}: -let version = "2.0.1"; in +let version = "2.0.4"; in stdenv.mkDerivation rec { pname = "reiser4progs"; inherit version; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz"; - sha256 = "1r7m95mnp6xmp1j5k99jhmz6g9y2qq7cghlmdxsfbr3xviqfs45d"; + sha256 = "sha256-WmIkISnRp5BngSfPEKY95HVEt5TBtPKu+RMBwlLsnuA="; }; buildInputs = [libaal]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix b/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix index 9185faedc0..8fa2bc7a01 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix @@ -5,8 +5,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/rschroll/rmfuse.git"; - rev = "ac91d477cc32311c88aa7ecd1bebd6503e426ae7"; - sha256 = "129n00hricsf4jkgj39bq3m5nhvy4d4yg7mcvrcgwb2546wcix0n"; + rev = "fca03bcdd6dc118f2ba981410ec9dff7f7cb88ec"; + sha256 = "0i7dvvi2bp3hydjpzvr7vg10bx0wxz87spf7pg455aga8d0qhxgk"; }; } ); diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry.lock b/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry.lock index a97b89181f..920fbddd0b 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry.lock +++ b/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry.lock @@ -1,10 +1,10 @@ [[package]] -category = "main" -description = "High level compatibility layer for multiple asynchronous event loop implementations" name = "anyio" +version = "2.2.0" +description = "High level compatibility layer for multiple asynchronous event loop implementations" +category = "main" optional = false python-versions = ">=3.6.2" -version = "2.1.0" [package.dependencies] idna = ">=2.8" @@ -13,16 +13,16 @@ sniffio = ">=1.1" [package.extras] curio = ["curio (>=1.4)"] doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] -test = ["coverage (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "trustme", "uvloop"] +test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "trustme", "uvloop (<0.15)", "uvloop (>=0.15)"] trio = ["trio (>=0.16)"] [[package]] -category = "main" -description = "asks - async http" name = "asks" +version = "2.4.12" +description = "asks - async http" +category = "main" optional = false python-versions = ">= 3.6.2" -version = "2.4.12" [package.dependencies] anyio = ">=2.0,<3.0" @@ -30,34 +30,34 @@ async_generator = "*" h11 = "*" [[package]] -category = "main" -description = "Async generators and context managers for Python 3.5+" name = "async-generator" +version = "1.10" +description = "Async generators and context managers for Python 3.5+" +category = "main" optional = false python-versions = ">=3.5" -version = "1.10" [[package]] -category = "main" -description = "Classes Without Boilerplate" name = "attrs" +version = "20.3.0" +description = "Classes Without Boilerplate" +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "20.3.0" [package.extras] -dev = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"] +dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"] docs = ["furo", "sphinx", "zope.interface"] -tests = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"] -tests_no_zope = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"] +tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"] +tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"] [[package]] -category = "main" -description = "The bidirectional mapping library for Python." name = "bidict" +version = "0.21.2" +description = "The bidirectional mapping library for Python." +category = "main" optional = false python-versions = ">=3.6" -version = "0.21.2" [package.extras] coverage = ["coverage (<6)", "pytest-cov (<3)"] @@ -67,23 +67,23 @@ precommit = ["pre-commit (<3)"] test = ["hypothesis (<6)", "py (<2)", "pytest (<7)", "pytest-benchmark (>=3.2.0,<4)", "sortedcollections (<2)", "sortedcontainers (<3)", "Sphinx (<4)", "sphinx-autodoc-typehints (<2)"] [[package]] -category = "main" -description = "Foreign Function Interface for Python calling C code." name = "cffi" +version = "1.14.5" +description = "Foreign Function Interface for Python calling C code." +category = "main" optional = false python-versions = "*" -version = "1.14.5" [package.dependencies] pycparser = "*" [[package]] -category = "main" -description = "cssselect2" name = "cssselect2" +version = "0.4.1" +description = "cssselect2" +category = "main" optional = false python-versions = ">=3.6" -version = "0.4.1" [package.dependencies] tinycss2 = "*" @@ -94,28 +94,28 @@ doc = ["sphinx", "sphinx-rtd-theme"] test = ["pytest", "pytest-cov", "pytest-flake8", "pytest-isort", "coverage"] [[package]] -category = "main" -description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" name = "h11" +version = "0.12.0" +description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" +category = "main" optional = false python-versions = ">=3.6" -version = "0.12.0" [[package]] -category = "main" -description = "Internationalized Domain Names in Applications (IDNA)" name = "idna" +version = "3.1" +description = "Internationalized Domain Names in Applications (IDNA)" +category = "main" optional = false python-versions = ">=3.4" -version = "3.1" [[package]] -category = "main" -description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." name = "lxml" +version = "4.6.2" +description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*" -version = "4.6.2" [package.extras] cssselect = ["cssselect (>=0.7)"] @@ -124,69 +124,72 @@ htmlsoup = ["beautifulsoup4"] source = ["Cython (>=0.29.7)"] [[package]] -category = "main" -description = "Capture the outcome of Python function calls." name = "outcome" +version = "1.1.0" +description = "Capture the outcome of Python function calls." +category = "main" optional = false python-versions = ">=3.6" -version = "1.1.0" [package.dependencies] attrs = ">=19.2.0" [[package]] -category = "main" -description = "PDF file reader/writer library" name = "pdfrw" +version = "0.4" +description = "PDF file reader/writer library" +category = "main" optional = false python-versions = "*" -version = "0.4" [[package]] -category = "main" -description = "Python Imaging Library (Fork)" name = "pillow" +version = "8.1.2" +description = "Python Imaging Library (Fork)" +category = "main" optional = false python-versions = ">=3.6" -version = "8.1.0" [[package]] -category = "main" -description = "C parser in Python" name = "pycparser" +version = "2.20" +description = "C parser in Python" +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.20" [[package]] -category = "main" -description = "Python 3 bindings for libfuse 3 with async I/O support" name = "pyfuse3" +version = "3.2.0" +description = "Python 3 bindings for libfuse 3 with async I/O support" +category = "main" optional = false python-versions = ">=3.5" -version = "3.2.0" [package.dependencies] trio = ">=0.15" [[package]] -category = "main" -description = "The Reportlab Toolkit" name = "reportlab" +version = "3.5.65" +description = "The Reportlab Toolkit" +category = "main" optional = false -python-versions = "*" -version = "3.5.59" +python-versions = ">=2.7, >=3.6, <4" [package.dependencies] pillow = ">=4.0.0" +[package.extras] +rlpycairo = ["rlPyCairo (>=0.0.5)"] + [[package]] -category = "main" -description = "reMarkable Cloud Library" name = "rmcl" +version = "0.4.0" +description = "reMarkable Cloud Library" +category = "main" optional = false python-versions = ">=3.7,<4.0" -version = "0.3.1" [package.dependencies] asks = ">=2.4.12,<3.0.0" @@ -194,30 +197,38 @@ trio = ">=0.18.0,<0.19.0" xdg = ">=5.0.1,<6.0.0" [[package]] -category = "main" -description = "" name = "rmfuse" +version = "0.2.1" +description = "" +category = "main" optional = false python-versions = "^3.7" -version = "0.1.1" +develop = false [package.dependencies] bidict = "^0.21.2" -pyfuse3 = "^3.2.0" -rmcl = "^0.3.1" -rmrl = "^0.1.2" +pyfuse3 = {version = "^3.2.0", optional = true} +rmcl = "^0.4.0" +rmrl = "^0.2.1" +xdg = "^5.0.1" + +[package.extras] +pyfuse3 = ["pyfuse3 (>=3.2.0,<4.0.0)"] +llfuse = ["llfuse (>=1.4.1,<2.0.0)"] [package.source] -reference = "ac91d477cc32311c88aa7ecd1bebd6503e426ae7" type = "git" url = "https://github.com/rschroll/rmfuse.git" +reference = "master" +resolved_reference = "fca03bcdd6dc118f2ba981410ec9dff7f7cb88ec" + [[package]] -category = "main" -description = "Render reMarkable documents to PDF" name = "rmrl" +version = "0.2.1" +description = "Render reMarkable documents to PDF" +category = "main" optional = false python-versions = ">=3.7,<4.0" -version = "0.1.2" [package.dependencies] pdfrw = ">=0.4,<0.5" @@ -226,28 +237,28 @@ svglib = ">=1.0.1,<2.0.0" xdg = ">=5.0.1,<6.0.0" [[package]] -category = "main" -description = "Sniff out which async library your code is running under" name = "sniffio" +version = "1.2.0" +description = "Sniff out which async library your code is running under" +category = "main" optional = false python-versions = ">=3.5" -version = "1.2.0" [[package]] -category = "main" -description = "Sorted Containers -- Sorted List, Sorted Dict, Sorted Set" name = "sortedcontainers" +version = "2.3.0" +description = "Sorted Containers -- Sorted List, Sorted Dict, Sorted Set" +category = "main" optional = false python-versions = "*" -version = "2.3.0" [[package]] -category = "main" -description = "A pure-Python library for reading and converting SVG" name = "svglib" +version = "1.0.1" +description = "A pure-Python library for reading and converting SVG" +category = "main" optional = false python-versions = ">=3" -version = "1.0.1" [package.dependencies] cssselect2 = ">=0.2.0" @@ -256,12 +267,12 @@ reportlab = "*" tinycss2 = ">=0.6.0" [[package]] -category = "main" -description = "tinycss2" name = "tinycss2" +version = "1.1.0" +description = "tinycss2" +category = "main" optional = false python-versions = ">=3.6" -version = "1.1.0" [package.dependencies] webencodings = ">=0.4" @@ -271,47 +282,47 @@ doc = ["sphinx", "sphinx-rtd-theme"] test = ["pytest", "pytest-cov", "pytest-flake8", "pytest-isort", "coverage"] [[package]] -category = "main" -description = "A friendly Python library for async concurrency and I/O" name = "trio" +version = "0.18.0" +description = "A friendly Python library for async concurrency and I/O" +category = "main" optional = false python-versions = ">=3.6" -version = "0.18.0" [package.dependencies] async-generator = ">=1.9" attrs = ">=19.2.0" -cffi = ">=1.14" +cffi = {version = ">=1.14", markers = "os_name == \"nt\" and implementation_name != \"pypy\""} idna = "*" outcome = "*" sniffio = "*" sortedcontainers = "*" [[package]] -category = "main" -description = "Character encoding aliases for legacy web content" name = "webencodings" +version = "0.5.1" +description = "Character encoding aliases for legacy web content" +category = "main" optional = false python-versions = "*" -version = "0.5.1" [[package]] -category = "main" -description = "Variables defined by the XDG Base Directory Specification" name = "xdg" +version = "5.0.1" +description = "Variables defined by the XDG Base Directory Specification" +category = "main" optional = false python-versions = ">=3.6,<4.0" -version = "5.0.1" [metadata] -content-hash = "df8dfb527656dec034712b2d07aaacfdee20f89f635d38af52bb21888d7d4130" -lock-version = "1.0" +lock-version = "1.1" python-versions = "^3.8" +content-hash = "3da90f3013f1220c9081c0a11dac7d8cd05c5a47ebda40fbb4357e44503e99a3" [metadata.files] anyio = [ - {file = "anyio-2.1.0-py3-none-any.whl", hash = "sha256:c286818ccd5dcbd5d385b223f16a055393474527b1d5650da489828a9887d559"}, - {file = "anyio-2.1.0.tar.gz", hash = "sha256:8a56e08623dc55955a06719d4ad62de6009bb3f1dd04936e60b2104dd58da484"}, + {file = "anyio-2.2.0-py3-none-any.whl", hash = "sha256:aa3da546ed17f097ca876c78024dea380a3b7fa80759abfdda59f12176a3dac8"}, + {file = "anyio-2.2.0.tar.gz", hash = "sha256:4a41c5b3a65ed92e469d51b6fba3779301850ea2e352afcf9e36c46f21ee14a9"}, ] asks = [ {file = "asks-2.4.12.tar.gz", hash = "sha256:38de944eb350e7e4e3a918055fa8ff033da5f7b5ff385c1160a2d6b9d84783b0"}, @@ -427,38 +438,39 @@ pdfrw = [ {file = "pdfrw-0.4.tar.gz", hash = "sha256:0dc0494a0e6561b268542b28ede2280387c2728114f117d3bb5d8e4787b93ef4"}, ] pillow = [ - {file = "Pillow-8.1.0-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:d355502dce85ade85a2511b40b4c61a128902f246504f7de29bbeec1ae27933a"}, - {file = "Pillow-8.1.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:93a473b53cc6e0b3ce6bf51b1b95b7b1e7e6084be3a07e40f79b42e83503fbf2"}, - {file = "Pillow-8.1.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:2353834b2c49b95e1313fb34edf18fca4d57446675d05298bb694bca4b194174"}, - {file = "Pillow-8.1.0-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:1d208e670abfeb41b6143537a681299ef86e92d2a3dac299d3cd6830d5c7bded"}, - {file = "Pillow-8.1.0-cp36-cp36m-win32.whl", hash = "sha256:dd9eef866c70d2cbbea1ae58134eaffda0d4bfea403025f4db6859724b18ab3d"}, - {file = "Pillow-8.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:b09e10ec453de97f9a23a5aa5e30b334195e8d2ddd1ce76cc32e52ba63c8b31d"}, - {file = "Pillow-8.1.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:b02a0b9f332086657852b1f7cb380f6a42403a6d9c42a4c34a561aa4530d5234"}, - {file = "Pillow-8.1.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:ca20739e303254287138234485579b28cb0d524401f83d5129b5ff9d606cb0a8"}, - {file = "Pillow-8.1.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:604815c55fd92e735f9738f65dabf4edc3e79f88541c221d292faec1904a4b17"}, - {file = "Pillow-8.1.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:cf6e33d92b1526190a1de904df21663c46a456758c0424e4f947ae9aa6088bf7"}, - {file = "Pillow-8.1.0-cp37-cp37m-win32.whl", hash = "sha256:47c0d93ee9c8b181f353dbead6530b26980fe4f5485aa18be8f1fd3c3cbc685e"}, - {file = "Pillow-8.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:96d4dc103d1a0fa6d47c6c55a47de5f5dafd5ef0114fa10c85a1fd8e0216284b"}, - {file = "Pillow-8.1.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:7916cbc94f1c6b1301ac04510d0881b9e9feb20ae34094d3615a8a7c3db0dcc0"}, - {file = "Pillow-8.1.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:3de6b2ee4f78c6b3d89d184ade5d8fa68af0848f9b6b6da2b9ab7943ec46971a"}, - {file = "Pillow-8.1.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:cdbbe7dff4a677fb555a54f9bc0450f2a21a93c5ba2b44e09e54fcb72d2bd13d"}, - {file = "Pillow-8.1.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:f50e7a98b0453f39000619d845be8b06e611e56ee6e8186f7f60c3b1e2f0feae"}, - {file = "Pillow-8.1.0-cp38-cp38-win32.whl", hash = "sha256:cb192176b477d49b0a327b2a5a4979552b7a58cd42037034316b8018ac3ebb59"}, - {file = "Pillow-8.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:6c5275bd82711cd3dcd0af8ce0bb99113ae8911fc2952805f1d012de7d600a4c"}, - {file = "Pillow-8.1.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:165c88bc9d8dba670110c689e3cc5c71dbe4bfb984ffa7cbebf1fac9554071d6"}, - {file = "Pillow-8.1.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:5e2fe3bb2363b862671eba632537cd3a823847db4d98be95690b7e382f3d6378"}, - {file = "Pillow-8.1.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:7612520e5e1a371d77e1d1ca3a3ee6227eef00d0a9cddb4ef7ecb0b7396eddf7"}, - {file = "Pillow-8.1.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:d673c4990acd016229a5c1c4ee8a9e6d8f481b27ade5fc3d95938697fa443ce0"}, - {file = "Pillow-8.1.0-cp39-cp39-win32.whl", hash = "sha256:dc577f4cfdda354db3ae37a572428a90ffdbe4e51eda7849bf442fb803f09c9b"}, - {file = "Pillow-8.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:22d070ca2e60c99929ef274cfced04294d2368193e935c5d6febfd8b601bf865"}, - {file = "Pillow-8.1.0-pp36-pypy36_pp73-macosx_10_10_x86_64.whl", hash = "sha256:a3d3e086474ef12ef13d42e5f9b7bbf09d39cf6bd4940f982263d6954b13f6a9"}, - {file = "Pillow-8.1.0-pp36-pypy36_pp73-manylinux2010_i686.whl", hash = "sha256:731ca5aabe9085160cf68b2dbef95fc1991015bc0a3a6ea46a371ab88f3d0913"}, - {file = "Pillow-8.1.0-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:bba80df38cfc17f490ec651c73bb37cd896bc2400cfba27d078c2135223c1206"}, - {file = "Pillow-8.1.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:c3d911614b008e8a576b8e5303e3db29224b455d3d66d1b2848ba6ca83f9ece9"}, - {file = "Pillow-8.1.0-pp37-pypy37_pp73-manylinux2010_i686.whl", hash = "sha256:39725acf2d2e9c17356e6835dccebe7a697db55f25a09207e38b835d5e1bc032"}, - {file = "Pillow-8.1.0-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:81c3fa9a75d9f1afafdb916d5995633f319db09bd773cb56b8e39f1e98d90820"}, - {file = "Pillow-8.1.0-pp37-pypy37_pp73-win32.whl", hash = "sha256:b6f00ad5ebe846cc91763b1d0c6d30a8042e02b2316e27b05de04fa6ec831ec5"}, - {file = "Pillow-8.1.0.tar.gz", hash = "sha256:887668e792b7edbfb1d3c9d8b5d8c859269a0f0eba4dda562adb95500f60dbba"}, + {file = "Pillow-8.1.2-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:5cf03b9534aca63b192856aa601c68d0764810857786ea5da652581f3a44c2b0"}, + {file = "Pillow-8.1.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:f91b50ad88048d795c0ad004abbe1390aa1882073b1dca10bfd55d0b8cf18ec5"}, + {file = "Pillow-8.1.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:5762ebb4436f46b566fc6351d67a9b5386b5e5de4e58fdaa18a1c83e0e20f1a8"}, + {file = "Pillow-8.1.2-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:e2cd8ac157c1e5ae88b6dd790648ee5d2777e76f1e5c7d184eaddb2938594f34"}, + {file = "Pillow-8.1.2-cp36-cp36m-win32.whl", hash = "sha256:72027ebf682abc9bafd93b43edc44279f641e8996fb2945104471419113cfc71"}, + {file = "Pillow-8.1.2-cp36-cp36m-win_amd64.whl", hash = "sha256:d1d6bca39bb6dd94fba23cdb3eeaea5e30c7717c5343004d900e2a63b132c341"}, + {file = "Pillow-8.1.2-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:90882c6f084ef68b71bba190209a734bf90abb82ab5e8f64444c71d5974008c6"}, + {file = "Pillow-8.1.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:89e4c757a91b8c55d97c91fa09c69b3677c227b942fa749e9a66eef602f59c28"}, + {file = "Pillow-8.1.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:8c4e32218c764bc27fe49b7328195579581aa419920edcc321c4cb877c65258d"}, + {file = "Pillow-8.1.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:a01da2c266d9868c4f91a9c6faf47a251f23b9a862dce81d2ff583135206f5be"}, + {file = "Pillow-8.1.2-cp37-cp37m-win32.whl", hash = "sha256:30d33a1a6400132e6f521640dd3f64578ac9bfb79a619416d7e8802b4ce1dd55"}, + {file = "Pillow-8.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:71b01ee69e7df527439d7752a2ce8fb89e19a32df484a308eca3e81f673d3a03"}, + {file = "Pillow-8.1.2-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:5a2d957eb4aba9d48170b8fe6538ec1fbc2119ffe6373782c03d8acad3323f2e"}, + {file = "Pillow-8.1.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:87f42c976f91ca2fc21a3293e25bd3cd895918597db1b95b93cbd949f7d019ce"}, + {file = "Pillow-8.1.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:15306d71a1e96d7e271fd2a0737038b5a92ca2978d2e38b6ced7966583e3d5af"}, + {file = "Pillow-8.1.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:71f31ee4df3d5e0b366dd362007740106d3210fb6a56ec4b581a5324ba254f06"}, + {file = "Pillow-8.1.2-cp38-cp38-win32.whl", hash = "sha256:98afcac3205d31ab6a10c5006b0cf040d0026a68ec051edd3517b776c1d78b09"}, + {file = "Pillow-8.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:328240f7dddf77783e72d5ed79899a6b48bc6681f8d1f6001f55933cb4905060"}, + {file = "Pillow-8.1.2-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:bead24c0ae3f1f6afcb915a057943ccf65fc755d11a1410a909c1fefb6c06ad1"}, + {file = "Pillow-8.1.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:81b3716cc9744ffdf76b39afb6247eae754186838cedad0b0ac63b2571253fe6"}, + {file = "Pillow-8.1.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:63cd413ac52ee3f67057223d363f4f82ce966e64906aea046daf46695e3c8238"}, + {file = "Pillow-8.1.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:8565355a29655b28fdc2c666fd9a3890fe5edc6639d128814fafecfae2d70910"}, + {file = "Pillow-8.1.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:1940fc4d361f9cc7e558d6f56ff38d7351b53052fd7911f4b60cd7bc091ea3b1"}, + {file = "Pillow-8.1.2-cp39-cp39-win32.whl", hash = "sha256:46c2bcf8e1e75d154e78417b3e3c64e96def738c2a25435e74909e127a8cba5e"}, + {file = "Pillow-8.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:aeab4cd016e11e7aa5cfc49dcff8e51561fa64818a0be86efa82c7038e9369d0"}, + {file = "Pillow-8.1.2-pp36-pypy36_pp73-macosx_10_10_x86_64.whl", hash = "sha256:74cd9aa648ed6dd25e572453eb09b08817a1e3d9f8d1bd4d8403d99e42ea790b"}, + {file = "Pillow-8.1.2-pp36-pypy36_pp73-manylinux2010_i686.whl", hash = "sha256:e5739ae63636a52b706a0facec77b2b58e485637e1638202556156e424a02dc2"}, + {file = "Pillow-8.1.2-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:903293320efe2466c1ab3509a33d6b866dc850cfd0c5d9cc92632014cec185fb"}, + {file = "Pillow-8.1.2-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:5daba2b40782c1c5157a788ec4454067c6616f5a0c1b70e26ac326a880c2d328"}, + {file = "Pillow-8.1.2-pp37-pypy37_pp73-manylinux2010_i686.whl", hash = "sha256:1f93f2fe211f1ef75e6f589327f4d4f8545d5c8e826231b042b483d8383e8a7c"}, + {file = "Pillow-8.1.2-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:6efac40344d8f668b6c4533ae02a48d52fd852ef0654cc6f19f6ac146399c733"}, + {file = "Pillow-8.1.2-pp37-pypy37_pp73-win32.whl", hash = "sha256:f36c3ff63d6fc509ce599a2f5b0d0732189eed653420e7294c039d342c6e204a"}, + {file = "Pillow-8.1.2.tar.gz", hash = "sha256:b07c660e014852d98a00a91adfbe25033898a9d90a8f39beb2437d22a203fc44"}, ] pycparser = [ {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"}, @@ -468,55 +480,44 @@ pyfuse3 = [ {file = "pyfuse3-3.2.0.tar.gz", hash = "sha256:45f0053ad601b03a36e2c283a5271403674245a66a0daf50e3deaab0ea4fa82f"}, ] reportlab = [ - {file = "reportlab-3.5.59-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:1da3d7a35f918cee905facfa94bd00ae6091cadc06dca1b0b31b69ae02d41d1d"}, - {file = "reportlab-3.5.59-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:792efba0c0c6e4ee94f6dc95f305451733ee9230a1c7d51cb8e5301a549e0dfb"}, - {file = "reportlab-3.5.59-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:f3d4a1a273dc141e03b72a553c11bc14dd7a27ec7654a071edcf83eb04f004bc"}, - {file = "reportlab-3.5.59-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:e2b4e33fea2ce9d3a14ea39191b169e41eb2ac995274f54ac8fd27519974bce8"}, - {file = "reportlab-3.5.59-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:b1b20208ecdfffd7ca027955c4fe8972b28b30a4b3b80cf25099a08d3b20ed7c"}, - {file = "reportlab-3.5.59-cp27-cp27m-win32.whl", hash = "sha256:5ed00894e0f8281c0b7c0494b4d3067c641fd90c8e5cf933089ec4cc9a48e491"}, - {file = "reportlab-3.5.59-cp27-cp27m-win_amd64.whl", hash = "sha256:85650446538cd2f606ca234634142a7ccd74cb6db7cfec250f76a4242e0f2431"}, - {file = "reportlab-3.5.59-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:79d63ca40231ca3860859b39a92daa5219035ba9553da89a5e1b218550744121"}, - {file = "reportlab-3.5.59-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:a0c377bc45e73c3f15f55d7de69fab270d174749d5b454ab0de502b15430ec2a"}, - {file = "reportlab-3.5.59-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:cfa854bea525f8c913cb77e2bda724d94b965a0eb3bcfc4a645a9baa29bb86e2"}, - {file = "reportlab-3.5.59-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:3d7713dddaa8081ed709a1fa2456a43f6a74b0f07d605da8441fd53fef334f69"}, - {file = "reportlab-3.5.59-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:ff547cf4c1de7e104cad1a378431ff81efcb03e90e40871ee686107da5b91442"}, - {file = "reportlab-3.5.59-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19353aead39fc115a4d6c598d6fb9fa26da7e69160a0443ebb49b02903e704e8"}, - {file = "reportlab-3.5.59-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:6f3ad2b1afe99c436563cd436d8693d4a12e2c4bd45f70c7705759ff7837fe53"}, - {file = "reportlab-3.5.59-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:b26d6f416891cef93411d6d478a25db275766081a5fb66368248293ef459f3be"}, - {file = "reportlab-3.5.59-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:dd9687359e466086b9f6fe6d8069034017f8b6ca3080944fae5709767ca6814e"}, - {file = "reportlab-3.5.59-cp36-cp36m-win32.whl", hash = "sha256:b71faf3b6e4d7058e1af1b8afedaf39a962db4a219affc8177009d8244ec10d4"}, - {file = "reportlab-3.5.59-cp36-cp36m-win_amd64.whl", hash = "sha256:4ca5233a19a5ceca23546290f43addec2345789c7d65bb32f8b2668aa148351f"}, - {file = "reportlab-3.5.59-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:9da445cb79e3f740756924c053edc952cde11a65ff5af8acfda3c0a1317136ef"}, - {file = "reportlab-3.5.59-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:07bff6742fba612da8d1b1f783c436338c6fdc6962828159827d5ca7d2b67935"}, - {file = "reportlab-3.5.59-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:52f8237654acbc78ea2fa6fb4a6a06e5b023b6da93f7889adfe2deba09473fad"}, - {file = "reportlab-3.5.59-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:739b743b7ca1ba4b4d64c321de6fccb49b562d0507ea06c817d9cc4faed5cd22"}, - {file = "reportlab-3.5.59-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:33f3cfdc492575f8af3225701301a7e62fc478358729820c9e0091aff5831378"}, - {file = "reportlab-3.5.59-cp37-cp37m-win32.whl", hash = "sha256:3e2b4d69763103b9dc9b54c0952dc3cee05cedd06e28c0987fad7f84705b12c0"}, - {file = "reportlab-3.5.59-cp37-cp37m-win_amd64.whl", hash = "sha256:18a876449c9000c391dd3415ebc8454cd7bb9e488977b894886a2d7d018f16cd"}, - {file = "reportlab-3.5.59-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:04a08d284da86882ec3a41a7c719833362ef891b09ee8e2fbb47cee352aa684a"}, - {file = "reportlab-3.5.59-cp38-cp38-manylinux1_i686.whl", hash = "sha256:83b28104edd58ad65748d2d0e60e0d97e3b91b3e90b4573ea6fe60de6811972c"}, - {file = "reportlab-3.5.59-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9fabd5fbd24f5971085ffe53150d663f158f7d3050b25c95736e29ebf676d454"}, - {file = "reportlab-3.5.59-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:b4ba4c30af7044ee987e61c88a5ffb76031ca0c53666bc85d823b7de55ddbc75"}, - {file = "reportlab-3.5.59-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:a315edef5c5610b0c75790142f49487e89ea34397fc247ae8aa890fe6d6dd057"}, - {file = "reportlab-3.5.59-cp38-cp38-win32.whl", hash = "sha256:5214a289cf01ebbd65e49bae83709671dd9edb601891cf0ae8abf85f3c0b392f"}, - {file = "reportlab-3.5.59-cp38-cp38-win_amd64.whl", hash = "sha256:009fa61710647cdc62eb373345248d8ebb93583a058990f7c4f9be46d90aa5b1"}, - {file = "reportlab-3.5.59-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:09fb11ab1500e679fc1b01199d2fed24435499856e75043a9ac0d31dd48fd881"}, - {file = "reportlab-3.5.59-cp39-cp39-manylinux1_i686.whl", hash = "sha256:18eec161411026dde49767bee4e5e8eeb8014879554811a62581dc7433628d5b"}, - {file = "reportlab-3.5.59-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:a1d3f7022a920d4a5e165d264581f1862e1c1b877ceeabb96fe98cec98125ae5"}, - {file = "reportlab-3.5.59-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:1b85c20e89c22ae902ca973df2afdd2d64d27dc4ffd2b29ebad8c805a213756b"}, - {file = "reportlab-3.5.59-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:de0c675fc2998a7eaa929c356ba49c84f53a892e9ab25e8ee7d8ebbbdcb2ac16"}, - {file = "reportlab-3.5.59-cp39-cp39-win32.whl", hash = "sha256:3b0026c1129147befd4e5a8cf25da8dea1096fce371e7b2412e36d7254019c06"}, - {file = "reportlab-3.5.59-cp39-cp39-win_amd64.whl", hash = "sha256:6191961533d49c9d860964d42bada4d7ac3bb28502d984feb8034093f2012fa8"}, - {file = "reportlab-3.5.59.tar.gz", hash = "sha256:a755cca2dcf023130b03bb671670301a992157d5c3151d838c0b68ef89894536"}, + {file = "reportlab-3.5.65-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:fd6712a8a6dca12181a3a12316f97810927861e77f2a98029efd2c5cfc8546dc"}, + {file = "reportlab-3.5.65-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:ee711804acdaf3ea7f0f2cd27f19478af993e730df8c8d923a678eb0e2572fba"}, + {file = "reportlab-3.5.65-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4c42e85851f969e21fa4d6414587b7544e877ce685e2495d7d422589c70b6281"}, + {file = "reportlab-3.5.65-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:d8fefd07072bfae2715283a821fb1acf8fc4946cf925509d5cc2af791c611809"}, + {file = "reportlab-3.5.65-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:bdf751289efee4891f4f354ce9122da8de8258a40f328b3f11540c4888363337"}, + {file = "reportlab-3.5.65-cp36-cp36m-win32.whl", hash = "sha256:f0634740b099b69caed081acd89692996b5504c59f86f39781b6bebc82b267f5"}, + {file = "reportlab-3.5.65-cp36-cp36m-win_amd64.whl", hash = "sha256:d810bffd4bcd50fdcb2bab0d1fe9ea4e6187ed5237687e41c6ade6c884b00c1e"}, + {file = "reportlab-3.5.65-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:46745826657d35f86843487f4bc6f6f805f61260428f8ee13642bf6372f9df55"}, + {file = "reportlab-3.5.65-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:bc62187181582772688d65c557ad6a40a4c3bb8d1f74de463d35ea81983e9b75"}, + {file = "reportlab-3.5.65-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:58bec163f727c1c60515fc4704a961b3b4ccf2c76b4e6ec1a457ea7ed0c2d756"}, + {file = "reportlab-3.5.65-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d92834993bf998853a04946729266a3276965e7b13f7423212f1c1abdfc4a1c7"}, + {file = "reportlab-3.5.65-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:9ec95808b742ce70c1dab28b2c5bef9093816b92315b948419c2c6968658f9cc"}, + {file = "reportlab-3.5.65-cp37-cp37m-win32.whl", hash = "sha256:b9494986f35d82350b0ce0c29704a49a3945421b789dff92e93fbd3de554fa34"}, + {file = "reportlab-3.5.65-cp37-cp37m-win_amd64.whl", hash = "sha256:07f9d9c0360cb8fc780ca05264faa68b90583cd28dbdf2cda6bda34379b6e66c"}, + {file = "reportlab-3.5.65-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:81898de0a0be2c8318468ae0ae1590f828805e9b7fd68e5a50667dce8b942171"}, + {file = "reportlab-3.5.65-cp38-cp38-manylinux1_i686.whl", hash = "sha256:99aeee49a61c85f1af1087e9e418f3d0c2352c4dd0f0abbfac17ae6c467185aa"}, + {file = "reportlab-3.5.65-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:3ec70873d99c14570e2a9c44b86c8c01526871e7af5ee4b2855246db15cb0c9f"}, + {file = "reportlab-3.5.65-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:c12432575c793b8cd8552fddc219bbf2813541c64d02854ae345a108fb875b9d"}, + {file = "reportlab-3.5.65-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:b2cf692ae7af995b499a31a3f58f2001d98e310e03f74812bcb97a08078239c0"}, + {file = "reportlab-3.5.65-cp38-cp38-win32.whl", hash = "sha256:f92388e30bf6b5d2eceb3d7b05ee2df856635f74ce7d950a8f45d2b70c685a5b"}, + {file = "reportlab-3.5.65-cp38-cp38-win_amd64.whl", hash = "sha256:6f007142f2b166f52cbb3e5d23319e3e496c429831e53b904e6db28c3370f279"}, + {file = "reportlab-3.5.65-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:8707cc21a769150154bf4634dca6e9581ae24a05f0fb81a84fcc1143b1cbbfde"}, + {file = "reportlab-3.5.65-cp39-cp39-manylinux1_i686.whl", hash = "sha256:27a831da0d17153e33c985bd7a88307e206c5a28778cddb755d5372598d12637"}, + {file = "reportlab-3.5.65-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fe5d98cdac07dd702bcd49f5723aacdd0af8c84d70fc82a5cc3781e52aedad52"}, + {file = "reportlab-3.5.65-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:ba2d10f368c9ea1e76c84b3bb6b9982eb5a8f243c434e821c505b75ca8d85852"}, + {file = "reportlab-3.5.65-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:289539f7888239343ef7ebcd30c55e6204ef78d5f70e1547fdeb854a2da8bfa1"}, + {file = "reportlab-3.5.65-cp39-cp39-win32.whl", hash = "sha256:cdf8ff72cd6fa9303744c8409fb81ef7720da2e034c369762c2fdf496462179e"}, + {file = "reportlab-3.5.65-cp39-cp39-win_amd64.whl", hash = "sha256:4a784ecdf3008f533e5a032b96c395e8592ed5e679baaf5ef4dcc136b01c72e9"}, + {file = "reportlab-3.5.65.tar.gz", hash = "sha256:b2c7eedb4d19db63301c27ad1076086a099fd4c8ca0a6f62f6e9ed749fa5908f"}, ] rmcl = [ - {file = "rmcl-0.3.1-py3-none-any.whl", hash = "sha256:e4ebcc3e6ce7e9efb1dec4a2d0a44c463ef3854d44e1f8919c65a2b3f9312ec7"}, - {file = "rmcl-0.3.1.tar.gz", hash = "sha256:5b5316adf53cca9e56273cad220cb7374cd56e7bac962c943868b05fc090e98c"}, + {file = "rmcl-0.4.0-py3-none-any.whl", hash = "sha256:d2fc5d183b213797f5886a6af52c5531c87b4e1770cc720e0e8ba5992e728473"}, + {file = "rmcl-0.4.0.tar.gz", hash = "sha256:14bd199ff2c71269c3c1ac63d10932de6c68a250a454550940dae3f06b07527a"}, ] rmfuse = [] rmrl = [ - {file = "rmrl-0.1.2-py3-none-any.whl", hash = "sha256:173231c7122a11201232ed8fe74e4a9a65192b87886ef8a98ae912aa9b875c26"}, - {file = "rmrl-0.1.2.tar.gz", hash = "sha256:8c8e757af5ca3eb7475f56803f7f37256fe4c5cad3a9ea5ad7534b2ebd172447"}, + {file = "rmrl-0.2.1-py3-none-any.whl", hash = "sha256:c35b9f20494a6034a16e916d7351575efb3e3f77acabe9094453a7f6013eaa86"}, + {file = "rmrl-0.2.1.tar.gz", hash = "sha256:c532bef4168350e6ab17cf37c6481dc12b6a78e007c073503f082f36215b71c9"}, ] sniffio = [ {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"}, diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/pyproject.toml b/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/pyproject.toml index 1163e308e7..e3f1767b4c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/pyproject.toml +++ b/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/pyproject.toml @@ -6,7 +6,7 @@ authors = [] [tool.poetry.dependencies] python = "^3.8" -rmfuse = {git = "https://github.com/rschroll/rmfuse.git"} +rmfuse = {git = "https://github.com/rschroll/rmfuse.git", extras = ["pyfuse3"]} [tool.poetry.dev-dependencies] diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/update b/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/update old mode 100644 new mode 100755 diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix index 650fd713a0..0a05a683ad 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { pname = "s3backer"; - version = "1.5.4"; + version = "1.6.1"; src = fetchFromGitHub { - sha256 = "1228qlfgz48k9vv72hrz488zg73zls99cppb9vmikc0pzv1xndsx"; + sha256 = "sha256-67sVT72i8tOMdGH/+Oh1N7Vh/2/qD56ImGWI+tprMOM="; rev = version; repo = "s3backer"; owner = "archiecobbs"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix index 8c8164a7e8..e0968dd627 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix @@ -1,23 +1,26 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, libiconv }: rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Jo+dx4+3GpEwOoE8HH0YahBmPvT9Oy2qXMvCJ/NZhF0="; + sha256 = "sha256-fd97w6yd9ZX2k8Vq+Vh6jouufGdFE02ZV8mb+BtA3tk="; }; - cargoSha256 = "sha256-8Es9NZYsC/9PZ6ytWZTAH42U3vxZtJERPSsno1s4TEc="; + cargoSha256 = "sha256-LlEYfjUINQW/YrhNp/Z+fdLQPcvrTjNFtDAk1gyAuj0="; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; doCheck = false; meta = with lib; { description = "An SVG rendering library"; homepage = "https://github.com/RazrFalcon/resvg"; + changelog = "https://github.com/RazrFalcon/resvg/raw/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = [ maintainers.marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index 60b5d6778b..d04de7bafe 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "ibus-anthy"; - version = "1.5.11"; + version = "1.5.12"; src = fetchurl { url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1zwgswpibh67sgbza8kvg03v06maxc08ihkgm5hmh333sjq9d5c0"; + sha256 = "sha256-6edY3dRq4pI3bqsXEYf6jyBjDwpXzRKKQSCP3N/fV7s="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 00a499fb10..ac29545db3 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.12.3"; + version = "1.12.4"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "sha256-iVbct7p+i8ifSQzOFUUnJU0RHX36cFiTlv7p79iawj8="; + sha256 = "sha256-2qST5k2+8gfSf1/FaxXW4qwSQgNw/QKM+1mMWDdrjCU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/3mux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/3mux/default.nix index 3c51210edc..4b5db58c64 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/3mux/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/3mux/default.nix @@ -1,24 +1,38 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: buildGoModule rec { pname = "3mux"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "aaronjanse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-auEMG3txO2JS/2dMFBtEujv9s5I0A80Vwts5kXjH600="; + sha256 = "sha256-QT4QXTlJf2NfTqXE4GF759EoW6Ri12lxDyodyEFc+ag="; }; - vendorSha256 = "sha256-rcbnyScD2GU1DLY6dTEPgFNXZfgkxXPn5lt6HRqa0d8="; + nativeBuildInputs = [ makeWrapper ]; + + vendorSha256 = "sha256-tbziQZIA1+b+ZtvA/865c8YQxn+r8HQy6Pqaac2kwcU="; + + # This is a package used for internally testing 3mux. It's meant for + # use by 3mux maintainers/contributors only. + excludedPackages = [ "fuzz" ]; + + # 3mux needs to have itself in the path so users can run `3mux detach`. + # This ensures that, while inside 3mux, the binary in the path is the + # same version as the 3mux hosting the session. This also allows users + # to use 3mux via `nix run nixpkgs#_3mux` (otherwise they'd get "command + # not found"). + postInstall = '' + wrapProgram $out/bin/3mux --prefix PATH : $out/bin + ''; meta = with lib; { description = "Terminal multiplexer inspired by i3"; longDescription = '' - 3mux is a terminal multiplexer with out-of-the-box support for search, - mouse-controlled scrollback, and i3-like keybindings. Imagine tmux with a - smaller learning curve and more sane defaults. + Terminal multiplexer with out-of-the-box support for search, + mouse-controlled scrollback, and i3-like keybindings ''; homepage = "https://github.com/aaronjanse/3mux"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix index 4b22e6493a..2acc8dabbe 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "broadlink-cli"; - version = "0.16.0"; + version = "0.17.0"; # the tools are available as part of the source distribution from GH but # not pypi, so we have to fetch them here. @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { owner = "mjg59"; repo = "python-broadlink"; rev = version; - sha256 = "sha256-fdwy58AopAcDp18APzvYionEbrKfTlH/yFpT1gG5iDs="; + sha256 = "sha256-b3A36BdIvyl1RxNO5SyxLIpQmu1UHHekyh6vrFjwpp4="; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix index 3ecb201468..7370570599 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }: -let version = "0.2.6"; in +let version = "0.2.7"; in rustPlatform.buildRustPackage { pname = "dijo"; inherit version; @@ -8,9 +8,9 @@ rustPlatform.buildRustPackage { owner = "NerdyPepper"; repo = "dijo"; rev = "v${version}"; - sha256 = "sha256-fdPl+3NjgVE2MRopzeN/bxbVP6HaTnyJTGFWsLhlRoQ="; + sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE="; }; - cargoSha256 = "sha256-45YfZWncT7hNiOhlAatpdFdxgBaF83sih67B/DPNHcs="; + cargoSha256 = "sha256-3V94bOixYMznkCQu90+E/68Sfl9GvHp9LNxwWwk4xZQ="; meta = with lib; { description = "Scriptable, curses-based, digital habit tracker"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix index ee06845034..5fa6b8db60 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "direnv"; - version = "2.27.0"; + version = "2.28.0"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "05vvn59xd2q4yjizh5fprjib5xqq58by80d5avsm8nb1qxf383b1"; + sha256 = "sha256-iZ3Lf7Yg+N9BWyLLF+MrT2gpPT9BTcp6pNMpfqwcZXo="; }; - vendorSha256 = "084x7d7sshcsyim76d6pl6127nlqacgwwnm965srl9y5w5nqzba6"; + vendorSha256 = "sha256-P8NLY1iGh86ntmYsTVlnNh5akdaM8nzcxDn6Nfmgr84="; # we have no bash at the moment for windows BASH_PATH = diff --git a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix index 25542543d6..035b6f6551 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.25.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "085apa4msw8v8f57942xh7wfw3dkavrl9d58yj6i3yr75l3vg05r"; + sha256 = "0p9hslaawnqnnf1s6hj3vdh11ncq7mrb4w4i933mdkychw5jav38"; }; vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix b/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix index 56f9452db7..88d62b896d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "git-town"; - version = "7.4.0"; + version = "7.5.0"; goPackagePath = "github.com/git-town/git-town"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - sha256 = "05s2hp4xn0bs3y6rgqkpgz0k8q8yfpwkw5m8vwim95hk6n41ps18"; + sha256 = "sha256-RmLDlTK+JO2KRLuLvO927W3WYdDlteBIpgTgDXh8lC8="; }; buildFlagsArray = [ "-ldflags=-X github.com/git-town/git-town/src/cmd.version=v${version} -X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix b/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix index ef464e7b75..f36dacdd3a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "oppai-ng"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Francesco149"; repo = pname; rev = version; - sha256 = "sha256-fUtyQaHcNBmDs1BPbFGieKY/CFyETqBxYzzIXSERFJY="; + sha256 = "sha256-L9eraLOWm1tMImS8bLB9T4Md4VdTSxqI9Bt4r8eqxqs="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix index f43bbcdb8f..6d38516997 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pcb2gcode"; - version = "2.2.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "pcb2gcode"; repo = "pcb2gcode"; rev = "v${version}"; - sha256 = "sha256-CIhhwUsnX+Wx4hLNE8uQf17QbDDm4vCbv/XZVuCrWdw="; + sha256 = "sha256-BELugmnnedqXTnSwiQN3XbqkWKTKF27ElQAwrEWNSao="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix index 970a5bc826..27e228f0f2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgcenter"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "lesovsky"; repo = "pgcenter"; rev = "v${version}"; - sha256 = "sha256-W/UUc0qwOvLSXYWepkCydst113BqR9EsZK0Es+6HSt8="; + sha256 = "sha256-ow26wuM7nw/WbeaPVcNm5iYUYLydeujhw+7BcTirPcA="; }; vendorSha256 = "sha256-9hYiyZ34atmSL7JvuXyiGU7HR4E6qN7bGZlyU+hP+FU="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pistol/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pistol/default.nix index 6eec45db01..f31de57fdf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pistol/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pistol/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pistol"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "00vpl43m0zw6vqw8yjkaa7dnis9g169jfb48g2mr0hgyhsjr7jbj"; + sha256 = "sha256-Q/W+1NvbuSu+QfezJpyeI5r4VlzdAAbOlSfFIT8knJs="; }; - vendorSha256 = "1rkyvcyrjnrgd3b05gjd4sv95j1b99q641f3n36kgf3sc3hp31ws"; + vendorSha256 = "sha256-oXt2nZ9lcAiI9ZQtKuQrXOXDfqx3Ucvh/K6g7SScd2Q="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix index eb267e6007..ea49038724 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2021.1"; + version = "1.2021.2"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "sha256-FOM+hao1lx6EJMccbhLzvVVmCR3F/igHTGN1vhhdmdQ="; + sha256 = "sha256-06PrqYf1Cc4FZPr0K2xUc83t+/qGbwMXe/BOV81Fuxc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/progress/default.nix b/third_party/nixpkgs/pkgs/tools/misc/progress/default.nix index 4f27cd239d..9feee48417 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/progress/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/progress/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "progress"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { owner = "Xfennec"; repo = "progress"; rev = "v${version}"; - sha256 = "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm"; + sha256 = "sha256-kkEyflyBaQ5hUVo646NUuC1u54uzLJJsVFej9pMEwT0="; }; nativeBuildInputs = [ pkg-config which ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix index 64cc91f170..a3b613611f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-564ZHrok5RVFR9OYPpd6WjSZKieNFhnvUbBklayGOb0="; + sha256 = "sha256-1udmtstmTmoW45tvDSVQPoMymw5YRKMls1CmWnqIaNE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix new file mode 100644 index 0000000000..b1e75f36b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix @@ -0,0 +1,38 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "tfk8s"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "jrhouston"; + repo = "tfk8s"; + rev = version; + sha256 = "sha256-JzTWbkICOIfsHgMvpXz4bIWaXKKDAD8INSorMvnXiBw="; + }; + + vendorSha256 = "sha256-r0c3y+nRc/hCTAT31DasQjxZN86BT8jnJmsLM7Ugrq4="; + runVend = true; + + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X main.toolVersion=${version}" + "-X main.builtBy=nixpkgs" + ]; + + meta = with lib; { + description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format."; + license = licenses.mit; + longDescription = '' + tfk8s is a tool that makes it easier to work with the Terraform Kubernetes Provider. + If you want to copy examples from the Kubernetes documentation or migrate existing YAML manifests and use them with Terraform without having to convert YAML to HCL by hand, this tool is for you. + Features: + * Convert a YAML file containing multiple manifests. + * Strip out server side fields when piping kubectl get $R -o yaml | tfk8s --strip + ''; + homepage = "https://github.com/jrhouston/tfk8s/"; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/units/default.nix b/third_party/nixpkgs/pkgs/tools/misc/units/default.nix index 2b40e289ca..04e955a78b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/units/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/units/default.nix @@ -11,11 +11,11 @@ assert enableCurrenciesUpdater -> pythonPackages != null; stdenv.mkDerivation rec { pname = "units"; - version = "2.19"; + version = "2.21"; src = fetchurl { url = "mirror://gnu/units/${pname}-${version}.tar.gz"; - sha256 = "0mk562g7dnidjgfgvkxxpvlba66fh1ykmfd9ylzvcln1vxmi6qj2"; + sha256 = "sha256-bD6AqfmAWJ/ZYqWFKiZ0ZCJX2xxf1bJ8TZ5mTzSGy68="; }; pythonEnv = pythonPackages.python.withPackages(ps: [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix index fd195ab184..8a04d07b65 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix @@ -1,8 +1,15 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, cargo +, sphinx , Security +, prefix ? "uutils-" +, buildMulticallBinary ? true }: -rustPlatform.buildRustPackage rec { +stdenv.mkDerivation rec { pname = "uutils-coreutils"; version = "0.0.4"; @@ -13,21 +20,32 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-z5lDKJpFxXDCQq+0Da/63GGoUXacy5TSn+1gJiMvicc="; }; - # too many impure/platform-dependent tests - doCheck = false; + postPatch = '' + # can be removed after https://github.com/uutils/coreutils/pull/1815 is included + substituteInPlace GNUmakefile \ + --replace uutils coreutils + ''; - cargoSha256 = "sha256-x/nn2JNe8x+I0G2Vbr2PZAHCghwLBDhKAhkHPQFeL0M="; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-x/nn2JNe8x+I0G2Vbr2PZAHCghwLBDhKAhkHPQFeL0M="; + }; - makeFlags = - [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] - ++ lib.optional (prefix != null) [ "PROG_PREFIX=${prefix}" ]; + nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; - nativeBuildInputs = [ cmake cargo sphinx ]; buildInputs = lib.optional stdenv.isDarwin Security; - # empty {build,install}Phase to use defaults of `stdenv.mkDerivation` rather than rust defaults - buildPhase = ""; - installPhase = ""; + makeFlags = [ + "CARGO=${cargo}/bin/cargo" + "PREFIX=${placeholder "out"}" + "PROFILE=release" + "INSTALLDIR_MAN=${placeholder "out"}/share/man/man1" + ] ++ lib.optionals (prefix != null) [ "PROG_PREFIX=${prefix}" ] + ++ lib.optionals buildMulticallBinary [ "MULTICALL=y" ]; + + # too many impure/platform-dependent tests + doCheck = false; meta = with lib; { description = "Cross-platform Rust rewrite of the GNU coreutils"; @@ -36,7 +54,7 @@ rustPlatform.buildRustPackage rec { CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. ''; homepage = "https://github.com/uutils/coreutils"; - maintainers = with maintainers; [ siraben ]; + maintainers = with maintainers; [ siraben SuperSandro2000 ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix index 29f1ed6d3d..2069ba6b15 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "7.3"; + version = "8.0"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "sha256-3y3QLqUWBSJ9BLI8gd0LQ9SxNhcj5dXpz8Y2Hi2iCwU="; + sha256 = "sha256-KntJtli1PtqH/9XOTq4FkVJYklp0L7bChwQQGCBTLDA="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix index 9feecb5891..56e139941b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix @@ -2,25 +2,34 @@ , stdenv , fetchFromGitHub , makeWrapper +, coreutils , curl , dmenu , fzf +, gnused , jq , mpv +, ncurses +, ueberzug , youtube-dl }: stdenv.mkDerivation rec { pname = "ytfzf"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - sha256 = "1i9ya38zcaj1vkfgy1n4gp5vqb59zlrd609pdmz4jqinrb0c5fgv"; + sha256 = "sha256-ATQRXYaIp1MKCO/EAPsopzFEZeNJzdk73/OcgjsMdkg="; }; + patches = [ + # Updates have to be installed through Nix. + ./no-update.patch + ]; + nativeBuildInputs = [ makeWrapper ]; makeFlags = [ "PREFIX=${placeholder "out"}/bin" ]; @@ -29,7 +38,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [ - curl dmenu fzf jq mpv youtube-dl + coreutils curl dmenu fzf gnused jq mpv ncurses ueberzug youtube-dl ]} ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch new file mode 100644 index 0000000000..07ca62cd94 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch @@ -0,0 +1,30 @@ +diff --git a/ytfzf b/ytfzf +index 5238682..c5c3a1a 100755 +--- a/ytfzf ++++ b/ytfzf +@@ -757,23 +757,8 @@ clear_history () { + } + + update_ytfzf () { +- branch="$1" +- updatefile="/tmp/ytfzf-update" +- curl -L "https://raw.githubusercontent.com/pystardust/ytfzf/$branch/ytfzf" -o "$updatefile" +- +- if sed -n '1p' < "$updatefile" | grep -q '#!/bin/sh' ; then +- chmod 755 "$updatefile" +- if [ "$(uname)" = "Darwin" ]; then +- sudo cp "$updatefile" "/usr/local/bin/ytfzf" +- else +- sudo cp "$updatefile" "/usr/bin/ytfzf" +- fi +- else +- printf "%bFailed to update ytfzf. Try again later.%b" "$c_red" "$c_reset" +- fi +- +- rm "$updatefile" +- exit ++ printf "%bUpdates have to be installed through Nix.%b\n" "$c_red" "$c_reset" ++ exit 1 + } + + diff --git a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix index 37cb23f987..50b3fa0778 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -1,32 +1,35 @@ { stdenv, lib, fetchzip }: -let - inherit (stdenv.hostPlatform) system; - suffix = { - 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}"; - }; -in stdenv.mkDerivation rec { pname = "boundary"; - version = "0.1.7"; + version = "0.1.8"; - src = fetchsrc version { - x86_64-linux = "sha256-cSD9V/Hj/eEc6k+LMNRnSEA94fA6bQUfCgA+XdqAR4k="; - aarch64-linux = "sha256-MG97PhG/t1rdmTF3n2YHYsTo8VODCaY3cfnv8YHgAY8="; - x86_64-darwin = "sha256-p60UiIy9DGx7AaEvmyo4FLa0Z67MQRNJkw1nHaM6eww="; - }; + src = + let + inherit (stdenv.hostPlatform) system; + suffix = { + 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}; + }; + in + fetchsrc version { + x86_64-linux = "sha256-CZueZqN1XoSmqOsocGwUoIZ5878uSHFYW2KDURWRHhM="; + aarch64-linux = "sha256-/pl9MzR4GFjiefc7Sde+jTGi/QaY3U/An8J5+KQR/68="; + x86_64-darwin = "sha256-kkqROFXvEpxRySByGtmGtFJPBr5Dw3BOPQ+bArqLxAA="; + }; dontConfigure = true; dontBuild = true; installPhase = '' + runHook preInstall install -D boundary $out/bin/boundary + runHook postInstall ''; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix index f0aecf7363..527ecfbf98 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cassowary"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "rogerwelin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IaS2QU9DBupv06AMzJXBM2iZkNVw31Pt1bOMQNBEiq0="; + sha256 = "sha256-rQNrxAKf2huY9I6iqdf1iYxgXaQI0LG1Lkrnv1OuJsg="; }; - vendorSha256 = "sha256-RuwrnuTNfiYpIuohw7OQv95hjOAeWCMuajsZVUUDxBQ="; + vendorSha256 = "sha256-hGpiL88x2roFEjJJM4CKyt3k66VK1pEnpOwvhDPDp6M="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/go-shadowsocks2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/go-shadowsocks2/default.nix index c989f36da3..0c8505c700 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/go-shadowsocks2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/go-shadowsocks2/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-shadowsocks2"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "shadowsocks"; repo = "go-shadowsocks2"; rev = "v${version}"; - sha256 = "1wzy3ml4ld83iawcl6p313bskzs6zjhz8vlg8kpwgn71cnbv4pvi"; + sha256 = "sha256-ouJGrVribymak4SWaLbGhlp41iuw07VdxCypoBr1hWA="; }; - vendorSha256 = "0iyak8af708h3rdrslndladbcjrix35j3rlhpsb8ljchqp09lksg"; + vendorSha256 = "sha256-RrHksWET5kicbdQ5HRDWhNxx4rTi2zaVeaPoLdg4uQw="; meta = with lib; { description = "Fresh implementation of Shadowsocks in Go"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix index 1307633852..dfb6413487 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kapp"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-kapp"; rev = "v${version}"; - sha256 = "1i4hpqpbwqb0yg3rx4z733zfslq3svmahfr39ss1ydylsipl02mg"; + sha256 = "sha256-hYKRfAnpHw8hHT70sOQSGlDj0dgzU0wlZpXA5f2BBfg="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix b/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix index a805fe7e9e..48fe72d429 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "keepalived"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "sha256-Cupi5arScECKmHCBcC0Cmm/64JhidMyNUB75YmGMJag="; + sha256 = "sha256-qugEEbOQ4bemzelIOaNFvo3piMZpKUZGjR+4XF8aLHw="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix index bdec1b2b4a..1b2b0f2deb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-03-10T05-59-20Z"; + version = "2021-03-12T03-36-59Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-IoCM2FA6oNiNT6zWspMEqgq4hZ8tAQVEAqouRlBe/ts="; + sha256 = "sha256-aIJjr7KaT4E4Q1Ho4D0emduJWFxdCXCodq7J43r0DMQ="; }; vendorSha256 = "sha256-aoRdtv/Q7vjn0M7iSYAuyu/3pEH30x6D39xTHqQPvuo="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/applet/default.nix b/third_party/nixpkgs/pkgs/tools/networking/network-manager/applet/default.nix index 45839eabb0..f6c45fc074 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/network-manager/applet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/network-manager/applet/default.nix @@ -11,7 +11,6 @@ , polkit , modemmanager , libnma -, mobile-broadband-provider-info , glib-networking , gsettings-desktop-schemas , libgudev @@ -26,11 +25,11 @@ stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.18.0"; + version = "1.20.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12xiy8g8qk18jvxvn78mvq03zvzp06bww49na765jjw0rq541fyx"; + sha256 = "0lsjkbv66hn7acl2pg9h6hz4b700zzv4cjwrwjvy7043blw0bcla"; }; mesonFlags = [ @@ -51,6 +50,7 @@ stdenv.mkDerivation rec { libgudev modemmanager jansson + glib glib-networking libappindicator-gtk3 gnome3.adwaita-icon-theme @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/network-manager-applet/"; description = "NetworkManager control applet for GNOME"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ phreedom ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/radvd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/radvd/default.nix index ddd196ebe5..de8b9a0a4f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/radvd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/radvd/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config bison flex check ]; buildInputs = [ libdaemon ]; + # Needed for cross-compilation + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + ]; + meta = with lib; { homepage = "http://www.litech.org/radvd/"; description = "IPv6 Router Advertisement Daemon"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix index 3427cd186c..efdd16e630 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix @@ -37,6 +37,9 @@ stdenv.mkDerivation rec { configureFlags = [ (lib.withFeatureAs (openssl != null) "ssl" "openssl") + ] ++ lib.optionals stdenv.isDarwin [ + # https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html + "--without-included-regex" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix index 798601d1a5..5a8ca2d9a8 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vA+Y4j9Flcrizqh61+4X70FzF5/wK2WVHQRsAUQzKnU="; + sha256 = "sha256-5t47QrYWbm8A4E1GhqZwME7rmSfU1SYVniRGSrcRpvk="; }; - cargoSha256 = "sha256-zGdjMpB7h+/RdM+wXffUuAyHnks6umyJmzUrANmqAS8="; + cargoSha256 = "sha256-/GFpjovPGEgkfJ53+wR8CBDXiQQPDCiIaRG2Ka71dhQ="; meta = with lib; { description = "Mirror installed software on multiple machines"; 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 9c0beb224d..d39af405da 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -55,7 +55,8 @@ common = ] ++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is24 [ libarchive gmock lowdown libcpuid ] + ++ lib.optionals is24 [ libarchive gmock lowdown ] + ++ lib.optional (is24 && stdenv.isx86_64) libcpuid ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS ((aws-sdk-cpp.override { diff --git a/third_party/nixpkgs/pkgs/tools/security/age/default.nix b/third_party/nixpkgs/pkgs/tools/security/age/default.nix index 74a2bb7a62..e15618da3f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/age/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/age/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "age"; - version = "1.0.0-beta6"; - vendorSha256 = "sha256-FTByNpLkWWHAWe5wVDRBGtKap/5+XGHeBMQAIdlPCkA="; + version = "1.0.0-rc.1"; + vendorSha256 = "1qx6pkhq00y0lsi6f82g8hxxh65zk1c0ls91ap6hdlj7ch79bhl2"; src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; rev = "v${version}"; - sha256 = "sha256-1LCcCEf2/R0am0jpA8yKl44+AoUFkbepxp9V6/nZkBQ="; + sha256 = "1n25wip4qnd3v9ial1apc2ybx10b9z6lwz7flyss6kvj3x5g9jd1"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix b/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix new file mode 100644 index 0000000000..a13e170723 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix @@ -0,0 +1,72 @@ +{ lib +, aiocoap +, awsiotpythonsdk +, bluepy +, buildPythonApplication +, can +, cmd2 +, cryptography +, fetchFromGitLab +, paho-mqtt +, pyi2cflash +, pymodbus +, pynetdicom +, pyparsing +, pyserial +, pyspiflash +, pythonOlder +, upnpy +, xmltodict +, zeroconf +}: + +buildPythonApplication rec { + pname = "expliot"; + version = "0.9.6"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitLab { + owner = "expliot_framework"; + repo = pname; + rev = version; + sha256 = "1wn8fyrvis0gw80zzmpivinw6mz5n33inhv39iallsl3is8xpgpa"; + }; + + propagatedBuildInputs = [ + aiocoap + awsiotpythonsdk + bluepy + can + cmd2 + cryptography + paho-mqtt + pyi2cflash + pymodbus + pynetdicom + pyparsing + pyserial + pyspiflash + upnpy + xmltodict + zeroconf + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "expliot" ]; + + meta = with lib; { + description = "IoT security testing and exploitation framework"; + longDescription = '' + EXPLIoT is a Framework for security testing and exploiting IoT + products and IoT infrastructure. It provides a set of plugins + (test cases) which are used to perform the assessment and can + be extended easily with new ones. The name EXPLIoT (pronounced + expl-aa-yo-tee) is a pun on the word exploit and explains the + purpose of the framework i.e. IoT exploitation. + ''; + homepage = "https://expliot.readthedocs.io/"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix index 0ffcad117f..92845c6cab 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.12.1"; + version = "1.12.2"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "0ickzq2swhabxqcg32n1i99bam6ip7c0mhhncgvmw332w6pzgvlb"; + sha256 = "14ylvb7crx32h7inklvvxjc72jz9xq3dhzr5905i76kgx57h64w9"; }; - vendorSha256 = "0i0dhipp1gdn0xdl4bpi13ksxf7dc9biz9riapm988bldcr5s1kr"; + vendorSha256 = "0gjzghrykdw1vp873yi7k8piz3gshzndm12jm6dxgl0ph4335a54"; subPackages = [ "." ]; @@ -46,6 +46,8 @@ buildGoModule rec { $out/bin/gopass completion $shell > gopass.$shell installShellCompletion gopass.$shell done + go run helpers/man/main.go > gopass.1 + installManPage gopass.1 '' + lib.optionalString passAlias '' ln -s $out/bin/gopass $out/bin/pass ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/libtpms/default.nix b/third_party/nixpkgs/pkgs/tools/security/libtpms/default.nix index 67228be674..85a2c1f722 100644 --- a/third_party/nixpkgs/pkgs/tools/security/libtpms/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-/zvMXdAOb4J3YaqdVJvTUI1/JFC0OKwgiYwYgYB62Y4="; + sha256 = "sha256-ljzxaZYC2RzasKoRvnjead8CEkbdptGD4V5QapvAQUQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index 047c072c38..cb6ee5aefe 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.33" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.34" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index a58e933d3c..17d21d9642 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 76926232b9c92df4832d986513fe89b8c1d53f1f - ref: refs/tags/6.0.33 + revision: 010e4d5a643a857e09bafbcf79b541e607de3c4c + ref: refs/tags/6.0.34 specs: - metasploit-framework (6.0.33) + metasploit-framework (6.0.34) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -12,7 +12,6 @@ GIT aws-sdk-s3 bcrypt bcrypt_pbkdf - bit-struct bson concurrent-ruby (= 1.0.5) dnsruby @@ -31,7 +30,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.34) + metasploit-payloads (= 2.0.37) metasploit_data_models metasploit_payloads-mettle (= 1.0.6) mqtt @@ -124,22 +123,22 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.431.1) - aws-sdk-core (3.112.1) + aws-partitions (1.432.0) + aws-sdk-core (3.113.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.226.0) + aws-sdk-ec2 (1.227.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.48.0) + aws-sdk-iam (1.49.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.42.0) + aws-sdk-kms (1.43.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.89.0) + aws-sdk-s3 (1.91.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -148,7 +147,6 @@ GEM bcrypt (3.1.16) bcrypt_pbkdf (1.1.0) bindata (2.4.8) - bit-struct (0.16) bson (4.12.0) builder (3.2.4) concurrent-ruby (1.0.5) @@ -168,7 +166,7 @@ GEM eventmachine (>= 1.0.0.beta.4) erubi (1.10.0) eventmachine (1.2.7) - faker (2.16.0) + faker (2.17.0) i18n (>= 1.6, < 2) faraday (1.3.0) faraday-net_http (~> 1.0) @@ -214,7 +212,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.34) + metasploit-payloads (2.0.37) metasploit_data_models (4.1.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -240,7 +238,7 @@ GEM network_interface (0.0.2) nexpose (7.2.1) nio4r (2.5.7) - nokogiri (1.11.1) + nokogiri (1.11.2) mini_portile2 (~> 2.5.0) racc (~> 1.4) octokit (4.20.0) @@ -325,7 +323,7 @@ GEM metasm rex-core rex-text - rex-socket (0.1.25) + rex-socket (0.1.26) rex-core rex-sslscan (0.1.6) rex-core diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index 0887f84410..b5fb78fd1f 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.33"; + version = "6.0.34"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-hIAXqohZyBJfVj4BxxYVpERZDU6sd6EnVgVax7MXQ7Q="; + sha256 = "sha256-sKt1hN7thNhA+bjeFF3gxJs/82EPXPiM81zcMpDRDyg="; }; 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 c66c4c5880..edd4d305fd 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -114,60 +114,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08574xgyq39z07xhbgc12882v38lgkmj0jpznpcivjca1v7dk53l"; + sha256 = "0y0z25hgghy3i8azx0mn8pda2qvd47zkilwjps0x32zn091blzgg"; type = "gem"; }; - version = "1.431.1"; + version = "1.432.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r5f7pb9dh95f7cb4rdj1z766c88735y6y6msbgzak0v8g8j3dw9"; + sha256 = "1774xyfqf307qvh5npvf01948ayrviaadq576r4jxin6xvlg8j9z"; type = "gem"; }; - version = "3.112.1"; + version = "3.113.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xa39m2lsdq4i0n9r2bz19nv43pjkrs54dnas7q78gl3c467wqj9"; + sha256 = "0lhpwxad3yc5c3a8jmp116qx5jmym0ykpv39iwdq5km4h3as6h2d"; type = "gem"; }; - version = "1.226.0"; + version = "1.227.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02xsqb66r7a53a9nnwrhpvd5s9n7wdrvd51c56gs1hlb38j45y0j"; + sha256 = "1c7vnkwh6z7nxgpmdw8hy70wxiimszyp644vmj8p1pr7ybz6sv9l"; type = "gem"; }; - version = "1.48.0"; + version = "1.49.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00wgf83cdy6z77b2y0ld0aqiidfyldi71hx0z8b73gxjdlbwpq1i"; + sha256 = "01pd0f4srsa65zl4zq4014p9j5yrr2yy9h9ab17g3w9d0qqm2vsh"; type = "gem"; }; - version = "1.42.0"; + version = "1.43.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mznxmpsjqf3gmb6nxkmj2niswy4vvs4ykabf5z9cvamhbvvjhbv"; + sha256 = "0vs3zg9d3lzi7rwys4qv62mcmga39s4rg4rmb0dalqknz6lqzhrq"; type = "gem"; }; - version = "1.89.0"; + version = "1.91.0"; }; aws-sigv4 = { groups = ["default"]; @@ -209,16 +209,6 @@ }; version = "2.4.8"; }; - bit-struct = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1w7x1fh4a6inpb46imhdf4xrq0z4d6zdpg7sdf8n98pif2hx50sx"; - type = "gem"; - }; - version = "0.16"; - }; bson = { groups = ["default"]; platforms = []; @@ -344,10 +334,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jc6wffxnl7rbhg4hpj572f38fkxgrkgvv5imgzamrdmw55h206b"; + sha256 = "0z3d4y6xg8prn3zdjw1qpqrnziq1d3zigqil4sxjj0pbr46gc1d6"; type = "gem"; }; - version = "2.16.0"; + version = "2.17.0"; }; faraday = { groups = ["default"]; @@ -524,12 +514,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "76926232b9c92df4832d986513fe89b8c1d53f1f"; - sha256 = "1d232yrwfnh5aqks2xxc9q6mji542lbcf09yargi5j2ri2m1g044"; + rev = "010e4d5a643a857e09bafbcf79b541e607de3c4c"; + sha256 = "0a0gs6835p2wyf6ghp0gc7rkz6y4w1fi9pmqz50di17dvs27baxh"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.33"; + version = "6.0.34"; }; metasploit-model = { groups = ["default"]; @@ -546,10 +536,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n0npcd6im6h225pd3abcydsxg9n3hmarmdssy66x4g8wpiifbrp"; + sha256 = "1mf1c50j2gszxspnn9f2d356z8aaiv9s9x8lpdi05cf6syvhsa2k"; type = "gem"; }; - version = "2.0.34"; + version = "2.0.37"; }; metasploit_data_models = { groups = ["default"]; @@ -706,10 +696,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; + sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p"; type = "gem"; }; - version = "1.11.1"; + version = "1.11.2"; }; octokit = { groups = ["default"]; @@ -1076,10 +1066,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1601b7vhp56sif21lk7mqcn3bbkhdrp6zz0vag8yzma3ji707pqg"; + sha256 = "0mgk44f55w2g536nkxbg62qq5cfr05qxldglfr3yf94qkkanl2gg"; type = "gem"; }; - version = "0.1.25"; + version = "0.1.26"; }; rex-sslscan = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix index e2a895f074..f44b7abf52 100644 --- a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "teler"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "kitabisa"; repo = "teler"; rev = "v${version}"; - sha256 = "sha256-6OeGlpimQtw4w26HRzw2wmd3wjASY199p8XXPD/JMy8="; + sha256 = "sha256-0tx/oyHl6s1mj7NyWMZGCJoSuOeB+BMlBrnGY4IN/i4="; }; - vendorSha256 = "sha256-L+wjurURpesCA2IK0r1sxvOUvNJT1wiRp75kpe6LH5s="; + vendorSha256 = "sha256-KvUnDInUqFW7FypgsppIBQZKNu6HVsEeHtGwdqYtoys="; # test require internet access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix index ab4a719764..0d7c3d2863 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.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mPd4HsWbPUNJTUNjQ5zQztoXZy2b9iLksdGKAjp0A58="; + sha256 = "sha256-YUrvdleH332fWDgq8AwUdXkFC7m9ap+OVuQhKlxZfII="; }; - vendorSha256 = "sha256-eNQTJHqOCOTAPO+vil6rkV9bNWZIdXxGQPE4IpETFtA="; + vendorSha256 = "sha256-CzJ83MsBetrzbBT+fmz8F8MjdrManJAd4xpykh/2938="; # tests want to download a vulnerable Terraform project doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/system/fio/default.nix b/third_party/nixpkgs/pkgs/tools/system/fio/default.nix index a71bef4809..d34f0d4b73 100644 --- a/third_party/nixpkgs/pkgs/tools/system/fio/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.25"; + version = "3.26"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "1f20ihynwnz8jqqlr73i5glr8ziplz4mmcjgk340mj2yqqcnsqag"; + sha256 = "sha256-/Si0McndJ6Xp3ifDr+BStv89LmZyAgof95QkHGT8MGQ="; }; buildInputs = [ python zlib ] diff --git a/third_party/nixpkgs/pkgs/tools/system/snooze/default.nix b/third_party/nixpkgs/pkgs/tools/system/snooze/default.nix index 05c0b69c92..bfe91c6e0e 100644 --- a/third_party/nixpkgs/pkgs/tools/system/snooze/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/snooze/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "snooze"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = "snooze"; rev = "v${version}"; - sha256 = "0a114brvvjf6vl7grviv0gd6gmikr447m8kq1wilp4yj51sfyxa9"; + sha256 = "sha256-K77axli/mapUr3yxpmUfFq4iWwgRmEVUlP6+/0Iezwo="; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix index 5989750ea9..93fadfe0ef 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "5.2.1"; + version = "5.2.2"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-eRKUoRr0FPVNUZV5WenA7GlpYPAVRNKe0uRxOzFjhVE="; + sha256 = "sha256-CS9xzRxTKvBuDM1vs+p+U7LSMP8W6+cKNb+Sd3wgwig="; }; - vendorSha256 = "sha256-l6zHsis2fais5HQJQdfsSC0sPdcF4BeWoUznpl3Fh1g="; + vendorSha256 = "sha256-nneQ0B7PyHAqiOzrmWqSssZM8B3np4VFUJLBqUvkjZE="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix index 1b22b781d5..1e6c86c199 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromSourcehut }: stdenv.mkDerivation rec { pname = "scdoc"; version = "1.11.1"; - src = fetchurl { - url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; - sha256 = "007pm3gspvya58cwb12wpnrm9dq5p28max2s0b2y9rq80nqgqag5"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = pname; + rev = version; + sha256 = "1g37j847j3h4a4qbbfbr6vvsxpifj9v25jgv25nd71d1n0dxlhvk"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix index 989f49b6d9..dbd4fed147 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2, libxslt, texlive +{ lib, stdenv, fetchurl, python3, libxslt, texlive , enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null , tex ? texlive.combine { # satisfy all packages that ./configure mentions @@ -21,14 +21,15 @@ assert enableAllFeatures -> ghostscript != null; stdenv.mkDerivation rec { - name = "dblatex-0.3.11"; + pname = "dblatex"; + version = "0.3.12"; src = fetchurl { - url = "mirror://sourceforge/dblatex/${name}.tar.bz2"; - sha256 = "0rp1bc2lgisigscq1i7zxfd2qdaxxxld6khbcxss4pq7fpi9fzkv"; + url = "mirror://sourceforge/dblatex/${pname}3-${version}.tar.bz2"; + sha256 = "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n"; }; - buildInputs = [ python2 libxslt tex ] + buildInputs = [ python3 libxslt tex ] ++ lib.optionals enableAllFeatures [ imagemagick transfig ]; # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - ${python2.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose + ${python3.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose ''; passthru = { inherit tex; }; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix index 028d05e633..14fda991f5 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "shipyard"; - version = "0.2.9"; + version = "0.2.15"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-S2nH1E20frsJzW2RCn+eJ9ylVdhVbo4wesNwlQll9S4="; + sha256 = "sha256-QJn1A2l9bK4jUObnKfzO9/2LxY9i+ueGlZiefqCYZKA="; }; - vendorSha256 = "sha256-rglpY7A0S56slL+mXFRgaZwS0bF1b9zxxmNYiX6TJzs="; + vendorSha256 = "sha256-bpPFtyDPelLfpxU5OGkEPrp6EvERThg1TzAQ6otg8B0="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wev/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wev/default.nix index 83e4113f7e..69288a1bc8 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wev/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wev/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromSourcehut , pkg-config , scdoc , wayland @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { pname = "wev"; version = "1.0.0"; - src = fetchurl { - url = "https://git.sr.ht/~sircmpwn/wev/archive/${version}.tar.gz"; - sha256 = "0vlxdkb59v6nb10j28gh1a56sx8jk7ak7liwzv911kpmygnls03g"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = pname; + rev = version; + sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms"; }; nativeBuildInputs = [ pkg-config scdoc wayland ]; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wlsunset/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wlsunset/default.nix index 692ddd37cf..931f394d68 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wlsunset/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wlsunset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, pkg-config, ninja, wayland +{ lib, stdenv, fetchFromSourcehut, meson, pkg-config, ninja, wayland , wayland-protocols }: @@ -6,9 +6,11 @@ stdenv.mkDerivation rec { pname = "wlsunset"; version = "0.1.0"; - src = fetchurl { - url = "https://git.sr.ht/~kennylevinsen/wlsunset/archive/${version}.tar.gz"; - sha256 = "0g7mk14hlbwbhq6nqr84452sbgcja3hdxsqf0vws4njhfjgqiv3q"; + src = fetchFromSourcehut { + owner = "~kennylevinsen"; + repo = pname; + rev = version; + sha256 = "12snizvf49y40cirhr2brgyldhsykv4k2gnln2sdrajqzhrc98v6"; }; nativeBuildInputs = [ meson pkg-config ninja wayland ]; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix index 1c095ca297..5f0025d607 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchFromSourcehut , meson, pkg-config, wayland, ninja , cairo, libinput, pango, wayland-protocols, libxkbcommon }: @@ -10,9 +10,11 @@ in stdenv.mkDerivation rec { pname = "wshowkeys-unstable"; inherit version; - src = fetchurl { - url = "https://git.sr.ht/~sircmpwn/wshowkeys/archive/${commit}.tar.gz"; - sha256 = "0iplmw13jmc8d3m307kc047zq8yqwm42kw9fpm270562i3p0qk4d"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "wshowkeys"; + rev = commit; + sha256 = "10kafdja5cwbypspwhvaxjz3hvf51vqjzbgdasl977193cvxgmbs"; }; nativeBuildInputs = [ meson pkg-config wayland ninja ]; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 6036e42168..00f5c067fd 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -240,16 +240,24 @@ mapAliases ({ gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # added 2019-05-27 - gnuradio-nacl = gr-nacl; # added 2019-05-27 - gnuradio-gsm = gr-gsm; # added 2019-05-27 - gnuradio-ais = gr-ais; # added 2019-05-27 - gnuradio-limesdr = gr-limesdr; # added 2019-05-27 - gnuradio-rds = gr-rds; # added 2019-05-27 - gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27 - # added 20-10-2020 + # Added 2020-10-16 gnuradio-with-packages = gnuradio3_7.override { - extraPackages = [ gr-nacl gr-gsm gr-ais gr-limesdr gr-rds gr-osmosdr ]; + extraPackages = lib.attrVals [ + "osmosdr" "ais" "gsm" "nacl" "rds" "limesdr" + ] gnuradio3_7Packages; }; + gnuradio-nacl = gnuradio3_7.pkgs.nacl; # added 2019-05-27, changed 2020-10-16 + gnuradio-gsm = gnuradio3_7.pkgs.gsm; # added 2019-05-27, changed 2020-10-16 + gnuradio-ais = gnuradio3_7.pkgs.ais; # added 2019-05-27, changed 2020-10-16 + gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # added 2019-05-27, changed 2020-10-16 + gnuradio-rds = gnuradio3_7.pkgs.rds; # added 2019-05-27, changed 2020-10-16 + gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # added 2019-05-27, changed 2020-10-16 + gr-nacl = gnuradio3_7.pkgs.nacl; # added 2019-05-27, changed 2020-10-16 + gr-gsm = gnuradio3_7.pkgs.gsm; # added 2019-05-27, changed 2020-10-16 + gr-ais = gnuradio3_7.pkgs.ais; # added 2019-05-27, changed 2020-10-16 + gr-limesdr = gnuradio3_7.pkgs.limesdr; # added 2019-05-27, changed 2020-10-16 + gr-rds = gnuradio3_7.pkgs.rds; # added 2019-05-27, changed 2020-10-16 + gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # added 2019-05-27, changed 2020-10-16 gnustep-make = gnustep.make; # added 2016-7-6 gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14 @@ -262,7 +270,6 @@ mapAliases ({ google-gflags = gflags; # added 2019-07-25 google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # added 2021-03-07 google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07 - google-play-music-desktop-player = throw "google-play-music-desktop-player has been removed because Google Play Music was discontinued"; # added 2021-03-07 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 @@ -296,13 +303,15 @@ mapAliases ({ inotifyTools = inotify-tools; i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 - jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities"; jbuilder = dune_1; # added 2018-09-09 jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 + kodiGBM = kodi-gbm; + kodiPlain = kodi; + kodiPlainWayland = kodi-wayland; julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15 julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15 kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28 @@ -357,6 +366,7 @@ mapAliases ({ 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 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 + lilypond-unstable = lilypond; # added 2021-03-11 links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; linuxPackages_rpi0 = linuxPackages_rpi1; @@ -780,7 +790,8 @@ mapAliases ({ xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # added 2020-06-24 xbmc = kodi; # added 2018-04-25 xbmcPlain = kodiPlain; # added 2018-04-25 - xbmcPlugins = kodiPlugins; # added 2018-04-25 + xbmcPlugins = kodiPackages; # added 2018-04-25 + kodiPlugins = kodiPackages; # added 2021-03-09; xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 72fdc8cbbc..70caf58015 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -755,6 +755,8 @@ in metapixel = callPackage ../tools/graphics/metapixel { }; + tfk8s = callPackage ../tools/misc/tfk8s { }; + xtrt = callPackage ../tools/archivers/xtrt { }; yabridge = callPackage ../tools/audio/yabridge { @@ -2778,7 +2780,9 @@ in precice = callPackage ../development/libraries/precice { }; - pueue = callPackage ../applications/misc/pueue { }; + pueue = callPackage ../applications/misc/pueue { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; pixiecore = callPackage ../tools/networking/pixiecore {}; @@ -3953,6 +3957,8 @@ in volctl = callPackage ../tools/audio/volctl { }; + volk = callPackage ../development/libraries/volk { }; + vorta = libsForQt5.callPackage ../applications/backup/vorta { }; utahfs = callPackage ../applications/networking/utahfs { }; @@ -4134,6 +4140,8 @@ in expect = callPackage ../tools/misc/expect { }; + expliot = python3Packages.callPackage ../tools/security/expliot { }; + f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; Fabric = with python3Packages; toPythonApplication Fabric; @@ -5575,11 +5583,13 @@ in kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { }; wrapKakoune = kakoune: attrs: callPackage ../applications/editors/kakoune/wrapper.nix (attrs // { inherit kakoune; }); - kakounePlugins = callPackage ../applications/editors/kakoune/plugins { }; + kakounePlugins = recurseIntoAttrs (callPackage ../applications/editors/kakoune/plugins { }); + kakoune-unwrapped = callPackage ../applications/editors/kakoune { }; kakoune = wrapKakoune kakoune-unwrapped { plugins = [ ]; # override with the list of desired plugins }; + kakouneUtils = callPackage ../applications/editors/kakoune/plugins/kakoune-utils.nix { }; kak-lsp = callPackage ../tools/misc/kak-lsp { inherit (darwin.apple_sdk.frameworks) Security; @@ -10810,7 +10820,7 @@ in ocamlformat # latest version ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0 - ocamlformat_0_15_1 ocamlformat_0_16_0; + ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0; orc = callPackage ../development/compilers/orc { }; @@ -10827,7 +10837,7 @@ in ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; opa = callPackage ../development/compilers/opa { - ocamlPackages = ocaml-ng.ocamlPackages_4_03; + ocamlPackages = ocaml-ng.ocamlPackages_4_04; }; opaline = callPackage ../development/tools/ocaml/opaline { }; @@ -11085,7 +11095,9 @@ in smlpkg = callPackage ../tools/package-management/smlpkg { }; - solc = callPackage ../development/compilers/solc { }; + solc = solc_0_8; + solc_0_8 = callPackage ../development/compilers/solc { }; + solc_0_7 = callPackage ../development/compilers/solc/0.7.nix { }; souffle = callPackage ../development/compilers/souffle { autoreconfHook = buildPackages.autoreconfHook269; @@ -13141,7 +13153,10 @@ in uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; - uhd = callPackage ../applications/radio/uhd { }; + uhd3_5 = callPackage ../applications/radio/uhd/3.5.nix { }; + uhd = callPackage ../applications/radio/uhd { + boost = boost17x; + }; uisp = callPackage ../development/tools/misc/uisp { }; @@ -13480,6 +13495,8 @@ in hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { }; + hci = callPackage ../development/tools/continuous-integration/hci { }; + niv = lib.getBin (haskell.lib.justStaticExecutables haskellPackages.niv); ormolu = haskellPackages.ormolu.bin; @@ -14639,6 +14656,8 @@ in jansson = callPackage ../development/libraries/jansson { }; + jasper = callPackage ../development/libraries/jasper { }; + jbig2dec = callPackage ../development/libraries/jbig2dec { }; jcal = callPackage ../development/libraries/jcal { }; @@ -16773,13 +16792,7 @@ in qm-dsp = callPackage ../development/libraries/audio/qm-dsp { }; - qradiolink = callPackage ../applications/radio/qradiolink { - # 3.8 support is not ready yet: - # https://github.com/qradiolink/qradiolink/issues/67#issuecomment-703222573 - # The non minimal build is used because the 'qtgui' component is needed. - # gr-osmosdr is using the same gnuradio as of now. - gnuradio = gnuradio3_7-unwrapped; - }; + qradiolink = callPackage ../applications/radio/qradiolink { }; qrupdate = callPackage ../development/libraries/qrupdate { }; @@ -18481,6 +18494,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost173; # Configure checks for specific version. protobuf = protobuf3_7; + icu = icu67; }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; @@ -18594,6 +18608,7 @@ in prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; 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-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { }; prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { }; @@ -22331,81 +22346,97 @@ in gksu = callPackage ../applications/misc/gksu { }; - gnss-sdr = callPackage ../applications/radio/gnss-sdr { - boost = boost166; - gnuradio = gnuradio3_7-unwrapped; - }; + gnss-sdr = callPackage ../applications/radio/gnss-sdr { }; - gnuradio-unwrapped = callPackage ../applications/radio/gnuradio { - inherit (darwin.apple_sdk.frameworks) CoreAudio; - python = python3; - }; - # A build without gui components and other utilites not needed for end user - # libraries - gnuradioMinimal = gnuradio-unwrapped.override { - features = { - gnuradio-companion = false; - python-support = false; - gr-ctrlport = false; - examples = false; - gr-qtgui = false; - gr-utils = false; - gr-modtool = false; - sphinx = false; - doxygen = false; + gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = callPackage ../applications/radio/gnuradio { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + python = python3; + boost = boost17x; }; }; - gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { - unwrapped = gnuradio-unwrapped; + gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; + # A build without gui components and other utilites not needed for end user + # libraries + gnuradioMinimal = gnuradio.override { + wrap = false; + unwrapped = gnuradio.unwrapped.override { + volk = volk.override { + # So it will not reference python + enableModTool = false; + }; + features = { + gnuradio-companion = false; + python-support = false; + examples = false; + gr-qtgui = false; + gr-utils = false; + gr-modtool = false; + gr-blocktool = false; + sphinx = false; + doxygen = false; + }; + }; }; - gnuradio3_7-unwrapped = callPackage ../applications/radio/gnuradio/3.7.nix { - inherit (darwin.apple_sdk.frameworks) CoreAudio; - python = python2; + gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + python = python3; + boost = boost17x; + }; }; + gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs; # A build without gui components and other utilites not needed if gnuradio is # used as a c++ library. - gnuradio3_7Minimal = gnuradio3_7-unwrapped.override { - features = { - gnuradio-companion = false; - python-support = false; - gr-ctrlport = false; - gr-qtgui = false; - gr-utils = false; - sphinx = false; - doxygen = false; - gr-wxgui = false; + gnuradio3_8Minimal = gnuradio3_8.override { + wrap = false; + unwrapped = gnuradio3_8.unwrapped.override { + volk = volk.override { + enableModTool = false; + }; + features = { + gnuradio-companion = false; + python-support = false; + examples = false; + gr-qtgui = false; + gr-utils = false; + gr-modtool = false; + sphinx = false; + doxygen = false; + }; }; }; gnuradio3_7 = callPackage ../applications/radio/gnuradio/wrapper.nix { - unwrapped = gnuradio3_7-unwrapped; + unwrapped = callPackage ../applications/radio/gnuradio/3.7.nix { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + python = python2; + # Incompatible with uhd4+ + uhd = uhd3_5; + }; + }; + gnuradio3_7Packages = lib.recurseIntoAttrs gnuradio3_7.pkgs; + # 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; + unwrapped = gnuradio3_7.unwrapped.override { + volk = volk.override { + enableModTool = false; + }; + features = { + gnuradio-companion = false; + python-support = false; + gr-qtgui = false; + gr-utils = false; + sphinx = false; + doxygen = false; + gr-wxgui = false; + }; + }; }; grandorgue = callPackage ../applications/audio/grandorgue { }; - gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { - gnuradio = gnuradio3_7-unwrapped; - }; - - gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { - gnuradio = gnuradio3_7-unwrapped; - }; - - gr-ais = callPackage ../applications/radio/gnuradio/ais.nix { - gnuradio = gnuradio3_7-unwrapped; - }; - - gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { - gnuradio = gnuradio3_7-unwrapped; - }; - - gr-rds = callPackage ../applications/radio/gnuradio/rds.nix { - gnuradio = gnuradio3_7-unwrapped; - }; - - gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { - gnuradio = gnuradio3_7-unwrapped; - }; - goldendict = libsForQt5.callPackage ../applications/misc/goldendict { inherit (darwin) libiconv; }; @@ -22432,14 +22463,7 @@ in gpx = callPackage ../applications/misc/gpx { }; - gqrx = libsForQt514.callPackage ../applications/radio/gqrx { - gnuradio = gnuradio3_7Minimal; - # Use the same gnuradio for gr-osmosdr as well - gr-osmosdr = gr-osmosdr.override { - gnuradio = gnuradio3_7Minimal; - pythonSupport = false; - }; - }; + gqrx = callPackage ../applications/radio/gqrx { }; gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; @@ -22866,6 +22890,10 @@ in google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; + google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player { + inherit (gnome2) GConf; + }; + gosmore = callPackage ../applications/misc/gosmore { }; gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { @@ -23283,9 +23311,7 @@ in inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); - inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { - gnuradio = gnuradioMinimal; - }; + inspectrum = callPackage ../applications/radio/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; @@ -24638,6 +24664,8 @@ in pidgin-window-merge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; + pika-backup = callPackage ../applications/backup/pika-backup { }; + purple-discord = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-discord { }; purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; @@ -26170,33 +26198,6 @@ in cores = retroArchCores; }; - wrapKodi = { kodi }: callPackage ../applications/video/kodi/wrapper.nix { - inherit kodi; - plugins = let inherit (lib) optional optionals; in with kodiPlugins; - ([] - ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher - ++ optional (config.kodi.enableAdvancedEmulatorLauncher or false) - advanced-emulator-launcher - ++ optionals (config.kodi.enableControllers or false) - (with controllers; - [ default dreamcast gba genesis mouse n64 nes ps snes ]) - ++ optional (config.kodi.enableExodus or false) exodus - ++ optionals (config.kodi.enableHyperLauncher or false) - (with hyper-launcher; [ plugin service pdfreader ]) - ++ optional (config.kodi.enableJoystick or false) joystick - ++ optional (config.kodi.enableOSMCskin or false) osmc-skin - ++ optional (config.kodi.enableSVTPlay or false) svtplay - ++ optional (config.kodi.enableSteamController or false) steam-controller - ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher - ++ optional (config.kodi.enablePVRHTS or false) pvr-hts - ++ optional (config.kodi.enablePVRHDHomeRun or false) pvr-hdhomerun - ++ optional (config.kodi.enablePVRIPTVSimple or false) pvr-iptvsimple - ++ optional (config.kodi.enableInputStreamAdaptive or false) inputstream-adaptive - ++ optional (config.kodi.enableVFSSFTP or false) vfs-sftp - ++ optional (config.kodi.enableVFSLibarchive or false) vfs-libarchive - ); - }; - wsjtx = qt5.callPackage ../applications/radio/wsjtx { }; wxhexeditor = callPackage ../applications/editors/wxhexeditor { @@ -26254,28 +26255,16 @@ in gtk = gtk2; }; - kodiPlain = callPackage ../applications/video/kodi { }; + kodiPackages = recurseIntoAttrs (kodi.packages); - kodiPlainWayland = callPackage ../applications/video/kodi { - useWayland = true; + kodi = callPackage ../applications/video/kodi { }; + + kodi-wayland = callPackage ../applications/video/kodi { + waylandSupport = true; }; - kodiGBM = callPackage ../applications/video/kodi { - useGbm = true; - }; - - kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); - - kodi = wrapKodi { - kodi = kodiPlain; - }; - - kodi-wayland = wrapKodi { - kodi = kodiPlainWayland; - }; - - kodi-gbm = wrapKodi { - kodi = kodiGBM; + kodi-gbm = callPackage ../applications/video/kodi { + gbmSupport = true; }; kodi-cli = callPackage ../tools/misc/kodi-cli { }; @@ -26703,7 +26692,7 @@ in wownero = callPackage ../applications/blockchains/wownero.nix {}; - zcash = callPackage ../applications/blockchains/zcash { }; + zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; openethereum = callPackage ../applications/blockchains/openethereum { }; @@ -28510,7 +28499,7 @@ in tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; - tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix {gtk = gtk2;}; + tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix {}; aiger = callPackage ../applications/science/logic/aiger {}; @@ -29119,6 +29108,8 @@ in keynav = callPackage ../tools/X11/keynav { }; + kgx = callPackage ../applications/terminal-emulators/kgx { }; + kmon = callPackage ../tools/system/kmon { }; kompose = callPackage ../applications/networking/cluster/kompose { }; @@ -29141,8 +29132,6 @@ in lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; - lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; - lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { }; openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; @@ -30018,6 +30007,8 @@ in zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; + zxing-cpp = callPackage ../development/libraries/zxing-cpp { }; + snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; openmsx = callPackage ../misc/emulators/openmsx { diff --git a/third_party/nixpkgs/pkgs/top-level/gnuradio-packages.nix b/third_party/nixpkgs/pkgs/top-level/gnuradio-packages.nix new file mode 100644 index 0000000000..e5c2c8be31 --- /dev/null +++ b/third_party/nixpkgs/pkgs/top-level/gnuradio-packages.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, newScope +, gnuradio # unwrapped gnuradio +}: + +lib.makeScope newScope ( self: + +let + # Modeled after qt's + mkDerivationWith = import ../development/gnuradio-modules/mkDerivation.nix { + inherit lib; + unwrapped = gnuradio; + }; + mkDerivation = mkDerivationWith stdenv.mkDerivation; + + callPackage = self.newScope { + inherit (gnuradio) + # Packages that are potentially overriden and used as deps here. + boost + uhd + volk + ; + inherit mkDerivationWith mkDerivation; + }; + +in { + + inherit callPackage mkDerivation mkDerivationWith; + + ### Packages + + inherit gnuradio; + + osmosdr = callPackage ../development/gnuradio-modules/osmosdr/default.nix { }; + + ais = callPackage ../development/gnuradio-modules/ais/default.nix { }; + + gsm = callPackage ../development/gnuradio-modules/gsm/default.nix { }; + + nacl = callPackage ../development/gnuradio-modules/nacl/default.nix { }; + + rds = callPackage ../development/gnuradio-modules/rds/default.nix { }; + + limesdr = callPackage ../development/gnuradio-modules/limesdr/default.nix { }; + +}) diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index 96d3e9b423..7db0eb4d6a 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -138,6 +138,8 @@ lib.makeScope pkgs.newScope (self: with self; { sqlsrv = callPackage ../development/php-packages/sqlsrv { }; + swoole = callPackage ../development/php-packages/swoole { }; + v8 = buildPecl { version = "0.2.2"; pname = "v8"; @@ -399,7 +401,7 @@ lib.makeScope pkgs.newScope (self: with self; { # oci8 (7.4, 7.3, 7.2) # odbc (7.4, 7.3, 7.2) { name = "opcache"; - buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ + buildInputs = [ pcre' ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [ valgrind.dev ]; patches = lib.optionals (lib.versionOlder php.version "7.4") [ @@ -419,7 +421,9 @@ lib.makeScope pkgs.newScope (self: with self; { #include "zend_accelerator_util_funcs.h" '') ]; zendExtension = true; - doCheck = !(lib.versionOlder php.version "7.4"); } + doCheck = !(lib.versionOlder php.version "7.4"); + # Tests launch the builtin webserver. + __darwinAllowLocalNetworking = true; } { name = "openssl"; buildInputs = [ openssl ]; configureFlags = [ "--with-openssl" ]; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 5b991da11f..987f83f3c3 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -951,6 +951,8 @@ in { bellows = callPackage ../development/python-modules/bellows { }; + beniget = callPackage ../development/python-modules/beniget { }; + bespon = callPackage ../development/python-modules/bespon { }; betacode = callPackage ../development/python-modules/betacode { }; @@ -2184,6 +2186,8 @@ in { evernote = callPackage ../development/python-modules/evernote { }; + evohome-async = callPackage ../development/python-modules/evohome-async { }; + ewmh = callPackage ../development/python-modules/ewmh { }; exdown = callPackage ../development/python-modules/exdown { }; @@ -3254,6 +3258,8 @@ in { imutils = callPackage ../development/python-modules/imutils { }; + incomfort-client = callPackage ../development/python-modules/incomfort-client { }; + incremental = callPackage ../development/python-modules/incremental { }; inflect = callPackage ../development/python-modules/inflect { }; @@ -5949,6 +5955,8 @@ in { pynest2d = callPackage ../development/python-modules/pynest2d { }; + pynetdicom = callPackage ../development/python-modules/pynetdicom { }; + pynisher = callPackage ../development/python-modules/pynisher { }; pynmea2 = callPackage ../development/python-modules/pynmea2 { }; @@ -6778,6 +6786,8 @@ in { python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; + pythran = callPackage ../development/python-modules/pythran { }; + pyeverlights = callPackage ../development/python-modules/pyeverlights { }; pytile = callPackage ../development/python-modules/pytile { };