From 3e7541c14f5492e4cfca30b6bc9f4ce0b03da042 Mon Sep 17 00:00:00 2001 From: Default email Date: Fri, 7 Jan 2022 12:07:37 +0800 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: ff377a78794d412a35245e05428c8f95fef3951f --- .../workflows/update-terraform-providers.yml | 47 + .../nixpkgs/doc/builders/fetchers.chapter.md | 9 +- .../doc/languages-frameworks/beam.section.md | 30 +- .../doc/languages-frameworks/go.section.md | 4 +- third_party/nixpkgs/lib/default.nix | 3 +- third_party/nixpkgs/lib/options.nix | 2 +- third_party/nixpkgs/lib/trivial.nix | 22 + .../nixpkgs/maintainers/maintainer-list.nix | 60 +- .../nixpkgs/nixos/doc/manual/default.nix | 17 +- .../development/meta-attributes.section.md | 28 +- .../development/meta-attributes.section.xml | 44 +- .../from_md/release-notes/rl-2205.section.xml | 9 + .../manual/release-notes/rl-2205.section.md | 4 + .../nixos/lib/eval-cacheable-options.nix | 53 + .../nixos/lib/make-options-doc/default.nix | 51 +- .../nixos/lib/make-options-doc/mergeJSON.py | 86 ++ .../modules/hardware/onlykey/onlykey.udev | 4 +- .../nixos/modules/i18n/input-method/fcitx.nix | 3 + .../nixos/modules/i18n/input-method/ibus.nix | 3 + .../nixos/modules/i18n/input-method/kime.nix | 4 +- .../modules/installer/tools/nixos-install.sh | 34 +- .../nixos/modules/misc/documentation.nix | 105 +- .../nixpkgs/nixos/modules/misc/ids.nix | 2 + .../nixpkgs/nixos/modules/misc/meta.nix | 15 + .../nixpkgs/nixos/modules/misc/nixpkgs.nix | 3 + .../nixpkgs/nixos/modules/misc/version.nix | 2 + .../nixpkgs/nixos/modules/programs/gnupg.nix | 2 + .../nixos/modules/services/backup/sanoid.nix | 5 +- .../cluster/kubernetes/controller-manager.nix | 7 +- .../services/cluster/kubernetes/default.nix | 5 + .../services/cluster/kubernetes/kubelet.nix | 7 +- .../services/cluster/kubernetes/pki.nix | 9 +- .../services/cluster/kubernetes/proxy.nix | 7 +- .../services/cluster/kubernetes/scheduler.nix | 7 +- .../modules/services/databases/couchdb.nix | 4 +- .../nixos/modules/services/desktops/gvfs.nix | 2 +- .../pipewire/pipewire-media-session.nix | 8 + .../services/desktops/pipewire/pipewire.nix | 46 +- .../services/games/minecraft-server.nix | 21 + .../services/misc/matrix-appservice-irc.nix | 3 + .../services/misc/sourcehut/default.nix | 4 +- .../monitoring/prometheus/default.nix | 7 + .../services/networking/adguardhome.nix | 54 +- .../services/networking/dnscrypt-proxy2.nix | 3 + .../nixos/modules/services/networking/kea.nix | 2 + .../modules/services/networking/searx.nix | 1 - .../modules/services/networking/tinc.nix | 2 +- .../modules/services/networking/xrdp.nix | 1 + .../nixos/modules/services/security/aesmd.nix | 6 +- .../services/security/vaultwarden/default.nix | 3 + .../modules/services/web-apps/bookstack.nix | 3 - .../nixos/modules/services/web-apps/dex.nix | 3 + .../modules/services/web-apps/gerrit.nix | 2 + .../modules/services/web-apps/jirafeau.nix | 3 + .../services/web-apps/powerdns-admin.nix | 3 + .../modules/services/web-apps/wordpress.nix | 2 +- .../x11/desktop-managers/enlightenment.nix | 1 + .../nixos/modules/services/x11/xserver.nix | 2 + .../modules/system/activation/top-level.nix | 2 + .../nixos/modules/system/boot/binfmt.nix | 52 +- .../nixos/modules/virtualisation/qemu-vm.nix | 3 + .../nixos/modules/virtualisation/xen-dom0.nix | 1 - third_party/nixpkgs/nixos/tests/sudo.nix | 2 +- .../nixpkgs/nixos/tests/systemd-binfmt.nix | 106 +- .../audio/bucklespring/default.nix | 6 +- .../audio/gnome-podcasts/default.nix | 7 +- .../audio/miniaudicle/default.nix | 4 +- .../applications/audio/mopidy/default.nix | 2 + .../pkgs/applications/audio/mopidy/muse.nix | 29 + .../applications/audio/paprefs/default.nix | 4 +- .../applications/audio/snapcast/default.nix | 4 +- .../blockchains/bitcoin-classic/default.nix | 2 +- .../blockchains/dashpay/default.nix | 2 +- .../blockchains/electrs/default.nix | 6 +- .../pkgs/applications/blockchains/erigon.nix | 4 +- .../pkgs/applications/editors/em/default.nix | 29 + .../applications/editors/helix/default.nix | 6 +- .../pkgs/applications/gis/qgis/unwrapped.nix | 2 +- .../graphics/odafileconverter/default.nix | 2 +- .../graphics/opentoonz/default.nix | 6 +- .../graphics/opentoonz/libtiff.nix | 53 +- .../graphics/opentoonz/source.nix | 6 +- .../applications/graphics/ovito/default.nix | 45 +- .../applications/graphics/pinta/default.nix | 122 +- .../pkgs/applications/graphics/pinta/deps.nix | 12 + .../pkgs/applications/misc/copyq/default.nix | 13 +- .../pkgs/applications/misc/free42/default.nix | 25 +- .../pkgs/applications/misc/gpxsee/default.nix | 4 +- .../pkgs/applications/misc/hugo/default.nix | 4 +- .../pkgs/applications/misc/mdzk/default.nix | 6 +- .../applications/misc/minigalaxy/default.nix | 76 ++ .../pkgs/applications/misc/mob/default.nix | 25 +- .../misc/prusa-slicer/super-slicer.nix | 4 +- .../pkgs/applications/misc/sigi/default.nix | 24 + .../pkgs/applications/misc/smos/default.nix | 27 - .../applications/misc/sqliteman/default.nix | 8 +- .../pkgs/applications/misc/udevil/default.nix | 44 +- .../applications/misc/udiskie/default.nix | 18 +- .../networking/browsers/chromium/common.nix | 12 + .../browsers/chromium/upstream-info.json | 20 +- .../networking/browsers/lagrange/default.nix | 4 +- .../cluster/helm/plugins/helm-diff.nix | 2 +- .../cluster/helm/plugins/helm-s3.nix | 2 +- .../cluster/helm/plugins/helm-secrets.nix | 2 +- .../networking/cluster/kbst/default.nix | 2 +- .../cluster/terraform-providers/default.nix | 28 +- .../terraform-providers/gandi/default.nix | 22 +- .../terraform-providers/gandi/deps.nix | 21 - .../terraform-providers/providers.json | 52 +- .../terraform-providers/update-provider | 2 +- .../networking/{ => ftp}/gftp/default.nix | 9 +- .../instant-messengers/baresip/default.nix | 116 +- .../instant-messengers/blink/default.nix | 2 +- .../instant-messengers/cinny/default.nix | 31 + .../instant-messengers/gajim/default.nix | 20 +- .../signal-desktop/default.nix | 4 +- .../telegram/tdesktop/default.nix | 12 +- .../telegram/tdesktop/tg_owt.nix | 6 +- .../networking/irc/kirc/default.nix | 4 +- .../networking/mailreaders/aerc/default.nix | 4 +- .../networking/openbazaar/client.nix | 60 - .../networking/openbazaar/default.nix | 48 - .../office/libreoffice/src-fresh/download.nix | 8 +- .../office/libreoffice/src-fresh/primary.nix | 10 +- .../applications/office/pyspread/default.nix | 43 +- .../science/astronomy/astrolog/default.nix | 25 +- .../science/logic/lean/default.nix | 6 +- .../{commitizen => cz-cli}/default.nix | 1 + .../generate-dependencies.sh | 0 .../node-composition.nix | 0 .../{commitizen => cz-cli}/node-env.nix | 0 .../{commitizen => cz-cli}/node-packages.nix | 0 .../{commitizen => cz-cli}/package.json | 0 .../version-management/mercurial/default.nix | 41 +- .../version-management/p4/default.nix | 2 +- .../version-management/pijul/default.nix | 6 +- .../applications/video/celluloid/default.nix | 18 +- .../video/kodi/addons/future/default.nix | 2 +- .../pkgs/applications/video/kodi/wrapper.nix | 6 + .../pkgs/applications/video/mpv/default.nix | 4 +- .../video/mpv/scripts/mpvacious.nix | 22 +- .../video/plex-mpv-shim/default.nix | 4 +- .../virtualization/containerd/default.nix | 6 +- .../virtualization/docker/default.nix | 12 +- .../virtualization/qemu/binfmt-p-wrapper.c | 79 ++ .../virtualization/qemu/binfmt-p-wrapper.nix | 31 + .../virtualization/qemu/default.nix | 1 + .../window-managers/berry/default.nix | 44 +- .../window-managers/ion-3/default.nix | 2 +- .../window-managers/pekwm/default.nix | 53 +- .../build-support/fetchsourcehut/default.nix | 45 +- .../nixpkgs/pkgs/build-support/go/garble.nix | 1 + .../pkgs/data/fonts/ipaexfont/default.nix | 2 +- .../nixpkgs/pkgs/data/fonts/iwona/default.nix | 2 +- .../data/fonts/quattrocento-sans/default.nix | 2 +- .../pkgs/data/fonts/quattrocento/default.nix | 2 +- .../data/fonts/vista-fonts-chs/default.nix | 2 +- .../data/icons/gnome-icon-theme/default.nix | 1 + .../pkgs/data/misc/freepats/default.nix | 2 +- .../nixpkgs/pkgs/data/misc/hackage/pin.json | 8 +- .../pkgs/desktops/enlightenment/default.nix | 7 +- .../desktops/enlightenment/ecrire/default.nix | 36 + .../desktops/enlightenment/efl/default.nix | 4 +- .../enlightenment/enlightenment/default.nix | 4 +- .../enlightenment/terminology/default.nix | 12 +- .../gnome/extensions/arcmenu/default.nix | 4 +- .../pkgs/desktops/gnustep/base/default.nix | 7 + .../desktops/lxqt/lxqt-config/default.nix | 5 + .../xfce4-whiskermenu-plugin/default.nix | 4 +- .../pkgs/development/compilers/ghc/8.10.7.nix | 2 +- .../pkgs/development/compilers/ghc/8.8.4.nix | 2 +- .../compilers/ghc/{9.0.1.nix => 9.0.2.nix} | 12 +- .../pkgs/development/compilers/ghc/9.2.1.nix | 2 +- .../pkgs/development/compilers/ghc/head.nix | 2 +- .../compilers/ghcjs/8.10/stage0.nix | 4 +- .../development/compilers/jsonnet/default.nix | 4 +- .../compilers/llvm/12/compiler-rt/default.nix | 1 + .../compilers/llvm/13/compiler-rt/default.nix | 2 + .../llvm/git/compiler-rt/default.nix | 2 + .../development/compilers/nextpnr/default.nix | 6 +- .../pkgs/development/compilers/xa/xa.nix | 4 +- .../development/compilers/yosys/default.nix | 8 +- .../compilers/yosys/plugins/bluespec.nix | 6 +- .../development/embedded/rshell/default.nix | 19 +- .../go-modules/generic/default.nix | 13 +- .../haskell-modules/configuration-common.nix | 22 +- .../haskell-modules/configuration-darwin.nix | 24 + .../configuration-ghc-9.0.x.nix | 6 +- .../configuration-hackage2nix/broken.yaml | 3 + .../configuration-hackage2nix/main.yaml | 13 +- .../configuration-hackage2nix/stackage.yaml | 46 +- .../transitive-broken.yaml | 2 + .../haskell-modules/hackage-packages.nix | 1075 ++++++++++------- .../interpreters/clojure/default.nix | 4 +- .../development/interpreters/clojure/obb.nix | 83 ++ .../development/interpreters/dart/default.nix | 2 +- .../development/libraries/LASzip/LASzip2.nix | 10 +- .../libraries/arrow-cpp/default.nix | 8 +- .../libraries/audio/roc-toolkit/default.nix | 66 + .../development/libraries/box2d/default.nix | 3 +- .../development/libraries/cimg/default.nix | 6 +- .../development/libraries/dyncall/default.nix | 6 +- .../graphene-hardened-malloc/default.nix | 10 +- .../libraries/grib-api/default.nix | 71 -- .../libraries/intel-media-sdk/default.nix | 4 +- .../libraries/keybinder/default.nix | 11 +- .../libraries/libbaseencode/default.nix | 4 +- .../libraries/libcangjie/default.nix | 12 +- .../development/libraries/libcec/default.nix | 10 +- .../development/libraries/libcotp/default.nix | 4 +- .../libraries/libcrafter/default.nix | 10 +- .../libraries/libfprint/default.nix | 4 +- .../development/libraries/libre/default.nix | 24 +- .../development/libraries/librem/default.nix | 24 +- .../libraries/libressl/default.nix | 4 +- .../development/libraries/openfec/default.nix | 40 + .../libraries/pipewire/default.nix | 18 +- .../libraries/pipewire/media-session.nix | 15 + .../development/libraries/proj/default.nix | 13 +- .../libraries/qscintilla-qt4/default.nix | 67 + .../fix-qt4-build.patch | 0 .../libraries/qscintilla/default.nix | 43 +- .../development/libraries/wolfssl/default.nix | 4 +- .../development/libraries/xalanc/default.nix | 36 +- .../development/libraries/xed/default.nix | 2 +- .../development/misc/haskell/hasura/pool.nix | 2 +- .../development/ocaml-modules/dbf/default.nix | 28 + .../ocaml-modules/uunf/default.nix | 2 + .../adafruit-platformdetect/default.nix | 4 +- .../python-modules/alot/default.nix | 2 +- .../python-modules/ansible-runner/default.nix | 61 +- .../python-modules/apycula/default.nix | 4 +- .../python-modules/capstone/default.nix | 2 +- .../python-modules/censys/default.nix | 4 +- .../python-modules/chainer/default.nix | 4 +- .../python-modules/cirq-rigetti/default.nix | 6 +- .../python-modules/cmarkgfm/default.nix | 24 +- .../python-modules/datashader/default.nix | 28 +- .../python-modules/decli/default.nix | 23 + .../python-modules/deemix/default.nix | 4 +- .../python-modules/deezer-py/default.nix | 4 +- .../python-modules/deezer-python/default.nix | 4 +- .../python-modules/dm-haiku/default.nix | 59 + .../python-modules/dulwich/default.nix | 12 +- .../python-modules/elasticsearch/default.nix | 4 +- .../python-modules/env-canada/default.nix | 4 +- .../python-modules/environs/default.nix | 4 +- .../python-modules/ephem/default.nix | 4 +- .../filebrowser_safe/default.nix | 24 +- .../python-modules/flux-led/default.nix | 4 +- .../python-modules/fontparts/default.nix | 4 +- .../python-modules/gcsfs/default.nix | 6 +- .../python-modules/genanki/default.nix | 4 +- .../python-modules/geoalchemy2/default.nix | 4 +- .../python-modules/getmac/default.nix | 9 +- .../python-modules/goodwe/default.nix | 4 +- .../google-cloud-storage/default.nix | 4 +- .../google-nest-sdm/default.nix | 4 +- .../python-modules/gphoto2/default.nix | 4 +- .../python-modules/graphql-core/default.nix | 4 +- .../python-modules/hahomematic/default.nix | 16 +- .../intensity-normalization/default.nix | 4 +- .../python-modules/ipympl/default.nix | 4 +- .../development/python-modules/jc/default.nix | 4 +- .../json-schema-for-humans/default.nix | 4 +- .../python-modules/limnoria/default.nix | 4 +- .../python-modules/liquidctl/default.nix | 4 +- .../python-modules/mautrix/default.nix | 4 +- .../python-modules/mcstatus/default.nix | 4 +- .../python-modules/meshtastic/default.nix | 4 +- .../python-modules/metar/default.nix | 4 +- .../python-modules/miniaudio/default.nix | 4 +- .../python-modules/mizani/default.nix | 31 +- .../python-modules/mypy-boto3-s3/default.nix | 4 +- .../python-modules/nameparser/default.nix | 4 +- .../python-modules/oocsi/default.nix | 4 +- .../python-modules/optax/default.nix | 55 + .../python-modules/parfive/default.nix | 4 +- .../python-modules/parsy/default.nix | 24 +- .../python-modules/pyatmo/default.nix | 4 +- .../python-modules/pycm/default.nix | 49 +- .../python-modules/pydevccu/default.nix | 39 + .../python-modules/pydmd/default.nix | 43 +- .../python-modules/pyebus/default.nix | 4 +- .../python-modules/pyfftw/default.nix | 4 +- .../python-modules/pynamodb/default.nix | 4 +- .../python-modules/pysimplegui/default.nix | 24 +- .../python-modules/pysptk/default.nix | 4 +- .../python-modules/pytest-cases/default.nix | 4 +- .../pytest-console-scripts/default.nix | 4 +- .../python-modules/pytest-socket/default.nix | 26 +- .../python-modules/python-gitlab/default.nix | 8 +- .../python-modules/qcs-api-client/default.nix | 4 +- .../python-modules/qscintilla-qt4/default.nix | 42 + .../python-modules/qscintilla-qt5/default.nix | 60 +- .../python-modules/qscintilla/default.nix | 43 - .../readme_renderer/default.nix | 15 +- .../python-modules/rich/default.nix | 4 +- .../python-modules/sarge/default.nix | 10 +- .../python-modules/scikit-learn/default.nix | 4 +- .../python-modules/sfepy/default.nix | 4 +- .../python-modules/sqlmap/default.nix | 4 +- .../python-modules/sqlobject/default.nix | 26 +- .../python-modules/striprtf/default.nix | 4 +- .../python-modules/sumo/default.nix | 19 +- .../python-modules/sunpy/default.nix | 4 +- .../python-modules/tables/default.nix | 16 +- .../python-modules/tensorly/default.nix | 33 +- .../python-modules/tomli-w/default.nix | 30 + .../python-modules/trimesh/default.nix | 4 +- .../python-modules/types-protobuf/default.nix | 4 +- .../python-modules/uritemplate/default.nix | 31 +- .../python-modules/url-normalize/default.nix | 33 +- .../python-modules/vt-py/default.nix | 6 +- .../python-modules/watermark/default.nix | 6 +- .../python-modules/xarray/default.nix | 40 +- .../python-modules/yfinance/default.nix | 4 +- .../tools/analysis/checkov/default.nix | 4 +- .../tools/analysis/rizin/default.nix | 4 +- .../build-managers/leiningen/default.nix | 1 + .../build-managers/meson/0.60/default.nix | 4 +- .../tools/build-managers/rebar3/default.nix | 4 +- .../build-managers/rebar3/rebar-deps.nix | 26 +- .../development/tools/castxml/default.nix | 19 +- .../development/tools/cocogitto/default.nix | 42 + .../tools/database/indradb/default.nix | 51 + .../tools/database/sqlfluff/default.nix | 14 +- .../development/tools/electron/default.nix | 32 +- .../tools/go-containerregistry/default.nix | 2 +- .../development/tools/go-task/default.nix | 6 +- .../tools/golangci-lint/default.nix | 2 +- .../haskell-language-server/withWrapper.nix | 2 +- .../development/tools/kube-linter/default.nix | 31 + .../tools/misc/clojure-lsp/default.nix | 8 +- .../pkgs/development/tools/stylua/default.nix | 6 +- .../pkgs/development/web/deno/default.nix | 6 +- .../nixpkgs/pkgs/games/osu-lazer/default.nix | 139 +-- .../nixpkgs/pkgs/games/osu-lazer/deps.nix | 144 ++- .../nixpkgs/pkgs/games/osu-lazer/update.sh | 3 + .../nixpkgs/pkgs/games/tlauncher/default.nix | 100 ++ .../nixpkgs/pkgs/games/ue4demos/default.nix | 2 +- .../nixpkgs/pkgs/games/widelands/default.nix | 10 +- .../pkgs/misc/drivers/utsushi/default.nix | 4 + .../pkgs/misc/emulators/fs-uae/default.nix | 61 +- .../default.nix => fs-uae/launcher.nix} | 29 +- .../pkgs/misc/emulators/ppsspp/default.nix | 14 +- .../pkgs/misc/emulators/punes/default.nix | 23 +- .../pkgs/misc/emulators/retroarch/cores.nix | 15 +- .../pkgs/misc/emulators/retroarch/hashes.json | 6 +- .../pkgs/misc/emulators/retroarch/update.py | 39 +- .../pkgs/misc/emulators/uae/default.nix | 4 +- .../pkgs/misc/ite-backlight/default.nix | 47 + .../pkgs/misc/vim-plugins/generated.nix | 294 +++-- .../pkgs/misc/vim-plugins/vim-plugin-names | 10 + .../pkgs/misc/vscode-extensions/default.nix | 17 + .../linux/bionic-prebuilt/default.nix | 13 +- .../pkgs/os-specific/linux/cpuset/default.nix | 1 + .../firmware/rtl8761b-firmware/default.nix | 2 +- .../linux/kernel/common-config.nix | 2 +- .../linux/kernel/hardened/patches.json | 50 +- .../os-specific/linux/kernel/linux-xanmod.nix | 4 +- .../nixpkgs/pkgs/servers/consul/default.nix | 10 +- .../nixpkgs/pkgs/servers/dcnnt/default.nix | 26 + third_party/nixpkgs/pkgs/servers/etcd/3.4.nix | 1 - .../nixpkgs/pkgs/servers/etcd/default.nix | 1 - .../nixpkgs/pkgs/servers/firebird/default.nix | 2 +- .../pkgs/servers/gobetween/default.nix | 2 +- .../pkgs/servers/hqplayerd/default.nix | 4 +- .../pkgs/servers/http/apache-httpd/2.4.nix | 4 +- .../nixpkgs/pkgs/servers/hydron/default.nix | 4 +- .../pkgs/servers/libreddit/default.nix | 6 +- .../nixpkgs/pkgs/servers/livepeer/default.nix | 4 +- .../grafana-image-renderer/package.json | 2 +- .../pkgs/servers/nosql/rethinkdb/default.nix | 6 +- .../nixpkgs/pkgs/servers/prowlarr/default.nix | 8 +- .../nixpkgs/pkgs/servers/t-rex/default.nix | 27 + .../nixpkgs/pkgs/shells/tcsh/default.nix | 4 +- .../tools/X11/opentabletdriver/default.nix | 11 +- .../tools/admin/synapse-admin/default.nix | 2 +- .../pkgs/tools/archivers/unzoo/default.nix | 2 +- .../pkgs/tools/misc/adrgen/default.nix | 34 + .../pkgs/tools/misc/dialog/default.nix | 6 +- .../pkgs/tools/misc/direnv/default.nix | 7 +- .../nixpkgs/pkgs/tools/misc/grc/default.nix | 7 +- .../misc/markdown-anki-decks/default.nix | 2 +- .../pkgs/tools/misc/thefuck/default.nix | 4 +- .../pkgs/tools/misc/zellij/default.nix | 6 +- .../pkgs/tools/networking/assh/default.nix | 6 +- .../pkgs/tools/networking/oneshot/default.nix | 2 +- .../pkgs/tools/networking/openssh/common.nix | 4 +- .../pkgs/tools/networking/openssh/default.nix | 27 +- .../package-management/apk-tools/default.nix | 4 +- .../package-management/nix-top/default.nix | 4 +- .../pkgs/tools/security/fprintd/default.nix | 4 +- .../pkgs/tools/security/gfshare/default.nix | 1 + .../pkgs/tools/security/honggfuzz/default.nix | 18 +- .../pkgs/tools/security/jaeles/default.nix | 28 + .../pkgs/tools/security/kubescape/default.nix | 6 +- .../pkgs/tools/security/metasploit/Gemfile | 2 +- .../tools/security/metasploit/Gemfile.lock | 14 +- .../tools/security/metasploit/default.nix | 4 +- .../pkgs/tools/security/metasploit/gemset.nix | 22 +- .../pkgs/tools/security/mkp224o/default.nix | 4 +- .../tools/security/quark-engine/default.nix | 12 +- .../pkgs/tools/security/snow/default.nix | 2 +- .../pkgs/tools/security/sudo/default.nix | 6 +- .../pkgs/tools/security/terrascan/default.nix | 6 +- .../pkgs/tools/security/uddup/default.nix | 15 +- .../pkgs/tools/security/wafw00f/default.nix | 14 +- .../pkgs/tools/system/bpytop/default.nix | 2 +- .../pkgs/tools/system/gotop/default.nix | 4 +- .../pkgs/tools/text/icdiff/default.nix | 2 +- .../pkgs/tools/text/languagetool/default.nix | 4 +- .../pkgs/tools/text/qprint/default.nix | 2 +- .../pkgs/tools/text/xml/rxp/default.nix | 2 +- .../ec2instanceconnectcli/default.nix | 2 +- .../lxd-image-server/default.nix | 2 +- .../nixpkgs/pkgs/top-level/aliases.nix | 3 + .../nixpkgs/pkgs/top-level/all-packages.nix | 93 +- .../nixpkgs/pkgs/top-level/default.nix | 11 +- .../pkgs/top-level/haskell-packages.nix | 10 +- .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 2 + .../nixpkgs/pkgs/top-level/perl-packages.nix | 2 +- .../pkgs/top-level/python-packages.nix | 14 +- .../nixpkgs/pkgs/top-level/qt5-packages.nix | 4 +- .../pkgs/top-level/release-haskell.nix | 10 +- 426 files changed, 5310 insertions(+), 2409 deletions(-) create mode 100644 third_party/nixpkgs/.github/workflows/update-terraform-providers.yml create mode 100644 third_party/nixpkgs/nixos/lib/eval-cacheable-options.nix create mode 100644 third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py create mode 100644 third_party/nixpkgs/pkgs/applications/audio/mopidy/muse.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/em/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/pinta/deps.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/sigi/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/smos/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix rename third_party/nixpkgs/pkgs/applications/networking/{ => ftp}/gftp/default.nix (90%) create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/openbazaar/default.nix rename third_party/nixpkgs/pkgs/applications/version-management/{commitizen => cz-cli}/default.nix (96%) rename third_party/nixpkgs/pkgs/applications/version-management/{commitizen => cz-cli}/generate-dependencies.sh (100%) rename third_party/nixpkgs/pkgs/applications/version-management/{commitizen => cz-cli}/node-composition.nix (100%) rename third_party/nixpkgs/pkgs/applications/version-management/{commitizen => cz-cli}/node-env.nix (100%) rename third_party/nixpkgs/pkgs/applications/version-management/{commitizen => cz-cli}/node-packages.nix (100%) rename third_party/nixpkgs/pkgs/applications/version-management/{commitizen => cz-cli}/package.json (100%) create mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/qemu/binfmt-p-wrapper.c create mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/qemu/binfmt-p-wrapper.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/enlightenment/ecrire/default.nix rename third_party/nixpkgs/pkgs/development/compilers/ghc/{9.0.1.nix => 9.0.2.nix} (97%) create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/clojure/obb.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/grib-api/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/openfec/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qscintilla-qt4/default.nix rename third_party/nixpkgs/pkgs/development/libraries/{qscintilla => qscintilla-qt4}/fix-qt4-build.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/dbf/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/decli/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt4/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tomli-w/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/database/indradb/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/kube-linter/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/tlauncher/default.nix rename third_party/nixpkgs/pkgs/misc/emulators/{fs-uae-launcher/default.nix => fs-uae/launcher.nix} (66%) create mode 100644 third_party/nixpkgs/pkgs/misc/ite-backlight/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/dcnnt/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/t-rex/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/adrgen/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/jaeles/default.nix diff --git a/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml b/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml new file mode 100644 index 0000000000..33ebb6f14a --- /dev/null +++ b/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml @@ -0,0 +1,47 @@ +name: "Update terraform-providers" + +on: + schedule: + - cron: "14 3 * * 1" + workflow_dispatch: + +jobs: + tf-providers: + if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: cachix/install-nix-action@v16 + - name: setup + id: setup + run: | + echo ::set-output name=title::"terraform-providers: update $(date -u +"%Y-%m-%d")" + - name: update terraform-providers + run: | + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config user.name "github-actions[bot]" + pushd pkgs/applications/networking/cluster/terraform-providers + ./update-all-providers + git commit -m "${{ steps.setup.outputs.title }}" providers.json + popd + - name: create PR + uses: peter-evans/create-pull-request@v3 + with: + body: | + Automatic update of terraform providers. + + Created by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action. + + Check that all providers build with `@ofborg build terraform-full` + branch: terraform-providers-update + delete-branch: false + labels: "2.status: work-in-progress" + title: ${{ steps.setup.outputs.title }} + token: ${{ secrets.GITHUB_TOKEN }} + - name: comment on failure + uses: peter-evans/create-or-update-comment@v1 + if: ${{ failure() }} + with: + issue-number: 153416 + body: | + Automatic update of terraform providers [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). diff --git a/third_party/nixpkgs/doc/builders/fetchers.chapter.md b/third_party/nixpkgs/doc/builders/fetchers.chapter.md index e36724f295..5b28b2dcb3 100644 --- a/third_party/nixpkgs/doc/builders/fetchers.chapter.md +++ b/third_party/nixpkgs/doc/builders/fetchers.chapter.md @@ -82,4 +82,11 @@ This is used with repo.or.cz repositories. The arguments expected are very simil ## `fetchFromSourcehut` {#fetchfromsourcehut} -This is used with sourcehut repositories. The arguments expected are very similar to fetchFromGitHub above. Don't forget the tilde (~) in front of the user name! +This is used with sourcehut repositories. Similar to `fetchFromGitHub` above, +it expects `owner`, `repo`, `rev` and `sha256`, but don't forget the tilde (~) +in front of the username! Expected arguments also include `vc` ("git" (default) +or "hg"), `domain` and `fetchSubmodules`. + +If `fetchSubmodules` is `true`, `fetchFromSourcehut` uses `fetchgit` +or `fetchhg` with `fetchSubmodules` or `fetchSubrepos` set to `true`, +respectively. Otherwise the fetcher uses `fetchzip`. diff --git a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md index 9b09d0329c..f6c74cb01e 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md @@ -74,7 +74,7 @@ there are 3 steps, frontend dependencies (javascript), backend dependencies (eli ##### mixRelease - Frontend dependencies (javascript) {#mix-release-javascript-deps} -for phoenix projects, inside of nixpkgs you can either use yarn2nix (mkYarnModule) or node2nix. An example with yarn2nix can be found [here](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix#L39). An example with node2nix will follow. To package something outside of nixpkgs, you have alternatives like [npmlock2nix](https://github.com/nix-community/npmlock2nix) or [nix-npm-buildpackage](https://github.com/serokell/nix-npm-buildpackage) +For phoenix projects, inside of nixpkgs you can either use yarn2nix (mkYarnModule) or node2nix. An example with yarn2nix can be found [here](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix#L39). An example with node2nix will follow. To package something outside of nixpkgs, you have alternatives like [npmlock2nix](https://github.com/nix-community/npmlock2nix) or [nix-npm-buildpackage](https://github.com/serokell/nix-npm-buildpackage) ##### mixRelease - backend dependencies (mix) {#mix-release-mix-deps} @@ -82,13 +82,13 @@ There are 2 ways to package backend dependencies. With mix2nix and with a fixed- ###### mix2nix {#mix2nix} -mix2nix is a cli tool available in nixpkgs. it will generate a nix expression from a mix.lock file. It is quite standard in the 2nix tool series. +`mix2nix` is a cli tool available in nixpkgs. it will generate a nix expression from a mix.lock file. It is quite standard in the 2nix tool series. Note that currently mix2nix can't handle git dependencies inside the mix.lock file. If you have git dependencies, you can either add them manually (see [example](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/pleroma/default.nix#L20)) or use the FOD method. The advantage of using mix2nix is that nix will know your whole dependency graph. On a dependency update, this won't trigger a full rebuild and download of all the dependencies, where FOD will do so. -practical steps: +Practical steps: - run `mix2nix > mix_deps.nix` in the upstream repo. - pass `mixNixDeps = with pkgs; import ./mix_deps.nix { inherit lib beamPackages; };` as an argument to mixRelease. @@ -280,6 +280,30 @@ mkShell { } ``` +### Using an overlay + +If you need to use an overlay to change some attributes of a derivation, e.g. if you need a bugfix from a version that is not yet available in nixpkgs, you can override attributes such as `version` (and the corresponding `sha256`) and then use this overlay in your development environment: + +#### `shell.nix` + +```nix +let + elixir_1_13_1_overlay = (self: super: { + elixir_1_13 = super.elixir_1_13.override { + version = "1.13.1"; + sha256 = "0z0b1w2vvw4vsnb99779c2jgn9bgslg7b1pmd9vlbv02nza9qj5p"; + }; + }); + pkgs = import { overlays = [ elixir_1_13_1_overlay ]; }; +in +with pkgs; +mkShell { + buildInputs = [ + elixir_1_13 + ]; +} +``` + #### Elixir - Phoenix project {#elixir---phoenix-project} Here is an example `shell.nix`. diff --git a/third_party/nixpkgs/doc/languages-frameworks/go.section.md b/third_party/nixpkgs/doc/languages-frameworks/go.section.md index 7cbf51c8e3..411205d08e 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/go.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/go.section.md @@ -12,8 +12,7 @@ The function `buildGoModule` builds Go programs managed with Go modules. It buil In the following is an example expression using `buildGoModule`, the following arguments are of special significance to the function: - `vendorSha256`: is the hash of the output of the intermediate fetcher derivation. `vendorSha256` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorSha256 = null;` -- `runVend`: runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build. -- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if any dependency has case-insensitive conflicts which will produce platform dependant `vendorSha256` checksums. +- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform dependant `vendorSha256` checksums. ```nix pet = buildGoModule rec { @@ -34,7 +33,6 @@ pet = buildGoModule rec { homepage = "https://github.com/knqyf263/pet"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } ``` diff --git a/third_party/nixpkgs/lib/default.nix b/third_party/nixpkgs/lib/default.nix index 626a751cb1..fe5d2db0db 100644 --- a/third_party/nixpkgs/lib/default.nix +++ b/third_party/nixpkgs/lib/default.nix @@ -66,7 +66,8 @@ let stringLength sub substring tail trace; inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max - importJSON importTOML warn warnIf info showWarnings nixpkgsVersion version + importJSON importTOML warn warnIf throwIfNot + info showWarnings nixpkgsVersion version mod compare splitByAndCompare functionArgs setFunctionArgs isFunction toHexString toBaseDigits; inherit (self.fixedPoints) fix fix' converge extends composeExtensions diff --git a/third_party/nixpkgs/lib/options.nix b/third_party/nixpkgs/lib/options.nix index 5d52f065af..53001a3113 100644 --- a/third_party/nixpkgs/lib/options.nix +++ b/third_party/nixpkgs/lib/options.nix @@ -177,7 +177,7 @@ rec { docOption = rec { loc = opt.loc; name = showOption opt.loc; - description = opt.description or (lib.warn "Option `${name}' has no description." "This option has no description."); + description = opt.description or null; declarations = filter (x: x != unknownModule) opt.declarations; internal = opt.internal or false; visible = diff --git a/third_party/nixpkgs/lib/trivial.nix b/third_party/nixpkgs/lib/trivial.nix index 33b553ac41..c961d3aa73 100644 --- a/third_party/nixpkgs/lib/trivial.nix +++ b/third_party/nixpkgs/lib/trivial.nix @@ -325,6 +325,28 @@ rec { */ warnIf = cond: msg: if cond then warn msg else id; + /* + Like the `assert b; e` expression, but with a custom error message and + without the semicolon. + + If true, return the identity function, `r: r`. + + If false, throw the error message. + + Calls can be juxtaposed using function application, as `(r: r) a = a`, so + `(r: r) (r: r) a = a`, and so forth. + + Type: bool -> string -> a -> a + + Example: + + throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list." + lib.foldr (x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions.") (r: r) overlays + pkgs + + */ + throwIfNot = cond: msg: if cond then x: x else throw msg; + info = msg: builtins.trace "INFO: ${msg}"; showWarnings = warnings: res: lib.foldr (w: x: warn w x) res warnings; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 74f6143071..48d8973e92 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -95,6 +95,12 @@ githubId = 7414843; name = "Nicholas von Klitzing"; }; + _13r0ck = { + name = "Brock Szuszczewicz"; + email = "bnr@tuta.io"; + github = "13r0ck"; + githubId = 58987761; + }; _3noch = { email = "eacameron@gmail.com"; github = "3noch"; @@ -946,6 +952,12 @@ githubId = 59696216; name = "Arnold Farkas"; }; + arnoutkroeze = { + email = "nixpkgs@arnoutkroeze.nl"; + github = "arnoutkroeze"; + githubId = 37151054; + name = "Arnout Kroeze"; + }; arobyn = { email = "shados@shados.net"; github = "shados"; @@ -2663,6 +2675,12 @@ email = "christoph.senjak@googlemail.com"; name = "Christoph-Simon Senjak"; }; + datafoo = { + email = "34766150+datafoo@users.noreply.github.com"; + github = "datafoo"; + githubId = 34766150; + name = "datafoo"; + }; davhau = { email = "d.hauer.it@gmail.com"; name = "David Hauer"; @@ -2800,6 +2818,12 @@ email = "d4delta@outlook.fr"; name = "Delta"; }; + deltadelta = { + email = "contact@libellules.eu"; + name = "Dara Ly"; + github = "tournemire"; + githubId = 20159432; + }; deltaevo = { email = "deltaduartedavid@gmail.com"; github = "DeltaEvo"; @@ -3314,12 +3338,6 @@ github = "edlimerkaj"; githubId = 71988351; }; - edibopp = { - email = "eduard.bopp@aepsil0n.de"; - github = "edibopp"; - githubId = 3098430; - name = "Eduard Bopp"; - }; emantor = { email = "rouven+nixos@czerwinskis.de"; github = "emantor"; @@ -4760,6 +4778,12 @@ github = "higebu"; githubId = 733288; }; + hiljusti = { + name = "J.R. Hill"; + email = "hiljusti@so.dang.cool"; + github = "hiljusti"; + githubId = 17605298; + }; hinton = { email = "t@larkery.com"; name = "Tom Hinton"; @@ -7809,6 +7833,12 @@ githubId = 38543128; name = "Miles Breslin"; }; + milibopp = { + email = "contact@ebopp.de"; + github = "milibopp"; + githubId = 3098430; + name = "Emilia Bopp"; + }; millerjason = { email = "mailings-github@millerjason.com"; github = "millerjason"; @@ -8202,6 +8232,12 @@ githubId = 4996739; name = "Masayuki Takeda"; }; + mtesseract = { + email = "moritz@stackrox.com"; + github = "mtesseract"; + githubId = 11706080; + name = "Moritz Clasmeier"; + }; MtP = { email = "marko.nixos@poikonen.de"; github = "MtP76"; @@ -11599,6 +11635,12 @@ githubId = 2389333; name = "Andy Tockman"; }; + techknowlogick = { + email = "techknowlogick@gitea.io"; + github = "techknowlogick"; + githubId = 164197; + name = "techknowlogick"; + }; Technical27 = { email = "38222826+Technical27@users.noreply.github.com"; github = "Technical27"; @@ -12653,6 +12695,12 @@ email = "tim.williams.public@gmail.com"; name = "Tim Philip Williams"; }; + willcohen = { + email = "willcohen@users.noreply.github.com"; + github = "willcohen"; + githubId = 5185341; + name = "Will Cohen"; + }; winden = { email = "windenntw@gmail.com"; name = "Antonio Vargas Gonzalez"; diff --git a/third_party/nixpkgs/nixos/doc/manual/default.nix b/third_party/nixpkgs/nixos/doc/manual/default.nix index 31b6da01c6..52d500c64d 100644 --- a/third_party/nixpkgs/nixos/doc/manual/default.nix +++ b/third_party/nixpkgs/nixos/doc/manual/default.nix @@ -1,4 +1,13 @@ -{ pkgs, options, config, version, revision, extraSources ? [] }: +{ pkgs +, options +, config +, version +, revision +, extraSources ? [] +, baseOptionsJSON ? null +, warningsAreErrors ? true +, prefix ? ../../.. +}: with pkgs; @@ -11,11 +20,11 @@ let # # E.g. if some `options` came from modules in ${pkgs.customModules}/nix, # you'd need to include `extraSources = [ pkgs.customModules ]` - prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources); + prefixesToStrip = map (p: "${toString p}/") ([ prefix ] ++ extraSources); stripAnyPrefixes = lib.flip (lib.foldr lib.removePrefix) prefixesToStrip; optionsDoc = buildPackages.nixosOptionsDoc { - inherit options revision; + inherit options revision baseOptionsJSON warningsAreErrors; transformOptions = opt: opt // { # Clean up declaration sites to not refer to the NixOS source tree. declarations = map stripAnyPrefixes opt.declarations; @@ -161,7 +170,7 @@ let in rec { inherit generatedSources; - inherit (optionsDoc) optionsJSON optionsDocBook; + inherit (optionsDoc) optionsJSON optionsNix optionsDocBook; # Generate the NixOS manual. manualHTML = runCommand "nixos-manual-html" diff --git a/third_party/nixpkgs/nixos/doc/manual/development/meta-attributes.section.md b/third_party/nixpkgs/nixos/doc/manual/development/meta-attributes.section.md index ca4ba007f7..946c08efd0 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/meta-attributes.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/meta-attributes.section.md @@ -5,7 +5,7 @@ extra information. Module meta attributes are defined in the `meta.nix` special module. `meta` is a top level attribute like `options` and `config`. Available -meta-attributes are `maintainers` and `doc`. +meta-attributes are `maintainers`, `doc`, and `buildDocsInSandbox`. Each of the meta-attributes must be defined at most once per module file. @@ -24,6 +24,7 @@ file. meta = { maintainers = with lib.maintainers; [ ericsagnes ]; doc = ./default.xml; + buildDocsInSandbox = true; }; } ``` @@ -38,3 +39,28 @@ file. ```ShellSession $ nix-build nixos/release.nix -A manual.x86_64-linux ``` + +- `buildDocsInSandbox` indicates whether the option documentation for the + module can be built in a derivation sandbox. This option is currently only + honored for modules shipped by nixpkgs. User modules and modules taken from + `NIXOS_EXTRA_MODULE_PATH` are always built outside of the sandbox, as has + been the case in previous releases. + + Building NixOS option documentation in a sandbox allows caching of the built + documentation, which greatly decreases the amount of time needed to evaluate + a system configuration that has NixOS documentation enabled. The sandbox also + restricts which attributes may be referenced by documentation attributes + (such as option descriptions) to the `options` and `lib` module arguments and + the `pkgs.formats` attribute of the `pkgs` argument, `config` and the rest of + `pkgs` are disallowed and will cause doc build failures when used. This + restriction is necessary because we cannot reproduce the full nixpkgs + instantiation with configuration and overlays from a system configuration + inside the sandbox. The `options` argument only includes options of modules + that are also built inside the sandbox, referencing an option of a module + that isn't built in the sandbox is also forbidden. + + The default is `true` and should usually not be changed; set it to `false` + only if the module requires access to `pkgs` in its documentation (e.g. + because it loads information from a linked package to build an option type) + or if its documentation depends on other modules that also aren't sandboxed + (e.g. by using types defined in the other module). diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/meta-attributes.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/meta-attributes.section.xml index f535d94602..1eb6e0f303 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/meta-attributes.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/meta-attributes.section.xml @@ -8,8 +8,8 @@ meta is a top level attribute like options and config. Available - meta-attributes are maintainers and - doc. + meta-attributes are maintainers, + doc, and buildDocsInSandbox. Each of the meta-attributes must be defined at most once per module @@ -29,6 +29,7 @@ meta = { maintainers = with lib.maintainers; [ ericsagnes ]; doc = ./default.xml; + buildDocsInSandbox = true; }; } @@ -51,5 +52,44 @@ $ nix-build nixos/release.nix -A manual.x86_64-linux + + + buildDocsInSandbox indicates whether the + option documentation for the module can be built in a derivation + sandbox. This option is currently only honored for modules + shipped by nixpkgs. User modules and modules taken from + NIXOS_EXTRA_MODULE_PATH are always built + outside of the sandbox, as has been the case in previous + releases. + + + Building NixOS option documentation in a sandbox allows caching + of the built documentation, which greatly decreases the amount + of time needed to evaluate a system configuration that has NixOS + documentation enabled. The sandbox also restricts which + attributes may be referenced by documentation attributes (such + as option descriptions) to the options and + lib module arguments and the + pkgs.formats attribute of the + pkgs argument, config and + the rest of pkgs are disallowed and will + cause doc build failures when used. This restriction is + necessary because we cannot reproduce the full nixpkgs + instantiation with configuration and overlays from a system + configuration inside the sandbox. The options + argument only includes options of modules that are also built + inside the sandbox, referencing an option of a module that isn’t + built in the sandbox is also forbidden. + + + The default is true and should usually not be + changed; set it to false only if the module + requires access to pkgs in its documentation + (e.g. because it loads information from a linked package to + build an option type) or if its documentation depends on other + modules that also aren’t sandboxed (e.g. by using types defined + in the other module). + + diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 54f0b0bf0f..fde5eec857 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -325,6 +325,15 @@ files. + + + fetchFromSourcehut now allows fetching + repositories recursively using fetchgit or + fetchhg if the argument + fetchSubmodules is set to + true. + + diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md index 81bac06157..f8145a1aa9 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md @@ -120,3 +120,7 @@ In addition to numerous new and upgraded packages, this release has the followin - The `services.stubby` module was converted to a [settings-style](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration. - The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files. + +- `fetchFromSourcehut` now allows fetching repositories recursively + using `fetchgit` or `fetchhg` if the argument `fetchSubmodules` + is set to `true`. diff --git a/third_party/nixpkgs/nixos/lib/eval-cacheable-options.nix b/third_party/nixpkgs/nixos/lib/eval-cacheable-options.nix new file mode 100644 index 0000000000..c3ba2ce663 --- /dev/null +++ b/third_party/nixpkgs/nixos/lib/eval-cacheable-options.nix @@ -0,0 +1,53 @@ +{ libPath +, pkgsLibPath +, nixosPath +, modules +, stateVersion +, release +}: + +let + lib = import libPath; + modulesPath = "${nixosPath}/modules"; + # dummy pkgs set that contains no packages, only `pkgs.lib` from the full set. + # not having `pkgs.lib` causes all users of `pkgs.formats` to fail. + pkgs = import pkgsLibPath { + inherit lib; + pkgs = null; + }; + utils = import "${nixosPath}/lib/utils.nix" { + inherit config lib; + pkgs = null; + }; + # this is used both as a module and as specialArgs. + # as a module it sets the _module special values, as specialArgs it makes `config` + # unusable. this causes documentation attributes depending on `config` to fail. + config = { + _module.check = false; + _module.args = {}; + system.stateVersion = stateVersion; + }; + eval = lib.evalModules { + modules = (map (m: "${modulesPath}/${m}") modules) ++ [ + config + ]; + specialArgs = { + inherit config pkgs utils; + }; + }; + docs = import "${nixosPath}/doc/manual" { + pkgs = pkgs // { + inherit lib; + # duplicate of the declaration in all-packages.nix + buildPackages.nixosOptionsDoc = attrs: + (import "${nixosPath}/lib/make-options-doc") + ({ inherit pkgs lib; } // attrs); + }; + config = config.config; + options = eval.options; + version = release; + revision = "release-${release}"; + prefix = modulesPath; + }; +in + docs.optionsNix diff --git a/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix b/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix index 44bc25be92..57652dd5db 100644 --- a/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix +++ b/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix @@ -21,6 +21,13 @@ , options , transformOptions ? lib.id # function for additional tranformations of the options , revision ? "" # Specify revision for the options +# a set of options the docs we are generating will be merged into, as if by recursiveUpdate. +# used to split the options doc build into a static part (nixos/modules) and a dynamic part +# (non-nixos modules imported via configuration.nix, other module sources). +, baseOptionsJSON ? null +# instead of printing warnings for eg options with missing descriptions (which may be lost +# by nix build unless -L is given), emit errors instead and fail the build +, warningsAreErrors ? true }: let @@ -51,10 +58,15 @@ let # ../../../lib/options.nix influences. # # Each element of `relatedPackages` can be either - # - a string: that will be interpreted as an attribute name from `pkgs`, - # - a list: that will be interpreted as an attribute path from `pkgs`, - # - an attrset: that can specify `name`, `path`, `package`, `comment` + # - a string: that will be interpreted as an attribute name from `pkgs` and turned into a link + # to search.nixos.org, + # - a list: that will be interpreted as an attribute path from `pkgs` and turned into a link + # to search.nixos.org, + # - an attrset: that can specify `name`, `path`, `comment` # (either of `name`, `path` is required, the rest are optional). + # + # NOTE: No checks against `pkgs` are made to ensure that the referenced package actually exists. + # Such checks are not compatible with option docs caching. genRelatedPackages = packages: optName: let unpack = p: if lib.isString p then { name = p; } @@ -64,16 +76,16 @@ let let title = args.title or null; name = args.name or (lib.concatStringsSep "." args.path); - path = args.path or [ args.name ]; - package = args.package or (lib.attrByPath path (throw "Invalid package attribute path `${toString path}' found while evaluating `relatedPackages' of option `${optName}'") pkgs); - in "" - + "${lib.optionalString (title != null) "${title} aka "}pkgs.${name} (${package.meta.name})" - + lib.optionalString (!package.meta.available) " [UNAVAILABLE]" - + ": ${package.meta.description or "???"}." - + lib.optionalString (args ? comment) "\n${args.comment}" - # Lots of `longDescription's break DocBook, so we just wrap them into - + lib.optionalString (package.meta ? longDescription) "\n${package.meta.longDescription}" - + ""; + in '' + + + + ${lib.optionalString (title != null) "${title} aka "}pkgs.${name} + + + ${lib.optionalString (args ? comment) "${args.comment}"} + + ''; in "${lib.concatStringsSep "\n" (map (p: describe (unpack p)) packages)}"; # Remove invisible and internal options. @@ -99,13 +111,24 @@ in rec { optionsJSON = pkgs.runCommand "options.json" { meta.description = "List of NixOS options in JSON format"; buildInputs = [ pkgs.brotli ]; + options = builtins.toFile "options.json" + (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix)); } '' # Export list of options in different format. dst=$out/share/doc/nixos mkdir -p $dst - cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix))} $dst/options.json + ${ + if baseOptionsJSON == null + then "cp $options $dst/options.json" + else '' + ${pkgs.python3Minimal}/bin/python ${./mergeJSON.py} \ + ${lib.optionalString warningsAreErrors "--warnings-are-errors"} \ + ${baseOptionsJSON} $options \ + > $dst/options.json + '' + } brotli -9 < $dst/options.json > $dst/options.json.br diff --git a/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py b/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py new file mode 100644 index 0000000000..029787a315 --- /dev/null +++ b/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py @@ -0,0 +1,86 @@ +import collections +import json +import sys +from typing import Any, Dict, List + +JSON = Dict[str, Any] + +class Key: + def __init__(self, path: List[str]): + self.path = path + def __hash__(self): + result = 0 + for id in self.path: + result ^= hash(id) + return result + def __eq__(self, other): + return type(self) is type(other) and self.path == other.path + +Option = collections.namedtuple('Option', ['name', 'value']) + +# pivot a dict of options keyed by their display name to a dict keyed by their path +def pivot(options: Dict[str, JSON]) -> Dict[Key, Option]: + result: Dict[Key, Option] = dict() + for (name, opt) in options.items(): + result[Key(opt['loc'])] = Option(name, opt) + return result + +# pivot back to indexed-by-full-name +# like the docbook build we'll just fail if multiple options with differing locs +# render to the same option name. +def unpivot(options: Dict[Key, Option]) -> Dict[str, JSON]: + result: Dict[str, Dict] = dict() + for (key, opt) in options.items(): + if opt.name in result: + raise RuntimeError( + 'multiple options with colliding ids found', + opt.name, + result[opt.name]['loc'], + opt.value['loc'], + ) + result[opt.name] = opt.value + return result + +warningsAreErrors = sys.argv[1] == "--warnings-are-errors" +optOffset = 1 if warningsAreErrors else 0 +options = pivot(json.load(open(sys.argv[1 + optOffset], 'r'))) +overrides = pivot(json.load(open(sys.argv[2 + optOffset], 'r'))) + +# fix up declaration paths in lazy options, since we don't eval them from a full nixpkgs dir +for (k, v) in options.items(): + v.value['declarations'] = list(map(lambda s: f'nixos/modules/{s}', v.value['declarations'])) + +# merge both descriptions +for (k, v) in overrides.items(): + cur = options.setdefault(k, v).value + for (ok, ov) in v.value.items(): + if ok == 'declarations': + decls = cur[ok] + for d in ov: + if d not in decls: + decls += [d] + elif ok == "type": + # ignore types of placeholder options + if ov != "_unspecified" or cur[ok] == "_unspecified": + cur[ok] = ov + elif ov is not None or cur.get(ok, None) is None: + cur[ok] = ov + +# check that every option has a description +hasWarnings = False +for (k, v) in options.items(): + if v.value.get('description', None) is None: + severity = "error" if warningsAreErrors else "warning" + hasWarnings = True + print(f"\x1b[1;31m{severity}: option {v.name} has no description\x1b[0m", file=sys.stderr) + v.value['description'] = "This option has no description." +if hasWarnings and warningsAreErrors: + print( + "\x1b[1;31m" + + "Treating warnings as errors. Set documentation.nixos.options.warningsAreErrors " + + "to false to ignore these warnings." + + "\x1b[0m", + file=sys.stderr) + sys.exit(1) + +json.dump(unpivot(options), fp=sys.stdout) diff --git a/third_party/nixpkgs/nixos/modules/hardware/onlykey/onlykey.udev b/third_party/nixpkgs/nixos/modules/hardware/onlykey/onlykey.udev index 61e3ee4e88..9c8873aafc 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/onlykey/onlykey.udev +++ b/third_party/nixpkgs/nixos/modules/hardware/onlykey/onlykey.udev @@ -14,5 +14,5 @@ KERNEL=="ttyACM*", ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="60fc", MODE:="066 # ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", GROUP+="plugdev" -KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", GROUP+="plugdev" +SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", GROUP="plugdev" +KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", GROUP="plugdev" diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx.nix index 57960cc365..7738581b89 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx.nix @@ -40,4 +40,7 @@ in }; services.xserver.displayManager.sessionCommands = "${fcitxPackage}/bin/fcitx"; }; + + # uses attributes of the linked package + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix index 92f8c64338..c5b0cbc215 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix @@ -80,4 +80,7 @@ in ibusPackage ]; }; + + # uses attributes of the linked package + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix index e462cae243..729a665614 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix @@ -45,5 +45,7 @@ in environment.etc."xdg/kime/config.yaml".text = replaceStrings [ "\\\\" ] [ "\\" ] (builtins.toJSON cfg.config); }; -} + # uses attributes of the linked package + meta.buildDocsInSandbox = false; +} diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh index fc4a69aa17..e7cf52f5e3 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh @@ -143,6 +143,23 @@ export TMPDIR=${TMPDIR:-$tmpdir} sub="auto?trusted=1" +# Copy the NixOS/Nixpkgs sources to the target as the initial contents +# of the NixOS channel. +if [[ -z $noChannelCopy ]]; then + if [[ -z $channelPath ]]; then + channelPath="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")" + fi + if [[ -n $channelPath ]]; then + echo "copying channel..." + mkdir -p "$mountPoint"/nix/var/nix/profiles/per-user/root + nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \ + -p "$mountPoint"/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet \ + "${verbosity[@]}" + install -m 0700 -d "$mountPoint"/root/.nix-defexpr + ln -sfn /nix/var/nix/profiles/per-user/root/channels "$mountPoint"/root/.nix-defexpr/channels + fi +fi + # Build the system configuration in the target filesystem. if [[ -z $system ]]; then outLink="$tmpdir/system" @@ -167,23 +184,6 @@ nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \ --extra-substituters "$sub" \ -p "$mountPoint"/nix/var/nix/profiles/system --set "$system" "${verbosity[@]}" -# Copy the NixOS/Nixpkgs sources to the target as the initial contents -# of the NixOS channel. -if [[ -z $noChannelCopy ]]; then - if [[ -z $channelPath ]]; then - channelPath="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")" - fi - if [[ -n $channelPath ]]; then - echo "copying channel..." - mkdir -p "$mountPoint"/nix/var/nix/profiles/per-user/root - nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \ - -p "$mountPoint"/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet \ - "${verbosity[@]}" - install -m 0700 -d "$mountPoint"/root/.nix-defexpr - ln -sfn /nix/var/nix/profiles/per-user/root/channels "$mountPoint"/root/.nix-defexpr/channels - fi -fi - # Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out. mkdir -m 0755 -p "$mountPoint/etc" touch "$mountPoint/etc/NIXOS" diff --git a/third_party/nixpkgs/nixos/modules/misc/documentation.nix b/third_party/nixpkgs/nixos/modules/misc/documentation.nix index bb294addcc..7d8fc08b60 100644 --- a/third_party/nixpkgs/nixos/modules/misc/documentation.nix +++ b/third_party/nixpkgs/nixos/modules/misc/documentation.nix @@ -1,19 +1,35 @@ -{ config, lib, pkgs, extendModules, noUserModules, ... }: +{ config, options, lib, pkgs, utils, modules, baseModules, extraModules, modulesPath, ... }: with lib; let cfg = config.documentation; + allOpts = options; /* Modules for which to show options even when not imported. */ extraDocModules = [ ../virtualisation/qemu-vm.nix ]; - /* For the purpose of generating docs, evaluate options with each derivation - in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}". - It isn't perfect, but it seems to cover a vast majority of use cases. - Caveat: even if the package is reached by a different means, - the path above will be shown and not e.g. `${config.services.foo.package}`. */ + canCacheDocs = m: + let + f = import m; + instance = f (mapAttrs (n: _: abort "evaluating ${n} for `meta` failed") (functionArgs f)); + in + cfg.nixos.options.splitBuild + && builtins.isPath m + && isFunction f + && instance ? options + && instance.meta.buildDocsInSandbox or true; + + docModules = + let + p = partition canCacheDocs (baseModules ++ extraDocModules); + in + { + lazy = p.right; + eager = p.wrong ++ optionals cfg.nixos.includeAllModules (extraModules ++ modules); + }; + manual = import ../../doc/manual rec { inherit pkgs config; version = config.system.nixos.release; @@ -21,10 +37,17 @@ let extraSources = cfg.nixos.extraModuleSources; options = let - extendNixOS = if cfg.nixos.includeAllModules then extendModules else noUserModules.extendModules; - scrubbedEval = extendNixOS { - modules = extraDocModules; - specialArgs.pkgs = scrubDerivations "pkgs" pkgs; + scrubbedEval = evalModules { + modules = [ { + _module.check = false; + } ] ++ docModules.eager; + specialArgs = { + pkgs = scrubDerivations "pkgs" pkgs; + # allow access to arbitrary options for eager modules, eg for getting + # option types from lazy modules + options = allOpts; + inherit modulesPath utils; + }; }; scrubDerivations = namePrefix: pkgSet: mapAttrs (name: value: @@ -36,6 +59,49 @@ let ) pkgSet; in scrubbedEval.options; + baseOptionsJSON = + let + filter = + builtins.filterSource + (n: t: + (t == "directory" -> baseNameOf n != "tests") + && (t == "file" -> hasSuffix ".nix" n) + ); + in + pkgs.runCommand "lazy-options.json" { + libPath = filter "${toString pkgs.path}/lib"; + pkgsLibPath = filter "${toString pkgs.path}/pkgs/pkgs-lib"; + nixosPath = filter "${toString pkgs.path}/nixos"; + modules = map (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy; + } '' + export NIX_STORE_DIR=$TMPDIR/store + export NIX_STATE_DIR=$TMPDIR/state + ${pkgs.nix}/bin/nix-instantiate \ + --show-trace \ + --eval --json --strict \ + --argstr libPath "$libPath" \ + --argstr pkgsLibPath "$pkgsLibPath" \ + --argstr nixosPath "$nixosPath" \ + --arg modules "[ $modules ]" \ + --argstr stateVersion "${options.system.stateVersion.default}" \ + --argstr release "${config.system.nixos.release}" \ + $nixosPath/lib/eval-cacheable-options.nix > $out \ + || { + echo -en "\e[1;31m" + echo 'Cacheable portion of option doc build failed.' + echo 'Usually this means that an option attribute that ends up in documentation (eg' \ + '`default` or `description`) depends on the restricted module arguments' \ + '`config` or `pkgs`.' + echo + echo 'Rebuild your configuration with `--show-trace` to find the offending' \ + 'location. Remove the references to restricted arguments (eg by escaping' \ + 'their antiquotations or adding a `defaultText`) or disable the sandboxed' \ + 'build for the failing module by setting `meta.buildDocsInSandbox = false`.' + echo -en "\e[0m" + exit 1 + } >&2 + ''; + inherit (cfg.nixos.options) warningsAreErrors; }; @@ -178,6 +244,25 @@ in ''; }; + nixos.options.splitBuild = mkOption { + type = types.bool; + default = true; + description = '' + Whether to split the option docs build into a cacheable and an uncacheable part. + Splitting the build can substantially decrease the amount of time needed to build + the manual, but some user modules may be incompatible with this splitting. + ''; + }; + + nixos.options.warningsAreErrors = mkOption { + type = types.bool; + default = true; + description = '' + Treat warning emitted during the option documentation build (eg for missing option + descriptions) as errors. + ''; + }; + nixos.includeAllModules = mkOption { type = types.bool; default = false; diff --git a/third_party/nixpkgs/nixos/modules/misc/ids.nix b/third_party/nixpkgs/nixos/modules/misc/ids.nix index d7fc9ca87d..61e7a6a8fc 100644 --- a/third_party/nixpkgs/nixos/modules/misc/ids.nix +++ b/third_party/nixpkgs/nixos/modules/misc/ids.nix @@ -352,6 +352,7 @@ in moonraker = 320; distcc = 321; webdav = 322; + pipewire = 323; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -658,6 +659,7 @@ in moonraker = 320; distcc = 321; webdav = 322; + pipewire = 323; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/third_party/nixpkgs/nixos/modules/misc/meta.nix b/third_party/nixpkgs/nixos/modules/misc/meta.nix index 3dd97cbec2..8e689a63f6 100644 --- a/third_party/nixpkgs/nixos/modules/misc/meta.nix +++ b/third_party/nixpkgs/nixos/modules/misc/meta.nix @@ -54,6 +54,21 @@ in ''; }; + buildDocsInSandbox = mkOption { + type = types.bool // { + merge = loc: defs: defs; + }; + internal = true; + default = true; + description = '' + Whether to include this module in the split options doc build. + Disable if the module references `config`, `pkgs` or other module + arguments that cannot be evaluated as constants. + + This option should be defined at most once per module. + ''; + }; + }; }; diff --git a/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix b/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix index 08bc439855..2e0c8e4cf2 100644 --- a/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix +++ b/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix @@ -248,4 +248,7 @@ in ) ]; }; + + # needs a full nixpkgs path to import nixpkgs + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/misc/version.nix b/third_party/nixpkgs/nixos/modules/misc/version.nix index fc0d65d514..6c526f6d4f 100644 --- a/third_party/nixpkgs/nixos/modules/misc/version.nix +++ b/third_party/nixpkgs/nixos/modules/misc/version.nix @@ -119,4 +119,6 @@ in }; + # uses version info nixpkgs, which requires a full nixpkgs path + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/programs/gnupg.nix b/third_party/nixpkgs/nixos/modules/programs/gnupg.nix index fe5d7bd834..b41f30287e 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gnupg.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gnupg.nix @@ -149,4 +149,6 @@ in ]; }; + # uses attributes of the linked package + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/services/backup/sanoid.nix b/third_party/nixpkgs/nixos/modules/services/backup/sanoid.nix index e70063415e..5eb031b2e9 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/sanoid.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/sanoid.nix @@ -51,7 +51,10 @@ let datasetOptions = rec { use_template = mkOption { description = "Names of the templates to use for this dataset."; - type = types.listOf (types.enum (attrNames cfg.templates)); + type = types.listOf (types.str // { + check = (types.enum (attrNames cfg.templates)).check; + description = "configured template name"; + }); default = [ ]; }; useTemplate = use_template; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix index ed25715fab..6d54659720 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix @@ -6,6 +6,7 @@ let top = config.services.kubernetes; otop = options.services.kubernetes; cfg = top.controllerManager; + klib = options.services.kubernetes.lib.default; in { imports = [ @@ -56,7 +57,7 @@ in type = int; }; - kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes controller manager"; + kubeconfig = klib.mkKubeConfigOptions "Kubernetes controller manager"; leaderElect = mkOption { description = "Whether to start leader election before executing main loop."; @@ -129,7 +130,7 @@ in "--cluster-cidr=${cfg.clusterCidr}"} \ ${optionalString (cfg.featureGates != []) "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ - --kubeconfig=${top.lib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig} \ + --kubeconfig=${klib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig} \ --leader-elect=${boolToString cfg.leaderElect} \ ${optionalString (cfg.rootCaFile!=null) "--root-ca-file=${cfg.rootCaFile}"} \ @@ -156,7 +157,7 @@ in path = top.path; }; - services.kubernetes.pki.certs = with top.lib; { + services.kubernetes.pki.certs = with klib; { controllerManager = mkCert { name = "kube-controller-manager"; CN = "kube-controller-manager"; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix index 227c69fec3..715c88ad88 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix @@ -193,12 +193,17 @@ in { inherit mkKubeConfigOptions; }; type = types.attrs; + readOnly = true; + internal = true; }; secretsPath = mkOption { description = "Default location for kubernetes secrets. Not a store location."; type = types.path; default = cfg.dataDir + "/secrets"; + defaultText = literalExpression '' + config.${opt.dataDir} + "/secrets" + ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix index 3e8eac96f6..2d58547ce4 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -6,6 +6,7 @@ let top = config.services.kubernetes; otop = options.services.kubernetes; cfg = top.kubelet; + klib = options.services.kubernetes.lib.default; cniConfig = if cfg.cni.config != [] && cfg.cni.configDir != null then @@ -27,7 +28,7 @@ let config.Cmd = ["/bin/pause"]; }; - kubeconfig = top.lib.mkKubeConfig "kubelet" cfg.kubeconfig; + kubeconfig = klib.mkKubeConfig "kubelet" cfg.kubeconfig; manifestPath = "kubernetes/manifests"; @@ -177,7 +178,7 @@ in type = str; }; - kubeconfig = top.lib.mkKubeConfigOptions "Kubelet"; + kubeconfig = klib.mkKubeConfigOptions "Kubelet"; manifests = mkOption { description = "List of manifests to bootstrap with kubelet (only pods can be created as manifest entry)"; @@ -358,7 +359,7 @@ in services.kubernetes.kubelet.hostname = with config.networking; mkDefault (hostName + optionalString (domain != null) ".${domain}"); - services.kubernetes.pki.certs = with top.lib; { + services.kubernetes.pki.certs = with klib; { kubelet = mkCert { name = "kubelet"; CN = top.kubelet.hostname; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix index 76ab03cd52..00d572a509 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix @@ -1,10 +1,11 @@ -{ config, lib, pkgs, ... }: +{ config, options, lib, pkgs, ... }: with lib; let top = config.services.kubernetes; cfg = top.pki; + klib = options.services.kubernetes.lib; csrCA = pkgs.writeText "kube-pki-cacert-csr.json" (builtins.toJSON { key = { @@ -29,7 +30,7 @@ let cfsslAPITokenLength = 32; clusterAdminKubeconfig = with cfg.certs.clusterAdmin; - top.lib.mkKubeConfig "cluster-admin" { + klib.mkKubeConfig "cluster-admin" { server = top.apiserverAddress; certFile = cert; keyFile = key; @@ -250,7 +251,7 @@ in # - it would be better with a more Nix-oriented way of managing addons systemd.services.kube-addon-manager = mkIf top.addonManager.enable (mkMerge [{ environment.KUBECONFIG = with cfg.certs.addonManager; - top.lib.mkKubeConfig "addon-manager" { + klib.mkKubeConfig "addon-manager" { server = top.apiserverAddress; certFile = cert; keyFile = key; @@ -343,7 +344,7 @@ in ''; services.flannel = with cfg.certs.flannelClient; { - kubeconfig = top.lib.mkKubeConfig "flannel" { + kubeconfig = klib.mkKubeConfig "flannel" { server = top.apiserverAddress; certFile = cert; keyFile = key; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix index 5f3da03412..986301f6bd 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix @@ -6,6 +6,7 @@ let top = config.services.kubernetes; otop = options.services.kubernetes; cfg = top.proxy; + klib = options.services.kubernetes.lib.default; in { imports = [ @@ -43,7 +44,7 @@ in type = str; }; - kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes proxy"; + kubeconfig = klib.mkKubeConfigOptions "Kubernetes proxy"; verbosity = mkOption { description = '' @@ -72,7 +73,7 @@ in ${optionalString (cfg.featureGates != []) "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ --hostname-override=${cfg.hostname} \ - --kubeconfig=${top.lib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \ + --kubeconfig=${klib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \ ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ ${cfg.extraOpts} ''; @@ -88,7 +89,7 @@ in services.kubernetes.proxy.hostname = with config.networking; mkDefault hostName; services.kubernetes.pki.certs = { - kubeProxyClient = top.lib.mkCert { + kubeProxyClient = klib.mkCert { name = "kube-proxy-client"; CN = "system:kube-proxy"; action = "systemctl restart kube-proxy.service"; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix index 87263ee72f..442e3fe3a6 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix @@ -6,6 +6,7 @@ let top = config.services.kubernetes; otop = options.services.kubernetes; cfg = top.scheduler; + klib = options.services.kubernetes.lib.default; in { ###### interface @@ -32,7 +33,7 @@ in type = listOf str; }; - kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes scheduler"; + kubeconfig = klib.mkKubeConfigOptions "Kubernetes scheduler"; leaderElect = mkOption { description = "Whether to start leader election before executing main loop."; @@ -69,7 +70,7 @@ in --address=${cfg.address} \ ${optionalString (cfg.featureGates != []) "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ - --kubeconfig=${top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \ + --kubeconfig=${klib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \ --leader-elect=${boolToString cfg.leaderElect} \ --port=${toString cfg.port} \ ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ @@ -87,7 +88,7 @@ in }; services.kubernetes.pki.certs = { - schedulerClient = top.lib.mkCert { + schedulerClient = klib.mkCert { name = "kube-scheduler-client"; CN = "system:kube-scheduler"; action = "systemctl restart kube-scheduler.service"; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix index 266bc82b69..742e605d22 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix @@ -1,9 +1,10 @@ -{ config, lib, pkgs, ... }: +{ config, options, lib, pkgs, ... }: with lib; let cfg = config.services.couchdb; + opt = options.services.couchdb; configFile = pkgs.writeText "couchdb.ini" ( '' [couchdb] @@ -153,6 +154,7 @@ in { argsFile = mkOption { type = types.path; default = "${cfg.package}/etc/vm.args"; + defaultText = literalExpression ''"config.${opt.package}/etc/vm.args"''; description = '' vm.args configuration. Overrides Couchdb's Erlang VM parameters file. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix index cc9a460327..27864fad4f 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix @@ -54,7 +54,7 @@ in systemd.packages = [ cfg.package ]; - services.udev.packages = [ pkgs.libmtp ]; + services.udev.packages = [ pkgs.libmtp.out ]; # Needed for unwrapped applications environment.variables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index 4be3e881a9..f7a03a4a3e 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -29,6 +29,8 @@ in { meta = { maintainers = teams.freedesktop.members; + # uses attributes of the linked package + buildDocsInSandbox = false; }; ###### interface @@ -94,6 +96,12 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; systemd.packages = [ cfg.package ]; + + # Enable either system or user units. + systemd.services.pipewire-media-session.enable = config.services.pipewire.systemWide; + systemd.user.services.pipewire-media-session.enable = !config.services.pipewire.systemWide; + + systemd.services.pipewire-media-session.wantedBy = [ "pipewire.service" ]; systemd.user.services.pipewire-media-session.wantedBy = [ "pipewire.service" ]; environment.etc."pipewire/media-session.d/media-session.conf" = { diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix index 55755ecd64..c3cfd46e61 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -40,6 +40,8 @@ in { meta = { maintainers = teams.freedesktop.members; + # uses attributes of the linked package + buildDocsInSandbox = false; }; ###### interface @@ -123,6 +125,22 @@ in { pulse = { enable = mkEnableOption "PulseAudio server emulation"; }; + + systemWide = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + If true, a system-wide PipeWire service and socket is enabled + allowing all users in the "pipewire" group to use it simultaneously. + If false, then user units are used instead, restricting access to + only one user. + + Enabling system-wide PipeWire is however not recommended and disabled + by default according to + https://github.com/PipeWire/pipewire/blob/master/NEWS + ''; + }; + }; }; @@ -148,9 +166,20 @@ in { # PipeWire depends on DBUS but doesn't list it. Without this booting # into a terminal results in the service crashing with an error. + systemd.services.pipewire.bindsTo = [ "dbus.service" ]; + systemd.user.services.pipewire.bindsTo = [ "dbus.service" ]; + + # Enable either system or user units. Note that for pipewire-pulse there + # are only user units, which work in both cases. + systemd.sockets.pipewire.enable = cfg.systemWide; + systemd.services.pipewire.enable = cfg.systemWide; + systemd.user.sockets.pipewire.enable = !cfg.systemWide; + systemd.user.services.pipewire.enable = !cfg.systemWide; + + systemd.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; systemd.user.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; systemd.user.sockets.pipewire-pulse.wantedBy = lib.mkIf (cfg.socketActivation && cfg.pulse.enable) ["sockets.target"]; - systemd.user.services.pipewire.bindsTo = [ "dbus.service" ]; + services.udev.packages = [ cfg.package ]; # If any paths are updated here they must also be updated in the package test. @@ -194,7 +223,22 @@ in { environment.sessionVariables.LD_LIBRARY_PATH = lib.optional cfg.jack.enable "${cfg.package.jack}/lib"; + users = lib.mkIf cfg.systemWide { + users.pipewire = { + uid = config.ids.uids.pipewire; + group = "pipewire"; + extraGroups = [ + "audio" + "video" + ] ++ lib.optional config.security.rtkit.enable "rtkit"; + description = "Pipewire system service user"; + isSystemUser = true; + }; + groups.pipewire.gid = config.ids.gids.pipewire; + }; + # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/464#note_723554 + systemd.services.pipewire.environment."PIPEWIRE_LINK_PASSIVE" = "1"; systemd.user.services.pipewire.environment."PIPEWIRE_LINK_PASSIVE" = "1"; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/games/minecraft-server.nix b/third_party/nixpkgs/nixos/modules/services/games/minecraft-server.nix index ddbe9508a4..5bb8eff576 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/minecraft-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/minecraft-server.nix @@ -182,6 +182,27 @@ in { Restart = "always"; User = "minecraft"; WorkingDirectory = cfg.dataDir; + # Hardening + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "" ]; + LockPersonality = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + UMask = "0077"; }; preStart = '' diff --git a/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix b/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix index 02627e51c9..b041c9c82c 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix @@ -226,4 +226,7 @@ in { isSystemUser = true; }; }; + + # uses attributes of the linked package + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix index 1bd21c278e..21551d7d5f 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix @@ -678,7 +678,7 @@ in rev = "ff96a0fa5635770390b184ae74debea75c3fd534"; ref = "nixos-unstable"; }; - image_from_nixpkgs = (import ("${pkgs.sourcehut.buildsrht}/lib/images/nixos/image.nix") { + image_from_nixpkgs = (import ("''${pkgs.sourcehut.buildsrht}/lib/images/nixos/image.nix") { pkgs = (import pkgs_unstable {}); }); in @@ -696,6 +696,7 @@ in package = mkOption { type = types.package; default = pkgs.git; + defaultText = literalExpression "pkgs.git"; example = literalExpression "pkgs.gitFull"; description = '' Git package for git.sr.ht. This can help silence collisions. @@ -712,6 +713,7 @@ in package = mkOption { type = types.package; default = pkgs.mercurial; + defaultText = literalExpression "pkgs.mercurial"; description = '' Mercurial package for hg.sr.ht. This can help silence collisions. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix index f20b8dde1a..b36b5fd065 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix @@ -251,6 +251,13 @@ let promTypes.scrape_config = types.submodule { options = { + authorization = mkOption { + type = types.attrs; + default = {}; + description = '' + Sets the `Authorization` header on every scrape request with the configured credentials. + ''; + }; job_name = mkOption { type = types.str; description = '' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix b/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix index 03f9b9f9ba..05713adbd8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix @@ -10,12 +10,20 @@ let "--pidfile /run/AdGuardHome/AdGuardHome.pid" "--work-dir /var/lib/AdGuardHome/" "--config /var/lib/AdGuardHome/AdGuardHome.yaml" - "--host ${cfg.host}" - "--port ${toString cfg.port}" ] ++ cfg.extraArgs); -in -{ + baseConfig = { + bind_host = cfg.host; + bind_port = cfg.port; + }; + + configFile = pkgs.writeTextFile { + name = "AdGuardHome.yaml"; + text = builtins.toJSON (recursiveUpdate cfg.settings baseConfig); + checkPhase = "${pkgs.adguardhome}/bin/adguardhome -c $out --check-config"; + }; + +in { options.services.adguardhome = with types; { enable = mkEnableOption "AdGuard Home network-wide ad blocker"; @@ -44,6 +52,31 @@ in ''; }; + mutableSettings = mkOption { + default = true; + type = bool; + description = '' + Allow changes made on the AdGuard Home web interface to persist between + service restarts. + ''; + }; + + settings = mkOption { + type = (pkgs.formats.yaml { }).type; + default = { }; + description = '' + AdGuard Home configuration. Refer to + + for details on supported values. + + + On start and if is true, + these options are merged into the configuration file on start, taking + precedence over configuration changes made on the web interface. + + ''; + }; + extraArgs = mkOption { default = [ ]; type = listOf str; @@ -62,6 +95,19 @@ in StartLimitIntervalSec = 5; StartLimitBurst = 10; }; + + preStart = '' + if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \ + && [ "${toString cfg.mutableSettings}" = "1" ]; then + # Writing directly to AdGuardHome.yaml results in empty file + ${pkgs.yaml-merge}/bin/yaml-merge "$STATE_DIRECTORY/AdGuardHome.yaml" "${configFile}" > "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" + mv "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" "$STATE_DIRECTORY/AdGuardHome.yaml" + else + cp --force "${configFile}" "$STATE_DIRECTORY/AdGuardHome.yaml" + chmod 600 "$STATE_DIRECTORY/AdGuardHome.yaml" + fi + ''; + serviceConfig = { DynamicUser = true; ExecStart = "${pkgs.adguardhome}/bin/adguardhome ${args}"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix index dc6a019e9b..316e6e37f9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix @@ -118,4 +118,7 @@ in }; }; }; + + # uses attributes of the linked package + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/kea.nix b/third_party/nixpkgs/nixos/modules/services/networking/kea.nix index 4da47f575f..17b4eb2e28 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/kea.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/kea.nix @@ -378,4 +378,6 @@ in ]); meta.maintainers = with maintainers; [ hexa ]; + # uses attributes of the linked package + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/searx.nix b/third_party/nixpkgs/nixos/modules/services/networking/searx.nix index 9fb06af744..b73f255eb9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/searx.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/searx.nix @@ -228,5 +228,4 @@ in }; meta.maintainers = with maintainers; [ rnhmjoj ]; - } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix b/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix index 9db433fa07..31731b60d4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix @@ -435,5 +435,5 @@ in ); }; - meta.maintainers = with maintainers; [ minijackson ]; + meta.maintainers = with maintainers; [ minijackson mic92 ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix b/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix index e9f123a181..747fb7a1f9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix @@ -100,6 +100,7 @@ in confDir = mkOption { type = types.path; default = confDir; + defaultText = literalDocBook "generated from configuration"; description = "The location of the config files for xrdp."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/aesmd.nix b/third_party/nixpkgs/nixos/modules/services/security/aesmd.nix index bb53bc49e2..924d614e47 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/aesmd.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/aesmd.nix @@ -1,7 +1,8 @@ -{ config, pkgs, lib, ... }: +{ config, options, pkgs, lib, ... }: with lib; let cfg = config.services.aesmd; + opt = options.services.aesmd; sgx-psw = pkgs.sgx-psw.override { inherit (cfg) debug; }; @@ -43,6 +44,9 @@ in options.proxyType = mkOption { type = with types; nullOr (enum [ "default" "direct" "manual" ]); default = if (cfg.settings.proxy != null) then "manual" else null; + defaultText = literalExpression '' + if (config.${opt.settings}.proxy != null) then "manual" else null + ''; example = "default"; description = '' Type of proxy to use. The default uses the system's default proxy. diff --git a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix index 5b951bc85e..71088fc4dc 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix @@ -179,4 +179,7 @@ in { wantedBy = [ "multi-user.target" ]; }; }; + + # uses attributes of the linked package + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix index 54c491f8b1..b509e4fff4 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix @@ -329,9 +329,6 @@ in { ${pkgs.php}/bin/php artisan cache:clear ${pkgs.php}/bin/php artisan config:clear ${pkgs.php}/bin/php artisan view:clear - ${pkgs.php}/bin/php artisan config:cache - ${pkgs.php}/bin/php artisan route:cache - ${pkgs.php}/bin/php artisan view:cache ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix index f08dd65bdb..4d4689a4cf 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix @@ -112,4 +112,7 @@ in }; }; }; + + # uses attributes of the linked package + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix index 9ee9dbf1aa..6bfc67368d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix @@ -237,4 +237,6 @@ in }; meta.maintainers = with lib.maintainers; [ edef zimbatm ]; + # uses attributes of the linked package + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/jirafeau.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/jirafeau.nix index 83cf224f7d..a95e2b4f82 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/jirafeau.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/jirafeau.nix @@ -167,4 +167,7 @@ in "d ${cfg.dataDir}/async/ 0750 ${user} ${group} - -" ]; }; + + # uses attributes of the linked package + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/powerdns-admin.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/powerdns-admin.nix index ce99b606c3..4661ba80c5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/powerdns-admin.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/powerdns-admin.nix @@ -146,4 +146,7 @@ in group = "powerdnsadmin"; }; }; + + # uses attributes of the linked package + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix index 8ebb722966..629fd04dc0 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix @@ -359,7 +359,7 @@ in DirectoryIndex index.php Require all granted - Options +FollowSymLinks + Options +FollowSymLinks -Indexes # https://wordpress.org/support/article/hardening-wordpress/#securing-wp-config-php diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix index e3d876e82f..d1513a596b 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -36,6 +36,7 @@ in enlightenment.econnman enlightenment.efl enlightenment.enlightenment + enlightenment.ecrire enlightenment.ephoto enlightenment.rage enlightenment.terminology diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix index 24d9257344..f0cabdd446 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix @@ -865,4 +865,6 @@ in }; + # uses relatedPackages + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix index 501998fa39..2efe0f05e0 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -317,4 +317,6 @@ in }; + # uses extendModules to generate a type + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix index fdb4d0e4c7..5bc603530f 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix @@ -20,16 +20,20 @@ let optionalString fixBinary "F"; in ":${name}:${type}:${offset'}:${magicOrExtension}:${mask'}:${interpreter}:${flags}"; - activationSnippet = name: { interpreter, ... }: '' + activationSnippet = name: { interpreter, wrapInterpreterInShell, ... }: if wrapInterpreterInShell then '' rm -f /run/binfmt/${name} cat > /run/binfmt/${name} << 'EOF' #!${pkgs.bash}/bin/sh exec -- ${interpreter} "$@" EOF chmod +x /run/binfmt/${name} + '' else '' + rm -f /run/binfmt/${name} + ln -s ${interpreter} /run/binfmt/${name} ''; getEmulator = system: (lib.systems.elaborate { inherit system; }).emulator pkgs; + getQemuArch = system: (lib.systems.elaborate { inherit system; }).qemuArch; # Mapping of systems to “magicOrExtension” and “mask”. Mostly taken from: # - https://github.com/cleverca22/nixos-configs/blob/master/qemu.nix @@ -238,6 +242,25 @@ in { ''; type = types.bool; }; + + wrapInterpreterInShell = mkOption { + default = true; + description = '' + Whether to wrap the interpreter in a shell script. + + This allows a shell command to be set as the interpreter. + ''; + type = types.bool; + }; + + interpreterSandboxPath = mkOption { + internal = true; + default = null; + description = '' + Path of the interpreter to expose in the build sandbox. + ''; + type = types.nullOr types.path; + }; }; })); }; @@ -258,16 +281,37 @@ in { config = { boot.binfmt.registrations = builtins.listToAttrs (map (system: { name = system; - value = { + value = let interpreter = getEmulator system; + qemuArch = getQemuArch system; + + preserveArgvZero = "qemu-${qemuArch}" == baseNameOf interpreter; + interpreterReg = let + wrapperName = "qemu-${qemuArch}-binfmt-P"; + wrapper = pkgs.wrapQemuBinfmtP wrapperName interpreter; + in + if preserveArgvZero then "${wrapper}/bin/${wrapperName}" + else interpreter; + in { + inherit preserveArgvZero; + + interpreter = interpreterReg; + wrapInterpreterInShell = !preserveArgvZero; + interpreterSandboxPath = dirOf (dirOf interpreterReg); } // (magics.${system} or (throw "Cannot create binfmt registration for system ${system}")); }) cfg.emulatedSystems); # TODO: add a nix.extraPlatforms option to NixOS! nix.extraOptions = lib.mkIf (cfg.emulatedSystems != []) '' extra-platforms = ${toString (cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux")} ''; - nix.sandboxPaths = lib.mkIf (cfg.emulatedSystems != []) - ([ "/run/binfmt" "${pkgs.bash}" ] ++ (map (system: dirOf (dirOf (getEmulator system))) cfg.emulatedSystems)); + nix.sandboxPaths = lib.mkIf (cfg.emulatedSystems != []) ( + let + ruleFor = system: cfg.registrations.${system}; + hasWrappedRule = lib.any (system: (ruleFor system).wrapInterpreterInShell) cfg.emulatedSystems; + in [ "/run/binfmt" ] + ++ lib.optional hasWrappedRule "${pkgs.bash}" + ++ (map (system: (ruleFor system).interpreterSandboxPath) cfg.emulatedSystems) + ); environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf" (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations)); diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index fa3e25afb0..29e3aa024d 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -999,4 +999,7 @@ in ]; }; + + # uses types of services/x11/xserver.nix + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix b/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix index f8f4af4f6b..975eed10cd 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix @@ -450,5 +450,4 @@ in }; }; - } diff --git a/third_party/nixpkgs/nixos/tests/sudo.nix b/third_party/nixpkgs/nixos/tests/sudo.nix index 4885d6e17b..ae9362ca70 100644 --- a/third_party/nixpkgs/nixos/tests/sudo.nix +++ b/third_party/nixpkgs/nixos/tests/sudo.nix @@ -73,7 +73,7 @@ in machine.fail('su - test1 -c "sudo -n -u root true"') with subtest("users in group 'foobar' should be able to use sudo with password"): - machine.succeed("sudo -u test2 echo ${password} | sudo -S -u root true") + machine.succeed('su - test2 -c "echo ${password} | sudo -S -u root true"') with subtest("users in group 'barfoo' should be able to use sudo without password"): machine.succeed("sudo -u test3 sudo -n -u root true") diff --git a/third_party/nixpkgs/nixos/tests/systemd-binfmt.nix b/third_party/nixpkgs/nixos/tests/systemd-binfmt.nix index 2a676f3da9..a3a6efac3e 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-binfmt.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-binfmt.nix @@ -1,24 +1,90 @@ # Teach the kernel how to run armv7l and aarch64-linux binaries, # and run GNU Hello for these architectures. -import ./make-test-python.nix ({ pkgs, ... }: { - name = "systemd-binfmt"; - machine = { - boot.binfmt.emulatedSystems = [ - "armv7l-linux" - "aarch64-linux" - ]; + +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; + +let + expectArgv0 = xpkgs: xpkgs.runCommandCC "expect-argv0" { + src = pkgs.writeText "expect-argv0.c" '' + #include + #include + + int main(int argc, char **argv) { + fprintf(stderr, "Our argv[0] is %s\n", argv[0]); + + if (strcmp(argv[0], argv[1])) { + fprintf(stderr, "ERROR: argv[0] is %s, should be %s\n", argv[0], argv[1]); + return 1; + } + + return 0; + } + ''; + } '' + $CC -o $out $src + ''; +in { + basic = makeTest { + name = "systemd-binfmt"; + machine = { + boot.binfmt.emulatedSystems = [ + "armv7l-linux" + "aarch64-linux" + ]; + }; + + testScript = let + helloArmv7l = pkgs.pkgsCross.armv7l-hf-multiplatform.hello; + helloAarch64 = pkgs.pkgsCross.aarch64-multiplatform.hello; + in '' + machine.start() + + assert "world" in machine.succeed( + "${helloArmv7l}/bin/hello" + ) + + assert "world" in machine.succeed( + "${helloAarch64}/bin/hello" + ) + ''; }; - testScript = let - helloArmv7l = pkgs.pkgsCross.armv7l-hf-multiplatform.hello; - helloAarch64 = pkgs.pkgsCross.aarch64-multiplatform.hello; - in '' - machine.start() - assert "world" in machine.succeed( - "${helloArmv7l}/bin/hello" - ) - assert "world" in machine.succeed( - "${helloAarch64}/bin/hello" - ) - ''; -}) + preserveArgvZero = makeTest { + name = "systemd-binfmt-preserve-argv0"; + machine = { + boot.binfmt.emulatedSystems = [ + "aarch64-linux" + ]; + }; + testScript = let + testAarch64 = expectArgv0 pkgs.pkgsCross.aarch64-multiplatform; + in '' + machine.start() + machine.succeed("exec -a meow ${testAarch64} meow") + ''; + }; + + ldPreload = makeTest { + name = "systemd-binfmt-ld-preload"; + machine = { + boot.binfmt.emulatedSystems = [ + "aarch64-linux" + ]; + }; + testScript = let + helloAarch64 = pkgs.pkgsCross.aarch64-multiplatform.hello; + libredirectAarch64 = pkgs.pkgsCross.aarch64-multiplatform.libredirect; + in '' + machine.start() + + assert "error" not in machine.succeed( + "LD_PRELOAD='${libredirectAarch64}/lib/libredirect.so' ${helloAarch64}/bin/hello 2>&1" + ).lower() + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/bucklespring/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bucklespring/default.nix index ee363c5c32..dbdef66c5b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bucklespring/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bucklespring/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "bucklespring"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "zevv"; repo = pname; - rev = version; - sha256 = "114dib4npb7r1z2zd1fwsx71xbf9r6psxqd7n7590cwz1w3r51mz"; + rev = "v${version}"; + sha256 = "0prhqibivxzmz90k79zpwx3c97h8wa61rk5ihi9a5651mnc46mna"; }; nativeBuildInputs = [ pkg-config makeWrapper ]; 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 b91e861c5d..5a4876a98d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "gnome-podcasts"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "podcasts"; rev = version; - hash = "sha256-Jk++/QrQt/fjOz2OaEIr1Imq2DmqTjcormCebjO4/Kk="; + sha256 = "00vy1qkkpn76jdpybsq9qp8s6fh1ih10j73p2x43sl97m5g8944h"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-jlXpeVabc1h2GU1j9Ff6GZJec+JgFyOdJzsOtdkrEWI="; + sha256 = "0y34b5rnr75h7dxbx93mafrmwsh187wq5js7fmkb1m1yyybj1v1x"; }; nativeBuildInputs = [ @@ -79,5 +79,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-podcasts.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix b/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix index 90821b0147..e469a96ab7 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix @@ -7,7 +7,7 @@ , alsa-lib , libsndfile , qt4 -, qscintilla +, qscintilla-qt4 , libpulseaudio , libjack2 , audioBackend ? "pulse" # "pulse", "alsa", or "jack" @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { alsa-lib libsndfile qt4 - qscintilla + qscintilla-qt4 ] ++ lib.optional (audioBackend == "pulse") libpulseaudio ++ lib.optional (audioBackend == "jack") libjack2; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix index d1b43bc448..8bf50e7209 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix @@ -21,6 +21,8 @@ lib.makeScope newScope (self: with self; { mopidy-mpris = callPackage ./mpris.nix { }; + mopidy-muse = callPackage ./muse.nix { }; + mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { }; mopidy-podcast = callPackage ./podcast.nix { }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/muse.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/muse.nix new file mode 100644 index 0000000000..22a6fcd684 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/muse.nix @@ -0,0 +1,29 @@ +{ lib, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + pname = "mopidy-muse"; + version = "0.0.27"; + + src = pythonPackages.fetchPypi { + inherit version; + pname = "Mopidy-Muse"; + sha256 = "0jx9dkgxr07avzz9zskzhqy98zsxkdrf7iid2ax5vygwf8qsx8ks"; + }; + + propagatedBuildInputs = [ + mopidy + pythonPackages.pykka + ]; + + pythonImportsCheck = [ "mopidy_muse" ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Mopidy web client with Snapcast support"; + homepage = "https://github.com/cristianpb/muse"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/paprefs/default.nix b/third_party/nixpkgs/pkgs/applications/audio/paprefs/default.nix index 31ccb212cd..ef45cc4676 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/paprefs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/paprefs/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "paprefs"; - version = "1.1"; + version = "1.2"; src = fetchurl { url = "https://freedesktop.org/software/pulseaudio/paprefs/paprefs-${version}.tar.xz"; - sha256 = "189z5p20hk0xv9vwvym293503j4pwl03xqk9hl7cl6dwgv0l7wkf"; + sha256 = "sha256-s/IeQNw5NtFeP/yRD7DAfBS4jowodxW0VqlIwXY49jM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix b/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix index d2b6ba07d2..19016b700f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix @@ -37,13 +37,13 @@ in stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "064pcpr5dsv9hncqkrnxriva4xjv1vcxhvc69h1an8x8vn4dwgmf"; + sha256 = "sha256-CCifn9OEFM//Hk1PJj8T3MXIV8pXCTdBBXPsHuZwLyQ="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-classic/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-classic/default.nix index 533e3c7dca..8aacb50a1b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-classic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-classic/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "bitcoinclassic"; repo = "bitcoinclassic"; rev = "v${version}"; - sha256 = "sha256-V1cOB5FLotGS5jup/aVaiDiyr/v2KJ2SLcIu/Hrjuwk="; + sha256 = "sha256-fVmFD1B4kKoejd2cmPPF5TJJQTAA6AVsGlVY8IIUNK4="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dashpay/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/dashpay/default.nix index ca1dd13e42..0411f8cf32 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/dashpay/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/dashpay/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "dashpay"; repo= "dash"; rev = "v${version}"; - sha256 = "0l1gcj2xf2bal9ph9y11x8yd28fd25f55f48xbm45bfw3ij7nbaa"; + sha256 = "sha256-DMoiUX8Q0HcBHA6ZIN58uPsTnHjEJMi8eGG2DW8z17Q="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix index ace5ec94c6..4d7943df77 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-sTQ/dX1uXJkEmrNZ47qjBlrexO50y0NGNhw71rHc9bw="; + hash = "sha256-37KTcLFVzuXlLpz9INXbasUdzuY+T34ef8EtfczQ+D8="; }; - cargoHash = "sha256-1ZQt8LaqgxNxFfgCVCK0GVwbcVfX3v9iz7tHvzgyI0g="; + cargoHash = "sha256-aOSCpvejMUfSZCDwShqMPEc3vXw9ri2QvTaCuHODTwA="; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix b/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix index 3258aec6c3..41eb1b9ca5 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "0l0w1badhvlh1rgqzvlmy5k7xhb1nf4f5dmhkl935a5ila08aak3"; }; - vendorSha256 = "1hbfmq76zm50zwmlh3jblriwq2k1mp99d8lg8xzxwy56hncgfj8k"; - runVend = true; + vendorSha256 = "sha256-kA7pOSP4wkzKuFmUqhZmjXJ0ao64cIgZMrQtQ0bQ++U="; + proxyVendor = true; # Build errors in mdbx when format hardening is enabled: # cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] diff --git a/third_party/nixpkgs/pkgs/applications/editors/em/default.nix b/third_party/nixpkgs/pkgs/applications/editors/em/default.nix new file mode 100644 index 0000000000..89cc795f56 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/em/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "em"; + version = "1.0.0"; + + src = fetchurl { + url = "http://pgas.freeshell.org/C/em/${pname}-${version}.tar.gz"; + hash = "sha256-ijMBkl7U1f9MTXgli9kUFB8ttMG6TMQnxfDMP9AblTQ="; + }; + + meta = with lib; { + homepage = "http://pgas.freeshell.org/C/em/"; + description = "Editor for Mortals"; + longDescription = '' + Em is a QMC variant of the standard Unix text editor - ed. It includes all + of ed, so the documentation for ed is fully applicable to em. Em also has + a number of new commands and facilities designed to improve its + interaction and increase its usefulness to users at fast vdu terminals + (such as the ITT's at QMC). + ''; + license = licenses.publicDomain; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/helix/default.nix b/third_party/nixpkgs/pkgs/applications/editors/helix/default.nix index c0c8e2a57b..6cc5714fb8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/helix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/helix/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "helix"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "helix-editor"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-NoVg/8oJIgMQtxlCSjrLnYCG8shigYqZzWAQwmiqxgA="; + sha256 = "sha256-d/USOtcPLjdgzN7TBCouBRmoSDH5LZD4R5Qq7lUrWZw="; }; - cargoSha256 = "sha256-kqPI8WpGpr0VL7CbBTSsjKl3xqJrv/6Qjr6UFnIgaVo="; + cargoSha256 = "sha256-/EATU7HsGNB35YOBp8sofbPd1nl4d3Ggj1ay3QuHkCI="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index 0ec81c785b..14bafb6c51 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -114,7 +114,7 @@ in mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" - "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" + "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/odafileconverter/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/odafileconverter/default.nix index a74043730b..b999029545 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/odafileconverter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/odafileconverter/default.nix @@ -14,7 +14,7 @@ in mkDerivation { src = fetchurl { # NB: this URL is not stable (i.e. the underlying file and the corresponding version will change over time) - url = "http://web.archive.org/web/20201206221727if_/https://download.opendesign.com/guestfiles/Demo/ODAFileConverter_QT5_lnxX64_7.2dll_21.11.deb"; + url = "https://web.archive.org/web/20201206221727if_/https://download.opendesign.com/guestfiles/Demo/ODAFileConverter_QT5_lnxX64_7.2dll_21.11.deb"; sha256 = "10027a3ab18efd04ca75aa699ff550eca3bdfe6f7084460d3c00001bffb50070"; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix index 14a130d7f4..7fd9606f3a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix @@ -1,6 +1,6 @@ { boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint -, libpng, libtiff, libusb1, lz4, xz, lzo, openblas, pkg-config, qtbase -, qtmultimedia, qtscript, lib, stdenv, superlu, wrapQtAppsHook, }: +, libpng, libtiff, libusb1, lz4, xz, lzo, openblas, opencv, pkg-config, qtbase +, qtmultimedia, qtscript, qtserialport, lib, stdenv, superlu, wrapQtAppsHook, }: let source = import ./source.nix { inherit fetchFromGitHub; }; in stdenv.mkDerivation rec { inherit (source) src; @@ -24,9 +24,11 @@ in stdenv.mkDerivation rec { xz lzo openblas + opencv qtbase qtmultimedia qtscript + qtserialport superlu ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/libtiff.nix b/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/libtiff.nix index 6663c47553..43ba1592cc 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/libtiff.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/libtiff.nix @@ -2,20 +2,55 @@ # opentoonz requires its own modified version of libtiff. We still build it as # a separate package # 1. For visibility for tools like vulnix, and -# 2. To avoid a diamond-dependency problem with qt linking the normal libtiff -# and opentoonz linking qt and this modified libtiff, we build a qt against -# this modified libtiff as well. +# 2. To avoid a diamond-dependency problem with opencv linking the normal libtiff +# and opentoonz linking opencv and this modified libtiff, we build an opencv +# against this modified libtiff as well. +# +# We use a separate mkDerivation rather than a minimal libtiff.overrideAttrs +# because the main libtiff builds with cmake and this version of libtiff was +# forked before libtiff gained CMake build capability (added in libtiff-4.0.5). + +{ lib, fetchFromGitHub, stdenv, pkg-config, zlib, libjpeg, xz, libtiff, }: -{ fetchFromGitHub, libtiff }: let source = import ./source.nix { inherit fetchFromGitHub; }; -in libtiff.overrideAttrs (old: { - inherit (source) src; + +in stdenv.mkDerivation { + pname = "libtiff"; version = source.versions.libtiff + "-opentoonz"; - postUnpack = (old.postUnpack or "") + '' + + inherit (source) src; + outputs = [ "bin" "dev" "out" "man" "doc" ]; + + nativeBuildInputs = [ pkg-config ]; + propagatedBuildInputs = [ zlib libjpeg xz ]; + + postUnpack = '' sourceRoot="$sourceRoot/thirdparty/tiff-${source.versions.libtiff}" ''; + # opentoonz uses internal libtiff headers - postInstall = (old.postInstall or "") + '' + postInstall = '' cp libtiff/{tif_config,tif_dir,tiffiop}.h $dev/include ''; -}) + + meta = libtiff.meta // { + knownVulnerabilities = ['' + Do not open untrusted files with Opentoonz: + Opentoonz uses an old custom fork of tibtiff from 2012 that is known to + be affected by at least these 50 vulnerabilities: + CVE-2012-4564 CVE-2013-4232 CVE-2013-4243 CVE-2013-4244 CVE-2014-8127 + CVE-2014-8128 CVE-2014-8129 CVE-2014-8130 CVE-2014-9330 CVE-2015-1547 + CVE-2015-8781 CVE-2015-8782 CVE-2015-8783 CVE-2015-8784 CVE-2015-8870 + CVE-2016-3620 CVE-2016-3621 CVE-2016-3623 CVE-2016-3624 CVE-2016-3625 + CVE-2016-3631 CVE-2016-3632 CVE-2016-3633 CVE-2016-3634 CVE-2016-3658 + CVE-2016-3945 CVE-2016-3990 CVE-2016-3991 CVE-2016-5102 CVE-2016-5314 + CVE-2016-5315 CVE-2016-5316 CVE-2016-5318 CVE-2016-5319 CVE-2016-5321 + CVE-2016-5322 CVE-2016-5323 CVE-2016-6223 CVE-2016-9453 CVE-2016-9532 + CVE-2017-9935 CVE-2017-9937 CVE-2018-10963 CVE-2018-5360 + CVE-2019-14973 CVE-2019-17546 CVE-2020-35521 CVE-2020-35522 + CVE-2020-35523 CVE-2020-35524 + More info at https://github.com/opentoonz/opentoonz/issues/4193 + '']; + maintainers = with lib.maintainers; [ chkno ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/source.nix b/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/source.nix index 7378d2f5f9..27a4b8c0b0 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/source.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/source.nix @@ -3,14 +3,14 @@ { fetchFromGitHub, }: rec { versions = { - opentoonz = "1.4.0"; - libtiff = "4.0.3"; + opentoonz = "1.5.0"; + libtiff = "4.0.3"; # The version in thirdparty/tiff-* }; src = fetchFromGitHub { owner = "opentoonz"; repo = "opentoonz"; rev = "v${versions.opentoonz}"; - sha256 = "0vgclx2yydsm5i2smff3fj8m750nhf35wfhva37kywgws01s189b"; + sha256 = "1rw30ksw3zjph1cwxkfvqj0330v8wd4333gn0fdf3cln1w0549lk"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix index f0dc5f2b36..45457ad8eb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix @@ -1,16 +1,33 @@ -{ mkDerivation, lib, fetchFromGitLab, cmake -, boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, ffmpeg, python -, qtbase, qtsvg, qttools, qscintilla }: +{ mkDerivation +, lib +, stdenv +, fetchFromGitLab +, cmake +, boost +, bzip2 +, ffmpeg +, fftwSinglePrec +, hdf5 +, muparser +, netcdf +, openssl +, python3 +, qscintilla +, qtbase +, qtsvg +, qttools +, VideoDecodeAcceleration +}: mkDerivation rec { pname = "ovito"; - version = "3.4.0"; + version = "3.6.0"; src = fetchFromGitLab { owner = "stuko"; repo = "ovito"; rev = "v${version}"; - sha256 = "1y3wr6yzpsl0qm7cicp2mppfszxd0fgx8hm99in9wff9qd0r16b5"; + sha256 = "sha256-yQ8gSe/QM1RRNxk4bDJ+K5QX0eYjZ+iG3QOHj01tJhY="; }; nativeBuildInputs = [ @@ -19,17 +36,20 @@ mkDerivation rec { buildInputs = [ boost - netcdf - hdf5 - fftwSinglePrec - muparser - openssl + bzip2 ffmpeg - python + fftwSinglePrec + hdf5 + muparser + netcdf + openssl + python3 + qscintilla qtbase qtsvg qttools - qscintilla + ] ++ lib.optionals stdenv.isDarwin [ + VideoDecodeAcceleration ]; meta = with lib; { @@ -37,5 +57,6 @@ mkDerivation rec { homepage = "https://ovito.org"; license = with licenses; [ gpl3Only mit ]; maintainers = with maintainers; [ twhitehead ]; + broken = stdenv.isDarwin; # clang-11: error: no such file or directory: '$-DOVITO_COPYRIGHT_NOTICE=... }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix index 6859a07b48..a4ad25109c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix @@ -1,91 +1,87 @@ { lib +, buildDotnetModule +, dotnetCorePackages , fetchFromGitHub -, buildDotnetPackage -, dotnetPackages -, gtksharp -, gettext +, gtk3 +, installShellFiles +, librsvg +, makeDesktopItem +, wrapGAppsHook }: -let - mono-addins = dotnetPackages.MonoAddins; -in -buildDotnetPackage rec { +buildDotnetModule rec { pname = "Pinta"; - version = "1.7.1"; + version = "2.0"; - outputFiles = [ "bin/*" ]; - buildInputs = [ gtksharp mono-addins gettext ]; - xBuildFiles = [ "Pinta.sln" ]; + nativeBuildInputs = [ + installShellFiles + wrapGAppsHook + ]; + + runtimeDeps = [ gtk3 ]; + + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + + # How-to update deps: + # $ nix-build -A pinta.fetch-deps + # $ ./result + # $ cp /tmp/Pinta-deps.nix ./pkgs/applications/graphics/pinta/default.nix + # TODO: create update script + nugetDeps = ./deps.nix; + + projectFile = "Pinta"; src = fetchFromGitHub { owner = "PintaProject"; repo = "Pinta"; rev = version; - sha256 = "sha256-yRp/dpJ9T4DieqHTj3vhyuASPGe4vjHw0rSXFrTNZVc="; + sha256 = "sha256-wqqNPyy5h/hTDm2u5MDZx1ds5qWAxy1/BY/fX4PeA88="; }; - # Remove version information from nodes - postPatch = with lib; let - csprojFiles = [ - "Pinta/Pinta.csproj" - "Pinta.Core/Pinta.Core.csproj" - "Pinta.Effects/Pinta.Effects.csproj" - "Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj" - "Pinta.Resources/Pinta.Resources.csproj" - "Pinta.Tools/Pinta.Tools.csproj" - ]; - versionedNames = [ - "Mono\\.Addins" - "Mono\\.Posix" - "Mono\\.Addins\\.Gui" - "Mono\\.Addins\\.Setup" - ]; - - stripVersion = name: file: - let - match = '' "$out/config.json" + + runHook postInstall + ''; + + meta = with lib; { + description = "Yet another Matrix client for the web"; + homepage = "https://cinny.in/"; + maintainers = with maintainers; [ abbe ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix index 2b6cb9969e..05a8b99695 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, gettext, wrapGAppsHook +{ lib, fetchurl, fetchFromGitLab, gettext, wrapGAppsHook # Native dependencies , python3, gtk3, gobject-introspection, gnome @@ -41,6 +41,21 @@ python3.pkgs.buildPythonApplication rec { gettext wrapGAppsHook ]; + # Workaround for https://dev.gajim.org/gajim/gajim/-/issues/10719. + # We don't use plugin release URL because it's updated in place. + plugins = fetchFromGitLab { + domain = "dev.gajim.org"; + owner = "gajim"; + repo = "gajim-plugins"; + rev = "fea522e4360cec6ceacbf1df92644ab3343d4b99"; + sha256 = "sha256-CmwEiLsdldoOfgHfWL/5hf/dp0HEDNAIlc5N0Np20KE="; + }; + + postPatch = '' + mkdir -p gajim/data/plugins + cp -r $plugins/plugin_installer gajim/data/plugins + ''; + dontWrapGApps = true; preFixup = '' @@ -59,7 +74,8 @@ python3.pkgs.buildPythonApplication rec { checkPhase = '' xvfb-run dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - ${python3.interpreter} setup.py test + ${python3.interpreter} -m unittest discover -s test/unit -v + ${python3.interpreter} -m unittest discover -s test/no_gui -v ''; # necessary for wrapGAppsHook diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 38e718972f..384feaac63 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.26.1"; # Please backport all updates to the stable channel. + version = "5.27.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-QIRt16AHILBNxKPxsOQ0n65W/bbalhXH1fM7KIaXP10="; + sha256 = "1agxn4fcgln5lsccvw5b7g2psv6nv2y7qm5df201c9pbwjak74nm"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 77508eb029..9937c1816e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -48,6 +48,8 @@ , brotli , microsoft_gsl , rlottie +, stdenv +, gcc10Stdenv }: # Main reference: @@ -63,10 +65,12 @@ let cxxStandard = "17"; }; }; + # Aarch64 default gcc9 will cause ICE. For reference #108305 + env = if stdenv.isAarch64 then gcc10Stdenv else stdenv; in -mkDerivation rec { +env.mkDerivation rec { pname = "telegram-desktop"; - version = "3.1.11"; + version = "3.4.3"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -75,7 +79,7 @@ mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0hpcsraw3gx37wk3r88q51qf68ny0kb3kd6slnklwf22d1jqr3fn"; + sha256 = "0w8llqc4ffhp4gkvk6cyxah16yxm15am0msg3qn39fi2qqnm01x8"; }; postPatch = '' @@ -154,6 +158,8 @@ mkDerivation rec { "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" # See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649 "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF" + # TODO: Remove once QT6 is available in nixpkgs + "-DDESKTOP_APP_QT6=OFF" ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 878fea994d..25dc1ff3d0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2021-10-21"; + version = "unstable-2021-12-22"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "d578c760dc6f1ae5f0f3bb5317b0b2ed04b79138"; - sha256 = "12lr50nma3j9df55sxi6p48yhn9yxrwzz5yrx7r29p8p4fv1c75w"; + rev = "6708e0d31a73e64fe12f54829bf4060c41b2658e"; + sha256 = "081ylw8vp8c84x3f1xx1kia6k1sds2iza9fm5dvn3ccgjwxdm5ny"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/kirc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/kirc/default.nix index c4f63613fc..08823cab57 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/kirc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/kirc/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "kirc"; - version = "0.2.7"; + version = "0.2.9"; src = fetchFromGitHub { owner = "mcpcpc"; repo = pname; rev = version; - hash = "sha256-iaqj4xB15DB3w/RaiCOMdAu8eONhTw1Dz0j5kykAHV4="; + hash = "sha256-KRCVjz59SHjk86VgfGxYKk/Ti3o77dV7fdRu9mB3FSo="; }; dontConfigure = true; 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 5ab0bfd803..6c8af895d5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -14,8 +14,8 @@ buildGoModule rec { sha256 = "sha256-RaHigTp1YGkjQ46gFLhKcJuajekcCgfozu0ndCNq5Ac="; }; - runVend = true; - vendorSha256 = "sha256-A2MZzTYzGuZLFENn9OBIBBreJan+b3RKOEu5bQcDwS8="; + proxyVendor = true; + vendorSha256 = "sha256-ZFs2CXmNZpGae7bD15yTh3w6b00C7AgOwGuz72d2wHs="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix b/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix deleted file mode 100644 index e7a19fa782..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv -, fetchurl -, gcc-unwrapped -, dpkg -, bash -, nodePackages -, makeWrapper -, electron_6 -}: - -let - electron = electron_6; -in -stdenv.mkDerivation rec { - pname = "openbazaar-client"; - version = "2.4.10"; - - src = fetchurl { - url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb"; - sha256 = "sha256-X0iTTLOJsZeyVZwNU3y39cFMHnxlnYXmqQERE26CLTY="; - }; - - dontBuild = true; - dontConfigure = true; - - nativeBuildInputs = [ makeWrapper ]; - - unpackPhase = '' - ${dpkg}/bin/dpkg-deb -x $src . - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/{${pname},applications,pixmaps} - - cp -a usr/lib/openbazaar2client/{locales,resources} $out/share/${pname} - cp -a usr/share/applications/openbazaar2client.desktop $out/share/applications/${pname}.desktop - cp -a usr/share/pixmaps/openbazaar2client.png $out/share/pixmaps/${pname}.png - - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'openbazaar2client' 'openbazaar-client' - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}" - ''; - - meta = with lib; { - description = "Decentralized Peer to Peer Marketplace for Bitcoin - client"; - homepage = "https://www.openbazaar.org/"; - license = licenses.mit; - maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/openbazaar/default.nix b/third_party/nixpkgs/pkgs/applications/networking/openbazaar/default.nix deleted file mode 100644 index aa5d14724a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/openbazaar/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv -, fetchurl -}: - -stdenv.mkDerivation rec { - pname = "openbazaar"; - version = "0.14.6"; - - suffix = { - i686-linux = "linux-386"; - x86_64-darwin = "darwin-10.6-amd64"; - x86_64-linux = "linux-amd64"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://github.com/OpenBazaar/openbazaar-go/releases/download/v${version}/${pname}-go-${suffix}"; - sha256 = { - i686-linux = "1cmv3gyfd6q7y6yn6kigksy2abkq5b8mfgk51d04ky1ckgbriaqq"; - x86_64-darwin = "0n32a0pyj1k2had3imimdyhdhyb285y1dj04f7g3jajmy5zndaxx"; - x86_64-linux = "105i5yl2yvhcvyh1wf35kqq1qyxgbl9j2kxs6yshsk14b2p02j5i"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - dontStrip = true; - dontPatchELF = true; - preferLocalBuild = true; - - installPhase = '' - install -D $src $out/bin/openbazaard - ''; - - postFixup = lib.optionalString (!stdenv.isDarwin) '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/openbazaard - ''; - - meta = with lib; { - description = "Decentralized Peer to Peer Marketplace for Bitcoin - daemon"; - homepage = "https://www.openbazaar.org/"; - license = licenses.mit; - maintainers = with maintainers; [ prusnak ]; - platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix index ecce7cf181..9bfccf4c30 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -714,11 +714,11 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-21.01.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-21.01.0.tar.xz"; - sha256 = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3"; + name = "poppler-21.11.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-21.11.0.tar.xz"; + sha256 = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584"; md5 = ""; - md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz"; + md5name = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584-poppler-21.11.0.tar.xz"; } { name = "poppler-data-0.4.10.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix index f1a1478a3c..7d13558b93 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,8 +8,8 @@ rec { major = "7"; minor = "2"; - patch = "4"; - tweak = "1"; + patch = "5"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "sha256-Ymi5BmpgWGzwpfXtmWDN+Gpf9Yb+Zpm/TSltWA3gjyE="; + sha256 = "sha256-Z8G/sFnUMyhrAlKpFWJ7M69ju19LbslQnRO53UdVEqc="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "sha256-8nzCt7/J7gqJPtHOrVu7UTonJw1pxu4fnLWJyWOUHa8="; + sha256 = "sha256-9rnuRifsEX7RAUdsX6VVw/xQS6dZeS3RbKnoC39uMd8="; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "sha256-rZb1ej3GbgXOHOZWVKKJVuir2urLmvGmrdpB1vpcaCk="; + sha256 = "sha256-6vERLWh0fkQcSRkC37fw2HBqxVtbr9kPEhOyWXjMrfM="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/pyspread/default.nix b/third_party/nixpkgs/pkgs/applications/office/pyspread/default.nix index 3c68c19aa9..b7261dca5a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/pyspread/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/pyspread/default.nix @@ -1,31 +1,22 @@ { lib -, python3 -, fetchpatch +, copyDesktopItems , makeDesktopItem +, python3 , qtsvg , wrapQtAppsHook }: python3.pkgs.buildPythonApplication rec { pname = "pyspread"; - version = "1.99.6"; + version = "2.0.2"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-B1oyWUAXn63mmVFN9brJwbHxi7I5nYrK2JJU1DjAlb8="; + hash = "sha256-rg2T9Y9FU2a+aWg0XM8jyQB9t8zDVlpad3TjUcx4//8="; }; - patches = [ - # https://gitlab.com/pyspread/pyspread/-/merge_requests/34 - (fetchpatch { - name = "entry-points.patch"; - url = "https://gitlab.com/pyspread/pyspread/-/commit/3d8da6a7a7d76f7027d77ca95fac103961d729a2.patch"; - excludes = [ "bin/pyspread" "bin/pyspread.bat" ]; - sha256 = "1l614k7agv339hrin23jj7s1mq576vkdfkdim6wp224k7y37bnil"; - }) - ]; - nativeBuildInputs = [ + copyDesktopItems wrapQtAppsHook ]; @@ -47,19 +38,17 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "pyspread" ]; - desktopItem = makeDesktopItem rec { - name = pname; - exec = name; - icon = name; - desktopName = "Pyspread"; - genericName = "Spreadsheet"; - comment = meta.description; - categories = "Office;Development;Spreadsheet;"; - }; - - postInstall = '' - install -m 444 -Dt $out/share/applications ${desktopItem}/share/applications/* - ''; + desktopItems = [ + (makeDesktopItem rec { + name = pname; + exec = name; + icon = name; + desktopName = "Pyspread"; + genericName = "Spreadsheet"; + comment = meta.description; + categories = "Office;Development;Spreadsheet;"; + }) + ]; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/astrolog/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/astrolog/default.nix index 90749f5431..dc567339d1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/astrolog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/astrolog/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchzip, fetchurl, xorg, gnused }: +{ lib, stdenv, fetchzip, fetchurl, xorg, gnused +, withBigAtlas ? true +, withEphemeris ? true +, withMoonsEphemeris ? true +}: stdenv.mkDerivation rec { pname = "astrolog"; version = "7.30"; @@ -23,15 +27,30 @@ stdenv.mkDerivation rec { sha256 = "1mwvpvfk3lxjcc79zvwl4ypqzgqzipnc01cjldxrmx56xkc35zn7"; stripRoot = false; }; + moonsEphemeris = fetchzip { + url = "https://www.astrolog.org/ftp/ephem/moons/sepm.zip"; + sha256 = "0labcidm8mrwvww93nwpp5738m9ff9q48cqzbgd18xny1jf6f8xd"; + stripRoot = false; + }; atlas = fetchurl { url = "http://astrolog.org/ftp/atlas/atlasbig.as"; - sha256 = "1k8cy8gpcvkwkhyz248qhvrv5xiwp1n1s3b7rlz86krh7vzz01mp"; + sha256 = "001bmqyldsbk4bdliqfl4a9ydrh1ff13wccvfniwaxlmvkridx2q"; }; in '' mkdir -p $out/bin $out/astrolog - cp -r ${ephemeris}/*.se1 $out/astrolog cp *.as $out/astrolog install astrolog $out/bin + ${lib.optionalString withBigAtlas "cp ${atlas} $out/astrolog/atlas.as"} + ${lib.optionalString withEphemeris '' + sed -i "/-Yi1/s#\".*\"#\"$out/ephemeris\"#" $out/astrolog/astrolog.as + mkdir -p $out/ephemeris + cp -r ${ephemeris}/*.se1 $out/ephemeris + ''} + ${lib.optionalString withMoonsEphemeris '' + sed -i "/-Yi1/s#\".*\"#\"$out/ephemeris\"#" $out/astrolog/astrolog.as + mkdir -p $out/ephemeris + cp -r ${moonsEphemeris}/*.se1 $out/ephemeris + ''} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix index 0b53c2ed8e..bb1463ad96 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.35.1"; + version = "3.36.0"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "4887d8a30621941c883f208e151e61ab268c006d"; - sha256 = "0xmiysmq80dnzq1lw9jmprc85kfimw0sl8m5rbi05z8f782gzv1z"; + rev = "e948149d3d1bbdb8eac9cd103d58626a59fae3b9"; + sha256 = "1lcjif29lfj3myc6j63ifk8fdvylyv8g82g2dv0d85nz7mpbq47b"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/cz-cli/default.nix similarity index 96% rename from third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix rename to third_party/nixpkgs/pkgs/applications/version-management/cz-cli/default.nix index c673fd6d0c..769aa0abb8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/cz-cli/default.nix @@ -7,6 +7,7 @@ let }; in nodePackages.commitizen.override { + name = "cz-cli"; meta = with lib; { description = "The commitizen command line utility"; homepage = "https://commitizen.github.io/cz-cli"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/generate-dependencies.sh b/third_party/nixpkgs/pkgs/applications/version-management/cz-cli/generate-dependencies.sh similarity index 100% rename from third_party/nixpkgs/pkgs/applications/version-management/commitizen/generate-dependencies.sh rename to third_party/nixpkgs/pkgs/applications/version-management/cz-cli/generate-dependencies.sh diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-composition.nix b/third_party/nixpkgs/pkgs/applications/version-management/cz-cli/node-composition.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-composition.nix rename to third_party/nixpkgs/pkgs/applications/version-management/cz-cli/node-composition.nix diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-env.nix b/third_party/nixpkgs/pkgs/applications/version-management/cz-cli/node-env.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-env.nix rename to third_party/nixpkgs/pkgs/applications/version-management/cz-cli/node-env.nix diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-packages.nix b/third_party/nixpkgs/pkgs/applications/version-management/cz-cli/node-packages.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-packages.nix rename to third_party/nixpkgs/pkgs/applications/version-management/cz-cli/node-packages.nix diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/package.json b/third_party/nixpkgs/pkgs/applications/version-management/cz-cli/package.json similarity index 100% rename from third_party/nixpkgs/pkgs/applications/version-management/commitizen/package.json rename to third_party/nixpkgs/pkgs/applications/version-management/cz-cli/package.json diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index eea3e7afb7..8320491758 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -6,6 +6,12 @@ , guiSupport ? fullBuild, tk , highlightSupport ? fullBuild , ApplicationServices +# test dependencies +, unzip +, which +, sqlite +, git +, gnupg }: let @@ -13,11 +19,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.9.3"; + version = "6.0.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-O0P2iXetD6dap/HlyPCoO6k1YhqyOWEpq7SY5W0b4I4="; + sha256 = "sha256-Bf0LSAOJyWVH9abHaekO4A8dE/esDUZeQKOBxs86VuI="; }; format = "other"; @@ -27,11 +33,20 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256:1d911jaawdrcv2mdhlp2ylr10791zj7dhb69aiw5yy7vn7gry82n"; + sha256 = "sha256-leyLb6RqntiuEhmJSUkZRUuO8ah0BZI5OhKkGbWRjxs="; sourceRoot = "${pname}-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; + postPatch = '' + patchShebangs . + + for f in **/*.{py,c,t}; do + # not only used in shebangs + substituteAllInPlace "$f" '/bin/sh' '${stdenv.shell}' + done + ''; + propagatedBuildInputs = lib.optional re2Support fb-re2 ++ lib.optional gitSupport pygit2 ++ lib.optional highlightSupport pygments; @@ -47,6 +62,26 @@ let makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional rustSupport "PURE=--rust"; + doCheck = stdenv.isLinux; # tests seem unstable on Darwin + checkInputs = [ + unzip + which + sqlite + git + gnupg + ]; + checkPhase = '' + cat << EOF > tests/blacklists/nix + # tests enforcing "/usr/bin/env" shebangs, which are patched for nix + test-run-tests.t + test-check-shbang.t + EOF + + # extended timeout necessary for tests to pass on the busy CI workers + export HGTESTFLAGS="--blacklist blacklists/nix --timeout 600" + make check + ''; + postInstall = (lib.optionalString guiSupport '' mkdir -p $out/etc/mercurial cp contrib/hgk $out/bin diff --git a/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix index 602d994998..4d3e471cca 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { # actually https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz but upstream deletes releases - url = "http://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz"; + url = "https://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz"; sha256 = "sha256-cmIMVek4lwVYJQbW8ziABftPZ0iIoAoSpR7cKuN4I7M="; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix index 03659e0ba4..ac3beb54f6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.56"; + version = "1.0.0-alpha.57"; src = fetchCrate { inherit version pname; - sha256 = "zV4F4dbjJ58yGiupUwj5Z0HrKR78Mzch8Zs98YfxSTQ="; + sha256 = "sha256-HhGUoO8UHJkfQ5QQ/H+PT8mqvdPb8Ok4D3j7QArLBeA="; }; - cargoSha256 = "JQGBTCNu9U2Kq6tc7VT07LEbzLW+jdVWrK5e2qjzGRA="; + cargoSha256 = "sha256-SyyJqUC7bCUJf53/+GJ/7+huab8hycNABwAFaHHmJtY="; doCheck = false; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/celluloid/default.nix b/third_party/nixpkgs/pkgs/applications/video/celluloid/default.nix index e6dcff6717..291b4b9ebf 100644 --- a/third_party/nixpkgs/pkgs/applications/video/celluloid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/celluloid/default.nix @@ -4,48 +4,50 @@ , appstream-glib , desktop-file-utils , libepoxy -, gettext , glib -, gtk3 +, gtk4 +, wayland , meson , mpv , ninja , nix-update-script , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "celluloid"; - version = "0.21"; + version = "0.22"; src = fetchFromGitHub { owner = "celluloid-player"; repo = "celluloid"; rev = "v${version}"; - hash = "sha256-1Jeg1uqWxURGKR/Xg4j4roZ9Pg5MR7geyttdzlOU+rA="; + hash = "sha256-QGN8YLtyb9YVNDK2ZDQwHJVg6UTIQssfNK9lQqxMNKQ="; }; nativeBuildInputs = [ appstream-glib desktop-file-utils - gettext meson ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ libepoxy glib - gtk3 + gtk4 + wayland mpv ]; postPatch = '' patchShebangs meson-post-install.py src/generate-authors.py + # Remove this for next release + substituteInPlace meson-post-install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/future/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/future/default.nix index fcc525ef17..0f2815fe5f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/future/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/future/default.nix @@ -18,7 +18,7 @@ buildKodiAddon rec { }; meta = with lib; { - homepage = "http://python-future.org"; + homepage = "https://python-future.org"; description = "The missing compatibility layer between Python 2 and Python 3"; license = licenses.mit; maintainers = teams.kodi.members; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix index 52b7679a32..2380d0023d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix @@ -35,5 +35,11 @@ buildEnv { (lib.concatMap (plugin: plugin.extraRuntimeDependencies or []) addons)}" done + + # makeWrapper just created webinterface.default as a symlink. However, + # kodi's webserver carefully refuses to follow symlinks, so we need to copy + # these assets instead. + rm $out/share/kodi/addons/webinterface.default + cp -r ${kodi}/share/kodi/addons/webinterface.default/ $out/share/kodi/addons/webinterface.default ''; } diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix index 3183ca9bbe..576f79c477 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix @@ -81,7 +81,7 @@ let in stdenv.mkDerivation rec { pname = "mpv"; - version = "0.34.0"; + version = "0.34.1"; outputs = [ "out" "dev" "man" ]; @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; - sha256 = "sha256-qa6xZV4aLcHBMa2bIqoKjte4+KWEGGZre4L0u1+eDE8="; + sha256 = "12qxwm1ww5vhjddl8yvj1xa0n1fi9z3lmzwhaiday2v59ca0qgsk"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix index 3225317d78..9ddd6e308c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -1,19 +1,29 @@ -{ lib, stdenvNoCC, fetchFromGitHub, curl, xclip }: +{ lib +, stdenvNoCC +, fetchFromGitHub +, curl +, wl-clipboard +, xclip +}: stdenvNoCC.mkDerivation rec { pname = "mpvacious"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "0r031hh3hpim9dli15m9q4cwka4ljvwg0hdgyp36r1n097q44r5f"; + sha256 = "1lxlgbjk4x3skg5s7kkr9llcdlmpmabfrcslwhhz5f4j3bq7498w"; }; postPatch = '' + # 'require' replaced with 'dofile' to work around + # https://github.com/mpv-player/mpv/issues/7399 until fixed in mpvacious substituteInPlace subs2srs.lua \ + --replace "require('osd_styler')" "dofile('"$out/share/mpv/scripts/mpvacious/osd_styler.lua"')" \ --replace "'curl'" "'${curl}/bin/curl'" \ + --replace "'wl-copy'" "'${wl-clipboard}/bin/wl-copy'" \ --replace "xclip" "${xclip}/bin/xclip" ''; @@ -21,12 +31,12 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/mpv/scripts - cp subs2srs.lua $out/share/mpv/scripts + mkdir -p $out/share/mpv/scripts/mpvacious + cp *.lua $out/share/mpv/scripts/mpvacious runHook postInstall ''; - passthru.scriptName = "subs2srs.lua"; + passthru.scriptName = "mpvacious/subs2srs.lua"; meta = with lib; { description = "Adds mpv keybindings to create Anki cards from movies and TV shows"; diff --git a/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix b/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix index b82b7fd243..f567827600 100644 --- a/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "plex-mpv-shim"; - version = "1.10.1"; + version = "1.10.3"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; rev = "v${version}"; - sha256 = "1ql7idkm916f1wlkqxqmq1i2pc94gbgq6pvb8szhb21icyy5d1y0"; + sha256 = "0hgv9g17dkrh3zbsx27n80yvkgix9j2x0rgg6d3qsf7hp5j3xw4r"; }; propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 8f8da3d180..a41dde4c95 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "containerd"; - version = "1.5.8"; + version = "1.5.9"; outputs = [ "out" "man" ]; @@ -18,7 +18,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-XIAByE2/eVG8DAZXstKs51LQYdVPcPQuIlST3xCclrU="; + sha256 = "sha256-v5seKJMfZUVMbydxKiTSy0OSwen6I/3DrGJnL2DyqHg="; }; vendorSha256 = null; @@ -51,7 +51,7 @@ buildGoModule rec { homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; - maintainers = with maintainers; [ offline vdemeester ]; + maintainers = with maintainers; [ offline vdemeester endocrimes ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index a6c94bf891..462ebb556f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -233,19 +233,19 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.9"; + version = "20.10.12"; rev = "v${version}"; - sha256 = "1msqvzfccah6cggvf1pm7n35zy09zr4qg2aalgwpqigv0jmrbyd4"; + sha256 = "sha256-nU6grb2lSW7BY7w9aAXwVbGp9TyO2ZxnJaxAi0wbk/c="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "04xx7m8s9vrkm67ba2k5i90053h5qqkjcvw5rc8w7m5a309xcp4n"; + sha256 = "sha256-qizzK1qJNRGFisahE3iAzZTNW/HmledlMNxcJCMQSJ4="; }; - runcRev = "v1.0.2"; # v1.0.2 + runcRev = "v1.0.2"; runcSha256 = "1bpckghjah0rczciw1a1ab8z718lb2d3k4mjm4zb45lpm3njmrcp"; - containerdRev = "v1.4.11"; # v1.4.11 - containerdSha256 = "02slv4gc2blxnmv0p8pkm139vjn6ihjblmn8ps2k1afbbyps0ilr"; + containerdRev = "v1.4.12"; + containerdSha256 = "sha256-g30kshXyGVew5tVaXFAOQUOYvvo0JBqIj1YaC5nTiS8="; tiniRev = "v0.19.0"; # v0.19.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/binfmt-p-wrapper.c b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/binfmt-p-wrapper.c new file mode 100644 index 0000000000..f956768862 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/binfmt-p-wrapper.c @@ -0,0 +1,79 @@ +// This is a tiny wrapper that converts the extra arv[0] argument +// from binfmt-misc with the P flag enabled to QEMU parameters. +// It also prevents LD_* environment variables from being applied +// to QEMU itself. + +#include +#include +#include +#include + +#ifndef TARGET_QEMU +#error "Define TARGET_QEMU to be the path to the qemu-user binary (e.g., -DTARGET_QEMU=\"/full/path/to/qemu-riscv64\")" +#endif + +extern char **environ; + +int main(int argc, char *argv[]) { + if (argc < 3) { + fprintf(stderr, "%s: This should be run as the binfmt interpreter with the P flag\n", argv[0]); + fprintf(stderr, "%s: My preconfigured qemu-user binary: %s\n", argv[0], TARGET_QEMU); + return 1; + } + + size_t environ_count = 0; + for (char **cur = environ; *cur != NULL; ++cur) { + environ_count++; + } + + size_t new_argc = 3; + size_t new_argv_alloc = argc + 2 * environ_count + 2; // [ "-E", env ] for each LD_* env + [ "-0", argv0 ] + char **new_argv = (char**)malloc((new_argv_alloc + 1) * sizeof(char*)); + if (!new_argv) { + fprintf(stderr, "FATAL: Failed to allocate new argv array\n"); + abort(); + } + + new_argv[0] = TARGET_QEMU; + new_argv[1] = "-0"; + new_argv[2] = argv[2]; + + // Pass all LD_ env variables as -E and strip them in `new_environ` + size_t new_environc = 0; + char **new_environ = (char**)malloc((environ_count + 1) * sizeof(char*)); + if (!new_environ) { + fprintf(stderr, "FATAL: Failed to allocate new environ array\n"); + abort(); + } + + for (char **cur = environ; *cur != NULL; ++cur) { + if (strncmp("LD_", *cur, 3) == 0) { + new_argv[new_argc++] = "-E"; + new_argv[new_argc++] = *cur; + } else { + new_environ[new_environc++] = *cur; + } + } + new_environ[new_environc] = NULL; + + size_t new_arg_start = new_argc; + new_argc += argc - 3 + 2; // [ "--", full_binary_path ] + + if (argc > 3) { + memcpy(&new_argv[new_arg_start + 2], &argv[3], (argc - 3) * sizeof(char**)); + } + + new_argv[new_arg_start] = "--"; + new_argv[new_arg_start + 1] = argv[1]; + new_argv[new_argc] = NULL; + +#ifdef DEBUG + for (size_t i = 0; i < new_argc; ++i) { + fprintf(stderr, "argv[%zu] = %s\n", i, new_argv[i]); + } +#endif + + return execve(new_argv[0], new_argv, new_environ); +} + +// vim: et:ts=4:sw=4 diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/binfmt-p-wrapper.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/binfmt-p-wrapper.nix new file mode 100644 index 0000000000..fada145692 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/binfmt-p-wrapper.nix @@ -0,0 +1,31 @@ +# binfmt preserve-argv[0] wrapper +# +# More details in binfmt-p-wrapper.c +# +# The wrapper has to be static so LD_* environment variables +# cannot affect the execution of the wrapper itself. + +{ lib, stdenv, pkgsStatic, enableDebug ? false }: + +name: emulator: + +pkgsStatic.stdenv.mkDerivation { + inherit name; + + src = ./binfmt-p-wrapper.c; + + dontUnpack = true; + dontInstall = true; + + buildPhase = '' + runHook preBuild + + mkdir -p $out/bin + $CC -o $out/bin/${name} -static -std=c99 -O2 \ + -DTARGET_QEMU=\"${emulator}\" \ + ${lib.optionalString enableDebug "-DDEBUG"} \ + $src + + runHook postBuild + ''; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index 2955b22729..059057bc49 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -283,6 +283,7 @@ stdenv.mkDerivation rec { homepage = "http://www.qemu.org/"; description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; + mainProgram = "qemu-kvm"; maintainers = with maintainers; [ eelco qyliss ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/berry/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/berry/default.nix index b2d28ca55f..23aa8ff820 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/berry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/berry/default.nix @@ -1,24 +1,35 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, copyDesktopItems +, fontconfig +, freetype , libX11 , libXext , libXft , libXinerama -, fontconfig -, freetype +, makeDesktopItem +, pkg-config +, which }: stdenv.mkDerivation rec { pname = "berry"; - version = "0.1.7"; + version = "0.1.9"; src = fetchFromGitHub { owner = "JLErvin"; repo = pname; rev = version; - sha256 = "sha256-2kFVOE5l1KQvDb5KDL7y0p4M7awJLrxJF871cyc0YZ8="; + hash = "sha256-E1kjqSv2eylJ/9EGcxQrJ2P7VaehyUiirk0TxlPWSnM="; }; + nativeBuildInputs = [ + copyDesktopItems + pkg-config + which + ]; + buildInputs =[ libX11 libXext @@ -28,16 +39,21 @@ stdenv.mkDerivation rec { freetype ]; - preBuild = '' - makeFlagsArray+=( PREFIX="${placeholder "out"}" - X11INC="${libX11.dev}/include" - X11LIB="${libX11}/lib" - XINERAMALIBS="-lXinerama" - XINERAMAFLAGS="-DXINERAMA" - FREETYPELIBS="-lfontconfig -lXft" - FREETYPEINC="${freetype.dev}/include/freetype2" ) + preConfigure = '' + patchShebangs configure ''; + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "berry"; + comment = meta.description; + desktopName = "Berry Window Manager"; + genericName = "Berry Window Manager"; + categories = "Utility;"; + }) + ]; + meta = with lib; { description = "A healthy, bite-sized window manager"; longDescription = '' @@ -59,3 +75,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } +# TODO: report upstream that `which` is not POSIX; the `command` shell builtin +# should be used instead diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/ion-3/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/ion-3/default.nix index 45d56194be..30328cd771 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/ion-3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/ion-3/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tiling tabbed window manager designed with keyboard users in mind"; - homepage = "http://modeemi.fi/~tuomov/ion"; + homepage = "https://modeemi.fi/~tuomov/ion"; platforms = with platforms; linux; license = licenses.lgpl21; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix index faa6f18564..6f1a37f937 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix @@ -1,6 +1,10 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, pkg-config +, awk +, grep +, sed +, runtimeShell , cmake , libXext , libXft @@ -9,20 +13,32 @@ , libXrandr , libjpeg , libpng +, pkg-config }: stdenv.mkDerivation rec { pname = "pekwm"; - version = "0.1.18"; + version = "0.2.1"; src = fetchFromGitHub { owner = "pekdon"; repo = "pekwm"; rev = "release-${version}"; - sha256 = "sha256-R1XDEk097ycMI3R4SjUEJv37CiMaDCQMvg7N8haN0MM="; + hash= "sha256-voHPstdcd4CHnAdD3PMxca0A6MyMYJi8Ik0UlFB0vG0="; }; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + cmakeFlags = [ + "-DAWK=${awk}/bin/awk" + "-DGREP=${grep}/bin/grep" + "-DSED=${sed}/bin/sed" + "-DSH=${runtimeShell}" + ]; + buildInputs = [ libXext libXft @@ -34,24 +50,23 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + homepage = "https://www.pekwm.se/"; description = "A lightweight window manager"; longDescription = '' - pekwm is a window manager that once upon a time was based on the - aewm++ window manager, but it has evolved enough that it no - longer resembles aewm++ at all. It has a much expanded - feature-set, including window grouping (similar to ion, pwm, or - fluxbox), autoproperties, xinerama, keygrabber that supports - keychains, and much more. - - Lightweight and Unobtrusive, a window manager shouldn't be - noticed. + pekwm is a window manager that once upon a time was based on the aewm++ + window manager, but it has evolved enough that it no longer resembles + aewm++ at all. It has a much expanded feature-set, including window + grouping (similar to ion, pwm, or fluxbox), autoproperties, xinerama, + keygrabber that supports keychains, and much more. + + - Lightweight and Unobtrusive, a window manager shouldn't be noticed. - Very configurable, we all work and think in different ways. - - Automatic properties, for all the lazy people, make things - appear as they should when starting applications. + - Automatic properties, for all the lazy people, make things appear as + they should when starting applications. - Chainable Keygrabber, usability for everyone. ''; - homepage = "https://www.pekwm.se/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/build-support/fetchsourcehut/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchsourcehut/default.nix index ed2f074200..2b1feaa496 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchsourcehut/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchsourcehut/default.nix @@ -1,10 +1,11 @@ -{ fetchzip, lib }: +{ fetchgit, fetchhg, fetchzip, lib }: { owner , repo, rev , domain ? "sr.ht" , vc ? "git" , name ? "source" +, fetchSubmodules ? false , ... # For hash agility } @ args: @@ -14,12 +15,36 @@ assert (lib.assertOneOf "vc" vc [ "hg" "git" ]); let baseUrl = "https://${vc}.${domain}/${owner}/${repo}"; - -in fetchzip (recursiveUpdate { - inherit name; - url = "${baseUrl}/archive/${rev}.tar.gz"; - meta.homepage = "${baseUrl}/"; - extraPostFetch = optionalString (vc == "hg") '' - rm -f "$out/.hg_archival.txt" - ''; # impure file; see #12002 -} (removeAttrs args [ "owner" "repo" "rev" "domain" "vc" ])) // { inherit rev; } + baseArgs = { + inherit name; + } // removeAttrs args [ + "owner" "repo" "rev" "domain" "vc" "name" "fetchSubmodules" + ]; + vcArgs = baseArgs // { + inherit rev; + url = baseUrl; + }; + fetcher = if fetchSubmodules then vc else "zip"; + cases = { + git = { + fetch = fetchgit; + arguments = vcArgs // { fetchSubmodules = true; }; + }; + hg = { + fetch = fetchhg; + arguments = vcArgs // { fetchSubrepos = true; }; + }; + zip = { + fetch = fetchzip; + arguments = baseArgs // { + url = "${baseUrl}/archive/${rev}.tar.gz"; + extraPostFetch = optionalString (vc == "hg") '' + rm -f "$out/.hg_archival.txt" + ''; # impure file; see #12002 + }; + }; + }; +in cases.${fetcher}.fetch cases.${fetcher}.arguments // { + inherit rev; + meta.homepage = "${baseUrl}"; +} diff --git a/third_party/nixpkgs/pkgs/build-support/go/garble.nix b/third_party/nixpkgs/pkgs/build-support/go/garble.nix index da1e3152ba..62fd931643 100644 --- a/third_party/nixpkgs/pkgs/build-support/go/garble.nix +++ b/third_party/nixpkgs/pkgs/build-support/go/garble.nix @@ -30,5 +30,6 @@ buildGoModule rec { homepage = "https://github.com/burrowers/garble/"; maintainers = with lib.maintainers; [ davhau ]; license = lib.licenses.bsd3; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/garble.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix index ef914d1448..cafd3c16fd 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "ipaexfont-003.01"; - url = "http://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip"; + url = "https://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip"; postFetch = '' mkdir -p $out/share/fonts diff --git a/third_party/nixpkgs/pkgs/data/fonts/iwona/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iwona/default.nix index 7333c5abe3..85cf06df11 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iwona/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iwona/default.nix @@ -14,7 +14,7 @@ in fetchzip { meta = with lib; { description = "A two-element sans-serif typeface, created by Małgorzata Budyta"; - homepage = "http://jmn.pl/en/kurier-i-iwona/"; + homepage = "https://jmn.pl/en/kurier-i-iwona/"; # "[...] GUST Font License (GFL), which is a free license, legally # equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or # later." - GUST website diff --git a/third_party/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix index ed0411ceb9..0d62a866e0 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix @@ -5,7 +5,7 @@ let in fetchzip rec { name = "quattrocento-sans-${version}"; - url = "http://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; + url = "https://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; postFetch = '' mkdir -p $out/share/{fonts,doc} diff --git a/third_party/nixpkgs/pkgs/data/fonts/quattrocento/default.nix b/third_party/nixpkgs/pkgs/data/fonts/quattrocento/default.nix index 3d11321cd4..aa23175a04 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/quattrocento/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/quattrocento/default.nix @@ -5,7 +5,7 @@ let in fetchzip rec { name = "quattrocento-${version}"; - url = "http://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; + url = "https://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; postFetch = '' mkdir -p $out/share/{fonts,doc} diff --git a/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix b/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix index 7c5d9dbba6..66274c667a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix @@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation { version = "1"; src = fetchurl { - url = "http://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE"; + url = "https://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE"; # Alternative mirror: # http://www.eeo.cn/download/font/VistaFont_CHS.EXE sha256 = "1qwm30b8aq9piyqv07hv8b5bac9ms40rsdf8pwix5dyk8020i8xi"; diff --git a/third_party/nixpkgs/pkgs/data/icons/gnome-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/gnome-icon-theme/default.nix index 0e6a2fc67c..239cf052ca 100644 --- a/third_party/nixpkgs/pkgs/data/icons/gnome-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/gnome-icon-theme/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-icon-theme.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/data/misc/freepats/default.nix b/third_party/nixpkgs/pkgs/data/misc/freepats/default.nix index 3ba5e1b61d..4fe6a5c20f 100644 --- a/third_party/nixpkgs/pkgs/data/misc/freepats/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/freepats/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { Freepats is a project to create a free and open set of instrument patches, in any format, that can be used with softsynths. ''; - homepage = "http://freepats.zenvoid.org/"; + homepage = "https://freepats.zenvoid.org/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index c6226691d7..ba4ce5feee 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "01a23b49c333c95167338433cd375e24fc60d66d", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/01a23b49c333c95167338433cd375e24fc60d66d.tar.gz", - "sha256": "0mf1pqlg5cj0p0si1vgf5mp5an89yhq0il6v7n58smcqbfdynds5", - "msg": "Update from Hackage at 2021-12-21T13:58:08Z" + "commit": "f1cca49c3c22107b73ce7156ebc7735d7d8d250e", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f1cca49c3c22107b73ce7156ebc7735d7d8d250e.tar.gz", + "sha256": "0bcfynix3y0w5fhrij241l6sbndfr5h20pnxwqb9sf4h2ag0zlsa", + "msg": "Update from Hackage at 2021-12-28T00:33:48Z" } diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/default.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/default.nix index 80b4eb58ab..34b0ae86e4 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/default.nix @@ -8,8 +8,9 @@ #### APPLICATIONS econnman = callPackage ./econnman { }; - evisum = callPackage ./evisum { }; - terminology = callPackage ./terminology { }; - rage = callPackage ./rage { }; + ecrire = callPackage ./ecrire { }; ephoto = callPackage ./ephoto { }; + evisum = callPackage ./evisum { }; + rage = callPackage ./rage { }; + terminology = callPackage ./terminology { }; } diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/ecrire/default.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/ecrire/default.nix new file mode 100644 index 0000000000..d152c943d5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/ecrire/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, efl +}: + +stdenv.mkDerivation rec { + pname = "ecrire"; + version = "0.2.0"; + + src = fetchurl { + url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1pszk583rzclfqy3dyjh1m9pz1hnr84vqz8vw9kngcnmj23mjr6r"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + efl + ]; + + meta = with lib; { + description = "EFL simple text editor"; + homepage = "https://www.enlightenment.org/"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix index 14d4572cf6..fb67cafd63 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/efl/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0k10mwpdjn57r2kflbzpybhvwl25yqqa2i2fhx0qazyjbzjbrad4"; + sha256 = "0hm6i1f2g4mwj726rc6na38xhys1plbv9swrlc9hrpa87mz6gac6"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment/default.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment/default.nix index d00f57f771..3c2dc7f331 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "enlightenment"; - version = "0.25.0"; + version = "0.25.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "01nzyvjy06043m01fdb1309xx3wxxg0s3hj9g9di7jjsxp774vkx"; + sha256 = "0i1424vsc929h36hx04646pbrjiya6nc1nqr6s15xwvfv7imzw1c"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/terminology/default.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/terminology/default.nix index 10b97436b9..a2e4f717f4 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/terminology/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/terminology/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl, pcre, mesa }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl }: stdenv.mkDerivation rec { pname = "terminology"; - version = "1.11.0"; + version = "1.12.1"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0bbav27p1xni7kidgf3vn42bwsfrzds301k3f7c8dg7v5yyq9n2g"; + sha256 = "1aasddf2343qj798b5s8qwif3lxj4pyjax6fa9sfi6if9icdkkpq"; }; nativeBuildInputs = [ @@ -18,12 +18,6 @@ stdenv.mkDerivation rec { buildInputs = [ efl - pcre - mesa - ]; - - mesonFlags = [ - "-D edje-cc=${efl}/bin/edje_cc" ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix index c245d593d3..01656dbee1 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-arcmenu"; - version = "19"; + version = "20"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "sha256-GEeONrrH00Tt9tuxhH7Gv5lSZ2D/hFgeGbUstqJsWZo="; + sha256 = "sha256-HjhOZfXld0gnKOAazT8qbI0Jdq6NY/FsrhzAY9uxxMg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix index 4fe005c374..2c28b3a0bb 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix @@ -2,6 +2,7 @@ , gsmakeDerivation , cups , fetchzip +, fetchpatch , gmp, gnutls , libffi, binutils-unwrapped , libjpeg, libtiff, libpng, giflib @@ -33,6 +34,12 @@ gsmakeDerivation rec { ]; patches = [ ./fixup-paths.patch + # https://github.com/gnustep/libs-base/issues/212 / https://www.sogo.nu/bugs/view.php?id=5416#c15585 + (fetchpatch { + url = "https://github.com/gnustep/libs-base/commit/bd5f2909e6edc8012a0a6e44ea1402dfbe1353a4.patch"; + revert = true; + sha256 = "02awigkbhqa60hfhqfh2wjsa960y3q6557qck1k2l231piz2xasa"; + }) ]; meta = { diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix index d46e8e05e0..85fd5aa703 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -13,6 +13,7 @@ , libkscreen , liblxqt , libqtxdg +, xkeyboard_config , xorg , lxqtUpdateScript }: @@ -57,6 +58,10 @@ mkDerivation rec { substituteInPlace lxqt-config-appearance/configothertoolkits.cpp \ --replace 'QStringLiteral("gsettings' \ 'QStringLiteral("${glib.bin}/bin/gsettings' + + substituteInPlace lxqt-config-input/keyboardlayoutconfig.h \ + --replace '/usr/share/X11/xkb/rules/base.lst' \ + '${xkeyboard_config}/share/X11/xkb/rules/base.lst' ''; passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 9d090e30c9..0dc3d3a81a 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.7.0"; + version = "2.7.1"; rev-prefix = "v"; odd-unstable = false; - sha256 = "sha256-wrFp+YMFfi1UZKQGkHnojAh+l170xW56ls9UJZXmzOo="; + sha256 = "sha256-aN8PwH5YIbjiyS5tTcU2AU4LAYC2tBStDxhCXi/dvkQ="; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix index 40b57223fa..d21ac4411f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix @@ -57,7 +57,7 @@ , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: assert !enableIntegerSimple -> gmp != null; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix index 3ce47a20ba..8a352d0e0a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix @@ -56,7 +56,7 @@ , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: assert !enableIntegerSimple -> gmp != null; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix similarity index 97% rename from third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix rename to third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix index 3f13fe1b9e..8ca5df0851 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx +, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx, xattr , autoSignDarwinBinariesHook , bash @@ -58,7 +58,7 @@ , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: assert !enableIntegerSimple -> gmp != null; @@ -165,12 +165,12 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; stdenv.mkDerivation (rec { - version = "9.0.1"; + version = "9.0.2"; pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "1y9mi9bq76z04hmggavrn8jwi1gx92bm3zhx6z69ypq6wha068x5"; + sha256 = "140e42b96346322d1a39eb17602bcdc76e292028ad4a69286b230bab188a9197"; }; enableParallelBuilding = true; @@ -280,6 +280,10 @@ stdenv.mkDerivation (rec { autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx + ] ++ lib.optionals stdenv.isDarwin [ + # TODO(@sternenseemann): backport addition of XATTR env var like + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447 + xattr ]; # For building runtime libs diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix index 77d741a4f2..4714a19a53 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix @@ -59,7 +59,7 @@ , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: assert !enableIntegerSimple -> gmp != null; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix index a769647940..1c4bf3059d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix @@ -64,7 +64,7 @@ , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: assert !enableNativeBignum -> gmp != null; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghcjs/8.10/stage0.nix b/third_party/nixpkgs/pkgs/development/compilers/ghcjs/8.10/stage0.nix index 1cb476ab0c..d173d5a2e5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghcjs/8.10/stage0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghcjs/8.10/stage0.nix @@ -60,7 +60,7 @@ libraryHaskellDepends = [ base binary bytestring containers ghc-prim ghci template-haskell ]; - homepage = "http://github.com/ghcjs"; + homepage = "https://github.com/ghcjs"; license = lib.licenses.mit; }) {}; @@ -71,7 +71,7 @@ version = "0.1.1.0"; src = ./.; libraryHaskellDepends = [ base ghc-prim ]; - homepage = "http://github.com/ghcjs"; + homepage = "https://github.com/ghcjs"; license = lib.licenses.mit; }) {}; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix index e85404c58b..f85ec0118b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "jsonnet"; - version = "0.17.0"; + version = "0.18.0"; outputs = ["out" "doc"]; src = fetchFromGitHub { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "1ddz14699v5lqx3dh0mb7hfffr6fk5zhmzn3z8yxkqqvriqnciim"; + sha256 = "sha256-RmuvpKv9Dg3JcxsdZDBMehJjG5SvrV0spHgxApFeuJo="; }; nativeBuildInputs = [ jekyll ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index 13c611ca8c..4b2907ed30 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index e30db5fcd9..10b89b91b9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" + "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 5874a91e03..019148039d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" + "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" diff --git a/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index 16f0a8348d..e20a25ac8e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in stdenv.mkDerivation rec { pname = "nextpnr"; - version = "2021.15.21"; + version = "2022.01.03"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "d04cfd5f0f6da184f5b8a03f0ce18fbd1d98eca3"; - hash = "sha256-gm/+kwIZ/m10+KuCJoK45F56nKZD3tM0myHwbFKIKAs="; + rev = "089ca8258e6f4dc93f8d39594c1109a8578cdc98"; + hash = "sha256-N8kX/+fN8Qe+qme8RFlZyYQ/3p1WBkt0ztUwjJIQCIw="; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/compilers/xa/xa.nix b/third_party/nixpkgs/pkgs/development/compilers/xa/xa.nix index dbeabe97b1..08f31148d4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/xa/xa.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/xa/xa.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "xa"; - version = "2.3.11"; + version = "2.3.12"; src = fetchurl { urls = [ "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz" "https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz" ]; - hash = "sha256-MvIWTJnjBSGOmSlwhW3Y4jCbXLasR1jXsq/jv+vJAS0="; + hash = "sha256-+P0VNgEtZ2/Gy/zdapF5PlZMibbvdH+NuPRnwXj7BwQ="; }; checkInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix index 9c3d9179f7..8f7de87362 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "0.12+36"; + version = "0.12+54"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "60c3ea367c942459a95e610ed98f277ce46c0142"; - hash = "sha256-NcfhNUmb3IDG08XgS+NGbRLI8sn4aQkOA7RF7wucDug="; + rev = "59a71503448401d2476cf0872808e0a99c3a4d81"; + hash = "sha256-cz4PQymaA9UW91lN+6iniFhbcPRpFNIAeC8ZkwYeg0U="; }; enableParallelBuilding = true; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { fi if ! grep -q "YOSYS_VER := $version" Makefile; then - echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing." + echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${version}), failing." exit 1 fi ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/bluespec.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/bluespec.nix index 6e436cd004..519da019c2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/bluespec.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/bluespec.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { pname = "yosys-bluespec"; - version = "2021.08.19"; + version = "2021.09.08"; src = fetchFromGitHub { owner = "thoughtpolice"; repo = "yosys-bluespec"; - rev = "bcea1635c97747acd3bcb5b8f1968b3f57ae62bc"; - sha256 = "0ipx9yjngs3haksdb440wlydviszwqnxgzynpp7yic2x3ai7i8m1"; + rev = "f6f4127a4e96e18080fd5362b6769fa3e24c76b1"; + sha256 = "sha256-3cNFP/k4JsgLyUQHWU10Htl2Rh0staAcA3R4piD6hDE="; }; buildInputs = [ yosys readline zlib bluespec ]; diff --git a/third_party/nixpkgs/pkgs/development/embedded/rshell/default.nix b/third_party/nixpkgs/pkgs/development/embedded/rshell/default.nix index bcda3c02dd..a537af3692 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/rshell/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/rshell/default.nix @@ -1,15 +1,26 @@ -{ lib, buildPythonApplication, fetchPypi, pyserial, pyudev }: +{ lib +, buildPythonApplication +, fetchPypi +, pyserial +, pyudev +, pythonOlder +}: buildPythonApplication rec { pname = "rshell"; - version = "0.0.30"; + version = "0.0.31"; + + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "d2002d40d735204037d6142a6c2d51beecc763c124faaf759cabf7acd945be95"; + sha256 = "7942b758a9ae5c6ff46516b0317f437dfce9f0721f3a3b635ebd501c9cd38fb9"; }; - propagatedBuildInputs = [ pyserial pyudev ]; + propagatedBuildInputs = [ + pyserial + pyudev + ]; meta = with lib; { homepage = "https://github.com/dhylands/rshell"; diff --git a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix index f00ca1984e..753dcfab37 100644 --- a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix @@ -26,12 +26,10 @@ , vendorSha256 # Whether to delete the vendor folder supplied with the source. , deleteVendor ? false -# Whether to run the vend tool to regenerate the vendor directory. -# This is useful if any dependency contain C files. -, runVend ? false # Whether to fetch (go mod download) and proxy the vendor directory. -# This is useful if any dependency has case-insensitive conflicts -# which will produce platform dependant `vendorSha256` checksums. +# This is useful if your code depends on c code and go mod tidy does not +# include the needed sources to build or if any dependency has case-insensitive +# conflicts which will produce platform dependant `vendorSha256` checksums. , proxyVendor ? false # We want parallel builds by default @@ -43,6 +41,9 @@ , meta ? {} +# disabled +, runVend ? false + # Not needed with buildGoModule , goPackagePath ? "" @@ -54,7 +55,7 @@ with builtins; -assert (runVend == true && proxyVendor == true) -> throw "can't use `runVend` and `proxyVendor` together"; +assert runVend != false -> throw "`runVend` has been replaced by `proxyVendor`"; assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`"; 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 e8ca545e6c..02ec8c38f4 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -2032,19 +2032,6 @@ self: super: { assert pkgs.lib.versionOlder self.hspec.version "2.8.2"; doJailbreak super.graphql; - # gtk2hsC2hs fails to build on certain architectures (aarch64, ppc64(le), ...) - # with a linker error. As a workaround, we build gtk2hs-buildtools with -O0 - # as suggested in the GHC thread below. An alternative to this could be to use - # -fllvm. I haven't been able to get this to work without linker errors, though. - # See also: - # * https://gitlab.haskell.org/ghc/ghc/-/issues/17203 - # * https://github.com/gtk2hs/gtk2hs/issues/305 - # * https://github.com/gtk2hs/gtk2hs/issues/279 - gtk2hs-buildtools = appendConfigureFlags - (pkgs.lib.optionals (with pkgs.stdenv.hostPlatform; isAarch64 || isPowerPC) [ - "--ghc-option=-O0" - ]) super.gtk2hs-buildtools; - # https://github.com/ajscholl/basic-cpuid/pull/1 basic-cpuid = appendPatch (pkgs.fetchpatch { url = "https://github.com/ajscholl/basic-cpuid/commit/2f2bd7a7b53103fb0cf26883f094db9d7659887c.patch"; @@ -2254,4 +2241,13 @@ self: super: { sdp4unordered = disableLibraryProfiling super.sdp4unordered; sdp4vector = disableLibraryProfiling super.sdp4vector; + hie-bios = appendPatches [ + # Accounts for a breaking change in GHC 9.0.2 via CPP + (pkgs.fetchpatch { + name = "hie-bios-ghc-9.0.2-compat.patch"; + url = "https://github.com/haskell/hie-bios/commit/da0cb23384cc6e9b393792f8f25a3c174a4edafa.patch"; + sha256 = "1qj67s93h6pxvdapw1sxy6izwp5y8vjaw67gw3lsnj8gs14fqq4h"; + }) + ] super.hie-bios; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix index 5248523e0c..bfc6f1f35a 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix @@ -256,6 +256,30 @@ self: super: ({ ] ++ (drv.libraryFrameworkDepends or []); }) super.streamly_0_8_1_1; + http-client-tls = overrideCabal (drv: { + postPatch = '' + # This comment has been inserted, so the derivation hash changes, forcing + # a rebuild of this derivation which has succeeded to build on Hydra before, + # but apparently been corrupted, causing reverse dependencies to fail. + # + # This workaround can be removed upon the next darwin stdenv rebuild, + # presumably https://github.com/NixOS/nixpkgs/pull/152850 or the next + # full haskellPackages rebuild. + '' + drv.postPatch or ""; + }) super.http-client-tls; + + foldl = overrideCabal (drv: { + postPatch = '' + # This comment has been inserted, so the derivation hash changes, forcing + # a rebuild of this derivation which has succeeded to build on Hydra before, + # but apparently been corrupted, causing reverse dependencies to fail. + # + # This workaround can be removed upon the next darwin stdenv rebuild, + # presumably https://github.com/NixOS/nixpkgs/pull/152850 or the next + # full haskellPackages rebuild. + '' + drv.postPatch or ""; + }) super.foldl; + } // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin # https://github.com/fpco/unliftio/issues/87 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 71b74f6db7..25c0873729 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 @@ -121,9 +121,9 @@ self: super: { # 2021-09-18: ghc-api-compat and ghc-lib-* need >= 9.0.x versions for hls and hlint ghc-api-compat = doDistribute super.ghc-api-compat_9_0_1; - ghc-lib-parser = self.ghc-lib-parser_9_0_1_20210324; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4; - ghc-lib = self.ghc-lib_9_0_1_20210324; + ghc-lib-parser = self.ghc-lib-parser_9_0_2_20211226; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_6; + ghc-lib = self.ghc-lib_9_0_2_20211226; # 2021-09-18: Need semialign >= 1.2 for correct bounds semialign = super.semialign_1_2_0_1; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d2f64dbbba..e5aaf87f41 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2109,6 +2109,7 @@ broken-packages: - heredocs - her-lexer - Hermes + - hermes-json - herms - hetero-dict - heterogeneous-list-literals @@ -2869,6 +2870,7 @@ broken-packages: - libsystemd-daemon - libtagc - libxls + - libxlsxwriter-hs - libxslt - libyaml-streamly - lie @@ -4383,6 +4385,7 @@ broken-packages: - servant-streaming - servant-to-elm - servant-tracing + - servant-util-beam-pg - servant-yaml - servant-zeppelin - server-generic diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bca6360dca..2374b71319 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -158,13 +158,13 @@ extra-packages: - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version - cabal-install-parsers == 0.4.2 # 2021-09-04: needed haskell-ci by until it upgrades to Cabal >= 3.6 - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4 - - ghc-lib == 9.0.1.* # 2021-11-05: Need one GHC 9.0.1 compatible version - - ghc-lib-parser == 9.0.1.* # 2021-11-05: Need one GHC 9.0.1 compatible version - - ghc-lib-parser-ex == 9.0.* # 2021-11-05: Need one GHC 9.0.1 compatible version + - ghc-lib == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version + - ghc-lib-parser == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version + - ghc-lib-parser-ex == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version - doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.* - brick == 0.64.* # 2021-12-03: matterhorn depends on brick < 0.65 - - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.1 - - ormolu == 0.3.* # 2021-12-03: for HLS with GHC 9.0.1 + - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 + - ormolu == 0.3.* # 2021-12-03: for HLS with GHC 9.0.2 package-maintainers: abbradar: @@ -429,7 +429,6 @@ unsupported-platforms: btrfs: [ x86_64-darwin, aarch64-darwin ] # depends on linux bustle: [ x86_64-darwin, aarch64-darwin ] # uses glibc-specific ptsname_r charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3 - crackNum: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux cut-the-crap: [ x86_64-darwin, aarch64-darwin ] d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ] DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ] @@ -459,7 +458,6 @@ unsupported-platforms: hbro: [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin hbro-contrib: [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin hcwiid: [ x86_64-darwin, aarch64-darwin ] - hevm: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux HFuse: [ x86_64-darwin, aarch64-darwin ] hidapi: [ x86_64-darwin, aarch64-darwin ] hinotify-bytestring: [ x86_64-darwin, aarch64-darwin ] @@ -514,7 +512,6 @@ unsupported-platforms: reflex-localize-dom: [ x86_64-darwin, aarch64-darwin, aarch64-linux ] rtlsdr: [ x86_64-darwin, aarch64-darwin ] rubberband: [ x86_64-darwin, aarch64-darwin ] - sbv: [ aarch64-linux ] scat: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86 scrypt: [ aarch64-linux, armv7l-linux ] # https://github.com/informatikr/scrypt/issues/8 sdl2-mixer: [ x86_64-darwin, aarch64-darwin ] diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 1c22787d28..72dfff26fd 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.19 +# Stackage LTS 18.20 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -302,7 +302,7 @@ default-package-overrides: - buffer-builder ==0.2.4.7 - buffer-pipe ==0.0 - bugsnag-haskell ==0.0.4.2 - - bugsnag-hs ==0.2.0.7 + - bugsnag-hs ==0.2.0.8 - bugzilla-redhat ==0.3.3 - burrito ==1.2.0.4 - butcher ==1.3.3.2 @@ -310,7 +310,7 @@ default-package-overrides: - bv ==0.5 - bv-little ==1.1.1 - byteable ==0.1.1 - - byte-count-reader ==0.10.1.7 + - byte-count-reader ==0.10.1.8 - bytedump ==1.0 - byte-order ==0.1.2.0 - byteorder ==1.0.4 @@ -362,7 +362,7 @@ default-package-overrides: - cborg ==0.2.6.0 - cborg-json ==0.2.3.0 - cdar-mBound ==0.1.0.4 - - c-enum ==0.1.0.1 + - c-enum ==0.1.1.0 - cereal ==0.5.8.2 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 @@ -467,7 +467,7 @@ default-package-overrides: - console-style ==0.0.2.1 - constraint ==0.1.4.0 - constraints ==0.13.2 - - constraints-extras ==0.3.2.0 + - constraints-extras ==0.3.2.1 - constraint-tuples ==0.1.2 - construct ==0.3.0.2 - contravariant ==1.5.5 @@ -513,7 +513,7 @@ default-package-overrides: - csp ==1.4.0 - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 - - c-struct ==0.1.0.1 + - c-struct ==0.1.1.0 - csv ==0.1.2 - ctrie ==0.2 - cubicbezier ==0.6.0.6 @@ -974,7 +974,7 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - hapistrano ==0.4.3.0 - - happstack-server ==7.7.1.1 + - happstack-server ==7.7.1.2 - happy ==1.20.0 - happy-meta ==0.2.0.11 - HasBigDecimal ==0.1.1 @@ -1070,7 +1070,7 @@ default-package-overrides: - hmpfr ==0.4.4 - hnock ==0.4.0 - hoauth2 ==1.16.0 - - hoogle ==5.0.18.2 + - hoogle ==5.0.18.3 - hOpenPGP ==2.9.7 - hopenpgp-tools ==0.23.6 - hopenssl ==2.2.4 @@ -1588,7 +1588,7 @@ default-package-overrides: - mwc-random-monad ==0.7.3.1 - mx-state-codes ==1.0.0.0 - mysql ==0.2.1 - - mysql-simple ==0.4.7 + - mysql-simple ==0.4.7.1 - n2o ==0.11.1 - nagios-check ==0.3.2 - names-th ==0.3.0.1 @@ -1881,7 +1881,7 @@ default-package-overrides: - pureMD5 ==2.1.4 - purescript-bridge ==0.14.0.0 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==2.1.0.7 + - pusher-http-haskell ==2.1.0.8 - pvar ==1.0.0.0 - PyF ==0.9.0.3 - qchas ==1.1.0.1 @@ -2009,7 +2009,7 @@ default-package-overrides: - rio-prettyprint ==0.1.1.0 - roc-id ==0.1.0.0 - rocksdb-haskell ==1.0.1 - - rocksdb-haskell-jprupp ==2.1.3 + - rocksdb-haskell-jprupp ==2.1.4 - rocksdb-query ==0.4.2 - roles ==0.2.1.0 - rope-utf16-splay ==0.3.2.0 @@ -2076,7 +2076,7 @@ default-package-overrides: - semirings ==0.6 - semiring-simple ==1.0.0.1 - semver ==0.4.0.1 - - sendfile ==0.7.11.1 + - sendfile ==0.7.11.4 - sendgrid-v3 ==0.3.0.0 - seqalign ==0.2.0.4 - seqid ==0.6.2 @@ -2126,7 +2126,7 @@ default-package-overrides: - shake-language-c ==0.12.0 - shake-plus ==0.3.4.0 - shake-plus-extended ==0.4.1.0 - - shakespeare ==2.0.25 + - shakespeare ==2.0.25.1 - shared-memory ==0.2.0.0 - ShellCheck ==0.7.2 - shell-conduit ==5.0.0 @@ -2191,7 +2191,7 @@ default-package-overrides: - sop-core ==0.5.0.1 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 - - sourcemap ==0.1.6.1 + - sourcemap ==0.1.7 - sox ==0.2.3.1 - soxlib ==0.0.3.1 - spacecookie ==1.0.0.1 @@ -2245,7 +2245,7 @@ default-package-overrides: - store-streaming ==0.2.0.3 - stratosphere ==0.59.1 - Stream ==0.4.7.2 - - streaming ==0.2.3.0 + - streaming ==0.2.3.1 - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.2.1 - streaming-commons ==0.2.2.3 @@ -2283,7 +2283,7 @@ default-package-overrides: - swagger ==0.3.0 - swagger2 ==2.6 - sweet-egison ==0.1.1.3 - - swish ==0.10.0.8 + - swish ==0.10.0.9 - syb ==0.7.2.1 - sydtest ==0.2.0.0 - sydtest-discover ==0.0.0.1 @@ -2411,7 +2411,7 @@ default-package-overrides: - th-test-utils ==1.1.1 - th-utilities ==0.2.4.3 - thyme ==0.3.5.5 - - tidal ==1.7.8 + - tidal ==1.7.9 - tile ==0.3.0.0 - time-compat ==1.9.5 - timeit ==2.0 @@ -2424,8 +2424,8 @@ default-package-overrides: - timerep ==2.0.1.0 - timer-wheel ==0.3.0 - time-units ==1.0.0 - - timezone-olson ==0.2.0 - - timezone-series ==0.1.9 + - timezone-olson ==0.2.1 + - timezone-series ==0.1.13 - tinylog ==0.15.0 - titlecase ==1.0.1 - tldr ==0.9.2 @@ -2454,7 +2454,7 @@ default-package-overrides: - triplesec ==0.2.2.1 - trivial-constraint ==0.7.0.0 - tsv2csv ==0.1.0.2 - - ttc ==1.1.0.2 + - ttc ==1.1.1.0 - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.2 - tuple ==0.3.0.2 @@ -2565,7 +2565,7 @@ default-package-overrides: - vector-algorithms ==0.8.0.4 - vector-binary-instances ==0.2.5.2 - vector-buffer ==0.4.1 - - vector-builder ==0.3.8.2 + - vector-builder ==0.3.8.3 - vector-bytes-instances ==0.1.1 - vector-circular ==0.1.3 - vector-instances ==3.4 @@ -2591,7 +2591,7 @@ default-package-overrides: - wai-enforce-https ==0.0.2.1 - wai-eventsource ==3.0.0 - wai-extra ==3.1.7 - - wai-feature-flags ==0.1.0.2 + - wai-feature-flags ==0.1.0.3 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.3.7 - wai-middleware-auth ==0.2.5.1 @@ -2628,7 +2628,7 @@ default-package-overrides: - Win32 ==2.6.2.1 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==0.3.4.1 + - witch ==0.3.4.2 - witherable ==0.4.2 - within ==0.2.0.1 - with-location ==0.1.0 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 8b87784cb5..1c22d7fcb6 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -794,6 +794,7 @@ dont-distribute-packages: - condor - conductive-hsc3 - conductive-song + - conduit-aeson - conduit-vfs-zip - confcrypt - conferer-provider-dhall @@ -1185,6 +1186,7 @@ dont-distribute-packages: - funnyprint - funsat - fused-effects-squeal + - futhark_0_21_2 - fwgl-glfw - fwgl-javascript - fxpak 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 6b96455ab7..3288fb06e7 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -811,6 +811,8 @@ self: { pname = "Agda"; version = "2.6.2.1"; sha256 = "03dw7jfqr3ffik6avigm525djqh2gn5c3qwnb2h6298zkr9lch9w"; + revision = "1"; + editedCabalFile = "1n43j03gmm4bhkvn2g752si6sj65hm2x4vq65frhqrjz3byag7ar"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -2787,6 +2789,8 @@ self: { pname = "Cabal"; version = "3.4.1.0"; sha256 = "1rqpq6l4b9990rmlgcyz44awps6r37ccyi6bgk7dhcsflad6prj4"; + revision = "1"; + editedCabalFile = "1l6jf1fkfppdxy4k6y0skddg2j3j2wq3i025ak0zljc1d2blrrj8"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -6554,8 +6558,8 @@ self: { pname = "FunGEn"; version = "1.1.1"; sha256 = "167bf5p4qcb9wj89x5i5zjjx1f7pmi6s5xbbh43ljhp1f25s9147"; - revision = "1"; - editedCabalFile = "0rgqkr95d2bssmnm4rrkrla7380vgr3isljs8jqglfjy660cynq3"; + revision = "2"; + editedCabalFile = "1dffca6qm0x5j0b2rii6r9ilsbvsg3ilsv4a05kzmpdsd94b5j16"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -10939,8 +10943,8 @@ self: { pname = "HsYAML"; version = "0.2.1.0"; sha256 = "10qzhsg789h37q22hm9p27dx4rhbykcbxp7p3pvkws8fr7ajgxv0"; - revision = "3"; - editedCabalFile = "0qj6180459mx08v3m8x8nw2a8a7srw2q48dh4d9qgwd1rl499a5i"; + revision = "4"; + editedCabalFile = "1gzfaqnz7wjvdjh8w66rlg8c9vwawb0adh9kahl8fn70mdnp38az"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35536,8 +35540,8 @@ self: { pname = "attoparsec"; version = "0.13.2.5"; sha256 = "0vv88m5m7ynjrg114psp4j4s69f1a5va3bvn293vymqrma7g7q11"; - revision = "1"; - editedCabalFile = "180r53j8z1p6z2l63qmhqyl1h27l5j3vrhanwfmwchrj7xf1k23w"; + revision = "2"; + editedCabalFile = "1syz7hf2h8c8vwqniymblnyciwqh4hvflfp1h0ywg7ad8q4gqr0v"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim scientific text transformers @@ -36058,8 +36062,8 @@ self: { pname = "aura"; version = "3.2.6"; sha256 = "07sry2nf41f101ldcfcf2x5pp0w7qvlvl6m4j5bbkvxp3rmsjbx2"; - revision = "1"; - editedCabalFile = "1ilxbi5pvg7ayyfww2y85y2503ihzr1w06w2sgbm3pk6qcjz95jg"; + revision = "2"; + editedCabalFile = "02vbh06llfj3f1crf5nqkx8crkh3lhv3mi2zqanjhj1wx98r4g7v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36276,8 +36280,8 @@ self: { }: mkDerivation { pname = "autodocodec"; - version = "0.0.0.0"; - sha256 = "0b8iwzmyf8l80i6p84yd4xhbxipbz10dn2428kmhyzlywjci6pps"; + version = "0.0.1.0"; + sha256 = "0g0k1c76nfkw8l5x6isz6fkci9bjn67qdpmjksf4qdfla28v35ha"; libraryHaskellDepends = [ aeson base bytestring containers hashable mtl scientific text time unordered-containers validity validity-scientific vector @@ -36289,14 +36293,14 @@ self: { "autodocodec-openapi3" = callPackage ({ mkDerivation, aeson, autodocodec, base - , insert-ordered-containers, openapi3, scientific, text + , insert-ordered-containers, lens, openapi3, scientific, text }: mkDerivation { pname = "autodocodec-openapi3"; - version = "0.0.0.0"; - sha256 = "0fj4acmzrbv94zdm6h1c8r7z312gh6cmjj4gy16ykqhks965h9v9"; + version = "0.1.0.0"; + sha256 = "02ccbpjy4x2kai6wysqp2hjq97k58psn3739c6j1sqhcrlqwhwy5"; libraryHaskellDepends = [ - aeson autodocodec base insert-ordered-containers openapi3 + aeson autodocodec base insert-ordered-containers lens openapi3 scientific text ]; description = "Autodocodec interpreters for openapi3"; @@ -36310,8 +36314,8 @@ self: { }: mkDerivation { pname = "autodocodec-schema"; - version = "0.0.0.0"; - sha256 = "0r5mhzfcyl0vzxzih9ckq21nly1i3y0ch2yj49idvw4df2wl5q8p"; + version = "0.1.0.0"; + sha256 = "0qk1fjb47whpbnj2w776sk5mnb1m4z1dq6fmxhvjih3xsrpjq7s3"; libraryHaskellDepends = [ aeson autodocodec base containers mtl text unordered-containers validity validity-aeson validity-containers validity-text @@ -36326,8 +36330,8 @@ self: { }: mkDerivation { pname = "autodocodec-swagger2"; - version = "0.0.0.0"; - sha256 = "1z7ap55y0wzrlkfa2z420flb5ipb5nmwfcgmw8ld8arp1p1dq80m"; + version = "0.0.1.0"; + sha256 = "1h5866568wksnj8khpn50v8c2pysri668l0y4x1pawn92cq5brn4"; libraryHaskellDepends = [ aeson autodocodec base insert-ordered-containers scientific swagger2 text @@ -36343,8 +36347,8 @@ self: { }: mkDerivation { pname = "autodocodec-yaml"; - version = "0.0.0.0"; - sha256 = "19ryi7kqxazng2iy5bdf7h8r2bvdydbb1f2fbxf5gzf1algb421z"; + version = "0.1.0.0"; + sha256 = "1wa51mas9jxzhig651i9r21fxahk8rdwg7waxx4ilayzdfhaic4b"; libraryHaskellDepends = [ autodocodec autodocodec-schema base bytestring containers path path-io safe-coloured-text scientific text unordered-containers @@ -38952,6 +38956,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "base16_0_3_1_0" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, criterion + , deepseq, primitive, QuickCheck, random-bytestring, tasty + , tasty-hunit, tasty-quickcheck, text, text-short + }: + mkDerivation { + pname = "base16"; + version = "0.3.1.0"; + sha256 = "1k7gp9nxzsd9d22ma7r4wbigck3bv71jycdjgr2n72bv5yzvrrzn"; + libraryHaskellDepends = [ + base bytestring deepseq primitive text text-short + ]; + testHaskellDepends = [ + base base16-bytestring bytestring QuickCheck random-bytestring + tasty tasty-hunit tasty-quickcheck text text-short + ]; + benchmarkHaskellDepends = [ + base base16-bytestring bytestring criterion deepseq + random-bytestring text + ]; + description = "Fast RFC 4648-compliant Base16 encoding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "base16-bytestring_0_1_1_7" = callPackage ({ mkDerivation, base, bytestring, ghc-prim }: mkDerivation { @@ -39173,8 +39202,8 @@ self: { pname = "base64"; version = "0.4.2.3"; sha256 = "1hdqswxhgjrg8akl5v99hbm02gkpagsbx4i7fxbzdys1k0bj3gxw"; - revision = "1"; - editedCabalFile = "10s7nw79q385f74x76rh8cy0dxfj7idzrj77ng9x32bf8h7jpa6q"; + revision = "2"; + editedCabalFile = "153csdlayv1zh6xrjrdbdczj6xl5xnipa5pg4l3i3dmaxiynzgcp"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -43235,20 +43264,20 @@ self: { "bishbosh" = callPackage ({ mkDerivation, array, base, containers, data-default, deepseq - , directory, extra, factory, filepath, HUnit, hxt, hxt-relaxng, mtl - , parallel, polyparse, process, QuickCheck, random, time, toolshed - , unix + , directory, extra, factory, filepath, ghc-prim, HUnit, hxt + , hxt-relaxng, mtl, parallel, polyparse, process, QuickCheck + , random, time, toolshed, unix }: mkDerivation { pname = "bishbosh"; - version = "0.1.3.1"; - sha256 = "17xbfcmbi8fx7ddxqc6h93c729bnx0vpanydbd2w3h24i2v75aqx"; + version = "0.1.4.0"; + sha256 = "1gnydsskfs0ws0pa8kl4xcd2c7n3bdq6n3kf2lxnwq6s23kdj9by"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers data-default deepseq extra factory filepath - hxt mtl parallel polyparse process random time toolshed + ghc-prim hxt mtl parallel polyparse process random time toolshed ]; executableHaskellDepends = [ array base containers data-default deepseq directory extra factory @@ -44341,8 +44370,8 @@ self: { pname = "blank-canvas"; version = "0.7.3"; sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "4"; - editedCabalFile = "0lxslpm4s98ddh12py9810k2q872vizphfrszp8gxkkvfzflbb5b"; + revision = "5"; + editedCabalFile = "0ls60723f859g8rp4974jpi8a5zdcaaxkm47mcsnhzxkswn0hjmj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -44508,6 +44537,8 @@ self: { pname = "blaze-builder"; version = "0.4.2.2"; sha256 = "0rxg6vjr0ji6g1nngrqpl4k1q9w66fwkhld9cqm5yfhx0a69kp1c"; + revision = "1"; + editedCabalFile = "026vxh94h2hwncy1mn51xzfpnhj8ijp5xc8fpq7dwc63fkrps0gh"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim text ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -45396,6 +45427,8 @@ self: { pname = "bmp"; version = "1.2.6.3"; sha256 = "1k6s5z520dadj38y7ja0m4syrg094gyq14c63i6wx2701zj3viiw"; + revision = "1"; + editedCabalFile = "0ghc3klxfz5v8rb3rwblrnxmxfafplxrd9gc0y975g8k1q71p44k"; libraryHaskellDepends = [ base binary bytestring ]; description = "Read and write uncompressed BMP image files"; license = lib.licenses.mit; @@ -45488,6 +45521,17 @@ self: { license = lib.licenses.mit; }) {}; + "bodhi" = callPackage + ({ mkDerivation, aeson, base, http-query, text, time }: + mkDerivation { + pname = "bodhi"; + version = "0.1.0"; + sha256 = "0jgvfys9wigkhavl17n6pq06nxfnaw0r3bpk93phvhb0vrxdl4wl"; + libraryHaskellDepends = [ aeson base http-query text time ]; + description = "Fedora Bodhi REST client library"; + license = lib.licenses.mit; + }) {}; + "bogocopy" = callPackage ({ mkDerivation, base, directory, filemanip, filepath , optparse-applicative, shelly, text, transformers, unix @@ -47735,8 +47779,8 @@ self: { }: mkDerivation { pname = "bugsnag-hs"; - version = "0.2.0.7"; - sha256 = "0wrc9lmx3r3l5hz0avr99f9fcjla5bi4b3iziv59qm93m882hmx3"; + version = "0.2.0.8"; + sha256 = "1qnbkp2c5fhv6b9mq3xr849if418qihy6xczzlsf7q4y0vx36kg9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring http-client text time unordered-containers @@ -48405,8 +48449,8 @@ self: { }: mkDerivation { pname = "byte-count-reader"; - version = "0.10.1.7"; - sha256 = "0rfrz11zhba52jv16k9ml6f4bdy5rlkslckdaq71nm4y8zw4388d"; + version = "0.10.1.8"; + sha256 = "1hnjn160xjvhk7mpi1l5sb5jv39660fhysrz1qg8azjgbykwpcja"; libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; testHaskellDepends = [ base extra hspec parsec parsec-numbers text @@ -48557,8 +48601,8 @@ self: { }: mkDerivation { pname = "bytepatch"; - version = "0.3.0"; - sha256 = "13hy2107nlhglafc6qk4q8f8ds2ypd1cmjw2x1ma08yznapljsy4"; + version = "0.3.1"; + sha256 = "0qfiai8kfrvrxv3s2p9ik3f9mxyyn2k5743agvhinfpjb6bl1pi6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48587,8 +48631,8 @@ self: { pname = "bytes"; version = "0.17.1"; sha256 = "1qmps8vvg98wfm9xm734hwzi56bsk8r1zc6vx20rlhc79krv5s9s"; - revision = "2"; - editedCabalFile = "1gayyk4sgd8r48x2cgil8392wlxir0qq059m5k966jrwrqdqg2m4"; + revision = "3"; + editedCabalFile = "1lagk22sacal7dbygp4cgfixq7j8daybn19x0xmrh9d89xgsl7vs"; libraryHaskellDepends = [ base binary binary-orphans bytestring cereal containers hashable mtl scientific text time transformers transformers-compat @@ -49281,8 +49325,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "c-enum"; - version = "0.1.0.1"; - sha256 = "1mg01qzmwaks9ix0269kpvjsa60fkvfc5hjn4wb47c7a6zam2rx0"; + version = "0.1.1.0"; + sha256 = "0ynq77s8xwl5xqkc3c99ygj3h7rkfmkf4040h1skiz8pd2l8v48i"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "To make a type corresponding to an enum of C language"; @@ -49351,14 +49395,27 @@ self: { ({ mkDerivation, array, base, primitive, template-haskell }: mkDerivation { pname = "c-struct"; - version = "0.1.0.1"; - sha256 = "0932b00zhhss86baj6cqhvn4f66l6z8dax58l4gbaif81w9281zw"; + version = "0.1.1.0"; + sha256 = "15q0y2v1nvgdrlzha196xdavr2j539vib4f83pmymc263ll0hr02"; libraryHaskellDepends = [ array base primitive template-haskell ]; testHaskellDepends = [ array base primitive template-haskell ]; description = "To make a wrapper for struct of C language"; license = lib.licenses.bsd3; }) {}; + "c-struct_0_1_1_1" = callPackage + ({ mkDerivation, array, base, primitive, template-haskell }: + mkDerivation { + pname = "c-struct"; + version = "0.1.1.1"; + sha256 = "0aan4j0zfam28phl8vgrgncbz275haq9ls0d2yisv2r2in6c99lx"; + libraryHaskellDepends = [ array base primitive template-haskell ]; + testHaskellDepends = [ array base primitive template-haskell ]; + description = "To make a wrapper for struct of C language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "c0check" = callPackage ({ mkDerivation, base, c0parser }: mkDerivation { @@ -51037,6 +51094,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "cached-json-file_0_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath + , http-query, time, xdg-basedir + }: + mkDerivation { + pname = "cached-json-file"; + version = "0.1.1"; + sha256 = "03pxi16byayjzqj1v930939bnbs2ldv4lvn0c0gyq2xfnmalbhw7"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath http-query time + xdg-basedir + ]; + description = "Locally cache a json file obtained by http"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cached-traversable" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, mtl @@ -51461,8 +51535,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.31.0"; - sha256 = "1yk0b54m243vz4kiqw70w2hc1p6zz4z0z852slgwp3455q02qy18"; + version = "0.2.0.0"; + sha256 = "0c3nfi2vsj9h64l9j3pf42fgjgs7sh5ks7i1ymkfvmb2d3yyff6x"; libraryHaskellDepends = [ aeson async base bytestring calamity-commands colour concurrent-extra connection containers data-default-class @@ -51486,8 +51560,8 @@ self: { }: mkDerivation { pname = "calamity-commands"; - version = "0.1.3.0"; - sha256 = "0vhv63vapjc51hx6g9mjr5vgxlsfkss828wxcfjf5jd98qdv96dj"; + version = "0.2.0.0"; + sha256 = "1hzaqwgvz6vlbpk8vzq1nyx1b598s91xk0pxmclikm94f1fq98d7"; libraryHaskellDepends = [ base generic-lens lens megaparsec polysemy polysemy-plugin text text-show unordered-containers @@ -53027,8 +53101,8 @@ self: { pname = "cassava"; version = "0.5.2.0"; sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; - revision = "6"; - editedCabalFile = "0r3daq24ng1sbypxr1h8m33pibwvrxyzd2inwhi5pvjckn2ghpmq"; + revision = "7"; + editedCabalFile = "1zb16h20w4p3qqvrg4m9rhnyrbpx1ga4r6azrzy1h8vsw09vcbsz"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -56007,8 +56081,8 @@ self: { }: mkDerivation { pname = "cimple"; - version = "0.0.2"; - sha256 = "0ija5g7myn50pyr4zyfya2p3vhgflfyf3pzjp8mg9i5ny9d8cqa4"; + version = "0.0.5"; + sha256 = "1yzf78x1vz9mpkkakk5v4h1lq4y14d8vgq6lyf5chwfa0pdlw1n8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57599,6 +57673,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "cli-arguments" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "cli-arguments"; + version = "0.1.0.1"; + sha256 = "0brks5bvl9h045ghx69s9ls4pssah652s8hc1ilysfi4kcgq8l98"; + libraryHaskellDepends = [ base ]; + description = "A library to process command line arguments in some more convenient way"; + license = lib.licenses.mit; + }) {}; + "cli-builder" = callPackage ({ mkDerivation, base, doctest, either, exceptions, filemanip , hspec, optparse-applicative, QuickCheck, transformers @@ -62693,6 +62778,28 @@ self: { license = lib.licenses.mit; }) {}; + "conduit-aeson" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit + , conduit-extra, containers, doctest-parallel, hspec + , hspec-discover, QuickCheck, scientific, text + }: + mkDerivation { + pname = "conduit-aeson"; + version = "0.1.0.0"; + sha256 = "17czqy2w3wq4sd2infclvipbq8xg01s6bz87y1fwgvd28c5hym6l"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit conduit-extra text + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring conduit containers + doctest-parallel hspec QuickCheck scientific text + ]; + testToolDepends = [ hspec-discover ]; + description = "Short description"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, conduit-zstd, containers @@ -64310,20 +64417,6 @@ self: { }) {}; "constraints-extras" = callPackage - ({ mkDerivation, aeson, base, constraints, template-haskell }: - mkDerivation { - pname = "constraints-extras"; - version = "0.3.2.0"; - sha256 = "11w2w11lr3m33xyk0r6m4ghqppwcapkr4a6gsrnxgwxj0m7zz1qf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base constraints template-haskell ]; - executableHaskellDepends = [ aeson base constraints ]; - description = "Utility package for constraints"; - license = lib.licenses.bsd3; - }) {}; - - "constraints-extras_0_3_2_1" = callPackage ({ mkDerivation, aeson, base, constraints, template-haskell }: mkDerivation { pname = "constraints-extras"; @@ -64335,7 +64428,6 @@ self: { executableHaskellDepends = [ aeson base constraints ]; description = "Utility package for constraints"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "constrictor" = callPackage @@ -66763,10 +66855,6 @@ self: { executableHaskellDepends = [ array base FloatingHex ]; description = "Crack various integer, floating-point data formats"; license = lib.licenses.bsd3; - platforms = [ - "aarch64-darwin" "armv7l-linux" "i686-linux" "x86_64-darwin" - "x86_64-linux" - ]; hydraPlatforms = lib.platforms.none; }) {}; @@ -66785,10 +66873,6 @@ self: { ]; description = "Crack various integer and floating-point data formats"; license = lib.licenses.bsd3; - platforms = [ - "aarch64-darwin" "armv7l-linux" "i686-linux" "x86_64-darwin" - "x86_64-linux" - ]; }) {}; "crackNum_3_2" = callPackage @@ -66806,10 +66890,6 @@ self: { ]; description = "Crack various integer and floating-point data formats"; license = lib.licenses.bsd3; - platforms = [ - "aarch64-darwin" "armv7l-linux" "i686-linux" "x86_64-darwin" - "x86_64-linux" - ]; hydraPlatforms = lib.platforms.none; }) {}; @@ -73508,10 +73588,8 @@ self: { }: mkDerivation { pname = "dear-imgui"; - version = "1.2.2"; - sha256 = "095mv60dvikw1pmj59kwq6p9s8yp04zd8ndbcq3fdia8w0razrxf"; - revision = "1"; - editedCabalFile = "002s2a3hl1scadwqvhairhh7kqvz6fzbjgw4knc9lj6qm9b70gf0"; + version = "1.3.0"; + sha256 = "1b8yafkgr41lizgg3zvzwf5rx1hwr84pqsrhzyfbpjhl0kbwvn54"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81054,8 +81132,8 @@ self: { }: mkDerivation { pname = "domain"; - version = "0.1.1.2"; - sha256 = "0s4x7jhhcx94fzi8cg5bqfqn2vajdlv1yjrakfnfdqk187zbdc6r"; + version = "0.1.1.3"; + sha256 = "0szq40sxd3cpq5mbgq9293643a5j45mr1p03lkxwny8xxhz6hs5a"; libraryHaskellDepends = [ attoparsec base bytestring domain-core foldl hashable parser-combinators template-haskell template-haskell-compat-v0208 @@ -81095,8 +81173,8 @@ self: { }: mkDerivation { pname = "domain-core"; - version = "0.1"; - sha256 = "1qxscw4rcbnak9mp21455gzjdnjj6cqisdhq63gdibhrazfsjvd3"; + version = "0.1.0.1"; + sha256 = "1zfn1nhhz810j5sq1l4i74iyxwf4gq9zr1gic76y1wv4gv1k096a"; libraryHaskellDepends = [ base template-haskell template-haskell-compat-v0208 text th-lego th-lift-instances @@ -81113,8 +81191,8 @@ self: { }: mkDerivation { pname = "domain-optics"; - version = "0.1.0.1"; - sha256 = "1ypsnwy9rv9yldyc2v5w6q2az87dmj9dyalsmg7nnymaip4jm1dm"; + version = "0.1.0.2"; + sha256 = "1j5165idl61gzxiknhpfqn4shji7cf2pcjlwazc2g5a86rvq0i0s"; libraryHaskellDepends = [ base domain-core optics-core template-haskell template-haskell-compat-v0208 text th-lego unordered-containers @@ -89371,6 +89449,43 @@ self: { broken = true; }) {}; + "eventstore_1_4_2" = callPackage + ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring + , cereal, clock, connection, containers, dns, dotnet-timespan + , exceptions, fast-logger, file-embed, hashable, hspec, http-client + , interpolate, lifted-async, lifted-base, monad-control + , monad-logger, mono-traversable, mtl, protobuf, random, safe + , safe-exceptions, semigroups, stm, stm-chans, streaming, tasty + , tasty-hspec, tasty-hunit, text, time, transformers-base + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "eventstore"; + version = "1.4.2"; + sha256 = "1g11asiwnqkzfvflcz0va28kj8b89h5890c9zsa2as9kzgb7zdmr"; + libraryHaskellDepends = [ + aeson array base bifunctors bytestring cereal clock connection + containers dns dotnet-timespan exceptions fast-logger hashable + http-client interpolate lifted-async lifted-base monad-control + monad-logger mono-traversable mtl protobuf random safe + safe-exceptions semigroups stm stm-chans streaming text time + transformers-base unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson async base bytestring cereal connection containers + dotnet-timespan exceptions fast-logger file-embed hashable hspec + lifted-async lifted-base monad-control mono-traversable protobuf + safe safe-exceptions semigroups stm stm-chans streaming tasty + tasty-hspec tasty-hunit text time transformers-base + unordered-containers uuid vector + ]; + description = "EventStore TCP Client"; + license = lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "every" = callPackage ({ mkDerivation, async, base, stm }: mkDerivation { @@ -95730,8 +95845,8 @@ self: { }: mkDerivation { pname = "flatparse"; - version = "0.3.1.0"; - sha256 = "119qqqzp3aaljxgw0fdvqi2mhpykff33rmm8b5v7y3mllz707mf3"; + version = "0.3.2.0"; + sha256 = "0jnf1sxd39xd2jry2p7d9sj29ym0bs4wb3yskl9sjwa6ssck4vdq"; libraryHaskellDepends = [ base bytestring containers integer-gmp template-haskell ]; @@ -96845,8 +96960,8 @@ self: { pname = "foldl"; version = "1.4.12"; sha256 = "0zf4yljh3s2ddxa7dhzdglmylj14kfldhkclc44g37zvjq6kcnag"; - revision = "1"; - editedCabalFile = "15d002khil6d4qjzm4hgfwnl502884jys9pqdm22jvdvsln84jjm"; + revision = "2"; + editedCabalFile = "0ggl6djyqrc56j8iy56f61jki7v3ym35ykd944z045gpjzbaq3c6"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable primitive profunctors random semigroupoids text transformers @@ -100641,14 +100756,14 @@ self: { license = lib.licenses.isc; }) {}; - "futhark_0_21_1" = callPackage + "futhark_0_21_2" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base , base16-bytestring, binary, blaze-html, bmp, bytestring , bytestring-to-vector, cmark-gfm, containers, cryptohash-md5 , directory, directory-tree, dlist, file-embed, filepath, free - , futhark-data, futhark-server, githash, half, happy, haskeline - , language-c-quote, mainland-pretty, megaparsec, mtl - , neat-interpolation, parallel, parser-combinators, process + , futhark-data, futhark-manifest, futhark-server, githash, half + , happy, haskeline, language-c-quote, mainland-pretty, megaparsec + , mtl, neat-interpolation, parallel, parser-combinators, process , process-extras, QuickCheck, random, regex-tdfa, srcloc, tasty , tasty-hunit, tasty-quickcheck, template-haskell, temporary , terminal-size, text, time, transformers, vector @@ -100656,19 +100771,20 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.21.1"; - sha256 = "0ba87d670i2hwa3hma46yx149f0f3q0blpl5v72434dzid575kx5"; + version = "0.21.2"; + sha256 = "09cvyqkhwnp5h759j0rggp2i6n48hkb7ck8284d8ahkq3lh47isg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base base16-bytestring binary blaze-html bmp bytestring bytestring-to-vector cmark-gfm containers cryptohash-md5 directory directory-tree dlist file-embed filepath - free futhark-data futhark-server githash half haskeline - language-c-quote mainland-pretty megaparsec mtl neat-interpolation - parallel process process-extras random regex-tdfa srcloc - template-haskell temporary terminal-size text time transformers - vector vector-binary-instances versions zip-archive zlib + free futhark-data futhark-manifest futhark-server githash half + haskeline language-c-quote mainland-pretty megaparsec mtl + neat-interpolation parallel process process-extras random + regex-tdfa srcloc template-haskell temporary terminal-size text + time transformers vector vector-binary-instances versions + zip-archive zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base text ]; @@ -104578,6 +104694,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "geojson_4_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , hlint, lens, scientific, semigroups, tasty, tasty-hspec + , tasty-quickcheck, text, transformers, validation, vector + }: + mkDerivation { + pname = "geojson"; + version = "4.0.4"; + sha256 = "1a488bbm3hh5hz5i99xj697951c0ni0ynp5x44d7srhf08z1zgjm"; + libraryHaskellDepends = [ + aeson base containers deepseq lens scientific semigroups text + transformers validation vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hlint tasty tasty-hspec + tasty-quickcheck text validation + ]; + description = "A thin GeoJSON Layer above the aeson library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "geojson-types" = callPackage ({ mkDerivation, aeson, base, bson, bytestring, lens, text }: mkDerivation { @@ -105539,20 +105677,21 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_0_1_20210324" = callPackage + "ghc-lib_9_0_2_20211226" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser - , ghc-prim, happy, hpc, pretty, process, time, transformers, unix + , ghc-prim, happy, hpc, parsec, pretty, process, rts, time + , transformers, unix }: mkDerivation { pname = "ghc-lib"; - version = "9.0.1.20210324"; - sha256 = "1qzsm132jk84nvkyrmhmnhpccb2f07miwdcq7h11ljmd3c4c577a"; + version = "9.0.2.20211226"; + sha256 = "0988500fwl24nh1i2pv22332sx8hgi6b2229ff3drd9jgpp886x1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory - exceptions filepath ghc-lib-parser ghc-prim hpc pretty process time - transformers unix + exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty + process rts time transformers unix ]; libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; @@ -105601,20 +105740,20 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_0_1_20210324" = callPackage + "ghc-lib-parser_9_0_2_20211226" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, exceptions, filepath, ghc-prim, happy, hpc + , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.0.1.20210324"; - sha256 = "1hl20lz8r9yhgh6hlakmbqp637h49mq3sdxciy4vsz3nhzy7nqqm"; + version = "9.0.2.20211226"; + sha256 = "0krf99pfnyfly22y5pgfsgpxfvbax9jivzjkhgg67hl0synladvz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory - exceptions filepath ghc-prim hpc pretty process time transformers - unix + exceptions filepath ghc-prim parsec pretty process time + transformers unix ]; libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; @@ -105663,14 +105802,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_9_0_0_4" = callPackage + "ghc-lib-parser-ex_9_0_0_6" = 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.4"; - sha256 = "11j1k26h7px9fydrwi5x9d9ckivc4xdsw4gzb7xhpzdq60f8af66"; + version = "9.0.0.6"; + sha256 = "1lqhddx4sw2d407q12ny1ims4khjxgajlk07wvrw0wcgmx91dmc7"; libraryHaskellDepends = [ base bytestring containers ghc-lib-parser uniplate ]; @@ -114580,8 +114719,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.6.0.0"; - sha256 = "1gr59pxai34zhgf65vg20nrgwish3w9z6107qygnrpmfpi2axmq5"; + version = "0.6.0.3"; + sha256 = "1mqfp7r7l4p3xfh9scnqa0fh23vm50klg5aw1l15xh8slip11qx7"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving generic-random lens lens-aeson mtl QuickCheck @@ -115714,16 +115853,16 @@ self: { }: mkDerivation { pname = "graphql"; - version = "1.0.1.0"; - sha256 = "1kfrfmmapq5sjh0gs9g3hgr4s3780ihvzqw94h7mzngq2ikviqgh"; + version = "1.0.2.0"; + sha256 = "1wnamdj6d0m1qqngslwiv5s20f16v9000hn2jq7q4m3f2y2pf2kb"; libraryHaskellDepends = [ aeson base conduit containers exceptions hspec-expectations megaparsec parser-combinators scientific template-haskell text transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base conduit exceptions hspec hspec-megaparsec megaparsec - QuickCheck scientific text unordered-containers + base conduit exceptions hspec hspec-megaparsec megaparsec + QuickCheck text unordered-containers ]; description = "Haskell GraphQL implementation"; license = "MPL-2.0 AND BSD-3-Clause"; @@ -119357,8 +119496,8 @@ self: { ({ mkDerivation, base, filepath, haddock-api }: mkDerivation { pname = "haddock"; - version = "2.25.0"; - sha256 = "0wjp13f7206g3j2g3lr4msf1anbhjqy9wbgfx382dnanxy80yr74"; + version = "2.25.1"; + sha256 = "1icwwpppi8djqjrfqcys6q8zxlpf14dna6j71qzzv4r9zdz5kr7r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haddock-api ]; @@ -119399,22 +119538,22 @@ self: { "haddock-api" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , directory, exceptions, filepath, ghc, ghc-boot, ghc-paths - , haddock-library, hspec, hspec-discover, mtl, QuickCheck + , haddock-library, hspec, hspec-discover, mtl, parsec, QuickCheck , transformers, xhtml }: mkDerivation { pname = "haddock-api"; - version = "2.25.0"; - sha256 = "1f0gbdlr2kvwagni3416q8jhhjh1b3h1cda5znlmgwdcg9bmcr17"; + version = "2.25.1"; + sha256 = "1zcgpzhnavkgf8pk4wr15rmcm4y6fz3jr03zg5gw9347hkxn0ry7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers deepseq directory exceptions - filepath ghc ghc-boot ghc-paths haddock-library mtl transformers - xhtml + filepath ghc ghc-boot ghc-paths haddock-library mtl parsec + transformers xhtml ]; testHaskellDepends = [ array base bytestring containers deepseq directory exceptions - filepath ghc ghc-boot ghc-paths haddock-library hspec mtl + filepath ghc ghc-boot ghc-paths haddock-library hspec mtl parsec QuickCheck transformers xhtml ]; testToolDepends = [ hspec-discover ]; @@ -121883,8 +122022,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.7.1.1"; - sha256 = "0nc5rnvrzl9m3pinmdq234m80qkf4jszbdqnd567f7lh09yiqw9n"; + version = "7.7.1.2"; + sha256 = "0hd1qwgmk547vqpjvpbdgnq815j1rnniwffrcbr9igv6xzkxzdzc"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -126411,8 +126550,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.62.1"; - sha256 = "12s8qwhxm8llz4asyapvd3mi8g9iv3yw65vyi55960cncvnha8a0"; + version = "0.64.8"; + sha256 = "1dryr93698a0v6bdl7dx0abl1zaayx0p9yvx449d3cw98hw841c0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126459,8 +126598,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.62.1"; - sha256 = "1v66d369fda1prcb8knmszi8kgp2x321pmdk8mwdd3059vcvsw84"; + version = "0.64.8"; + sha256 = "0caih6piinnfshvryvlv6jwrmvrz7570vki3lc9d5jvvbk7sqlx5"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -130538,8 +130677,8 @@ self: { }: mkDerivation { pname = "helic"; - version = "0.3.1.0"; - sha256 = "1bshhddy04w5p6546fxdvk11g6pq781dp4mf4r84qqi7avfjp0xk"; + version = "0.3.2.0"; + sha256 = "1q6dg44fqfpkgc3148lw9srhg0kjw41hd6cda8xb1bkijj0lajrh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131250,6 +131389,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "hermes-json" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base + , bytestring, containers, deepseq, dlist, hedgehog, mtl, scientific + , tasty, tasty-hedgehog, text, time, time-compat, transformers + , unliftio, unliftio-core + }: + mkDerivation { + pname = "hermes-json"; + version = "0.1.0.0"; + sha256 = "0ibr5c9m760wqfbqgy54iwzi6l4fg4afrwj2f4xnn761lrwcbb08"; + revision = "1"; + editedCabalFile = "1m5w72shhr5nl70vv3nx6n8qdhfri49nz0f261kafglsmnp6jbva"; + libraryHaskellDepends = [ + attoparsec attoparsec-iso8601 base bytestring deepseq dlist mtl + scientific text time time-compat transformers unliftio + unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers hedgehog scientific tasty + tasty-hedgehog text time + ]; + description = "Fast JSON decoding via simdjson C++ bindings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hermit" = callPackage ({ mkDerivation, alex, ansi-terminal, array, base, containers , data-default-class, directory, fail, filepath, ghc, ghc-paths @@ -131621,10 +131787,6 @@ self: { testSystemDepends = [ secp256k1 ]; description = "Ethereum virtual machine evaluator"; license = lib.licenses.agpl3Only; - platforms = [ - "aarch64-darwin" "armv7l-linux" "i686-linux" "x86_64-darwin" - "x86_64-linux" - ]; }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;}; "hevolisa" = callPackage @@ -138212,10 +138374,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.18.2"; - sha256 = "1xacx2f33x1a4qlv25f8rlmb4wi0cjfzrj22nlnkrd0knghik3m7"; - revision = "1"; - editedCabalFile = "11ig5z81h27ify5sx2dyrx4kiv61gzd96k9qi8a11hvnk2w51a9y"; + version = "5.0.18.3"; + sha256 = "0v6k75w0an9pqgb7a6cicnpf9rz77xd2lmxfbafc5l4f99jg83bn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -140747,8 +140907,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-api"; - version = "0.0.2.0"; - sha256 = "1mbcqifvpx4xrlwv6bg2rgz8m6b55f40vlc23yi03893i885qn86"; + version = "0.0.3.0"; + sha256 = "03h84hks4g7nvkr38li5f59vcm48if7zjjcwcyx6kakk6hikmwx1"; libraryHaskellDepends = [ async attoparsec base binary bytestring charset clock containers ghc-prim hashable http-types memory mtl template-haskell text @@ -140769,8 +140929,8 @@ self: { ({ mkDerivation, async, base, hs-opentelemetry-api, unagi-chan }: mkDerivation { pname = "hs-opentelemetry-exporter-in-memory"; - version = "0.0.1.1"; - sha256 = "0vfkfdr20w6a7xf0ppsj4nns5nfgs6bib8vm7fpgra1mpsvi31v7"; + version = "0.0.1.2"; + sha256 = "18f0wv1drlbyp1vm4za2a4l1vyi8hwd34imz6m81n4kqz3sdabf3"; libraryHaskellDepends = [ async base hs-opentelemetry-api unagi-chan ]; @@ -140788,8 +140948,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-exporter-otlp"; - version = "0.0.1.1"; - sha256 = "1r7f54dw183gg3vh806saqwmmf0yvh2w4a854szp9h0x5qf17hn1"; + version = "0.0.1.3"; + sha256 = "0ci1c6820cq2xml5fdj04a49r78ymw0s7pdlyhkg7a0ccrxi3722"; libraryHaskellDepends = [ base bytestring case-insensitive clock hs-opentelemetry-api hs-opentelemetry-otlp http-client http-conduit http-types microlens @@ -140804,14 +140964,67 @@ self: { license = lib.licenses.bsd3; }) {}; + "hs-opentelemetry-instrumentation-conduit" = callPackage + ({ mkDerivation, base, conduit, hs-opentelemetry-api, text }: + mkDerivation { + pname = "hs-opentelemetry-instrumentation-conduit"; + version = "0.0.1.1"; + sha256 = "1gc93nnkdbm5drqwg20w317x3n4n7fjp61j3kdy7x7q1qd55khfn"; + libraryHaskellDepends = [ base conduit hs-opentelemetry-api text ]; + testHaskellDepends = [ base conduit hs-opentelemetry-api text ]; + license = lib.licenses.bsd3; + }) {}; + + "hs-opentelemetry-instrumentation-http-client" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit + , hs-opentelemetry-api, hs-opentelemetry-instrumentation-conduit + , http-client, http-client-tls, http-conduit, http-types, text + , unliftio + }: + mkDerivation { + pname = "hs-opentelemetry-instrumentation-http-client"; + version = "0.0.1.1"; + sha256 = "0rhskdibz7g87b04yr44yqxfjf28iavf2akp4m9104yp8vf099hb"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive conduit hs-opentelemetry-api + hs-opentelemetry-instrumentation-conduit http-client + http-client-tls http-conduit http-types text unliftio + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive conduit hs-opentelemetry-api + hs-opentelemetry-instrumentation-conduit http-client + http-client-tls http-conduit http-types text unliftio + ]; + license = lib.licenses.bsd3; + }) {}; + + "hs-opentelemetry-instrumentation-postgresql-simple" = callPackage + ({ mkDerivation, base, bytestring, hs-opentelemetry-api, iproute + , network, postgresql-libpq, postgresql-simple, text, unliftio + }: + mkDerivation { + pname = "hs-opentelemetry-instrumentation-postgresql-simple"; + version = "0.0.1.0"; + sha256 = "1rz2gdaq1dwrnghbmrx58nza2g9h6z2pi5rnl6hzv6n1sm6i80rx"; + libraryHaskellDepends = [ + base bytestring hs-opentelemetry-api iproute network + postgresql-libpq postgresql-simple text unliftio + ]; + testHaskellDepends = [ + base bytestring hs-opentelemetry-api iproute network + postgresql-libpq postgresql-simple text unliftio + ]; + license = lib.licenses.bsd3; + }) {}; + "hs-opentelemetry-instrumentation-wai" = callPackage ({ mkDerivation, base, bytestring, hs-opentelemetry-api, http-types , iproute, network, text, vault, wai }: mkDerivation { pname = "hs-opentelemetry-instrumentation-wai"; - version = "0.0.1.1"; - sha256 = "1pc3m8sw7nymcx3f3ys24hby9j6g874ijxr7lnxmp8iis3l0kd3d"; + version = "0.0.1.2"; + sha256 = "1yxy49cacldbic67ic35ym48zd0c1cwx1cjh6l0fxn26yvjp1i68"; libraryHaskellDepends = [ base bytestring hs-opentelemetry-api http-types iproute network text vault wai @@ -140831,8 +141044,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-instrumentation-yesod"; - version = "0.0.1.1"; - sha256 = "0wavva2amc439qa7zjf9q323dcpjg1kcbgzbhw71wljywjv9g9xg"; + version = "0.0.1.2"; + sha256 = "01rcd2mxm7g0c9sqw0m4z779py4d7p3zq01yw2499yhn75c9akya"; libraryHaskellDepends = [ base hs-opentelemetry-api hs-opentelemetry-instrumentation-wai microlens mtl template-haskell text unliftio wai yesod-core @@ -140862,8 +141075,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-propagator-w3c"; - version = "0.0.1.1"; - sha256 = "02jxrfx7jccbd8n2w3brnz4dzhabysrrbsps77xhpma7dpfmgq5q"; + version = "0.0.1.2"; + sha256 = "1z4f7hsdbp6gr2ymbrvfkb0ynzy8kxfwpcyl2718qib7m2qjyysz"; libraryHaskellDepends = [ attoparsec base bytestring hs-opentelemetry-api http-types text ]; @@ -140883,8 +141096,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-sdk"; - version = "0.0.2.0"; - sha256 = "0kph4vqapk15c833kakvk9nl2v07sa8cwy6bj2graini386f04d5"; + version = "0.0.3.0"; + sha256 = "0z9fwppsgyrw56r4fcb0ds06rvn2vskmc3l7fhkdb47j71fill58"; libraryHaskellDepends = [ async base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-w3c @@ -151114,10 +151327,8 @@ self: { }: mkDerivation { pname = "hzenity"; - version = "0.4"; - sha256 = "1zyj7wnjcmv5pmgzn6cgly2zalys5i9waik17b4n46kk38f2pv1i"; - revision = "1"; - editedCabalFile = "11b7zavg3d84w8iypikvp8n4yy0d084j9qvifjh9yny2m64w5xav"; + version = "0.4.1"; + sha256 = "1fpjbkdqbx052c4975gg7qdb97gh3dhvv7dc550f7ka5bii97d4k"; libraryHaskellDepends = [ base containers data-default process process-extras text time ]; @@ -155033,8 +155244,8 @@ self: { pname = "intern"; version = "0.9.4"; sha256 = "00c74apc2ap1pjxmzk1c975zzqrc94p69l7v1fvfakv87mbrg8j0"; - revision = "1"; - editedCabalFile = "0xkv6g1aadm5biiqvbfp8f9jsr75prs5aqbhmcskq7s475p1fglp"; + revision = "2"; + editedCabalFile = "1jd429wyh11py7yd95zgaqf3djwvmqznslanlp7jcbrv8ag3dyg8"; libraryHaskellDepends = [ array base bytestring hashable text unordered-containers ]; @@ -156966,8 +157177,8 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "isocline"; - version = "1.0.5"; - sha256 = "05amznscn43vscz3b9rnb2scryriq0gccjx5z5fk1wn47i3dz6vg"; + version = "1.0.6"; + sha256 = "0yxnylxmim43a4gc8hnz32gv3p1mzfx5v0j0pn2frn3xhjx9mxhn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring text ]; @@ -160362,8 +160573,8 @@ self: { }: mkDerivation { pname = "jsonrpc-conduit"; - version = "0.3.7"; - sha256 = "0i1anr471rm7wil2l62mcwkqsyd62zwcgc0rb3iblr64bjd6kl80"; + version = "0.3.8"; + sha256 = "196w8jmb8107shbrdhr17axl6x2sx088hdys2yfpqmrcsxc77z45"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra mtl text transformers unordered-containers @@ -161257,6 +161468,8 @@ self: { pname = "kansas-comet"; version = "0.4.1"; sha256 = "1j54rsqna8xrw1si8i74v0c9k4jjv8a2q001aa8sx4rxb7d1qbzy"; + revision = "1"; + editedCabalFile = "12mg3hb54x680mzyp39bdbhfpjfav531ap02gvsr4k46jvfg0i2p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -162329,8 +162542,8 @@ self: { }: mkDerivation { pname = "keid-core"; - version = "0.1.3.1"; - sha256 = "0q9zrdqfbgyi6gjm8g0nhv74rbz2r56v4hlkqp89vs93sws5pnsy"; + version = "0.1.4.0"; + sha256 = "10jdkcp256q1n63v0pqqml9nvq0fp3paww2fy742f5xvyid927qr"; libraryHaskellDepends = [ adjunctions base binary bytestring cryptohash-md5 derive-storable derive-storable-plugin distributive file-embed foldl geomancy @@ -162368,8 +162581,8 @@ self: { }: mkDerivation { pname = "keid-render-basic"; - version = "0.1.3.0"; - sha256 = "15cp34k0kmis9wf5r8x2pfihl263fjwmwfkpi9fn7p5snn36pc28"; + version = "0.1.4.0"; + sha256 = "0dyhainb14q3gi1spdfsz31yf6xiisjyp06hzxrqz3q5fg7in0c9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ adjunctions aeson base bytestring derive-storable @@ -162401,14 +162614,15 @@ self: { }) {}; "keid-sound-openal" = callPackage - ({ mkDerivation, base, keid-core, OpenAL, opusfile, resourcet, rio + ({ mkDerivation, base, keid-core, openal-ffi, opusfile, resourcet + , rio }: mkDerivation { pname = "keid-sound-openal"; - version = "0.1.1.0"; - sha256 = "1bzx73wm8xf9nbw0771dl6fsq31lg1nxqg20sr14cglbvmpjiscb"; + version = "0.2.0.0"; + sha256 = "1dnpyghydxlh3158psliz76s213jlxz21lf7ps3cw22crf9c8hr5"; libraryHaskellDepends = [ - base keid-core OpenAL opusfile resourcet rio + base keid-core openal-ffi opusfile resourcet rio ]; description = "OpenAL sound system for Keid engine"; license = lib.licenses.bsd3; @@ -162422,8 +162636,8 @@ self: { }: mkDerivation { pname = "keid-ui-dearimgui"; - version = "0.1.0.1"; - sha256 = "1b731r5q8bjpiy84kfzy30pn4wppak1m1zx2ssicdl86181wva1l"; + version = "0.1.1.0"; + sha256 = "10ivrkbhnd9kwrwywspaj0z2agrddjrf4cv4rxpij28xrhj5jbav"; libraryHaskellDepends = [ base binary bytestring dear-imgui GLFW-b keid-core resourcet rio rio-app unliftio vector vulkan vulkan-utils VulkanMemoryAllocator @@ -165096,6 +165310,8 @@ self: { pname = "language-c-quote"; version = "0.13"; sha256 = "02axz6498sg2rf24qds39n9gysc4lm3v354h2qyhrhadlfq8sf6d"; + revision = "1"; + editedCabalFile = "1vl92h4z294ycg87140qk7v40r7vz43n8anpd2w1jdnwd6w4f4m3"; libraryHaskellDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -167974,6 +168190,8 @@ self: { pname = "lens"; version = "5.1"; sha256 = "1g9mwfs0vs0kq6affrdl07z2zkl39pd2362vn9iycpwr3bg2284j"; + revision = "1"; + editedCabalFile = "1gr096bpap1v2s08fz91plampxgx3ka8ylacnrp7xcwz7dhnpm1c"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -168032,6 +168250,8 @@ self: { pname = "lens-aeson"; version = "1.1.3"; sha256 = "05jyn6rn0anhgfmk754gmmpcy5jv3ki213z4v243n9jvdjdlg7ms"; + revision = "1"; + editedCabalFile = "0l1hkkpp4blkhmbpswl6lqww6wpfm327f8knq1lskhnisbnfmj2j"; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text unordered-containers vector @@ -168500,6 +168720,8 @@ self: { pname = "lentil"; version = "1.5.3.2"; sha256 = "0knc3g5n6h0yzr0kpgmgk44kbwh200qafjdvwpca92n3s0wf76py"; + revision = "1"; + editedCabalFile = "07f2bmplq73fvr2qylaz5w1p5ma20nrs32jwf1gbndp3cqklwjzi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -169906,6 +170128,20 @@ self: { broken = true; }) {}; + "libxlsxwriter-hs" = callPackage + ({ mkDerivation, base, bytestring, xlsxwriter }: + mkDerivation { + pname = "libxlsxwriter-hs"; + version = "0.1.0"; + sha256 = "00mmqzmmk8nmvvaqn6paq0s4kk5fbrxr1h5n4wd5fkhb4nizsj5s"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ xlsxwriter ]; + description = "Bindings to libxlsxwriter"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {xlsxwriter = null;}; + "libxml" = callPackage ({ mkDerivation, base, bytestring, libxml2, mtl }: mkDerivation { @@ -170299,8 +170535,8 @@ self: { }: mkDerivation { pname = "lifx-lan"; - version = "0.5.1.1"; - sha256 = "1rk1ln19hlcvs3g25pq4p136zxbd1lxi4pjfflngb691mvvb7ih6"; + version = "0.6.0.1"; + sha256 = "0fld72ndissfkpqzkzxvqgqqpjvii8slb5vdz4h9w5s1fzpz8rvj"; libraryHaskellDepends = [ base binary bytestring composition containers extra monad-loops mtl network random safe text time transformers @@ -172504,15 +172740,15 @@ self: { license = lib.licenses.mit; }) {}; - "literatex_0_2_0_0" = callPackage + "literatex_0_2_0_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, conduit , filepath, optparse-applicative, tasty, tasty-hunit, text, ttc , unliftio }: mkDerivation { pname = "literatex"; - version = "0.2.0.0"; - sha256 = "1j5x1hfh71jpywgwpbyir74h58b6lzaj7gpk2f07xlcwqmm68syz"; + version = "0.2.0.1"; + sha256 = "0rc8ks4z9sb99ziv1ancdypsbfhb7qpyi4ha76rmq4jhs7kznkcq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174801,8 +175037,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.13.0"; - sha256 = "1r4pni5hnf8vaxyv62jvq9dvhwalgzczhymm4w9ixfhncnr6znv4"; + version = "0.13.1"; + sha256 = "1cg2y15nz193s1mwm0c6x1z8nmdwv9n8qljl1a2irh3z3nb33sd2"; libraryHaskellDepends = [ aeson-pretty base-noprelude bimap bytestring constraints containers cryptonite data-default first-class-families fmt lens morley @@ -180423,8 +180659,8 @@ self: { }: mkDerivation { pname = "melf"; - version = "1.0.1"; - sha256 = "1k4174ssrj5d6qjj9fcxd8q586c96jpwzf4f19kqhv8w4mbpvfl0"; + version = "1.0.2"; + sha256 = "065nsazfsh8f6j2g80c2wppq5zm502ngwbn3lyzg2y42im4cdycx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -187094,25 +187330,25 @@ self: { "morley" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base-noprelude , base58-bytestring, binary, bytestring, constraints, containers - , cryptonite, data-default, elliptic-curve, first-class-families - , fmt, galois-field, generic-deriving, gitrev, haskeline, hex-text - , lens, megaparsec, memory, MonadRandom, morley-prelude, mtl, named - , optparse-applicative, pairing, parser-combinators, scientific - , semigroups, show-type, singletons, syb, template-haskell, text - , text-manipulate, th-lift, th-lift-instances, time, timerep - , uncaught-exception, unordered-containers, vector, vinyl - , with-utf8, wl-pprint-text + , crypto-sodium, cryptonite, data-default, elliptic-curve + , first-class-families, fmt, galois-field, generic-deriving, gitrev + , haskeline, hex-text, lens, megaparsec, memory, MonadRandom + , morley-prelude, mtl, named, optparse-applicative, pairing + , parser-combinators, scientific, semigroups, show-type, singletons + , syb, template-haskell, text, text-manipulate, th-lift + , th-lift-instances, time, timerep, uncaught-exception + , unordered-containers, vector, vinyl, with-utf8, wl-pprint-text }: mkDerivation { pname = "morley"; - version = "1.16.0"; - sha256 = "02ysr8qh0jgwz25nlwk88qxkpx3jsijd854i5dp9h19n5iibh7l8"; + version = "1.16.1"; + sha256 = "0kb4v5fwlxy80swqvjbrdc2qafiqrzw5zhihfjz4hc3vp5pcfizs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing aeson-pretty base-noprelude base58-bytestring - binary bytestring constraints containers cryptonite data-default - elliptic-curve first-class-families fmt galois-field + binary bytestring constraints containers crypto-sodium cryptonite + data-default elliptic-curve first-class-families fmt galois-field generic-deriving gitrev hex-text lens megaparsec memory MonadRandom morley-prelude mtl named optparse-applicative pairing parser-combinators scientific semigroups show-type singletons syb @@ -191119,8 +191355,8 @@ self: { }: mkDerivation { pname = "mysql-simple"; - version = "0.4.7"; - sha256 = "1mhmszpq64h8kxr20iaj1laq46wr2gaqc8xxq1k821i7jfxfld6j"; + version = "0.4.7.1"; + sha256 = "011pmniplphwzkv6chcnl2vljb2w4hc0iakdwlicykvrhx86nh3v"; libraryHaskellDepends = [ attoparsec base base16-bytestring blaze-builder blaze-textual bytestring containers mysql old-locale pcre-light text time @@ -195044,8 +195280,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "ngx-export-distribution"; - version = "0.3.0.0"; - sha256 = "0vxbrr82w8sw7fbp5nwi6ksfdlbgwqsdfzlyp72fx71dradqpbsx"; + version = "0.3.1.0"; + sha256 = "16yggqk02cs5s9iljllz4xh6grq829wxzpzidfi0276bmwmkdi1b"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "Build custom libraries for Nginx haskell module"; license = lib.licenses.bsd3; @@ -199777,6 +200013,19 @@ self: { broken = true; }) {}; + "openal-ffi" = callPackage + ({ mkDerivation, base, openal }: + mkDerivation { + pname = "openal-ffi"; + version = "0.0.1"; + sha256 = "14zhplwg66dpx78zyyx1wp1lqfqbwkcgjrkm94dfz25vykw71k0h"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ openal ]; + testHaskellDepends = [ base ]; + description = "Low-level bindings to OpenAL"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) openal;}; + "openapi-petstore" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, containers, deepseq, exceptions, hspec @@ -201512,6 +201761,8 @@ self: { pname = "optparse-generic"; version = "1.4.7"; sha256 = "03s6iwfr2iiypnx3wmnrb37zz7kflk40dj38v8j4ccqxkkf9h0kk"; + revision = "1"; + editedCabalFile = "0q3nq4qnsnx875a9vp08hgzhrbq463cdjdc4xlswcalip2qjw4y2"; libraryHaskellDepends = [ base bytestring Only optparse-applicative system-filepath text time transformers transformers-compat void @@ -202667,6 +202918,8 @@ self: { pname = "package-version"; version = "0.1.0.0"; sha256 = "1r1rw412f40ylnyhxjb04f2ch52wqqblm8979x92n8fd9jj3lr84"; + revision = "1"; + editedCabalFile = "165bhn0fv5ip5vcrnxv33i4a8mi7r0nhry1j3f7alh2mj0zck7xv"; libraryHaskellDepends = [ base deepseq prettyprinter safe-exceptions template-haskell text ]; @@ -203117,6 +203370,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "pagure" = callPackage + ({ mkDerivation, aeson, base, http-query, text }: + mkDerivation { + pname = "pagure"; + version = "0.1.0"; + sha256 = "1g5b0y0cv3yzdpza2750aj5zxagwdy189sqb4bvr0rrjbfgxrjv8"; + libraryHaskellDepends = [ aeson base http-query text ]; + description = "Pagure REST client library"; + license = lib.licenses.gpl2Only; + }) {}; + "pagure-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, http-conduit , lens, lens-aeson, optparse-applicative, simple-cmd-args, text @@ -203709,8 +203973,8 @@ self: { }: mkDerivation { pname = "pandoc-lua-marshal"; - version = "0.1.2"; - sha256 = "13w9wp5gq0mici6faf2shpwbm7a7akh4h4gvkhki88kj4sbfvikp"; + version = "0.1.3"; + sha256 = "0x4r0w2gavphc5f6yr4szb31blsvw3hdyackwza8dmzag952nc9k"; libraryHaskellDepends = [ base bytestring containers exceptions hslua hslua-marshalling lua pandoc-types safe text @@ -204021,8 +204285,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.4.8"; - sha256 = "0ifhigbvx24j8xg4h90xc2lfpzlb04ndlqyvym2gbmh8rmg87bjd"; + version = "0.4.9"; + sha256 = "0z02q7bxrrij4vls3gpxg34z47y2ijapjwagw6aw8dpsn75hj798"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -204031,8 +204295,8 @@ self: { ({ mkDerivation, ghc-prim, pandora }: mkDerivation { pname = "pandora-io"; - version = "0.4.7"; - sha256 = "1kdm9g651g0836q2rc8ahqa9ys72xsy8z1ssawf4d339f8id83v5"; + version = "0.4.9"; + sha256 = "1ni4xwmdx741r53n5dbpzrmczs75qq9v9kg6jka87q6mpl1879r1"; libraryHaskellDepends = [ ghc-prim pandora ]; description = "..."; license = lib.licenses.mit; @@ -205662,8 +205926,8 @@ self: { pname = "parsers"; version = "0.12.10"; sha256 = "0v0smxbzk1qpdfkfqqmrzd2dngv3vxba10mkjn9nfm6a309izf8p"; - revision = "1"; - editedCabalFile = "15pcq6iz3mbcwlknzxxfgd1myhyl41fs4j3m80pkif6dm5g18rv3"; + revision = "2"; + editedCabalFile = "0m6nnr3hif3iwvl7d0ikh04l6varkqzwkd6vqgycvvvsjgdl1gcs"; libraryHaskellDepends = [ attoparsec base base-orphans binary charset containers mtl parsec scientific semigroups text transformers unordered-containers @@ -206414,7 +206678,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "path_0_9_1" = callPackage + "path_0_9_2" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions , filepath, genvalidity, genvalidity-hspec, genvalidity-property , hashable, hspec, mtl, QuickCheck, template-haskell, text @@ -206422,8 +206686,8 @@ self: { }: mkDerivation { pname = "path"; - version = "0.9.1"; - sha256 = "0n0mp0cs2abybhpbrj1xgdcllcrxnjpw0c663aapm48irrq1fjbf"; + version = "0.9.2"; + sha256 = "15xxsjdxxqxnh20iqhprbdyhldk2igl5gd4ld6hhk9nqgwqdcr0f"; libraryHaskellDepends = [ aeson base deepseq exceptions filepath hashable template-haskell text @@ -207200,15 +207464,15 @@ self: { license = lib.licenses.asl20; }) {}; - "pcre2_2_0_3" = callPackage + "pcre2_2_0_4" = callPackage ({ mkDerivation, base, containers, criterion, hspec, microlens , microlens-platform, mtl, pcre-light, regex-pcre-builtin , template-haskell, text }: mkDerivation { pname = "pcre2"; - version = "2.0.3"; - sha256 = "0fcgaf1w5y2mwki4zp4yx2a65g7aqqrpmrrjdjybwz37bp5hzihs"; + version = "2.0.4"; + sha256 = "15zbwsv4kic58znngw1ff8vxqjqqglsds9xnn1s4f9hnzd87vwx2"; libraryHaskellDepends = [ base containers microlens mtl template-haskell text ]; @@ -207225,6 +207489,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "pdc" = callPackage + ({ mkDerivation, aeson, base, http-query, text, time }: + mkDerivation { + pname = "pdc"; + version = "0.1.1"; + sha256 = "1013nvvsrajjp38kb78gzhkjgav80lrlq966nijxhqd4k6bsm7qc"; + libraryHaskellDepends = [ aeson base http-query text time ]; + description = "Fedora Product Definition Center service"; + license = lib.licenses.mit; + }) {}; + "pdf-slave" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, directory, exceptions, haskintex, HaTeX @@ -210083,8 +210358,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.15.2.1"; - sha256 = "0ag3nnmfipngc9xf70s5dla84ynab9r9ipswrxcxyga5mx5zw1da"; + version = "0.15.2.2"; + sha256 = "1cbq9jz86vf4q2qk45df6dfjxykvnvxrcim52z3108wa4xvhxvmf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214420,17 +214695,17 @@ self: { }) {}; "polysemy-log" = callPackage - ({ mkDerivation, ansi-terminal, base, polysemy, polysemy-conc - , polysemy-test, polysemy-time, relude, tasty, template-haskell - , text, time + ({ mkDerivation, ansi-terminal, async, base, polysemy + , polysemy-conc, polysemy-test, polysemy-time, relude, tasty + , template-haskell, text, time }: mkDerivation { pname = "polysemy-log"; - version = "0.4.0.0"; - sha256 = "0jizgwd1vjhdn2m4d2xdhzawmdblvhk12v6blcnyxm94nab215li"; + version = "0.4.2.0"; + sha256 = "106b9y3apffc84k9idb1vmfjjfwjww4xlpqn4mphrf7w2cxyn6gv"; libraryHaskellDepends = [ - ansi-terminal base polysemy polysemy-conc polysemy-time relude - template-haskell text time + ansi-terminal async base polysemy polysemy-conc polysemy-time + relude template-haskell text time ]; testHaskellDepends = [ base polysemy polysemy-conc polysemy-test polysemy-time tasty time @@ -214446,8 +214721,8 @@ self: { }: mkDerivation { pname = "polysemy-log-co"; - version = "0.4.0.0"; - sha256 = "0c778m2ibs09aw9lv2a7xs3ywj0c8agnpx3vg114dh1ndbvcyhl5"; + version = "0.4.2.0"; + sha256 = "03ipk2085zr3mm7m2qyiixxf4gpmv0bbyw1s1ykqngh7f6d6f2pp"; libraryHaskellDepends = [ base co-log co-log-core co-log-polysemy polysemy polysemy-conc polysemy-log polysemy-time @@ -214467,8 +214742,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.4.0.0"; - sha256 = "0dnprxjafy2jy7mlj4h6jh456mys4af467kagdvbv8kllc66rrsc"; + version = "0.4.2.0"; + sha256 = "0kmrwyfsldpaafkimfi4plx6ngppq0jj5mhrpknfg5v2ca9j691k"; libraryHaskellDepends = [ base di-polysemy polysemy polysemy-conc polysemy-log polysemy-time ]; @@ -218904,7 +219179,7 @@ self: { license = lib.licenses.mit; }) {}; - "primitive-extras_0_10_1_2" = callPackage + "primitive-extras_0_10_1_3" = callPackage ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus , foldl, list-t, primitive, primitive-unlifted, profunctors , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit @@ -218912,8 +219187,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.10.1.2"; - sha256 = "0517ln7ihsqb15m0h0nw9qjh73kdwcc2nkg9n39hnmhiw4im9d1i"; + version = "0.10.1.3"; + sha256 = "03i65knf4fkhai1668k5vlpa7z8jdvwy9kay4i4qr2l013qx29yf"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive primitive-unlifted profunctors vector @@ -221106,33 +221381,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "protobuf_0_2_1_4" = callPackage - ({ mkDerivation, base, base-orphans, binary, bytestring, containers - , criterion, data-binary-ieee754, deepseq, hex, HUnit, mtl - , QuickCheck, semigroups, tagged, tasty, tasty-hunit - , tasty-quickcheck, text, unordered-containers - }: - mkDerivation { - pname = "protobuf"; - version = "0.2.1.4"; - sha256 = "0qcnhj0ryaz4naqkqc7gankgwb6r7psl3njk7f6vi3l2y88ssa4v"; - libraryHaskellDepends = [ - base base-orphans binary bytestring data-binary-ieee754 deepseq mtl - semigroups text unordered-containers - ]; - testHaskellDepends = [ - base binary bytestring containers hex HUnit mtl QuickCheck tagged - tasty tasty-hunit tasty-quickcheck text unordered-containers - ]; - benchmarkHaskellDepends = [ - base binary bytestring containers criterion deepseq hex mtl tagged - text unordered-containers - ]; - description = "Google Protocol Buffers via GHC.Generics"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "protobuf-native" = callPackage ({ mkDerivation, base, bytestring, cereal, cplusplus-th, criterion , hprotoc-fork, protobuf, protocol-buffers-fork, QuickCheck @@ -222680,8 +222928,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.1.0.7"; - sha256 = "0dk3m4gxcifarmn8l92bqlpn1n6fdmryjazspj0nm1a6r0zc1q9p"; + version = "2.1.0.8"; + sha256 = "16m9yqjyhafbfiiq6nn7d525sw27v5i8ib930ik8xjhm0pq10fbg"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -228657,8 +228905,8 @@ self: { pname = "reducers"; version = "3.12.4"; sha256 = "0hsycdir52jdijnnvc77jj971fjrrc722v952wr62ivrvx2zarn0"; - revision = "1"; - editedCabalFile = "0i5mvhfp5b6dmmk8l93492cyjxn6n9dncmijpbp4hbqi40pr9g47"; + revision = "2"; + editedCabalFile = "1ji6rp0f857d0vp2kjqcck7avrjgqvqjgwnhdcxs3zbjkwpqyhfb"; libraryHaskellDepends = [ array base bytestring containers fingertree hashable semigroupoids text transformers unordered-containers @@ -229093,10 +229341,8 @@ self: { }: mkDerivation { pname = "reflex-dom"; - version = "0.6.1.0"; - sha256 = "190g56y16xvj508qdp3znlbbv4gb3ska38jbjpblvq8cz2d4nkdc"; - revision = "1"; - editedCabalFile = "0xi2bn6d4bgbfqngl2y9gva4nxii65v3hzrik74wzdsf17wyrmv9"; + version = "0.6.1.1"; + sha256 = "0ykkzmzxiznd09sgmjwzmbrpnm8gr2bd57hzdl8avrr728bwj8ga"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229177,8 +229423,8 @@ self: { }: mkDerivation { pname = "reflex-dom-core"; - version = "0.6.2.1"; - sha256 = "1xqb0m1p2x8s2x98j9nlq707p92gdjby9k925l13bly3rh1kk4y4"; + version = "0.6.3.0"; + sha256 = "0w3vn5in594rslv3lfw5sgbs2phh7f9f3q9sxpqbjqvcscll5rpg"; libraryHaskellDepends = [ aeson base bifunctors bimap blaze-builder bytestring case-insensitive constraints containers contravariant data-default @@ -230294,8 +230540,8 @@ self: { pname = "regex-tdfa"; version = "1.3.1.1"; sha256 = "1msrq31k4jmn2lmrdzn87jqarqhw265ca69rfg5jpa5adrzm3gmi"; - revision = "1"; - editedCabalFile = "02gwf740vs0jy3l6dgw72r8c04yggshia6w16n140ncpsici8c4r"; + revision = "2"; + editedCabalFile = "06zs654j7lrap69fqvmsas7f9x50kbxba7qzq4yihd94f03ba911"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; @@ -235013,18 +235259,18 @@ self: { "rocksdb-haskell-jprupp" = callPackage ({ mkDerivation, base, bytestring, data-default, directory, hspec - , QuickCheck, rocksdb, string-conversions, unliftio + , QuickCheck, resourcet, rocksdb, string-conversions, unliftio }: mkDerivation { pname = "rocksdb-haskell-jprupp"; - version = "2.1.3"; - sha256 = "01hn77v6qjj6dx2g3ddff5q1b3wj0yqplhmxs1c8hndbn5alk0pv"; + version = "2.1.4"; + sha256 = "0c647kahnglwf881hd3ksan1p7j4m65s84wyw8i4jvikm4jzgqsh"; libraryHaskellDepends = [ - base bytestring data-default directory unliftio + base bytestring data-default directory resourcet unliftio ]; librarySystemDepends = [ rocksdb ]; testHaskellDepends = [ - base bytestring data-default directory hspec QuickCheck + base bytestring data-default directory hspec QuickCheck resourcet string-conversions unliftio ]; description = "Haskell bindings for RocksDB"; @@ -238584,10 +238830,6 @@ self: { testSystemDepends = [ z3 ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; - platforms = [ - "aarch64-darwin" "armv7l-linux" "i686-linux" "x86_64-darwin" - "x86_64-linux" - ]; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) z3;}; @@ -238622,10 +238864,6 @@ self: { ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; - platforms = [ - "aarch64-darwin" "armv7l-linux" "i686-linux" "x86_64-darwin" - "x86_64-linux" - ]; }) {inherit (pkgs) z3;}; "sbv_8_17" = callPackage @@ -238659,10 +238897,6 @@ self: { ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; - platforms = [ - "aarch64-darwin" "armv7l-linux" "i686-linux" "x86_64-darwin" - "x86_64-linux" - ]; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) z3;}; @@ -241932,8 +242166,8 @@ self: { ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "sendfile"; - version = "0.7.11.1"; - sha256 = "0988snmx3bylpw3kcq8hsgji8idc6xcrcfp275qjv3apfdgc9rp0"; + version = "0.7.11.4"; + sha256 = "1i2i0w18l2ysambyylv93jzy0adiiqwwnhg7zagqb7p2srybxc3k"; libraryHaskellDepends = [ base bytestring network ]; description = "A portable sendfile library"; license = lib.licenses.bsd3; @@ -243978,8 +244212,8 @@ self: { }: mkDerivation { pname = "servant-lucid"; - version = "0.9.0.3"; - sha256 = "10g7radhkh50hpwf97syh3kpdacw096bnawni0hwwbi6rfgz38nm"; + version = "0.9.0.4"; + sha256 = "1m02z60l1knzpcc41ccqmg8fblg2wzdn60vy3cwjbk15girjpxaw"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -245156,23 +245390,23 @@ self: { }) {}; "servant-util" = callPackage - ({ mkDerivation, aeson, base, containers, data-default, fmt, hspec - , hspec-discover, hspec-expectations, http-client, http-types - , insert-ordered-containers, lens, megaparsec, mtl, pretty-terminal - , QuickCheck, reflection, regex-posix, safe-exceptions, servant - , servant-client, servant-client-core, servant-server - , servant-swagger, servant-swagger-ui, servant-swagger-ui-core - , swagger2, text, text-format, time, universum, wai, wai-extra - , warp + ({ mkDerivation, aeson, base, constraints, containers, data-default + , fmt, hspec, hspec-discover, hspec-expectations, http-client + , http-types, insert-ordered-containers, lens, megaparsec, mtl + , pretty-terminal, QuickCheck, reflection, regex-posix + , safe-exceptions, servant, servant-client, servant-client-core + , servant-server, servant-swagger, servant-swagger-ui + , servant-swagger-ui-core, swagger2, text, text-format, time + , universum, wai, wai-extra, warp }: mkDerivation { pname = "servant-util"; - version = "0.1.0.2"; - sha256 = "1l0pwwz8y4qwnpn30w3mla3j3dmbyv99kilbb8z283iwpnbgrn2w"; + version = "0.2"; + sha256 = "0c4zfch99rsjfljy990q2f7icxcn0h16v37j6h8fbwbg5cwdn702"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base containers data-default fmt http-types + aeson base constraints containers data-default fmt http-types insert-ordered-containers lens megaparsec mtl pretty-terminal QuickCheck reflection regex-posix safe-exceptions servant servant-client servant-client-core servant-server servant-swagger @@ -245180,7 +245414,7 @@ self: { text-format time universum wai ]; executableHaskellDepends = [ - aeson base containers data-default fmt http-types + aeson base constraints containers data-default fmt http-types insert-ordered-containers lens megaparsec mtl pretty-terminal QuickCheck reflection regex-posix safe-exceptions servant servant-client servant-client-core servant-server servant-swagger @@ -245188,13 +245422,13 @@ self: { text-format time universum wai wai-extra warp ]; testHaskellDepends = [ - aeson base containers data-default fmt hspec hspec-expectations - http-client http-types insert-ordered-containers lens megaparsec - mtl pretty-terminal QuickCheck reflection regex-posix - safe-exceptions servant servant-client servant-client-core - servant-server servant-swagger servant-swagger-ui - servant-swagger-ui-core swagger2 text text-format time universum - wai warp + aeson base constraints containers data-default fmt hspec + hspec-expectations http-client http-types insert-ordered-containers + lens megaparsec mtl pretty-terminal QuickCheck reflection + regex-posix safe-exceptions servant servant-client + servant-client-core servant-server servant-swagger + servant-swagger-ui servant-swagger-ui-core swagger2 text + text-format time universum wai warp ]; testToolDepends = [ hspec-discover ]; description = "Servant servers utilities"; @@ -245209,8 +245443,8 @@ self: { }: mkDerivation { pname = "servant-util-beam-pg"; - version = "0.1.0.2"; - sha256 = "048ybnlkhp7dabki4r3k6q147cdm3w3l14c57rrf1n1vf4rwkgn2"; + version = "0.2"; + sha256 = "0g3vv4hyylnzflhx70dcr3k023xf04a8c07v2jf1v4bf6c21f8dh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245229,6 +245463,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Implementation of servant-util primitives for beam-postgres"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "servant-validate" = callPackage @@ -246907,10 +247143,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.25"; - sha256 = "1fjv3yg425d87d3dih0l3ff95g5a5yp9w85m58sjara6xqivj9s4"; - revision = "1"; - editedCabalFile = "0na31a7h3sq8ndrx79waywsfj5667pm0masy10gxzhzwmf6i3s1l"; + version = "2.0.25.1"; + sha256 = "183dvpwvlivrkgdijga3gbywqlgg3qlbsjlc2q6cv22x8mnxmjgl"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -249665,8 +249899,8 @@ self: { }: mkDerivation { pname = "simpoole"; - version = "0.0.1"; - sha256 = "0wzmr1gj01vl37hwnwy03mq3ywhqxn0y25y2f0q1yky698yq87lw"; + version = "0.2.0"; + sha256 = "17hisyc7c4vff3nn69sk7xkkq2nj8l0zwq27zx1nfarwqf04g2ix"; libraryHaskellDepends = [ base concurrency containers exceptions time ]; @@ -254549,8 +254783,8 @@ self: { }: mkDerivation { pname = "sourcemap"; - version = "0.1.6.1"; - sha256 = "0kz8xpcd5syg5s4qa2qq8ylaxjhabj127w42may46vv6i0q1bf8a"; + version = "0.1.7"; + sha256 = "09i340mhzlfi5ayy9cb0378glnygdmpdhhsgikm3zrvwf2wmwr2h"; libraryHaskellDepends = [ aeson attoparsec base bytestring process text unordered-containers utf8-string @@ -255564,6 +255798,8 @@ self: { pname = "splaytree"; version = "0.1.5"; sha256 = "0jilqkgp1mk6sllxhigp1sidnp7amgsfdmxf23r0l69hp0w4dcm7"; + revision = "1"; + editedCabalFile = "05a2lwcy83jjq71zfhddg2r3888yqqj8yzwkdf01ir5xlryyr9lw"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base containers QuickCheck test-framework @@ -260012,21 +260248,6 @@ self: { }) {}; "streaming" = callPackage - ({ mkDerivation, base, containers, ghc-prim, mmorph, mtl - , transformers, transformers-base - }: - mkDerivation { - pname = "streaming"; - version = "0.2.3.0"; - sha256 = "0qpxz9hkk31k64w98pdnz8qjgxvcznzfwc8d7pvakrnf3zp8w05l"; - libraryHaskellDepends = [ - base containers ghc-prim mmorph mtl transformers transformers-base - ]; - description = "an elementary streaming prelude and general stream type"; - license = lib.licenses.bsd3; - }) {}; - - "streaming_0_2_3_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, mmorph, mtl , QuickCheck, transformers, transformers-base }: @@ -260040,7 +260261,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "an elementary streaming prelude and general stream type"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "streaming-attoparsec" = callPackage @@ -263844,8 +264064,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.10.0.8"; - sha256 = "1a7iz3d78r00mgkq370zy5fxjkb5x34c9iq3kc3gbl6hs6m6l579"; + version = "0.10.0.9"; + sha256 = "1l9mz4gxrdjy2z5rz7vbmp80jq9x2hwhccd5360yh6ljm8glf4y6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -264043,7 +264263,7 @@ self: { license = "unknown"; }) {}; - "sydtest_0_7_0_0" = callPackage + "sydtest_0_7_0_1" = callPackage ({ mkDerivation, async, autodocodec, autodocodec-yaml, base , bytestring, containers, Diff, dlist, envparse, filepath , MonadRandom, mtl, optparse-applicative, path, path-io @@ -264053,8 +264273,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.7.0.0"; - sha256 = "16lgys2l3ywai85mf80r212l3m15mbd4a2zgg8wpmn98d798qjr1"; + version = "0.7.0.1"; + sha256 = "09qvl0j8bx5v1i8mvvmzkfaxj7jrcbpbkxrnjcanml60dfp0s444"; libraryHaskellDepends = [ async autodocodec autodocodec-yaml base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path @@ -265900,10 +266120,8 @@ self: { }: mkDerivation { pname = "systemd-socket-activation"; - version = "1"; - sha256 = "10y7g2y62v48n6zkpgpjqyf2a7fqm8d9mx24vcwk6bcxkq1bciz2"; - revision = "1"; - editedCabalFile = "084phqk9wb0slsmb7pj68nivhjx3w6hs0djq589j771v579vck0r"; + version = "1.0.0.1"; + sha256 = "1czps42qaxghg3mbr7v847j1yqgk79lbx1b5dmi5mnyg3869dq81"; libraryHaskellDepends = [ base containers network text transformers unix ]; @@ -270714,8 +270932,8 @@ self: { }: mkDerivation { pname = "testcontainers"; - version = "0.3.0.1"; - sha256 = "01qqinmjy6mvfnszq2br459xfcx9jg5ycs0dfmpqg3wxfi826kx6"; + version = "0.3.1.0"; + sha256 = "0gkspiz9vzaa02f6fnp6xv8xqgxnv73j50gh90z4hcbprcqgayk8"; libraryHaskellDepends = [ aeson aeson-optics base bytestring exceptions mtl network optics-core process resourcet tasty text unliftio-core @@ -270944,28 +271162,27 @@ self: { broken = true; }) {}; - "text_1_2_5_0" = callPackage - ({ mkDerivation, array, base, binary, bytestring, bytestring-lexing - , containers, deepseq, directory, filepath, ghc-prim, QuickCheck - , quickcheck-unicode, random, stringsearch, tasty, tasty-bench - , tasty-hunit, tasty-inspection-testing, tasty-quickcheck - , template-haskell, transformers, vector + "text_2_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-prim, QuickCheck, tasty + , tasty-bench, tasty-hunit, tasty-inspection-testing + , tasty-quickcheck, template-haskell, transformers }: mkDerivation { pname = "text"; - version = "1.2.5.0"; - sha256 = "0wwgsq7px8cvmqj3264132xsbj6b92j6mfgd1jlk08vdl8hmx821"; + version = "2.0"; + sha256 = "15pcs9wdd0jjh4k2qis1s8bny14s0x85nys9i25nwr4a6xxpi6fm"; libraryHaskellDepends = [ array base binary bytestring deepseq ghc-prim template-haskell ]; testHaskellDepends = [ - base bytestring deepseq directory QuickCheck quickcheck-unicode - random tasty tasty-hunit tasty-inspection-testing tasty-quickcheck + base bytestring deepseq directory ghc-prim QuickCheck tasty + tasty-hunit tasty-inspection-testing tasty-quickcheck template-haskell ]; benchmarkHaskellDepends = [ - base binary bytestring bytestring-lexing containers deepseq - filepath stringsearch tasty-bench transformers vector + base bytestring containers deepseq directory filepath tasty-bench + transformers ]; doCheck = false; description = "An efficient packed Unicode text type"; @@ -271699,7 +271916,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-show_3_9_3" = callPackage + "text-show_3_9_4" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers, criterion , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim @@ -271709,8 +271926,8 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.9.3"; - sha256 = "0vn1qp1knwa2vr5v75bims0lqyi073d98axibbv2mr3cp3348xhn"; + version = "3.9.4"; + sha256 = "0wskjfyb3nn6dkd6h0zakiy71qkhgmin636qrmryqbv3q7172yfq"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -271778,6 +271995,8 @@ self: { pname = "text-show-instances"; version = "3.8.6"; sha256 = "1jg1wsjnp6q68nsynwzw26s4akr0d9a4frd9dvnddalm2c6vdwaz"; + revision = "1"; + editedCabalFile = "1xikz6yviivafckm6ri0abm60z2qkgmqkc7gnjxhicfhbnnqpbbi"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -272530,8 +272749,8 @@ self: { }: mkDerivation { pname = "th-lego"; - version = "0.2.3"; - sha256 = "1c2q1gz04072kh2dxs22hqvcjkfq66ylixl0631wnlmvivbm2ahz"; + version = "0.3"; + sha256 = "0shwmh8anzrgifk0z2ypdkp7f0sz9p4azfjj1rcnz0px1wmhz9xn"; libraryHaskellDepends = [ base template-haskell template-haskell-compat-v0208 text ]; @@ -273508,8 +273727,8 @@ self: { pname = "through-text"; version = "0.1.0.0"; sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk"; - revision = "7"; - editedCabalFile = "0cgh3sxd7ms5wdrrr174jf7pf6n7c66srpsmg3yk8h8msnrvw1qr"; + revision = "8"; + editedCabalFile = "1h55jhl5igpli19qirk0wv5gl7ihhw0glbha18xpghfz2z6fjwl3"; libraryHaskellDepends = [ base bytestring case-insensitive text ]; description = "Convert textual types through Text without needing O(n^2) instances"; license = lib.licenses.bsd3; @@ -273769,8 +273988,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.7.8"; - sha256 = "0l8k4f89rhmvd0ys7klgi57k0313ki1vr256mkc60xc6a6gb3g93"; + version = "1.7.9"; + sha256 = "1117qcmgjrhvijjqkkdrb003k3jymgr11dhcr67i1xw23v59a689"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc @@ -273784,6 +274003,34 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "tidal_1_7_10" = callPackage + ({ mkDerivation, async, base, bifunctors, bytestring, clock, colour + , containers, criterion, deepseq, exceptions, hint, hosc, microspec + , mtl, network, parsec, primitive, random, text, transformers + , weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.7.10"; + sha256 = "0vfymixr66sj6zsadkbcx0yx722f2d3q6cic4c91cswxssfqfrhc"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bifunctors bytestring clock colour containers deepseq + exceptions hosc mtl network parsec primitive random text + transformers + ]; + executableHaskellDepends = [ async base exceptions hint ]; + testHaskellDepends = [ + base containers deepseq hosc microspec parsec + ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers @@ -274830,8 +275077,8 @@ self: { }: mkDerivation { pname = "timezone-olson"; - version = "0.2.0"; - sha256 = "0b9vh27b9nz803yhd93d5z63bs370lvn4vkdajxaak9clxlw6mwg"; + version = "0.2.1"; + sha256 = "10f5843sza2ikj2sg9fjhf5dhnhcidad86cdjmrj1y6zclkiqmdc"; libraryHaskellDepends = [ base binary bytestring extensible-exceptions time timezone-series ]; @@ -274860,8 +275107,10 @@ self: { ({ mkDerivation, base, deepseq, time }: mkDerivation { pname = "timezone-series"; - version = "0.1.9"; - sha256 = "1blwgnyzqn917rgqkl4dncv9whv3xmk0lav040qq0214vksmvlz5"; + version = "0.1.13"; + sha256 = "18n6w7jxwlysq5mvb1sp1z57nyrsgn2ans642fy5rhmpwcavgvr8"; + revision = "1"; + editedCabalFile = "1ak05p8z1q2nispv1xw32j7lhfmf3sfj2ibjrxpm347s37fmxnwc"; libraryHaskellDepends = [ base deepseq time ]; description = "Enhanced timezone handling for Data.Time"; license = lib.licenses.bsd3; @@ -276039,25 +276288,26 @@ self: { }) {}; "tokstyle" = callPackage - ({ mkDerivation, aeson, array, base, bytestring, compact - , containers, deepseq, filepath, groom, hspec, language-c, mtl - , servant, servant-server, text, wai, wai-cors, wai-extra, warp + ({ mkDerivation, aeson, base, bytestring, cimple, containers + , deepseq, filepath, groom, hspec, hspec-discover, mtl, servant + , servant-server, text, wai, wai-cors, wai-extra, warp }: mkDerivation { pname = "tokstyle"; - version = "0.0.5"; - sha256 = "1b5s43srz8gyg2fajchsi7gzgk6q8vp269h8q7rzznrl8kxkvl5z"; + version = "0.0.8"; + sha256 = "04rdvyn49a6qbmdvjfk1901kpz4r4la1fikw6cffar3ga3p9sh67"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson array base bytestring compact containers deepseq filepath - groom language-c mtl text + aeson base bytestring cimple containers deepseq filepath groom mtl + text ]; executableHaskellDepends = [ - base bytestring groom servant servant-server text wai wai-cors + base bytestring cimple servant servant-server text wai wai-cors wai-extra warp ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base cimple hspec text ]; + testToolDepends = [ hspec-discover ]; description = "TokTok C code style checker"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; @@ -276505,8 +276755,8 @@ self: { ({ mkDerivation, base, filepath, hspec, profunctors, text }: mkDerivation { pname = "tophat"; - version = "1.0.5.0"; - sha256 = "1g8mwf734kc9gkvc8q67jj0bfsh1vi8qxdsr58jax64cxr6vlv95"; + version = "1.0.5.1"; + sha256 = "1y519agpn8ksybfakgg4n565w26mgr3kvpjk555pq5s6rb77wjdf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base profunctors text ]; @@ -279097,8 +279347,8 @@ self: { }: mkDerivation { pname = "ttc"; - version = "1.1.0.2"; - sha256 = "0i1jnign6xb0i4y5rkwz2rp2lj7q3r50i4bkjghz8i2djw2sd1cw"; + version = "1.1.1.0"; + sha256 = "04r2kv0wr7g4ahy3iqbbnihy0mh75pghqzsl9iiz60dpgdnfgafw"; libraryHaskellDepends = [ base bytestring template-haskell text ]; testHaskellDepends = [ base bytestring tasty tasty-hunit template-haskell text @@ -281591,8 +281841,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.8.1.1"; - sha256 = "10siihvba8c4zbwvw247zrx9z5v5sgr8vswjbbiw9gn7qdiq8ppa"; + version = "0.8.2.1"; + sha256 = "0km7bjziw5ypfyqg8shxxwmfnqbalin44sp1inv508cmi277im02"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -287660,8 +287910,8 @@ self: { }: mkDerivation { pname = "vector-builder"; - version = "0.3.8.2"; - sha256 = "1g1zxp6xcwcq3372a5qqs44cl09a48p21m1jsys5bsampprlmcgs"; + version = "0.3.8.3"; + sha256 = "0rajpk54n9anlqixxr2qn7qximhhy7qa4gg4czwmj5zl5ysj2br4"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ attoparsec QuickCheck quickcheck-instances rerebase tasty @@ -287794,8 +288044,8 @@ self: { }: mkDerivation { pname = "vector-extras"; - version = "0.2.3"; - sha256 = "13iiy6jdbp4fgdxhm7jhkr1hqilgmzwmfjyjna6a64vb20vr9xyr"; + version = "0.2.4"; + sha256 = "0aiycxljvwakvfigbm9wbg7b4jahd3ijckzgrfwdjpnxcqhjr0p9"; libraryHaskellDepends = [ base containers deferred-folds foldl hashable unordered-containers vector @@ -288382,6 +288632,21 @@ self: { broken = true; }) {}; + "verset" = callPackage + ({ mkDerivation, base, bytestring, containers, extra, mtl, safe + , text, time, uuid + }: + mkDerivation { + pname = "verset"; + version = "0.0.1.5"; + sha256 = "1bqbwjw5lpn6lxm5pqxk0v3ywnmrl8fmn4y0whby76xn2xspsl8b"; + libraryHaskellDepends = [ + base bytestring containers extra mtl safe text time uuid + ]; + description = "Small alternative prelude"; + license = lib.licenses.mit; + }) {}; + "versioning" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, semigroupoids }: mkDerivation { @@ -290086,8 +290351,8 @@ self: { }: mkDerivation { pname = "wai-feature-flags"; - version = "0.1.0.2"; - sha256 = "03w8hskgajvkhjsrj7ynxcx92qghqfd9rfxb5v4wm7wb6lag8qvh"; + version = "0.1.0.3"; + sha256 = "1w1n24w7wf3jxnlid437d4rva86vbhyvlrz8nq7z6bc3xi8bdlkz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -291033,6 +291298,8 @@ self: { pname = "wai-middleware-static"; version = "0.9.1"; sha256 = "0zf91kq5mdbdzi7rccyjrk5y4lpnwl8pb83wpcifr0gqp6a6avcy"; + revision = "1"; + editedCabalFile = "1r8vglmczbkz7x7dw943ah5zdf2zsnrkc1jn941axmnk9p6c959c"; libraryHaskellDepends = [ base bytestring containers cryptonite directory expiring-cache-map filepath http-types memory mime-types old-locale semigroups text @@ -294361,8 +294628,8 @@ self: { }: mkDerivation { pname = "witch"; - version = "0.3.4.1"; - sha256 = "12nrikciqg85lnkncdibs65z0psn93n68ljy1gvdiaxcbxzydswp"; + version = "0.3.4.2"; + sha256 = "1qrvr8ink179xq69gwawvph942hkv798kvy303si5l1vmni6skh3"; libraryHaskellDepends = [ base bytestring containers template-haskell text time ]; @@ -299635,8 +299902,8 @@ self: { pname = "yampa-canvas"; version = "0.2.3"; sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r"; - revision = "5"; - editedCabalFile = "0v17zrnlwcf8ggp0d3879qavnxz5cdnqyw292cl3dr038agkk8gf"; + revision = "6"; + editedCabalFile = "01daplf24d506lvgaxc69rhkd3idcyad9igqpb630k03gswvvpcl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -299919,8 +300186,8 @@ self: { pname = "yasi"; version = "0.1.2.1"; sha256 = "0647z79wva7apkp0swj7gax780vqmhr5czxrvg88gl3bi03wcapl"; - revision = "2"; - editedCabalFile = "1pn72i0177k1x1frl0k8lqkw2vxnq77vhs9kgmvg4r76mw2z2vkm"; + revision = "3"; + editedCabalFile = "0laibkj367wqnq95jiw1rca9b2jb5hanhvlclsdflyzg8kfknmhc"; libraryHaskellDepends = [ base bytestring template-haskell text ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit text diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix index 9fba39d70c..45dc35681c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.1053"; + version = "1.10.3.1058"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "p91+Ylx8HQL/o3Pq4Pd1c9GAMiOXvJSw+09LGYLj5Wo="; + sha256 = "guIQjiWyulITZZSjt/kCtU5qo4FG/2IK2rwBI6Ttfe0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/obb.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/obb.nix new file mode 100644 index 0000000000..9583be9239 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/obb.nix @@ -0,0 +1,83 @@ +{ lib +, stdenv +, fetchurl +, babashka +, cacert +, clojure +, git +, jdk +, obb +, fetchFromGitHub +, makeWrapper +, runCommand }: + +stdenv.mkDerivation rec { + pname = "obb"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "babashka"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-WxQjBg6el6XMiHTurmSo1GgZnTdaJjRmcV3+3X4yohc="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ babashka cacert git jdk ]; + + configurePhase = '' + runHook preConfigure + + mkdir -p .m2 + substituteInPlace deps.edn --replace ':paths' ':mvn/local-repo "./.m2" :paths' + substituteInPlace bb.edn --replace ':paths' ':mvn/local-repo "./.m2" :paths' + echo deps.edn + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + export DEPS_CLJ_TOOLS_DIR=${clojure} + export DEPS_CLJ_TOOLS_VERSION=${clojure.version} + mkdir -p .gitlibs + mkdir -p .cpcache + export GITLIBS=.gitlibs + export CLJ_CACHE=.cpcache + + bb build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + ln -s /usr/bin/osascript $out/bin/osascript + + install -Dm755 "out/bin/obb" "$out/bin/obb" + wrapProgram $out/bin/obb --prefix PATH : $out/bin + + runHook postInstall + ''; + + passthru.tests = { + simple = runCommand "${pname}-test" {} '' + [ $(${obb}/bin/obb -e '(+ 1 2)') = '3' ] + touch $out + ''; + }; + + meta = with lib; { + description = "Ad-hoc ClojureScript scripting of Mac applications via Apple's Open Scripting Architecture"; + homepage = "https://github.com/babashka/obb"; + license = licenses.epl10; + maintainers = with maintainers; [ + willcohen + ]; + platforms = platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix index 452d0edc3e..d41c0a3c1f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.dartlang.org/"; - maintainers = with maintainers; [ grburst thiagokokada flexagoon ]; + maintainers = with maintainers; [ grburst flexagoon ]; description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps"; longDescription = '' Dart is a class-based, single inheritance, object-oriented language diff --git a/third_party/nixpkgs/pkgs/development/libraries/LASzip/LASzip2.nix b/third_party/nixpkgs/pkgs/development/libraries/LASzip/LASzip2.nix index b080153826..4f63dfe805 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/LASzip/LASzip2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/LASzip/LASzip2.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { version = "2.2.0"; pname = "LASzip"; - src = fetchurl { - url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz"; - sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2"; + src = fetchFromGitHub { + owner = "LASzip"; + repo = "LASzip"; + rev = "v${version}"; + sha256 = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index 5138a96545..031b4fc46c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -199,13 +199,7 @@ stdenv.mkDerivation rec { "S3RegionResolutionTest.PublicBucket" "S3RegionResolutionTest.RestrictedBucket" "TestMinioServer.Connect" - "TestS3FS.GetFileInfoRoot" - "TestS3FS.OpenOutputStreamBackgroundWrites" - "TestS3FS.OpenOutputStreamDestructorBackgroundWrites" - "TestS3FS.OpenOutputStreamDestructorSyncWrite" - "TestS3FS.OpenOutputStreamDestructorSyncWrites" - "TestS3FS.OpenOutputStreamMetadata" - "TestS3FS.OpenOutputStreamSyncWrites" + "TestS3FS.*" "TestS3FSGeneric.*" ] ++ lib.optionals enableGcs [ "GcsFileSystem.FileSystemCompare" diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix new file mode 100644 index 0000000000..f9f9d4888e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -0,0 +1,66 @@ +{ stdenv, + lib, + fetchFromGitHub, + sconsPackages, + ragel, + gengetopt, + pkg-config, + libuv, + openfecSupport ? true, + openfec, + libunwindSupport ? true, + libunwind, + pulseaudioSupport ? true, + libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "roc-toolkit"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "roc-streaming"; + repo = "roc-toolkit"; + rev = "v${version}"; + sha256 = "sha256:1pld340zfch4p3qaf5anrspq7vmxrgf9ddsdsq92pk49axaaz19w"; + }; + + nativeBuildInputs = [ + sconsPackages.scons_3_0_1 + ragel + gengetopt + pkg-config + ]; + + buildInputs = [ + libuv + libunwind + openfec + libpulseaudio + ]; + + sconsFlags = + [ "--disable-sox" + "--disable-tests" ] ++ + lib.optional (!libunwindSupport) "--disable-libunwind" ++ + lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++ + (if (!openfecSupport) + then ["--disable-openfec"] + else [ "--with-libraries=${openfec}/lib" + "--with-openfec-includes=${openfec.dev}/include" ]); + + prePatch = lib.optionalString stdenv.isAarch64 + "sed -i 's/c++98/c++11/g' SConstruct"; + + preConfigure = '' + sconsFlags+=" --prefix=$out" + ''; + + meta = with lib; { + description = "Roc is a toolkit for real-time audio streaming over the network"; + homepage = "https://github.com/roc-streaming/roc-toolkit"; + license = licenses.mpl20; + maintainers = with maintainers; [ bgamari ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/box2d/default.nix b/third_party/nixpkgs/pkgs/development/libraries/box2d/default.nix index 80287f4f31..84e2dbc056 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/box2d/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/box2d/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs="; }; - sourceRoot = "source/Box2D"; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libGLU libGL freeglut libX11 xorgproto libXi ]; @@ -24,6 +22,7 @@ stdenv.mkDerivation rec { ]; prePatch = '' + cd Box2D substituteInPlace Box2D/Common/b2Settings.h \ --replace 'b2_maxPolygonVertices 8' 'b2_maxPolygonVertices 15' ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix index 09a407fc3b..47e9ffa925 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.9"; + version = "3.0.0"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-DWyqVN7v+j2XCArv4jmrD45XKWMNhd2DddJHH3gQWQY="; + hash = "sha256-dC4VuWTz0uyFxLjBQ+2ggndHaCErcoI7tJMfkqbWmeg="; }; outputs = [ "out" "doc" ]; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples install -m 644 CImg.h $out/include/ - cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/ cp -dr --no-preserve=ownership plugins/* $out/include/CImg/plugins/ + cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/ cp README.txt $doc/share/doc/cimg/ runHook postInstall diff --git a/third_party/nixpkgs/pkgs/development/libraries/dyncall/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dyncall/default.nix index f92f2f0aff..3197e3abed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dyncall/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dyncall/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "dyncall"; - version = "1.2"; + version = "1.3"; src = fetchurl { url = "https://www.dyncall.org/r${version}/dyncall-${version}.tar.gz"; - # https://www.dyncall.org/r1.2/SHA256 - sha256 = "sha256-6IFUwCQ0IVYHBPXHKUr73snpka+gYB1a3/UELqgYCNc="; + # https://www.dyncall.org/r1.3/SHA256 + sha256 = "sha256-q/Ys/DHr1/IWWNqhNwp3gcxRQxYrwIaDhKwH3vnj05A="; }; # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :) diff --git a/third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix index 35a4d93626..f3c16c8ac3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, python3, runCommand, makeWrapper, stress-ng }: +{ lib, stdenv, fetchFromGitHub, python3, runCommand, makeWrapper, stress-ng }: lib.fix (self: stdenv.mkDerivation rec { pname = "graphene-hardened-malloc"; version = "8"; - src = fetchurl { - url = "https://github.com/GrapheneOS/hardened_malloc/archive/${version}.tar.gz"; - sha256 = "0lipyd2pb1bmghkyv9zmg25jwcglj7m281f01zlh3ghz3xlfh0ym"; + src = fetchFromGitHub { + owner = "GrapheneOS"; + repo = "hardened_malloc"; + rev = version; + sha256 = "sha256-+5kJb3hhuFTto7zsIymIXl3tpKUOm3v1DCY4EkAOCgo="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/grib-api/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grib-api/default.nix deleted file mode 100644 index 1f7097dc4a..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/grib-api/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ fetchurl, fetchpatch, lib, stdenv, - cmake, netcdf, gfortran, libpng, openjpeg, - enablePython ? false, pythonPackages ? null }: - -stdenv.mkDerivation rec { - pname = "grib-api"; - version = "1.28.0"; - - src = fetchurl { - url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz"; - sha256 = "0qbj12ap7yy2rl1pq629chnss2jl73wxdj1lwzv0xp87r6z5qdfl"; - }; - - patches = [ - (fetchpatch { - url = "https://salsa.debian.org/science-team/grib-api/raw/debian/1.28.0-2/debian/patches/openjpeg2.patch"; - sha256 = "05faxh51vlidiazxq1ssd3k4cjivk1adyn30k94mxqa1xnb2r2pc"; - }) - ]; - - preConfigure = '' - # Fix "no member named 'inmem_' in 'jas_image_t'" - substituteInPlace "src/grib_jasper_encoding.c" --replace "image.inmem_ = 1;" "" - ''; - - nativeBuildInputs = [ cmake gfortran ]; - buildInputs = [ netcdf - libpng - openjpeg - ] ++ lib.optionals enablePython [ - pythonPackages.python - ]; - - propagatedBuildInputs = lib.optionals enablePython [ - pythonPackages.numpy - ]; - - cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}" - "-DENABLE_PNG=ON" - "-DENABLE_FORTRAN=ON" - "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/${openjpeg.incDir}" - ]; - - doCheck = true; - - # Only do tests that don't require downloading 120MB of testdata - # We fix the darwin checkPhase, which searches for libgrib_api.dylib - # in /nix/store by setting DYLD_LIBRARY_PATH - checkPhase = lib.optionalString (stdenv.isDarwin) '' - substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib" - '' + '' - ctest -R "t_definitions|t_calendar|t_unit_tests" -VV - ''; - - - meta = with lib; { - homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home"; - license = licenses.asl20; - platforms = with platforms; linux ++ darwin; - description = "ECMWF Library for the GRIB file format -- DEPRECATED"; - longDescription = '' - The ECMWF GRIB API is an application program interface accessible from C, - FORTRAN and Python programs developed for encoding and decoding WMO FM-92 - GRIB edition 1 and edition 2 messages. - - Please note: GRIB-API support is being discontinued at the end of 2018. - After which there will be no further releases. Please upgrade to ecCodes - ''; - maintainers = with maintainers; [ knedlsepp ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index 870276c172..d383a3093f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "21.4.3"; + version = "22.1.0"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-Z6wIwgcKa+EaqSmbD//pYzGjDezASNWGnLCROiRvACo="; + sha256 = "sha256-iISG947MUWVVAxykFwB5UK5Z4uQnEWJ6AFr/ZlHx4Nw="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/keybinder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/keybinder/default.nix index fb481c19d0..95eb0ce4de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/keybinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/keybinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome , gtk-doc, gtk2, python2Packages, lua, gobject-introspection }: @@ -8,10 +8,11 @@ in stdenv.mkDerivation rec { pname = "keybinder"; version = "0.3.0"; - src = fetchurl { - name = "${pname}-${version}.tar.gz"; - url = "https://github.com/engla/keybinder/archive/v${version}.tar.gz"; - sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf"; + src = fetchFromGitHub { + owner = "engla"; + repo = "keybinder"; + rev = "v${version}"; + sha256 = "sha256-q/+hqhvXIknT+/5oENcWSr1OuF00kaZlXFUP1fdCMlk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbaseencode/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbaseencode/default.nix index c40f9bafb4..b72f5ca1db 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbaseencode/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbaseencode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libbaseencode"; - version = "1.0.11"; + version = "1.0.12"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "1f52yh052z8k90d1ag6nk01p1gf4i1zxp1daw8mashs8avqr2m7g"; + sha256 = "sha256-TKmM2BPzas9qbWI8n63lfR8OvsSj+BKC12NXpfe9aow="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcangjie/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcangjie/default.nix index c6bbbcdb61..b0c02eaa6b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcangjie/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcangjie/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }: +{ lib, stdenv, autoconf, automake, libtool, m4, fetchFromGitLab, bash, pkg-config, sqlite }: stdenv.mkDerivation rec { pname = "libcangjie"; version = "1.4_rev_${rev}"; rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d"; - src = fetchurl { - url = "https://github.com/Cangjians/libcangjie/archive/${rev}.tar.gz"; - sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg"; + src = fetchFromGitLab { + owner = "Cangjians"; + repo = "libcangjie"; + inherit rev; + sha256 = "sha256-R7WqhxciaTxhTiwPp2EUNTOh477gi/Pj3VpMtat5qXw="; }; nativeBuildInputs = [ pkg-config ]; @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { longDescription = '' libcangjie is a library implementing the Cangjie input method. ''; - homepage = "http://cangjians.github.io/projects/libcangjie/"; + homepage = "https://gitlab.freedesktop.org/cangjie/libcangjie"; license = lib.licenses.lgpl3Plus; maintainers = [ lib.maintainers.linquize ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix index b0de959234..e03416a221 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }: stdenv.mkDerivation rec { pname = "libcec"; version = "6.0.2"; - src = fetchurl { - url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "0xrkrcgfgr5r8r0854bw3i9jbq4jmf8nzc5vrrx2sxzvlkbrc1h9"; + src = fetchFromGitHub { + owner = "Pulse-Eight"; + repo = "libcec"; + rev = "libcec-${version}"; + sha256 = "sha256-OWqCn7Z0KG8sLlfMWd0btJIFJs79ET3Y1AV/y/Kj2TU="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcotp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcotp/default.nix index 986890102d..bd555bdbc3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcotp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcotp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcotp"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "1qq4shwiz1if9vys052dnsbm4dfw1ynlj6nsb0v4zjly3ndspfsk"; + sha256 = "sha256-PN0kd0CP2zrkuPTdaS3TdsdEl+Gy6CecrDSh0Bd7mRk="; }; buildInputs = [ libbaseencode libgcrypt ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcrafter/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcrafter/default.nix index 37ac9bf7f1..22543972c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcrafter/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcrafter/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchzip, autoconf, automake, libtool, libpcap }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libpcap }: stdenv.mkDerivation rec { pname = "libcrafter"; version = "1.0"; - src = fetchzip { - url = "https://github.com/pellegre/libcrafter/archive/version-${version}.zip"; - sha256 = "1d2vgxawdwk2zg3scxclxdby1rhghmivly8azdjja89kw7gls9xl"; + src = fetchFromGitHub { + owner = "pellegre"; + repo = "libcrafter"; + rev = "version-${version}"; + sha256 = "sha256-tCdN3+EzISVl+wp5umOFD+bgV+uUdabH+2LyxlV/W7Q="; }; preConfigure = "cd libcrafter"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix index 42e308f41a..daa1d22334 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.92.1"; + version = "1.94.1"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "0dpwzmwl9jjpaz44znvy3v8s9sln0c71b756rs1knk0zx8sa1qbc"; + sha256 = "sha256-xFmby1x2TRZqXrV9Einqu3002qMAN5tQga2mIAHfC9c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix index 7c91950a4c..36f1a288f1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix @@ -1,24 +1,22 @@ -{lib, stdenv, fetchurl, zlib, openssl}: +{ lib, stdenv, fetchFromGitHub, zlib, openssl }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "2.0.1"; pname = "libre"; - src = fetchurl { - url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "0hzyc0hdlw795nyx6ik7h2ihs8wapbj32x8c40xq0484ciwzqnyd"; + src = fetchFromGitHub { + owner = "baresip"; + repo = "re"; + rev = "v${version}"; + sha256 = "sha256-/1J9cs0W96CtnHAoX/jg3FLGD9coa0eOEgf8uMQHuUk="; }; buildInputs = [ zlib openssl ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] - ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" - ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}" + ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" + ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}" ; meta = { description = "A library for real-time communications with async IO support and a complete SIP stack"; - homepage = "http://www.creytiv.com/re.html"; - platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [raskin]; + homepage = "https://github.com/baresip/re"; + maintainers = with lib.maintainers; [ elohmeier raskin ]; license = lib.licenses.bsd3; - downloadPage = "http://www.creytiv.com/pub/"; - updateWalker = true; - downloadURLRegexp = "/re-.*[.]tar[.].*"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/librem/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librem/default.nix index 349384b467..23c1f2cc34 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librem/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librem/default.nix @@ -1,12 +1,14 @@ -{lib, stdenv, fetchurl, zlib, openssl, libre}: +{ lib, stdenv, fetchFromGitHub, zlib, openssl, libre }: stdenv.mkDerivation rec { - version = "0.6.0"; + version = "1.0.0"; pname = "librem"; - src=fetchurl { - url = "http://www.creytiv.com/pub/rem-${version}.tar.gz"; - sha256 = "0b17wma5w9acizk02isk5k83vv47vf1cf9zkmsc1ail677d20xj1"; + src = fetchFromGitHub { + owner = "baresip"; + repo = "rem"; + rev = "v${version}"; + sha256 = "sha256-6Xe9zT0qLLGe1+QCQ9NALoDTaRhHpaTLbCbA+kV7hOA="; }; - buildInputs = [zlib openssl libre]; + buildInputs = [ zlib openssl libre ]; makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" "LIBRE_INC=${libre}/include/re" @@ -16,13 +18,9 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}" ; meta = { - description = " A library for real-time audio and video processing"; - homepage = "http://www.creytiv.com/rem.html"; - platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [raskin]; + description = "A library for real-time audio and video processing"; + homepage = "https://github.com/baresip/rem"; + maintainers = with lib.maintainers; [ elohmeier raskin ]; license = lib.licenses.bsd3; - downloadPage = "http://www.creytiv.com/pub/"; - updateWalker = true; - downloadURLRegexp = "/rem-.*[.]tar[.].*"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix index 0d01eeb81f..7a2718c015 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix @@ -91,7 +91,7 @@ in { sha256 = "112bjfrwwqlk0lak7fmfhcls18ydf62cp7gxghf4gklpfl1zyckw"; }; libressl_3_4 = generic { - version = "3.4.1"; - sha256 = "0766yxb599lx7qmlmsddiw9wgminz9mc311mav5q23l0rbkflz0h"; + version = "3.4.2"; + sha256 = "sha256-y4LKfVRzNpFzUvvSPbL8SDxsRNNRV7MngCFOx0GXs84="; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/openfec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openfec/default.nix new file mode 100644 index 0000000000..2a0588a71e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/openfec/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchzip, cmake }: + +stdenv.mkDerivation rec { + pname = "openfec"; + version = "1.4.2"; + + src = fetchzip { + url = "http://openfec.org/files/openfec_v1_4_2.tgz"; + sha256 = "sha256:0c2lg8afr7lqpzrsi0g44a6h6s7nq4vz7yc9vm2k57ph2y6r86la"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ "-DDEBUG:STRING=OFF" ]; + + installPhase = + let so = stdenv.hostPlatform.extensions.sharedLibrary; + in '' + # This is pretty horrible but sadly there is not installation procedure + # provided. + mkdir -p $dev/include + cp -R ../src/* $dev/include + find $dev/include -type f -a ! -iname '*.h' -delete + + install -D -m755 -t $out/lib ../bin/Release/libopenfec${so} + ln -s libopenfec${so} $out/lib/libopenfec${so}.1 + ''; + + meta = with lib; { + description = "Application-level Forward Erasure Correction codes"; + homepage = "https://github.com/roc-streaming/openfec"; + license = licenses.cecill-c; + maintainers = with maintainers; [ bgamari ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index af5f238c9d..b6d96492fc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -2,6 +2,7 @@ , lib , buildPackages , fetchFromGitLab +, fetchpatch , removeReferencesTo , python3 , meson @@ -54,6 +55,8 @@ , libpulseaudio , zeroconfSupport ? true , avahi +, rocSupport ? true +, roc-toolkit }: let @@ -100,6 +103,15 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch + # Fix attempt to put system service units into pkgs.systemd. + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b666edde787b167c6e19b9356257d48007357acc.diff"; + sha256 = "1pmnyyvrjykr46ld4a5frq3cc739f8h4jwvfj414lyx8c6ybm63s"; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5054b48c9de655b4b48f7c801cb305d9eb122520.diff"; + sha256 = "0myhb7h4g7x2nr08dpx8d7nqhsmzp90yanmkvm627r1xxnnr3ivn"; + }) ]; nativeBuildInputs = [ @@ -134,7 +146,8 @@ let ++ lib.optional ffmpegSupport ffmpeg ++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt sbc fdk_aac ] ++ lib.optional pulseTunnelSupport libpulseaudio - ++ lib.optional zeroconfSupport avahi; + ++ lib.optional zeroconfSupport avahi + ++ lib.optional rocSupport roc-toolkit; # Valgrind binary is required for running one optional test. checkInputs = lib.optional withValgrind valgrind; @@ -147,10 +160,11 @@ let "-Dpipewire_pulse_prefix=${placeholder "pulse"}" "-Dlibjack-path=${placeholder "jack"}/lib" "-Dlibcamera=${mesonEnable libcameraSupport}" - "-Droc=disabled" + "-Droc=${mesonEnable rocSupport}" "-Dlibpulse=${mesonEnable pulseTunnelSupport}" "-Davahi=${mesonEnable zeroconfSupport}" "-Dgstreamer=${mesonEnable gstreamerSupport}" + "-Dsystemd-system-service=enabled" "-Dffmpeg=${mesonEnable ffmpegSupport}" "-Dbluez5=${mesonEnable bluezSupport}" "-Dbluez5-backend-hsp-native=${mesonEnable nativeHspSupport}" diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/media-session.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/media-session.nix index 47cb3b4159..19940d8d74 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/media-session.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/media-session.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitLab +, fetchpatch , meson , ninja , pkg-config @@ -30,6 +31,19 @@ let sha256 = "sha256-e537gTkiNYMz2YJrOff/MXYWVDgHZDkqkSn8Qh+7Wr4="; }; + patches = [ + # Fix `ERROR: Tried to access unknown option "session-managers".` + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/media-session/-/commit/dfa740175c83e1cd0d815ad423f90872de566437.diff"; + sha256 = "01rfwq8ipm8wyv98rxal1s5zrkf0pn9hgrngiq2wdbwj6vjdnr1h"; + }) + # Fix attempt to put system service units into pkgs.systemd. + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/media-session/-/commit/2ff6b0baec7325dde229013b9d37c93f8bc7edee.diff"; + sha256 = "18gg7ca04ihl4ylnw78wdyrbvg66m8w43gg0wp258x4nv95gpps2"; + }) + ]; + nativeBuildInputs = [ doxygen graphviz @@ -48,6 +62,7 @@ let mesonFlags = [ "-Ddocs=enabled" + "-Dsystemd-system-service=enabled" # We generate these empty files from the nixos module, don't bother installing them "-Dwith-module-sets=[]" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix b/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix index 6ecc3606b9..376cb36edd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , sqlite @@ -12,23 +11,15 @@ stdenv.mkDerivation rec { pname = "proj"; - version = "8.2.0"; + version = "8.2.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - sha256 = "sha256-YXZ3txBWW5vUcdYLISJPxdFGCQpKi1vvJlX8rntujg8="; + hash = "sha256-tnaIqYKgYHY1Tg33jsKYn9QL8YUobgXKbQsodoCXNys="; }; - patches = [ - (fetchpatch { - name = "Make-CApi-test-cross-platform.patch"; - url = "https://github.com/OSGeo/PROJ/commit/ac113a8898cded7f5359f1edd3abc17a78eee9b4.patch"; - sha256 = "0gz2xa5nxzck5c0yr7cspv3kw4cz3fxb2yic76w7qfvxidi7z1s1"; - }) - ]; - outputs = [ "out" "dev"]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qscintilla-qt4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qscintilla-qt4/default.nix new file mode 100644 index 0000000000..23daedd217 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qscintilla-qt4/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, lib +, fetchurl +, unzip +, qt4 +, qmake4Hook +}: + +stdenv.mkDerivation rec { + pname = "qscintilla-qt4"; + version = "2.11.6"; + + src = fetchurl { + url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz"; + sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc="; + }; + + sourceRoot = "QScintilla-${version}/Qt4Qt5"; + + buildInputs = [ qt4 ]; + + nativeBuildInputs = [ unzip qmake4Hook ]; + + patches = [ + ./fix-qt4-build.patch + ]; + + # Make sure that libqscintilla2.so is available in $out/lib since it is expected + # by some packages such as sqlitebrowser + postFixup = '' + ln -s $out/lib/libqscintilla2_qt4.so $out/lib/libqscintilla2.so + ''; + + dontWrapQtApps = true; + + postPatch = '' + substituteInPlace qscintilla.pro \ + --replace '$$[QT_INSTALL_LIBS]' $out/lib \ + --replace '$$[QT_INSTALL_HEADERS]' $out/include \ + --replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \ + --replace '$$[QT_HOST_DATA]/mkspecs' $out/mkspecs \ + --replace '$$[QT_INSTALL_DATA]/mkspecs' $out/mkspecs \ + --replace '$$[QT_INSTALL_DATA]' $out/share + ''; + + meta = with lib; { + description = "A Qt port of the Scintilla text editing library"; + longDescription = '' + QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor + control. + + As well as features found in standard text editing components, + QScintilla includes features especially useful when editing and + debugging source code. These include support for syntax styling, + error indicators, code completion and call tips. The selection + margin can contain markers like those used in debuggers to + indicate breakpoints and the current line. Styling choices are + more open than with many editors, allowing the use of + proportional fonts, bold and italics, multiple foreground and + background colours and multiple fonts. + ''; + homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro"; + license = with licenses; [ gpl3 ]; # and commercial + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/qscintilla/fix-qt4-build.patch b/third_party/nixpkgs/pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/qscintilla/fix-qt4-build.patch rename to third_party/nixpkgs/pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/qscintilla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qscintilla/default.nix index fc2ef6c09a..88c44ece32 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qscintilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qscintilla/default.nix @@ -1,49 +1,46 @@ -{ stdenv, lib, fetchurl, unzip -, qt4 ? null, qmake4Hook ? null -, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null +{ stdenv +, lib +, fetchurl +, unzip +, qtbase +, qtmacextras +, qmake , fixDarwinDylibNames }: -let - pname = "qscintilla-qt${if withQt5 then "5" else "4"}"; - version = "2.11.6"; - -in stdenv.mkDerivation rec { - inherit pname version; +stdenv.mkDerivation rec { + pname = "qscintilla-qt5"; + version = "2.13.1"; src = fetchurl { - url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz"; - sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc="; + url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"; + sha256 = "gA49IHGpa8zNdYE0avDS/ij8MM1oUwy4MCaF0BOv1Uo="; }; - sourceRoot = "QScintilla-${version}/Qt4Qt5"; + sourceRoot = "QScintilla_src-${version}/src"; - buildInputs = [ (if withQt5 then qtbase else qt4) ]; + buildInputs = [ qtbase ]; - propagatedBuildInputs = lib.optional (withQt5 && stdenv.isDarwin) qtmacextras; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ qtmacextras ]; - nativeBuildInputs = [ unzip ] - ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]) - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - - patches = lib.optional (!withQt5) ./fix-qt4-build.patch; + nativeBuildInputs = [ unzip qmake ] + ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; # Make sure that libqscintilla2.so is available in $out/lib since it is expected # by some packages such as sqlitebrowser postFixup = '' - ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so + ln -s $out/lib/libqscintilla2_qt5.so $out/lib/libqscintilla2.so ''; dontWrapQtApps = true; - postPatch = '' + preConfigure = '' substituteInPlace qscintilla.pro \ --replace '$$[QT_INSTALL_LIBS]' $out/lib \ --replace '$$[QT_INSTALL_HEADERS]' $out/include \ --replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \ --replace '$$[QT_HOST_DATA]/mkspecs' $out/mkspecs \ - --replace '$$[QT_INSTALL_DATA]/mkspecs' $out/mkspecs \ - --replace '$$[QT_INSTALL_DATA]' $out/share${lib.optionalString (! withQt5) "/qt"} + --replace '$$[QT_INSTALL_DATA]' $out/share ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index 619f41eb33..d2735f34b7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "sha256-PkuYXDL04LbUiY+O/4EilZn2+hTbwbRXPDE3B5d/4pQ="; + sha256 = "sha256-/noS5cn8lllWoGyZ9QyjRmdiR6LXzfT4lYGEt+0+Bdw="; }; # Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed diff --git a/third_party/nixpkgs/pkgs/development/libraries/xalanc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xalanc/default.nix index 445efcaf75..b750b26996 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xalanc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xalanc/default.nix @@ -1,35 +1,17 @@ -{ lib, stdenv, fetchurl, xercesc, getopt }: +{ lib, stdenv, fetchFromGitHub, xercesc, getopt, cmake }: -let - platform = if stdenv.isLinux then "linux" else - if stdenv.isDarwin then "macosx" else - throw "Unsupported platform"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "xalan-c"; - version = "1.11"; + version = "1.12.0"; - src = fetchurl { - url = "mirror://apache/xalan/xalan-c/sources/xalan_c-${version}-src.tar.gz"; - sha256 = "0a3a2b15vpacnqgpp6fiy1pwyc8q6ywzvyb5445f6wixfdspypjg"; + src = fetchFromGitHub { + owner = "apache"; + repo = "xalan-c"; + rev = "Xalan-C_1_12_0"; + sha256 = "sha256:0q1204qk97i9h14vxxq7phcfpyiin0i1zzk74ixvg4wqy87b62s8"; }; - configurePhase = '' - export XALANCROOT=`pwd`/c - cd `pwd`/c - mkdir -p $out - ./runConfigure -p ${platform} -c cc -x c++ -P$out - ''; - - buildInputs = [ xercesc getopt ]; - - # Parallel build fails as: - # c++ ... -c ... ExecutionContext.cpp - # ProblemListenerBase.hpp:28:10: fatal error: LocalMsgIndex.hpp: No such file or directory - # The build failure happens due to missing intra-project dependencies - # against generated headers. Future 1.12 version dropped - # autotools-based build system. Let's disable parallel builds until - # next release. - enableParallelBuilding = false; + buildInputs = [ xercesc getopt cmake ]; meta = { homepage = "https://xalan.apache.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xed/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xed/default.nix index 395b399d8f..d899458191 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xed/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xed/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Intel X86 Encoder Decoder (Intel XED)"; homepage = "https://intelxed.github.io/"; - license = licenses.apsl20; + license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ arturcygan ]; }; diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix index 48954114a4..c03b1fb881 100644 --- a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix @@ -17,7 +17,7 @@ mkDerivation { vector ]; testHaskellDepends = [ base hspec ]; - homepage = "http://github.com/bos/pool"; + homepage = "https://github.com/bos/pool"; description = "A high-performance striped resource pooling implementation"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lassulus ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dbf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dbf/default.nix new file mode 100644 index 0000000000..d2dad611bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dbf/default.nix @@ -0,0 +1,28 @@ +{ lib, buildDunePackage, fetchFromGitHub, ppx_cstruct, rresult, cstruct-unix +, core_kernel }: + +buildDunePackage rec { + pname = "dbf"; + version = "0.1.1"; + + minimalOCamlVersion = "4.08"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "pveber"; + repo = "dbf"; + rev = "${version}"; + sha256 = "sha256-h1K5YDLbXGEJi/quKXvSR0gZ+WkBzut7AsVFv+Bm8/g="; + }; + + buildInputs = [ ppx_cstruct ]; + propagatedBuildInputs = [ rresult cstruct-unix core_kernel ]; + + meta = with lib; { + description = "DBF format parsing"; + homepage = "https://github.com/pveber/dbf"; + license = licenses.isc; + maintainers = [ maintainers.deltadelta ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix index b71442a6a8..073e6865fc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation { propagatedBuildInputs = [ uchar ]; + prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384"; + inherit (topkg) buildPhase installPhase; meta = with lib; { 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 9e32e903e8..6f4bba33eb 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,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.18.0"; + version = "3.19.1"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "593f3719580b31b3dffab0817414a3aa548ed609659ad216ceb8cf31cc51ec9b"; + sha256 = "sha256-mJ121SSoO7v2p+qCF5Va5+ppHQsHcFuyJDpyc6lykRI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix index 562ec0d2c4..6aa09f70ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { description = "Terminal MUA using notmuch mail"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ edibopp ]; + maintainers = with maintainers; [ milibopp ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix index f4ec1c1846..92d377d088 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix @@ -1,30 +1,40 @@ { lib -, buildPythonPackage -, fetchPypi -, psutil -, pexpect -, python-daemon -, pyyaml -, six , stdenv , ansible +, buildPythonPackage +, fetchPypi , mock , openssh +, pexpect +, psutil , pytest-mock , pytest-timeout , pytest-xdist , pytestCheckHook +, python-daemon +, pyyaml +, six }: buildPythonPackage rec { pname = "ansible-runner"; version = "2.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "7684612f7543c5f07f3e8135667eeb22a9dbd98f625cc69901ba9924329ef24f"; + hash = "sha256-doRhL3VDxfB/PoE1Zn7rIqnb2Y9iXMaZAbqZJDKe8k8="; }; + propagatedBuildInputs = [ + ansible + psutil + pexpect + python-daemon + pyyaml + six + ]; + checkInputs = [ ansible # required to place ansible CLI onto the PATH in tests pytestCheckHook @@ -35,44 +45,45 @@ buildPythonPackage rec { openssh ]; - propagatedBuildInputs = [ - ansible - psutil - pexpect - python-daemon - pyyaml - six - ]; - preCheck = '' export HOME=$(mktemp -d) + export PATH="$PATH:$out/bin"; ''; disabledTests = [ - "test_callback_plugin_task_args_leak" # requires internet + # Requires network access + "test_callback_plugin_task_args_leak" "test_env_accuracy" - "test_large_stdout_blob" # times out on slower hardware - ] + # Times out on slower hardware + "test_large_stdout_blob" + # Failed: DID NOT RAISE + "test_validate_pattern" + ] ++ lib.optional stdenv.isDarwin [ # test_process_isolation_settings is currently broken on Darwin Catalina # https://github.com/ansible/ansible-runner/issues/413 - ++ lib.optional stdenv.isDarwin "process_isolation_settings"; + "process_isolation_settings" + ]; disabledTestPaths = [ - # these tests unset PATH and then run executables like `bash` (see https://github.com/ansible/ansible-runner/pull/918) + # These tests unset PATH and then run executables like `bash` (see https://github.com/ansible/ansible-runner/pull/918) "test/integration/test_runner.py" "test/unit/test_runner.py" ] ++ lib.optionals stdenv.isDarwin [ - # integration tests on Darwin are not regularly passing in ansible-runner's own CI + # Integration tests on Darwin are not regularly passing in ansible-runner's own CI "test/integration" - # these tests write to `/tmp` which is not writable on Darwin + # These tests write to `/tmp` which is not writable on Darwin "test/unit/config/test__base.py" ]; + pythonImportsCheck = [ + "ansible_runner" + ]; + meta = with lib; { description = "Helps when interfacing with Ansible"; homepage = "https://github.com/ansible/ansible-runner"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix index 53851ded56..d8a369d6da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.0.1a12"; + version = "0.2a2"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-TFb1C1GaMAK+ckEeXDxSyO2Cgx5dmq62daoSnAiAFmI="; + hash = "sha256-pcVoYGBhp9jyuWBJ/Rpi8cjwDgPjhJ1PrPblj5DQTpk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix index f10f34c381..c99c392841 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = lib.getVersion capstone; src = capstone.src; - sourceRoot = "${capstone.name}/bindings/python"; + sourceRoot = "source/bindings/python"; postPatch = '' ln -s ${capstone}/lib/libcapstone${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix index 38653306ee..4262efb1a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.0.9"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "sha256-qh3Z8Gza8J3OEM94GguJ+oEdVle01Gx1m/7+LCOErKY="; + sha256 = "sha256-zQoG7clqDAxwJIt0AQcj8kKGODL61ODc4inP2Ll+Jt8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix index 1ccce2caee..b7dbfca70e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "chainer"; - version = "7.8.0"; + version = "7.8.1"; disabled = !isPy3k; # python2.7 abandoned upstream # no tests in Pypi tarball @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "chainer"; repo = "chainer"; rev = "v${version}"; - sha256 = "1zfj3pk54gzxd4nid0qjx4kw1wdngwscvn4hk4cijxvwqi4a5zxj"; + sha256 = "1n07zjzc4g92m1sbgxvnansl0z00y4jnhma2mw06vnahs7s9nrf6"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix index f2fd48d541..662eaef557 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -13,6 +13,7 @@ , pyjwt , pyquil , python-dateutil +, pythonOlder , qcs-api-client , retrying , rfc3339 @@ -26,6 +27,8 @@ buildPythonPackage rec { pname = "cirq-rigetti"; inherit (cirq-core) version src meta; + disabled = pythonOlder "3.7"; + sourceRoot = "source/${pname}"; postPatch = '' @@ -36,9 +39,10 @@ buildPythonPackage rec { --replace "httpcore~=0.11.1" "httpcore" \ --replace "httpx~=0.15.5" "httpx" \ --replace "idna~=2.10" "idna" \ - --replace "requests~=2.18" "requests" \ --replace "pyjwt~=1.7.1" "pyjwt" \ --replace "qcs-api-client~=0.8.0" "qcs-api-client" + # Remove outdated test + rm cirq_rigetti/service_test.py ''; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix index 1085f4030c..c0863a5b39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix @@ -3,24 +3,36 @@ , cffi , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "cmarkgfm"; - version = "0.6.0"; + version = "0.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ec2bf8d5799c4b5bbfbae30a4a1dfcb06512f2e17e9ee60ba7e1d390318582fc"; + sha256 = "sha256-plwVL52ov4JxTxnCh/4JaO6Of4mejZRQPXPQ/lcinBk="; }; - propagatedNativeBuildInputs = [ cffi ]; + propagatedNativeBuildInputs = [ + cffi + ]; - propagatedBuildInputs = [ cffi ]; + propagatedBuildInputs = [ + cffi + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "cmarkgfm" ]; + pythonImportsCheck = [ + "cmarkgfm" + ]; meta = with lib; { description = "Minimal bindings to GitHub's fork of cmark"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix index 587f73d81e..d4515b0648 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix @@ -25,19 +25,13 @@ buildPythonPackage rec { pname = "datashader"; version = "0.13.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "sha256-6JscHm1QjDmXOLLa83qhAvY/xwvlPM6duQ1lSxnCVV8="; }; - # the complete extra is for usage with conda, which we - # don't care about - postPatch = '' - substituteInPlace setup.py \ - --replace "dask[complete]" "dask" - ''; - propagatedBuildInputs = [ dask bokeh @@ -56,13 +50,21 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest-xdist # not needed + pytest-xdist nbsmoke fastparquet nbconvert netcdf4 ]; + # The complete extra is for usage with conda, which we + # don't care about + postPatch = '' + substituteInPlace setup.py \ + --replace "dask[complete]" "dask" \ + --replace "xarray >=0.9.6" "xarray" + ''; + preCheck = '' export HOME=$TMPDIR ''; @@ -73,10 +75,10 @@ buildPythonPackage rec { ]; disabledTests = [ - # not compatible with current version of bokeh + # Not compatible with current version of bokeh # see: https://github.com/holoviz/datashader/issues/1031 "test_interactive_image_update" - # latest dask broken array marshalling + # Latest dask broken array marshalling # see: https://github.com/holoviz/datashader/issues/1032 "test_raster_quadmesh_autorange_reversed" ]; @@ -86,10 +88,14 @@ buildPythonPackage rec { "datashader/tests/test_datatypes.py" ]; + pythonImportsCheck = [ + "datashader" + ]; + meta = with lib;{ description = "Data visualization toolchain based on aggregating into a grid"; homepage = "https://datashader.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/decli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/decli/default.nix new file mode 100644 index 0000000000..1e0fd21320 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/decli/default.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "decli"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-8s3lUDSnXIGcYwx2VahExhLyWYxCwhKZFgRl32rUY60="; + }; + + pythonImportsCheck = [ "decli" ]; + + meta = with lib; { + description = "Minimal, easy to use, declarative command line interface tool"; + homepage = "https://github.com/Woile/decli"; + license = licenses.mit; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix index cf54f6facf..e9bbb8a637 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "deemix"; - version = "3.6.4"; + version = "3.6.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "268617b3ff9346ae51a063cbdb820c1f591cbadc1cf2fafd201dc671e721c1dd"; + sha256 = "c56245b2a2142dafb0658d60919ccf34e04e5d87720d5909e0e030521349a65a"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix index 648f0e3f0f..5307fb1e63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "deezer-py"; - version = "1.3.2"; + version = "1.3.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-G4GREc+PWvaphnOuzBePraj4pHgmhhKqsyVHKOPwGik="; + sha256 = "5bc30e8887a7dc1dfec2970d825a69c7c932564300fc84b4e68cbf59bf109baa"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix index cb3afb6442..b25440d0e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "4.2.1"; + version = "4.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "0gl0l7x9zqfkz3l4jfz8rb956lqj3vx1aghric36izwzl6wyj6h5"; + sha256 = "17l11mhv1qkdbhmwwal3zfgr1a3w1c4bwm9lqi78gadpl5lli4i2"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix new file mode 100644 index 0000000000..5468776c72 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix @@ -0,0 +1,59 @@ +{ buildPythonPackage +, chex +, cloudpickle +, dill +, dm-tree +, fetchFromGitHub +, jmp +, lib +, pytestCheckHook +, tabulate +, tensorflow +}: + +buildPythonPackage rec { + pname = "dm-haiku"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "deepmind"; + repo = pname; + rev = "v${version}"; + sha256 = "1mdqjcka0m1div63ngba8w8z94id4c1h8xqmnq1xpmgkc79224wa"; + }; + + propagatedBuildInputs = [ + jmp + tabulate + ]; + + checkInputs = [ + chex + cloudpickle + dm-tree + pytestCheckHook + tensorflow + ]; + + pythonImportsCheck = [ + "haiku" + ]; + + disabledTestPaths = [ + # These tests require `bsuite` which isn't packaged in `nixpkgs`. + "examples/impala_lite_test.py" + "examples/impala/actor_test.py" + "examples/impala/learner_test.py" + # This test breaks on multiple cases with TF-related errors, + # likely that's the reason the upstream uses TF-nightly for tests? + # `nixpkgs` doesn't have the corresponding TF version packaged. + "haiku/_src/integration/jax2tf_test.py" + ]; + + meta = with lib; { + description = "Haiku is a simple neural network library for JAX developed by some of the authors of Sonnet."; + homepage = "https://github.com/deepmind/dm-haiku"; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix index a0c7706c2f..74595943a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix @@ -12,15 +12,19 @@ , mock , pkgs , urllib3 +, pythonOlder }: buildPythonPackage rec { - version = "0.20.26"; + version = "0.20.27"; pname = "dulwich"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OKpQ+FnI6lMHGgScPx1cxU99xgpBNqGrYxdWp59lgrU="; + hash = "sha256-9dP6dlmRTnorh4NahWZsdwHTdR+IFVFlPUzSVgsqEk4="; }; LC_ALL = "en_US.UTF-8"; @@ -43,7 +47,9 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; - pythonImportsCheck = [ "dulwich" ]; + pythonImportsCheck = [ + "dulwich" + ]; meta = with lib; { description = "Simple Python implementation of the Git file formats and protocols"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix index 81bc807a13..601c5b6886 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix @@ -12,11 +12,11 @@ buildPythonPackage (rec { # there's a clear path forward. See # https://github.com/elastic/elasticsearch-py/issues/1639 for more # info. - version = "7.16.1"; + version = "7.16.2"; src = fetchPypi { inherit pname version; - sha256 = "c024ee2e7e2509c842c4e3c5e2b99a92ceecfde06d6dac2d32a19bf566c3e175"; + sha256 = "23ac0afb4398c48990e359ac73ab6963741bd05321345299c62d9d23e209eee2"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix index f755d54559..32b3098ffc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.18"; + version = "0.5.20"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "1w2fclpmcb41k2a3226jk62hdclc8b18kxih2ads90r4yxgpxc8p"; + sha256 = "sha256-gYl5+rtOzci3nhgP74VM37tNk9pPWgcNBfcSSG1fSJs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/environs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/environs/default.nix index 04bb5dda00..a0a4fb88e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/environs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/environs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "environs"; - version = "9.3.5"; + version = "9.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sloria"; repo = pname; rev = version; - sha256 = "sha256-4jyqdA/xoIEsfouIneGs3A9++sNG2kRUhDzteN0Td6w="; + sha256 = "sha256-LPD46kxzQ/oTC7XjJn/SXaLQgX613ZoCrJuaRng57Gw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix index 1e5db008de..a5a87f908d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ephem"; - version = "4.1.1"; + version = "4.1.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-26ngXHjOkQrnWgY1GlWSR5GRqNxXCsDNbRinfpgTiHM="; + sha256 = "sha256-f6GGhZgbpSjt1QQFKp1SEqCapb8VwRpzTtxqhuiotWo="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix index d571f76f92..28798dd838 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -2,18 +2,25 @@ , buildPythonPackage , fetchPypi , django +, pythonOlder }: buildPythonPackage rec { - version = "1.1.0"; - pname = "filebrowser_safe"; + pname = "filebrowser-safe"; + version = "1.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "14b6e0af9697f1d0f08508cc88bc8459273cd6453636cebe8504dccc80e926e4"; + pname = "filebrowser_safe"; + inherit version; + sha256 = "499c5dbd9e112dfc436cae7713b2fb664a59015021f6c9d131e3b7980aeb5c94"; }; - buildInputs = [ django ]; + buildInputs = [ + django + ]; # There is no test embedded doCheck = false; @@ -24,15 +31,10 @@ buildPythonPackage rec { filebrowser_safe was created to provide a snapshot of the FileBrowser asset manager for Django, to be referenced as a dependency for the Mezzanine CMS for Django. - - At the time of filebrowser_safe's creation, FileBrowser was - incorrectly packaged on PyPI, and had also dropped compatibility - with Django 1.1 - filebrowser_safe was therefore created to - address these specific issues. ''; homepage = "https://github.com/stephenmcd/filebrowser-safe"; downloadPage = "https://pypi.python.org/pypi/filebrowser_safe/"; - license = licenses.free; + license = licenses.bsd3; maintainers = with maintainers; [ prikhi ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix index 08bf77f703..bb271807a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.27.28"; + version = "0.27.40"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-lm560jTafxMVNH4tXx7xov1bQMEYp3FFzJEK5K+ung0="; + sha256 = "sha256-imfdLomMjeGAyVBSygx+TV0DA9OrMreeSlzzrJ2B9cc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix index 9b9cc129c6..7c04c54d42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.10.1"; + version = "0.10.2"; src = fetchPypi { inherit pname version; - sha256 = "794ada47e19ba41ef39b59719be312b127672bcb56bb7208dd3234d2bb3e8218"; + sha256 = "a3a3926e977f82ae19e6823760b59f2338085973da1eaad5badaf969f261a737"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix index c6e0dc1835..66d05f2a35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "dask"; + owner = "fsspec"; repo = pname; rev = version; - sha256 = "sha256-BME40kyxZHx9+XrMCqWYp8+q6tjeYwAw/zISMNpQxDU="; + sha256 = "sha256-cpV+HKE39Yct1yu5xW9HZftx2Wy9ydFL2YLvPD3YM2M="; }; propagatedBuildInputs = [ @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convenient Filesystem interface over GCS"; - homepage = "https://github.com/dask/gcsfs"; + homepage = "https://github.com/fsspec/gcsfs"; license = licenses.bsd3; maintainers = with maintainers; [ nbren12 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix index 7b37be48f1..3989cf6f72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "genanki"; - version = "0.12.0"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f787ac440ff37a3ef3389030e992e3527f000f7a69498f797033ccfad07ebe62"; + sha256 = "bfacdcadd7903ed6afce6168e1977e473b431677b358f8fd42e80b48cedd19ab"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index d32eea8ced..b6890fe3fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.10.0"; + version = "0.10.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "d97f85a4ff84341c12b1d7a6fee5ab5e5e942271279684310bb2f507b6ee5c53"; + sha256 = "3b51f4d0558b7effb9add93aaa813c7a160ed293c346f5379a6fa1c8049af062"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix index 483539bc22..79f85ad956 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix @@ -8,13 +8,14 @@ buildPythonPackage rec { pname = "getmac"; - version = "0.8.2"; + version = "0.8.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "GhostofGoes"; repo = pname; rev = version; - sha256 = "08d4iv5bjl1s4i9qhzf3pzjgj1rgbwi0x26qypf3ycgdj0a6gvh2"; + sha256 = "sha256-X4uuYisyobCxhoywaSXBZjVxrPAbBiZrWUJAi2/P5mw="; }; checkInputs = [ @@ -33,7 +34,9 @@ buildPythonPackage rec { "test_uuid_lanscan_iface" ]; - pythonImportsCheck = [ "getmac" ]; + pythonImportsCheck = [ + "getmac" + ]; meta = with lib; { description = "Python package to get the MAC address of network interfaces and hosts on the local network"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix index 567ffef56e..9cf6c08b24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.9"; + version = "0.2.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "v${version}"; - sha256 = "0l895nyq2g7isvim2fx4ivdh3xzhyc10yzqvqnlg3fr56l5srfch"; + sha256 = "1c4wks67vm2dwzmm3xqkidyss04vkx4mpkkr8l1c7c5myfk1n157"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix index 9d97437b81..f74944a45e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.43.0"; + version = "1.44.0"; src = fetchPypi { inherit pname version; - sha256 = "f3b4f4be5c8a1b5727a8f7136c94d3bacdd4b7bf11f9553f51ae4c1d876529d3"; + sha256 = "29edbfeedd157d853049302bf5d104055c6f0cb7ef283537da3ce3f730073001"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix index 93fa676f6f..27211ed209 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "1.2.1"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = version; - sha256 = "sha256-gg5JAkTUuch6HcRLl1Xm/LAoC32EcayG1w3Fk7GrZD8="; + sha256 = "sha256-E0e4lLUBzHKA3clmb/JUBE0KGciQ1xrmLTSeSkGDsWo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix index ddc638b55c..b239dfc6e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "a208264ed252a39b29a0b0f7ccc4c4ffb941398715aec84c3a547281a43c4eb8"; + sha256 = "5affd12421ba75f4c04f5678aef62f78aae2a7ae74aa23614c6f3799d2784b28"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix index 8906af53ce..6a33cfd7b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.1.6"; + version = "3.1.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "1ip0yrqmnqncgpwvba18x020gkwr7csiw4zdy6mrdnvwf5qyam4x"; + sha256 = "1mwwh55qd5bcpvgy6pyliwn8jkmj4yk4d2pqb6mdkgqhdic2081l"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index 287e12afe7..bf8bed9dd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -1,7 +1,10 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub -, aiohttp +, pydevccu +, pytest-aiohttp +, pytestCheckHook , pythonOlder , voluptuous , websocket-client @@ -10,7 +13,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.9.1"; + version = "0.13.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +22,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-sxYa0SCsX1NZlCRMIpwyU1KPEteVH5HGLx1dFsbiu/E="; + sha256 = "sha256-9dR0qYoHVovD4fwJz6v+/RItMuqr2vA9YHn0nMGHUX0="; }; propagatedBuildInputs = [ @@ -27,8 +30,11 @@ buildPythonPackage rec { voluptuous ]; - # Module has no tests - doCheck = false; + checkInputs = [ + pydevccu + pytest-aiohttp + pytestCheckHook + ]; pythonImportsCheck = [ "hahomematic" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix index 8061532882..ec16470ef1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "intensity-normalization"; - version = "2.1.1"; + version = "2.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aGuGdUqaUgoD95PLFch+lF9o7eeKwK0bNWTF1beslIY="; + sha256 = "sha256-92STD5sOc9TLf3Ooaoi3afWkXiGjVgUUFvSVTeP8MaA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix index f04b876f04..050abc4ea2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipympl"; - version = "0.8.4"; + version = "0.8.5"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "2f955c1c04d8e6df883d57866450657040bfc568edeabcace801cbdbaf4d0295"; + sha256 = "120a084d84e6a6a00fc39c73e10345dcd9855efb3fa6e774f3e72057a866715c"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix index 1a4ce8f749..9546225dab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.17.5"; + version = "1.17.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "004773a1wsip1gnqvas78k0snv7yq83qv1spir891sz4mmg7fyin"; + sha256 = "sha256-JWipvhMsVI/AX7Pj4iHJh5GIgfwGLc7s1hZZJnsYGIw="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix index 5f2c5ac7fd..f9452a25b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.39.3"; + version = "0.39.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rg50AE30R1OErtOKppnkhg8MTuhEY6gdBgc7ipEkONA="; + sha256 = "sha256-gaholnLO5oIQaXgliuvlU2MfpjiCMgAPplOPgvMYim8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix index 8e2cb3ca36..7a4e93f9dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.1.1"; + version = "2022.1.1.post1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tJqUsNRvSipuvOTfxJOFUCojrkRrrrzIgEYNShrTP8c="; + hash = "sha256-9p06yD95emBOFKtTZMVR/3ySAB24pB3QRmzVEnqeb9U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix index c37183e22e..66a1a5f61f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.7.2"; + version = "1.8.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-fPSvxdr329SxAe4N7lTa7hddFp1WVUplkhYD1oDQXAI="; + sha256 = "sha256-N0Ebd0zIHFmuiIozkAy4SV3o8rFA1wmrGd+dJo8jdk0="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index 1be685e013..4e4e6dcc63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.14.0"; + version = "0.14.3"; src = fetchPypi { inherit pname version; - sha256 = "5ad04e87bcf31eb3479fdd3cabd5082b257013e5c00f6b369539a2b584afadaf"; + sha256 = "a7b41b522deafe47f8d3ce2b13f5a8a01f7bc715f09ebb5ca53a4af4f6987701"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix index f5c6c27686..7aeb0ee2c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "7.0.0"; + version = "8.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/EoVM3wEiA2suJHxMu2zZktQhO6T9grWcvWuzmUe6V0="; + sha256 = "sha256-19VO5L5abVGm5zEMt88o67ArLjBCnGO2DxfAD+u1hF4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index 0d1e17afc3..95e1a3e331 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.51"; + version = "1.2.52"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-CMoa7FQnGTWS14WmWvuryO2bKMWC05PBIDBlEWRjNRA="; + sha256 = "sha256-PSacL0ze+TvNBHj+HIpaoy8GxnklFwFrNztEso6lwqU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix index e832c7cf56..4a7bf9edc5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "metar"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "python-metar"; repo = "python-metar"; rev = "v${version}"; - sha256 = "019vfq9191cdvvq1afdcdgdgbzpj7wq6pz9li8ggim71azjnv5nn"; + sha256 = "sha256-pl2NWRfFCYyM2qvBt4Ic3wgbGkYZvAO6pX2Set8zYW8="; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix index 0f3372a604..f0e5db4f0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "miniaudio"; - version = "1.45"; + version = "1.46"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "irmen"; repo = "pyminiaudio"; rev = "v${version}"; - sha256 = "1yx4n4zax103fmjzdiqzw37zibsh68b2p2l5qvgcnx2zrrjd31yl"; + sha256 = "16llwmbbd9445rwhl4v66kf5zd7yl3a94zm9xyllq6ij7vnhg5jb"; }; propagatedNativeBuildInputs = [ cffi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix index f7bf273f1a..9136f1b8e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix @@ -1,15 +1,20 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , matplotlib , palettable , pandas , pytestCheckHook +, pythonOlder +, scipy }: buildPythonPackage rec { pname = "mizani"; version = "0.7.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "has2k1"; @@ -18,15 +23,25 @@ buildPythonPackage rec { sha256 = "04r53dp5jbklv8l9ncgc5wiq0gx25y73h65gmmbbfkxwgsl3w78l"; }; + propagatedBuildInputs = [ + matplotlib + palettable + pandas + scipy + ]; + + checkInputs = [ + pytestCheckHook + ]; + postPatch = '' - substituteInPlace pytest.ini --replace " --cov=mizani --cov-report=xml" "" + substituteInPlace pytest.ini \ + --replace " --cov=mizani --cov-report=xml" "" ''; - propagatedBuildInputs = [ matplotlib palettable pandas ]; - - checkInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "mizani" ]; + pythonImportsCheck = [ + "mizani" + ]; meta = with lib; { description = "Scales for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index b26086f00a..e7aa7de0c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.20.17"; + version = "1.20.28"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7Zw8NxOEXDRmLChxHQXVU/HzR8z6HuLxX8bB3pZuCqc="; + sha256 = "85ac23d06f9d0d794f60041b4c4f271d2bb8f5a83375c963e4a9e73e51ba9ca5"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix index 0d7b53f03c..9d36c73bc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "nameparser"; - version = "1.0.6"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0av5kraczczp0hvwpkdaw7kl2hk9k4dyll08rg180n52a2dm0pra"; + sha256 = "bbd4831c72426757ec59674a1aad29c40bf411358a6d6e1cdd68002cbcb90d08"; }; LC_ALL="en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oocsi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oocsi/default.nix index 2f0ae510d0..c558ebcc1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oocsi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oocsi/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "oocsi"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "020xfjvcgicj81zl3z9wnb2f9bha75bjw512b0cc38w66bniinjq"; + sha256 = "sha256-AgDBsPoi0aQ6uglc7Zl4gxVmeyDCysoef5vZpxgwE/Q="; }; # Tests are not shipped diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix new file mode 100644 index 0000000000..bf0383fa15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix @@ -0,0 +1,55 @@ +{ absl-py +, buildPythonPackage +, chex +, dm-haiku +, fetchFromGitHub +, jaxlib +, lib +, numpy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "optax"; + # As of 2022-01-06, the latest stable version (0.1.0) has broken tests that are fixed + # in https://github.com/deepmind/optax/commit/d6633365d84eb6f2c0df0c52b630481a349ce562 + version = "unstable-2022-01-05"; + + src = fetchFromGitHub { + owner = "deepmind"; + repo = pname; + rev = "5ec5541b3486224b22e950480ff639ceaf5098f7"; + sha256 = "1q8cxc42a5xais2ll1l238cnn3l7w28savhgiz0lg01ilz2ysbli"; + }; + + propagatedBuildInputs = [ + absl-py + chex + jaxlib + numpy + ]; + + checkInputs = [ + dm-haiku + pytestCheckHook + ]; + + pythonImportsCheck = [ + "optax" + ]; + + disabledTestPaths = [ + # Requires `flax` which depends on `optax` creating circular dependency. + "optax/_src/equivalence_test.py" + # Require `tensorflow_datasets` which isn't packaged in `nixpkgs`. + "examples/datasets_test.py" + "examples/lookahead_mnist_test.py" + ]; + + meta = with lib; { + description = "Optax is a gradient processing and optimization library for JAX."; + homepage = "https://github.com/deepmind/optax"; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix index 822ae2113b..5bb1b04439 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "parfive"; - version = "1.5.0"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f36128e8a93f3494ce3de8af883eeba4bd651ab228682810a46ec4b7897a84b3"; + sha256 = "c411fd7269a49d1c72a964e97de474ec082115777b363aeed98a6595f90b8676"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix index 53743052f4..72d025c969 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix @@ -1,26 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "parsy"; version = "1.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "7c411373e520e97431f0b390db9d2cfc5089bc1d33f4f1584d2cdc9e6368f302"; }; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - py.test test/ - ''; - - disabled = pythonOlder "3.4"; + pythonImportsCheck = [ + "parsy" + ]; meta = with lib; { homepage = "https://github.com/python-parsy/parsy"; description = "Easy-to-use parser combinators, for parsing in pure Python"; license = [ licenses.mit ]; - maintainers = with maintainers; [ edibopp ]; + maintainers = with maintainers; [ milibopp ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix index c039ff16b8..d35a574029 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "6.2.0"; + version = "6.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "v${version}"; - sha256 = "sha256-VBc2avJiIFQW1LYXQEvIZ/wZKMFJsCF9DDrxwL8dDnk="; + sha256 = "1cd6g5vix8k45ndx4aq4pvyyisqdp38gd2466jrlg8z9byandj0i"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix index 9e3b711718..878e36e5c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix @@ -1,28 +1,55 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, matplotlib, numpy, pytestCheckHook, seaborn }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, matplotlib +, numpy +, pytestCheckHook +, pythonOlder +, seaborn +}: buildPythonPackage rec { pname = "pycm"; version = "3.3"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { - owner = "sepandhaghighi"; - repo = pname; - rev = "v${version}"; + owner = "sepandhaghighi"; + repo = pname; + rev = "v${version}"; sha256 = "0i3qpb20mnc22qny1ar3yvxb1dac7njwi8bvi5sy5kywz10c5dkw"; }; - # remove a trivial dependency on the author's `art` Python ASCII art library + propagatedBuildInputs = [ + matplotlib + numpy + seaborn + ]; + + checkInputs = [ + pytestCheckHook + ]; + postPatch = '' + # Remove a trivial dependency on the author's `art` Python ASCII art library rm pycm/__main__.py - rm Otherfiles/notebook_check.py # also depends on python3Packages.notebook - substituteInPlace setup.py --replace '=get_requires()' '=[]' + # Also depends on python3Packages.notebook + rm Otherfiles/notebook_check.py + substituteInPlace setup.py \ + --replace '=get_requires()' '=[]' ''; - checkInputs = [ pytestCheckHook ]; - disabledTests = [ "pycm.pycm_compare.Compare" ]; # output formatting error - propagatedBuildInputs = [ matplotlib numpy seaborn ]; + disabledTests = [ + # Output formatting error + "pycm.pycm_compare.Compare" + "plot_test" + ]; + + pythonImportsCheck = [ + "pycm" + ]; meta = with lib; { description = "Multiclass confusion matrix library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix new file mode 100644 index 0000000000..ca4c74e2a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pydevccu"; + version = "0.0.9"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "danielperna84"; + repo = pname; + rev = version; + sha256 = "sha256-/4sJ5T17nCcTjg1Me4zTlOEOkK1py9kl2YeLGv4X6us="; + }; + + postPatch = '' + # Fix file name, https://github.com/danielperna84/pydevccu/pull/8 + mv pydevccu/paramset_descriptions/HmIP-STDH.json pydevccu/paramset_descriptions/HmIP-STHD.json + ''; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pydevccu" + ]; + + meta = with lib; { + description = "HomeMatic CCU XML-RPC Server with fake devices"; + homepage = "https://github.com/danielperna84/pydevccu"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix index dd166b78f8..f80f900347 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix @@ -1,18 +1,21 @@ { lib , stdenv -, python -, fetchFromGitHub , buildPythonPackage +, fetchFromGitHub , future -, numpy -, scipy , matplotlib -, nose +, numpy +, pytestCheckHook +, pythonOlder +, scipy }: buildPythonPackage rec { pname = "pydmd"; version = "0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mathLab"; @@ -21,19 +24,31 @@ buildPythonPackage rec { sha256 = "1qwa3dyrrm20x0pzr7rklcw7433fd822n4m8bbbdd7z83xh6xm8g"; }; - propagatedBuildInputs = [ future numpy scipy matplotlib ]; - checkInputs = [ nose ]; + propagatedBuildInputs = [ + future + matplotlib + numpy + scipy + ]; - checkPhase = '' - ${python.interpreter} test.py - ''; - pythonImportsCheck = [ "pydmd" ]; + checkInputs = [ + pytestCheckHook + ]; - meta = { + disabledTestPaths = [ + # Those tests take over 1.5 h on hydra. Also, an error and two failures + "tests/test_spdmd.py" + ]; + + pythonImportsCheck = [ + "pydmd" + ]; + + meta = with lib; { description = "Python Dynamic Mode Decomposition"; homepage = "https://mathlab.github.io/PyDMD/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ yl3dy ]; + license = licenses.mit; + maintainers = with maintainers; [ yl3dy ]; broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyebus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyebus/default.nix index d4c8658673..5506c1fbf3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyebus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyebus/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyebus"; - version = "1.2.4"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "i+p40s9SXey1lfXWW+PiXsA1kUF4o6Rk7QLmQ2ljN6g="; + sha256 = "sha256-6ooOSJAIi8vYmCjDHnbMGQJfPqPmzA5thDSg+iM7T+8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix index 96e807f8eb..651ad1c439 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix @@ -2,12 +2,12 @@ , fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }: buildPythonPackage rec { - version = "0.12.0"; + version = "0.13.0"; pname = "pyFFTW"; src = fetchPypi { inherit pname version; - sha256 = "60988e823ca75808a26fd79d88dbae1de3699e72a293f812aa4534f8a0a58cb0"; + sha256 = "da85102405c0bd95d57eb19e99b01a0729d8406cb204c3900894b873784253da"; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix index b59d292d97..46bc5d49ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "5.1.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "7f351d70b9f4da95ea2d7e50299640e4c46c83b7b24bea5daf110acd2e5aef2b"; + sha256 = "6c9bec5946949d07c76230187cdb9126e8247c94499bbc8e79ded11d17060a60"; }; propagatedBuildInputs = [ python-dateutil botocore ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysimplegui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysimplegui/default.nix index 9542ffe1b3..ecc396d1b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysimplegui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysimplegui/default.nix @@ -2,26 +2,34 @@ , buildPythonPackage , fetchPypi , tkinter +, pythonOlder }: + buildPythonPackage rec { - pname = "PySimpleGUI"; - version = "4.55.1"; + pname = "pysimplegui"; + version = "4.56.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-nUDAoMK0w9Luk1hU5I1yT1CK5oEj9LrIByYS3Z5wfew="; + pname = "PySimpleGUI"; + inherit version; + sha256 = "1a13a19282f92626cc6a823cbe9f4aa08aa558870f03441a1c4e8b6cef27c9d5"; }; - pythonImportsCheck = [ "PySimpleGUI" ]; - propagatedBuildInputs = [ tkinter ]; + pythonImportsCheck = [ + "PySimpleGUI" + ]; + meta = with lib; { - description = "Python GUIs for Humans."; + description = "Python GUIs for Humans"; homepage = "https://github.com/PySimpleGUI/PySimpleGUI"; - license = licenses.gpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ lucasew ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysptk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysptk/default.nix index 478595c1bf..a6129ea20c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysptk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysptk/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pysptk"; - version = "0.1.18"; + version = "0.1.20"; src = fetchPypi { inherit pname version; - sha256 = "34c5ccc40c9e177cfd764daa9f7635c4c1e648e14ce78ba975537dae5a14c4e4"; + sha256 = "29e8e6a76243f3be728d23450982bd9f916530634079252a490ba7182bef30ca"; }; PYSPTK_BUILD_VERSION = 0; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix index 47f5bbb1fd..ccbf5401bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.5"; + version = "3.6.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JZfQI6dgYFHWUbCMuHD78eBi9svoV5zkX887V9xFLNw="; + sha256 = "sha256-ZUAXmIww/tdm7nDAj2VDXq0B6raHeDX1ywxnnv3EVIE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix index 3005c26f77..609ed9cc34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-console-scripts"; - version = "1.2.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "c7f258025110f1337c23499c2f6674b873d4adba2438be55895edf01451c5ce3"; + sha256 = "caeaaaf57f3a99e4482127e8a18467a1cfd49c92f4b37e5578d0bc40bf1b3394"; }; postPatch = '' # setuptools-scm is pinned to <6 because it dropped Python 3.5 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix index 0371b7cac5..1376d3e841 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix @@ -1,23 +1,24 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , pytest , pythonOlder +, setuptoolsBuildHook }: buildPythonPackage rec { pname = "pytest-socket"; - version = "0.4.0"; - disabled = pythonOlder "3.6"; + version = "0.5.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "miketheman"; repo = pname; rev = version; - sha256 = "sha256-cFYtJqZ/RjFbn9XlEy6ffxZ2djisajQAwjV/YR2f59Q="; + hash = "sha256-HdGkpIHFsoAG2+8UyL9jSb3Dm8bWkYzREdY3i15ls/Q="; }; nativeBuildInputs = [ @@ -28,23 +29,12 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ - pytest - ]; - - patches = [ - # Switch to poetry-core, https://github.com/miketheman/pytest-socket/pull/74 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/miketheman/pytest-socket/commit/32519170e656e731d24b81770a170333d3efa6a8.patch"; - sha256 = "19ksgx77rsa6ijcbml74alwc5052mdqr4rmvqhlzvfcvv3676ig2"; - }) - ]; - # pytest-socket require network for majority of tests doCheck = false; - pythonImportsCheck = [ "pytest_socket" ]; + pythonImportsCheck = [ + "pytest_socket" + ]; meta = with lib; { description = "Pytest Plugin to disable socket calls during tests"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix index a5c40533c1..c3e35db28a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,12 +10,14 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.10.1"; - disabled = pythonOlder "3.6"; + version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "7afa7d7c062fa62c173190452265a30feefb844428efc58ea5244f3b9fc0d40f"; + sha256 = "89f82740b76820cf407cee9c43b75ca3ddb72f344f595902ee963837d7664986"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix index 7e961b8a23..c286cb3dc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.20.5"; + version = "0.20.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nSkCARZk6K5JMgiXunRBrb3pn5Ti6f493OOFzJYaW0M="; + sha256 = "64f3ee91cb9424ac1f27a2e13a4d03090a57d2e0e5edf6981a0b4e5295844c81"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt4/default.nix new file mode 100644 index 0000000000..a356bfddb9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt4/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, isPy3k +, isPyPy +, pkgs +, python +, pyqt4 +}: + +buildPythonPackage { + pname = "qscintilla-qt4"; + version = pkgs.qscintilla-qt4.version; + format = "other"; + + disabled = isPyPy; + + src = pkgs.qscintilla-qt4.src; + + nativeBuildInputs = [ pkgs.xorg.lndir ]; + + buildInputs = [ pyqt4.qt pyqt4 ]; + + preConfigure = '' + mkdir -p $out + lndir ${pyqt4} $out + rm -rf "$out/nix-support" + cd Python + ${python.executable} ./configure-old.py \ + --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \ + --apidir $out/api/${python.libPrefix} \ + -n ${pkgs.qscintilla-qt4}/include \ + -o ${pkgs.qscintilla-qt4}/lib \ + --sipdir $out/share/sip + ''; + + meta = with lib; { + description = "A Python binding to QScintilla, Qt based text editing control"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ danbst ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix index 70ee430891..3e43b0d069 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -2,51 +2,53 @@ , pythonPackages , qscintilla , qtbase +, qmake +, qtmacextras +, stdenv }: let - inherit (pythonPackages) buildPythonPackage isPy3k python sip_4 pyqt5; + inherit (pythonPackages) buildPythonPackage isPy3k python sip sipbuild pyqt5 pyqt-builder; in buildPythonPackage rec { - pname = "qscintilla"; + pname = "qscintilla-qt5"; version = qscintilla.version; src = qscintilla.src; - format = "other"; + format = "pyproject"; disabled = !isPy3k; - nativeBuildInputs = [ sip_4 qtbase ]; - buildInputs = [ qscintilla ]; - propagatedBuildInputs = [ pyqt5 ]; + nativeBuildInputs = [ sip qmake pyqt-builder qscintilla ]; + buildInputs = [ qtbase ]; + propagatedBuildInputs = [ pyqt5 ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; dontWrapQtApps = true; postPatch = '' - substituteInPlace Python/configure.py \ - --replace \ - "target_config.py_module_dir" \ - "'$out/${python.sitePackages}'" - ''; - - preConfigure = '' - # configure.py will look for this folder - mkdir -p $out/share/sip/PyQt5 - cd Python - substituteInPlace configure.py \ - --replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}" - ${python.executable} ./configure.py \ - --pyqt=PyQt5 \ - --destdir=$out/${python.sitePackages}/PyQt5 \ - --stubsdir=$out/${python.sitePackages}/PyQt5 \ - --apidir=$out/api/${python.libPrefix} \ - --qsci-incdir=${qscintilla}/include \ - --qsci-featuresdir=${qscintilla}/mkspecs/features \ - --qsci-libdir=${qscintilla}/lib \ - --pyqt-sipdir=${pyqt5}/${python.sitePackages}/PyQt5/bindings \ - --qsci-sipdir=$out/share/sip/PyQt5 \ - --sip-incdir=${sip_4}/include + cp pyproject-qt5.toml pyproject.toml + echo '[tool.sip.project]' >> pyproject.toml + echo 'sip-include-dirs = [ "${pyqt5}/${python.sitePackages}/PyQt5/bindings"]' \ + >> pyproject.toml + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace project.py \ + --replace \ + "if self.project.qsci_external_lib: + if self.qsci_features_dir is not None:" \ + "if self.project.qsci_external_lib: + self.builder_settings.append('QT += widgets') + + self.builder_settings.append('QT += printsupport') + + if self.qsci_features_dir is not None:" ''; + dontConfigure = true; + + build = '' + sip-install --qsci-features-dir ${qscintilla}/mkspecs/features \ + --qsci-include-dir ${qscintilla}/include \ + --qsci-library-dir ${qscintilla}/lib --api-dir ${qscintilla}/share"; + ''; postInstall = '' # Needed by pythonImportsCheck to find the module export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix deleted file mode 100644 index 24719de779..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, buildPythonPackage -, disabledIf -, isPy3k -, isPyPy -, pkgs -, python -, pyqt4 -}: - -disabledIf (isPy3k || isPyPy) - (buildPythonPackage { - # TODO: Qt5 support - pname = "qscintilla"; - version = pkgs.qscintilla.version; - format = "other"; - - src = pkgs.qscintilla.src; - - nativeBuildInputs = [ pkgs.xorg.lndir ]; - - buildInputs = [ pyqt4.qt pyqt4 ]; - - preConfigure = '' - mkdir -p $out - lndir ${pyqt4} $out - rm -rf "$out/nix-support" - cd Python - ${python.executable} ./configure-old.py \ - --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \ - --apidir $out/api/${python.libPrefix} \ - -n ${pkgs.qscintilla}/include \ - -o ${pkgs.qscintilla}/lib \ - --sipdir $out/share/sip - ''; - - meta = with lib; { - description = "A Python binding to QScintilla, Qt based text editing control"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ danbst ]; - platforms = platforms.unix; - }; - }) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix index 43d1494a58..ee2599a8fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix @@ -12,13 +12,16 @@ }: buildPythonPackage rec { - pname = "readme_renderer"; - version = "30.0"; + pname = "readme-renderer"; + version = "32.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-gplwDXqRDDBAcqdgHq+tpnEqWwEaIBOUF+Gx6fBGRdg="; + pname = "readme_renderer"; + inherit version; + sha256 = "sha256-tRK+r6Z5gmDH1a8+Gx8Jfli/zZpXXafE3dXgN0kKW4U="; }; propagatedBuildInputs = [ @@ -34,7 +37,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "readme_renderer" ]; + pythonImportsCheck = [ + "readme_renderer" + ]; meta = with lib; { description = "Python library for rendering readme descriptions"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix index 98c26c7a7f..6517d15df5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rich"; - version = "10.14.0"; + version = "10.16.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "1j1m1064gmy07ah4crds5sd0k7dcwvf2b1z6rvjfvq4v9fx962qv"; + sha256 = "sha256-smeRZTMIDbK9pZRRj42BGj8ifQw9bTTE90rGaV/Up/4="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix index 34d10f8a07..98187f96af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix @@ -6,20 +6,26 @@ buildPythonPackage rec { pname = "sarge"; - version = "0.1.7"; + version = "0.1.7.post1"; format = "setuptools"; src = fetchFromGitHub { owner = "vsajip"; repo = pname; rev = version; - sha256 = "sha256-E1alSDXj0oeyB6dN5PAtN62FPpMsCKb4R9DpfWdFtn0="; + sha256 = "sha256-bT1DbcQi+SbeRBsL7ILuQbSnAj3BBB4+FNl+Zek5xU4="; }; checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # Aarch64-linux times out for these tests, so they need to be disabled. + "test_timeout" + "test_feeder" + ]; + pythonImportsCheck = [ "sarge" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix index b717432a65..7e2096c9b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.0.1"; + version = "1.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rCyp27dU1hz+HIO6hINJjvlR0puT7AnW8AKEfyEKmdo="; + sha256 = "sha256-tYcJWaVIS2FPJtMcpMF1JLGwMXUiGZ3JhcO0JW4DB2c="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix index 7b939342bf..3d895f4a3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "sfepy"; - version = "2021.2"; + version = "2021.4"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sfepy"; repo = "sfepy"; rev = "release_${version}"; - sha256 = "sha256-zFtm4KrpqjYfxVHcMrTU4tMyHYnD9VPEvuId2lR1MHU="; + sha256 = "sha256-+wvFcME02la5JwzD5bvPgBBlkQKF5LWz5MC3+0s5jSs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 5d1d90b372..2abfaef9ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.5.12"; + version = "1.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9FplToUd4CIkYZ88+Lat+joniZzRZDOfifH5z4sH8RM="; + sha256 = "sha256-gYr/+sgkFT24JXNDHgmT4ee5b977Iax9TLZ9/nh7PP0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix index c645a850f4..817ba2dfc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix @@ -9,17 +9,35 @@ }: buildPythonPackage rec { - pname = "SQLObject"; + pname = "sqlobject"; version = "3.9.1"; + format = "setuptools"; src = fetchPypi { - inherit pname version; + pname = "SQLObject"; + inherit version; sha256 = "45064184decf7f42d386704e5f47a70dee517d3e449b610506e174025f84d921"; }; - propagatedBuildInputs = [ FormEncode pastedeploy paste pydispatcher ]; + propagatedBuildInputs = [ + FormEncode + paste + pastedeploy + pydispatcher + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/sqlobject/sqlobject/issues/179 + "test_fail" + ]; + + pythonImportsCheck = [ + "sqlobject" + ]; meta = with lib; { description = "Object Relational Manager for providing an object interface to your database"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/striprtf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/striprtf/default.nix index 3f941d59da..f2639debbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/striprtf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/striprtf/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "striprtf"; - version = "0.0.17"; + version = "0.0.18"; src = fetchPypi { inherit pname version; - sha256 = "e122b5d334cda9b0edb3eeb8910f01d0ffb02eaca054facd75b17b98fcf646f5"; + sha256 = "6bb2dc8a59f3128662f958d647c5e6755f9ad8053f216c88e68514df204926d2"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix index 204bb80e58..299d8446cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub , pythonOlder , h5py , matplotlib @@ -15,10 +17,10 @@ buildPythonPackage rec { pname = "sumo"; version = "2.2.5"; + format = "setuptools"; disabled = pythonOlder "3.6"; - # No tests in Pypi tarball src = fetchFromGitHub { owner = "SMTG-UCL"; repo = "sumo"; @@ -38,7 +40,18 @@ buildPythonPackage rec { castepxbin ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "castepxbin==0.1.0" "castepxbin>=0.1.0" + ''; + + pythonImportsCheck = [ + "sumo" + ]; meta = with lib; { description = "Toolkit for plotting and analysis of ab initio solid-state calculation data"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix index 2bb07b3730..e2838ad526 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix @@ -31,12 +31,12 @@ buildPythonPackage rec { pname = "sunpy"; - version = "3.1.2"; + version = "3.1.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5eeb479c3f2424bf46355165249a1caa849872f8bee525349c4dca4d15b271fd"; + sha256 = "4acb05a05c7e6a2090cd0bb426b34c7e1620be0de2bf90a95a3f48ba15a5fce2"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix index 245e619e89..fbe99c6fa9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix @@ -10,19 +10,19 @@ , lzo , numpy , numexpr -, setuptools +, packaging # Test inputs , pytestCheckHook }: buildPythonPackage rec { pname = "tables"; - version = "3.6.1"; + version = "3.7.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0j8vnxh2m5n0cyk9z3ndcj5n1zj5rdxgc1gb78bqlyn2lyw75aa9"; + sha256 = "sha256-6SqIetbyqYPlZKaZAt5KdkXDAGn8AavTU+xdolXF4f4="; }; nativeBuildInputs = [ cython ]; @@ -36,17 +36,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy numexpr - setuptools # uses pkg_resources at runtime + packaging # uses packaging.version at runtime ]; - patches = [ - (fetchpatch { - # Needed for numpy >= 1.20.0 - name = "tables-pr-862-use-lowercase-numpy-dtypes.patch"; - url = "https://github.com/PyTables/PyTables/commit/93a3272b8fe754095637628b4d312400e24ae654.patch"; - sha256 = "00czgxnm1dxp9763va9xw1nc7dd7kxh9hjcg9klim52519hkbhi4"; - }) - ]; # When doing `make distclean`, ignore docs postPatch = '' substituteInPlace Makefile --replace "src doc" "src" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix index 54f32d182c..e780aba228 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix @@ -1,45 +1,36 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytest -, nose +, pytestCheckHook , isPy27 , numpy , scipy , sparse -, pytorch }: buildPythonPackage rec { pname = "tensorly"; - version = "0.4.5"; + version = "0.7.0"; disabled = isPy27; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1ml91yaxwx4msisxbm92yf22qfrscvk58f3z2r1jhi96pw2k4i7x"; + sha256 = "VcX3pCczZQUYZaD7xrrkOcj0QPJt28cYTwpZm5D/X3c="; }; - propagatedBuildInputs = [ numpy scipy sparse ] - ++ lib.optionals (!doCheck) [ nose ]; # upstream added nose to install_requires - - checkInputs = [ pytest nose pytorch ]; - # also has a cupy backend, but the tests are currently broken - # (e.g. attempts to access cupy.qr instead of cupy.linalg.qr) - # and this backend also adds a non-optional CUDA dependence, - # as well as tensorflow and mxnet backends, but the tests don't - # seem to exercise these backend by default - - # uses >= 140GB of ram to test - doCheck = false; - checkPhase = '' - runHook preCheck - nosetests -e "test_cupy" - runHook postCheck + # nose is not actually required for anything + # (including testing with the minimal dependencies) + postPatch = '' + substituteInPlace setup.py --replace ", 'nose'" "" ''; + propagatedBuildInputs = [ numpy scipy sparse ]; + + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tensorly" ]; + pythonImportsCheck = [ "tensorly" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tomli-w/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tomli-w/default.nix new file mode 100644 index 0000000000..bbd928ac16 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tomli-w/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, callPackage +, fetchFromGitHub +, flit-core +}: + +buildPythonPackage rec { + pname = "tomli-w"; + version = "1.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hukkin"; + repo = pname; + rev = version; + sha256 = "sha256-wZSC5uOi1JUeKXIli1I8/Vo0wGsv9Q1I84dAMQQP95w="; + }; + + nativeBuildInputs = [ flit-core ]; + + pythonImportsCheck = [ "tomli_w" ]; + + meta = with lib; { + description = "A write-only counterpart to Tomli, which is a read-only TOML parser"; + homepage = "https://github.com/hukkin/tomli-w"; + license = licenses.mit; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index e2ccb99da6..9c8818dd11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.9.36"; + version = "3.9.40"; src = fetchPypi { inherit pname version; - sha256 = "f01e8edab14d1999700c980c21a1546f37417216ad915a53be649d263130181e"; + sha256 = "321005b498361548ce2e048f8499a347d8f38c75ff9f74cee7b118c84b0c41d4"; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix index 382bd31117..398f71a4c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.18.2"; + version = "3.18.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yiHe3+d1msvrDNj1xyp0/zxAmuDAe8HZTv9RI6wPojw="; + sha256 = "d3e253ebc1ba5e78932fef703dc4316afb7e5facd0ce8661b3921c9d541e16a7"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uritemplate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uritemplate/default.nix index 5077267528..814e7fd8c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uritemplate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uritemplate/default.nix @@ -1,25 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, simplejson, pytest, glibcLocales }: +{ lib +, buildPythonPackage +, fetchPypi +, simplejson +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "uritemplate"; - version = "3.0.1"; + version = "4.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae"; + sha256 = "sha256-Q0bt/Fw7efaUvM1tYJmjIrvrYo2/LNhu6lWkVs5RJPA="; }; - propagatedBuildInputs = [ simplejson ]; + propagatedBuildInputs = [ + simplejson + ]; - checkInputs = [ pytest glibcLocales ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - LC_ALL=en_US.UTF-8 py.test - ''; + pythonImportsCheck = [ + "uritemplate" + ]; meta = with lib; { + description = "Implementation of RFC 6570 URI templates"; homepage = "https://github.com/python-hyper/uritemplate"; - description = "URI template parsing for Humans"; license = with licenses; [ asl20 bsd3 ]; maintainers = with maintainers; [ matthiasbeyer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix index ea7825d9ff..3032f7791a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry -, pytest-cov +, fetchpatch +, poetry-core , pytest-flakes , pytest-mock , pytest-socket @@ -19,22 +19,41 @@ buildPythonPackage rec { owner = "niksite"; repo = pname; rev = version; - sha256 = "09nac5nh94x0n4bfazjfxk96b20mfsx6r1fnvqv85gkzs0rwqkaq"; + hash = "sha256-WE3MM9B/voI23taFbLp2FYhl0uxOfuUWsaCTBG1hyiY="; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ + poetry-core + ]; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; checkInputs = [ - pytest-cov pytest-flakes pytest-mock pytest-socket pytestCheckHook ]; - pythonImportsCheck = [ "url_normalize" ]; + patches = [ + # Switch to poetry-core, https://github.com/niksite/url-normalize/pull/28 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/niksite/url-normalize/commit/b8557b10c977b191cc9d37e6337afe874a24ad08.patch"; + sha256 = "sha256-SVCQATV9V6HbLmjOHs7V7eBagO0PuqZLubIJghBYfQQ="; + }) + ]; + + postPatch = '' + sed -i "/--cov/d" tox.ini + sed -i "/--flakes/d" tox.ini + ''; + + pythonImportsCheck = [ + "url_normalize" + ]; meta = with lib; { description = "URL normalization for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix index 80c297fe77..e584b3de3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.11.0"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "VirusTotal"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-PpgN9adGNZOorOUigsBVOb//ZafUaYHfo/Fv1IZf/XA="; + rev = version; + sha256 = "sha256-yf1p56+mGVzG4HBlbIp/HvNSYJGQufzYjmPrtITaV5o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix index 2bbb281f08..b6403a38df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "watermark"; - version = "2.2.0"; + version = "2.3.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rasbt"; repo = pname; - rev = "d3553b68dd30ac5b0951a6fae6083236e4c7f3bd"; - sha256 = "0w2mzi344x1mrv8d9jca67bhig34jissr9sqrk68gpg5n10alblb"; + rev = "v${version}"; + sha256 = "1kl9yn1pkl84d3lcz7bvphqkydsgs0p5k0ja0msy3hrxxfzdzd16"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix index 602bbac89a..37fb5edf70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -1,34 +1,48 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , numpy , pandas +, pytestCheckHook +, pythonOlder , setuptools -, isPy3k -, setuptools-scm +, setuptoolsBuildHook }: buildPythonPackage rec { pname = "xarray"; - version = "0.20.1"; - disabled = !isPy3k; + version = "0.20.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "9c0bffd8b55fdef277f8f6c817153eb51fa4e58653a7ad92eaed9984164b7bdb"; + sha256 = "sha256-wuvoDKgbEKAkH2h23MNKyWluXFzc30dY2nz0vXMsQfc="; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ numpy pandas setuptools ]; - checkInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + setuptoolsBuildHook + ]; - pythonImportsCheck = [ "xarray" ]; + propagatedBuildInputs = [ + numpy + pandas + setuptools + ]; - meta = { + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "xarray" + ]; + + meta = with lib; { description = "N-D labeled arrays and datasets in Python"; homepage = "https://github.com/pydata/xarray"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ fridh ]; + license = licenses.asl20; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix index 059316f7a9..db27afcfe6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.67"; + version = "0.1.68"; src = fetchFromGitHub { owner = "ranaroussi"; repo = pname; rev = version; - sha256 = "sha256-QwWShXelEBgLUvCwPqB7z5DjS1JsW/krPrsS3VkyaJg="; + sha256 = "sha256-ubOC56DUViClARzMSRtDFrtxhilmVkhKMx9SxLbYFiA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index 38921d25fe..ee3009a633 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -46,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.702"; + version = "2.0.707"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-6FaJkGQpjTNW73D39KD9qMw97znt9B1vzdlJPvqI7Vo="; + sha256 = "sha256-AsKsv3fKubFZZMZHBRuVmgeGJB1zTe00J2kmqikBiD8="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix index e632c3c3cc..c316ef970f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "rizin"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - sha256 = "sha256-muS3+cR75jZl/Q5ZN1srEPg8NxVquwRMpNYcHw/Ij34="; + sha256 = "sha256-T65gm1tfRD7dZSL8qZKMTAbQ65Lx/ecidFc9T1b7cig="; }; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix index 592564878e..7dfb6c9b2a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = lib.licenses.epl10; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ thiagokokada ]; + mainProgram = "lein"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/0.60/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/0.60/default.nix index 79870cd4d1..a5efccfac9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/0.60/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/0.60/default.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "0.60.2"; + version = "0.60.3"; src = python3.pkgs.fetchPypi { inherit pname version; - hash = "sha256-ZOaWhWW/G4FS9PnWyoFU77nhTKqaq/eyLnHmxdBT6SE="; + hash = "sha256-h8pfqTWKAYZFKTkr1k4CcVjrlK/KfHdmsYZu8n7MuY4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix index a575b0ee3b..37cb4dd866 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,7 +3,7 @@ writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }: let - version = "3.17.0"; + version = "3.18.0"; owner = "erlang"; deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; }; rebar3 = stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ let inherit owner; repo = pname; rev = version; - sha256 = "02sk3whrbprzlih4pgcsd6ngmassfjfmkz21gwvb7mq64pib40k6"; + sha256 = "09648hzc2mnjwf9klm20cg4hb5rn2xv2gmzcg98ffv37p5yfl327"; }; buildInputs = [ erlang ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix index 8882feaf3c..3848600cb4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix @@ -16,23 +16,23 @@ let }; relx = builder { name = "relx"; - version = "4.5.0"; + version = "4.6.0"; src = fetchHex { pkg = "relx"; - version = "4.5.0"; - sha256 = "sha256-3bWPIMzmymP1onJeklgW3XITR2aYo/PDy0+ownIgLFI="; + version = "4.6.0"; + sha256 = "sha256-L/gTHGMJPGIcazfcUtGyhIqTiIZYS0twHTW9vkN39Qk="; }; beamDeps = [ bbmustache ]; }; providers = builder { name = "providers"; - version = "1.8.1"; + version = "1.9.0"; src = fetchHex { pkg = "providers"; - version = "1.8.1"; - sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + version = "1.9.0"; + sha256 = "sha256-0ofodEBqFQVghkKwo9tbaNato/KrABrsh+f018efwBc="; }; - beamDeps = [ getopt ]; + beamDeps = [ erlware_commons getopt ]; }; getopt = builder { name = "getopt"; @@ -86,21 +86,21 @@ let }; certifi = builder { name = "certifi"; - version = "2.6.1"; + version = "2.8.0"; src = fetchHex { pkg = "certifi"; - version = "2.6.1"; - sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34="; + version = "2.8.0"; + sha256 = "sha256-asfvwcb4YAsI1iUpLUu/WE4UhHzhtrXETZg9Jz4Ql+o="; }; beamDeps = [ ]; }; bbmustache = builder { name = "bbmustache"; - version = "1.10.0"; + version = "1.12.2"; src = fetchHex { pkg = "bbmustache"; - version = "1.10.0"; - sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4="; + version = "1.12.2"; + sha256 = "sha256-aIszpNXMLVH1da3ws2g/xAo4MUovFQkG7c/Hf1tXezs="; }; beamDeps = [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix b/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix index a233288a28..31642f5b00 100644 --- a/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "CastXML"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-MschwCEkZrZmNgr8a1ocdukjXzHbXl2gmkPmygJaA6k="; + hash = "sha256-VtkMjZOcF5OAHkezlupXOpNwqUD1oKHdRbtG2FZBRL4="; }; nativeBuildInputs = [ @@ -30,23 +30,23 @@ stdenv.mkDerivation rec { sphinx ]; - cmakeFlags = [ - "-DCLANG_RESOURCE_DIR=${libclang.dev}/" - "-DSPHINX_HTML=${if withHTML then "ON" else "OFF"}" - "-DSPHINX_MAN=${if withManual then "ON" else "OFF"}" - ]; - buildInputs = [ + libclang libffi libxml2 zlib - libclang ]; propagatedBuildInputs = [ libclang ]; + cmakeFlags = [ + "-DCLANG_RESOURCE_DIR=${libclang.dev}/" + "-DSPHINX_HTML=${if withHTML then "ON" else "OFF"}" + "-DSPHINX_MAN=${if withManual then "ON" else "OFF"}" + ]; + # 97% tests passed, 97 tests failed out of 2881 # mostly because it checks command line and nix append -isystem and all doCheck = false; @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix b/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix new file mode 100644 index 0000000000..dc5b875ac0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix @@ -0,0 +1,42 @@ +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, makeWrapper, git }: + +rustPlatform.buildRustPackage rec { + pname = "cocogitto"; + version = "4.0.1"; + + src = fetchFromGitHub { + owner = "oknozor"; + repo = pname; + rev = version; + sha256 = "sha256-uSKzHo1lEBiXsi1rOKvfD2zVlkAUVZ5k0y8iiTXYE2A="; + }; + + cargoSha256 = "sha256-gss3+XXyM//zER3gnN9qemIWaVDfs/f4gljmukMxoq0="; + + # Test depend on git configuration that would likly exist in a normal user enviroment + # and might be failing to create the test repository it works in. + doCheck = false; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; + + buildInputs = lib.optional stdenv.isDarwin Security; + + postInstall = '' + installShellCompletion --cmd cog \ + --bash <($out/bin/cog generate-completions bash) \ + --fish <($out/bin/cog generate-completions fish) \ + --zsh <($out/bin/cog generate-completions zsh) + + wrapProgram $out/bin/cog \ + --prefix PATH : "${lib.makeBinPath [ git ]}" + wrapProgram $out/bin/coco \ + --prefix PATH : "${lib.makeBinPath [ git ]}" + ''; + + meta = with lib; { + description = "A set of cli tools for the conventional commit and semver specifications"; + homepage = "https://github.com/oknozor/cocogitto"; + license = licenses.mit; + maintainers = with maintainers; [ travisdavis-ops ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/database/indradb/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/indradb/default.nix new file mode 100644 index 0000000000..f577963e8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/database/indradb/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, fetchFromGitHub +, lib +, rustPlatform +, rustfmt +}: +let + src = fetchFromGitHub { + owner = "indradb"; + repo = "indradb"; + rev = "06134dde5bb53eb1d2aaa52afdaf9ff3bf1aa674"; + sha256 = "sha256-g4Jam7yxMc+piYQzgMvVsNTF+ce1U3thzYl/M9rKG4o="; + }; + + meta = with lib; { + description = "A graph database written in rust "; + homepage = "https://github.com/indradb/indradb"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + platforms = platforms.unix; + }; +in +{ + indradb-server = rustPlatform.buildRustPackage { + pname = "indradb-server"; + version = "unstable-2021-01-05"; + inherit src; + + cargoSha256 = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js="; + + buildAndTestSubdir = "server"; + + nativeBuildInputs = [ rustfmt ]; + + # test rely on libindradb and it can't be found + # failure at https://github.com/indradb/indradb/blob/master/server/tests/plugins.rs#L63 + # `let _server = Server::start(&format!("../target/debug/libindradb_plugin_*.{}", LIBRARY_EXTENSION)).unwrap();` + doCheck = false; + }; + indradb-client = rustPlatform.buildRustPackage { + pname = "indradb-client"; + version = "unstable-2021-01-05"; + inherit src; + + cargoSha256 = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM="; + + nativeBuildInputs = [ rustfmt ]; + + buildAndTestSubdir = "client"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index 26d3377b22..f755c4593e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,19 +5,19 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.8.2"; - disabled = python3.pythonOlder "3.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-0FlXHUjoeZ7XfmOSlY30b13i2t/4vyWwhDKXquXKaJE="; + hash = "sha256-AxK5pRuNkhJokuuv/5/ZJxZ2J9d6XLFPZJWQfq9baaU="; }; propagatedBuildInputs = with python3.pkgs; [ appdirs cached-property + chardet click colorama configparser @@ -26,12 +26,16 @@ python3.pkgs.buildPythonApplication rec { oyaml pathspec pytest + regex tblib toml tqdm typing-extensions ] ++ lib.optionals (pythonOlder "3.7") [ dataclasses + ] ++ lib.optionals (pythonOlder "3.8") [ + backports.cached-property + importlib_metadata ]; checkInputs = with python3.pkgs; [ @@ -53,7 +57,9 @@ python3.pkgs.buildPythonApplication rec { "test__rules__std_file_dbt" ]; - pythonImportsCheck = [ "sqlfluff" ]; + pythonImportsCheck = [ + "sqlfluff" + ]; meta = with lib; { description = "SQL linter and auto-formatter"; diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix index a09bd4a99d..eeca6ccfbb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix @@ -115,14 +115,14 @@ rec { headers = "1idam1xirxqxqg4g7n33kdx2skk0r351m00g59a8yx9z82g06ah9"; }; - electron_13 = mkElectron "13.6.3" { - armv7l-linux = "a293a9684e16a427a9f68d101814575a4b1dd232dc3fca47552f906019a6cadc"; - aarch64-linux = "1599d259832c806b98751a68fb93112711963d259024f0e36f12f064995b3251"; - x86_64-linux = "7607422a4ba80cda4bd7fefb2fbe2f4e0b9a73db92e1e82dc01012a85b5d0d2b"; - i686-linux = "db9261c05ed57af2fcd4a84b89d299c76948b9d57ce0dba38e3240eb43935257"; - x86_64-darwin = "6bf09794d6f020bbaaf806a7758da125137b3c96646f4503eb81b9541e50e02f"; - aarch64-darwin = "374ddf0581794b31eee900828172f9218193c032c0e46bffcfac6aec95c22f1a"; - headers = "0v1n8izy83qq3ljs6191a7mzr6nnda5ib9ava1cjddkshl8pampq"; + electron_13 = mkElectron "13.6.6" { + armv7l-linux = "4d8a8bde1c993bfc20afb2b23e55101ad2048f5ddd89ab86043f510470aeba8d"; + aarch64-linux = "6d1480f80d43cdebd9f74cb62b64c9d16bee29b68b863faf7c50fcb91f63985c"; + x86_64-linux = "62b9ba2fea4f0f54fd54bce8a532d14132302a66ec99173764f44234fa76925e"; + i686-linux = "b83860318b2e591b150dc9578ea749f66ab9a18aafbe69dadb622b9ca131e695"; + x86_64-darwin = "a59b7270f86286e4ee217552b8729621f4b282360ad15391886d5686008b6933"; + aarch64-darwin = "1f445d2f02d1054a760bdaafb755677a35c495e64385e2d2a5547b6750a82dfa"; + headers = "0qdlw17jxhhcamr8g2ybbs2jkijzdq82qgc3knr4kdxb425q898r"; }; electron_14 = mkElectron "14.2.3" { @@ -145,13 +145,13 @@ rec { headers = "1xnbzskvf8p5a07bha41qqnw1hb68f019qrda3z2jn96m3qnj46r"; }; - electron_16 = mkElectron "16.0.5" { - armv7l-linux = "16381d22f6f3c7990435598fc50addf8addde2fa749ab23672733ec90b8d53ef"; - aarch64-linux = "6274bdf2a3894ce9ddb70800df497a034893e1be5e2d07763e339550009d53b6"; - x86_64-linux = "2830a9f8fc5e7fa4f70997e11d55b250e90db511b29da22699e1fe23b153128c"; - i686-linux = "363e2588f57f3d31e506e759f723768b543baf248dfb518d06747ffa0a8d8ab1"; - x86_64-darwin = "0bb7f2c506d8c3e9ef7ec4049baf87a3365cbf80c569f6eb98ddc1a2ddb653e6"; - aarch64-darwin = "de4eac412a942a0b238792a38c0c80691d1a7ef2eba850c15619c0db9da89f1a"; - headers = "1pdi86sq60z9bqd81fvgl14c3bk21wk9mwkqyn653yq4zk0mqpi5"; + electron_16 = mkElectron "16.0.6" { + armv7l-linux = "f15d665cbf487538f5448a318519e16e3c07a5f7b55895541df1c067c9cfcb55"; + aarch64-linux = "92037b0886a9404c7f9027e7597df552b2c0011ded100537f4287e4e925db6dc"; + x86_64-linux = "0017aba47756b962b9571ccd9dcf6297af0f603b879e26f49bab8728bb64567d"; + i686-linux = "11ae3628d27d12612a8742b72b0dc4521c9b2cd303619046c6f6a36282f43c72"; + x86_64-darwin = "250489ca6b1bec91f4d59766c1d4f65407f016765395517a6dfd5625e93d646f"; + aarch64-darwin = "a4416627a3055308259689fd156a7d4fd704983420a20e8939409b08195af204"; + headers = "00iq8v3nm42f9fphwd50vdng51bd291rk33zcavpidiw29hrqi9m"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix index 086cd5d05a..4aefc02e15 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { meta = with lib; { description = "Tools for interacting with remote images and registries including crane and gcrane"; homepage = "https://github.com/google/go-containerregistry"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix index 822633982c..05ffe14dd4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.9.2"; + version = "3.10.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-nlIgX7TV3bWi8vaYQ9kXmNzGlVLgRUDNkNApwrAw3EQ="; + sha256 = "sha256-E0wMFdLK8lA8oluFQuq7hPMWh4t6OsoJ14d7ErDjAdA="; }; - vendorSha256 = "sha256-Dmn3LJ+TBO/F3N5lgrNXXrFJ5KTp6r45ZwU11LxvQSg="; + vendorSha256 = "sha256-ClMvbxDKwwoVUC9+AJPZfBxJ26KKuLueUn9Nz/gh4Fs="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index a142d9a9d9..706d8e428f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { ]; postInstall = '' - for shell in bash zsh; do + for shell in bash zsh fish; do HOME=$TMPDIR $out/bin/golangci-lint completion $shell > golangci-lint.$shell installShellCompletion golangci-lint.$shell done diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 9f67317d71..2b5f6c4da8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,4 +1,4 @@ -{ lib, supportedGhcVersions ? [ "884" "8107" "901" ], stdenv, haskellPackages +{ lib, supportedGhcVersions ? [ "884" "8107" "902" ], stdenv, haskellPackages , haskell }: # # The recommended way to override this package is diff --git a/third_party/nixpkgs/pkgs/development/tools/kube-linter/default.nix b/third_party/nixpkgs/pkgs/development/tools/kube-linter/default.nix new file mode 100644 index 0000000000..1b94b95629 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/kube-linter/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub, testVersion, kube-linter }: + +buildGoModule rec { + pname = "kube-linter"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "stackrox"; + repo = pname; + rev = "${version}"; + sha256 = "GUDrUEBorV4/ZqPnfNYcsbW4Zr1LpS3yL+4OgxFbTOk="; + }; + + vendorSha256 = "xGghTP9thICOGIfc5VPJK06DeXfLiTckwa4nXv83/P8="; + + ldflags = [ + "-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}" + ]; + + passthru.tests.version = testVersion { + package = kube-linter; + command = "kube-linter version"; + }; + + meta = with lib; { + description = "A static analysis tool that checks Kubernetes YAML files and Helm charts"; + homepage = "https://kubelinter.io"; + license = licenses.asl20; + maintainers = with maintainers; [ mtesseract ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index 5e3c750852..2e11ad9f8a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -17,10 +17,14 @@ buildGraalvmNativeImage rec { }; # https://github.com/clojure-lsp/clojure-lsp/blob/2021.11.02-15.24.47/graalvm/native-unix-compile.sh#L18-L27 - DTLV_LIB_EXTRACT_DIR = "/tmp"; + # Needs to be inject on `nativeImageBuildArgs` inside shell environment, + # otherwise we can't expand to the value set in `mktemp -d` call + preBuild = '' + export DTLV_LIB_EXTRACT_DIR="$(mktemp -d)" + nativeImageBuildArgs+=("-H:CLibraryPath=$DTLV_LIB_EXTRACT_DIR") + ''; extraNativeImageBuildArgs = [ - "-H:CLibraryPath=${DTLV_LIB_EXTRACT_DIR}" "--no-fallback" "--native-image-info" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix index 8d0625d7be..752803ee05 100644 --- a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rdtFzHpOvv1uJBigJWenWyIZF/wpYP7iBW2FCsfq2d4="; + sha256 = "sha256-9V8vuFfyEdSzOG3Azk/e55N+Oh1VtMgcM+/PEMwJ6DI="; }; - cargoSha256 = "sha256-/4ZW1FIfK51ak2EIV6dYY3XpucPPR+OZySPWwcKP4v0="; + cargoSha256 = "sha256-PrZojkObidzzVv6KwFtI1QUGj5UB5TiMmzdBKq45Ci4="; buildFeatures = lib.optional lua52Support "lua52" ++ lib.optional luauSupport "luau"; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 31a8ef404d..32507f0d5a 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XzpOJTLTiF4GrECC7ObFzoPusFM8mvhUGH9F52o88MY="; + sha256 = "sha256-i8BfLnZnkHBPyNy4vUUA9J1f757KCjJ/DsWLPMVxsEg="; }; - cargoSha256 = "sha256-7uTxDkAyViNidSDH6bdUrtP96vQgyz+p2OlK+/FUJvc="; + cargoSha256 = "sha256-bYRBIdB9/F9OgFxC2LZ24HJWQRLeji978Z2cpH18lY8="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index ab826c4f0b..8c6724d9e3 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -1,111 +1,70 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs -, dotnetCorePackages, dotnetPackages, cacert -, ffmpeg_4, alsa-lib, SDL2, lttng-ust, numactl, alsa-plugins +{ lib +, stdenvNoCC +, buildDotnetModule +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, ffmpeg +, alsa-lib +, SDL2 +, lttng-ust +, numactl }: -let - runtimeDeps = [ - ffmpeg_4 alsa-lib SDL2 lttng-ust numactl - ]; - - dotnet-sdk = dotnetCorePackages.sdk_5_0; - dotnet-runtime = dotnetCorePackages.runtime_5_0; - - # https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#using-rids - runtimeId = "linux-x64"; - -in stdenv.mkDerivation rec { +buildDotnetModule rec { pname = "osu-lazer"; - version = "2021.1113.0"; + version = "2021.1225.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "EDW3DGnDkdH6k4XKDc5xWFYeIMcoRN4S9nMBF+TeAl8="; + sha256 = "sha256-kN5pR37b0giKGJVnJo/Mce+MWFwZiY+mZAHG/fUt0O4="; }; - nativeBuildInputs = [ - dotnet-sdk dotnetPackages.Nuget makeWrapper - # FIXME: Without `cacert`, we will suffer from https://github.com/NuGet/Announcements/issues/49 - cacert + projectFile = "osu.Desktop/osu.Desktop.csproj"; + nugetDeps = ./deps.nix; + + nativeBuildInputs = [ copyDesktopItems ]; + + preConfigure = '' + dotnetFlags+=( + --runtime linux-x64 + ) + ''; + + runtimeDeps = [ + ffmpeg + alsa-lib + SDL2 + lttng-ust + numactl ]; - nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { - fetchNuGet = { pname, version, sha256 }: fetchurl { - name = "${pname}-${version}.nupkg"; - url = "https://www.nuget.org/api/v2/package/${pname}/${version}"; - inherit sha256; - }; - }); - - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_NOLOGO=1 - - nuget sources Add -Name nixos -Source "$PWD/nixos" - nuget init "$nugetDeps" "$PWD/nixos" - - # FIXME: https://github.com/NuGet/Home/issues/4413 - mkdir -p $HOME/.nuget/NuGet - cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet - - dotnet restore --source "$PWD/nixos" osu.Desktop --runtime ${runtimeId} - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - dotnet build osu.Desktop \ - --no-restore \ - --configuration Release \ - --runtime ${runtimeId} \ - -p:Version=${version} - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - dotnet publish osu.Desktop \ - --no-build \ - --configuration Release \ - --runtime ${runtimeId} \ - --no-self-contained \ - --output $out/lib/osu - - makeWrapper $out/lib/osu/osu\! $out/bin/osu\! \ - --set DOTNET_ROOT "${dotnet-runtime}" \ - --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" - for i in 16 32 48 64 96 128 256 512 1024; do - install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png - done - cp -r ${makeDesktopItem { - desktopName = "osu!"; - name = "osu"; - exec = "osu!"; - icon = "osu!"; - comment = meta.description; - type = "Application"; - categories = "Game;"; - }}/share/applications $out/share - - runHook postInstall - ''; + executables = [ "osu!" ]; fixupPhase = '' runHook preFixup - cp -f ${./osu.runtimeconfig.json} "$out/lib/osu/osu!.runtimeconfig.json" - ln -sft $out/lib/osu ${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary} + + for i in 16 32 48 64 96 128 256 512 1024; do + install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png + done + + ln -sft $out/lib/${pname} ${SDL2}/lib/libSDL2${stdenvNoCC.hostPlatform.extensions.sharedLibrary} + cp -f ${./osu.runtimeconfig.json} "$out/lib/${pname}/osu!.runtimeconfig.json" + runHook postFixup ''; - # Strip breaks the executable. - dontStrip = true; + desktopItems = [(makeDesktopItem { + desktopName = "osu!"; + name = "osu"; + exec = "osu!"; + icon = "osu!"; + comment = meta.description; + type = "Application"; + categories = "Game;"; + })]; meta = with lib; { description = "Rhythm is just a *click* away"; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index 96b257204f..e6ebf84830 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -4,65 +4,66 @@ (fetchNuGet { pname = "DiffPlex"; version = "1.7.0"; sha256 = "09a8hkbx99iwikfl8war629945yv7i8llj9480dbc4kyp6qqlr00"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) - (fetchNuGet { pname = "Fody"; version = "6.5.3"; sha256 = "14yj3xj4jh2ayl8jsyypxv9af0xbw30946kn14m0bfmlyl027wkp"; }) + (fetchNuGet { pname = "Fody"; version = "6.6.0"; sha256 = "0cx708ah61cxmvpaq040mhqwrv937rvlmskwihg1w118729k9yv0"; }) (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.37"; sha256 = "1q0kkw2rhvxi67hqv18ziv2dvmhi7f68745gcs1253mwv5da4vy6"; }) - (fetchNuGet { pname = "Humanizer"; version = "2.11.10"; sha256 = "057pqzvdxsbpnnc5f1xkqg7j3ywp68ggia3w74fgqp0158dm6rdk"; }) - (fetchNuGet { pname = "Humanizer.Core"; version = "2.11.10"; sha256 = "0z7kmd5rh1sb6izq0vssk6c2p63n00xglk45s7ga9z18z9aaskxv"; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.39"; sha256 = "05rlw9h3ps1gx4pwdxjwpx1lajyvj1b35j3536ixfmnnvjx4v2yj"; }) + (fetchNuGet { pname = "Humanizer"; version = "2.13.14"; sha256 = "155g2700x6sbym2jd4dshm4rf3jjr8flx6w9xnw28zrrv7r2rdy8"; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.13.14"; sha256 = "1ni4mcyhcs46ih9b8c8l3xq3iai56rdlcw0afwhji3hxwbxqbk7i"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.2.0"; sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; }) - (fetchNuGet { pname = "Humanizer.Core.af"; version = "2.11.10"; sha256 = "18fiixfvjwn8m1i8z2cz4aqykzylvfdqmmpwc2zcd8sr1a2xm86z"; }) - (fetchNuGet { pname = "Humanizer.Core.ar"; version = "2.11.10"; sha256 = "009fpm4jd325izm82ipipsvlwd31824gvskda68bdwi4yqmycz4p"; }) - (fetchNuGet { pname = "Humanizer.Core.az"; version = "2.11.10"; sha256 = "144b9diwprabxwgi5a98k5iy95ajq4p7356phdqi2lhzwbz7b6a9"; }) - (fetchNuGet { pname = "Humanizer.Core.bg"; version = "2.11.10"; sha256 = "1b9y40gvq2kwnj5wa40f8cbywv79jkajcwknagrgr27sykpfadl2"; }) - (fetchNuGet { pname = "Humanizer.Core.bn-BD"; version = "2.11.10"; sha256 = "18pn4jcp36ygcx283l3fi9bs5d7q1a384b72a10g5kl0qckn88ay"; }) - (fetchNuGet { pname = "Humanizer.Core.cs"; version = "2.11.10"; sha256 = "03crw1lnzp32v2kcdmllkrsqh07r4ggw9gyc96qw7cv0nk5ch1h8"; }) - (fetchNuGet { pname = "Humanizer.Core.da"; version = "2.11.10"; sha256 = "0glby12zra3y3yiq4cwq1m6wjcjl8f21v8ghi6s20r48glm8vzy9"; }) - (fetchNuGet { pname = "Humanizer.Core.de"; version = "2.11.10"; sha256 = "0a35xrm1f9p74x0fkr52bw9sd54vdy9d5rnvf565yh8ww43xfk7b"; }) - (fetchNuGet { pname = "Humanizer.Core.el"; version = "2.11.10"; sha256 = "0bhwwdx5vc48zikdsbrkghdhwahxxc2lkff0yaa5nxhbhasl84h8"; }) - (fetchNuGet { pname = "Humanizer.Core.es"; version = "2.11.10"; sha256 = "07bw07qy8nyzlgxl7l2lxv9f78qmkfppgzx7iyq5ikrcnpvc7i9q"; }) - (fetchNuGet { pname = "Humanizer.Core.fa"; version = "2.11.10"; sha256 = "00d4hc1pfmhfkc5wmx9p7i00lgi4r0k6wfcns9kl1syjxv3bs5f2"; }) - (fetchNuGet { pname = "Humanizer.Core.fi-FI"; version = "2.11.10"; sha256 = "0z4is7pl5jpi4pfdvd2zvx5mp00bj26d9l9ksqyc0liax8nfzyik"; }) - (fetchNuGet { pname = "Humanizer.Core.fr"; version = "2.11.10"; sha256 = "0sybpg6kbbhrnk7gxcdk7ppan89lsfqsdssrg4i1dm8w48wgicap"; }) - (fetchNuGet { pname = "Humanizer.Core.fr-BE"; version = "2.11.10"; sha256 = "1s25c86nl9wpsn6fydzwv4rfmdx5sm0vgyd7xhw5344k20gazvhv"; }) - (fetchNuGet { pname = "Humanizer.Core.he"; version = "2.11.10"; sha256 = "1nx61qkjd6p9r36dmnm4942khyv35fpdqmb2w69gz6463g4d7z29"; }) - (fetchNuGet { pname = "Humanizer.Core.hr"; version = "2.11.10"; sha256 = "02jhcyj72prkqsjxyilv04drm0bknqjh2r893jlbsfi9vjg2zay3"; }) - (fetchNuGet { pname = "Humanizer.Core.hu"; version = "2.11.10"; sha256 = "0yb6ly4s1wdyaf96h2dvifqyb575aid6irwl3qx8gcvrs0xpcxdp"; }) - (fetchNuGet { pname = "Humanizer.Core.hy"; version = "2.11.10"; sha256 = "0b7vaqldn7ca3xi4gkvkhjk900kw2zwb0m0d20bg45a83zdlx79c"; }) - (fetchNuGet { pname = "Humanizer.Core.id"; version = "2.11.10"; sha256 = "1yqxirknwga4j18k7ixwgqxlv20479afanhariy3c5mkwvglsr9b"; }) - (fetchNuGet { pname = "Humanizer.Core.it"; version = "2.11.10"; sha256 = "1skwgj5a6kkx3pm9w4f29psch69h1knmwbkdydlmx13h452p1w4l"; }) - (fetchNuGet { pname = "Humanizer.Core.ja"; version = "2.11.10"; sha256 = "1wpc3yz9v611dqbw8j5yimk8dpz0rvpnls4rmlnp1m47gavpj8x4"; }) - (fetchNuGet { pname = "Humanizer.Core.ko-KR"; version = "2.11.10"; sha256 = "1df0kd7vwdc3inxfkb3wsl1aw3d6vbab99dzh08p4m04g7i2c1a9"; }) - (fetchNuGet { pname = "Humanizer.Core.ku"; version = "2.11.10"; sha256 = "17b66xfgwjr0sffx0hw4c6l90h43z7ffylrs26hgav0n110q2nwg"; }) - (fetchNuGet { pname = "Humanizer.Core.lv"; version = "2.11.10"; sha256 = "0czxx4b9g0w7agykdl82wds09zasa9y58dmgjm925amlfz4wkyzs"; }) - (fetchNuGet { pname = "Humanizer.Core.ms-MY"; version = "2.11.10"; sha256 = "0kix95nbw94fx0dziyz80y59i7ii7d21b63f7f94niarljjq36i3"; }) - (fetchNuGet { pname = "Humanizer.Core.mt"; version = "2.11.10"; sha256 = "1rwy6m22pq65gxn86xlr9lv818fp5kb0wz98zxxfljc2iviw1f4p"; }) - (fetchNuGet { pname = "Humanizer.Core.nb"; version = "2.11.10"; sha256 = "0ra2cl0avvv4sylha7z76jxnb4pdiqfbpr5m477snr04dsjxd9q9"; }) - (fetchNuGet { pname = "Humanizer.Core.nb-NO"; version = "2.11.10"; sha256 = "1qszib03pvmjkrg8za7jjd2vzrs9p4fn2rmy82abnzldkhvifipq"; }) - (fetchNuGet { pname = "Humanizer.Core.nl"; version = "2.11.10"; sha256 = "1i9bvy0i2yyasl9mgxiiwrkmfpm2c53d3wwdp9270r6120sxyy63"; }) - (fetchNuGet { pname = "Humanizer.Core.pl"; version = "2.11.10"; sha256 = "0kggh4wgcic7wzgxy548n6w61schss2ccf9kz8alqshfi42xifby"; }) - (fetchNuGet { pname = "Humanizer.Core.pt"; version = "2.11.10"; sha256 = "09j90s8x1lpvhfiy3syfnj8slkgcacf3xjy3pnkgxa6g4mi4f4bd"; }) - (fetchNuGet { pname = "Humanizer.Core.ro"; version = "2.11.10"; sha256 = "1jgidmqfly91v1k22gn687mfql5bz7gjzp1aapi93vq5x635qssy"; }) - (fetchNuGet { pname = "Humanizer.Core.ru"; version = "2.11.10"; sha256 = "13mmlh0ibxfyc85xrz3vx4mcg56mkzqql184iwdryq94p0g5ahil"; }) - (fetchNuGet { pname = "Humanizer.Core.sk"; version = "2.11.10"; sha256 = "04ja06y5jaz1jwkwn117wx9cib04gpbi0vysn58a8sd5jrxmxai5"; }) - (fetchNuGet { pname = "Humanizer.Core.sl"; version = "2.11.10"; sha256 = "05hxk9v3a7fn7s4g9jp5zxk2z6a33b9fkavyb1hjqnl2i37q2wja"; }) - (fetchNuGet { pname = "Humanizer.Core.sr"; version = "2.11.10"; sha256 = "0x6l2msimrx72iywa1g0rqklgy209sdwg0r77i2lz0s1rvk5klm5"; }) - (fetchNuGet { pname = "Humanizer.Core.sr-Latn"; version = "2.11.10"; sha256 = "01hdyn7mmbyy7f3aglawgnsj3nblcdpqjgzdcvniy73l536mira0"; }) - (fetchNuGet { pname = "Humanizer.Core.sv"; version = "2.11.10"; sha256 = "0cbgchivw3d5ndib1zmgzmnymhyvfh9g9f0hijc860g5vaa9fkvh"; }) - (fetchNuGet { pname = "Humanizer.Core.th-TH"; version = "2.11.10"; sha256 = "1v7f9x3b04iwhz9lb3ir8az8128nvcw1gi4park5zh3fg0f3mni0"; }) - (fetchNuGet { pname = "Humanizer.Core.tr"; version = "2.11.10"; sha256 = "02c4ky0dskxkdrkc7vy8yzmvwjr1wqll1kzx0k21afhlx8xynjd4"; }) - (fetchNuGet { pname = "Humanizer.Core.uk"; version = "2.11.10"; sha256 = "0900ilhwj8yvhyzpg1pjr7f5vrl62wp8dsnhk4c2igs20qvnv079"; }) - (fetchNuGet { pname = "Humanizer.Core.uz-Cyrl-UZ"; version = "2.11.10"; sha256 = "09b7p2m8y49j49ckrmx2difgyj6y7fm2mwca093j8psxclsykcyr"; }) - (fetchNuGet { pname = "Humanizer.Core.uz-Latn-UZ"; version = "2.11.10"; sha256 = "029kvkawqhlln52vpjpvr52dhr18ylk01cgsj2z8lxnqaka0q9hk"; }) - (fetchNuGet { pname = "Humanizer.Core.vi"; version = "2.11.10"; sha256 = "0q4d47plsj956ivn82qwyidfxppjr9dp13m8c66aamrvhy4q8ny5"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.11.10"; sha256 = "01dy5kf6ai8id77px92ji4kcxjc8haj39ivv55xy1afcg3qiy7mh"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.11.10"; sha256 = "16gcxgw2g6gck3nc2hxzlkbsg7wkfaqsjl87kasibxxh47zdqqv2"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.11.10"; sha256 = "1rjg2xvkwjjw3c7z9mdjjvbnl9lcvvhh4fr7l61rla2ynzdk46cj"; }) + (fetchNuGet { pname = "Humanizer.Core.af"; version = "2.13.14"; sha256 = "0w7n9qfxlqayw2dwgajqjks5b2qxcy2853v5h0rbaq5r5yb84874"; }) + (fetchNuGet { pname = "Humanizer.Core.ar"; version = "2.13.14"; sha256 = "1nxdh3hg9hkvi7q0ffaflb738kkdl0kmpry9jxdkkvg4mhrmfs2i"; }) + (fetchNuGet { pname = "Humanizer.Core.az"; version = "2.13.14"; sha256 = "1rjhpbzy49rrf0mypkf7ksjlmx6iywdbra1caj1mr970gfm1j4zb"; }) + (fetchNuGet { pname = "Humanizer.Core.bg"; version = "2.13.14"; sha256 = "101zwkys4w7dwwa7dzsc10gdrk6bnfmm3hqc09a4jvxj2p8i6hds"; }) + (fetchNuGet { pname = "Humanizer.Core.bn-BD"; version = "2.13.14"; sha256 = "1d0flbhk4f0kc1dqzgqnimlp3gcj490qchrbl4yb4ilmsyaws0gm"; }) + (fetchNuGet { pname = "Humanizer.Core.cs"; version = "2.13.14"; sha256 = "11hfxdpncbrbj9d779b24hw43sfpbjynmkxlv636sg532j5vd58g"; }) + (fetchNuGet { pname = "Humanizer.Core.da"; version = "2.13.14"; sha256 = "0bfl1zx6x58i75l57k8xfky264hh2ziv068yx9w0zshil0d74iw5"; }) + (fetchNuGet { pname = "Humanizer.Core.de"; version = "2.13.14"; sha256 = "1bhhmp9rza2p4j5zs11sk2xvrbbvckr1v8d97aramqzqmv4x20pd"; }) + (fetchNuGet { pname = "Humanizer.Core.el"; version = "2.13.14"; sha256 = "1kym97876jspj72y9fhpc2y1jn3j12y5l95222r53mbrrpwz1m6p"; }) + (fetchNuGet { pname = "Humanizer.Core.es"; version = "2.13.14"; sha256 = "0v5fmy7cjdk3bs13pi09v3g7sbmdnvijn0w8gnif0krmg2rdm2z7"; }) + (fetchNuGet { pname = "Humanizer.Core.fa"; version = "2.13.14"; sha256 = "12m3d0cr9qa0f7sx58rqw835awi01j0frvbp1q796s6amlvhrcyc"; }) + (fetchNuGet { pname = "Humanizer.Core.fi-FI"; version = "2.13.14"; sha256 = "0j8gl6kajazjw64xpf4ws5v6hv5dz43gnm0vcnfm5l2kizd87wxh"; }) + (fetchNuGet { pname = "Humanizer.Core.fr"; version = "2.13.14"; sha256 = "053jcc9rdxxnwiccqmcxnvq40a4fm6h6lr0mlqdxjdfdj07s29i9"; }) + (fetchNuGet { pname = "Humanizer.Core.fr-BE"; version = "2.13.14"; sha256 = "00xff7shwclns2v8mknwnh2y6ycfa9zj7ssgrkdyqa9k8ppq26dh"; }) + (fetchNuGet { pname = "Humanizer.Core.he"; version = "2.13.14"; sha256 = "10qhxb6fin6w595f7h7nnfvvh5xi0vmca9ynsggq74rpjzgmvyzr"; }) + (fetchNuGet { pname = "Humanizer.Core.hr"; version = "2.13.14"; sha256 = "1xgd3had8gsfy4l5835vn9ngr5i5ys38mggzmm4s6j1id49920g4"; }) + (fetchNuGet { pname = "Humanizer.Core.hu"; version = "2.13.14"; sha256 = "0gfrkjp9c38c671d8rc468hphkixarjzss754rqsk4j5x1p13wml"; }) + (fetchNuGet { pname = "Humanizer.Core.hy"; version = "2.13.14"; sha256 = "01691rwvrh6spks5jc1vcg961p1awy34ynkaxqlhr5d49dw5qgdd"; }) + (fetchNuGet { pname = "Humanizer.Core.id"; version = "2.13.14"; sha256 = "177vbbn8q0xl2cdak4xyk38w4w8c1y2vlq9i2fm7va4x6awdyxjk"; }) + (fetchNuGet { pname = "Humanizer.Core.is"; version = "2.13.14"; sha256 = "08d8zknnxlvbshlvlnj1m954ddf7khw1n24pphsa9i0brww9wxfv"; }) + (fetchNuGet { pname = "Humanizer.Core.it"; version = "2.13.14"; sha256 = "0873ijf8cxm7skwp622ddnh8pdl30nlrwmil89icf67z3flis60d"; }) + (fetchNuGet { pname = "Humanizer.Core.ja"; version = "2.13.14"; sha256 = "1bshhkiv57010zij7pcmm1709n0y4pk3kp9xx7ar3gnra3jmm6za"; }) + (fetchNuGet { pname = "Humanizer.Core.ko-KR"; version = "2.13.14"; sha256 = "0rhq6471pjaypnh4k08y124i7sa6cj3i71v2frv66qpynl6hi0y0"; }) + (fetchNuGet { pname = "Humanizer.Core.ku"; version = "2.13.14"; sha256 = "1ircd4lw3ryl3zzdv85wpk8by44rzhn4ln85ycml2b6a21arq1rw"; }) + (fetchNuGet { pname = "Humanizer.Core.lv"; version = "2.13.14"; sha256 = "0y7m6zvns8wr0sy5ksjb51wrypgplfdwprz96xw1ajmdj4fjh9sr"; }) + (fetchNuGet { pname = "Humanizer.Core.ms-MY"; version = "2.13.14"; sha256 = "1cpnjjgybh9dp9snq3r6wm3l4zy1ssjyb64bayjnd8770lpvyfjs"; }) + (fetchNuGet { pname = "Humanizer.Core.mt"; version = "2.13.14"; sha256 = "0n5zjsq71nvxnhghsk321cqrwz7kf1jzfcq4vhsksyv7q9na74ak"; }) + (fetchNuGet { pname = "Humanizer.Core.nb"; version = "2.13.14"; sha256 = "07b1fj3ac2wcj7ql1gc7vaa4q4dmyd0prj7bxr52z04ar3nxjlsc"; }) + (fetchNuGet { pname = "Humanizer.Core.nb-NO"; version = "2.13.14"; sha256 = "0v1vljlzjlslj5y3c5xd2pbp1g29ghjd02s0z2bri5zk9zcgysvq"; }) + (fetchNuGet { pname = "Humanizer.Core.nl"; version = "2.13.14"; sha256 = "15imi9m1lvfrx0fvfmlx74p8y59na2rkgdrbfyy3dvgvd74b9k5v"; }) + (fetchNuGet { pname = "Humanizer.Core.pl"; version = "2.13.14"; sha256 = "06ix2xilgi7w7306hs4v41ai6jwank384cyz0885b53dic5kgq7r"; }) + (fetchNuGet { pname = "Humanizer.Core.pt"; version = "2.13.14"; sha256 = "1qd1w1xrxap7nwmfl9yjx6z71r03p53kw8y4dnjn7xdn85xc7z4b"; }) + (fetchNuGet { pname = "Humanizer.Core.ro"; version = "2.13.14"; sha256 = "1qifvw6y6g7014q0s8xaprsk79bqlgg0rmvbyn21qalc0ayab97v"; }) + (fetchNuGet { pname = "Humanizer.Core.ru"; version = "2.13.14"; sha256 = "0wg4p84m9r6slbz9gxrjnidc1j7xfmwncpp14x3f86a37791rz61"; }) + (fetchNuGet { pname = "Humanizer.Core.sk"; version = "2.13.14"; sha256 = "1qm0nsbw3z9n011fnnhyhzgpxyz41f01dxl13bs8mjzy0f1v3gvj"; }) + (fetchNuGet { pname = "Humanizer.Core.sl"; version = "2.13.14"; sha256 = "1fhkjyxjk9icj705qysk8yc11hpdml2cjcxm7mfdv5z2f93sa4hz"; }) + (fetchNuGet { pname = "Humanizer.Core.sr"; version = "2.13.14"; sha256 = "02f15q3i9npvvxwjyp14rxd8rlhd9qricrah3cmc8lw9fca26bb4"; }) + (fetchNuGet { pname = "Humanizer.Core.sr-Latn"; version = "2.13.14"; sha256 = "0mnycpjl51cd4nz9kwijr66zrgxqjbcsp5jqgr660l4bq16yxjad"; }) + (fetchNuGet { pname = "Humanizer.Core.sv"; version = "2.13.14"; sha256 = "13vdyrg1jp2al96w08vfkw5yjdqdnp7pksxz907i89w6cp9wbfvm"; }) + (fetchNuGet { pname = "Humanizer.Core.th-TH"; version = "2.13.14"; sha256 = "0ganp6zjjj07lcpy9h88q2441f1lfv3a7mgncrqw36bliv37pr8m"; }) + (fetchNuGet { pname = "Humanizer.Core.tr"; version = "2.13.14"; sha256 = "1sgfzh9dabdhhk5i97c0d13rz5yghcp2qpjidqsizpi2k8h8rl0r"; }) + (fetchNuGet { pname = "Humanizer.Core.uk"; version = "2.13.14"; sha256 = "1ns33byx9p6fv6gffdxly3fm3wvjl6ndscribwr37134pa6nvqc9"; }) + (fetchNuGet { pname = "Humanizer.Core.uz-Cyrl-UZ"; version = "2.13.14"; sha256 = "1qm27qz989nwnkpg26phi60qqahivssx906znwkldml2h2rz8k0g"; }) + (fetchNuGet { pname = "Humanizer.Core.uz-Latn-UZ"; version = "2.13.14"; sha256 = "1hd2d7js8cng50ir56l8lhc9qc1rwzjvqrv98ly9ggnv8n63iiws"; }) + (fetchNuGet { pname = "Humanizer.Core.vi"; version = "2.13.14"; sha256 = "0xh33ml7aspslj4gnbd7anjvp3463djhcc51bh2ji67rbw1an6rw"; }) + (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.13.14"; sha256 = "062wgs0qnhvikvfz37jmqw6sx7xwzs24ncl89paq3640id32aivd"; }) + (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.13.14"; sha256 = "0s01h733ihxjg64bznjvnij76lflqfcmwznjwmd8p2axmn8688s0"; }) + (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.13.14"; sha256 = "07xsdx8j1rhp712kwy8jx9ang6f9zljqrvaggf0ssj5zqbliz93p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) - (fetchNuGet { pname = "ManagedBass"; version = "3.0.0"; sha256 = "1yh1s36w465z8gcj4xs6q048g63z7m3nyfy1vvw1lgh7k6hqqgma"; }) - (fetchNuGet { pname = "ManagedBass.Fx"; version = "3.0.0"; sha256 = "0sck1wmjlcy8q941bamk1i0k4yrklyilsgg6c832xdh96sdc049s"; }) - (fetchNuGet { pname = "ManagedBass.Mix"; version = "3.0.0"; sha256 = "0brnm0ry96b81hgffbaj52s53bsn9c8cx4q24j0whsvmcqqxhs4v"; }) + (fetchNuGet { pname = "ManagedBass"; version = "3.1.0"; sha256 = "0p4kzpq86h00z7rwzmwxyk1yg627mm5376ssjv1wgqgls0dl7gkh"; }) + (fetchNuGet { pname = "ManagedBass.Fx"; version = "3.1.0"; sha256 = "130rrf6sb64dcq58mr1gigma3pzr7hg5mxn5fbryg375x3vphbs8"; }) + (fetchNuGet { pname = "ManagedBass.Mix"; version = "3.1.0"; sha256 = "1ppxczh1i67k5xicr0q4n0k7zdzghs99wwkcpjmh726hkdsshnib"; }) (fetchNuGet { pname = "managed-midi"; version = "1.9.14"; sha256 = "025jh146zy98699y4civ7nxlkx312lwkl4sr8pha626q7q1kg89h"; }) - (fetchNuGet { pname = "Markdig"; version = "0.26.0"; sha256 = "1pg0yica8h1c2kx10pqzc5iclmlfll5wbw1bxa8l251w1qnfglv2"; }) + (fetchNuGet { pname = "Markdig"; version = "0.23.0"; sha256 = "1bwn885w7balwncmr764vidyyp9bixqlq6r3lhsapj8ykrpxxa70"; }) (fetchNuGet { pname = "MessagePack"; version = "2.3.85"; sha256 = "0n7kv4i6knhv1dd35cv45sfpidsiy9albfdmbrdschykd1mzxmiy"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.3.85"; sha256 = "0axjgy9r533bw00lflnc6acjyza76mf2x1nn6fw7qacvak9rqxm3"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1asph5v7kgmscfgsyv9gg7cwvg52gnm6m0ldm2m4pfkpsxqyp2mi"; }) @@ -77,7 +78,6 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "5.0.11"; sha256 = "0w60z54wxv1nndv7mz9rqswdh8k4rxmgihnxkirp4gr0idr7ln7j"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "5.0.11"; sha256 = "1qrmrkdrzm4bn5zq6a1dk88rpb6pajcs6jh23h43yny68y80jcnr"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.0.0"; sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "16.5.0"; sha256 = "1xgr02r7s9i6s70n237hss4yi9zicssia3zd2ny6s8vyxb7jpdyb"; }) (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.4.1"; sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx"; }) @@ -93,8 +93,8 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "2.2.6"; sha256 = "0fx8698k71vzr8pdc6q8bsbzg6r8a42s4hkzmiyv13ibmyb5q68k"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.221401"; sha256 = "1k55l60bg8lj5ayl3kixbzvx2684xd7a9nzha5fiqjgp85cimb3r"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "2.0.226801"; sha256 = "1w8ahqkv8nbq2ch17aa9axhqqnybmc9bsxpdhpiy52ix70mr72w1"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.61701"; sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "2.0.161401"; sha256 = "02qcm8nv1ch07g8b0i60ynrjn33b8y5ivyk4rxal3vd9zfi6pvwi"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "2.2.6"; sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "2.2.6"; sha256 = "1dyxb5ibx24frlgbqy7zch0falq9p1189zvlbxgl94m0hvpml5j3"; }) @@ -127,7 +127,6 @@ (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1fdbrjrmjd31y1amp0inlmki9w3fwzv8nz41pqmc943g3cpmyg9f"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "3.1.0"; sha256 = "04cc2wl90p7g9zscnxgyj55vzl7srrrjwadl2dxgicfb2x2499ca"; }) @@ -156,16 +155,15 @@ (fetchNuGet { pname = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; }) (fetchNuGet { pname = "OpenTabletDriver"; version = "0.5.3.1"; sha256 = "16xw8w943x9gvnnpbryahff5azzy8n26j2igyqgv88m352jd9rb8"; }) (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; }) - (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2021.725.0"; sha256 = "00nvk8kw94v0iq5k7y810sa235lqdjlggq7f00c64c3d1zam4203"; }) - (fetchNuGet { pname = "ppy.ManagedBass"; version = "3.1.3-alpha"; sha256 = "0qdrklalp42pbyb30vpr7c0kwjablsja0s6xplxxkpfd14y8mzk4"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2021.1108.0"; sha256 = "0zcmxnb521j8v9q863l5bf74svgsn8lc00d03kmldyfhcjq6zqb9"; }) - (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2021.805.0"; sha256 = "004c053s6p7339bfw68lvlyk9jkbw6djkf2d72dz8wam546k8dcl"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2021.1112.0"; sha256 = "0q0z0f9f9g2a6523zyp5a7k3z0h2rallnz6pzyahkn2vz9s4ykxj"; }) - (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.178"; sha256 = "1bv77rrf3g6zr4bzfrrqqzl0vjj4c8izc0sakckda8dlm6h3gxln"; }) - (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.468-alpha"; sha256 = "1qa2xg5p6ywmvzz868vck2jy4sn8vfqssa4an4afqsmc4amxfmc8"; }) + (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2021.1210.0"; sha256 = "0dn6fc31yllr5nizylvkfl2b603b5m9694nsn5mmkh8w43h0rkbq"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2021.1225.0"; sha256 = "1md0zsjwi8zx2az42cch1wgvb5ygscncmpc4ysgz1pl6jn02v3by"; }) + (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2021.1221.0"; sha256 = "1ffxp4nsgbqw1f6nypirmc0a3h203qikbmxm2x8w3kgcfga5dx3k"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2021.1215.0"; sha256 = "1aarb8wkzz31xa8fa6g5axwmvx89ix66ygbqq7zcyz8k9yy2ilh1"; }) + (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.187"; sha256 = "0ididsxn3005dvs0hvx7bz2xzjsfpa8kmnyfqq4c2ybjxlx15gkw"; }) + (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.486-alpha"; sha256 = "0hp6wfjgpwdgy1ag2bpjkyalw92k6qg9pc5mriij6a5vhxzadhk3"; }) (fetchNuGet { pname = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) - (fetchNuGet { pname = "Realm"; version = "10.6.0"; sha256 = "0vsd99zr22a2cvyx71gdqqvr2ld239v5s4dhhfdkjgvadz5dyc2a"; }) - (fetchNuGet { pname = "Realm.Fody"; version = "10.6.0"; sha256 = "031igfdwrkgn5nh19qxh6s6l8l1ni6lgk65dhqrzqc202xqidsdm"; }) + (fetchNuGet { pname = "Realm"; version = "10.7.1"; sha256 = "058jigmsxvzb7571ll9qkf0hwmgff5zddfq4pqvnzkf87i5kd2kq"; }) + (fetchNuGet { pname = "Realm.Fody"; version = "10.7.1"; sha256 = "1m3cglh39fr84pr3nr7q1hyiq83gqj0m6h8m79wl96g5xxq5v6pa"; }) (fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) @@ -187,9 +185,9 @@ (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "Sentry"; version = "3.10.0"; sha256 = "1dnvj1adr6kz5pfdhi2cvq8m303vdaj00zgg2sbx0pc8y3nhc6x7"; }) + (fetchNuGet { pname = "Sentry"; version = "3.12.1"; sha256 = "1bqldqc0bnrxdgfxh71w3vjf3cygcn6jyrhxmjvikciirlgcs3cz"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.17.1"; sha256 = "1ffiacghbcnr3fkgvdcad7b1nky54nhmmn2sm43sks9zm8grvva4"; }) - (fetchNuGet { pname = "SharpCompress"; version = "0.30.0"; sha256 = "0q9icpwzf76a85wlqqn2d5zsb0pfzvqxihsg71g76gk74xg9gdcd"; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.30.1"; sha256 = "1hib2hxjrlikwsczym1qn2slaapgjw8qzd8gmid8bryaz8hv044h"; }) (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "1.0.4"; sha256 = "0fmgn414my76gjgp89qlc210a0lqvnvkvk2fcwnpwxdhqpfvyilr"; }) (fetchNuGet { pname = "Splat"; version = "1.6.2"; sha256 = "154w9q0z8697rcpqs4x233crx5ap1z4pl4xc21hsd3csbhw13ykf"; }) @@ -206,12 +204,12 @@ (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "4.5.0"; sha256 = "1js3h3ig0zwyynl1q88siynp8ra0gz0pfq1wmvls6ji83jrxsami"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) @@ -260,7 +258,6 @@ (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Linq.Queryable"; version = "4.0.1"; sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; }) - (fetchNuGet { pname = "System.Management"; version = "4.5.0"; sha256 = "19z5x23n21xi94bgl531l9hrm64nyw9d5fpd7klfvr5xfsbh9jwr"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) @@ -287,6 +284,7 @@ (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.6.0"; sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.8.1"; sha256 = "17xxl3m99wa4hcpqy42vl8qb1jk2jfq32rj3sfjc1a46hi2si5jj"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) @@ -299,6 +297,7 @@ (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) @@ -348,7 +347,6 @@ (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.2"; sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh b/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh index 2fe30ebec1..21f9eb80f4 100755 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh @@ -22,6 +22,9 @@ chmod -R +w "$src" pushd "$src" +export DOTNET_NOLOGO=1 +export DOTNET_CLI_TELEMETRY_OPTOUT=1 + mkdir ./nuget_tmp.packages dotnet restore osu.Desktop --packages ./nuget_tmp.packages --runtime linux-x64 diff --git a/third_party/nixpkgs/pkgs/games/tlauncher/default.nix b/third_party/nixpkgs/pkgs/games/tlauncher/default.nix new file mode 100644 index 0000000000..48cfac1f58 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/tlauncher/default.nix @@ -0,0 +1,100 @@ +{ lib +, stdenv +, openjdk8 +, buildFHSUserEnv +, fetchzip +, fetchurl +, copyDesktopItems +, makeDesktopItem +}: +let + version = "2.839"; + src = stdenv.mkDerivation { + pname = "tlauncher"; + inherit version; + src = fetchzip { + name = "tlauncher.zip"; + url = "https://dl2.tlauncher.org/f.php?f=files%2FTLauncher-${version}.zip"; + sha256 = "sha256-KphpNuTucpuJhXspKxqDyYQN6vbpY0XCB3GAd5YCGbc="; + stripRoot = false; + }; + installPhase = '' + cp $src/*.jar $out + ''; + }; + fhs = buildFHSUserEnv { + name = "tlauncher"; + runScript = '' + ${openjdk8}/bin/java -jar "${src}" "$@" + ''; + targetPkgs = pkgs: with pkgs; [ + alsa-lib + cpio + cups + file + fontconfig + freetype + giflib + glib + gnome2.GConf + gnome2.gnome_vfs + gtk2 + libjpeg + libGL + openjdk8-bootstrap + perl + which + xorg.libICE + xorg.libX11 + xorg.libXcursor + xorg.libXext + xorg.libXi + xorg.libXinerama + xorg.libXrandr + xorg.xrandr + xorg.libXrender + xorg.libXt + xorg.libXtst + xorg.libXtst + xorg.libXxf86vm + zip + zlib + ]; + }; + desktopItem = makeDesktopItem { + name = "tlauncher"; + exec = "tlauncher"; + icon = fetchurl { + url = "https://styles.redditmedia.com/t5_2o8oax/styles/communityIcon_gu5r5v8eaiq51.png"; + sha256 = "sha256-ma8zxaUxdAw5VYfOK8i8s1kjwMgs80Eomq43Cb0HZWw="; + }; + comment = "Minecraft launcher"; + desktopName = "TLauncher"; + categories = "Game;"; + }; +in stdenv.mkDerivation { + pname = "tlauncher-wrapper"; + inherit version; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir $out/{bin,share/applications} -p + install ${fhs}/bin/tlauncher $out/bin + + runHook postInstall + ''; + + nativeBuildInputs = [ copyDesktopItems ]; + desktopItems = [ desktopItem ]; + + meta = with lib; { + description = "Minecraft launcher that already deal with forge, optifine and mods"; + homepage = "https://tlauncher.org/"; + maintainers = with maintainers; [ lucasew ]; + license = licenses.unfree; + platforms = openjdk8.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/ue4demos/default.nix b/third_party/nixpkgs/pkgs/games/ue4demos/default.nix index a2d114f511..51148e42e8 100644 --- a/third_party/nixpkgs/pkgs/games/ue4demos/default.nix +++ b/third_party/nixpkgs/pkgs/games/ue4demos/default.nix @@ -5,7 +5,7 @@ let [ # Untrusted mirrors - do not update hashes "https://ludios.org/mirror/ue4demos/${file}" - "http://web.archive.org/web/20140824192039/http://ue4linux.raxxy.com/${file}" + "https://web.archive.org/web/20140824192039/http://ue4linux.raxxy.com/${file}" ]; buildDemo = { name, src }: diff --git a/third_party/nixpkgs/pkgs/games/widelands/default.nix b/third_party/nixpkgs/pkgs/games/widelands/default.nix index f094c7cd59..f53b3deaef 100644 --- a/third_party/nixpkgs/pkgs/games/widelands/default.nix +++ b/third_party/nixpkgs/pkgs/games/widelands/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , SDL2 , SDL2_image , SDL2_mixer @@ -32,7 +33,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-gNumYoeKePaxiAzrqEPKibMxFwv9vyBrCSoua+MKhcM="; }; - patches = [ ./bincmake.patch ]; + patches = [ + ./bincmake.patch + # fix for building with Boost 1.77, https://github.com/widelands/widelands/pull/5025 + (fetchpatch { + url = "https://github.com/widelands/widelands/commit/33981fda8c319c9feafc958f5f0b1670c48666ef.patch"; + sha256 = "sha256-FjxxCTPpg/Zp01XpNfgRXMMLJBfxAptkLpsLmnFXm2Q="; + }) + ]; postPatch = '' substituteInPlace xdg/org.widelands.Widelands.desktop \ diff --git a/third_party/nixpkgs/pkgs/misc/drivers/utsushi/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/utsushi/default.nix index dcb04f5ce5..b802431d4e 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/utsushi/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/utsushi/default.nix @@ -33,6 +33,10 @@ in stdenv.mkDerivation rec { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-3.61.0-imagemagick-7.patch?id=985c92af4730d864e86fa87746185b0246e9db93"; sha256 = "sha256-dfdVMp3ZfclYeRxYjMIvl+ZdlLn9S+IwQ+OmlHW8318="; }) + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/b3046e0e78b95440f135fcadb19a9eb531729a58/trunk/boost-1.74.patch"; + sha256 = "sha256-W8R1l7ZPcsfiIy1QBJvh0M8du0w1cnTg3PyAz65v4rE="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix index eef8c2c325..4bd67908a7 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix @@ -1,21 +1,56 @@ -{ lib, stdenv, fetchurl, pkg-config -, gettext, gtk2, SDL2, zlib, glib, openal, libGLU, libGL, lua, freetype, libmpeg2, zip }: +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, autoreconfHook +, freetype +, gettext +, glib +, gtk2 +, libGL +, libGLU +, libmpeg2 +, lua +, openal +, pkg-config +, zip +, zlib +}: + -with lib; stdenv.mkDerivation rec { - pname = "fs-uae"; - version = "3.0.5"; + version = "3.1.66"; - src = fetchurl { - url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz"; - sha256 = "1qwzhp34wy7bnd3c0plv11rg9fs5m92rh3ffnr9pn6ng0cpc8vpj"; + src = fetchFromGitHub { + owner = "FrodeSolheim"; + repo = pname; + rev = "v${version}"; + hash = "sha256-zPVRPazelmNaxcoCStB0j9b9qwQDTgv3O7Bg3VlW9ys="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU libGL lua freetype libmpeg2 zip ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; - meta = { + buildInputs = [ + SDL2 + freetype + gettext + glib + gtk2 + libGL + libGLU + libmpeg2 + lua + openal + zip + zlib + ]; + + meta = with lib; { + homepage = "https://fs-uae.net"; description = "An accurate, customizable Amiga Emulator"; longDescription = '' FS-UAE integrates the most accurate Amiga emulation code available @@ -24,9 +59,7 @@ stdenv.mkDerivation rec { create customized Amigas. ''; license = licenses.gpl2Plus; - homepage = "https://fs-uae.net"; - maintainers = with lib; [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } -# TODO: testing and Python GUI support diff --git a/third_party/nixpkgs/pkgs/misc/emulators/fs-uae-launcher/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/fs-uae/launcher.nix similarity index 66% rename from third_party/nixpkgs/pkgs/misc/emulators/fs-uae-launcher/default.nix rename to third_party/nixpkgs/pkgs/misc/emulators/fs-uae/launcher.nix index 9416e92e2b..afe12aab0c 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/fs-uae-launcher/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/fs-uae/launcher.nix @@ -1,5 +1,9 @@ -{ stdenv, lib, fetchurl, makeWrapper, python3, gettext -, pyqt5, setuptools, requests +{ lib +, stdenv +, fetchurl +, gettext +, makeWrapper +, python3 }: stdenv.mkDerivation rec { @@ -11,18 +15,29 @@ stdenv.mkDerivation rec { sha256 = "1dknra4ngz7bpppwqghmza1q68pn1yaw54p9ba0f42zwp427ly97"; }; + nativeBuildInputs = [ + gettext + makeWrapper + python3 + ]; + + buildInputs = with python3.pkgs; [ + pyqt5 + requests + setuptools + ]; + makeFlags = [ "prefix=$(out)" ]; - nativeBuildInputs = [ makeWrapper python3 gettext ]; - buildInputs = [ pyqt5 setuptools requests ]; + postInstall = '' wrapProgram $out/bin/fs-uae-launcher --set PYTHONPATH "$PYTHONPATH" ''; - meta = { + meta = with lib; { + homepage = "https://fs-uae.net"; description = "Graphical front-end for the FS-UAE emulator"; license = lib.licenses.gpl2Plus; - homepage = "https://fs-uae.net"; - maintainers = with lib; [ maintainers.sander ]; + maintainers = with maintainers; [ sander AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix index 124b8cb8e6..b84d18a4e7 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix @@ -1,6 +1,5 @@ { mkDerivation , fetchFromGitHub -, fetchpatch , SDL2 , cmake , ffmpeg @@ -17,25 +16,16 @@ mkDerivation rec { pname = "ppsspp"; - version = "1.11"; + version = "1.12.3"; src = fetchFromGitHub { owner = "hrydgard"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU="; + sha256 = "sha256-S16rTB0svksW5MwrPV/+qpTK4uKZ7mFcmbOyEmMmzhY="; }; - patches = [ - # fix compability with ffmpeg 4.4, remove on next release after 1.11 - (fetchpatch { - name = "fix_ffmpeg_4.4.patch"; - url = "https://patch-diff.githubusercontent.com/raw/hrydgard/ppsspp/pull/14176.patch"; - sha256 = "sha256-ecDoOydaLfL6+eFpahcO1TnRl866mZZVHlr6Qrib1mo="; - }) - ]; - postPatch = '' substituteInPlace git-version.cmake --replace unknown ${src.rev} substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share diff --git a/third_party/nixpkgs/pkgs/misc/emulators/punes/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/punes/default.nix index 860e90d23c..9b147de4fa 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/punes/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/punes/default.nix @@ -2,7 +2,8 @@ , stdenv , lib , fetchFromGitHub -, unstableGitUpdater +, fetchpatch +, nix-update-script , qtbase , qtsvg , qttools @@ -19,15 +20,25 @@ mkDerivation rec { pname = "punes"; - version = "unstable-2021-09-11"; + version = "0.108"; src = fetchFromGitHub { owner = "punesemu"; repo = "puNES"; - rev = "60ca36fcb066c41d0b3f2b550ca94dc7d12d84d6"; - sha256 = "JOi6AE1bpAc/wj9fQqHrUNc6vceeUyP0phT2f9kcJTY="; + rev = "v${version}"; + sha256 = "0inkwmvbr2w4addmgk9r4f13yismang9ylfgflhh9352lf0lirv8"; }; + patches = [ + # Drop when version > 0.108 + # https://github.com/punesemu/puNES/issues/185 + (fetchpatch { + name = "0001-punes-Fixed-make-install.patch"; + url = "https://github.com/punesemu/puNES/commit/902434f50398ebcda0786ade4b28a0496084810e.patch"; + sha256 = "1a3052n3n1qipi4bd7f7gq4zl5jjjzzzpbijdisis2vxvhnfvcim"; + }) + ]; + postPatch = '' substituteInPlace configure.ac \ --replace '`$PKG_CONFIG --variable=host_bins Qt5Core`/lrelease' '${qttools.dev}/bin/lrelease' @@ -49,8 +60,8 @@ mkDerivation rec { "--with-ffmpeg" ]; - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/punesemu/puNES.git"; + passthru.updateScript = nix-update-script { + attrPath = pname; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix index 09acbca865..4bbe12cbd2 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix @@ -54,7 +54,7 @@ let , description # Check https://github.com/libretro/libretro-core-info for license information , license - , src ? null + , src ? (getCoreSrc core) , broken ? false , version ? "unstable-2021-12-06" , platforms ? retroarch.meta.platforms @@ -63,15 +63,13 @@ let , normalizeCore ? true , ... }@args: - lib.makeOverridable stdenv.mkDerivation ( + stdenv.mkDerivation ( let d2u = if normalizeCore then (lib.replaceChars [ "-" ] [ "_" ]) else (x: x); - finalSrc = if src == null then getCoreSrc core else src; in (rec { pname = "libretro-${core}"; - inherit version; - src = finalSrc; + inherit version src; buildInputs = [ zlib ] ++ args.extraBuildInputs or [ ]; nativeBuildInputs = [ makeWrapper ] ++ args.extraNativeBuildInputs or [ ]; @@ -308,13 +306,6 @@ in citra = mkLibRetroCore { core = "citra"; - # `nix-prefetch-github` doesn't support `deepClone`, necessary for citra - # https://github.com/seppeljordan/nix-prefetch-github/issues/41 - src = fetchFromGitHub { - inherit (hashesFile.citra) owner repo rev fetchSubmodules; - deepClone = true; - sha256 = "sha256-bwnYkMvbtRF5bGZRYVtMWxnCu9P45qeX4+ntOj9eRds="; - }; description = "Port of Citra to libretro"; license = lib.licenses.gpl2Plus; extraNativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/hashes.json b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/hashes.json index 2d5e7411b8..4f01bcf8b4 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/hashes.json +++ b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/hashes.json @@ -122,8 +122,10 @@ "owner": "libretro", "repo": "citra", "rev": "b1959d07a340bfd9af65ad464fd19eb6799a96ef", - "sha256": "Tw6Niba9gsZOMKGaXF9AZ5gdigB0mmFyqoRTMElM/Ps=", - "fetchSubmodules": true + "sha256": "bwnYkMvbtRF5bGZRYVtMWxnCu9P45qeX4+ntOj9eRds=", + "fetchSubmodules": true, + "leaveDotGit": true, + "deepClone": true }, "desmume": { "owner": "libretro", diff --git a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/update.py b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/update.py index 831709d89e..857c5df624 100755 --- a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/update.py +++ b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/update.py @@ -1,12 +1,11 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests nix-prefetch-github ])" -p "git" +#!nix-shell -I nixpkgs=../../../../ -i python3 -p "python3.withPackages (ps: with ps; [ requests nix-prefetch-github ])" -p "git" import json import sys +import subprocess from pathlib import Path -from nix_prefetch_github import nix_prefetch_github - SCRIPT_PATH = Path(__file__).absolute().parent HASHES_PATH = SCRIPT_PATH / "hashes.json" CORES = { @@ -27,7 +26,7 @@ CORES = { "bsnes": {"repo": "bsnes-libretro"}, "bsnes-hd": {"repo": "bsnes-hd", "owner": "DerKoun"}, "bsnes-mercury": {"repo": "bsnes-mercury"}, - "citra": {"repo": "citra", "fetch_submodules": True}, + "citra": {"repo": "citra", "fetch_submodules": True, "deep_clone": True, "leave_dot_git": True}, "desmume": {"repo": "desmume"}, "desmume2015": {"repo": "desmume2015"}, "dolphin": {"repo": "dolphin"}, @@ -97,19 +96,27 @@ def info(*msg): print(*msg, file=sys.stderr) -def get_repo_hash_fetchFromGitHub(repo, owner="libretro", fetch_submodules=False): - assert repo is not None, "Parameter 'repo' can't be None." - - repo_hash = nix_prefetch_github( - owner=owner, repo=repo, fetch_submodules=fetch_submodules +def get_repo_hash_fetchFromGitHub( + repo, + owner="libretro", + deep_clone=False, + fetch_submodules=False, + leave_dot_git=False, +): + extra_args = [] + if deep_clone: + extra_args.append("--deep-clone") + if fetch_submodules: + extra_args.append("--fetch-submodules") + if leave_dot_git: + extra_args.append("--leave-dot-git") + result = subprocess.run( + ["nix-prefetch-github", owner, repo, *extra_args], + check=True, + capture_output=True, + text=True, ) - return { - "owner": repo_hash.repository.owner, - "repo": repo_hash.repository.name, - "rev": repo_hash.rev, - "sha256": repo_hash.sha256, - "fetchSubmodules": repo_hash.fetch_submodules, - } + return json.loads(result.stdout) def get_repo_hash(fetcher="fetchFromGitHub", **kwargs): diff --git a/third_party/nixpkgs/pkgs/misc/emulators/uae/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/uae/default.nix index ebbdc667ef..64f311c4a8 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/uae/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/uae/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.8.29"; src = fetchurl { - url = "http://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/uae-${version}.tar.bz2"; + url = "https://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/uae-${version}.tar.bz2"; sha256 = "05s3cd1rd5a970s938qf4c2xm3l7f54g5iaqw56v8smk355m4qr4"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Ultimate/Unix/Unusable Amiga Emulator"; license = lib.licenses.gpl2Plus; - homepage = "http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/"; + homepage = "https://web.archive.org/web/20130901222855/http://www.amigaemulator.org/"; maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/misc/ite-backlight/default.nix b/third_party/nixpkgs/pkgs/misc/ite-backlight/default.nix new file mode 100644 index 0000000000..033ff0f205 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/ite-backlight/default.nix @@ -0,0 +1,47 @@ +{ lib +, pkgs +, stdenv +, ninja +, libusb1 +, meson +, boost +, fetchFromGitHub +, pkg-config +, microsoft_gsl +}: + +stdenv.mkDerivation rec { + pname = "ite-backlight"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "hexagonal-sun"; + repo = pname; + rev = "v${version}"; + sha256 = "1hany4bn93mac9qyz97r1l858d48zdvvmn3mabzr3441ivqr9j0a"; + }; + + nativeBuildInputs = [ + ninja + pkg-config + meson + microsoft_gsl + ]; + + buildInputs = [ + boost + libusb1 + ]; + + meta = with lib; { + description = "Commands to control ite-backlight devices"; + longDescription = '' + This project aims to provide a set of simple utilities for controlling ITE 8291 + keyboard backlight controllers. + ''; + license = with licenses; [ mit ]; + homepage = "https://github.com/hexagonal-sun/ite-backlight"; + platforms = platforms.linux; + maintainers = with maintainers; [ hexagonal-sun ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 1d6954da57..04f21f7624 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -45,8 +45,8 @@ final: prev: src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "351b9693f1e0af0b0bbb05a8aef294bce1365e3c"; - sha256 = "0f7ni7y3l3w01jyhp35n023dc0213794ds79p2lmlsdqbqs3p03f"; + rev = "0f26a8d2c63c7050aea9b19982b5402595126bd7"; + sha256 = "118vv5g918r9zcbjrlm9df6q4vban8jkc9xa40bbfkghgccadbjf"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -161,12 +161,12 @@ final: prev: async-vim = buildVimPluginFrom2Nix { pname = "async.vim"; - version = "2021-03-21"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "async.vim"; - rev = "0fb846e1eb3c2bf04d52a57f41088afb3395212e"; - sha256 = "1glzg0i53wkm383y1vbddbyp1ivlsx2hivjchiw60sr9gccn8f8l"; + rev = "f20569020d65bec3249222606c073c0943045b5e"; + sha256 = "0lff0v2vd06amcjirnpa4wc4l4nsbngcrdqcv34kszyqgzd7phka"; }; meta.homepage = "https://github.com/prabirshrestha/async.vim/"; }; @@ -473,12 +473,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-01-03"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "cd5b7c77fb69b5ec7a2aa917234af17a4277db5e"; - sha256 = "1api1vxlwlxw5j8m2hhkpiryr24hcx9lb0z64ajig04aak3pznk0"; + rev = "09fb16e9c07c45f05951d939bb8b89e2e31dcea1"; + sha256 = "0acsac6wmyxhcgwav7gzgcjabqi37c9gcxph6x87xw8cmlbbpx81"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -581,12 +581,12 @@ final: prev: cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2021-12-24"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "a01cfeca70594f505b2f086501e90fb6c2f2aaaa"; - sha256 = "0qsicv28kyg3rrj1b7g7x2dhhhrs9i577bnvv4972riii544wjra"; + rev = "f83773e2f433a923997c5faad7ea689ec24d1785"; + sha256 = "0z1c0x60hz3khgpp7nfj0i579sgi4vsnhhcqb02i7a8jx685qwrd"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; @@ -1182,12 +1182,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-01-01"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "31a4bc8ae519020edf315f8d98380e7659c1d621"; - sha256 = "1hh942nczxgljy95c6788qmkqd9gql05fk9c3ddhbrci6mmjhwcj"; + rev = "a43f8a467b091329ff59be52c06012a0c614fc9b"; + sha256 = "059h4fxx92rv78i1gpvvsnydkbr0fr1np0b7vkanhbqm37xz1b09"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2015,12 +2015,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-01-02"; + version = "2022-01-03"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "7ef21c9daa6f47ad0ce6907232c94bcb99f23a11"; - sha256 = "0g466ddc0jk9mrv7lq4dpxgc5cpqy89w1jx5l0x0c339sijacsgb"; + rev = "9f04462bcabfd108341a6e47ed742b09a6a5b975"; + sha256 = "0j8cb1k66x0xnqa9rf20lic9v3byw0r93kcznnjxv8arg82zpc2k"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2039,12 +2039,12 @@ final: prev: FTerm-nvim = buildVimPluginFrom2Nix { pname = "FTerm.nvim"; - version = "2021-11-13"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "numToStr"; repo = "FTerm.nvim"; - rev = "0911ab93b488fdd8032e695ab56d14357e14e836"; - sha256 = "0pbfg66fd8ff1b2wshlb9c58sb8zq3ckm7yjg6vv43dk4kcnjf1i"; + rev = "eabb65f23ba48ec9e8abb9a2514f99b77b3bc6f2"; + sha256 = "0bk1lh9i584ysj5yvmb7945nkighrc8blw28y6npqaf6mvma31n6"; }; meta.homepage = "https://github.com/numToStr/FTerm.nvim/"; }; @@ -2159,12 +2159,12 @@ final: prev: ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2021-10-10"; + version = "2022-01-03"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "b18ad1643f753f39e924909ecd957cb6b5a5fa89"; - sha256 = "1swwz4kzc1d41nbvvar3a2c71xy524fsyf5kjyrbbivrghcifpl8"; + rev = "dc20c97a8f9ee36cbcdcd824e3c42140059af759"; + sha256 = "0in5hryli9iiww4wvakd3q82m65zwplahnqxxfyppjps2q534dkm"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -2195,12 +2195,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2021-06-14"; + version = "2022-01-03"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "125f09f3e09091fa9cc6585156e199d08989dc0e"; - sha256 = "1d6al5yrwv0wfmy39k8ky5ha1x0a6mz6djscibwz13fvgqka2730"; + rev = "f94cd83f7fd15805c3b145ff63fdb9390b18585a"; + sha256 = "1qdb3xg7fmb5fid288h3jyaj2rl6vbcc8d7pn0gk5bshli02bp4q"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -2577,6 +2577,18 @@ final: prev: meta.homepage = "https://github.com/edwinb/idris2-vim/"; }; + impatient-nvim = buildVimPluginFrom2Nix { + pname = "impatient.nvim"; + version = "2021-12-26"; + src = fetchFromGitHub { + owner = "lewis6991"; + repo = "impatient.nvim"; + rev = "3ea9abedb6941995b05fdad654d9cfd51c38a31f"; + sha256 = "06b8h3g77wrjxvhapkvx149pha29a0zcq28bj2pcvh7686cysz9k"; + }; + meta.homepage = "https://github.com/lewis6991/impatient.nvim/"; + }; + Improved-AnsiEsc = buildVimPluginFrom2Nix { pname = "Improved-AnsiEsc"; version = "2015-08-26"; @@ -2940,12 +2952,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-01-03"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "1696419d2d8acc8f34ba9b81c5e91b8782369530"; - sha256 = "05a002zykm9xkqp5x6lpbwp46fyk7lz85fc2dnkq38hjyzp6h9sh"; + rev = "a99fc6963510dd481953f71683e98a4559518825"; + sha256 = "1826ixb15k9s0rqiw1ynhf6j6w9cxxciskvyiyp7wgd2i6rwf42g"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3142,6 +3154,54 @@ final: prev: meta.homepage = "https://github.com/tami5/lispdocs.nvim/"; }; + litee-calltree-nvim = buildVimPluginFrom2Nix { + pname = "litee-calltree.nvim"; + version = "2022-01-03"; + src = fetchFromGitHub { + owner = "ldelossa"; + repo = "litee-calltree.nvim"; + rev = "518d9e9e82e8480a81cf3e76c46ba7880a0c0034"; + sha256 = "0ai2pj4ggjcrl3z0azwrjashqazim51crzk1f5gsbpd4j1r572iv"; + }; + meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; + }; + + litee-filetree-nvim = buildVimPluginFrom2Nix { + pname = "litee-filetree.nvim"; + version = "2022-01-03"; + src = fetchFromGitHub { + owner = "ldelossa"; + repo = "litee-filetree.nvim"; + rev = "fe7e87130ac73c60247c61d71a7479a696766c22"; + sha256 = "0scak2xdcq0vxhb21d7sm59b3hhccwwkrn5wcl7cd0akxg5xpp3s"; + }; + meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; + }; + + litee-symboltree-nvim = buildVimPluginFrom2Nix { + pname = "litee-symboltree.nvim"; + version = "2022-01-03"; + src = fetchFromGitHub { + owner = "ldelossa"; + repo = "litee-symboltree.nvim"; + rev = "1c857aa75a0f011fa62cfc8ccd11a3d4e14fc552"; + sha256 = "19xl6yfnyc30mgqqg15mfawj1cw78h59amb32r7zhwxsh1p4qvsg"; + }; + meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; + }; + + litee-nvim = buildVimPluginFrom2Nix { + pname = "litee.nvim"; + version = "2022-01-03"; + src = fetchFromGitHub { + owner = "ldelossa"; + repo = "litee.nvim"; + rev = "db4bbde5f90c3a9ca82ffe5e5dca63ecf5a8bd7c"; + sha256 = "0d5dlnxn0swrvj7i2kn6nxc8msl6z632ichabls53y1b3xps20jw"; + }; + meta.homepage = "https://github.com/ldelossa/litee.nvim/"; + }; + lsp-colors-nvim = buildVimPluginFrom2Nix { pname = "lsp-colors.nvim"; version = "2021-10-22"; @@ -3192,12 +3252,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-01-03"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "d15c7445dc896a146b670b6ceab4bb1619384062"; - sha256 = "0bb2hmfp43khn592zxddyvllim873phqzpma2q2hvk9hdl0hz1ry"; + rev = "44a5bde409922a0019f3c25011be11fb20705f47"; + sha256 = "0g93khmivnrr02avd3nb88hh8bcyj9y7gq5l8fgjjq2cppbw03a1"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3226,6 +3286,18 @@ final: prev: meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; + lua-dev-nvim = buildVimPluginFrom2Nix { + pname = "lua-dev.nvim"; + version = "2021-12-31"; + src = fetchFromGitHub { + owner = "folke"; + repo = "lua-dev.nvim"; + rev = "03a44ec6a54b0a025a633978e8541584a02e46d9"; + sha256 = "1id96h1kl299mlgqqby4kcnsb6nz51r5i4vyfdcnpla27w0pr6pd"; + }; + meta.homepage = "https://github.com/folke/lua-dev.nvim/"; + }; + lualine-lsp-progress = buildVimPluginFrom2Nix { pname = "lualine-lsp-progress"; version = "2021-10-23"; @@ -3240,12 +3312,12 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-01-02"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "b18b7ee8acf877a603c21b28b9a4d9c08bbd9594"; - sha256 = "0zp02m1xhqa5rbqp5wjfjaasmyd50w9782wm0k7lnyakf8akg8jn"; + rev = "4b68b8dd2aa5bb74fe8cd058797322d81df1f455"; + sha256 = "17csrd2hbqdrim9aq948zd5vy6babjh9c8z4zw2q8xskvkkbiww8"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; @@ -3388,8 +3460,8 @@ final: prev: src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "minsnip.nvim"; - rev = "8edc84c4896e72a85a474930af82656773ac82b0"; - sha256 = "1m7w5xz5j0brqx7ravwqjnran9g2zr3nsckmgmpahva7287db9hz"; + rev = "190eefab6335d8d803e49c14a15c9dd0a947f972"; + sha256 = "083yskdn9jhzk1qpyhak4rdm5r0ryjr9swscxp77df6sfnbixvf5"; }; meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/"; }; @@ -3780,12 +3852,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-01-02"; + version = "2022-01-03"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "36e4ba5b49d5e01b1910db8ebc7c1963e51600a4"; - sha256 = "0wgzhxrx034m2rn2sp7gs5bi6wwdmr73qddbn3fxfn69y8h1m41n"; + rev = "ff085fbaf095ea07f5e35404747281ad3d40772e"; + sha256 = "1l0lmhm4wdc5b30vbc4715gggm9xx6y5hkvzb1xrrvkx0dp6kj0c"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4008,12 +4080,12 @@ final: prev: nnn-vim = buildVimPluginFrom2Nix { pname = "nnn.vim"; - version = "2021-12-04"; + version = "2022-01-03"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "32d106a121eb4c88a8f4d0c6d779065b731c9fcb"; - sha256 = "12n3i813019q4j1lhgkpigjbi6yjywhhdib0xhw9qsjw2s7nvpk8"; + rev = "169951733371abd152d76d1ce65e2dd867156e2d"; + sha256 = "15prh70imjikmgnk4b161phcfqqz8jfqdq3l3nzhz80b597d6sv5"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -4080,12 +4152,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-01-03"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "5d37e35938862f1642ef94206bec9a6f184ec798"; - sha256 = "157246yhf7za5aw7v0g0wk6kbcdpz7bwngg45l7xxh0p4c57j0y2"; + rev = "8c59fd5ec84e1c90c3982a40d699ebe62b243592"; + sha256 = "0lix5ambsmldvajb5dcwcyb8cy2g6v1iq92dbw0v11l5wcddr75f"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4128,12 +4200,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-12-26"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "3909fc7912f4349ee8b8891056ad807abc7221d3"; - sha256 = "1awx0pzkgw1c07dghcfrspj4vl7s0rkb23jhz9sd0zi9cbrqczpc"; + rev = "96858723f1cba6a3eb004373a20c315d90584ea6"; + sha256 = "11zmf2dwd9fxgdargjbkh70d89ii7qf00mh3v8v8dm89fd6ap0xy"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -4356,12 +4428,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-11-30"; + version = "2022-01-03"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "639c167541202fcbf41ed5cec619ce0fcf1d5ab8"; - sha256 = "1dcwbzw6rfh5h2yxl17jy5szqp2fmjcss3sfcznis1ccdggh9wnr"; + rev = "03f0100dd52125a968e3bda4dacc3ab2003049d9"; + sha256 = "0wqlsys0z2hq9mlqb631v84fd35fznvkkq3nbzq6xyr3d8wmp0fk"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -4452,12 +4524,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-01-02"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "486d51cbf492ea769ff563f86bf84ae4a51ccb02"; - sha256 = "1zhfs2s5c63i3hvs4d558zxjd4ckr5811qhmrxwb6ry3lvp2dq4j"; + rev = "1917a52a7ccb517f76d6a6e732fb349f381fc927"; + sha256 = "0s4wcnn4d0wjr02307fbwz2f0yp77ibzadp4lcvsd7im9kxiczna"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4536,12 +4608,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-12-16"; + version = "2022-01-03"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "5f35322499bc789b44d19f35ee4c23fbed5a3a89"; - sha256 = "1nc3czp7grb9db52d2cvj81pqipk0x4918560v11b9g2kmvp34g2"; + rev = "4313cbb75a966aa461ef179fbcda23ba21d64c65"; + sha256 = "15zwii6bwz488xwj9397fgbxv723vxvmqhkx3kfq412rlb5aadx5"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -4596,12 +4668,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-12-29"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "fa2a6b68aaa6df0187b5bbebe6cbadc120d4a65a"; - sha256 = "1yfvx0nmz76cl7d8zmzgmkpxkjn12ddk7sdglcqmvy32iil3bksw"; + rev = "479fde3471ad6833d950abf645c0ebece15eaea4"; + sha256 = "072l6m04z83rb9f6sp4rvziyk3i2r20i5vhn0c9djkdhy7x2bj9h"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4654,6 +4726,18 @@ final: prev: meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; + nvim-ts-autotag = buildVimPluginFrom2Nix { + pname = "nvim-ts-autotag"; + version = "2021-12-19"; + src = fetchFromGitHub { + owner = "windwp"; + repo = "nvim-ts-autotag"; + rev = "0ceb4ef342bf1fdbb082ad4fa1fcfd0f864e1cba"; + sha256 = "0bbjhjngn0wv6f28z437bx9743w366665ygz6pz81059whfp93g7"; + }; + meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; + }; + nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; version = "2021-12-13"; @@ -5330,12 +5414,12 @@ final: prev: renamer-nvim = buildVimPluginFrom2Nix { pname = "renamer.nvim"; - version = "2021-12-19"; + version = "2022-01-03"; src = fetchFromGitHub { owner = "filipdutescu"; repo = "renamer.nvim"; - rev = "814ddbb11602e3c8b2af166b4d1e029272ab796f"; - sha256 = "067mn0wzvin7zbbzd8svshi5ga38r5d7nw8kqbyn3aakggpnylm3"; + rev = "6d4e3066bbf5725d15b082a7a188a3aca16ce217"; + sha256 = "1yfkpjjkhkhkqf543is1y2r44kz9py20rl5j34lwd2zz8ldibmca"; }; meta.homepage = "https://github.com/filipdutescu/renamer.nvim/"; }; @@ -5366,12 +5450,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-01-02"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "d91ea7e21a2e3e0c4ff58abcdee0a4804c15cdc6"; - sha256 = "1hlrny63nn9836w4g4ia4niygq8pwwv0g9hsway589xpgj0kgadz"; + rev = "b876914f4c0fef926bed50876c3da16c15adc81c"; + sha256 = "0n5y4ysm0inki1sxxa7w59b682xjy7ykflydiphwf5m1w0fhpkin"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -5474,12 +5558,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-01-01"; + version = "2022-01-03"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "efa83a65c646ff7a1deda77aaae3703f5e0cba0d"; - sha256 = "1rla73samh16x6yvw3qd9s36vh400k3rz4gid550msvxym3inq0y"; + rev = "8cec6ac01fbeba4efd91ab9f991bbd56fb5002a7"; + sha256 = "069hn6px0a83bpj6332n9gwn82145d98pdvadhsnj89dkmf4gdcj"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -5799,12 +5883,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2021-11-03"; + version = "2022-01-03"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "0f45bfd7d6a8acb7d6ac126001a27190851bf3f5"; - sha256 = "1a5y8qj8gyrmaxh4si3k30v19yh8chws4h9k41ra1jzslrilm9ai"; + rev = "ed71635666356d9dc8950ecc177ed7eaa0d939ec"; + sha256 = "1fjg1zxl4sbibr658962iqk0lgcrggxwffmscr5v4n3x41v0xnrd"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -5918,6 +6002,18 @@ final: prev: meta.homepage = "https://github.com/ervandew/supertab/"; }; + surround-nvim = buildVimPluginFrom2Nix { + pname = "surround.nvim"; + version = "2021-12-29"; + src = fetchFromGitHub { + owner = "blackCauldron7"; + repo = "surround.nvim"; + rev = "81f997bd71590f21f717e24bae72edf8e8b7b0f6"; + sha256 = "06mdbpka2z17hyi3p7b9ksyz79ppwybhr4h9829qba8xr2gpd465"; + }; + meta.homepage = "https://github.com/blackCauldron7/surround.nvim/"; + }; + sved = buildVimPluginFrom2Nix { pname = "sved"; version = "2021-10-22"; @@ -6125,12 +6221,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2021-12-23"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "2617983a9f0f70b578bbd290f2502d1bc91219ff"; - sha256 = "0ycvhvvy954vhi5jidwz37xkmdk3i8cnwx7aasgmpkwrcgpaqq43"; + rev = "5d806a0de91abfbdad967028627e8f300946f463"; + sha256 = "0b2497s3zdan81fslxpxpcr495wcvj1kdi5dzwl13102gd2mqn59"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -6147,6 +6243,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-dap.nvim/"; }; + telescope-file-browser-nvim = buildVimPluginFrom2Nix { + pname = "telescope-file-browser.nvim"; + version = "2021-12-29"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-file-browser.nvim"; + rev = "52170a89ea52a7a3b6131d19348642dbb60e5a84"; + sha256 = "1vfd9i96dy1mjhd86xcx8b2wg2sk063h3il2ngymdil55iv1x4yc"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; + }; + telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; version = "2021-12-06"; @@ -6196,6 +6304,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/"; }; + telescope-github-nvim = buildVimPluginFrom2Nix { + pname = "telescope-github.nvim"; + version = "2021-08-25"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-github.nvim"; + rev = "004a224de1770bf8b2d7b147359a127dc323c8e6"; + sha256 = "0jizqlasmnsyfcjd9fqdc0zf6xfpbfrwcdywpvn52x5cdrjascp7"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/"; + }; + telescope-lsp-handlers-nvim = buildVimPluginFrom2Nix { pname = "telescope-lsp-handlers.nvim"; version = "2021-09-07"; @@ -7879,12 +7999,12 @@ final: prev: vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2021-10-01"; + version = "2022-01-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "7a48f9ff0ef5f21447b2354ee52dc18b5567e05c"; - sha256 = "1mwalnbp8pigpvai22zhzg52m25qbl7hl7r8vr8vhs277gc0lx8m"; + rev = "7fb5aef524808d6ba67d6d986d15a2e291194edf"; + sha256 = "1yil4g5wym2a41isb6cdqcmccwrggy255frwxlb3rvffnl9b22m7"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -8937,12 +9057,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-01-02"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "420143420d929d6bc9e98102b5828e0bbc5c9052"; - sha256 = "0dkvcsd3jmkmg3by4jz1a5lj17blqm6zb1w7n9bccc2gy232sx6y"; + rev = "40b155512b142f2111195d85d4c19de2c424a4f2"; + sha256 = "1pxdc0f66hgikwnwddhlwriaribbsxddyki33a5pn7z2sbhd8c9g"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -9386,8 +9506,8 @@ final: prev: src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "03561775e295d8546a95e04f9a2f1a246ad80354"; - sha256 = "1xn4k29s6psn0jbmbj1nymrkjky10ny9nylzpm5zz3rbad1c0k26"; + rev = "7882e202a3115a07be5300fd596194c94d622911"; + sha256 = "1idmlrgjvarsv620rkhpnknbqvrw372mjzxi3jrk3i2d6d9phsnb"; }; meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; @@ -11136,12 +11256,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-01-02"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "84bc5aeb1d6c07f892b39ae99e356d7ab7012476"; - sha256 = "17k6dcycv2n0zklb23nx9bzr4cmxgp1np3py3ci4s6fznn64yymn"; + rev = "d9fa252426343bd6f3e6cb134b41e674ad0e39d3"; + sha256 = "190kpl2ng8i1fkw6pzgx32aw6c1zw8w10aikwvdrz8f7g691kf7f"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index d539a92518..92a530d55f 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -49,6 +49,7 @@ benizi/vim-automkdir bhurlow/vim-parinfer bitc/vim-hdevtools bkad/camelcasemotion +blackCauldron7/surround.nvim bling/vim-bufferline blueballs-theme/blueballs-neovim blueyed/vim-diminactive @@ -169,6 +170,7 @@ fisadev/vim-isort flazz/vim-colorschemes floobits/floobits-neovim folke/lsp-colors.nvim +folke/lua-dev.nvim folke/todo-comments.nvim folke/tokyonight.nvim folke/trouble.nvim @@ -387,12 +389,17 @@ lambdalisue/vim-gista lambdalisue/vim-manpager lambdalisue/vim-pager latex-box-team/latex-box +ldelossa/litee-calltree.nvim +ldelossa/litee-filetree.nvim +ldelossa/litee-symboltree.nvim +ldelossa/litee.nvim leafgarland/typescript-vim leanprover/lean.vim ledger/vim-ledger lepture/vim-jinja lervag/vimtex lewis6991/gitsigns.nvim +lewis6991/impatient.nvim lf-lang/lingua-franca.vim lfe-support/vim-lfe lfilho/cosco.vim @@ -560,10 +567,12 @@ nvim-orgmode/orgmode nvim-pack/nvim-spectre nvim-telescope/telescope-cheat.nvim nvim-telescope/telescope-dap.nvim +nvim-telescope/telescope-file-browser.nvim nvim-telescope/telescope-frecency.nvim nvim-telescope/telescope-fzf-native.nvim nvim-telescope/telescope-fzf-writer.nvim nvim-telescope/telescope-fzy-native.nvim +nvim-telescope/telescope-github.nvim nvim-telescope/telescope-project.nvim nvim-telescope/telescope-symbols.nvim nvim-telescope/telescope-z.nvim @@ -928,6 +937,7 @@ wincent/command-t wincent/ferret wincent/terminus windwp/nvim-autopairs +windwp/nvim-ts-autotag winston0410/cmd-parser.nvim winston0410/range-highlight.nvim wlangstroth/vim-racket diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 2a06df7218..98257d87a9 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -144,6 +144,23 @@ let }; }; + apollographql.vscode-apollo = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-apollo"; + publisher = "apollographql"; + version = "1.19.9"; + sha256 = "sha256-iJpzNKcuQrfq4Z0LXuadt6OKXelBbDQg/vuc7NJ2I5o="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog"; + description = "Rich editor support for GraphQL client and server development that seamlessly integrates with the Apollo platform"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=apollographql.vscode-apollo"; + homepage = "https://github.com/apollographql/vscode-graphql"; + license = licenses.mit; + maintainers = with maintainers; [ datafoo ]; + }; + }; + arcticicestudio.nord-visual-studio-code = buildVscodeMarketplaceExtension { mktplcRef = { name = "nord-visual-studio-code"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bionic-prebuilt/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bionic-prebuilt/default.nix index 920732a202..8fa17036c4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bionic-prebuilt/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bionic-prebuilt/default.nix @@ -1,4 +1,6 @@ -{ stdenvNoCC, lib, fetchzip, pkgs +{ stdenv, stdenvNoCC, lib, fetchzip, pkgs +, enableStatic ? stdenv.hostPlatform.isStatic +, enableShared ? !stdenv.hostPlatform.isStatic }: let @@ -92,10 +94,17 @@ stdenvNoCC.mkDerivation rec { cp -v ${prebuilt_crt.out}/*.o $out/lib/ cp -v ${prebuilt_crt.out}/libgcc.a $out/lib/ cp -v ${prebuilt_ndk_crt.out}/*.o $out/lib/ + '' + lib.optionalString enableShared '' for i in libc.so libm.so libdl.so liblog.so; do cp -v ${prebuilt_libs.out}/$i $out/lib/ done - + '' + lib.optionalString enableStatic '' + # no liblog.a; while it's also part of the base libraries, + # it's only available as shared object in the prebuilts. + for i in libc.a libm.a libdl.a; do + cp -v ${prebuilt_ndk_crt.out}/$i $out/lib/ + done + '' + '' mkdir -p $dev/include cp -v $out/include/*.h $dev/include/ ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix index e82e3f5901..bb7a953c11 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix @@ -40,5 +40,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/lpechacek/cpuset"; license = licenses.gpl2; maintainers = with maintainers; [ thiagokokada wykurz ]; + mainProgram = "cset"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix index f2dd36a0e0..925521696d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Firmware for Realtek RTL8761b"; license = licenses.unfreeRedistributableFirmware; - maintainers = with maintainers; [ edibopp ]; + maintainers = with maintainers; [ milibopp ]; platforms = with platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index b127ec9197..82de6a96e7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -473,7 +473,7 @@ let # Detect buffer overflows on the stack CC_STACKPROTECTOR_REGULAR = {optional = true; tristate = whenOlder "4.18" "y";}; - } // optionalAttrs stdenv.hostPlatform.isx86 { + } // optionalAttrs stdenv.hostPlatform.isx86_64 { # Enable Intel SGX X86_SGX = whenAtLeast "5.11" yes; # Allow KVM guests to load SGX enclaves diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 1242aa8eba..12e58150ee 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,51 +2,51 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.258-hardened1.patch", - "sha256": "0rni42mbvyw0f9032i6bkgcwnzfw472vimd5l1q7rp52m63z6vbk", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.258-hardened1/linux-hardened-4.14.258-hardened1.patch" + "name": "linux-hardened-4.14.260-hardened1.patch", + "sha256": "13r6lx3rcbaz2wvhwa950gsjharzq1n61bl9l3nm8v66j7gab3l0", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.260-hardened1/linux-hardened-4.14.260-hardened1.patch" }, - "sha256": "162bzhm0k8kipgk0ma745rjcl33rqhpwxdfdz3q6rkp48b82kbvi", - "version": "4.14.258" + "sha256": "1bylxn6hsq17cann2w02ggz6xz3b3synrapcwlwfcfydf71hzj9f", + "version": "4.14.260" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.221-hardened1.patch", - "sha256": "0lw4lysiv5h1vlkwlz2z1kv78wsszj1xc383i2qkzfsb4l9vsm7h", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.221-hardened1/linux-hardened-4.19.221-hardened1.patch" + "name": "linux-hardened-4.19.223-hardened1.patch", + "sha256": "1jrg8fkb8kc3m1zcgyw99mnmgvyxi3yp33x9jh1s4babxcr7w4g3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.223-hardened1/linux-hardened-4.19.223-hardened1.patch" }, - "sha256": "1yg1cibyn53gpjnxfgj2qxxi8k3l7gv1ri6kywvp6sk5bygx8jd3", - "version": "4.19.221" + "sha256": "1cnjk49g8sxsbzk375ji47lnx36drqh1x2pbfiqdwgrbjcb043sz", + "version": "4.19.223" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.87-hardened1.patch", - "sha256": "1r1vyf9wy49s7pfskxlng17n0khi1dpxg5cm4yfnbbq0gdisnh1f", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.87-hardened1/linux-hardened-5.10.87-hardened1.patch" + "name": "linux-hardened-5.10.89-hardened1.patch", + "sha256": "0gpfyykm66h4hdazqw1xkg514cglin6zmd754xala924kj6x0k8b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.89-hardened1/linux-hardened-5.10.89-hardened1.patch" }, - "sha256": "0jz6xhph7x0x11cjmypaw5gh8z4d53dcgx2gmg7k6d06ydq8n4h3", - "version": "5.10.87" + "sha256": "0c5v8fsv9sazdmdw4m1canm54x2p8777yavxq2gcpw8q98d8n8cj", + "version": "5.10.89" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.10-hardened1.patch", - "sha256": "1fn37pg10w1m4cr4g0ibs5fvqs1yx3y776daxv836naffl1001fm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.10-hardened1/linux-hardened-5.15.10-hardened1.patch" + "name": "linux-hardened-5.15.12-hardened1.patch", + "sha256": "1xxyh87pbk7961zc5554f3gwr65n5msaxyxbi1kpd4q19gcw86xz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.12-hardened1/linux-hardened-5.15.12-hardened1.patch" }, - "sha256": "0jsv8lialjwp91qg9c9rh8rhn49a70ryyhzl19bxq3fhz1fwyks8", - "version": "5.15.10" + "sha256": "182iwy2288layl2290cxla0k6y436lxlx43yaa8par325dviksbx", + "version": "5.15.12" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.167-hardened1.patch", - "sha256": "03mj8nncfpqf5j6l66239saxv251rh5infhl0jjyx1znhfzavg0p", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.167-hardened1/linux-hardened-5.4.167-hardened1.patch" + "name": "linux-hardened-5.4.169-hardened1.patch", + "sha256": "19mghwh66rmbjd7i0hxhysabarpz8l4wadw8schwc8q9kxy33py4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.169-hardened1/linux-hardened-5.4.169-hardened1.patch" }, - "sha256": "19x5f3s5f4nqzjb61g22rs0hnmk43q4b7sm7mc4j1q3y44b33r5l", - "version": "5.4.167" + "sha256": "068sw1p50vcygi422bfjpahf2fxy3ifyp4ljnkwxbbvibzcq4hsm", + "version": "5.4.169" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 9740615a33..00e9fd0a09 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.15.11"; + version = "5.15.12"; release = "1"; suffix = "xanmod${release}-tt"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-f5DvjgZQoryCpRcawlmZY6muZdAcQMNm+N18XHEBq4U="; + sha256 = "sha256-XGIq0OjC9nGQ8oUIoLIBT+Nj3pjleDeKvkz2QrZWJcI="; }; structuredExtraConfig = with lib.kernel; { diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix index bf75eb4d3a..58b11dfab0 100644 --- a/third_party/nixpkgs/pkgs/servers/consul/default.nix +++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.10.3"; + version = "1.11.1"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-Jn8cF+8Wf4zZ/PFXvjCGpomSa/DvraBGW0LsZQ+Zy+4="; + sha256 = "0x374capaz6h8mzvq2pfz4zg3gz27fjbqax65f23zqyl46haj01p"; }; passthru.tests.consul = nixosTests.consul; @@ -26,12 +26,10 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256-cQP1po9LGunFVocl4+HPs67oae2KpgyfRRB+xGVySUY="; + vendorSha256 = "09rz2xv407ym71dap7f6bbqhdnqvylvbd9zg6f6h7qsb88nvyzsp"; doCheck = false; - deleteVendor = true; - ldflags = [ "-X github.com/hashicorp/consul/version.GitDescribe=v${version}" "-X github.com/hashicorp/consul/version.Version=${version}" @@ -43,6 +41,6 @@ buildGoModule rec { homepage = "https://www.consul.io/"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; - maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 ]; + maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 techknowlogick]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/dcnnt/default.nix b/third_party/nixpkgs/pkgs/servers/dcnnt/default.nix new file mode 100644 index 0000000000..0cab4a326c --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/dcnnt/default.nix @@ -0,0 +1,26 @@ +{ buildPythonApplication, fetchPypi, lib, pycryptodome }: + +buildPythonApplication rec { + pname = "dcnnt"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "ef8578526163cb3e25fa352ba2f6f4d39309f477a72282416c89eddfb69c3a91"; + }; + + propagatedBuildInputs = [ + pycryptodome + ]; + + meta = with lib; { + homepage = "https://github.com/cyanomiko/dcnnt-py"; + description = "UI-less tool to connect Android phone with desktop"; + longDescription = '' + Yet another tool to connect Android phone with desktop similar to + KDE Connect. + ''; + license = licenses.mit; + maintainers = with maintainers; [ arnoutkroeze ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix b/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix index dc2e5adb96..538b7a7d23 100644 --- a/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix +++ b/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix @@ -30,6 +30,5 @@ buildGoModule rec { license = licenses.asl20; homepage = "https://etcd.io/"; maintainers = with maintainers; [ offline zowoq ]; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/etcd/default.nix b/third_party/nixpkgs/pkgs/servers/etcd/default.nix index dabd46a4d4..4dbe693297 100644 --- a/third_party/nixpkgs/pkgs/servers/etcd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/etcd/default.nix @@ -31,6 +31,5 @@ buildGoPackage rec { license = licenses.asl20; homepage = "https://etcd.io/"; maintainers = with maintainers; [ offline zowoq ]; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/firebird/default.nix b/third_party/nixpkgs/pkgs/servers/firebird/default.nix index 5a975205a2..7924f6e6ab 100644 --- a/third_party/nixpkgs/pkgs/servers/firebird/default.nix +++ b/third_party/nixpkgs/pkgs/servers/firebird/default.nix @@ -75,7 +75,7 @@ let base = { owner = "FirebirdSQL"; repo = "firebird"; rev = "v${version}"; - sha256 = "sha256-a4ex19FMfiJsUEhWUYd2YXKgJ24Jnpoab2t6x9sUuyQ="; + sha256 = "sha256-Pc3hUAhXgpa6VOkjidfh/vS/60Gtjenid8nHnIH7s0E="; }; buildInputs = base.buildInputs ++ [ zlib unzip libtommath libtomcrypt ]; diff --git a/third_party/nixpkgs/pkgs/servers/gobetween/default.nix b/third_party/nixpkgs/pkgs/servers/gobetween/default.nix index f429f9ad38..c7beee4a7b 100644 --- a/third_party/nixpkgs/pkgs/servers/gobetween/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gobetween/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { meta = with lib; { description = "Modern & minimalistic load balancer for the Сloud era"; - homepage = "http://gobetween.io"; + homepage = "https://gobetween.io"; license = licenses.mit; maintainers = with maintainers; [ tomberek ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix b/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix index 4bd1ea3d63..e38113525e 100644 --- a/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix @@ -45,11 +45,11 @@ let in stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.27.2-72"; + version = "4.28.2-76"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}sse42.fc34.x86_64.rpm"; - sha256 = "sha256-oCZS68n9R6Hm6lltcL6zQhPaU9FRqtB59DrstRNjnH8="; + sha256 = "sha256-LWNC4tXDddkW1zFf99CQTZjXJq7EMWuDkxS8HJ9AGiY="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix index 9538ea9f45..56d66a2e99 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.51"; + version = "2.4.52"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4"; + sha256 = "sha256-ASf33El+mYPpxRR0vtdeRWB/L4cKdnWobckK9tVy9ck="; }; # FIXME: -dev depends on -doc diff --git a/third_party/nixpkgs/pkgs/servers/hydron/default.nix b/third_party/nixpkgs/pkgs/servers/hydron/default.nix index 41c69bde28..ced4a6dec1 100644 --- a/third_party/nixpkgs/pkgs/servers/hydron/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hydron/default.nix @@ -13,8 +13,8 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - vendorSha256 = "1ngig5zw0gf1mkjjsfvvn09rncb36rg274cbi3glp8wzfcr8aip3"; - runVend = true; + vendorSha256 = "sha256-TxeHfO5IUVsKmKZ1e0/KXi+6dk2nn6AoNG0eB3jyGkY="; + proxyVendor = true; buildInputs = [ ffmpeg ]; diff --git a/third_party/nixpkgs/pkgs/servers/libreddit/default.nix b/third_party/nixpkgs/pkgs/servers/libreddit/default.nix index 5ad43a8952..121eeb991f 100644 --- a/third_party/nixpkgs/pkgs/servers/libreddit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.21.4"; + version = "0.21.7"; src = fetchFromGitHub { owner = "spikecodes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9Qr1afzp5BwcnJ4WjACJQk4NA81JTnNBmZZNFMZ6FvU="; + sha256 = "sha256-pALPhSoamsU5xEbSoXFe+Cikl16gxTXccUATMkYB97M="; }; - cargoSha256 = "sha256-HD6asNFb0ZICeXnUwF4ZZ568GJRPeSy4XwflpIuWJw8="; + cargoSha256 = "sha256-/P8wyFPCcCoGINtJ0qom3xLlkunH6xZPd7/7ynXmTy4="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/servers/livepeer/default.nix b/third_party/nixpkgs/pkgs/servers/livepeer/default.nix index b8a4f3c556..e5d282e64e 100644 --- a/third_party/nixpkgs/pkgs/servers/livepeer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/livepeer/default.nix @@ -6,8 +6,8 @@ buildGoModule rec { pname = "livepeer"; version = "0.5.20"; - runVend = true; - vendorSha256 = "sha256-iFVScV3arPkBjMi8sCHIja4G2QeQDb2sgBrbTFyxKyw="; + proxyVendor = true; + vendorSha256 = "sha256-pyPxONcWniJoA0qYusHktF3/taYda2StaMiMhyRYEm4="; src = fetchFromGitHub { owner = "livepeer"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json index da21f90bc9..dbc39a3aaf 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -5,7 +5,7 @@ "license": "Apache-2.0", "repository": { "type": "git", - "url": "http://github.com/grafana/grafana-image-renderer.git" + "url": "https://github.com/grafana/grafana-image-renderer.git" }, "scripts": { "eslint": "eslint . --ext .ts", diff --git a/third_party/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix index 4c5be92e76..112475d7dd 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, which, m4 -, protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool +, protobuf, boost170, zlib, curl, openssl, icu, jemalloc, libtool , python2Packages, makeWrapper }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { makeFlags = [ "rethinkdb" ]; - buildInputs = [ protobuf boost zlib curl openssl icu ] + buildInputs = [ protobuf boost170 zlib curl openssl icu ] ++ lib.optional (!stdenv.isDarwin) jemalloc ++ lib.optional stdenv.isDarwin libtool; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { query language that supports really useful queries like table joins and group by, and is easy to setup and learn. ''; - homepage = "http://www.rethinkdb.com"; + homepage = "https://rethinkdb.com"; license = lib.licenses.asl20; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thoughtpolice bluescreen303 ]; diff --git a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix index d4d00cc4a8..be77d8072b 100644 --- a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix @@ -16,14 +16,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-KPGE9Az98UOBEJ/mUH/RI0zrf1tf90yckAfURvC+lWM="; - arm64-linux_hash = "sha256-seJJ2le7Y4x6G5s0ASbN3KzldD9kOmFamwaxnJV3T7c="; - x64-osx_hash = "sha256-FA81l/IZWGoAlBUS3irPCdcf3ey9Df3XzDen+4UlZzc="; + x64-linux_hash = "sha256-L34dvileSSJxdhNwXC5iBChUM4r6hwncTHIBjWH20XE="; + arm64-linux_hash = "sha256-cT0UcN9otaGbMXoxlxJosYFtWzA8lRvekdleUSaxN0E="; + x64-osx_hash = "sha256-7a34R7PsgEzY4u7NKNR0LaVxonhhDNqjwQxEXaJbAww="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "0.1.8.1231"; + version = "0.1.9.1313"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/servers/t-rex/default.nix b/third_party/nixpkgs/pkgs/servers/t-rex/default.nix new file mode 100644 index 0000000000..48903b9130 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/t-rex/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, gdal, openssl, Security }: + +rustPlatform.buildRustPackage rec { + pname = "t-rex"; + version = "0.14.2"; + + src = fetchFromGitHub { + owner = "t-rex-tileserver"; + repo = pname; + rev = "v${version}"; + hash = "sha256-QNowkQzEYLOgJ2h0yq+gShmW5WgqPF3iiSejqwrOrHo="; + }; + + cargoHash = "sha256-k10DjLJCJLqjmtEED5pwQDt3mOiey89UYC36lG+3AmM="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gdal openssl ] ++ lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "Vector tile server specialized on publishing MVT tiles"; + homepage = "https://t-rex.tileserver.ch/"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/tcsh/default.nix b/third_party/nixpkgs/pkgs/shells/tcsh/default.nix index 9a5bf59f18..1befd28975 100644 --- a/third_party/nixpkgs/pkgs/shells/tcsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/tcsh/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "tcsh"; - version = "6.23.00"; + version = "6.23.02"; src = fetchurl { urls = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "ftp://ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" ]; - hash = "sha256-Tr6y8zYz0RXZU19VTGUahSMEDY2R5d4zP7LuBFuOAB4="; + hash = "sha256-wD+AQFE2cxswkdpzWoHN2EgAhRAySrMl8jWv9wnkRus="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix index ff2472294e..3d7183c786 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix @@ -22,15 +22,15 @@ buildDotnetModule rec { version = "0.5.3.3"; src = fetchFromGitHub { - owner = "InfinityGhost"; + owner = "OpenTabletDriver"; repo = "OpenTabletDriver"; rev = "v${version}"; - sha256 = "k4SoOMKAwHeYSQ80M8Af1DiiDSZIi3gS7lGr2ZrXrEI="; + sha256 = "sha256-k4SoOMKAwHeYSQ80M8Af1DiiDSZIi3gS7lGr2ZrXrEI="; }; debPkg = fetchurl { - url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb"; - sha256 = "0v03qiiz28k1yzgxf5qc1mdg2n7kjx6h8vpx9dxz342wwbgqg6ic"; + url = "https://github.com/OpenTabletDriver/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb"; + sha256 = "sha256-LJqH3+JckPF7S/1uBE2X81jxWg0MF9ff92Ei8WPEA2w="; }; dotnet-sdk = dotnetCorePackages.sdk_5_0; @@ -103,9 +103,10 @@ buildDotnetModule rec { meta = with lib; { description = "Open source, cross-platform, user-mode tablet driver"; - homepage = "https://github.com/InfinityGhost/OpenTabletDriver"; + homepage = "https://github.com/OpenTabletDriver/OpenTabletDriver"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ thiagokokada ]; platforms = platforms.linux; + mainProgram = "otd"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/synapse-admin/default.nix b/third_party/nixpkgs/pkgs/tools/admin/synapse-admin/default.nix index 8ca0816f9e..4248e62ade 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/synapse-admin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/synapse-admin/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Admin UI for Synapse Homeservers"; homepage = "https://github.com/Awesome-Technologies/synapse-admin"; - license = licenses.apsl20; + license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ mkg20001 ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzoo/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unzoo/default.nix index a24b490279..c8fd4364ea 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unzoo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unzoo/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://github.com/museoa/unzoo/"; + homepage = "https://github.com/museoa/unzoo/"; description = "Manipulate archives of files in Zoo compressed form"; license = licenses.publicDomain; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/adrgen/default.nix b/third_party/nixpkgs/pkgs/tools/misc/adrgen/default.nix new file mode 100644 index 0000000000..08fec93b58 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/adrgen/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testVersion +, adrgen +}: + +buildGoModule rec { + pname = "adrgen"; + version = "0.4.0-beta"; + + src = fetchFromGitHub { + owner = "asiermarques"; + repo = "adrgen"; + rev = "v${version}"; + sha256 = "sha256-2ZE/orsfwL59Io09c4yfXt2enVmpSM/QHlUMgyd9RYQ="; + }; + + vendorSha256 = "sha256-aDtUD+KKKSE0TpSi4+6HXSBMqF/TROZZhT0ox3a8Idk="; + + passthru.tests.version = testVersion { + package = adrgen; + command = "adrgen version"; + version = "v${version}"; + }; + + meta = with lib; { + homepage = "https://github.com/asiermarques/adrgen"; + description = "A command-line tool for generating and managing Architecture Decision Records"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/dialog/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dialog/default.nix index dd31fed358..e295f7c27a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dialog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dialog/default.nix @@ -12,11 +12,11 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { pname = "dialog"; - version = "1.3-20210621"; + version = "1.3-20211214"; src = fetchurl { url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"; - hash = "sha256-w68izPzZuso4QGIQjdk1ToaZCSnuJwwjnu9pUYxdp8g="; + hash = "sha256-zCll4FxqjDcHCza1ZBTqpWDfjYfyzqIXWeKJUOmyeks="; }; buildInputs = [ @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { description = "Display dialog boxes from shell"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ AndersonTorres spacefrogg ]; - platforms = ncurses.meta.platforms; + inherit (ncurses.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix index e9d38cbdcc..1920dac543 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "direnv"; - version = "2.30.2"; + version = "2.30.3"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "sha256-lQcy3EXl6KicAzRbypyX8sh39vNbZE2aUHBtwx07s9g="; + sha256 = "sha256-cLDafCZH0WKexO6jCdzUhRWaxmQYb1ay9w9lje3cQ+U="; }; vendorSha256 = "sha256-YhgQUl9fdictEtz6J88vEzznGd8Ipeb9AYo/p1ZLz5k="; @@ -29,6 +29,9 @@ buildGoModule rec { checkInputs = [ fish zsh ]; + # temporarily disable tests, check if they can be reenabled with the next release + doCheck = false; + checkPhase = '' export HOME=$(mktemp -d) make test-go test-bash test-fish test-zsh diff --git a/third_party/nixpkgs/pkgs/tools/misc/grc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/grc/default.nix index bb44c800a3..7692c49fa6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grc/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchFromGitHub, buildPythonApplication }: +{ lib +, fetchFromGitHub +, buildPythonApplication +}: buildPythonApplication rec { pname = "grc"; @@ -27,7 +30,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html"; + homepage = "http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"; description = "A generic text colouriser"; longDescription = '' Generic Colouriser is yet another colouriser (written in Python) for diff --git a/third_party/nixpkgs/pkgs/tools/misc/markdown-anki-decks/default.nix b/third_party/nixpkgs/pkgs/tools/misc/markdown-anki-decks/default.nix index 01a6d29332..62c8ca86e6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/markdown-anki-decks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/markdown-anki-decks/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { # No API changes. substituteInPlace pyproject.toml \ --replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"' \ - --replace 'genanki = "^0.10.1"' 'genanki = "^0.11.0"' \ + --replace 'genanki = "^0.10.1"' 'genanki = "*"' \ --replace 'typer = "^0.3.2"' 'typer = "^0.4.0"' ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix b/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix index a3aa31d4de..87d6dcfb0c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "thefuck"; - version = "3.31"; + version = "3.32"; src = fetchFromGitHub { owner = "nvbn"; repo = pname; rev = version; - sha256 = "sha256-eKKUUJr00sUtT4u91MUgJjyPOXp3NigYVfYUP/sDBhY="; + sha256 = "sha256-bRCy95owBJaxoyCNQF6gEENoxCkmorhyKzZgU1dQN6I="; }; propagatedBuildInputs = [ colorama decorator psutil pyte six ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix index 2fb985c791..6a09ba4e0e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-DJ7FGtcsWGk4caS22aXo+8chCcvEdRlVrSRmIHsETD4="; + sha256 = "sha256-GYbRu2ZEFswyOBUbg6jdAZQRogIDT/YolEElZT8h744="; }; - cargoSha256 ="sha256-dWdFBSZwTEvxrPiXtTWcYLtC+4XFb5R7Wu4r1YpHQRk="; + cargoSha256 = "sha256-ogWFAO3xMH4vho9SRjyeHCDxRtAx6exGkMpNhz2VOLA"; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix index 4300f8797b..9ceffb4ff8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "assh"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { repo = "advanced-ssh-config"; owner = "moul"; rev = "v${version}"; - sha256 = "sha256-FqxxNTsZVmCsIGNHRWusFP2gba2+geqBubw+6PeR75c="; + sha256 = "1r3fny4k1crpjasgsp09qf0p3l9vg8c0ddbb8jd6qnqnwwprqfxd"; }; - vendorSha256 = "sha256-AYBwuRSeam5i2gex9PSG9Qk+FHdEhIpY250CJo01cFE="; + vendorSha256 = "14x7m900mxiwgbbxs56pdqsmx56c4qir5j4dz57bwr10rmh25fy4"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix b/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix index 9c0f446998..006fd3b259 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "A first-come-first-serve single-fire HTTP server"; homepage = "https://github.com/raphaelreyna/oneshot"; license = licenses.mit; - maintainers = with maintainers; [ edibopp ]; + maintainers = with maintainers; [ milibopp ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix index ee8d2a9269..229edd37ee 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix @@ -4,6 +4,7 @@ , src , extraPatches ? [] , extraNativeBuildInputs ? [] +, extraConfigureFlags ? [] , extraMeta ? {} }: @@ -94,7 +95,8 @@ stdenv.mkDerivation rec { ++ optional withFIDO "--with-security-key-builtin=yes" ++ optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") ++ optional stdenv.isDarwin "--disable-libutil" - ++ optional (!linkOpenssl) "--without-openssl"; + ++ optional (!linkOpenssl) "--without-openssl" + ++ extraConfigureFlags; buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix index 4bc1817171..e8cad75698 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix @@ -19,29 +19,30 @@ in openssh_hpn = common rec { pname = "openssh-with-hpn"; - version = "8.4p1"; + version = "8.8p1"; extraDesc = " with high performance networking patches"; - src = fetchFromGitHub { - owner = "rapier1"; - repo = "openssh-portable"; - rev = "hpn-KitchenSink-${builtins.replaceStrings [ "." "p" ] [ "_" "_P" ] version}"; - hash = "sha256-SYQPDGxZR41m4g603RaZaOYm4vCr9uZnFnZoKhruueY="; + src = fetchurl { + url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; + sha256 = "1s8z6f7mi1pwsl79cqai8cr350m5lf2ifcxff57wx6mvm478k425"; }; extraPatches = [ - ./ssh-keysign-8.4.patch + ./ssh-keysign-8.5.patch - # See https://github.com/openssh/openssh-portable/pull/206 - ./ssh-copy-id-fix-eof.patch + # HPN Patch from FreeBSD ports + (fetchpatch { + name = "ssh-hpn.patch"; + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/a981593e/security/openssh-portable/files/extra-patch-hpn"; + stripLen = 1; + sha256 = "sha256-+JvpPxktZAjhxLLK1lF4ijG9VlSWkqbRwotaLe6en64="; + }) ]; extraNativeBuildInputs = [ autoreconfHook ]; - extraMeta.knownVulnerabilities = [ - "CVE-2021-28041" - "CVE-2021-41617" - ]; + extraConfigureFlags = [ "--with-hpn" ]; + extraMeta.maintainers = with lib.maintainers; [ abbe ]; }; openssh_gssapi = common rec { diff --git a/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix index eda95f2552..252036a9e9 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.12.8"; + version = "2.12.9"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "1bqrvdyqqllzsyx9gdkqmd17wxcmli6ljwxxa8wj9gzg9pqhlhqz"; + sha256 = "sha256-WmL2sjBUwk9qw8+vHgaufaElQnbDAtOCZHoBXLcvJ18="; }; nativeBuildInputs = [ pkg-config scdoc ] diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-top/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-top/default.nix index eedd4f97db..523f15bd46 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-top/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-top/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "nix-top"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "samueldr"; repo = "nix-top"; rev = "v${version}"; - sha256 = "0560a9g8n4p764r3va1nn95iv4bg71g8h0wws1af2p5g553j4zps"; + sha256 = "sha256-w/TKzbZmMt4CX2KnLwPvR1ydp5NNlp9nNx78jJvhp54="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix b/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix index 1340ec26ca..b0339846a6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pname = "fprintd"; - version = "1.92.0"; + version = "1.94.1"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "0bqzxxb5iq3pdwdv1k8wsx3alirbjla6zgcki55b5p6mzrvk781x"; + sha256 = "sha256-XHfHPffVp0jV3Md9Gui9v/nyOJ/bTWM3+hiR7WdEsgQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/gfshare/default.nix b/third_party/nixpkgs/pkgs/tools/security/gfshare/default.nix index 3079c7fb57..e0da2fdaf3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gfshare/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gfshare/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.rraval ]; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gfshare.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/honggfuzz/default.nix b/third_party/nixpkgs/pkgs/tools/security/honggfuzz/default.nix index 62b335ef5c..7333c20fd7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/honggfuzz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/honggfuzz/default.nix @@ -1,17 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper -, clang, llvm, libbfd, libopcodes, libunwind, libblocksruntime -}: +{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper, clang, llvm, libbfd +, libopcodes, libunwind, libblocksruntime }: let honggfuzz = stdenv.mkDerivation rec { pname = "honggfuzz"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = version; - sha256 = "sha256-sU5lmlfmvVWo4K96sI+xQsPfTMd1wsLbihcKI4aTj6g="; + sha256 = "sha256-TkyUKmiiSAfCnfQhSOUxuce6+dRyMmHy7vFK59jPIxM="; }; postPatch = '' @@ -28,7 +27,8 @@ let makeFlags = [ "PREFIX=$(out)" ]; meta = { - description = "A security oriented, feedback-driven, evolutionary, easy-to-use fuzzer"; + description = + "A security oriented, feedback-driven, evolutionary, easy-to-use fuzzer"; longDescription = '' Honggfuzz is a security oriented, feedback-driven, evolutionary, easy-to-use fuzzer with interesting analysis options. It is @@ -42,9 +42,9 @@ let fuzzing), and it will work its way up, expanding it by utilizing feedback-based coverage metrics. ''; - homepage = "https://honggfuzz.dev/"; - license = lib.licenses.asl20; - platforms = ["x86_64-linux"]; + homepage = "https://honggfuzz.dev/"; + license = lib.licenses.asl20; + platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ cpu ]; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/jaeles/default.nix b/third_party/nixpkgs/pkgs/tools/security/jaeles/default.nix new file mode 100644 index 0000000000..4580f08248 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/jaeles/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "jaeles"; + version = "0.17"; + + src = fetchFromGitHub { + owner = "jaeles-project"; + repo = pname; + rev = "beta-v${version}"; + hash = "sha256-IGB+TYMOOO7fvRfDe9y+JSXuDSMDVJK+N4hS+kezG48="; + }; + + vendorSha256 = "sha256-R2cP5zNuGUs0/KeaGhbQm1m5gVBVhpcFrS/jsph3EBk="; + + # Tests want to download signatures + doCheck = false; + + meta = with lib; { + description = "Tool for automated Web application testing"; + homepage = "https://github.com/jaeles-project/jaeles"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix index 0a13b54d2b..8f5382d381 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.136"; + version = "1.0.137"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g7gM+fZIDb6YK3QDiBqiQaTEyFtIQ30mTe6AAR3S3iw="; + sha256 = "sha256-2VjC5icIKF7VO7Tli/mk/gXbIzZxkFm7Aigwl+BVQ6g="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-hEj69RsYj+KxfZPri2j+vFxUU2S8wuK85EYGND5wtWg="; + vendorSha256 = "sha256-nUMbHoF7xqSpyfb+v7+ZaKzYOalpNcrFxcaRUw2W49s="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index a5808532ca..2b1a9c3c2d 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.1.21" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.22" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 8433072283..d0e4798515 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: 0b16a2cd771a6afd286188da1c60c9fd772ab0f1 - ref: refs/tags/6.1.21 + revision: 3bfd2d8eeab3f8ab7efd7a46f8125a7a3bb5f2f0 + ref: refs/tags/6.1.22 specs: - metasploit-framework (6.1.21) + metasploit-framework (6.1.22) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -214,7 +214,7 @@ GEM httpclient (2.8.3) i18n (1.8.11) concurrent-ruby (~> 1.0) - io-console (0.5.9) + io-console (0.5.11) irb (1.3.6) reline (>= 0.2.5) jmespath (1.4.0) @@ -288,7 +288,7 @@ GEM pcaprub patch_finder (1.0.2) pcaprub (0.12.4) - pdf-reader (2.7.0) + pdf-reader (2.8.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -375,7 +375,7 @@ GEM ruby-macho (2.5.1) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (2.0.12) + ruby_smb (2.0.13) bindata openssl-ccm openssl-cmac @@ -433,7 +433,7 @@ GEM activesupport (>= 4.2, < 7.0) xmlrpc (0.3.2) webrick - zeitwerk (2.5.1) + zeitwerk (2.5.3) PLATFORMS ruby diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index e2659abe6a..426f925864 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.21"; + version = "6.1.22"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-43abc6XUmLZZ+KuaAqyT/fJT+79JWKeRRA41NJOWoPY="; + sha256 = "sha256-D3OmkXEqOgDOf1fvMtWiFT4bLw38SNHp2A25xAkq7Ew="; }; 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 9e6f49e96d..6d2cea42c6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -554,10 +554,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pmafwxh8z1apnk7bb1ibnbhfrgb1jgilxm4j8d0fcqlc2ggmbja"; + sha256 = "0r9kxrf9jccrr329pa3s37rf16vy426cbqmfwxkav1fidwvih93y"; type = "gem"; }; - version = "0.5.9"; + version = "0.5.11"; }; irb = { groups = ["default"]; @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "0b16a2cd771a6afd286188da1c60c9fd772ab0f1"; - sha256 = "1xm0js9k8d8f8j8sfn29pzxm7wpxjfn056mbz1cvd66llmrrnxp3"; + rev = "3bfd2d8eeab3f8ab7efd7a46f8125a7a3bb5f2f0"; + sha256 = "0k7c584w9f8dv3lx2j7w1lpinghmlbak5vspgz700fiaf68scwqg"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.21"; + version = "6.1.22"; }; metasploit-model = { groups = ["default"]; @@ -947,10 +947,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c8s9p3s7z39zv9s6avaf5ddqncpglraqpqn50yhb1lrnna3akgi"; + sha256 = "18vsmybpvyi0favlabjipznpc8hgprsm7jpw3s7xr01c3lpjli7y"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; pg = { groups = ["default"]; @@ -1337,10 +1337,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "103rm0p44w8q2gyw3yigb6k2v12hi7gkj71b2wkj4859jzi96vyb"; + sha256 = "1bjsh4qi6ii4zl0g0na004ylk991ar9rg5kz9rq1q7r5crxy2rw7"; type = "gem"; }; - version = "2.0.12"; + version = "2.0.13"; }; rubyntlm = { groups = ["default"]; @@ -1607,9 +1607,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj"; + sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.3"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/mkp224o/default.nix b/third_party/nixpkgs/pkgs/tools/security/mkp224o/default.nix index 17d8e8ad4f..6f836271c0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/mkp224o/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/mkp224o/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { { suffix = "donna"; configureFlags = ["--enable-donna"]; } ] ++ lib.optionals stdenv.hostPlatform.isx86 [ { suffix = "donna-sse2"; configureFlags = ["--enable-donna-sse2"]; } - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals (!stdenv.isDarwin && stdenv.isx86_64) [ { suffix = "amd64-51-30k"; configureFlags = ["--enable-amd64-51-30k"]; } { suffix = "amd64-64-20k"; configureFlags = ["--enable-amd64-64-24k"]; } ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Vanity address generator for tor onion v3 (ed25519) hidden services"; homepage = "http://cathug2kyi4ilneggumrenayhuhsvrgn6qv2y47bgeet42iivkpynqad.onion/"; license = licenses.cc0; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ volth ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/quark-engine/default.nix b/third_party/nixpkgs/pkgs/tools/security/quark-engine/default.nix index 00e495f718..4db3ce4167 100644 --- a/third_party/nixpkgs/pkgs/tools/security/quark-engine/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/quark-engine/default.nix @@ -7,8 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; version = "21.10.2"; - - disabled = python3.pythonOlder "3.6"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; @@ -31,10 +30,17 @@ python3.pkgs.buildPythonApplication rec { tqdm ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "prompt-toolkit==3.0.19" "prompt-toolkit>=3.0.19" + ''; + # Project has no tests doCheck = false; - pythonImportsCheck = [ "quark" ]; + pythonImportsCheck = [ + "quark" + ]; meta = with lib; { description = "Android malware (analysis and scoring) system"; diff --git a/third_party/nixpkgs/pkgs/tools/security/snow/default.nix b/third_party/nixpkgs/pkgs/tools/security/snow/default.nix index 6d264c09ad..6dce95f8cf 100644 --- a/third_party/nixpkgs/pkgs/tools/security/snow/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/snow/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Conceal messages in ASCII text by appending whitespace to the end of lines"; homepage = "http://www.darkside.com.au/snow/"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ siraben ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix b/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix index e5207ea9d7..58afd5318d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, buildPackages , coreutils , pam , groff @@ -13,11 +14,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.7p2"; + version = "1.9.8p2"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - sha256 = "sha256-KLXucl2/iaeFL0LzCcqHfSgQqVMbTuz+WfOoS2tK/Kg="; + sha256 = "sha256-njuLjafe9DtuYMJXq+gEZyBWcP0PfAgd4UI8QUtoDy0="; }; prePatch = '' @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy DESTDIR=/" ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ groff ]; buildInputs = [ pam ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix index da338ba347..4137f20dbb 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.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DYWp7D2CQxasEYkoCEa0KdFQDvo4rNgRcTKzxYLsYFg="; + sha256 = "sha256-HV9WOJ8bWu8Uk1tXMZWqvo3ZvFiWLMGKmw6HzHBxSBY="; }; - vendorSha256 = "0vx406y3kj1qmgr1y9vg3rprwjpm5g8p9shmhq28gp7sxz3j82ry"; + vendorSha256 = "sha256-MB3/iIStqNBM9YnNaRpV4hbs1gZzWm+7B+qHHm0kOmU="; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/uddup/default.nix b/third_party/nixpkgs/pkgs/tools/security/uddup/default.nix index 60c3609738..5cde218bac 100644 --- a/third_party/nixpkgs/pkgs/tools/security/uddup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/uddup/default.nix @@ -1,13 +1,12 @@ { lib -, buildPythonApplication -, colorama , fetchFromGitHub -, pytestCheckHook +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "uddup"; version = "0.9.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "rotemreiss"; @@ -16,15 +15,17 @@ buildPythonApplication rec { sha256 = "1f5dm3772hiik9irnyvbs7wygcafbwi7czw3b47cwhb90b8fi5hg"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ colorama ]; - checkInputs = [ + checkInputs = with python3.pkgs; [ pytestCheckHook ]; - pythonImportsCheck = [ "uddup" ]; + pythonImportsCheck = [ + "uddup" + ]; meta = with lib; { description = "Tool for de-duplication URLs"; diff --git a/third_party/nixpkgs/pkgs/tools/security/wafw00f/default.nix b/third_party/nixpkgs/pkgs/tools/security/wafw00f/default.nix index dae4f5a5ad..0e363b608f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/wafw00f/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/wafw00f/default.nix @@ -1,13 +1,12 @@ { lib -, buildPythonApplication , fetchFromGitHub -, pluginbase -, requests +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "wafw00f"; version = "2.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "EnableSecurity"; @@ -16,14 +15,17 @@ buildPythonApplication rec { sha256 = "0526kz6ypww9nxc2vddkhpn1gqvn25mzj3wmi91wwxwxjjb6w4qj"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ requests pluginbase ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "wafw00f" ]; + + pythonImportsCheck = [ + "wafw00f" + ]; meta = with lib; { description = "Tool to identify and fingerprint Web Application Firewalls (WAF)"; diff --git a/third_party/nixpkgs/pkgs/tools/system/bpytop/default.nix b/third_party/nixpkgs/pkgs/tools/system/bpytop/default.nix index eb0630d33e..f0df9fa2e3 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bpytop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/bpytop/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A resource monitor; python port of bashtop"; homepage = src.meta.homepage; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ aw ]; platforms = with platforms; linux ++ freebsd ++ darwin; diff --git a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix index 27b24b869c..7fc247c8a5 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "15bsxaxqxp17wsr0p9fkpvgfyqnhhwm3j8jxkvcs4cdw73qaxdsy"; }; - runVend = true; - vendorSha256 = "06hl1npwmy9dvpf4kljvw8lwwiigm52wf106lmf9k6k2gi5ikprz"; + proxyVendor = true; + vendorSha256 = "sha256-c+9IZEKiW95JIh6krs9NhdBohUatTTEIYBU13kj9zB8="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix index c051560151..715a4dbaae 100644 --- a/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://www.jefftk.com/icdiff"; description = "Side-by-side highlighted command line diffs"; - maintainers = with maintainers; [ aneeshusa ]; + maintainers = with maintainers; [ ]; license = licenses.psfl; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix b/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix index 3c130162ca..96dc84e94d 100644 --- a/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "5.5"; + version = "5.6"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "sha256-v9p+G1aSzrvuoJLfRqWQXGVJ+2vysxdTgrD+ZUt6Yg4="; + sha256 = "sha256-HsRAu8exGXCGF0P7wZaDtuAKRDmNjMF9P2hFliZ1RXo="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/qprint/default.nix b/third_party/nixpkgs/pkgs/tools/text/qprint/default.nix index 19f2d7b1cb..56f5b5becb 100644 --- a/third_party/nixpkgs/pkgs/tools/text/qprint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/qprint/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.fourmilab.ch/webtools/qprint/"; + homepage = "https://www.fourmilab.ch/webtools/qprint/"; license = lib.licenses.publicDomain; description = "Encode and decode Quoted-Printable files"; maintainers = [ lib.maintainers.tv ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/rxp/default.nix b/third_party/nixpkgs/pkgs/tools/text/xml/rxp/default.nix index 5940bc6d60..918a491ede 100644 --- a/third_party/nixpkgs/pkgs/tools/text/xml/rxp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/xml/rxp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { license = lib.licenses.gpl2Plus; description = "A validating XML parser written in C"; - homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html"; + homepage = "https://www.cogsci.ed.ac.uk/~richard/rxp.html"; platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix index 16c10b5ae7..1ce3c5d2f1 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command Line Interface for AWS EC2 Instance Connect"; homepage = "https://github.com/aws/aws-ec2-instance-connect-cli"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/lxd-image-server/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/lxd-image-server/default.nix index 3992f425a3..3a1d32247a 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/lxd-image-server/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/lxd-image-server/default.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Creates and manages a simplestreams lxd image server on top of nginx"; homepage = "https://github.com/Avature/lxd-image-server"; - license = licenses.apsl20; + license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ mkg20001 ]; }; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 81d4131116..3517f43fbe 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -349,6 +349,7 @@ mapAliases ({ graalvm8 = throw "graalvm8-ce has been removed by upstream."; # added 2021-10-19 graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # added 2021-10-19 graalvm11 = graalvm11-ce; + grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # added 2022-01-05 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 gtk_doc = gtk-doc; # added 2018-02-25 gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # added 2022-01-01 @@ -633,6 +634,8 @@ mapAliases ({ octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # added 2021-01-24 ofp = throw "ofp is not compatible with odp-dpdk"; olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 + openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # added 2022-01-06 + openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # added 2022-01-06 opencl-icd = ocl-icd; # added 2017-01-20 openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21 openelec-dvb-firmware = libreelec-dvb-firmware; # added 2021-05-10 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 20a2839b51..82bd5f8866 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -244,7 +244,7 @@ with pkgs; castxml = callPackage ../development/tools/castxml { inherit (llvmPackages) libclang llvm; - inherit (python3Packages) sphinx; + inherit (python3.pkgs) sphinx; }; catatonit = callPackage ../applications/virtualization/catatonit { }; @@ -277,6 +277,10 @@ with pkgs; cm256cc = callPackage ../development/libraries/cm256cc { }; + cocogitto = callPackage ../development/tools/cocogitto { + inherit (darwin.apple_sdk.frameworks) Security; + }; + conftest = callPackage ../development/tools/conftest { }; corgi = callPackage ../development/tools/corgi { }; @@ -909,6 +913,8 @@ with pkgs; acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; }; + adrgen = callPackage ../tools/misc/adrgen { }; + adriconf = callPackage ../tools/graphics/adriconf { }; amass = callPackage ../tools/networking/amass { }; @@ -2502,6 +2508,8 @@ with pkgs; cht-sh = callPackage ../tools/misc/cht.sh { }; + cinny = callPackage ../applications/networking/instant-messengers/cinny {}; + ckbcomp = callPackage ../tools/X11/ckbcomp { }; clac = callPackage ../tools/misc/clac {}; @@ -2550,7 +2558,7 @@ with pkgs; colpack = callPackage ../applications/science/math/colpack { }; - commitizen = callPackage ../applications/version-management/commitizen {}; + cz-cli = callPackage ../applications/version-management/cz-cli {}; common-licenses = callPackage ../data/misc/common-licenses {}; @@ -5617,7 +5625,7 @@ with pkgs; gexiv2 = callPackage ../development/libraries/gexiv2 { }; - gftp = callPackage ../applications/networking/gftp { + gftp = callPackage ../applications/networking/ftp/gftp { gtk = gtk2; }; @@ -6681,6 +6689,8 @@ with pkgs; itm-tools = callPackage ../development/tools/misc/itm-tools { }; + ite-backlight = callPackage ../misc/ite-backlight { }; + iwgtk = callPackage ../tools/networking/iwgtk { }; ix = callPackage ../tools/misc/ix { }; @@ -7705,6 +7715,8 @@ with pkgs; guile = guile_1_8; }; + mcstatus = with python3Packages; toPythonApplication mcstatus; + mdbtools = callPackage ../tools/misc/mdbtools { }; mdk = callPackage ../development/tools/mdk { }; @@ -8341,9 +8353,6 @@ with pkgs; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; }; - openbazaar = callPackage ../applications/networking/openbazaar { }; - openbazaar-client = callPackage ../applications/networking/openbazaar/client.nix { }; - openboard = libsForQt5.callPackage ../applications/graphics/openboard { }; opencc = callPackage ../tools/text/opencc { }; @@ -8364,6 +8373,8 @@ with pkgs; opendylan-bootstrap = opendylan_bin; }; + openfec = callPackage ../development/libraries/openfec { }; + ophis = python3Packages.callPackage ../development/compilers/ophis { }; opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; @@ -8518,7 +8529,9 @@ with pkgs; ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { }; - ovito = libsForQt5.callPackage ../applications/graphics/ovito { }; + ovito = libsForQt5.callPackage ../applications/graphics/ovito { + inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration; + }; owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; @@ -9080,7 +9093,9 @@ with pkgs; qprint = callPackage ../tools/text/qprint { }; - qscintilla = callPackage ../development/libraries/qscintilla { }; + qscintilla = libsForQt5.callPackage ../development/libraries/qscintilla { }; + + qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { }; qshowdiff = callPackage ../tools/text/qshowdiff { }; @@ -9301,6 +9316,8 @@ with pkgs; rmtrash = callPackage ../tools/misc/rmtrash { }; + roc-toolkit = callPackage ../development/libraries/audio/roc-toolkit { }; + rockbox_utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; rosegarden = libsForQt514.callPackage ../applications/audio/rosegarden { }; @@ -9602,6 +9619,8 @@ with pkgs; sigal = callPackage ../applications/misc/sigal { }; + sigi = callPackage ../applications/misc/sigi { }; + sigil = libsForQt5.callPackage ../applications/editors/sigil { }; signald = callPackage ../applications/networking/instant-messengers/signald { }; @@ -12291,6 +12310,10 @@ with pkgs; remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { }; + t-rex = callPackage ../servers/t-rex { + inherit (darwin.apple_sdk.frameworks) Security; + }; + tacacsplus = callPackage ../servers/tacacsplus { }; tamarin-prover = @@ -12386,6 +12409,10 @@ with pkgs; idris2 = callPackage ../development/compilers/idris2 { }; + inherit (callPackage ../development/tools/database/indradb { }) + indradb-server + indradb-client; + intel-graphics-compiler = callPackage ../development/compilers/intel-graphics-compiler { }; intercal = callPackage ../development/compilers/intercal { }; @@ -13566,6 +13593,8 @@ with pkgs; ngn-k = callPackage ../development/interpreters/ngn-k { }; + obb = callPackage ../development/interpreters/clojure/obb.nix { }; + octave = callPackage ../development/interpreters/octave { python = python3; mkDerivation = stdenv.mkDerivation; @@ -14952,6 +14981,8 @@ with pkgs; kubectx = callPackage ../development/tools/kubectx { }; + kube-linter = callPackage ../development/tools/kube-linter { }; + kube-prompt = callPackage ../development/tools/kube-prompt { }; kubei = callPackage ../tools/security/kubei { }; @@ -15579,7 +15610,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; - uddup = python3Packages.callPackage ../tools/security/uddup { }; + uddup = callPackage ../tools/security/uddup { }; udis86 = callPackage ../development/tools/udis86 { }; @@ -16791,8 +16822,6 @@ with pkgs; grab-site = callPackage ../tools/backup/grab-site { }; - grib-api = callPackage ../development/libraries/grib-api { }; - grilo = callPackage ../development/libraries/grilo { }; grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; @@ -20874,6 +20903,8 @@ with pkgs; erlang = erlangR22; }; + dcnnt = python3Packages.callPackage ../servers/dcnnt { }; + dendrite = callPackage ../servers/dendrite { }; dex-oidc = callPackage ../servers/dex { }; @@ -25006,6 +25037,8 @@ with pkgs; elvis = callPackage ../applications/editors/elvis { }; + em = callPackage ../applications/editors/em { }; + emacs = emacs27; emacs-nox = emacs27-nox; @@ -26127,8 +26160,6 @@ with pkgs; smooth = callPackage ../development/libraries/smooth { }; - smos = callPackage ../applications/misc/smos { }; - spectrwm = callPackage ../applications/window-managers/spectrwm { }; spot = callPackage ../applications/audio/spot { }; @@ -26437,6 +26468,8 @@ with pkgs; jackmix = libsForQt5.callPackage ../applications/audio/jackmix { }; jackmix_jack1 = jackmix.override { jack = jack1; }; + jaeles = callPackage ../tools/security/jaeles { }; + jalv = callPackage ../applications/audio/jalv { }; jameica = callPackage ../applications/office/jameica { @@ -27059,6 +27092,8 @@ with pkgs; minicom = callPackage ../tools/misc/minicom { }; + minigalaxy = callPackage ../applications/misc/minigalaxy { }; + minimodem = callPackage ../applications/radio/minimodem { }; minidjvu = callPackage ../applications/graphics/minidjvu { }; @@ -27158,6 +27193,7 @@ with pkgs; mopidy-mopify mopidy-mpd mopidy-mpris + mopidy-muse mopidy-musicbox-webclient mopidy-podcast mopidy-scrobbler @@ -27699,9 +27735,12 @@ with pkgs; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; - opentoonz = (qt514.overrideScope' (_: _: { - libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; - })).callPackage ../applications/graphics/opentoonz { }; + opentoonz = let + opentoonz-libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; + in qt5.callPackage ../applications/graphics/opentoonz { + libtiff = opentoonz-libtiff; + opencv = opencv.override { libtiff = opentoonz-libtiff; }; + }; opentabletdriver = callPackage ../tools/X11/opentabletdriver { }; @@ -27809,7 +27848,11 @@ with pkgs; pdfslicer = callPackage ../applications/misc/pdfslicer { }; - pekwm = callPackage ../applications/window-managers/pekwm { }; + pekwm = callPackage ../applications/window-managers/pekwm { + awk = gawk; + grep = gnugrep; + sed = gnused; + }; pencil = callPackage ../applications/graphics/pencil { }; @@ -27951,9 +27994,7 @@ with pkgs; pinpoint = callPackage ../applications/office/pinpoint { }; - pinta = callPackage ../applications/graphics/pinta { - gtksharp = gtk-sharp-2_0; - }; + pinta = callPackage ../applications/graphics/pinta { }; pistol = callPackage ../tools/misc/pistol { }; @@ -28073,6 +28114,8 @@ with pkgs; qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; + wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { }; + qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix { withGrass = false; }; @@ -28342,7 +28385,7 @@ with pkgs; udevil = callPackage ../applications/misc/udevil {}; - udiskie = python3Packages.callPackage ../applications/misc/udiskie { }; + udiskie = python3.pkgs.callPackage ../applications/misc/udiskie { }; sacc = callPackage ../applications/networking/gopher/sacc { }; @@ -29352,7 +29395,7 @@ with pkgs; wad = callPackage ../tools/security/wad { }; - wafw00f = python3Packages.callPackage ../tools/security/wafw00f { }; + wafw00f = callPackage ../tools/security/wafw00f { }; whispers = callPackage ../tools/security/whispers { }; @@ -30748,6 +30791,8 @@ with pkgs; portmod = callPackage ../games/portmod { }; + tlauncher = callPackage ../games/tlauncher {}; + tr-patcher = callPackage ../games/tr-patcher { }; tes3cmd = callPackage ../games/tes3cmd { }; @@ -33191,9 +33236,7 @@ with pkgs; fsuae = callPackage ../misc/emulators/fs-uae { }; - fsuae-launcher = callPackage ../misc/emulators/fs-uae-launcher { - inherit (python3Packages) pyqt5 setuptools requests; - }; + fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix { }; putty = callPackage ../applications/networking/remote/putty { gtk2 = gtk2-x11; diff --git a/third_party/nixpkgs/pkgs/top-level/default.nix b/third_party/nixpkgs/pkgs/top-level/default.nix index 10cf36d4d1..e95a0db78c 100644 --- a/third_party/nixpkgs/pkgs/top-level/default.nix +++ b/third_party/nixpkgs/pkgs/top-level/default.nix @@ -49,6 +49,15 @@ let # Rename the function arguments in let lib = import ../../lib; + inherit (lib) throwIfNot; + + checked = + throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list." + lib.foldr (x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions.") (r: r) overlays + throwIfNot (lib.isList crossOverlays) "The crossOverlays argument to nixpkgs must be a list." + lib.foldr (x: throwIfNot (lib.isFunction x) "All crossOverlays passed to nixpkgs must be functions.") (r: r) crossOverlays + ; + localSystem = lib.systems.elaborate args.localSystem; # Condition preserves sharing which in turn affects equality. @@ -121,4 +130,4 @@ in let pkgs = boot stages; -in pkgs +in checked pkgs diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index 089450ef97..c4e13ec44a 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -101,7 +101,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { + ghc902 = callPackage ../development/compilers/ghc/9.0.2.nix { bootPkgs = # aarch64 ghc8107Binary exceeds max output size on hydra # the oldest ghc with aarch64-darwin support is 8.10.5 @@ -110,7 +110,7 @@ in { else packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; - inherit (buildPackages.darwin) autoSignDarwinBinariesHook; + inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr; buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; @@ -215,9 +215,9 @@ in { ghc = bh.compiler.ghc8107; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; - ghc901 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc901; - ghc = bh.compiler.ghc901; + ghc902 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc902; + ghc = bh.compiler.ghc902; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { }; }; ghc921 = callPackage ../development/haskell-modules { diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index aed6268686..ab1c8704fb 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -254,6 +254,8 @@ let data-encoding = callPackage ../development/ocaml-modules/data-encoding { }; + dbf = callPackage ../development/ocaml-modules/dbf { }; + decompress = callPackage ../development/ocaml-modules/decompress { }; diet = callPackage ../development/ocaml-modules/diet { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index f24f8defb9..0b9e6c3308 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -793,7 +793,7 @@ let rm $out/bin/wxchordpro # Wx not supported on darwin ''; meta = { - homepage = "http://www.chordpro.org"; + homepage = "https://www.chordpro.org"; description = "A lyrics and chords formatting program"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index f82a0e0851..14f128a865 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -2038,6 +2038,8 @@ in { debugpy = callPackage ../development/python-modules/debugpy { }; + decli = callPackage ../development/python-modules/decli { }; + decorator = callPackage ../development/python-modules/decorator { }; decopatch = callPackage ../development/python-modules/decopatch { }; @@ -2325,6 +2327,8 @@ in { dmenu-python = callPackage ../development/python-modules/dmenu { }; + dm-haiku = callPackage ../development/python-modules/dm-haiku { }; + dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; dm-tree = callPackage ../development/python-modules/dm-tree { }; @@ -5596,6 +5600,8 @@ in { opt-einsum = callPackage ../development/python-modules/opt-einsum { }; + optax = callPackage ../development/python-modules/optax { }; + optuna = callPackage ../development/python-modules/optuna { }; opuslib = callPackage ../development/python-modules/opuslib { }; @@ -6598,6 +6604,8 @@ in { py-desmume = callPackage ../development/python-modules/py-desmume { }; + pydevccu = callPackage ../development/python-modules/pydevccu { }; + pydexcom = callPackage ../development/python-modules/pydexcom { }; pydicom = callPackage ../development/python-modules/pydicom { }; @@ -8281,13 +8289,13 @@ in { qreactor = callPackage ../development/python-modules/qreactor { }; - qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; + qscintilla-qt4 = callPackage ../development/python-modules/qscintilla-qt4 { }; qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; - qscintilla = self.qscintilla-qt4; + qscintilla = self.qscintilla-qt5; qtawesome = callPackage ../development/python-modules/qtawesome { }; @@ -9716,6 +9724,8 @@ in { tomli = callPackage ../development/python-modules/tomli { }; + tomli-w = callPackage ../development/python-modules/tomli-w { }; + tomlkit = callPackage ../development/python-modules/tomlkit { }; toolz = callPackage ../development/python-modules/toolz { }; diff --git a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix index a2bd8dc6a5..d9cc05afe7 100644 --- a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix @@ -190,9 +190,7 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qoauth = callPackage ../development/libraries/qoauth { }; - qscintilla = callPackage ../development/libraries/qscintilla { - withQt5 = true; - }; + qscintilla = callPackage ../development/libraries/qscintilla { }; qt5ct = callPackage ../tools/misc/qt5ct { }; diff --git a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix index a9e4ea32cc..a9044f6989 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix @@ -51,7 +51,7 @@ let released = with compilerNames; [ ghc884 ghc8107 - ghc901 + ghc902 ghc921 ]; @@ -313,7 +313,7 @@ let haskell-language-server = [ compilerNames.ghc884 compilerNames.ghc8107 - compilerNames.ghc901 + compilerNames.ghc902 ]; hoogle = released; hlint = released; @@ -325,7 +325,7 @@ let ghc-api-compat = [ compilerNames.ghc884 compilerNames.ghc8107 - compilerNames.ghc901 + compilerNames.ghc902 ]; }) { @@ -393,11 +393,11 @@ let jobs.pkgsMusl.haskell.compiler.ghc8107Binary jobs.pkgsMusl.haskell.compiler.ghc884 jobs.pkgsMusl.haskell.compiler.ghc8107 - jobs.pkgsMusl.haskell.compiler.ghc901 + jobs.pkgsMusl.haskell.compiler.ghc902 jobs.pkgsMusl.haskell.compiler.ghc921 jobs.pkgsMusl.haskell.compiler.ghcHEAD jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 - jobs.pkgsMusl.haskell.compiler.integer-simple.ghc901 + jobs.pkgsMusl.haskell.compiler.integer-simple.ghc902 jobs.pkgsMusl.haskell.compiler.integer-simple.ghc921 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ];