From 8e9df96aee53de5be45cd1c30fbb6f6758b9e46d Mon Sep 17 00:00:00 2001 From: JacobMetz Date: Fri, 22 Nov 2024 14:27:33 -0700 Subject: [PATCH] ntfy-sh: add secret file support --- .github/workflows/check-nixf-tidy.yml | 2 +- .github/workflows/editorconfig-v2.yml | 2 +- .github/workflows/lint-actions.sh | 7 - ci/OWNERS | 3 +- lib/systems/examples.nix | 1 - maintainers/maintainer-list.nix | 7 - .../manual/release-notes/rl-2411.section.md | 2 - .../manual/release-notes/rl-2505.section.md | 2 - nixos/lib/test-driver/default.nix | 82 +- nixos/lib/test-driver/pyproject.toml | 6 +- nixos/lib/test-driver/test_driver/driver.py | 27 +- nixos/lib/test-driver/test_driver/logger.py | 43 +- nixos/lib/test-driver/test_driver/machine.py | 57 +- .../test_driver/polling_condition.py | 8 +- .../modules/services/databases/postgresql.md | 4 +- nixos/modules/services/misc/ntfy-sh.nix | 5 +- nixos/modules/services/misc/rmfakecloud.nix | 40 +- .../networking/netbird/management.nix | 16 - .../services/networking/netbird/signal.nix | 61 +- nixos/modules/services/security/kanidm.nix | 6 +- nixos/modules/services/web-apps/netbox.nix | 6 +- nixos/tests/all-tests.nix | 1 - nixos/tests/rmfakecloud.nix | 67 - nixos/tests/technitium-dns-server.nix | 6 - .../editors/vscode/extensions/default.nix | 16 - .../instant-messengers/ferdium/default.nix | 6 +- .../signal-desktop/default.nix | 5 + .../signal-desktop/signal-desktop-beta.nix | 8 + .../signal-desktop/update.sh | 6 + .../science/math/caffe/default.nix | 30 +- .../terminal-emulators/st/siduck76-st.nix | 2 +- .../version-management/fossil/default.nix | 28 +- .../rust/build-rust-package/default.nix | 13 +- pkgs/by-name/ac/activemq/package.nix | 4 +- pkgs/by-name/ae/aegisub/package.nix | 2 +- pkgs/by-name/al/algia/package.nix | 28 - .../an/antimatter-dimensions/package.nix | 6 +- pkgs/by-name/ar/arc-browser/package.nix | 4 +- pkgs/by-name/ar/argtable/package.nix | 2 +- pkgs/by-name/bl/bluez-alsa/package.nix | 2 +- pkgs/by-name/bl/bluez/package.nix | 2 +- pkgs/by-name/ca/cardinal/package.nix | 64 +- pkgs/by-name/ch/chez/package.nix | 4 +- pkgs/by-name/cl/clerk/package.nix | 1 + pkgs/by-name/cm/cmake/package.nix | 2 +- pkgs/by-name/co/container2wasm/package.nix | 6 +- pkgs/by-name/da/darcs-to-git/package.nix | 6 +- pkgs/by-name/dc/dcgm/dynamic-libs.patch | 40 - pkgs/by-name/dc/dcgm/fix-includes.patch | 110 - pkgs/by-name/dc/dcgm/package.nix | 126 +- pkgs/by-name/de/debianutils/package.nix | 2 +- pkgs/by-name/de/deltachat-repl/package.nix | 2 +- .../de/deltachat-rpc-server/package.nix | 2 +- pkgs/by-name/ec/ecapture/package.nix | 4 +- pkgs/by-name/ed/edbrowse/package.nix | 1 + pkgs/by-name/em/emulationstation/package.nix | 1 + pkgs/by-name/fh/fheroes2/package.nix | 4 +- pkgs/by-name/fi/finamp/package.nix | 8 +- pkgs/by-name/fi/finamp/pubspec.lock.json | 341 +- pkgs/by-name/fo/fondo/package.nix | 2 +- pkgs/by-name/ga/gay/package.nix | 2 +- pkgs/by-name/gh/gh-i/package.nix | 6 +- pkgs/by-name/gi/gitify/package.nix | 113 - pkgs/by-name/gn/gnucash/package.nix | 2 +- pkgs/by-name/go/goose/package.nix | 6 +- pkgs/by-name/ho/home-manager/package.nix | 2 +- pkgs/by-name/hy/hysteria/package.nix | 6 +- pkgs/by-name/id/id3/package.nix | 31 - pkgs/by-name/j/j/package.nix | 2 +- pkgs/by-name/ju/just/package.nix | 6 +- pkgs/by-name/ki/kid3/package.nix | 4 +- pkgs/by-name/ku/kubedock/package.nix | 6 +- pkgs/by-name/ky/kyverno/package.nix | 6 +- pkgs/by-name/la/labwc-gtktheme/package.nix | 2 +- .../la/labwc-menu-generator/package.nix | 2 +- pkgs/by-name/la/labwc-tweaks-gtk/package.nix | 2 +- pkgs/by-name/li/libarchive/package.nix | 2 +- pkgs/by-name/li/libdeltachat/package.nix | 18 +- pkgs/by-name/li/libnbd/package.nix | 1 + pkgs/by-name/ln/lnav/package.nix | 7 +- pkgs/by-name/lo/loksh/package.nix | 2 +- pkgs/by-name/lz/lzfse/package.nix | 23 +- pkgs/by-name/ma/magic-vlsi/package.nix | 2 +- pkgs/by-name/md/mdk-sdk/package.nix | 4 +- pkgs/by-name/me/megatools/package.nix | 2 +- pkgs/by-name/me/meshoptimizer/package.nix | 6 +- pkgs/by-name/me/meson/package.nix | 2 +- pkgs/by-name/mi/micro/package.nix | 1 + pkgs/by-name/mi/miru/darwin.nix | 2 +- pkgs/by-name/mi/miru/linux.nix | 2 +- pkgs/by-name/mi/miru/package.nix | 2 +- pkgs/by-name/ni/nickel/package.nix | 2 +- pkgs/by-name/ni/nixos-rebuild-ng/README.md | 40 +- pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 58 +- .../src/nixos_rebuild/__init__.py | 25 +- .../src/nixos_rebuild/__main__.py | 4 - .../src/nixos_rebuild/models.py | 11 +- .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 46 +- .../nixos-rebuild-ng/src/tests/test_main.py | 35 +- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 55 - pkgs/by-name/no/nomacs/package.nix | 2 +- pkgs/by-name/no/nomino/package.nix | 6 +- pkgs/by-name/no/nostui/Cargo.lock | 3234 ++++++++++++ pkgs/by-name/no/nostui/package.nix | 2 + pkgs/by-name/no/notion/package.nix | 2 +- pkgs/by-name/np/nph/package.nix | 12 +- pkgs/by-name/ns/nsxiv/package.nix | 2 +- pkgs/by-name/nu/nuclei-templates/package.nix | 4 +- pkgs/by-name/nu/nuclei/package.nix | 6 +- pkgs/by-name/op/openxr-loader/package.nix | 4 +- pkgs/by-name/op/operator-sdk/package.nix | 6 +- pkgs/by-name/ov/overturemaps/package.nix | 32 - pkgs/by-name/pl/plattenalbum/package.nix | 4 +- pkgs/by-name/po/poke/package.nix | 2 +- .../pr/prometheus-dcgm-exporter/package.nix | 6 +- pkgs/by-name/qi/qidi-slicer-bin/package.nix | 48 - pkgs/by-name/qt/qtscrcpy/package.nix | 10 +- ...move_deprecated_avcodec_free_context.patch | 14 - pkgs/by-name/qu/quill-log/package.nix | 4 +- pkgs/by-name/rc/rc/package.nix | 2 +- pkgs/by-name/re/remnote/package.nix | 4 +- pkgs/by-name/rm/rmfakecloud/package.nix | 42 +- pkgs/by-name/rm/rmfakecloud/webui.nix | 2 +- pkgs/by-name/ro/robodoc/package.nix | 2 +- pkgs/by-name/ru/ruff-lsp/package.nix | 4 +- pkgs/by-name/ru/ruff/Cargo.lock | 4540 +++++++++++++++++ pkgs/by-name/ru/ruff/package.nix | 20 +- pkgs/by-name/sa/sakura/package.nix | 2 +- pkgs/by-name/sa/samurai/package.nix | 2 +- pkgs/by-name/sc/scilla/package.nix | 6 +- pkgs/by-name/se/seabios/package.nix | 2 +- pkgs/by-name/sn/snis-assets/manifest.txt | 810 --- pkgs/by-name/sn/snis-assets/package.nix | 55 - pkgs/by-name/sn/snis-unwrapped/package.nix | 86 - pkgs/by-name/sn/snis/package.nix | 86 +- pkgs/by-name/so/soplex/package.nix | 4 +- pkgs/by-name/st/starpls-bin/package.nix | 43 + pkgs/by-name/st/starpls/manifest.json | 17 - pkgs/by-name/st/starpls/package.nix | 57 - pkgs/by-name/st/starpls/update.py | 65 - pkgs/by-name/su/superfile/package.nix | 6 +- pkgs/by-name/su/supermariowar/package.nix | 6 +- pkgs/by-name/sw/sword/package.nix | 1 + pkgs/by-name/sx/sxhkd/package.nix | 2 +- pkgs/by-name/sy/sydbox/package.nix | 126 +- pkgs/by-name/sy/syshud/package.nix | 6 +- pkgs/by-name/ta/taxi/package.nix | 2 +- .../technitium-dns-server-library/package.nix | 40 - .../library-nuget-deps.nix} | 0 .../te/technitium-dns-server/package.nix | 33 +- pkgs/by-name/te/television/package.nix | 49 - pkgs/by-name/te/textlint/package.nix | 6 +- pkgs/by-name/ti/tidb/package.nix | 6 +- pkgs/by-name/tl/tllist/package.nix | 2 +- pkgs/by-name/to/tomlc99/package.nix | 2 +- pkgs/by-name/tp/tplay/package.nix | 6 +- pkgs/by-name/tr/tryton/package.nix | 4 +- pkgs/by-name/ts/tsukimi/package.nix | 8 +- pkgs/by-name/ud/udevil/package.nix | 2 +- pkgs/by-name/ud/udiskie/package.nix | 2 +- pkgs/by-name/ud/udunits/package.nix | 2 +- pkgs/by-name/va/variety/package.nix | 2 +- pkgs/by-name/vl/vlc/package.nix | 2 +- pkgs/by-name/wa/waf/package.nix | 2 +- pkgs/by-name/wa/wayclip/package.nix | 46 - pkgs/by-name/wl/wl-crosshair/package.nix | 37 - pkgs/by-name/xl/xlights/package.nix | 4 +- pkgs/by-name/xm/xmldiff/package.nix | 2 +- pkgs/by-name/ze/zed-editor/package.nix | 6 +- pkgs/by-name/zi/zile/package.nix | 2 +- pkgs/by-name/zx/zxing-cpp/package.nix | 2 +- pkgs/data/fonts/font-awesome/default.nix | 4 +- pkgs/desktops/gnome/default.nix | 216 +- pkgs/development/compilers/corretto/11.nix | 4 +- pkgs/development/compilers/corretto/17.nix | 4 +- pkgs/development/compilers/corretto/21.nix | 4 +- .../compilers/corretto/mk-corretto.nix | 15 +- .../coq-modules/lemma-overloading/default.nix | 32 - .../cuda-modules/cudatoolkit/default.nix | 173 +- .../cuda-modules/cudatoolkit/releases.nix | 18 + .../cuda-modules/cudnn/releases.nix | 91 + .../cuda-modules/cutensor/extension.nix | 5 +- pkgs/development/cuda-modules/gpus.nix | 17 + .../cuda-modules/nvcc-compatibilities.nix | 22 + .../cuda-modules/tensorrt/releases.nix | 32 + pkgs/development/interpreters/php/8.4.nix | 9 +- .../ocaml-modules/janestreet/0.17.nix | 3 +- .../ocaml-modules/merlin-extend/default.nix | 8 +- .../development/php-packages/apcu/default.nix | 20 +- .../python-modules/accuweather/default.nix | 12 +- .../python-modules/aiortm/default.nix | 4 +- .../python-modules/aiosonic/default.nix | 4 +- .../python-modules/apsystems-ez1/default.nix | 4 +- .../azure-keyvault-administration/default.nix | 7 +- .../azure-keyvault-certificates/default.nix | 7 +- .../azure-keyvault-keys/default.nix | 7 +- .../azure-keyvault-secrets/default.nix | 7 +- .../azure-mgmt-containerservice/default.nix | 4 +- .../azure-mgmt-cosmosdb/default.nix | 4 +- .../azure-mgmt-extendedlocation/default.nix | 17 +- .../azure-mgmt-scheduler/default.nix | 33 +- .../azure-storage-file-share/default.nix | 4 +- .../bluetooth-adapters/default.nix | 4 +- .../certbot-dns-cloudflare/default.nix | 3 +- .../certbot-dns-ovh/default.nix | 14 +- .../certbot-dns-rfc2136/default.nix | 3 +- .../certbot-dns-route53/default.nix | 14 +- .../python-modules/cffsubr/default.nix | 2 + .../python-modules/cftime/default.nix | 4 +- .../python-modules/datadog/default.nix | 4 +- .../python-modules/duden/default.nix | 1 + .../edk2-pytool-library/default.nix | 4 +- .../google-cloud-redis/default.nix | 4 +- .../python-modules/jianpu-ly/default.nix | 35 - .../python-modules/mypy-boto3/default.nix | 84 +- .../python-modules/plotnine/default.nix | 4 +- .../python-modules/plugwise/default.nix | 4 +- .../publicsuffixlist/default.nix | 4 +- .../python-modules/pyenphase/default.nix | 4 +- .../python-modules/pylacus/default.nix | 4 +- .../python-modules/pyvex/default.nix | 5 - .../python-modules/reolink-aio/default.nix | 4 +- .../python-modules/restview/default.nix | 23 +- .../strawberry-graphql/default.nix | 4 +- .../python-modules/tldextract/default.nix | 4 +- .../python-modules/tubeup/default.nix | 12 +- .../python-modules/wgnlpy/default.nix | 40 - .../tools/rust/cargo-pgrx/default.nix | 18 + pkgs/games/heroic/fhsenv.nix | 5 - .../tower-pixel-dungeon/default.nix | 32 - .../tower-pixel-dungeon/deps.json | 238 - pkgs/os-specific/linux/evdi/default.nix | 40 +- .../linux/kernel/hardened/patches.json | 60 +- .../os-specific/linux/kernel/kernels-org.json | 16 +- .../home-assistant/component-packages.nix | 2 +- .../mushroom/default.nix | 6 +- pkgs/servers/home-assistant/default.nix | 6 +- pkgs/servers/home-assistant/stubs.nix | 4 +- pkgs/servers/http/tomcat/default.nix | 4 +- pkgs/servers/monitoring/grafana/default.nix | 8 +- pkgs/servers/nextcloud/packages/29.json | 10 - pkgs/servers/nextcloud/packages/30.json | 10 - pkgs/servers/snac2/default.nix | 4 +- pkgs/servers/sql/postgresql/ext/postgis.nix | 8 +- pkgs/test/cuda/default.nix | 5 + .../audio/openai-whisper-cpp/default.nix | 4 +- .../tools/package-management/akku/default.nix | 16 +- pkgs/tools/security/rekor/default.nix | 6 +- pkgs/tools/security/trufflehog/default.nix | 6 +- pkgs/tools/system/plan9port/default.nix | 2 +- pkgs/top-level/aliases.nix | 7 - pkgs/top-level/all-packages.nix | 17 +- pkgs/top-level/coq-packages.nix | 1 - pkgs/top-level/php-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 - pkgs/top-level/python-packages.nix | 9 +- pkgs/top-level/release-cuda.nix | 1 + 257 files changed, 9423 insertions(+), 3772 deletions(-) delete mode 100755 .github/workflows/lint-actions.sh delete mode 100644 nixos/tests/rmfakecloud.nix create mode 100644 pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix delete mode 100644 pkgs/by-name/al/algia/package.nix delete mode 100644 pkgs/by-name/dc/dcgm/dynamic-libs.patch delete mode 100644 pkgs/by-name/dc/dcgm/fix-includes.patch delete mode 100644 pkgs/by-name/gi/gitify/package.nix delete mode 100644 pkgs/by-name/id/id3/package.nix delete mode 100644 pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__main__.py create mode 100644 pkgs/by-name/no/nostui/Cargo.lock delete mode 100644 pkgs/by-name/ov/overturemaps/package.nix delete mode 100644 pkgs/by-name/qi/qidi-slicer-bin/package.nix delete mode 100644 pkgs/by-name/qt/qtscrcpy/remove_deprecated_avcodec_free_context.patch create mode 100644 pkgs/by-name/ru/ruff/Cargo.lock delete mode 100644 pkgs/by-name/sn/snis-assets/manifest.txt delete mode 100644 pkgs/by-name/sn/snis-assets/package.nix delete mode 100644 pkgs/by-name/sn/snis-unwrapped/package.nix create mode 100644 pkgs/by-name/st/starpls-bin/package.nix delete mode 100644 pkgs/by-name/st/starpls/manifest.json delete mode 100644 pkgs/by-name/st/starpls/package.nix delete mode 100755 pkgs/by-name/st/starpls/update.py delete mode 100644 pkgs/by-name/te/technitium-dns-server-library/package.nix rename pkgs/by-name/te/{technitium-dns-server-library/nuget-deps.nix => technitium-dns-server/library-nuget-deps.nix} (100%) delete mode 100644 pkgs/by-name/te/television/package.nix delete mode 100644 pkgs/by-name/wa/wayclip/package.nix delete mode 100644 pkgs/by-name/wl/wl-crosshair/package.nix delete mode 100644 pkgs/development/coq-modules/lemma-overloading/default.nix delete mode 100644 pkgs/development/python-modules/jianpu-ly/default.nix delete mode 100644 pkgs/development/python-modules/wgnlpy/default.nix delete mode 100644 pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix delete mode 100644 pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml index 481ae2df4c31f..de74ae8b5372a 100644 --- a/.github/workflows/check-nixf-tidy.yml +++ b/.github/workflows/check-nixf-tidy.yml @@ -107,7 +107,7 @@ jobs: echo "$errors" else # just print in plain text - echo "${errors/::/}" + echo "$errors" | sed 's/^:://' echo # add one empty line fi failedFiles+=("$dest") diff --git a/.github/workflows/editorconfig-v2.yml b/.github/workflows/editorconfig-v2.yml index f3f4d59eef9bf..b14f76637458c 100644 --- a/.github/workflows/editorconfig-v2.yml +++ b/.github/workflows/editorconfig-v2.yml @@ -38,7 +38,7 @@ jobs: nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz - name: Checking EditorConfig run: | - < "$HOME/changed_files" nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size' + cat "$HOME/changed_files" | nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size' - if: ${{ failure() }} run: | echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again." diff --git a/.github/workflows/lint-actions.sh b/.github/workflows/lint-actions.sh deleted file mode 100755 index 43d6e801caf68..0000000000000 --- a/.github/workflows/lint-actions.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash actionlint shellcheck -I nixpkgs=../.. -set -euo pipefail - -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -cd "$SCRIPT_DIR/../.." -actionlint diff --git a/ci/OWNERS b/ci/OWNERS index d67e6b019b8cc..1a1175cacd6cb 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -14,7 +14,7 @@ # Processing of this file is implemented in workflows/codeowners-v2.yml # CI -/.github/workflows @NixOS/Security @Mic92 @zowoq @infinisil @azuwis +/.github/workflows @NixOS/Security @Mic92 @zowoq @infinisil /.github/workflows/check-nix-format.yml @infinisil /.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron /.github/workflows/codeowners-v2.yml @infinisil @@ -241,7 +241,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # PostgreSQL and related stuff /pkgs/servers/sql/postgresql @NixOS/postgres -/pkgs/development/tools/rust/cargo-pgrx @NixOS/postgres /nixos/modules/services/databases/postgresql.md @NixOS/postgres /nixos/modules/services/databases/postgresql.nix @NixOS/postgres /nixos/tests/postgresql @NixOS/postgres diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 8433042838dc6..20f96f0849d16 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -329,7 +329,6 @@ rec { ucrtAarch64 = { config = "aarch64-w64-mingw32"; libc = "ucrt"; - rust.rustcTarget = "aarch64-pc-windows-gnullvm"; useLLVM = true; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e1f60b5be9ddb..055857336729b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4578,13 +4578,6 @@ githubId = 1707779; name = "Chris Ertel"; }; - crimeminister = { - email = "robert@crimeminister.org"; - name = "Robert Medeiros"; - github = "crimeminister"; - githubId = 29072; - keys = [ { fingerprint = "E3BD A35E 590A 8D29 701A 9723 F448 7FA0 4BC6 44F2"; } ]; - }; crinklywrappr = { email = "crinklywrappr@pm.me"; name = "Daniel Fitzpatrick"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 4690bf70cfe8a..e62065775b913 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -44,8 +44,6 @@ - `authelia` has been upgraded to version 4.38. This version brings several features and improvements which are detailed in the [release blog post](https://www.authelia.com/blog/4.38-release-notes/). This release also deprecates some configuration keys which are likely to be removed in version 5.0.0. -- `netbird` has been updated to 0.31.1. This adds a built-in relay server which is not yet supported by the NixOS module, as well as a metrics endpoint for both the management and signal services. The default metrics port for the `signal` service has been changed from `9090` to `9091` to prevent a port conflict with the management server. This can be changed with their respective `metricsPort` as needed. Refer to the [release notes](https://github.com/netbirdio/netbird/releases/tag/v0.31.1) and [this pull request](https://github.com/NixOS/nixpkgs/pull/354032#issuecomment-2480925927) for more information. - - `compressDrv` can compress selected files in a derivation. `compressDrvWeb` compresses files for common web server usage (`.gz` with `zopfli`, `.br` with `brotli`). - [`hardware.display`](#opt-hardware.display.edid.enable) is a new module implementing workarounds for misbehaving monitors diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index d55b5bfd42a7d..31d1777d30142 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -28,8 +28,6 @@ After you run ALTER EXTENSION, you must run [this SQL script](https://github.com/timescale/timescaledb-extras/blob/master/utils/2.15.X-fix_hypertable_foreign_keys.sql). For more details, see the following pull requests [#6797](https://github.com/timescale/timescaledb/pull/6797). PostgreSQL 13 is no longer supported in TimescaleDB v2.16. -- Support for CUDA 10 has been dropped, as announced in the 24.11 release notes. - - `kanata` was updated to v1.7.0, which introduces several breaking changes. See the release notes of [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0) diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix index 35471f74949c4..26652db6016e6 100644 --- a/nixos/lib/test-driver/default.nix +++ b/nixos/lib/test-driver/default.nix @@ -1,18 +1,17 @@ -{ - lib, - python3Packages, - enableOCR ? false, - qemu_pkg ? qemu_test, - coreutils, - imagemagick_light, - netpbm, - qemu_test, - socat, - ruff, - tesseract4, - vde2, - extraPythonPackages ? (_: [ ]), - nixosTests, +{ lib +, python3Packages +, enableOCR ? false +, qemu_pkg ? qemu_test +, coreutils +, imagemagick_light +, netpbm +, qemu_test +, socat +, ruff +, tesseract4 +, vde2 +, extraPythonPackages ? (_ : []) +, nixosTests }: let fs = lib.fileset; @@ -20,8 +19,6 @@ in python3Packages.buildPythonApplication { pname = "nixos-test-driver"; version = "1.1"; - pyproject = true; - src = fs.toSource { root = ./.; fileset = fs.unions [ @@ -30,50 +27,37 @@ python3Packages.buildPythonApplication { ./extract-docstrings.py ]; }; + pyproject = true; - build-system = with python3Packages; [ - setuptools - ]; - - dependencies = - with python3Packages; - [ - colorama - junit-xml - ptpython - ] + propagatedBuildInputs = [ + coreutils + netpbm + python3Packages.colorama + python3Packages.junit-xml + python3Packages.ptpython + qemu_pkg + socat + vde2 + ] + ++ (lib.optionals enableOCR [ imagemagick_light tesseract4 ]) ++ extraPythonPackages python3Packages; - propagatedBuildInputs = - [ - coreutils - netpbm - qemu_pkg - socat - vde2 - ] - ++ lib.optionals enableOCR [ - imagemagick_light - tesseract4 - ]; + nativeBuildInputs = [ + python3Packages.setuptools + ]; passthru.tests = { inherit (nixosTests.nixos-test-driver) driver-timeout; }; doCheck = true; - - nativeCheckInputs = with python3Packages; [ - mypy - ruff - ]; - + nativeCheckInputs = with python3Packages; [ mypy ruff black ]; checkPhase = '' echo -e "\x1b[32m## run mypy\x1b[0m" mypy test_driver extract-docstrings.py - echo -e "\x1b[32m## run ruff check\x1b[0m" + echo -e "\x1b[32m## run ruff\x1b[0m" ruff check . - echo -e "\x1b[32m## run ruff format\x1b[0m" - ruff format --check --diff . + echo -e "\x1b[32m## run black\x1b[0m" + black --check --diff . ''; } diff --git a/nixos/lib/test-driver/pyproject.toml b/nixos/lib/test-driver/pyproject.toml index ac83eed268d92..714139bc1b25c 100644 --- a/nixos/lib/test-driver/pyproject.toml +++ b/nixos/lib/test-driver/pyproject.toml @@ -17,7 +17,6 @@ find = {} test_driver = ["py.typed"] [tool.ruff] -target-version = "py312" line-length = 88 lint.select = ["E", "F", "I", "U", "N"] @@ -36,6 +35,11 @@ ignore_missing_imports = true module = "junit_xml.*" ignore_missing_imports = true +[tool.black] +line-length = 88 +target-version = ['py39'] +include = '\.pyi?$' + [tool.mypy] warn_redundant_casts = true disallow_untyped_calls = true diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py index ca778a576f722..0f01bd6d0ab49 100644 --- a/nixos/lib/test-driver/test_driver/driver.py +++ b/nixos/lib/test-driver/test_driver/driver.py @@ -3,10 +3,9 @@ import signal import tempfile import threading -from collections.abc import Callable, Iterator -from contextlib import AbstractContextManager, contextmanager +from contextlib import contextmanager from pathlib import Path -from typing import Any +from typing import Any, Callable, ContextManager, Dict, Iterator, List, Optional, Union from colorama import Fore, Style @@ -45,17 +44,17 @@ class Driver: and runs the tests""" tests: str - vlans: list[VLan] - machines: list[Machine] - polling_conditions: list[PollingCondition] + vlans: List[VLan] + machines: List[Machine] + polling_conditions: List[PollingCondition] global_timeout: int race_timer: threading.Timer logger: AbstractLogger def __init__( self, - start_scripts: list[str], - vlans: list[int], + start_scripts: List[str], + vlans: List[int], tests: str, out_dir: Path, logger: AbstractLogger, @@ -74,7 +73,7 @@ def __init__( vlans = list(set(vlans)) self.vlans = [VLan(nr, tmp_dir, self.logger) for nr in vlans] - def cmd(scripts: list[str]) -> Iterator[NixStartScript]: + def cmd(scripts: List[str]) -> Iterator[NixStartScript]: for s in scripts: yield NixStartScript(s) @@ -120,7 +119,7 @@ def subtest(self, name: str) -> Iterator[None]: self.logger.error(f'Test "{name}" failed with error: "{e}"') raise e - def test_symbols(self) -> dict[str, Any]: + def test_symbols(self) -> Dict[str, Any]: @contextmanager def subtest(name: str) -> Iterator[None]: return self.subtest(name) @@ -208,7 +207,7 @@ def create_machine( self, start_command: str | dict, *, - name: str | None = None, + name: Optional[str] = None, keep_vm_state: bool = False, ) -> Machine: # Legacy args handling @@ -274,11 +273,11 @@ def check_polling_conditions(self) -> None: def polling_condition( self, - fun_: Callable | None = None, + fun_: Optional[Callable] = None, *, seconds_interval: float = 2.0, - description: str | None = None, - ) -> Callable[[Callable], AbstractContextManager] | AbstractContextManager: + description: Optional[str] = None, + ) -> Union[Callable[[Callable], ContextManager], ContextManager]: driver = self class Poll: diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/test_driver/logger.py index 564d39f4f055c..484829254b812 100644 --- a/nixos/lib/test-driver/test_driver/logger.py +++ b/nixos/lib/test-driver/test_driver/logger.py @@ -5,11 +5,10 @@ import time import unicodedata from abc import ABC, abstractmethod -from collections.abc import Iterator from contextlib import ExitStack, contextmanager from pathlib import Path from queue import Empty, Queue -from typing import Any +from typing import Any, Dict, Iterator, List from xml.sax.saxutils import XMLGenerator from xml.sax.xmlreader import AttributesImpl @@ -19,17 +18,17 @@ class AbstractLogger(ABC): @abstractmethod - def log(self, message: str, attributes: dict[str, str] = {}) -> None: + def log(self, message: str, attributes: Dict[str, str] = {}) -> None: pass @abstractmethod @contextmanager - def subtest(self, name: str, attributes: dict[str, str] = {}) -> Iterator[None]: + def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]: pass @abstractmethod @contextmanager - def nested(self, message: str, attributes: dict[str, str] = {}) -> Iterator[None]: + def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]: pass @abstractmethod @@ -69,11 +68,11 @@ def __init__(self, outfile: Path) -> None: self._print_serial_logs = True atexit.register(self.close) - def log(self, message: str, attributes: dict[str, str] = {}) -> None: + def log(self, message: str, attributes: Dict[str, str] = {}) -> None: self.tests[self.currentSubtest].stdout += message + os.linesep @contextmanager - def subtest(self, name: str, attributes: dict[str, str] = {}) -> Iterator[None]: + def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]: old_test = self.currentSubtest self.tests.setdefault(name, self.TestCaseState()) self.currentSubtest = name @@ -83,7 +82,7 @@ def subtest(self, name: str, attributes: dict[str, str] = {}) -> Iterator[None]: self.currentSubtest = old_test @contextmanager - def nested(self, message: str, attributes: dict[str, str] = {}) -> Iterator[None]: + def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]: self.log(message) yield @@ -124,25 +123,25 @@ def close(self) -> None: class CompositeLogger(AbstractLogger): - def __init__(self, logger_list: list[AbstractLogger]) -> None: + def __init__(self, logger_list: List[AbstractLogger]) -> None: self.logger_list = logger_list def add_logger(self, logger: AbstractLogger) -> None: self.logger_list.append(logger) - def log(self, message: str, attributes: dict[str, str] = {}) -> None: + def log(self, message: str, attributes: Dict[str, str] = {}) -> None: for logger in self.logger_list: logger.log(message, attributes) @contextmanager - def subtest(self, name: str, attributes: dict[str, str] = {}) -> Iterator[None]: + def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]: with ExitStack() as stack: for logger in self.logger_list: stack.enter_context(logger.subtest(name, attributes)) yield @contextmanager - def nested(self, message: str, attributes: dict[str, str] = {}) -> Iterator[None]: + def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]: with ExitStack() as stack: for logger in self.logger_list: stack.enter_context(logger.nested(message, attributes)) @@ -174,7 +173,7 @@ class TerminalLogger(AbstractLogger): def __init__(self) -> None: self._print_serial_logs = True - def maybe_prefix(self, message: str, attributes: dict[str, str]) -> str: + def maybe_prefix(self, message: str, attributes: Dict[str, str]) -> str: if "machine" in attributes: return f"{attributes['machine']}: {message}" return message @@ -183,16 +182,16 @@ def maybe_prefix(self, message: str, attributes: dict[str, str]) -> str: def _eprint(*args: object, **kwargs: Any) -> None: print(*args, file=sys.stderr, **kwargs) - def log(self, message: str, attributes: dict[str, str] = {}) -> None: + def log(self, message: str, attributes: Dict[str, str] = {}) -> None: self._eprint(self.maybe_prefix(message, attributes)) @contextmanager - def subtest(self, name: str, attributes: dict[str, str] = {}) -> Iterator[None]: + def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]: with self.nested("subtest: " + name, attributes): yield @contextmanager - def nested(self, message: str, attributes: dict[str, str] = {}) -> Iterator[None]: + def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]: self._eprint( self.maybe_prefix( Style.BRIGHT + Fore.GREEN + message + Style.RESET_ALL, attributes @@ -242,12 +241,12 @@ def close(self) -> None: def sanitise(self, message: str) -> str: return "".join(ch for ch in message if unicodedata.category(ch)[0] != "C") - def maybe_prefix(self, message: str, attributes: dict[str, str]) -> str: + def maybe_prefix(self, message: str, attributes: Dict[str, str]) -> str: if "machine" in attributes: return f"{attributes['machine']}: {message}" return message - def log_line(self, message: str, attributes: dict[str, str]) -> None: + def log_line(self, message: str, attributes: Dict[str, str]) -> None: self.xml.startElement("line", attrs=AttributesImpl(attributes)) self.xml.characters(message) self.xml.endElement("line") @@ -261,7 +260,7 @@ def warning(self, *args, **kwargs) -> None: # type: ignore def error(self, *args, **kwargs) -> None: # type: ignore self.log(*args, **kwargs) - def log(self, message: str, attributes: dict[str, str] = {}) -> None: + def log(self, message: str, attributes: Dict[str, str] = {}) -> None: self.drain_log_queue() self.log_line(message, attributes) @@ -274,7 +273,7 @@ def log_serial(self, message: str, machine: str) -> None: self.enqueue({"msg": message, "machine": machine, "type": "serial"}) - def enqueue(self, item: dict[str, str]) -> None: + def enqueue(self, item: Dict[str, str]) -> None: self.queue.put(item) def drain_log_queue(self) -> None: @@ -288,12 +287,12 @@ def drain_log_queue(self) -> None: pass @contextmanager - def subtest(self, name: str, attributes: dict[str, str] = {}) -> Iterator[None]: + def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]: with self.nested("subtest: " + name, attributes): yield @contextmanager - def nested(self, message: str, attributes: dict[str, str] = {}) -> Iterator[None]: + def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]: self.xml.startElement("nest", attrs=AttributesImpl({})) self.xml.startElement("head", attrs=AttributesImpl(attributes)) self.xml.characters(message) diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index c423ad8a3fc07..7a602ce6608fa 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -12,11 +12,10 @@ import tempfile import threading import time -from collections.abc import Callable, Iterable from contextlib import _GeneratorContextManager, nullcontext from pathlib import Path from queue import Queue -from typing import Any +from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple from test_driver.logger import AbstractLogger @@ -92,7 +91,7 @@ def make_command(args: list) -> str: def _perform_ocr_on_screenshot( screenshot_path: str, model_ids: Iterable[int] -) -> list[str]: +) -> List[str]: if shutil.which("tesseract") is None: raise Exception("OCR requested but enableOCR is false") @@ -249,19 +248,19 @@ class Machine: start_command: StartCommand keep_vm_state: bool - process: subprocess.Popen | None - pid: int | None - monitor: socket.socket | None - qmp_client: QMPSession | None - shell: socket.socket | None - serial_thread: threading.Thread | None + process: Optional[subprocess.Popen] + pid: Optional[int] + monitor: Optional[socket.socket] + qmp_client: Optional[QMPSession] + shell: Optional[socket.socket] + serial_thread: Optional[threading.Thread] booted: bool connected: bool # Store last serial console lines for use # of wait_for_console_text last_lines: Queue = Queue() - callbacks: list[Callable] + callbacks: List[Callable] def __repr__(self) -> str: return f"" @@ -274,7 +273,7 @@ def __init__( logger: AbstractLogger, name: str = "machine", keep_vm_state: bool = False, - callbacks: list[Callable] | None = None, + callbacks: Optional[List[Callable]] = None, ) -> None: self.out_dir = out_dir self.tmp_dir = tmp_dir @@ -315,7 +314,7 @@ def log(self, msg: str) -> None: def log_serial(self, msg: str) -> None: self.logger.log_serial(msg, self.name) - def nested(self, msg: str, attrs: dict[str, str] = {}) -> _GeneratorContextManager: + def nested(self, msg: str, attrs: Dict[str, str] = {}) -> _GeneratorContextManager: my_attrs = {"machine": self.name} my_attrs.update(attrs) return self.logger.nested(msg, my_attrs) @@ -344,7 +343,7 @@ def send_monitor_command(self, command: str) -> str: return self.wait_for_monitor_prompt() def wait_for_unit( - self, unit: str, user: str | None = None, timeout: int = 900 + self, unit: str, user: Optional[str] = None, timeout: int = 900 ) -> None: """ Wait for a systemd unit to get into "active" state. @@ -374,7 +373,7 @@ def check_active(_: Any) -> bool: ): retry(check_active, timeout) - def get_unit_info(self, unit: str, user: str | None = None) -> dict[str, str]: + def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]: status, lines = self.systemctl(f'--no-pager show "{unit}"', user) if status != 0: raise Exception( @@ -385,7 +384,7 @@ def get_unit_info(self, unit: str, user: str | None = None) -> dict[str, str]: line_pattern = re.compile(r"^([^=]+)=(.*)$") - def tuple_from_line(line: str) -> tuple[str, str]: + def tuple_from_line(line: str) -> Tuple[str, str]: match = line_pattern.match(line) assert match is not None return match[1], match[2] @@ -400,7 +399,7 @@ def get_unit_property( self, unit: str, property: str, - user: str | None = None, + user: Optional[str] = None, ) -> str: status, lines = self.systemctl( f'--no-pager show "{unit}" --property="{property}"', @@ -425,7 +424,7 @@ def get_unit_property( assert match[1] == property, invalid_output_message return match[2] - def systemctl(self, q: str, user: str | None = None) -> tuple[int, str]: + def systemctl(self, q: str, user: Optional[str] = None) -> Tuple[int, str]: """ Runs `systemctl` commands with optional support for `systemctl --user` @@ -481,8 +480,8 @@ def execute( command: str, check_return: bool = True, check_output: bool = True, - timeout: int | None = 900, - ) -> tuple[int, str]: + timeout: Optional[int] = 900, + ) -> Tuple[int, str]: """ Execute a shell command, returning a list `(status, stdout)`. @@ -549,7 +548,7 @@ def execute( return (rc, output.decode(errors="replace")) - def shell_interact(self, address: str | None = None) -> None: + def shell_interact(self, address: Optional[str] = None) -> None: """ Allows you to directly interact with the guest shell. This should only be used during test development, not in production tests. @@ -596,7 +595,7 @@ def console_interact(self) -> None: break self.send_console(char.decode()) - def succeed(self, *commands: str, timeout: int | None = None) -> str: + def succeed(self, *commands: str, timeout: Optional[int] = None) -> str: """ Execute a shell command, raising an exception if the exit status is not zero, otherwise returning the standard output. Similar to `execute`, @@ -613,7 +612,7 @@ def succeed(self, *commands: str, timeout: int | None = None) -> str: output += out return output - def fail(self, *commands: str, timeout: int | None = None) -> str: + def fail(self, *commands: str, timeout: Optional[int] = None) -> str: """ Like `succeed`, but raising an exception if the command returns a zero status. @@ -725,7 +724,7 @@ def tty_matches(last: bool) -> bool: with self.nested(f"waiting for {regexp} to appear on tty {tty}"): retry(tty_matches, timeout) - def send_chars(self, chars: str, delay: float | None = 0.01) -> None: + def send_chars(self, chars: str, delay: Optional[float] = 0.01) -> None: """ Simulate typing a sequence of characters on the virtual keyboard, e.g., `send_chars("foobar\n")` will type the string `foobar` @@ -799,10 +798,10 @@ def port_is_closed(_: Any) -> bool: with self.nested(f"waiting for TCP port {port} on {addr} to be closed"): retry(port_is_closed, timeout) - def start_job(self, jobname: str, user: str | None = None) -> tuple[int, str]: + def start_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]: return self.systemctl(f"start {jobname}", user) - def stop_job(self, jobname: str, user: str | None = None) -> tuple[int, str]: + def stop_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]: return self.systemctl(f"stop {jobname}", user) def wait_for_job(self, jobname: str) -> None: @@ -943,13 +942,13 @@ def dump_tty_contents(self, tty: str) -> None: """Debugging: Dump the contents of the TTY""" self.execute(f"fold -w 80 /dev/vcs{tty} | systemd-cat") - def _get_screen_text_variants(self, model_ids: Iterable[int]) -> list[str]: + def _get_screen_text_variants(self, model_ids: Iterable[int]) -> List[str]: with tempfile.TemporaryDirectory() as tmpdir: screenshot_path = os.path.join(tmpdir, "ppm") self.send_monitor_command(f"screendump {screenshot_path}") return _perform_ocr_on_screenshot(screenshot_path, model_ids) - def get_screen_text_variants(self) -> list[str]: + def get_screen_text_variants(self) -> List[str]: """ Return a list of different interpretations of what is currently visible on the machine's screen using optical character @@ -1029,7 +1028,7 @@ def console_matches(_: Any) -> bool: pass def send_key( - self, key: str, delay: float | None = 0.01, log: bool | None = True + self, key: str, delay: Optional[float] = 0.01, log: Optional[bool] = True ) -> None: """ Simulate pressing keys on the virtual keyboard, e.g., @@ -1169,7 +1168,7 @@ def check_x(_: Any) -> bool: with self.nested("waiting for the X11 server"): retry(check_x, timeout) - def get_window_names(self) -> list[str]: + def get_window_names(self) -> List[str]: return self.succeed( r"xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'" ).splitlines() diff --git a/nixos/lib/test-driver/test_driver/polling_condition.py b/nixos/lib/test-driver/test_driver/polling_condition.py index 1a8091cf44719..1cccaf2c71e74 100644 --- a/nixos/lib/test-driver/test_driver/polling_condition.py +++ b/nixos/lib/test-driver/test_driver/polling_condition.py @@ -1,6 +1,6 @@ import time -from collections.abc import Callable from math import isfinite +from typing import Callable, Optional from test_driver.logger import AbstractLogger @@ -12,7 +12,7 @@ class PollingConditionError(Exception): class PollingCondition: condition: Callable[[], bool] seconds_interval: float - description: str | None + description: Optional[str] logger: AbstractLogger last_called: float @@ -20,10 +20,10 @@ class PollingCondition: def __init__( self, - condition: Callable[[], bool | None], + condition: Callable[[], Optional[bool]], logger: AbstractLogger, seconds_interval: float = 2.0, - description: str | None = None, + description: Optional[str] = None, ): self.condition = condition # type: ignore self.seconds_interval = seconds_interval diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index f055298499eb5..41b2e70f334e3 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -290,11 +290,11 @@ postgresql_15.pkgs.pg_partman postgresql_15.pkgs.pgroonga ... ``` -To add plugins via NixOS configuration, set `services.postgresql.extensions`: +To add plugins via NixOS configuration, set `services.postgresql.extraPlugins`: ```nix { services.postgresql.package = pkgs.postgresql_17; - services.postgresql.extensions = ps: with ps; [ + services.postgresql.extraPlugins = ps: with ps; [ pg_repack postgis ]; diff --git a/nixos/modules/services/misc/ntfy-sh.nix b/nixos/modules/services/misc/ntfy-sh.nix index 7e5d5e3924432..fb2388f95be25 100644 --- a/nixos/modules/services/misc/ntfy-sh.nix +++ b/nixos/modules/services/misc/ntfy-sh.nix @@ -70,6 +70,7 @@ in base-url = lib.mkOption { type = lib.types.str; example = "https://ntfy.example"; + # CHANGED: Detailed documentation description = '' Public facing base URL of the service @@ -94,7 +95,7 @@ in description = '' Configuration for ntfy.sh, supported values are documented at - + https://ntfy.sh/docs/config/#config-options ''; }; }; @@ -135,7 +136,7 @@ in User = cfg.user; StateDirectory = "ntfy-sh"; - LoadCredential = + LoadCredential = lib.mkIf (cfg.smtpSenderPassFile != null || cfg.webPushPrivateKeyFile != null) (lib.optional (cfg.smtpSenderPassFile != null) "smtp_pass:${cfg.smtpSenderPassFile}" ++ lib.optional (cfg.webPushPrivateKeyFile != null) "webpush_key:${cfg.webPushPrivateKeyFile}"); diff --git a/nixos/modules/services/misc/rmfakecloud.nix b/nixos/modules/services/misc/rmfakecloud.nix index d19a9969a3ffd..6cc87753aa255 100644 --- a/nixos/modules/services/misc/rmfakecloud.nix +++ b/nixos/modules/services/misc/rmfakecloud.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: with lib; @@ -11,13 +6,18 @@ let cfg = config.services.rmfakecloud; serviceDataDir = "/var/lib/rmfakecloud"; -in -{ +in { options = { services.rmfakecloud = { enable = mkEnableOption "rmfakecloud remarkable self-hosted cloud"; - package = mkPackageOption pkgs "rmfakecloud" { }; + package = mkPackageOption pkgs "rmfakecloud" { + extraDescription = '' + ::: {.note} + The default does not include the web user interface. + ::: + ''; + }; storageUrl = mkOption { type = types.str; @@ -36,12 +36,7 @@ in }; logLevel = mkOption { - type = types.enum [ - "info" - "debug" - "warn" - "error" - ]; + type = types.enum [ "info" "debug" "warn" "error" ]; default = "info"; description = '' Logging level. @@ -51,9 +46,7 @@ in extraSettings = mkOption { type = with types; attrsOf str; default = { }; - example = { - DATADIR = "/custom/path/for/rmfakecloud/data"; - }; + example = { DATADIR = "/custom/path/for/rmfakecloud/data"; }; description = '' Extra settings in the form of a set of key-value pairs. For tokens and secrets, use `environmentFile` instead. @@ -113,9 +106,11 @@ in Type = "simple"; Restart = "always"; - EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; + EnvironmentFile = + mkIf (cfg.environmentFile != null) cfg.environmentFile; - AmbientCapabilities = mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; + AmbientCapabilities = + mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; DynamicUser = true; PrivateDevices = true; @@ -133,10 +128,7 @@ in ProtectProc = "invisible"; ProcSubset = "pid"; RemoveIPC = true; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - ]; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/nixos/modules/services/networking/netbird/management.nix b/nixos/modules/services/networking/netbird/management.nix index 4ebaa60ecb052..f4b5bbf643239 100644 --- a/nixos/modules/services/networking/netbird/management.nix +++ b/nixos/modules/services/networking/netbird/management.nix @@ -196,12 +196,6 @@ in description = "Internal port of the management server."; }; - metricsPort = mkOption { - type = port; - default = 9090; - description = "Internal port of the metrics server."; - }; - extraOptions = mkOption { type = listOf str; default = [ ]; @@ -366,13 +360,6 @@ in } ]; - assertions = [ - { - assertion = cfg.port != cfg.metricsPort; - message = "The primary listen port cannot be the same as the listen port for the metrics endpoint"; - } - ]; - systemd.services.netbird-management = { description = "The management server for Netbird, a wireguard VPN"; documentation = [ "https://netbird.io/docs/" ]; @@ -400,9 +387,6 @@ in # Port to listen on "--port" cfg.port - # Port the internal prometheus server listens on - "--metrics-port" - cfg.metricsPort # Log to stdout "--log-file" "console" diff --git a/nixos/modules/services/networking/netbird/signal.nix b/nixos/modules/services/networking/netbird/signal.nix index 3122b6c9fe5ff..b53e9d40c2eed 100644 --- a/nixos/modules/services/networking/netbird/signal.nix +++ b/nixos/modules/services/networking/netbird/signal.nix @@ -15,12 +15,7 @@ let mkOption ; - inherit (lib.types) - listOf - enum - port - str - ; + inherit (lib.types) enum port str; inherit (utils) escapeSystemdExecArgs; @@ -46,20 +41,6 @@ in description = "Internal port of the signal server."; }; - metricsPort = mkOption { - type = port; - default = 9091; - description = "Internal port of the metrics server."; - }; - - extraOptions = mkOption { - type = listOf str; - default = [ ]; - description = '' - Additional options given to netbird-signal as commandline arguments. - ''; - }; - logLevel = mkOption { type = enum [ "ERROR" @@ -73,38 +54,24 @@ in }; config = mkIf cfg.enable { - - assertions = [ - { - assertion = cfg.port != cfg.metricsPort; - message = "The primary listen port cannot be the same as the listen port for the metrics endpoint"; - } - ]; - systemd.services.netbird-signal = { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = escapeSystemdExecArgs ( - [ - (getExe' cfg.package "netbird-signal") - "run" - # Port to listen on - "--port" - cfg.port - # Port the internal prometheus server listens on - "--metrics-port" - cfg.metricsPort - # Log to stdout - "--log-file" - "console" - # Log level - "--log-level" - cfg.logLevel - ] - ++ cfg.extraOptions - ); + ExecStart = escapeSystemdExecArgs [ + (getExe' cfg.package "netbird-signal") + "run" + # Port to listen on + "--port" + cfg.port + # Log to stdout + "--log-file" + "console" + # Log level + "--log-level" + cfg.logLevel + ]; Restart = "always"; RuntimeDirectory = "netbird-mgmt"; diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index 67218eb29880b..042ca0bb3b368 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -515,13 +515,13 @@ in }; originUrl = mkOption { - description = "The redirect URL of the service. These need to exactly match the OAuth2 redirect target"; + description = "The origin URL of the service. OAuth2 redirects will only be allowed to sites under this origin. Must end with a slash."; type = let - originStrType = types.strMatching ".*://.*$"; + originStrType = types.strMatching ".*://.*/$"; in types.either originStrType (types.nonEmptyListOf originStrType); - example = "https://someservice.example.com/auth/login"; + example = "https://someservice.example.com/"; }; originLanding = mkOption { diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix index 6f5e1536d6164..01319722afa92 100644 --- a/nixos/modules/services/web-apps/netbox.nix +++ b/nixos/modules/services/web-apps/netbox.nix @@ -298,13 +298,13 @@ in { # This mostly correspond to upstream NetBox's 'upgrade.sh' script. versionFile="${cfg.dataDir}/version" - if [[ -h "$versionFile" && "$(readlink -- "$versionFile")" == "${cfg.package}" ]]; then + if [[ -e "$versionFile" && "$(cat "$versionFile")" == "${cfg.package.version}" ]]; then exit 0 fi ${pkg}/bin/netbox migrate ${pkg}/bin/netbox trace_paths --no-input - ${pkg}/bin/netbox collectstatic --clear --no-input + ${pkg}/bin/netbox collectstatic --no-input ${pkg}/bin/netbox remove_stale_contenttypes --no-input ${pkg}/bin/netbox reindex --lazy ${pkg}/bin/netbox clearsessions @@ -314,7 +314,7 @@ in { (lib.versionOlder cfg.package.version "3.7.0") "${pkg}/bin/netbox clearcache"} - ln -sfn "${cfg.package}" "$versionFile" + echo "${cfg.package.version}" > "$versionFile" ''; serviceConfig = defaultServiceConfig // { diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 47c1ce41671bb..14a1439eeae7f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -876,7 +876,6 @@ in { retroarch = handleTest ./retroarch.nix {}; rke2 = handleTestOn ["aarch64-linux" "x86_64-linux"] ./rke2 {}; rkvm = handleTest ./rkvm {}; - rmfakecloud = runTest ./rmfakecloud.nix; robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; rosenpass = handleTest ./rosenpass.nix {}; diff --git a/nixos/tests/rmfakecloud.nix b/nixos/tests/rmfakecloud.nix deleted file mode 100644 index f226c20b9577e..0000000000000 --- a/nixos/tests/rmfakecloud.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ pkgs, ... }: -{ - name = "rmfakecloud"; - meta = with pkgs.lib.maintainers; { - maintainers = [ martinetd ]; - }; - - nodes.machine = { - services.rmfakecloud = { - enable = true; - storageUrl = "https://local.appspot.com"; - }; - }; - - testScript = '' - machine.wait_for_unit("rmfakecloud.service") - machine.wait_for_open_port(3000) - - # first login creates user - login_token = machine.succeed(""" - curl -sSf -b cookie -c cookie -H "Content-Type: application/json" \ - -d'{"email":"test","password":"test"}' -X POST \ - http://localhost:3000/ui/api/login - """) - - # subsequent different pass or mail should fail, but same login works - machine.fail(""" - curl -sSf -H "Content-Type: application/json" \ - -d'{"email":"test","password":"test2"}' -X POST \ - http://localhost:3000/ui/api/login - """) - machine.fail(""" - curl -sSf -H "Content-Type: application/json" \ - -d'{"email":"test2","password":"test"}' -X POST - http://localhost:3000/ui/api/login - """) - machine.succeed(""" - curl -sSf -H "Content-Type: application/json" \ - -d'{"email":"test","password":"test"}' -X POST \ - http://localhost:3000/ui/api/login - """) - - # can get code from cookie or bearer - machine.succeed(""" - curl -sSf -b cookie -c cookie http://localhost:3000/ui/api/newcode - """) - newcode = machine.succeed(f""" - curl -sSf -H "Authorization: Bearer {login_token}" \ - http://localhost:3000/ui/api/newcode - """).strip('"') - - # ... but not junk - machine.fail(f""" - curl -sSf -H "Authorization: Bearer abc{login_token}" \ - http://localhost:3000/ui/api/newcode - """) - - # can connect "device" with said code - machine.succeed(f""" - curl -sSf -d '{{"code":"{newcode}", "deviceDesc": "desc", "deviceID":"rm100-123"}}' \ - http://localhost:3000/token/json/2/device/new - """) - - # for future improvements - machine.log(machine.execute("systemd-analyze security rmfakecloud.service")[1]) - ''; -} diff --git a/nixos/tests/technitium-dns-server.nix b/nixos/tests/technitium-dns-server.nix index 12ee57ed52d21..016c9d4ecead5 100644 --- a/nixos/tests/technitium-dns-server.nix +++ b/nixos/tests/technitium-dns-server.nix @@ -12,15 +12,9 @@ import ./make-test-python.nix ({pkgs, lib, ...}: }; testScript = '' - import json - start_all() machine.wait_for_unit("technitium-dns-server.service") machine.wait_for_open_port(53) - curl_cmd = 'curl --fail-with-body -X GET "http://localhost:5380/api/user/login?user=admin&pass=admin"' - output = json.loads(machine.wait_until_succeeds(curl_cmd, timeout=10)) - print(output) - assert "ok" == output['status'], "status not ok" ''; meta.maintainers = with lib.maintainers; [ fabianrig ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d01509d6d4309..f2af3a9bdc527 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2468,22 +2468,6 @@ let }; }; - ionic.ionic = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "ionic"; - publisher = "ionic"; - version = "1.96.0"; - hash = "sha256-rezlSTzw0x1ugFkWrAUX6tnmbVjiI8sV/488pWkZ/rc="; - }; - meta = { - description = "Official VSCode extension for Ionic and Capacitor development"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ionic.ionic"; - homepage = "https://github.com/ionic-team/vscode-ionic"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ thtrf ]; - }; - }; - ionide.ionide-fsharp = buildVscodeMarketplaceExtension { mktplcRef = { name = "Ionide-fsharp"; diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index e67a46cdf5028..f42b519f26a43 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -6,14 +6,14 @@ let aarch64-linux = "arm64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - amd64-linux_hash = "sha256-Ey2FhekQVSYB0ki4U3HyuKs/URgtZMCl41jkPsZMNrQ="; - arm64-linux_hash = "sha256-oiimMFwwkBOwqlCSFoGQSYHsDpcjTQingyuBkYz8fvA="; + amd64-linux_hash = "sha256-5OW10sABNNYQNUgorM634j5oiBhJJby1ymH6UcmknRg="; + arm64-linux_hash = "sha256-zbO/8RU2SDV1h4gKdxKbvNFFSj6p3ybmPkpKsrup4No="; }."${arch}-linux_hash"; in mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "7.0.0"; + version = "6.7.7"; src = fetchurl { url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb"; inherit hash; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 821506747bd86..45f93f97f2457 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -7,4 +7,9 @@ callPackage ./signal-desktop-darwin.nix { } else callPackage ./signal-desktop.nix { }; + signal-desktop-beta = (callPackage ./signal-desktop-beta.nix { }).overrideAttrs (old: { + meta = old.meta // { + platforms = [ "x86_64-linux" ]; + }; + }); } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix new file mode 100644 index 0000000000000..2b91efdca61a6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -0,0 +1,8 @@ +{ callPackage }: +callPackage ./generic.nix { } rec { + pname = "signal-desktop-beta"; + dir = "Signal Beta"; + version = "7.34.0-beta.2"; + url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; + hash = "sha256-fwSZ0j2iHJUhRc2MZY5Cj6guoAST3XfrXFnj8uUCl9k="; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh b/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh index a2d0e2aae340d..1c5f2386da293 100755 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh @@ -33,6 +33,12 @@ signal-desktop) --override-filename "$SCRIPT_DIR/signal-desktop-darwin.nix" \ signal-desktop ;; +signal-desktop-beta) + latestTagBeta=$(curl_github https://api.github.com/repos/signalapp/Signal-Desktop/releases | jq -r ".[0].tag_name") + latestVersionBeta="$(expr "$latestTagBeta" : 'v\(.*\)')" + echo "Updating signal-desktop-beta for x86_64-linux" + nix-update --version "$latestVersionBeta" --system x86_64-linux --override-filename "$SCRIPT_DIR/signal-desktop-beta.nix" signal-desktop-beta + ;; *) echo "Unknown attr path $UPDATE_NIX_ATTR_PATH" ;; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 65e039991b913..f82cef9d881cb 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -14,11 +14,23 @@ , Accelerate, CoreGraphics, CoreVideo , lmdbSupport ? true, lmdb , leveldbSupport ? true, leveldb, snappy +, cudaSupport ? config.cudaSupport, cudaPackages ? { } +, cudnnSupport ? cudaSupport +, ncclSupport ? false , pythonSupport ? false, python ? null, numpy ? null , substituteAll }: let + inherit (cudaPackages) backendStdenv cudatoolkit nccl; + # The default for cudatoolkit 10.1 is CUDNN 8.0.5, the last version to support CUDA 10.1. + # However, this caffe does not build with CUDNN 8.x, so we use CUDNN 7.6.5 instead. + # Earlier versions of cudatoolkit use pre-8.x CUDNN, so we use the default. + hasCudnn = + if lib.versionOlder cudatoolkit.version "10.1" + then cudaPackages ? cudnn + else cudaPackages ? cudnn_7_6; + toggle = bool: if bool then "ON" else "OFF"; test_model_weights = fetchurl { @@ -45,12 +57,20 @@ stdenv.mkDerivation rec { # boost_python expects [ (if pythonSupport then "-Dpython_version=${python.pythonVersion}" else "-DBUILD_python=OFF") "-DBLAS=open" - "-DCPU_ONLY=ON" - ] ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] + ] ++ (if cudaSupport then [ + "-DCUDA_ARCH_NAME=All" + "-DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin/cc" + ] else [ "-DCPU_ONLY=ON" ]) + ++ ["-DUSE_NCCL=${toggle ncclSupport}"] + ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv4 blas ] + ++ lib.optional cudaSupport cudatoolkit + ++ lib.optional (lib.versionOlder cudatoolkit.version "10.1" && hasCudnn) cudaPackages.cudnn + ++ lib.optional (lib.versionAtLeast cudatoolkit.version "10.1" && hasCudnn) cudaPackages.cudnn_7_6 ++ lib.optional lmdbSupport lmdb + ++ lib.optional ncclSupport nccl ++ lib.optionals leveldbSupport [ leveldb snappy ] ++ lib.optionals pythonSupport [ python numpy ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreVideo ] @@ -85,6 +105,9 @@ stdenv.mkDerivation rec { substituteInPlace src/caffe/util/io.cpp --replace \ 'SetTotalBytesLimit(kProtoReadBytesLimit, 536870912)' \ 'SetTotalBytesLimit(kProtoReadBytesLimit)' + '' + lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") '' + # CUDA 9.0 doesn't support sm_20 + sed -i 's,20 21(20) ,,' cmake/Cuda.cmake ''; preConfigure = lib.optionalString pythonSupport '' @@ -127,7 +150,10 @@ stdenv.mkDerivation rec { maintainers = [ ]; broken = (pythonSupport && (python.isPy310)) + || cudaSupport || !(leveldbSupport -> (leveldb != null && snappy != null)) + || !(cudnnSupport -> (hasCudnn && cudaSupport)) + || !(ncclSupport -> (cudaSupport && !nccl.meta.unsupported)) || !(pythonSupport -> (python != null && numpy != null)) ; license = licenses.bsd2; diff --git a/pkgs/applications/terminal-emulators/st/siduck76-st.nix b/pkgs/applications/terminal-emulators/st/siduck76-st.nix index 54ec7117e2111..cb4a9d77b5fd5 100644 --- a/pkgs/applications/terminal-emulators/st/siduck76-st.nix +++ b/pkgs/applications/terminal-emulators/st/siduck76-st.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/siduck76/st"; description = "Fork of st with many add-ons"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 8d470d3f852f7..77658b58f2603 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -3,6 +3,7 @@ , tcl , libiconv , fetchurl +, fetchpatch , buildPackages , zlib , openssl @@ -17,17 +18,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "fossil"; - version = "2.25"; + version = "2.24"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz"; - hash = "sha256-5O6ceBUold+yp13pET/5NB17Del1wDOzUQYLv0DS/KE="; + hash = "sha256-lc08F2g1vrm4lwdvpYFx/jCwspH2OHu1R0nvvfqWL0w="; }; # required for build time tool `./tools/translate.c` depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ installShellFiles tcl ]; + nativeBuildInputs = [ installShellFiles tcl tclPackages.tcllib ]; buildInputs = [ zlib openssl readline which ed ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv @@ -41,6 +42,27 @@ stdenv.mkDerivation (finalAttrs: { lib.optional (!withInternalSqlite) "--disable-internal-sqlite" ++ lib.optional withJson "--json"; + patches = [ + (fetchpatch { + url = "https://fossil-scm.org/home/vpatch?from=8be0372c10510437&to=5ad708085a90365f"; + extraPrefix = ""; + hash = "sha256-KxF40wiEY3R1RFM0/YOmdNiedQHzs+vyMXslnqLtqQ4="; + name = "fossil-disable-tests.patch"; + }) + (fetchpatch { + url = "https://fossil-scm.org/home/vpatch?from=fb4e90b662803e47&to=17c01c549e73c6b8"; + extraPrefix = ""; + hash = "sha256-b0JSDWEBTlLWFr5rO+g0biPzUfVsdeAw71DR7/WQKzU="; + name = "fossil-fix-json-test.patch"; + }) + (fetchpatch { + url = "https://fossil-scm.org/home/vpatch?from=5ad708085a90365f&to=fb4e90b662803e47"; + extraPrefix = ""; + hash = "sha256-bbWUrlhPxC/DQQDeC3gG0jGfxQ6F7YkxINqg3baf+j0="; + name = "fossil-comment-utf-tests.patch"; + }) + ]; + preBuild = '' export USER=nonexistent-but-specified-user ''; diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 0498161a7a629..0b77df55ba72e 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -38,7 +38,6 @@ , buildType ? "release" , meta ? {} , useFetchCargoVendor ? false -, cargoDeps ? null , cargoLock ? null , cargoVendorDir ? null , checkType ? buildType @@ -61,15 +60,14 @@ , buildAndTestSubdir ? null , ... } @ args: -assert cargoVendorDir == null && cargoDeps == null && cargoLock == null +assert cargoVendorDir == null && cargoLock == null -> !(args ? cargoSha256 && args.cargoSha256 != null) && !(args ? cargoHash && args.cargoHash != null) - -> throw "cargoHash, cargoVendorDir, cargoDeps, or cargoLock must be set"; + -> throw "cargoHash, cargoVendorDir, or cargoLock must be set"; let - cargoDeps' = + cargoDeps = if cargoVendorDir != null then null - else if cargoDeps != null then cargoDeps else if cargoLock != null then importCargoLock cargoLock else if useFetchCargoVendor then (fetchCargoVendor { inherit src srcs sourceRoot preUnpack unpackPhase postUnpack; @@ -104,7 +102,7 @@ in # See https://os.phil-opp.com/testing/ for more information. assert useSysroot -> !(args.doCheck or true); -stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "cargoDeps" "cargoLock" ]) // lib.optionalAttrs useSysroot { +stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "cargoLock" ]) // lib.optionalAttrs useSysroot { RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or ""); } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && buildType == "debug") { RUSTFLAGS = @@ -112,8 +110,7 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg + lib.optionalString useSysroot "--sysroot ${sysroot} " + (args.RUSTFLAGS or ""); } // { - cargoDeps = cargoDeps'; - inherit buildAndTestSubdir; + inherit buildAndTestSubdir cargoDeps; cargoBuildType = buildType; diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix index c691f398bb9c2..81a6b540f232b 100644 --- a/pkgs/by-name/ac/activemq/package.nix +++ b/pkgs/by-name/ac/activemq/package.nix @@ -5,7 +5,7 @@ }: let - version = "6.1.4"; + version = "6.1.3"; in stdenvNoCC.mkDerivation { pname = "activemq"; @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { src = fetchurl { url = "https://archive.apache.org/dist/activemq/${version}/apache-activemq-${version}-bin.tar.gz"; - hash = "sha256-8b0no0XUNOw3U2ULWtNW9R7DAWXtAajvh0nGuTkVNfM="; + hash = "sha256-ytFOgW6ZDxMScJ6/wij0KJXYxUxlLTzVbwtRRWNdx5Q="; }; installPhase = '' diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix index d4c593fb5de12..da6bd31073126 100644 --- a/pkgs/by-name/ae/aegisub/package.nix +++ b/pkgs/by-name/ae/aegisub/package.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { bsd3 ]; mainProgram = "aegisub"; - maintainers = with lib.maintainers; [ wegank ]; + maintainers = with lib.maintainers; [ AndersonTorres wegank ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix deleted file mode 100644 index e9d27cedebd79..0000000000000 --- a/pkgs/by-name/al/algia/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - pkgs, - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "algia"; - version = "0.0.74"; - - src = fetchFromGitHub { - owner = "mattn"; - repo = "algia"; - rev = "v${version}"; - hash = "sha256-t6XDw40FTa7QkZmOkgAufWV1aFjQrLWmycp+zcVYQWs="; - }; - - vendorHash = "sha256-fko9WC/Rh5fmoypqBuFKiuIuIJYMbKV+1uQKf5tFil0="; - - meta = { - description = "CLI application for nostr"; - homepage = "https://github.com/mattn/algia"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ haruki7049 ]; - mainProgram = "algia"; - }; -} diff --git a/pkgs/by-name/an/antimatter-dimensions/package.nix b/pkgs/by-name/an/antimatter-dimensions/package.nix index 84c0348fdb6e7..8118a2d09731b 100644 --- a/pkgs/by-name/an/antimatter-dimensions/package.nix +++ b/pkgs/by-name/an/antimatter-dimensions/package.nix @@ -18,12 +18,12 @@ let in buildNpmPackage rec { pname = "antimatter-dimensions"; - version = "0-unstable-2024-10-16"; + version = "0-unstable-2024-08-12"; src = fetchFromGitHub { owner = "IvarK"; repo = "AntimatterDimensionsSourceCode"; - rev = "b813542c2f77501d0b8d07ae8b0044df2a994e86"; - hash = "sha256-1uZeY0Lgqbo9X9xbXed0aYy8mNApMBXJRlaoliZb/mA="; + rev = "af840eef45bb2120bff4dcebb9b11c181067f9a8"; + hash = "sha256-qlgu/Sw3LMn/ZSXJFi0DW6vYAZyF2D3cCpKmXhID3s4="; }; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 0ed495eada6df..9fd1bf8a475ad 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.70.0-56062"; + version = "1.69.0-55816"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-x+QHlBsZGkmJm05VeZx43XFxpRJR1crLjEqNIQJwitQ="; + hash = "sha256-v9tZE0/Kv90yR1vrflPAZH6n25bdI5AHskUSHz91USU="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/ar/argtable/package.nix b/pkgs/by-name/ar/argtable/package.nix index eb751a2a12af2..c4db49d20254d 100644 --- a/pkgs/by-name/ar/argtable/package.nix +++ b/pkgs/by-name/ar/argtable/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { are essential but tedious to implement for a robust CLI program. ''; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ artuuge ]; + maintainers = with lib.maintainers; [ AndersonTorres artuuge ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/bl/bluez-alsa/package.nix b/pkgs/by-name/bl/bluez-alsa/package.nix index eb42c8402cab7..911efe4a56445 100644 --- a/pkgs/by-name/bl/bluez-alsa/package.nix +++ b/pkgs/by-name/bl/bluez-alsa/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ mit ]; mainProgram = "bluealsa"; - maintainers = with lib.maintainers; [ oxij ]; + maintainers = with lib.maintainers; [ AndersonTorres oxij ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix index 4337cd90b5193..bd9a612416daf 100644 --- a/pkgs/by-name/bl/bluez/package.nix +++ b/pkgs/by-name/bl/bluez/package.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/ChangeLog?h=${finalAttrs.version}"; license = with lib.licenses; [ bsd2 gpl2Plus lgpl21Plus mit ]; mainProgram = "btinfo"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ca/cardinal/package.nix b/pkgs/by-name/ca/cardinal/package.nix index a0307bb8c7a42..a9d653b2f0f27 100644 --- a/pkgs/by-name/ca/cardinal/package.nix +++ b/pkgs/by-name/ca/cardinal/package.nix @@ -1,29 +1,28 @@ -{ - stdenv, - fetchurl, - cmake, - dbus, - fftwFloat, - file, - freetype, - jansson, - lib, - libGL, - libX11, - libXcursor, - libXext, - libXrandr, - libarchive, - libjack2, - liblo, - libsamplerate, - libsndfile, - makeWrapper, - pkg-config, - python3, - speexdsp, - libglvnd, - headless ? false, +{ stdenv +, fetchurl +, cmake +, dbus +, fftwFloat +, file +, freetype +, jansson +, lib +, libGL +, libX11 +, libXcursor +, libXext +, libXrandr +, libarchive +, libjack2 +, liblo +, libsamplerate +, libsndfile +, makeWrapper +, pkg-config +, python3 +, speexdsp +, libglvnd +, headless ? false }: stdenv.mkDerivation rec { @@ -70,13 +69,7 @@ stdenv.mkDerivation rec { ]; hardeningDisable = [ "format" ]; - makeFlags = - [ - "SYSDEPS=true" - "PREFIX=$(out)" - ] - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILING=true" - ++ lib.optional headless "HEADLESS=true"; + makeFlags = lib.optional headless "HEADLESS=true" ++ [ "SYSDEPS=true" "PREFIX=$(out)" ]; postInstall = '' wrapProgram $out/bin/Cardinal \ @@ -93,10 +86,7 @@ stdenv.mkDerivation rec { description = "Plugin wrapper around VCV Rack"; homepage = "https://github.com/DISTRHO/cardinal"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ - magnetophon - PowerUser64 - ]; + maintainers = with lib.maintainers; [ magnetophon PowerUser64 ]; mainProgram = "Cardinal"; platforms = lib.platforms.all; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix index 52c8821bd2d1e..de998e550b41e 100644 --- a/pkgs/by-name/ch/chez/package.nix +++ b/pkgs/by-name/ch/chez/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "chez-scheme"; - version = "10.1.0"; + version = "10.0.0"; src = fetchurl { url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz"; - hash = "sha256-kYGmyMSrXl0y2Hn/FZ0zWlDU+LOIYRriKiY+kyw1OYs="; + hash = "sha256-03GZASte0ZhcQGnWqH/xjl4fWi3yfkApkfr0XcTyIyw="; }; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/cl/clerk/package.nix b/pkgs/by-name/cl/clerk/package.nix index e9c719dbadc45..9ff0290a2379c 100644 --- a/pkgs/by-name/cl/clerk/package.nix +++ b/pkgs/by-name/cl/clerk/package.nix @@ -96,6 +96,7 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ anderspapitto rewine + AndersonTorres ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 3b6a80a550c4e..3b5caabec7092 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -217,7 +217,7 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor finalAttrs.version}/release/${lib.versions.majorMinor finalAttrs.version}.html"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ttuegel lnl7 ]; + maintainers = with lib.maintainers; [ ttuegel lnl7 AndersonTorres ]; platforms = lib.platforms.all; mainProgram = "cmake"; broken = (qt5UI && stdenv.hostPlatform.isDarwin); diff --git a/pkgs/by-name/co/container2wasm/package.nix b/pkgs/by-name/co/container2wasm/package.nix index 633c08d02ebec..0245cb57ebfb4 100644 --- a/pkgs/by-name/co/container2wasm/package.nix +++ b/pkgs/by-name/co/container2wasm/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "container2wasm"; - version = "0.7.0"; + version = "0.6.5"; src = fetchFromGitHub { owner = "ktock"; repo = "container2wasm"; rev = "refs/tags/v${version}"; - hash = "sha256-Zet7gTS/929/RVsh/F0N4AlQ9KVfsfDVyAYYJR3Xjc4="; + hash = "sha256-PFgaqzl6uc6vHzcZ9+FpugAOFSBKhxAsoSvmYHxUmLs="; }; - vendorHash = "sha256-X6JG/D+f9MmZVGqic13OkyPriLloEazU6dqDjue6YmY="; + vendorHash = "sha256-j6oqYpFcfZy4Lz4C9wbJGI2RdJsAxQxBqcLNWgKk/UU="; ldflags = [ "-s" diff --git a/pkgs/by-name/da/darcs-to-git/package.nix b/pkgs/by-name/da/darcs-to-git/package.nix index 0c3111b0d2125..8ab4a7d63f85c 100644 --- a/pkgs/by-name/da/darcs-to-git/package.nix +++ b/pkgs/by-name/da/darcs-to-git/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { pname = "darcs-to-git"; - version = "0-unstable-2024-11-07"; + version = "0-unstable-2024-09-30"; src = fetchFromGitHub { owner = "purcell"; repo = "darcs-to-git"; - rev = "7b7bbc653c953772edffc2378cc0b2fe7632e1fa"; - hash = "sha256-94tHR4zLaXERQM2Eyy/S3DW/f0jGasA0i3FMF8I5tIo="; + rev = "9d556cb7daa06b9de3cb97487b98bab2869a7fe7"; + hash = "sha256-0GKSzqgJgi1w4uZOqixp/F6i7hK2ZmuQI0px8FEDFXM="; }; patchPhase = diff --git a/pkgs/by-name/dc/dcgm/dynamic-libs.patch b/pkgs/by-name/dc/dcgm/dynamic-libs.patch deleted file mode 100644 index fcc544c75bed5..0000000000000 --- a/pkgs/by-name/dc/dcgm/dynamic-libs.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/cmake/FindJsoncpp.cmake b/cmake/FindJsoncpp.cmake -index abedf7bb85..d7a52f5c7b 100644 ---- a/cmake/FindJsoncpp.cmake -+++ b/cmake/FindJsoncpp.cmake -@@ -16,8 +16,8 @@ - - if (NOT TARGET JsonCpp::JsonCpp) - find_package(jsoncpp REQUIRED CONFIG) -- set(JSONCPP_STATIC_LIBS jsoncpp_static) -- set(JSONCPP_INCLUDE_PATH $) -+ set(JSONCPP_STATIC_LIBS jsoncpp) -+ set(JSONCPP_INCLUDE_PATH $) - endif() - # set(Jsoncpp_PATH_PREFIXES /usr/local "${Jsoncpp_ROOT}" "$ENV{HOME}") - # foreach(prefix ${Jsoncpp_PATH_PREFIXES}) -diff --git a/cmake/FindLibevent.cmake b/cmake/FindLibevent.cmake -index 354d6f9b99..38aca9534e 100644 ---- a/cmake/FindLibevent.cmake -+++ b/cmake/FindLibevent.cmake -@@ -26,16 +26,12 @@ - endforeach() - - find_path(LIBEVENT_INCLUDE_DIR evhttp.h event.h PATHS ${Libevent_INCLUDE_PATHS}) --find_library(LIBEVENT_STATIC_LIB NAMES libevent.a libevent_core.a libevent_extra.a PATHS ${Libevent_LIB_PATHS}) --find_library(LIBEVENT_PTHREAD_STATIC_LIB NAMES libevent_pthreads.a PATHS ${Libevent_LIB_PATHS}) -+find_library(LIBEVENT_STATIC_LIB NAMES libevent.so libevent_core.so libevent_extra.so PATHS ${Libevent_LIB_PATHS}) -+find_library(LIBEVENT_PTHREAD_STATIC_LIB NAMES libevent_pthreads.so PATHS ${Libevent_LIB_PATHS}) - --if (LIBEVENT_INCLUDE_DIR AND LIBEVENT_STATIC_LIB AND LIBEVENT_PTHREAD_STATIC_LIB) -+if (LIBEVENT_INCLUDE_DIR AND LIBEVENT_STATIC_LIB) - set(Libevent_FOUND TRUE) -- add_library(libevent_event_static STATIC IMPORTED) -- set_target_properties(libevent_event_static PROPERTIES IMPORTED_LOCATION ${LIBEVENT_STATIC_LIB}) -- add_library(libevent_event_pthread STATIC IMPORTED) -- set_target_properties(libevent_event_pthread PROPERTIES IMPORTED_LOCATION ${LIBEVENT_PTHREAD_STATIC_LIB}) -- set(LIBEVENT_STATIC_LIBS libevent_event_static libevent_event_pthread) -+ set(LIBEVENT_STATIC_LIBS ${LIBEVENT_STATIC_LIB} ${LIBEVENT_PTHREAD_STATIC_LIB}) - else () - set(Libevent_FOUND FALSE) - endif () diff --git a/pkgs/by-name/dc/dcgm/fix-includes.patch b/pkgs/by-name/dc/dcgm/fix-includes.patch deleted file mode 100644 index 2f15ddca1f7eb..0000000000000 --- a/pkgs/by-name/dc/dcgm/fix-includes.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff --git a/common/CudaWorker/DcgmDgemm.cpp b/common/CudaWorker/DcgmDgemm.cpp -index 8d33a3256e..6b3284258d 100644 ---- a/common/CudaWorker/DcgmDgemm.cpp -+++ b/common/CudaWorker/DcgmDgemm.cpp -@@ -17,6 +17,7 @@ - - #include - #include -+#include - - #define CU_CHK(op) \ - if (auto const status = op; status != CUBLAS_STATUS_SUCCESS) \ -@@ -122,4 +123,4 @@ - return CUBLAS_STATUS_SUCCESS; - } - --} // namespace DcgmNs -\ No newline at end of file -+} // namespace DcgmNs -diff --git a/common/DcgmError.h b/common/DcgmError.h -index 8638cdceb1..e8d817c0d4 100644 ---- a/common/DcgmError.h -+++ b/common/DcgmError.h -@@ -17,6 +17,7 @@ - - #include - #include -+#include - - #include - #include -diff --git a/common/DcgmStringHelpers.cpp b/common/DcgmStringHelpers.cpp -index b41917e3b7..1fe63980c7 100644 ---- a/common/DcgmStringHelpers.cpp -+++ b/common/DcgmStringHelpers.cpp -@@ -17,6 +17,7 @@ - - #include - #include -+#include - - /*****************************************************************************/ - void dcgmTokenizeString(const std::string &src, const std::string &delimiter, std::vector &tokens) -diff --git a/dcgmi/CommandOutputController.cpp b/dcgmi/CommandOutputController.cpp -index 5057205564..8520171efa 100644 ---- a/dcgmi/CommandOutputController.cpp -+++ b/dcgmi/CommandOutputController.cpp -@@ -24,6 +24,7 @@ - #include "dcgm_agent.h" - #include - #include -+#include - #include - #include - #include -diff --git a/dcgmi/Diag.h b/dcgmi/Diag.h -index a326f7b949..563fb3c9c0 100755 ---- a/dcgmi/Diag.h -+++ b/dcgmi/Diag.h -@@ -24,6 +24,7 @@ - #define DIAG_H_ - - #include -+#include - - #include "Command.h" - #include "CommandOutputController.h" -diff --git a/hostengine/src/HostEngineOutput.cpp b/hostengine/src/HostEngineOutput.cpp -index 23c6ca9f54..798b83b3e4 100644 ---- a/hostengine/src/HostEngineOutput.cpp -+++ b/hostengine/src/HostEngineOutput.cpp -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - namespace - { -@@ -365,4 +366,4 @@ - } - } - os << std::endl; --} -\ No newline at end of file -+} -diff --git a/nvvs/src/NvvsCommon.cpp b/nvvs/src/NvvsCommon.cpp -index 8f7888649b..1604d9dabe 100644 ---- a/nvvs/src/NvvsCommon.cpp -+++ b/nvvs/src/NvvsCommon.cpp -@@ -15,6 +15,7 @@ - */ - #include - #include -+#include - #include - #include - -diff --git a/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp b/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp -index 9eebeaf1c4..6e21201229 100644 ---- a/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp -+++ b/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp -@@ -20,6 +20,7 @@ - - #include - #include -+#include - - static void *g_nvmlLib = 0; - static std::atomic_uint32_t g_nvmlStaticLibResetHooksCount = 1; diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix index e0de192b3dafb..7573cb37ec226 100644 --- a/pkgs/by-name/dc/dcgm/package.nix +++ b/pkgs/by-name/dc/dcgm/package.nix @@ -1,13 +1,12 @@ { lib -, stdenv +, gcc11Stdenv , fetchFromGitHub , autoAddDriverRunpath , catch2 , cmake -, ninja +, cudaPackages_10_2 , cudaPackages_11_8 , cudaPackages_12 -, boost , fmt_9 , git , jsoncpp @@ -17,14 +16,30 @@ , symlinkJoin , tclap_1_4 , yaml-cpp + +, static ? gcc11Stdenv.hostPlatform.isStatic }: let - # DCGM depends on 2 different versions of CUDA at the same time. - # The runtime closure, thankfully, is quite small as it does not - # include the CUDA libraries. - cudaPackageSets = [ - cudaPackages_11_8 - cudaPackages_12 + # DCGM depends on 3 different versions of CUDA at the same time. + # The runtime closure, thankfully, is quite small because most things + # are statically linked. + cudaPackageSetByVersion = [ + { + version = "10"; + # Nixpkgs cudaPackages_10 doesn't have redist packages broken out. + pkgSet = [ + cudaPackages_10_2.cudatoolkit + cudaPackages_10_2.cudatoolkit.lib + ]; + } + { + version = "11"; + pkgSet = getCudaPackages cudaPackages_11_8; + } + { + version = "12"; + pkgSet = getCudaPackages cudaPackages_12; + } ]; # Select needed redist packages from cudaPackages @@ -39,40 +54,44 @@ let libcurand ]; - # Builds CMake flags to add CUDA paths for include and lib. - mkCudaFlags = cudaPackages: + # Builds CMake code to add CUDA paths for include and lib. + mkAppendCudaPaths = { version, pkgSet }: let - version = cudaPackages.cudaMajorVersion; # The DCGM CMake assumes that the folder containing cuda.h contains all headers, so we must # combine everything together for headers to work. - headers = symlinkJoin { - name = "cuda-headers-combined-${version}"; - paths = lib.map (pkg: "${lib.getInclude pkg}/include") (getCudaPackages cudaPackages); + # It would be more convenient to use symlinkJoin on *just* the include subdirectories + # of each package, but not all of them have an include directory and making that work + # is more effort than it's worth for this temporary, build-time package. + combined = symlinkJoin { + name = "cuda-combined-${version}"; + paths = pkgSet; }; - in [ - (lib.cmakeFeature "CUDA${version}_INCLUDE_DIR" "${headers}") - (lib.cmakeFeature "CUDA${version}_LIBS" "${cudaPackages.cuda_cudart.stubs}/lib/stubs/libcuda.so") - (lib.cmakeFeature "CUDA${version}_STATIC_LIBS" "${lib.getLib cudaPackages.cuda_cudart}/lib/libcudart.so") - (lib.cmakeFeature "CUDA${version}_STATIC_CUBLAS_LIBS" (lib.concatStringsSep ";" [ - "${lib.getLib cudaPackages.libcublas}/lib/libcublas.so" - "${lib.getLib cudaPackages.libcublas}/lib/libcublasLt.so" - ])) - ]; -in stdenv.mkDerivation rec { + # The combined package above breaks the build for some reason so we just configure + # each package's library path. + libs = lib.concatMapStringsSep " " (x: ''"${x}/lib"'') pkgSet; + in '' + list(APPEND Cuda${version}_INCLUDE_PATHS "${combined}/include") + list(APPEND Cuda${version}_LIB_PATHS ${libs}) + ''; + +# gcc11 is required by DCGM's very particular build system +# C.f. https://github.com/NVIDIA/DCGM/blob/7e1012302679e4bb7496483b32dcffb56e528c92/dcgmbuild/build.sh#L22 +in gcc11Stdenv.mkDerivation rec { pname = "dcgm"; - version = "3.3.9"; # N.B: If you change this, be sure prometheus-dcgm-exporter supports this version. + version = "3.3.5"; # N.B: If you change this, be sure prometheus-dcgm-exporter supports this version. src = fetchFromGitHub { owner = "NVIDIA"; repo = "DCGM"; rev = "refs/tags/v${version}"; - hash = "sha256-PysxuN5WT7GB0oOvT5ezYeOau6AMVDDWE5HOAcmqw/Y="; + hash = "sha256-n/uWvgvxAGfr1X51XgtHfFGDOO5AMBSV5UWQQpsylpg="; }; - patches = [ - ./fix-includes.patch - ./dynamic-libs.patch - ]; + # Add our paths to the CUDA paths so FindCuda.cmake can find them. + EXTRA_CUDA_PATHS = lib.concatMapStringsSep "\n" mkAppendCudaPaths cudaPackageSetByVersion; + prePatch = '' + echo "$EXTRA_CUDA_PATHS"$'\n'"$(cat cmake/FindCuda.cmake)" > cmake/FindCuda.cmake + ''; hardeningDisable = [ "all" ]; @@ -85,55 +104,26 @@ in stdenv.mkDerivation rec { autoAddDriverRunpath cmake - ninja git python3 ]; buildInputs = [ # Header-only - boost catch2 plog.dev tclap_1_4 - fmt_9 - yaml-cpp - jsoncpp - libevent - ]; - - # Add our paths to the CMake flags so FindCuda.cmake can find them. - cmakeFlags = lib.concatMap mkCudaFlags cudaPackageSets; + # Dependencies that can be either static or dynamic. + (fmt_9.override { enableShared = !static; }) # DCGM's build uses the static outputs regardless of enableShared + (yaml-cpp.override { inherit static; stdenv = gcc11Stdenv; }) - # Lots of dodgy C++. - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - doCheck = true; - - checkPhase = '' - runHook preCheck - - ctest -j $NIX_BUILD_CORES --output-on-failure --exclude-regex ${ - lib.escapeShellArg ( - lib.concatMapStringsSep "|" (test: "^${lib.escapeRegex test}$") [ - "DcgmModuleSysmon Watches" - "DcgmModuleSysmon maxSampleAge" - "DcgmModuleSysmon::CalculateCoreUtilization" - "DcgmModuleSysmon::ParseProcStatCpuLine" - "DcgmModuleSysmon::ParseThermalFileContentsAndStore" - "DcgmModuleSysmon::PopulateTemperatureFileMap" - "DcgmModuleSysmon::ReadCoreSpeed" - "DcgmModuleSysmon::ReadTemperature" - "Sysmon: initialize module" - ] - ) - } - - runHook postCheck - ''; + # TODO: Dependencies that DCGM's CMake hard-codes to be static-only. + (jsoncpp.override { enableStatic = true; }) + (libevent.override { sslSupport = false; static = true; }) + ]; - disallowedReferences = lib.concatMap getCudaPackages cudaPackageSets; + disallowedReferences = lib.concatMap (x: x.pkgSet) cudaPackageSetByVersion; meta = with lib; { description = "Data Center GPU Manager (DCGM) is a daemon that allows users to monitor NVIDIA data-center GPUs"; diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix index b52a77bab04d3..785c67aba69b1 100644 --- a/pkgs/by-name/de/debianutils/package.nix +++ b/pkgs/by-name/de/debianutils/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ gpl2Plus publicDomain smail ]; mainProgram = "ischroot"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/de/deltachat-repl/package.nix b/pkgs/by-name/de/deltachat-repl/package.nix index 2cf3bc5f42cca..eedda8a397aff 100644 --- a/pkgs/by-name/de/deltachat-repl/package.nix +++ b/pkgs/by-name/de/deltachat-repl/package.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage { pname = "deltachat-repl"; - inherit (libdeltachat) version src cargoDeps buildInputs; + inherit (libdeltachat) version src cargoLock buildInputs; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/de/deltachat-rpc-server/package.nix b/pkgs/by-name/de/deltachat-rpc-server/package.nix index 7dfd75ef8f661..1e1e95796771c 100644 --- a/pkgs/by-name/de/deltachat-rpc-server/package.nix +++ b/pkgs/by-name/de/deltachat-rpc-server/package.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage { pname = "deltachat-rpc-server"; - inherit (libdeltachat) version src cargoDeps buildInputs; + inherit (libdeltachat) version src cargoLock buildInputs; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index bd29649bfb5f0..379a7d5061d8d 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "ecapture"; - version = "0.8.10"; + version = "0.8.9"; src = fetchFromGitHub { owner = "gojue"; repo = "ecapture"; rev = "refs/tags/v${version}"; - hash = "sha256-vaksl9Bt7Yu62MDGtgkFB4nhH0zdZ29JhE0ypQkuv74="; + hash = "sha256-snq6ypEEyIVxD19pdc2qw/j6FPgmRS9l6lmdDcUljKw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ed/edbrowse/package.nix b/pkgs/by-name/ed/edbrowse/package.nix index 4561e0b902722..154095e57cc8c 100644 --- a/pkgs/by-name/ed/edbrowse/package.nix +++ b/pkgs/by-name/ed/edbrowse/package.nix @@ -92,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ schmitthenner equirosa + AndersonTorres ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/em/emulationstation/package.nix b/pkgs/by-name/em/emulationstation/package.nix index eb8c048d4ea17..8be475d885fca 100644 --- a/pkgs/by-name/em/emulationstation/package.nix +++ b/pkgs/by-name/em/emulationstation/package.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation { license = with lib.licenses; [ mit ]; mainProgram = "emulationstation"; maintainers = with lib.maintainers; [ + AndersonTorres edwtjo ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/fh/fheroes2/package.nix b/pkgs/by-name/fh/fheroes2/package.nix index 467411a8e71f1..c505970c964fa 100644 --- a/pkgs/by-name/fh/fheroes2/package.nix +++ b/pkgs/by-name/fh/fheroes2/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.1.3"; + version = "1.1.2"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-YAjKdr40MTNEtdzSdsKZQlogZYgMFbTrnLLKOyNtLsM="; + hash = "sha256-FSfA2gjJZWAbl2nTJwkAhWcJghbw5ulftU+6QBqljxY="; }; nativeBuildInputs = [ imagemagick ]; diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix index e3a58bc3c36fb..b4b3668633e54 100644 --- a/pkgs/by-name/fi/finamp/package.nix +++ b/pkgs/by-name/fi/finamp/package.nix @@ -1,5 +1,5 @@ { lib -, flutter327 +, flutter324 , mpv-unwrapped , xdg-user-dirs , patchelf @@ -8,16 +8,16 @@ , makeDesktopItem }: let - version = "0.9.12-beta"; + version = "0.9.11-beta"; in -flutter327.buildFlutterApplication { +flutter324.buildFlutterApplication { inherit version; pname = "finamp"; src = fetchFromGitHub { owner = "jmshrv"; repo = "finamp"; rev = version; - hash = "sha256-hY+1BMQEACrpjKZnVwPqWY5M4m4U/Ys/bcqhGMeCE6U="; + hash = "sha256-ruHjLM68c/k+Q64eeoezj5gmmniLBAOt3PEmmaO81xo="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json index 8c7af472635b5..1eb17a65728ad 100644 --- a/pkgs/by-name/fi/finamp/pubspec.lock.json +++ b/pkgs/by-name/fi/finamp/pubspec.lock.json @@ -4,27 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", "url": "https://pub.dev" }, "source": "hosted", - "version": "72.0.0" - }, - "_macros": { - "dependency": "transitive", - "description": "dart", - "source": "sdk", - "version": "0.3.2" + "version": "67.0.0" }, "analyzer": { - "dependency": "direct overridden", + "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.7.0" + "version": "6.4.1" }, "analyzer_plugin": { "dependency": "transitive", @@ -40,11 +34,11 @@ "dependency": "direct main", "description": { "name": "app_set_id", - "sha256": "362d61e013f400666c6e0f57d56ab9d32505e011e4ca4dfb779fd80c9d9505b0", + "sha256": "455b04bc03fd9b1b66a50bbca74278d973ac4e6f2c03d5dd4707bb071613a7e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.0" }, "archive": { "dependency": "transitive", @@ -140,11 +134,11 @@ "dependency": "direct main", "description": { "name": "background_downloader", - "sha256": "91448c0fcb41af14ede14485c33b8ca684fcd6c0ac0a439be9f83fa964753e13", + "sha256": "6a945db1a1c7727a4bc9c1d7c882cfb1a819f873b77e01d5e5dd6a3fb231cb28", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.6.0" + "version": "8.5.5" }, "balanced_text": { "dependency": "direct main", @@ -161,11 +155,11 @@ "dependency": "direct main", "description": { "name": "battery_plus", - "sha256": "220c8f1961efb01d6870493b5ac5a80afaeaffc8757f7a11ed3025a8570d29e7", + "sha256": "ccc1322fee1153a0f89e663e0eac2f64d659da506454cf24dcad75eb08ae138b", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.0" + "version": "6.0.2" }, "battery_plus_platform_interface": { "dependency": "transitive", @@ -241,21 +235,21 @@ "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d", + "sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.13" + "version": "2.4.11" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "sha256": "e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.3.2" + "version": "7.3.1" }, "built_collection": { "dependency": "transitive", @@ -301,21 +295,21 @@ "dependency": "direct main", "description": { "name": "chopper", - "sha256": "40899b729fb6d8969d967264b189efaf2452bc3ccf6ed0782d00f1d8a6161c31", + "sha256": "6b2f5681f2bdca65a1fe2372922e797303fa058b6ead765afa88e40e0fd61071", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.3" + "version": "8.0.2" }, "chopper_generator": { "dependency": "direct dev", "description": { "name": "chopper_generator", - "sha256": "de438569cba1e2a2888e8d91e3c2ac60106574eea7f36823ed0334e96146328a", + "sha256": "7d25ad17062a9b671020f96082ed5f8ee85e18137beb74aca4620137ae6ea523", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.3" + "version": "8.0.2" }, "ci": { "dependency": "transitive", @@ -461,11 +455,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.7" + "version": "2.3.6" }, "dartx": { "dependency": "transitive", @@ -491,11 +485,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "c4af09051b4f0508f6c1dc0a5c085bf014d5c9a4a0678ce1799c2b4d716387a0", + "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.1.0" + "version": "10.1.2" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -521,11 +515,11 @@ "dependency": "transitive", "description": { "name": "fading_edge_scrollview", - "sha256": "1f84fe3ea8e251d00d5735e27502a6a250e4aa3d3b330d3fdcb475af741464ef", + "sha256": "c25c2231652ce774cc31824d0112f11f653881f43d7f5302c05af11942052031", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.1" + "version": "3.0.0" }, "fake_async": { "dependency": "transitive", @@ -561,11 +555,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "aac85f20436608e01a6ffd1fdd4e746a7f33c93a2c83752e626bdfaea139b877", + "sha256": "825aec673606875c33cd8d3c4083f1a3c3999015a84178b317b7ef396b7384f3", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.3" + "version": "8.0.7" }, "file_sizes": { "dependency": "direct main", @@ -607,11 +601,11 @@ "dependency": "direct main", "description": { "name": "flutter_cache_manager", - "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386", + "sha256": "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.1" + "version": "3.3.1" }, "flutter_gen_core": { "dependency": "transitive", @@ -637,21 +631,21 @@ "dependency": "direct dev", "description": { "name": "flutter_launcher_icons", - "sha256": "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77", + "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.14.1" + "version": "0.13.1" }, "flutter_lints": { "dependency": "direct dev", "description": { "name": "flutter_lints", - "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", + "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.0" + "version": "4.0.0" }, "flutter_localizations": { "dependency": "direct main", @@ -673,21 +667,21 @@ "dependency": "direct main", "description": { "name": "flutter_riverpod", - "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1", + "sha256": "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "2.5.1" }, "flutter_rust_bridge": { "dependency": "transitive", "description": { "name": "flutter_rust_bridge", - "sha256": "0ad5079de35d317650fec59b26cb4d0c116ebc2ce703a29f9367513b8a91c287", + "sha256": "e12415c3bce49bcbc3fed383f0ea41ad7d828f6cf0eccba0588ffa5a812fe522", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "1.82.1" }, "flutter_staggered_grid_view": { "dependency": "transitive", @@ -703,31 +697,21 @@ "dependency": "direct main", "description": { "name": "flutter_sticky_header", - "sha256": "7f76d24d119424ca0c95c146b8627a457e8de8169b0d584f766c2c545db8f8be", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.0" - }, - "flutter_svg": { - "dependency": "direct main", - "description": { - "name": "flutter_svg", - "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2", + "sha256": "017f398fbb45a589e01491861ca20eb6570a763fd9f3888165a978e11248c709", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.10+1" + "version": "0.6.5" }, "flutter_tabler_icons": { "dependency": "direct main", "description": { "name": "flutter_tabler_icons", - "sha256": "657c2201e12fa9121a12ddb4edb74d69290f803868eb6526f04102e6d49ec882", + "sha256": "08581b2d87e41c86e3acb7cf48482f1a1775e4ed37febc02ca1b99a221836580", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.43.0" + "version": "1.40.0" }, "flutter_test": { "dependency": "direct dev", @@ -974,11 +958,12 @@ "isar_generator": { "dependency": "direct dev", "description": { - "name": "isar_generator", - "sha256": "76c121e1295a30423604f2f819bc255bc79f852f3bc8743a24017df6068ad133", - "url": "https://pub.dev" + "path": "packages/isar_generator", + "ref": "70a5abd2b36d265a2eef0141f98f312a8710e60c", + "resolved-ref": "70a5abd2b36d265a2eef0141f98f312a8710e60c", + "url": "https://github.com/ndelanou/isar.git" }, - "source": "hosted", + "source": "git", "version": "3.1.0+1" }, "js": { @@ -1015,21 +1000,21 @@ "dependency": "direct main", "description": { "name": "just_audio", - "sha256": "b41646a8241688f1d99c2e69c4da2bb26aa4b3a99795f6ff205c2a165e033fda", + "sha256": "d8e8aaf417d33e345299c17f6457f72bd4ba0c549dc34607abb5183a354edc4d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.41" + "version": "0.9.40" }, "just_audio_media_kit": { "dependency": "direct main", "description": { "name": "just_audio_media_kit", - "sha256": "9f3517213dfc7bbaf6980656feb66c35600f114c7efc0b5b3f4476cd5c18b45e", + "sha256": "7f57d317fafa04cb3e70b924e8f632ffb7eca7a97a369e1e44738ed89fbd5da1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.6" + "version": "2.0.5" }, "just_audio_platform_interface": { "dependency": "transitive", @@ -1045,11 +1030,11 @@ "dependency": "transitive", "description": { "name": "just_audio_web", - "sha256": "9a98035b8b24b40749507687520ec5ab404e291d2b0937823ff45d92cb18d448", + "sha256": "b163878529d9b028c53a6972fcd58cae2405bcd11cbfcea620b6fb9f151429d6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.13" + "version": "0.4.12" }, "leak_tracker": { "dependency": "transitive", @@ -1085,11 +1070,11 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413", + "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.0" + "version": "4.0.0" }, "locale_names": { "dependency": "direct main", @@ -1105,31 +1090,21 @@ "dependency": "direct main", "description": { "name": "logging", - "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" - }, - "macros": { - "dependency": "transitive", - "description": { - "name": "macros", - "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.2-main.4" + "version": "1.2.0" }, "marquee": { "dependency": "direct main", "description": { "name": "marquee", - "sha256": "a87e7e80c5d21434f90ad92add9f820cf68be374b226404fe881d2bba7be0862", + "sha256": "4b5243d2804373bdc25fc93d42c3b402d6ec1f4ee8d0bb72276edd04ae7addb8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.0" + "version": "2.2.3" }, "matcher": { "dependency": "transitive", @@ -1202,6 +1177,16 @@ "source": "hosted", "version": "1.0.6" }, + "mini_music_visualizer": { + "dependency": "direct main", + "description": { + "name": "mini_music_visualizer", + "sha256": "779a957424ce9a09cc00989a8cf9b7541ec22316d9781a43e701afa6acacf274", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, "msix": { "dependency": "direct dev", "description": { @@ -1483,15 +1468,25 @@ "source": "hosted", "version": "1.3.0" }, + "puppeteer": { + "dependency": "transitive", + "description": { + "name": "puppeteer", + "sha256": "871140cbcc1bcbc6d8e4c2c6ca8fdeed5fae66dfef1efc4c271160a96e0823f9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.14.0" + }, "qs_dart": { "dependency": "transitive", "description": { "name": "qs_dart", - "sha256": "be73d060d29c0716ded88380ba32e87ce8105f0ba234edb3edefa0d74d47d64b", + "sha256": "8dddeaf1d32fe407e253840b2c25c9ab5bf347d2761d82cb4ce010096565c9ff", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.4" + "version": "1.2.3" }, "recursive_regex": { "dependency": "transitive", @@ -1507,51 +1502,51 @@ "dependency": "transitive", "description": { "name": "riverpod", - "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959", + "sha256": "f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "2.5.1" }, "riverpod_analyzer_utils": { "dependency": "transitive", "description": { "name": "riverpod_analyzer_utils", - "sha256": "0dcb0af32d561f8fa000c6a6d95633c9fb08ea8a8df46e3f9daca59f11218167", + "sha256": "8b71f03fc47ae27d13769496a1746332df4cec43918aeba9aff1e232783a780f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.6" + "version": "0.5.1" }, "riverpod_annotation": { "dependency": "direct main", "description": { "name": "riverpod_annotation", - "sha256": "e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8", + "sha256": "e5e796c0eba4030c704e9dae1b834a6541814963292839dcf9638d53eba84f5c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "2.3.5" }, "riverpod_generator": { "dependency": "direct dev", "description": { "name": "riverpod_generator", - "sha256": "851aedac7ad52693d12af3bf6d92b1626d516ed6b764eb61bf19e968b5e0b931", + "sha256": "d451608bf17a372025fc36058863737636625dfdb7e3cbf6142e0dfeb366ab22", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "2.4.0" }, "riverpod_lint": { "dependency": "direct dev", "description": { "name": "riverpod_lint", - "sha256": "0684c21a9a4582c28c897d55c7b611fa59a351579061b43f8c92c005804e63a8", + "sha256": "3c67c14ccd16f0c9d53e35ef70d06cd9d072e2fb14557326886bbde903b230a5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "2.3.10" }, "rxdart": { "dependency": "direct main", @@ -1577,51 +1572,11 @@ "dependency": "transitive", "description": { "name": "screen_retriever", - "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", + "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" - }, - "screen_retriever_linux": { - "dependency": "transitive", - "description": { - "name": "screen_retriever_linux", - "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "screen_retriever_macos": { - "dependency": "transitive", - "description": { - "name": "screen_retriever_macos", - "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "screen_retriever_platform_interface": { - "dependency": "transitive", - "description": { - "name": "screen_retriever_platform_interface", - "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "screen_retriever_windows": { - "dependency": "transitive", - "description": { - "name": "screen_retriever_windows", - "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" + "version": "0.1.9" }, "scroll_to_index": { "dependency": "direct main", @@ -1637,21 +1592,21 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "3af2cda1752e5c24f2fc04b6083b40f013ffe84fb90472f30c6499a9213d5442", + "sha256": "ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.1" + "version": "9.0.0" }, "share_plus_platform_interface": { "dependency": "transitive", "description": { "name": "share_plus_platform_interface", - "sha256": "c57c0bbfec7142e3a0f55633be504b796af72e60e3c791b44d5a017b985f7a48", + "sha256": "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.1" + "version": "4.0.0" }, "shelf": { "dependency": "transitive", @@ -1663,6 +1618,16 @@ "source": "hosted", "version": "1.4.1" }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, "shelf_web_socket": { "dependency": "transitive", "description": { @@ -1703,11 +1668,11 @@ "dependency": "direct main", "description": { "name": "smtc_windows", - "sha256": "80f7c10867da485ffdf87f842bf27e6763589933c18c11af5dc1cd1e158c3154", + "sha256": "799bbe0f8e4436da852c5dcc0be482c97b8ae0f504f65c6b750cd239b4835aa0", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" + "version": "0.1.2" }, "source_gen": { "dependency": "transitive", @@ -1750,35 +1715,25 @@ "source": "git", "version": "3.2.1" }, - "sprintf": { - "dependency": "transitive", - "description": { - "name": "sprintf", - "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, "sqflite": { "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "ff5a2436ef8ebdfda748fbfe957f9981524cb5ff11e7bafa8c42771840e8a788", + "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3+2" + "version": "2.3.3+1" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "2d8e607db72e9cb7748c9c6e739e2c9618320a5517de693d5a24609c4671b1a4", + "sha256": "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4+4" + "version": "2.5.4" }, "stack_trace": { "dependency": "transitive", @@ -1834,11 +1789,11 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0+3" + "version": "3.1.0+1" }, "term_glyph": { "dependency": "transitive", @@ -1880,6 +1835,16 @@ "source": "hosted", "version": "1.0.1" }, + "tuple": { + "dependency": "transitive", + "description": { + "name": "tuple", + "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, "typed_data": { "dependency": "transitive", "description": { @@ -1934,21 +1899,21 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.1" + "version": "6.3.0" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab", + "sha256": "f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.10" + "version": "6.3.9" }, "url_launcher_ios": { "dependency": "transitive", @@ -1974,11 +1939,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672", + "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.0" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -2014,31 +1979,21 @@ "dependency": "direct main", "description": { "name": "uuid", - "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.1" + "version": "3.0.7" }, "value_layout_builder": { "dependency": "transitive", "description": { "name": "value_layout_builder", - "sha256": "c02511ea91ca5c643b514a33a38fa52536f74aa939ec367d02938b5ede6807fa", + "sha256": "98202ec1807e94ac72725b7f0d15027afde513c55c69ff3f41bcfccb950831bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.0" - }, - "vector_graphics": { - "dependency": "transitive", - "description": { - "name": "vector_graphics", - "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.11+1" + "version": "0.3.1" }, "vector_graphics_codec": { "dependency": "transitive", @@ -2134,51 +2089,51 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "0.5.1" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", + "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.5" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec", + "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.5.5" + "version": "5.5.4" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.5" + "version": "1.1.4" }, "window_manager": { "dependency": "direct main", "description": { "name": "window_manager", - "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059", + "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.3" + "version": "0.3.9" }, "xdg_directories": { "dependency": "transitive", @@ -2204,11 +2159,11 @@ "dependency": "transitive", "description": { "name": "xxh3", - "sha256": "cbeb0e1d10f4c6bf67b650f395eac0cc689425b5efc2ba0cc3d3e069a0beaeec", + "sha256": "a92b30944a9aeb4e3d4f3c3d4ddb3c7816ca73475cd603682c4f8149690f56d7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.0.1" }, "yaml": { "dependency": "transitive", @@ -2222,7 +2177,7 @@ } }, "sdks": { - "dart": ">=3.5.0 <4.0.0", - "flutter": ">=3.24.0" + "dart": ">=3.4.0 <4.0.0", + "flutter": ">=3.22.0" } } diff --git a/pkgs/by-name/fo/fondo/package.nix b/pkgs/by-name/fo/fondo/package.nix index 16fcd734286a3..46c2c72d91ad3 100644 --- a/pkgs/by-name/fo/fondo/package.nix +++ b/pkgs/by-name/fo/fondo/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/calo001/fondo"; description = "Find the most beautiful wallpapers for your desktop"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; platforms = platforms.linux; mainProgram = "com.github.calo001.fondo"; }; diff --git a/pkgs/by-name/ga/gay/package.nix b/pkgs/by-name/ga/gay/package.nix index 341c620af4ffa..d1129702f867a 100644 --- a/pkgs/by-name/ga/gay/package.nix +++ b/pkgs/by-name/ga/gay/package.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/ms-jpq/gay"; description = "Colour your text / terminal to be more gay"; license = licenses.mit; - maintainers = with maintainers; [ CodeLongAndProsper90 ]; + maintainers = with maintainers; [ AndersonTorres CodeLongAndProsper90 ]; mainProgram = "gay"; }; } diff --git a/pkgs/by-name/gh/gh-i/package.nix b/pkgs/by-name/gh/gh-i/package.nix index c4dbf1ba6aef6..7e78935ccc3bf 100644 --- a/pkgs/by-name/gh/gh-i/package.nix +++ b/pkgs/by-name/gh/gh-i/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gh-i"; - version = "0.0.10"; + version = "0.0.8"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "gh-i"; rev = "v${version}"; - hash = "sha256-k1xfQxRh8T0SINtbFlIVNFEODYU0RhBAkjudOv1bLvw="; + hash = "sha256-fW9T7B/97kI8zjaTvJHOkEUGVVM+ysOxZzqVNeOfVkc="; }; - vendorHash = "sha256-eqSAwHFrvBxLl5zcZyp3+1wTf7+JmpogFBDuVgzNm+w="; + vendorHash = "sha256-TSl+7N3W3BeW8UWxUdTv3cob2P7eLvO+80BLqcbhanQ="; ldflags = [ "-s" ]; diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix deleted file mode 100644 index ae2d4cfdb7ccb..0000000000000 --- a/pkgs/by-name/gi/gitify/package.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pnpm, - nodejs, - electron, - makeDesktopItem, - copyDesktopItems, - imagemagick, - makeWrapper, - nix-update-script, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gitify"; - version = "5.16.1"; - - src = fetchFromGitHub { - owner = "gitify-app"; - repo = "gitify"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-mTe3Nl0ZxUfzS06oETOh/gdcjVWeXSoyXmvKKHJ2rVw="; - }; - - nativeBuildInputs = [ - nodejs - pnpm.configHook - copyDesktopItems - imagemagick - makeWrapper - ]; - - pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) pname version src; - hash = "sha256-xgS7MaiILErKHCSI/f2lQif8Hf3RPQEC/DGGGmOBRzk="; - }; - - env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; - - postPatch = '' - substituteInPlace package.json \ - --replace-fail '"Emmanouil Konstantinidis (3YP8SXP3BF)"' null \ - --replace-fail '"scripts/notarize.js"' null - ''; - - buildPhase = '' - runHook preBuild - - # electronDist needs to be modifiable on Darwin - cp -r ${electron.dist} electron-dist - chmod -R u+w electron-dist - - pnpm build - pnpm exec electron-builder \ - --dir \ - -c.electronDist=electron-dist \ - -c.electronVersion="${electron.version}" \ - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - ${ - if stdenv.hostPlatform.isDarwin then - '' - mkdir -p $out/Applications - cp -r dist/mac*/Gitify.app $out/Applications - makeWrapper $out/Applications/Gitify.app/Contents/MacOS/gitify $out/bin/gitify - '' - else - '' - mkdir -p $out/share/gitify - cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/gitify - - mkdir -p $out/share/icons/hicolor/256x256/apps - magick assets/images/app-icon.ico $out/share/icons/hicolor/256x256/apps/gitify.png - - makeWrapper ${lib.getExe electron} $out/bin/gitify \ - --add-flags $out/share/gitify/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --inherit-argv0 - '' - } - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = "gitify"; - desktopName = "Gitify"; - exec = "gitify %U"; - icon = "gitify"; - comment = "GitHub Notifications on your menu bar."; - categories = [ "Development" ]; - startupWMClass = "Gitify"; - }) - ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - homepage = "https://www.gitify.io/"; - changelog = "https://github.com/gitify-app/gitify/releases/tag/v${finalAttrs.version}"; - description = "GitHub Notifications on your menu bar"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pineapplehunter ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix index a966522b9825c..c7d7e6c51380e 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation rec { - Financial Calculations ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar rski nevivurn ]; + maintainers = with maintainers; [ domenkozar AndersonTorres rski nevivurn ]; platforms = platforms.unix; mainProgram = "gnucash"; }; diff --git a/pkgs/by-name/go/goose/package.nix b/pkgs/by-name/go/goose/package.nix index 2dca37b2259d5..058408ca9f2c3 100644 --- a/pkgs/by-name/go/goose/package.nix +++ b/pkgs/by-name/go/goose/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "goose"; - version = "3.23.0"; + version = "3.22.1"; src = fetchFromGitHub { owner = "pressly"; repo = pname; rev = "v${version}"; - hash = "sha256-xfCkhVUR/GXYQEpaAhaeBV6UfXMdHyzTn+mIJfuHjBA="; + hash = "sha256-rXh50Yv8UXJc+E32Fgg6Iy2K6x5+IM7dmxsvwFuCQ9U="; }; proxyVendor = true; - vendorHash = "sha256-kNe+qc1EIHqXRv0DAGfBK6XNahn/YNmz74mfWrG3+rc="; + vendorHash = "sha256-xb3yBiV+XyOlMp42c+eCj27DpvJalP5qhEoKG1X2kG8="; # skipping: end-to-end tests require a docker daemon postPatch = '' diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index bf91648b34113..0b8e16ced6abb 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -93,7 +93,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; license = lib.licenses.mit; mainProgram = "home-manager"; - maintainers = with lib.maintainers; [ bryango ]; + maintainers = with lib.maintainers; [ AndersonTorres bryango ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/hy/hysteria/package.nix b/pkgs/by-name/hy/hysteria/package.nix index 498f880f96dd0..932d31c1f5e63 100644 --- a/pkgs/by-name/hy/hysteria/package.nix +++ b/pkgs/by-name/hy/hysteria/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "hysteria"; - version = "2.6.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "apernet"; repo = pname; rev = "app/v${version}"; - hash = "sha256-EdqFushE/G0kWOkks7m2nSQ9wXq1p1HjebSgb5tAzmo="; + hash = "sha256-ClWbA3cjQXK8tzXfmApBQ+TBnbRc6f36G1iIFcNQi7o="; }; - vendorHash = "sha256-P4BiWeGZCI/8zehAt+5OEZhQcA9usw+OSum9gEl/gSU="; + vendorHash = "sha256-I5SCr45IT8gl8eD9BburxHBodOpP+R5rk9Khczx5z8M="; proxyVendor = true; ldflags = diff --git a/pkgs/by-name/id/id3/package.nix b/pkgs/by-name/id/id3/package.nix deleted file mode 100644 index e0cd063141c50..0000000000000 --- a/pkgs/by-name/id/id3/package.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - fetchFromGitHub, - lib, - libiconv, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "id3"; - version = "0.81"; - - src = fetchFromGitHub { - owner = "squell"; - repo = "id3"; - rev = version; - hash = "sha256-+h1wwgTB7CpbjyUAK+9BNRhmy83D+1I+cZ70E1m3ENk="; - }; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - - makeFlags = [ "prefix=$(out)" ]; - - meta = { - description = "Portable command-line mass tagger"; - homepage = "https://squell.github.io/id3/"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ jecaro ]; - platforms = lib.platforms.unix; - mainProgram = "id3"; - }; -} diff --git a/pkgs/by-name/j/j/package.nix b/pkgs/by-name/j/j/package.nix index 3101b22bcb507..f7b36dfa35396 100644 --- a/pkgs/by-name/j/j/package.nix +++ b/pkgs/by-name/j/j/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { problems that are not already well understood. ''; license = licenses.gpl3Only; - maintainers = with maintainers; [ raskin synthetica ]; + maintainers = with maintainers; [ raskin synthetica AndersonTorres ]; broken = stdenv.hostPlatform.isDarwin; platforms = platforms.all; mainProgram = "jconsole"; diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 8a501f1e6c609..b39954953c26c 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.37.0"; + version = "1.36.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WF1kyIZyqnIYfFL/HZWBER97aXH3FSCbTRonOKSwgNg="; + hash = "sha256-4p4otR0W/v0DoWwwcNq/UEDa1V8vlZMpdk33B/9A4Bo="; }; - cargoHash = "sha256-/uWxYxczTOlUs2wOCCn5wwbGETHwIqdDI2mb/h4xVxQ="; + cargoHash = "sha256-y6wBFjBOeymbXUIeflQ35FxQRMPlDvB0Zeo2bQeZjJ0="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/by-name/ki/kid3/package.nix b/pkgs/by-name/ki/kid3/package.nix index 7f314d6bb2e30..8403db5c9f3fb 100644 --- a/pkgs/by-name/ki/kid3/package.nix +++ b/pkgs/by-name/ki/kid3/package.nix @@ -42,11 +42,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "kid3"; - version = "3.9.6"; + version = "3.9.5"; src = fetchurl { url = "mirror://kde/stable/kid3/${finalAttrs.version}/kid3-${finalAttrs.version}.tar.xz"; - hash = "sha256-zyf/zENpyZQNp7/BL9EN+9pSa4GH5bYmYqvoBp/CbCc="; + hash = "sha256-pCT+3eNcF247RDNEIqrUOEhBh3LaAgdR0A0IdOXOgUU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ku/kubedock/package.nix b/pkgs/by-name/ku/kubedock/package.nix index 286f30a843f50..b7103c18a2230 100644 --- a/pkgs/by-name/ku/kubedock/package.nix +++ b/pkgs/by-name/ku/kubedock/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubedock"; - version = "0.17.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "joyrex2001"; repo = "kubedock"; rev = version; - hash = "sha256-413VUnVYPHKoy9r/XQ4An/TNfEjozsGANfKawFN7Y08="; + hash = "sha256-UfOFehpN9Qj4LKH61akSidikPytZS4QSFOUzDDw3OCI="; }; - vendorHash = "sha256-S/0oyps1zrbncfy31C6SV13gt/oE+GeXGxD0KaKCn/s="; + vendorHash = "sha256-qPBqKDn6NFa35+f+s2iCeHKdLI7ihK1DUMlq2mldNEI="; # config.Build not defined as it would break r-ryantm ldflags = [ diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix index 7fffab9c0ccb4..5c6d84aad5a8a 100644 --- a/pkgs/by-name/ky/kyverno/package.nix +++ b/pkgs/by-name/ky/kyverno/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.13.1"; + version = "1.12.6"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - hash = "sha256-25q+VNeQ3MviZBcFLgcyK80ZTUILZUWrRRwQ0vys5k4="; + hash = "sha256-FwVB1okxhWTzWlZljGEEH9KuSsJl9GmwnX7bn4iDx/M="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorHash = "sha256-euHYTd2iyfVWsJhWZux5OCv2CPWqmsIPB1/rGD22a5Q="; + vendorHash = "sha256-Zv393gchMaJzdHFp6U0PDlsk+yIg2t5X3nsgK48TW5A="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/pkgs/by-name/la/labwc-gtktheme/package.nix b/pkgs/by-name/la/labwc-gtktheme/package.nix index 0084a5a30a50d..0e9645e596289 100644 --- a/pkgs/by-name/la/labwc-gtktheme/package.nix +++ b/pkgs/by-name/la/labwc-gtktheme/package.nix @@ -49,6 +49,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "labwc-gtktheme"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ AndersonTorres romildo ]; }; } diff --git a/pkgs/by-name/la/labwc-menu-generator/package.nix b/pkgs/by-name/la/labwc-menu-generator/package.nix index 3ba8dd9668162..a7a4f781edd92 100644 --- a/pkgs/by-name/la/labwc-menu-generator/package.nix +++ b/pkgs/by-name/la/labwc-menu-generator/package.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "labwc-menu-generator"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ AndersonTorres romildo ]; }; }) diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix index f62013c98a586..fdf4420f1a814 100644 --- a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix +++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "labwc-tweaks-gtk"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ AndersonTorres romildo ]; }; }) diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix index 306c92c6e71a1..8703c1a4faba0 100644 --- a/pkgs/by-name/li/libarchive/package.nix +++ b/pkgs/by-name/li/libarchive/package.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://github.com/libarchive/libarchive/releases/tag/v${finalAttrs.version}"; license = licenses.bsd3; - maintainers = with maintainers; [ jcumming ]; + maintainers = with maintainers; [ jcumming AndersonTorres ]; platforms = platforms.all; inherit (acl.meta) badPlatforms; }; diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index c8f40db5b6600..a5df231b86577 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -18,7 +18,16 @@ , libiconv }: -stdenv.mkDerivation rec { +let + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "email-0.0.20" = "sha256-rV4Uzqt2Qdrfi5Ti1r+Si1c2iW1kKyWLwOgLkQ5JGGw="; + "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk="; + "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk="; + }; + }; +in stdenv.mkDerivation rec { pname = "libdeltachat"; version = "1.148.7"; @@ -33,11 +42,7 @@ stdenv.mkDerivation rec { ./no-static-lib.patch ]; - cargoDeps = rustPlatform.fetchCargoVendor { - pname = "deltachat-core-rust"; - inherit version src; - hash = "sha256-eDj8DIvvWWj+tfHuzR35WXlKY5klGxW+MixdN++vugk="; - }; + cargoDeps = rustPlatform.importCargoLock cargoLock; nativeBuildInputs = [ cmake @@ -73,6 +78,7 @@ stdenv.mkDerivation rec { ''; passthru = { + inherit cargoLock; tests = { inherit deltachat-desktop deltachat-repl deltachat-rpc-server; python = python3.pkgs.deltachat; diff --git a/pkgs/by-name/li/libnbd/package.nix b/pkgs/by-name/li/libnbd/package.nix index 02b3cf734daa4..76e94bcf04754 100644 --- a/pkgs/by-name/li/libnbd/package.nix +++ b/pkgs/by-name/li/libnbd/package.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { ''; license = with licenses; lgpl21Plus; maintainers = with maintainers; [ + AndersonTorres humancalico ]; platforms = with platforms; linux; diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix index 4933e08796289..55148ad29b91d 100644 --- a/pkgs/by-name/ln/lnav/package.nix +++ b/pkgs/by-name/ln/lnav/package.nix @@ -11,18 +11,17 @@ , automake , curl , buildPackages -, nix-update-script }: stdenv.mkDerivation rec { pname = "lnav"; - version = "0.12.3"; + version = "0.12.2"; src = fetchFromGitHub { owner = "tstack"; repo = "lnav"; rev = "v${version}"; - sha256 = "sha256-m0r7LAo9pYFpS+oimVCNCipojxPzMMsLLjhjkitEwow="; + sha256 = "sha256-grEW3J50osKJzulNQFN7Gir5+wk1qFPc/YaT+EZMAqs="; }; enableParallelBuilding = true; @@ -48,8 +47,6 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - passthru.updateScript = nix-update-script { }; - meta = with lib; { homepage = "https://github.com/tstack/lnav"; description = "Logfile Navigator"; diff --git a/pkgs/by-name/lo/loksh/package.nix b/pkgs/by-name/lo/loksh/package.nix index 4d18fb08c93af..e82c803c56773 100644 --- a/pkgs/by-name/lo/loksh/package.nix +++ b/pkgs/by-name/lo/loksh/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { systems. ''; license = with lib.licenses; [ publicDomain ]; - maintainers = with lib.maintainers; [ cameronnemo ]; + maintainers = with lib.maintainers; [ AndersonTorres cameronnemo ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/lz/lzfse/package.nix b/pkgs/by-name/lz/lzfse/package.nix index ce89b500accd7..dd2144a168493 100644 --- a/pkgs/by-name/lz/lzfse/package.nix +++ b/pkgs/by-name/lz/lzfse/package.nix @@ -1,24 +1,19 @@ -{ - cmake, - fetchFromGitHub, - lib, - stdenv, -}: +{ lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation rec { pname = "lzfse"; version = "1.0"; src = fetchFromGitHub { owner = "lzfse"; repo = "lzfse"; - rev = "lzfse-${finalAttrs.version}"; - hash = "sha256-pcGnes966TSdYeIwjJv4F7C++cRzuYorb7rvu4030NU="; + rev = "lzfse-${version}"; + sha256 = "1mfh6y6vpvxsdwmqmfbkqkwvxc0pz2dqqc72c6fk9sbsrxxaghd5"; }; nativeBuildInputs = [ cmake ]; - meta = { + meta = with lib; { homepage = "https://github.com/lzfse/lzfse"; description = "Reference C implementation of the LZFSE compressor"; longDescription = '' @@ -26,9 +21,9 @@ stdenv.mkDerivation (finalAttrs: { LZFSE is a Lempel-Ziv style data compression algorithm using Finite State Entropy coding. It targets similar compression rates at higher compression and decompression speed compared to deflate using zlib. ''; - platforms = lib.platforms.unix; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ KSJ2000 ]; + platforms = platforms.unix; + license = licenses.bsd3; + maintainers = [ ]; mainProgram = "lzfse"; }; -}) +} diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix index 393694cfe623e..04ec3c080279b 100644 --- a/pkgs/by-name/ma/magic-vlsi/package.nix +++ b/pkgs/by-name/ma/magic-vlsi/package.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { description = "VLSI layout tool written in Tcl"; homepage = "http://opencircuitdesign.com/magic/"; license = licenses.mit; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice AndersonTorres ]; }; } diff --git a/pkgs/by-name/md/mdk-sdk/package.nix b/pkgs/by-name/md/mdk-sdk/package.nix index ae41f07525a63..3381282f675bf 100644 --- a/pkgs/by-name/md/mdk-sdk/package.nix +++ b/pkgs/by-name/md/mdk-sdk/package.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mdk-sdk"; - version = "0.30.0"; + version = "0.29.1"; src = fetchurl { url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz"; - hash = "sha256-dZ6KS3BlJAEOifGgXKBn1jgWTp3x82xJxk8qdXyJTeg="; + hash = "sha256-7dkvm5kP3gcQwXOE9DrjoOTzKRiwk/PVeRr7poLdCU0="; }; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/by-name/me/megatools/package.nix b/pkgs/by-name/me/megatools/package.nix index 105abe6470898..aaf0549e8fd61 100644 --- a/pkgs/by-name/me/megatools/package.nix +++ b/pkgs/by-name/me/megatools/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Command line client for Mega.co.nz"; homepage = "https://megatools.megous.com/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ viric AndersonTorres ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/me/meshoptimizer/package.nix b/pkgs/by-name/me/meshoptimizer/package.nix index 168ee2c729947..c632932e5a53e 100644 --- a/pkgs/by-name/me/meshoptimizer/package.nix +++ b/pkgs/by-name/me/meshoptimizer/package.nix @@ -9,12 +9,12 @@ let }; in stdenv.mkDerivation rec { pname = "meshoptimizer"; - version = "0.22"; + version = "0.21"; src = fetchFromGitHub { owner = "zeux"; repo = "meshoptimizer"; rev = "v${version}"; - hash = "sha256-/47CfgPtj+e4iz01+rwahP+jCXPXXZhTeLLiLktrJ6g="; + hash = "sha256-G8rR4Ff3mVxTPD1etI82fYwFawsjrLvwWuEuib+dUBU="; }; nativeBuildInputs = [ cmake ]; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { description = "Mesh optimization library that makes meshes smaller and faster to render"; homepage = "https://github.com/zeux/meshoptimizer"; license = licenses.mit; - maintainers = with maintainers; [ bouk lillycham ]; + maintainers = [ maintainers.lillycham ]; platforms = platforms.all; mainProgram = "gltfpack"; }; diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 2b68f1e5078ed..419e489e2b2e1 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -173,7 +173,7 @@ python3.pkgs.buildPythonApplication rec { code. ''; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ qyliss ]; + maintainers = with lib.maintainers; [ AndersonTorres qyliss ]; inherit (python3.meta) platforms; }; } diff --git a/pkgs/by-name/mi/micro/package.nix b/pkgs/by-name/mi/micro/package.nix index 1573cc4c4bb41..8f2bb8488db38 100644 --- a/pkgs/by-name/mi/micro/package.nix +++ b/pkgs/by-name/mi/micro/package.nix @@ -83,6 +83,7 @@ let license = lib.licenses.mit; mainProgram = "micro"; maintainers = with lib.maintainers; [ + AndersonTorres pbsds ]; }; diff --git a/pkgs/by-name/mi/miru/darwin.nix b/pkgs/by-name/mi/miru/darwin.nix index 792282b44663d..0e996826d007b 100644 --- a/pkgs/by-name/mi/miru/darwin.nix +++ b/pkgs/by-name/mi/miru/darwin.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/mac-Miru-${version}-mac.zip"; - hash = "sha256-o/7CTkIVufD5ai99XZFyDUgCIV7r4PbUcqkYcMVZwKE="; + hash = "sha256-GTw5RislcL5s6gwUeCmLglXt/BZEpq3aau/ij1E7kso="; }; sourceRoot = "."; diff --git a/pkgs/by-name/mi/miru/linux.nix b/pkgs/by-name/mi/miru/linux.nix index e31b02d79554c..cf935ffa7c85a 100644 --- a/pkgs/by-name/mi/miru/linux.nix +++ b/pkgs/by-name/mi/miru/linux.nix @@ -19,7 +19,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - hash = "sha256-AhaGiZ/Vx9nJmIXrzZ1JMLqjWfQDyoKpzl55NT712Ro="; + hash = "sha256-4ueVgIcIi/RIFRoDKStiNqszfaIXZ9dfagddzCVaSRs="; }; extraInstallCommands = diff --git a/pkgs/by-name/mi/miru/package.nix b/pkgs/by-name/mi/miru/package.nix index f250c3a524f79..3c325b038233e 100644 --- a/pkgs/by-name/mi/miru/package.nix +++ b/pkgs/by-name/mi/miru/package.nix @@ -5,7 +5,7 @@ }: let pname = "miru"; - version = "5.5.9"; + version = "5.5.8"; meta = { description = "Stream anime torrents, real-time with no waiting for downloads"; homepage = "https://miru.watch"; diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index 70a2167bc56ec..5c82059e76417 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { ''; changelog = "https://github.com/tweag/nickel/blob/${version}/RELEASES.md"; license = licenses.mit; - maintainers = with maintainers; [ felschr matthiasbeyer ]; + maintainers = with maintainers; [ AndersonTorres felschr matthiasbeyer ]; mainProgram = "nickel"; }; } diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/README.md b/pkgs/by-name/ni/nixos-rebuild-ng/README.md index f023c949c1ef3..cc2419844ef88 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/README.md +++ b/pkgs/by-name/ni/nixos-rebuild-ng/README.md @@ -53,38 +53,6 @@ an attempt of the rewrite. And use `nixos-rebuild-ng` instead of `nixos-rebuild`. -## Development - -Run: - -```console -nix-build -A nixos-rebuild-ng.tests.ci -``` - -The command above will run the unit tests and linters, and also check if the -code is formatted. However, sometimes is more convenient to run just a few -tests to debug, in this case you can run: - -```console -nix-shell -A nixos-rebuild-ng.devShell -``` - -The command above should automatically put you inside `src` directory, and you -can run: - -```console -# run program -python -m nixos_rebuild -# run tests -python -m pytest -# check types -mypy . -# fix lint issues -ruff check --fix . -# format code -ruff format . -``` - ## Current caveats - For now we will install it in `nixos-rebuild-ng` path by default, to avoid @@ -128,10 +96,4 @@ ruff format . - [ ] Improve documentation - [ ] `nixos-rebuild repl` (calling old `nixos-rebuild` for now) - [ ] `nix` build/bootstrap -- [ ] Generate tab completion via [`shtab`](https://docs.iterative.ai/shtab/) -- [x] Reduce build closure - -## TODON'T - -- Reimplement `systemd-run` logic (will be moved to the new - [`apply`](https://github.com/NixOS/nixpkgs/pull/344407) script) +- [ ] Reduce build closure diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix index b111c7cb108a3..b97387c9cc5fe 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix +++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix @@ -1,26 +1,24 @@ { lib, installShellFiles, - mkShell, nix, nixos-rebuild, python3, - python3Packages, - runCommand, withNgSuffix ? true, }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication { pname = "nixos-rebuild-ng"; version = "0.0.0"; src = ./src; pyproject = true; - build-system = with python3Packages; [ + build-system = with python3.pkgs; [ setuptools ]; - dependencies = with python3Packages; [ + dependencies = with python3.pkgs; [ tabulate + types-tabulate ]; nativeBuildInputs = [ @@ -55,48 +53,22 @@ python3Packages.buildPythonApplication rec { mv $out/bin/nixos-rebuild $out/bin/nixos-rebuild-ng ''; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook + mypy + ruff ]; pytestFlagsArray = [ "-vv" ]; - passthru = - let - python-with-pkgs = python3.withPackages ( - ps: with ps; [ - mypy - pytest - ruff - types-tabulate - # dependencies - tabulate - ] - ); - in - { - devShell = mkShell { - packages = [ python-with-pkgs ]; - shellHook = '' - cd pkgs/by-name/ni/nixos-rebuild-ng/src || true - ''; - }; - - # NOTE: this is a passthru test rather than a build-time test because we - # want to keep the build closures small - tests.ci = runCommand "${pname}-ci" { nativeBuildInputs = [ python-with-pkgs ]; } '' - export RUFF_CACHE_DIR="$(mktemp -d)" - - echo -e "\x1b[32m## run mypy\x1b[0m" - mypy ${src} - echo -e "\x1b[32m## run ruff\x1b[0m" - ruff check ${src} - echo -e "\x1b[32m## run ruff format\x1b[0m" - ruff format --check ${src} - - touch $out - ''; - }; + postCheck = '' + echo -e "\x1b[32m## run mypy\x1b[0m" + mypy nixos_rebuild tests + echo -e "\x1b[32m## run ruff\x1b[0m" + ruff check nixos_rebuild tests + echo -e "\x1b[32m## run ruff format\x1b[0m" + ruff format --check nixos_rebuild tests + ''; meta = { description = "Rebuild your NixOS configuration and switch to it, on local hosts and remote"; diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 777cf05a07ddc..e3e198292c427 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -7,11 +7,11 @@ from subprocess import run from typing import assert_never +from tabulate import tabulate + from .models import Action, Flake, NRError, Profile from .nix import ( edit, - find_file, - get_nixpkgs_rev, list_generations, nixos_build, nixos_build_flake, @@ -88,20 +88,7 @@ def execute(argv: list[str]) -> None: if args.upgrade or args.upgrade_all: upgrade_channels(bool(args.upgrade_all)) - action = Action(args.action) - # Only run shell scripts from the Nixpkgs tree if the action is - # "switch", "boot", or "test". With other actions (such as "build"), - # the user may reasonably expect that no code from the Nixpkgs tree is - # executed, so it's safe to run nixos-rebuild against a potentially - # untrusted tree. - can_run = action in (Action.SWITCH, Action.BOOT, Action.TEST) - if can_run and not flake: - nixpkgs_path = find_file("nixpkgs", nix_flags) - rev = get_nixpkgs_rev(nixpkgs_path) - if nixpkgs_path and rev: - (nixpkgs_path / ".version-suffix").write_text(rev) - - match action: + match action := Action(args.action): case Action.SWITCH | Action.BOOT: info("building the system configuration...") if args.rollback: @@ -190,8 +177,6 @@ def execute(argv: list[str]) -> None: if args.json: print(json.dumps(generations, indent=2)) else: - from tabulate import tabulate - headers = { "generation": "Generation", "date": "Build-date", @@ -231,3 +216,7 @@ def main() -> None: raise ex else: sys.exit(str(ex)) + + +if __name__ == "__main__": + main() diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__main__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__main__.py deleted file mode 100644 index 868d99efc3c4a..0000000000000 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__main__.py +++ /dev/null @@ -1,4 +0,0 @@ -from . import main - -if __name__ == "__main__": - main() diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py index 0de155cf7b6af..489c9ba3e796c 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py @@ -46,7 +46,9 @@ def values() -> list[str]: class Flake: path: Path attr: str - _re: ClassVar = re.compile(r"^(?P[^\#]*)\#?(?P[^\#\"]*)$") + _re: ClassVar[re.Pattern[str]] = re.compile( + r"^(?P[^\#]*)\#?(?P[^\#\"]*)$" + ) @override def __str__(self) -> str: @@ -57,8 +59,11 @@ def parse(cls, flake_str: str, hostname: str | None = None) -> Flake: m = cls._re.match(flake_str) assert m is not None, f"got no matches for {flake_str}" attr = m.group("attr") - nixos_attr = f"nixosConfigurations.{attr or hostname or "default"}" - return Flake(Path(m.group("path")), nixos_attr) + if not attr: + attr = f"nixosConfigurations.{hostname or "default"}" + else: + attr = f"nixosConfigurations.{attr}" + return Flake(Path(m.group("path")), attr) @classmethod def from_arg(cls, flake_arg: Any) -> Flake | None: diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index fc2ba09dfffe7..1197fb5abbf65 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -1,7 +1,6 @@ from __future__ import annotations import os -import shutil from datetime import datetime from pathlib import Path from subprocess import PIPE, CalledProcessError, run @@ -15,7 +14,7 @@ NRError, Profile, ) -from .utils import dict_to_flags, info +from .utils import dict_to_flags FLAKE_FLAGS: Final = ["--extra-experimental-features", "nix-command flakes"] @@ -49,49 +48,6 @@ def edit(flake: Flake | None, nix_flags: list[str] | None = None) -> None: raise NRError("cannot find NixOS config file") -def find_file(file: str, nix_flags: list[str] | None = None) -> Path | None: - "Find classic Nixpkgs location." - r = run( - ["nix-instantiate", "--find-file", file, *(nix_flags or [])], - stdout=PIPE, - check=False, - text=True, - ) - if r.returncode: - return None - return Path(r.stdout.strip()) - - -def get_nixpkgs_rev(nixpkgs_path: Path | None) -> str | None: - """Get Nixpkgs path as a Git revision. - - Can be used to generate `.version-suffix` file.""" - if not nixpkgs_path: - return None - - # Git is not included in the closure for nixos-rebuild so we need to check - if not shutil.which("git"): - info(f"warning: Git not found; cannot figure out revision of '{nixpkgs_path}'") - return None - - # Get current revision - r = run( - ["git", "-C", nixpkgs_path, "rev-parse", "--short", "HEAD"], - check=False, - stdout=PIPE, - text=True, - ) - rev = r.stdout.strip() - - if rev: - # Check if repo is dirty - if run(["git", "-C", nixpkgs_path, "diff", "--quiet"], check=False).returncode: - rev += "M" - return f".git.{rev}" - else: - return None - - def _parse_generation_from_nix_store(path: Path, profile: Profile) -> Generation: entry_id = path.name.split("-")[1] current = path.name == profile.path.readlink().name diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 3f4fcfe289d80..03dcf684e7341 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -67,17 +67,10 @@ def test_parse_args() -> None: @patch(get_qualified_name(nr.nix.run, nr.nix), autospec=True) -@patch(get_qualified_name(nr.nix.shutil.which), autospec=True, return_value="/bin/git") -def test_execute_nix_boot(mock_which: Any, mock_run: Any, tmp_path: Path) -> None: - nixpkgs_path = tmp_path / "nixpkgs" - nixpkgs_path.mkdir() +def test_execute_nix_boot(mock_run: Any, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() mock_run.side_effect = [ - # update_nixpkgs_rev - CompletedProcess([], 0, str(nixpkgs_path)), - CompletedProcess([], 0, "nixpkgs-rev"), - CompletedProcess([], 0), # nixos_build CompletedProcess([], 0, str(config_path)), # set_profile @@ -89,25 +82,9 @@ def test_execute_nix_boot(mock_which: Any, mock_run: Any, tmp_path: Path) -> Non nr.execute(["nixos-rebuild", "boot", "--no-flake", "-vvv"]) assert nr.VERBOSE is True - assert mock_run.call_count == 6 + assert mock_run.call_count == 3 mock_run.assert_has_calls( [ - call( - ["nix-instantiate", "--find-file", "nixpkgs", "-vvv"], - stdout=PIPE, - check=False, - text=True, - ), - call( - ["git", "-C", nixpkgs_path, "rev-parse", "--short", "HEAD"], - check=False, - stdout=PIPE, - text=True, - ), - call( - ["git", "-C", nixpkgs_path, "diff", "--quiet"], - check=False, - ), call( [ "nix-build", @@ -203,15 +180,11 @@ def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: @patch(get_qualified_name(nr.nix.run, nr.nix), autospec=True) -def test_execute_switch_rollback(mock_run: Any, tmp_path: Path) -> None: - nixpkgs_path = tmp_path / "nixpkgs" - nixpkgs_path.touch() - +def test_execute_switch_rollback(mock_run: Any) -> None: nr.execute(["nixos-rebuild", "switch", "--rollback", "--install-bootloader"]) assert nr.VERBOSE is False - assert mock_run.call_count == 3 - # ignoring update_nixpkgs_rev calls + assert mock_run.call_count == 2 mock_run.assert_has_calls( [ call( diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 367c55c556951..8b145bfc83056 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -42,61 +42,6 @@ def test_edit(mock_run: Any, monkeypatch: Any, tmpdir: Any) -> None: mock_run.assert_called_with(["editor", default_nix], check=False) -@patch(get_qualified_name(n.shutil.which), autospec=True, return_value="/bin/git") -def test_get_nixpkgs_rev(mock_which: Any) -> None: - assert n.get_nixpkgs_rev(None) is None - - path = Path("/path/to/nix") - - with patch( - get_qualified_name(n.run, n), - autospec=True, - side_effect=[CompletedProcess([], 0, "")], - ) as mock_run: - assert n.get_nixpkgs_rev(path) is None - mock_run.assert_called_with( - ["git", "-C", path, "rev-parse", "--short", "HEAD"], - check=False, - stdout=PIPE, - text=True, - ) - - expected_calls = [ - call( - ["git", "-C", path, "rev-parse", "--short", "HEAD"], - check=False, - stdout=PIPE, - text=True, - ), - call( - ["git", "-C", path, "diff", "--quiet"], - check=False, - ), - ] - - with patch( - get_qualified_name(n.run, n), - autospec=True, - side_effect=[ - CompletedProcess([], 0, "0f7c82403fd6"), - CompletedProcess([], returncode=0), - ], - ) as mock_run: - assert n.get_nixpkgs_rev(path) == ".git.0f7c82403fd6" - mock_run.assert_has_calls(expected_calls) - - with patch( - get_qualified_name(n.run, n), - autospec=True, - side_effect=[ - CompletedProcess([], 0, "0f7c82403fd6"), - CompletedProcess([], returncode=1), - ], - ) as mock_run: - assert n.get_nixpkgs_rev(path) == ".git.0f7c82403fd6M" - mock_run.assert_has_calls(expected_calls) - - def test_get_generations_from_nix_store(tmp_path: Path) -> None: nixos_path = tmp_path / "nixos-system" nixos_path.mkdir() diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix index 4c8a1465fc61d..7387297b45c93 100644 --- a/pkgs/by-name/no/nomacs/package.nix +++ b/pkgs/by-name/no/nomacs/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/nomacs/nomacs/releases/tag/${finalAttrs.src.rev}"; license = with lib.licenses; [ gpl3Plus ]; mainProgram = "nomacs"; - maintainers = with lib.maintainers; [ mindavi ]; + maintainers = with lib.maintainers; [ AndersonTorres mindavi ]; inherit (libsForQt5.qtbase.meta) platforms; }; }) diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix index 8dd25227323db..ab4d1d0fbd234 100644 --- a/pkgs/by-name/no/nomino/package.nix +++ b/pkgs/by-name/no/nomino/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nomino"; - version = "1.3.6"; + version = "1.3.5"; src = fetchFromGitHub { owner = "yaa110"; repo = pname; rev = version; - hash = "sha256-HbI2XPYNSFBc/h+kEsNsOxJ8+7uq1Ia0ce98FKoUlng="; + hash = "sha256-qznue5C/6Y+54/gV1lLgJPCezW0zF2Fe2ZlMvU57+Q0="; }; - cargoHash = "sha256-zA5cTdW0x7k8/mAUfUBzbiBR1ypyeLr7AOyg+16Islk="; + cargoHash = "sha256-28QXDhpcrW1flnU5WesAdbJSMrZAhIuFv2LSJHTk74Y="; meta = with lib; { description = "Batch rename utility for developers"; diff --git a/pkgs/by-name/no/nostui/Cargo.lock b/pkgs/by-name/no/nostui/Cargo.lock new file mode 100644 index 0000000000000..aef6111a857e0 --- /dev/null +++ b/pkgs/by-name/no/nostui/Cargo.lock @@ -0,0 +1,3234 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "ahash" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "async-utility" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a349201d80b4aa18d17a34a182bdd7f8ddf845e9e57d2ea130a12e10ef1e3a47" +dependencies = [ + "futures-util", + "gloo-timers", + "tokio", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-wsocket" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d253e375ea899cb131b92a474587e217634e7ea927c24d8098eecbcad0c5c97a" +dependencies = [ + "async-utility", + "futures-util", + "thiserror", + "tokio", + "tokio-rustls 0.25.0", + "tokio-socks", + "tokio-tungstenite", + "url", + "wasm-ws", + "webpki-roots 0.26.2", +] + +[[package]] +name = "async_io_stream" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" +dependencies = [ + "futures", + "pharos", + "rustc_version", +] + +[[package]] +name = "atomic-destructor" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4653a42bf04120a1d4e92452e006b4e3af4ab4afff8fb4af0f1bbb98418adf3e" +dependencies = [ + "tracing", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bech32" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" + +[[package]] +name = "better-panic" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa9e1d11a268684cbd90ed36370d7577afb6c62d912ddff5c15fc34343e5036" +dependencies = [ + "backtrace", + "console", +] + +[[package]] +name = "bip39" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" +dependencies = [ + "bitcoin_hashes 0.11.0", + "serde", + "unicode-normalization", +] + +[[package]] +name = "bitcoin" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1945a5048598e4189e239d3f809b19bdad4845c4b2ba400d304d2dcf26d2c462" +dependencies = [ + "bech32", + "bitcoin-private", + "bitcoin_hashes 0.12.0", + "hex_lit", + "secp256k1", + "serde", +] + +[[package]] +name = "bitcoin-private" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57" + +[[package]] +name = "bitcoin_hashes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" + +[[package]] +name = "bitcoin_hashes" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501" +dependencies = [ + "bitcoin-private", + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +dependencies = [ + "serde", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "castaway" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" +dependencies = [ + "rustversion", +] + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets 0.52.0", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", +] + +[[package]] +name = "clap" +version = "4.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", + "terminal_size", + "unicase", + "unicode-width", +] + +[[package]] +name = "clap_derive" +version = "4.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "color-eyre" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "compact_str" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "ryu", + "serde", + "static_assertions", +] + +[[package]] +name = "config" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" +dependencies = [ + "async-trait", + "convert_case", + "json5", + "lazy_static", + "nom", + "pathdiff", + "ron", + "rust-ini", + "serde", + "serde_json", + "toml", + "yaml-rust", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "const-random" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crossterm" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +dependencies = [ + "bitflags 2.4.2", + "crossterm_winapi", + "futures-core", + "libc", + "mio", + "parking_lot", + "serde", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "derive_deref" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcdbcee2d9941369faba772587a565f4f534e42cb8d17e5295871de730163b2b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dlv-list" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.11", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" + +[[package]] +name = "hex_lit" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "human-panic" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c5d0e9120f6bca6120d142c7ede1ba376dd6bf276d69dd3dbe6cbeb7824179" +dependencies = [ + "anstream", + "anstyle", + "backtrace", + "os_info", + "serde", + "serde_derive", + "toml", + "uuid", +] + +[[package]] +name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 0.2.11", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.11", + "hyper", + "rustls 0.21.11", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "js-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json5" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" +dependencies = [ + "pest", + "pest_derive", + "serde", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "lnurl-pay" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b628658116d331c9567f6cb22415d726125ff6e328d1fb1b422b1b58afeaec21" +dependencies = [ + "bech32", + "reqwest", + "serde", + "serde_json", +] + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "lru" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" +dependencies = [ + "hashbrown 0.14.3", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "negentropy" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e664971378a3987224f7a0e10059782035e89899ae403718ee07de85bec42afe" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nostr" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25e4e34578e8cc2b4050c6224a0c422b23ba1e61f2602b4e320c221ac3cbbc2e" +dependencies = [ + "aes", + "base64", + "bip39", + "bitcoin", + "cbc", + "chacha20", + "chacha20poly1305", + "getrandom", + "instant", + "js-sys", + "negentropy", + "once_cell", + "reqwest", + "scrypt", + "serde", + "serde_json", + "tracing", + "unicode-normalization", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "nostr-database" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e15ab55f96ea5e560af0c75f1d942b1064266d443d11b2afbe51ca9ad78a018" +dependencies = [ + "async-trait", + "lru", + "nostr", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "nostr-relay-pool" +version = "0.29.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8efc437bcf8c433887a9897dfb6f99914170f656a2a66398e737b3050c2aa34" +dependencies = [ + "async-utility", + "async-wsocket", + "atomic-destructor", + "nostr", + "nostr-database", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "nostr-sdk" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81ed0ab9cbc3b20d3dba99337f2e0739f052ebe32133d690e212022a06a22044" +dependencies = [ + "async-utility", + "lnurl-pay", + "nostr", + "nostr-database", + "nostr-relay-pool", + "nostr-signer", + "nostr-zapper", + "nwc", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "nostr-signer" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "307bdc7c26887d7e65632e66872989a19892dfe9f2c6dbd9a1d3f959c5c524d5" +dependencies = [ + "async-utility", + "nostr", + "nostr-relay-pool", + "thiserror", + "tokio", +] + +[[package]] +name = "nostr-zapper" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061d5eb00b430747a984ea9e41cd82c849832151b4263d8230c9c220dc2c62f8" +dependencies = [ + "async-trait", + "nostr", + "thiserror", +] + +[[package]] +name = "nostui" +version = "0.1.0" +dependencies = [ + "better-panic", + "chrono", + "clap", + "color-eyre", + "config", + "crossterm", + "derive_deref", + "directories", + "futures", + "human-panic", + "json5", + "lazy_static", + "libc", + "log", + "nostr-sdk", + "pretty_assertions", + "ratatui", + "regex", + "rstest", + "serde", + "serde_json", + "signal-hook", + "sorted-vec", + "strip-ansi-escapes", + "strum", + "thousands", + "tokio", + "tokio-util", + "tracing", + "tracing-error", + "tracing-subscriber", + "tui-textarea", + "tui-widget-list", + "unicode-width", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "nwc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1894ffe54a1e5adf8dbb22b5a290c0748ec4a88aa07fa69c4359010edea49ed" +dependencies = [ + "async-utility", + "nostr", + "nostr-relay-pool", + "nostr-zapper", + "thiserror", + "tracing", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-multimap" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" +dependencies = [ + "dlv-list", + "hashbrown 0.13.2", +] + +[[package]] +name = "os_info" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +dependencies = [ + "log", + "serde", + "winapi", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "2.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e1288dbd7786462961e69bfd4df7848c1e37e8b74303dbdab82c3a9cdd2809" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pest_meta" +version = "2.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0934d6907f148c22a3acbda520c7eed243ad7487a30f51f6ce52b58b7077a8a" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "pharos" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" +dependencies = [ + "futures", + "rustc_version", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_assertions" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "ratatui" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef" +dependencies = [ + "bitflags 2.4.2", + "cassowary", + "compact_str", + "crossterm", + "itertools", + "lru", + "paste", + "serde", + "stability", + "strum", + "unicode-segmentation", + "unicode-truncate", + "unicode-width", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.5", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "relative-path" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" + +[[package]] +name = "reqwest" +version = "0.11.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http 0.2.11", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.11", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls 0.24.1", + "tokio-socks", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.25.4", + "winreg", +] + +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.48.0", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.4.2", + "serde", + "serde_derive", +] + +[[package]] +name = "rstest" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" +dependencies = [ + "futures", + "futures-timer", + "rstest_macros", + "rustc_version", +] + +[[package]] +name = "rstest_macros" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" +dependencies = [ + "cfg-if", + "glob", + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "relative-path", + "rustc_version", + "syn 2.0.48", + "unicode-ident", +] + +[[package]] +name = "rust-ini" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.4", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scrypt" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" +dependencies = [ + "password-hash", + "pbkdf2", + "salsa20", + "sha2", +] + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "secp256k1" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" +dependencies = [ + "bitcoin_hashes 0.12.0", + "rand", + "secp256k1-sys", + "serde", +] + +[[package]] +name = "secp256k1-sys" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e" +dependencies = [ + "cc", +] + +[[package]] +name = "semver" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" + +[[package]] +name = "send_wrapper" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" + +[[package]] +name = "serde" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_json" +version = "1.0.120" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "sorted-vec" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6734caf0b6f51addd5eeacca12fb39b2c6c14e8d4f3ac42f3a78955c0467458" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "stability" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a" +dependencies = [ + "quote", + "syn 2.0.48", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strip-ansi-escapes" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" +dependencies = [ + "vte", +] + +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.48", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "thousands" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.11", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.4", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-socks" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "rustls 0.22.4", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tungstenite", + "webpki-roots 0.26.2", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.4", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "serde", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tui-textarea" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e38ced1f941a9cfc923fbf2fe6858443c42cc5220bfd35bdd3648371e7bd8e" +dependencies = [ + "crossterm", + "ratatui", + "unicode-width", +] + +[[package]] +name = "tui-widget-list" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a872e33bd14ffe44e0332bab251ce58846e3a9a9d6e4a6929ce8f7f7d7d137d6" +dependencies = [ + "ratatui", +] + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "rustls 0.22.4", + "rustls-pki-types", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-truncate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5fbabedabe362c618c714dbefda9927b5afc8e2a8102f47f081089a9019226" +dependencies = [ + "itertools", + "unicode-width", +] + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +dependencies = [ + "getrandom", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vte" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +dependencies = [ + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" + +[[package]] +name = "wasm-ws" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5b3a482e27ff54809c0848629d9033179705c5ea2f58e26cf45dc77c34c4984" +dependencies = [ + "async_io_stream", + "futures", + "js-sys", + "pharos", + "send_wrapper", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webpki-roots" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/no/nostui/package.nix b/pkgs/by-name/no/nostui/package.nix index 364d5154007e1..9c4f32004849c 100644 --- a/pkgs/by-name/no/nostui/package.nix +++ b/pkgs/by-name/no/nostui/package.nix @@ -30,6 +30,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-8ciA1FoGdnU+GWRcYJc8zU2FpUgGwTZSZynvAi1luYo="; + cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; + meta = with lib; { homepage = "https://github.com/akiomik/nostui"; description = "TUI client for Nostr"; diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix index f430d72c2737b..9ee84b130bf46 100644 --- a/pkgs/by-name/no/notion/package.nix +++ b/pkgs/by-name/no/notion/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://notionwm.net"; license = lib.licenses.lgpl21; mainProgram = "notion"; - maintainers = with lib.maintainers; [ jfb raboof ]; + maintainers = with lib.maintainers; [ jfb AndersonTorres raboof ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/np/nph/package.nix b/pkgs/by-name/np/nph/package.nix index 5535ce9f40853..897b84d7980ac 100644 --- a/pkgs/by-name/np/nph/package.nix +++ b/pkgs/by-name/np/nph/package.nix @@ -1,16 +1,10 @@ { lib, - fetchFromGitHub, buildNimPackage, - nim-2_0, + fetchFromGitHub, }: -let - buildNimPackage' = buildNimPackage.override { - # Do not build with Nim-2.2.x. - nim2 = nim-2_0; - }; -in -buildNimPackage' (finalAttrs: { + +buildNimPackage (finalAttrs: { pname = "nph"; version = "0.6.0"; diff --git a/pkgs/by-name/ns/nsxiv/package.nix b/pkgs/by-name/ns/nsxiv/package.nix index b4059bbb2fa96..b54c8ce55f4ea 100644 --- a/pkgs/by-name/ns/nsxiv/package.nix +++ b/pkgs/by-name/ns/nsxiv/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://codeberg.org/nsxiv/nsxiv/src/tag/${finalAttrs.src.rev}/etc/CHANGELOG.md"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ sikmir ]; + maintainers = with lib.maintainers; [ AndersonTorres sikmir ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 2a7c699e1aecd..d15503b2b0eea 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "10.0.4"; + version = "10.0.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-1kz48njrg5wumrMb2bYs1IYziYKDLkxM3G8TKfjtv2A="; + hash = "sha256-oT2W5MuXYR2UENIAkH2Pb6f/m9gC2SfTjjvEq539PRU="; }; installPhase = '' diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix index 4d10cc6fbf005..6f9eb684c2008 100644 --- a/pkgs/by-name/nu/nuclei/package.nix +++ b/pkgs/by-name/nu/nuclei/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.3.6"; + version = "3.3.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-cR0eOWKr1RK2Tw3ct/3pev275NveWkcBM3EzTm3Qa1E="; + hash = "sha256-L8HOuPENnyM56ac1dqJRCYzqN9wRnGt4RoF8BZji0Z0="; }; - vendorHash = "sha256-lxqVNhA8/iMx31Bbp4rIHVrh3nUARlxY2KDcCxOtO+I="; + vendorHash = "sha256-ZGFzZ/WpiVChtvMJQH3lR4k2it1KF0QwrMQchQz5XYw="; proxyVendor = true; # hash mismatch between Linux and Darwin subPackages = [ "cmd/nuclei/" ]; diff --git a/pkgs/by-name/op/openxr-loader/package.nix b/pkgs/by-name/op/openxr-loader/package.nix index e82525479ba42..16a9e594336c1 100644 --- a/pkgs/by-name/op/openxr-loader/package.nix +++ b/pkgs/by-name/op/openxr-loader/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.1.42"; + version = "1.1.41"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-jHpCseldH02vcuoARHKGitaKi95atLfCPZxY6CVaM+4="; + sha256 = "sha256-D6FTslMdnqLTQrI1E6Ts5PwkrqhQo/uOfp9CsChoneU="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/by-name/op/operator-sdk/package.nix b/pkgs/by-name/op/operator-sdk/package.nix index 7a4596e620fdd..9f21ff46889a4 100644 --- a/pkgs/by-name/op/operator-sdk/package.nix +++ b/pkgs/by-name/op/operator-sdk/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.38.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YCYieXT+3LCpae3V/vub/TAKUG03HjB9FdHEhDVP4uM="; + hash = "sha256-ANG9KpyEO+fpjelYU+HNTkbg2S0vFNyPzPRFjcLoLOI="; }; - vendorHash = "sha256-8qNrXLmp3FKb6ByrIWa7VupEhW4Wc4xZCJmURqt/mfw="; + vendorHash = "sha256-pr3WTUZetps/Gof8lttN2beomiobVPCgX0j9V77g5sI="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ov/overturemaps/package.nix b/pkgs/by-name/ov/overturemaps/package.nix deleted file mode 100644 index e0ef41b529456..0000000000000 --- a/pkgs/by-name/ov/overturemaps/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - python3Packages, - fetchPypi, -}: - -python3Packages.buildPythonPackage rec { - pname = "overturemaps"; - version = "0.9.0"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = "sha256-JsgufE8Xmw7xXVypM+g3Vjmf5fL/FQRxddGSpQ762PQ="; - }; - - build-system = with python3Packages; [ poetry-core ]; - - dependencies = with python3Packages; [ - click - pyarrow - shapely - ]; - - meta = { - description = "Official command-line tool of the Overture Maps Foundation"; - homepage = "https://overturemaps.org/"; - mainProgram = "overturemaps"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ crimeminister ]; - }; -} diff --git a/pkgs/by-name/pl/plattenalbum/package.nix b/pkgs/by-name/pl/plattenalbum/package.nix index 5d026704cdb5c..69a8b7cabf0fc 100644 --- a/pkgs/by-name/pl/plattenalbum/package.nix +++ b/pkgs/by-name/pl/plattenalbum/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication rec { pname = "plattenalbum"; - version = "2.2.1"; + version = "2.2.0"; pyproject = false; src = fetchFromGitHub { owner = "SoongNoonien"; repo = "plattenalbum"; rev = "refs/tags/v${version}"; - hash = "sha256-tbgSgbj77GvTgnI5eGu4cxYDie1gNa+5z053c0Nnu+Y="; + hash = "sha256-WUhKNt6jAKHsLGy862DJqV4S34krNl9y43vyLiq5qss="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/poke/package.nix b/pkgs/by-name/po/poke/package.nix index 66fa43394f2bc..5b078d263e481 100644 --- a/pkgs/by-name/po/poke/package.nix +++ b/pkgs/by-name/po/poke/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.jemarch.net/poke"; changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ kira-bruneau ]; + maintainers = with lib.maintainers; [ AndersonTorres kira-bruneau ]; platforms = lib.platforms.unix; hydraPlatforms = lib.platforms.linux; # build hangs on Darwin platforms, needs investigation }; diff --git a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix index df9ac3ef4d414..05b210ac2efe9 100644 --- a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { # The first portion of this version string corresponds to a compatible DCGM # version. - version = "3.3.9-3.6.1"; # N.B: If you change this, update dcgm as well to the matching version. + version = "3.3.5-3.4.0"; # N.B: If you change this, update dcgm as well to the matching version. src = fetchFromGitHub { owner = "NVIDIA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BAMN2yuIW5FcHY3o9MUIMgPnTEFFRCbqhoAkcaZDxcM="; + hash = "sha256-IOVPEK+9ogBZJYns2pTyJwHUBMN8JqG1THTJPvpCwdo="; }; CGO_LDFLAGS = "-ldcgm"; @@ -28,7 +28,7 @@ buildGoModule rec { # symbols are available on startup. hardeningDisable = [ "bindnow" ]; - vendorHash = "sha256-b7GyPsmSGHx7hK0pDa88FKA+ZKJES2cdAGjT2aAfX/A="; + vendorHash = "sha256-urKa0O8QZnM8cWjPcGVhoAWhx6fCdMmhRX0JOriRaig="; nativeBuildInputs = [ autoAddDriverRunpath diff --git a/pkgs/by-name/qi/qidi-slicer-bin/package.nix b/pkgs/by-name/qi/qidi-slicer-bin/package.nix deleted file mode 100644 index bdb59cdbf9cab..0000000000000 --- a/pkgs/by-name/qi/qidi-slicer-bin/package.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - appimageTools, - fetchurl, - webkitgtk_4_1, - libsoup_3, - lib, - hicolor-icon-theme, -}: -let - pname = "qidi-slicer"; - version = "1.2.0"; - - src = fetchurl { - url = "https://github.com/QIDITECH/QIDISlicer/releases/download/V${version}/QIDISlicer_${version}_Linux_x64_newer.AppImage"; - hash = "sha256-WMurkt9VJTlFnx66ByQq+WVtx37q5P4mA4cxF/UzC50="; - }; - - appimageContents = appimageTools.extract { - inherit version pname src; - }; -in -appimageTools.wrapType2 { - inherit pname version src; - extraPkgs = pkgs: [ - webkitgtk_4_1 - libsoup_3 - ]; - - extraInstallCommands = '' - ln -s "$out/bin/qidi-slicer" "$out/bin/qidi-gcodeviewer" - install -m 444 -D ${appimageContents}/QIDISlicer.desktop $out/share/applications/QIDISlicer.desktop - install -m 444 -D ${appimageContents}/usr/bin/resources/icons/QIDISlicer.svg $out/share/icons/hicolor/scalable/apps/QIDISlicer.svg - ''; - - meta = { - description = "Slicer for QIDI 3D Printers, based on PrusaSlicer"; - longDescription = '' - QIDISlicer is a 3D printer slicing software that works with all QIDI Technology printers and filaments. - It is easy to use and has all the functions you need to learn 3D printing. - ''; - homepage = "https://github.com/QIDITECH/QIDISlicer"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ j0hax ]; - mainProgram = "qidi-slicer"; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/qt/qtscrcpy/package.nix b/pkgs/by-name/qt/qtscrcpy/package.nix index 3d9d733de46de..88f13a04d03ac 100644 --- a/pkgs/by-name/qt/qtscrcpy/package.nix +++ b/pkgs/by-name/qt/qtscrcpy/package.nix @@ -7,7 +7,7 @@ libsForQt5, scrcpy, android-tools, - ffmpeg, + ffmpeg_4, makeDesktopItem, copyDesktopItems, }: @@ -37,11 +37,6 @@ stdenv.mkDerivation rec { # remove predefined adb and scrcpy-server path # we later set them in wrapper ./remove_predefined_paths.patch - - # remove avcodec_close which is deprecated in ffmpeg_7 - # This doesn't affect functionality because - # it's followed by avcodec_free_context - ./remove_deprecated_avcodec_free_context.patch ]; postPatch = '' @@ -66,8 +61,7 @@ stdenv.mkDerivation rec { buildInputs = [ scrcpy - # Upstream vendors ffmpeg_4 - ffmpeg + ffmpeg_4 ] ++ (with libsForQt5; [ qtbase diff --git a/pkgs/by-name/qt/qtscrcpy/remove_deprecated_avcodec_free_context.patch b/pkgs/by-name/qt/qtscrcpy/remove_deprecated_avcodec_free_context.patch deleted file mode 100644 index 4037144d3bf96..0000000000000 --- a/pkgs/by-name/qt/qtscrcpy/remove_deprecated_avcodec_free_context.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/device/decoder/decoder.cpp b/src/device/decoder/decoder.cpp -index 79dec15..5f6979b 100644 ---- a/src/device/decoder/decoder.cpp -+++ b/QtScrcpy/QtScrcpyCore/src/device/decoder/decoder.cpp -@@ -51,9 +51,6 @@ void Decoder::close() - if (!m_codecCtx) { - return; - } -- if (m_isCodecCtxOpen) { -- avcodec_close(m_codecCtx); -- } - avcodec_free_context(&m_codecCtx); - } - diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix index ccfa63429aa1f..131deb7c08ef1 100644 --- a/pkgs/by-name/qu/quill-log/package.nix +++ b/pkgs/by-name/qu/quill-log/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "quill-log"; - version = "7.5.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "odygrd"; repo = "quill"; rev = "v${version}"; - hash = "sha256-sALrDsOxyBAtUCSRFTpZV4/2B29pss+KbiXT9xEfLTI="; + hash = "sha256-wExPgq+La0PCTrUajn8VYWw6uReXHoAVngygMJ2B/Qs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/rc/rc/package.nix b/pkgs/by-name/rc/rc/package.nix index 15b35211b3014..6484269c924b9 100644 --- a/pkgs/by-name/rc/rc/package.nix +++ b/pkgs/by-name/rc/rc/package.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Plan 9 shell"; license = [ lib.licenses.zlib ]; mainProgram = "rc"; - maintainers = with lib.maintainers; [ ramkromberg ]; + maintainers = with lib.maintainers; [ ramkromberg AndersonTorres ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index bc1a729615aa0..68b0e7d4fd386 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.17.21"; + version = "1.16.127"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-VoEaBaHGBgkDpzk2n/LXlzR+xl2AXMv5zSAzB74YIuE="; + hash = "sha256-VsS9RXbcu6aV7b+Bk3lB+x6/X/HxN5EoypFCn4qKNEk="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix index f68229b10a162..315ac8ec43b12 100644 --- a/pkgs/by-name/rm/rmfakecloud/package.nix +++ b/pkgs/by-name/rm/rmfakecloud/package.nix @@ -1,54 +1,36 @@ -{ - lib, - fetchFromGitHub, - buildGoModule, - callPackage, - enableWebui ? true, - nixosTests, -}: +{ lib, fetchFromGitHub, buildGoModule, callPackage, enableWebui ? true }: buildGoModule rec { pname = "rmfakecloud"; - version = "0.0.21"; + version = "0.0.18"; src = fetchFromGitHub { owner = "ddvk"; repo = pname; rev = "v${version}"; - hash = "sha256-Opx39FUo4Kzezi96D9iraA8gkqCPVfMf4LhxtVpsuNQ="; + hash = "sha256-J8oB5C5FYZTVq9zopHoL6WYpfTyiiyrQ4YSGu+2eaKw="; }; - vendorHash = "sha256-9tfxE03brUvCYusmewiqNpCkKyIS9qePqylrzDWrJLY="; + vendorHash = "sha256-S43qNDAlDWhrkfSffCooveemR1Z7KXS18t97UoolgBM="; ui = callPackage ./webui.nix { inherit version src; }; - postPatch = - if enableWebui then - '' - mkdir -p ui/build - cp -r ${ui}/* ui/build - '' - else - '' - sed -i '/go:/d' ui/assets.go - ''; + postPatch = if enableWebui then '' + mkdir -p ui/build + cp -r ${ui}/* ui/build + '' else '' + sed -i '/go:/d' ui/assets.go + ''; ldflags = [ - "-s" - "-w" - "-X main.version=v${version}" + "-s" "-w" "-X main.version=v${version}" ]; - passthru.tests.rmfakecloud = nixosTests.rmfakecloud; - meta = with lib; { description = "Host your own cloud for the Remarkable"; homepage = "https://ddvk.github.io/rmfakecloud/"; license = licenses.agpl3Only; - maintainers = with maintainers; [ - pacien - martinetd - ]; + maintainers = with maintainers; [ pacien martinetd ]; mainProgram = "rmfakecloud"; }; } diff --git a/pkgs/by-name/rm/rmfakecloud/webui.nix b/pkgs/by-name/rm/rmfakecloud/webui.nix index 928a624cba2b4..91efa1c78d9da 100644 --- a/pkgs/by-name/rm/rmfakecloud/webui.nix +++ b/pkgs/by-name/rm/rmfakecloud/webui.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/ui/yarn.lock"; - hash = "sha256-9//uQ4ZLLTf2N1WSwsOwFjBuDmThuMtMXU4SzMljAMM="; + hash = "sha256-JLCrpzytMKejmW+WlM6yybsoIZiimiJdPG5dSIn1L14="; }; nativeBuildInputs = [ fixup-yarn-lock yarn nodejs ]; diff --git a/pkgs/by-name/ro/robodoc/package.nix b/pkgs/by-name/ro/robodoc/package.nix index 8ebd078b9696a..4665548117208 100644 --- a/pkgs/by-name/ro/robodoc/package.nix +++ b/pkgs/by-name/ro/robodoc/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { Java -- basically any program in which you can use remarks/comments. ''; license = with licenses; gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; }; }) diff --git a/pkgs/by-name/ru/ruff-lsp/package.nix b/pkgs/by-name/ru/ruff-lsp/package.nix index 97b905e340c3c..e924e8b95ebbb 100644 --- a/pkgs/by-name/ru/ruff-lsp/package.nix +++ b/pkgs/by-name/ru/ruff-lsp/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication rec { pname = "ruff-lsp"; - version = "0.0.59"; + version = "0.0.58"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-fMw93EmwO0wbIcGMr7csXkMRzgyQJNQzgLDZQqNB8Zc="; + hash = "sha256-TB4OcKkaUGYAmiGNJRnfRmiXTyTQL4sFoBrzxT6DWec="; }; build-system = with python3Packages; [ hatchling ]; diff --git a/pkgs/by-name/ru/ruff/Cargo.lock b/pkgs/by-name/ru/ruff/Cargo.lock new file mode 100644 index 0000000000000..1f7584b8fdb9e --- /dev/null +++ b/pkgs/by-name/ru/ruff/Cargo.lock @@ -0,0 +1,4540 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "annotate-snippets" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7" + +[[package]] +name = "annotate-snippets" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" +dependencies = [ + "unicode-width 0.1.13", + "yansi-term", +] + +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" + +[[package]] +name = "append-only-vec" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d9f7083455f1a474276ccd32374958d2cb591024aac45101c7623b10271347" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "argfile" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a1cc0ba69de57db40674c66f7cf2caee3981ddef084388482c95c0e2133e5e8" +dependencies = [ + "fs-err", + "os_str_bytes", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "assert_fs" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efdb1fdb47602827a342857666feb372712cbc64b414172bd6b167a02927674" +dependencies = [ + "anstyle", + "doc-comment", + "globwalk", + "predicates", + "predicates-core", + "predicates-tree", + "tempfile", +] + +[[package]] +name = "autocfg" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bstr" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "regex-automata 0.4.8", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cachedir" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4703f3937077db8fa35bee3c8789343c1aec2585f0146f09d658d4ccc0e8d873" +dependencies = [ + "tempfile", +] + +[[package]] +name = "camino" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "castaway" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" +dependencies = [ + "rustversion", +] + +[[package]] +name = "cc" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +dependencies = [ + "jobserver", + "libc", + "once_cell", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chic" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5b5db619f3556839cb2223ae86ff3f9a09da2c5013be42bc9af08c9589bf70c" +dependencies = [ + "annotate-snippets 0.6.1", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "windows-targets 0.52.6", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", + "terminal_size", +] + +[[package]] +name = "clap_complete" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_complete_command" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da8e198c052315686d36371e8a3c5778b7852fc75cc313e4e11eeb7a644a1b62" +dependencies = [ + "clap", + "clap_complete", + "clap_complete_nushell", +] + +[[package]] +name = "clap_complete_nushell" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1accf1b463dee0d3ab2be72591dccdab8bef314958340447c882c4c72acfe2a3" +dependencies = [ + "clap", + "clap_complete", +] + +[[package]] +name = "clap_derive" +version = "4.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "clearscreen" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f8c93eb5f77c9050c7750e14f13ef1033a40a0aac70c6371535b6763a01438c" +dependencies = [ + "nix 0.28.0", + "terminfo", + "thiserror 1.0.67", + "which", + "winapi", +] + +[[package]] +name = "codspeed" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "450a0e9df9df1c154156f4344f99d8f6f6e69d0fc4de96ef6e2e68b2ec3bce97" +dependencies = [ + "colored", + "libc", + "serde_json", +] + +[[package]] +name = "codspeed-criterion-compat" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eb1a6cb9c20e177fde58cdef97c1c7c9264eb1424fe45c4fccedc2fb078a569" +dependencies = [ + "codspeed", + "colored", + "criterion", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + +[[package]] +name = "compact_str" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "rustversion", + "ryu", + "serde", + "static_assertions", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width 0.1.13", + "windows-sys 0.52.0", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "console_log" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f" +dependencies = [ + "log", + "web-sys", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "countme" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" +dependencies = [ + "dashmap 5.5.3", + "once_cell", + "rustc-hash 1.1.0", +] + +[[package]] +name = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] +name = "crossbeam" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ctrlc" +version = "3.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" +dependencies = [ + "nix 0.29.0", + "windows-sys 0.59.0", +] + +[[package]] +name = "darling" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 2.0.87", +] + +[[package]] +name = "darling_macro" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dir-test" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c44bdf9319ad5223afb7eb15a7110452b0adf0373ea6756561b2c708eef0dd1" +dependencies = [ + "dir-test-macros", +] + +[[package]] +name = "dir-test-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "644f96047137dfaa7a09e34d4623f9e52a1926ecc25ba32ad2ba3fc422536b25" +dependencies = [ + "glob", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "drop_bomb" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" + +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + +[[package]] +name = "either" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "fern" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69ff9c9d5fb3e6da8ac2f77ab76fe7e8087d512ce095200f8f29ac5b656cf6dc" +dependencies = [ + "log", +] + +[[package]] +name = "filetime" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +dependencies = [ + "cfg-if", + "libc", + "libredox", + "windows-sys 0.59.0", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs-err" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +dependencies = [ + "autocfg", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width 0.1.13", +] + +[[package]] +name = "getrandom" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", +] + +[[package]] +name = "globwalk" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" +dependencies = [ + "bitflags 2.6.0", + "ignore", + "walkdir", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "ignore" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata 0.4.8", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "imara-diff" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc9da1a252bd44cd341657203722352efc9bc0c847d06ea6d2dc1cd1135e0a01" +dependencies = [ + "ahash", + "hashbrown 0.14.5", +] + +[[package]] +name = "imperative" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29a1f6526af721f9aec9ceed7ab8ebfca47f3399d08b80056c2acca3fcb694a9" +dependencies = [ + "phf", + "rust-stemmers", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown 0.15.1", + "serde", +] + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width 0.1.13", + "vt100", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "inotify" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "insta" +version = "1.41.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9ffc4d4892617c50a928c52b2961cb5174b6fc6ebf252b2fac9d21955c48b8" +dependencies = [ + "console", + "globset", + "lazy_static", + "linked-hash-map", + "pest", + "pest_derive", + "regex", + "serde", + "similar", + "walkdir", +] + +[[package]] +name = "insta-cmd" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffeeefa927925cced49ccb01bf3e57c9d4cd132df21e576eb9415baeab2d3de6" +dependencies = [ + "insta", + "serde", + "serde_json", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-macro" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d57a3e447e24c22647738e4607f1df1e0ec6f72e16182c4cd199f647cdfb0e4" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "jod-thread" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae" + +[[package]] +name = "js-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.162" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" + +[[package]] +name = "libcst" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1586dd7a857d8a61a577afde1a24cc9573ff549eff092d5ce968b1ec93cc61b6" +dependencies = [ + "chic", + "libcst_derive", + "memchr", + "paste", + "peg", + "regex", + "thiserror 1.0.67", +] + +[[package]] +name = "libcst_derive" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2ae40017ac09cd2c6a53504cb3c871c7f2b41466eac5bc66ba63f39073b467b" +dependencies = [ + "quote", + "syn 2.0.87", +] + +[[package]] +name = "libmimalloc-sys" +version = "0.1.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.5.3", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lsp-server" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "550446e84739dcaf6d48a4a093973850669e13e8a34d8f8d64851041be267cd9" +dependencies = [ + "crossbeam-channel", + "log", + "serde", + "serde_json", +] + +[[package]] +name = "lsp-types" +version = "0.95.1" +source = "git+https://github.com/astral-sh/lsp-types.git?rev=3512a9f#3512a9f33eadc5402cfab1b8f7340824c8ca1439" +dependencies = [ + "bitflags 1.3.2", + "serde", + "serde_json", + "serde_repr", + "url", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matchit" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0aa4b8ca861b08d68afc8702af3250776898c1508b278e1da9d01e01d4b45c" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "mimalloc" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "minicov" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169" +dependencies = [ + "cc", + "walkdir", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "log", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "natord" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" + +[[package]] +name = "newtype-uuid" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3526cb7c660872e401beaf3297f95f548ce3b4b4bdd8121b7c0713771d7c4a6e" +dependencies = [ + "uuid", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.1.1", + "libc", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.2.1", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533b4c39709f9ba5005d8002048266593c1cfaf3c5f0739d5b8ab0c6c504009" +dependencies = [ + "bitflags 2.6.0", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "notify-types", + "walkdir", + "windows-sys 0.52.0", +] + +[[package]] +name = "notify-types" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7393c226621f817964ffb3dc5704f9509e107a8b024b489cc2c1b217378785df" +dependencies = [ + "instant", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.50.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordermap" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f2bd7b03bf2c767e1bb7b91505dbe022833776e60480275e6f2fb0db0c7503" +dependencies = [ + "indexmap", +] + +[[package]] +name = "os_str_bytes" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ac44c994af577c799b1b4bd80dc214701e349873ad894d6cdf96f4f7526e0b9" +dependencies = [ + "memchr", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "path-absolutize" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5" +dependencies = [ + "path-dedot", +] + +[[package]] +name = "path-dedot" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397" +dependencies = [ + "once_cell", +] + +[[package]] +name = "path-slash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" + +[[package]] +name = "pathdiff" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" + +[[package]] +name = "peg" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "295283b02df346d1ef66052a757869b2876ac29a6bb0ac3f5f7cd44aebe40e8f" +dependencies = [ + "peg-macros", + "peg-runtime", +] + +[[package]] +name = "peg-macros" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdad6a1d9cf116a059582ce415d5f5566aabcd4008646779dab7fdc2a9a9d426" +dependencies = [ + "peg-runtime", + "proc-macro2", + "quote", +] + +[[package]] +name = "peg-runtime" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3aeb8f54c078314c2065ee649a7241f46b9d8e418e1a9581ba0546657d7aa3a" + +[[package]] +name = "pep440_rs" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0c29f9c43de378b4e4e0cd7dbcce0e5cfb80443de8c05620368b2948bc936a1" +dependencies = [ + "once_cell", + "regex", + "serde", + "unicode-width 0.1.13", +] + +[[package]] +name = "pep440_rs" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0922a442c78611fa8c5ed6065d2d898a820cf12fa90604217fdb2d01675efec7" +dependencies = [ + "serde", + "unicode-width 0.2.0", + "unscanny", +] + +[[package]] +name = "pep508_rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "910c513bea0f4f833122321c0f20e8c704e01de98692f6989c2ec21f43d88b1e" +dependencies = [ + "once_cell", + "pep440_rs 0.4.0", + "regex", + "serde", + "thiserror 1.0.67", + "tracing", + "unicode-width 0.1.13", + "url", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +dependencies = [ + "memchr", + "thiserror 1.0.67", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "pest_meta" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "predicates" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +dependencies = [ + "anstyle", + "difflib", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" + +[[package]] +name = "predicates-tree" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "pretty_assertions" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" +dependencies = [ + "diff", + "yansi", +] + +[[package]] +name = "proc-macro2" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyproject-toml" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95c3dd745f99aa3c554b7bb00859f7d18c2f1d6afd749ccc86d60b61e702abd9" +dependencies = [ + "indexmap", + "pep440_rs 0.4.0", + "pep508_rs", + "serde", + "toml", +] + +[[package]] +name = "quick-junit" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ffd2f9a162cfae131bed6d9d1ed60adced33be340a94f96952897d7cb0c240" +dependencies = [ + "chrono", + "indexmap", + "newtype-uuid", + "quick-xml", + "strip-ansi-escapes", + "thiserror 1.0.67", + "uuid", +] + +[[package]] +name = "quick-xml" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "red_knot" +version = "0.0.0" +dependencies = [ + "anyhow", + "chrono", + "clap", + "colored", + "countme", + "crossbeam", + "ctrlc", + "filetime", + "rayon", + "red_knot_python_semantic", + "red_knot_server", + "red_knot_workspace", + "ruff_db", + "salsa", + "tempfile", + "tracing", + "tracing-flame", + "tracing-subscriber", + "tracing-tree", +] + +[[package]] +name = "red_knot_python_semantic" +version = "0.0.0" +dependencies = [ + "anyhow", + "bitflags 2.6.0", + "camino", + "compact_str", + "countme", + "dir-test", + "hashbrown 0.15.1", + "indexmap", + "insta", + "itertools 0.13.0", + "memchr", + "ordermap", + "red_knot_test", + "red_knot_vendored", + "ruff_db", + "ruff_index", + "ruff_python_ast", + "ruff_python_literal", + "ruff_python_parser", + "ruff_python_stdlib", + "ruff_source_file", + "ruff_text_size", + "rustc-hash 2.0.0", + "salsa", + "smallvec", + "static_assertions", + "tempfile", + "test-case", + "thiserror 2.0.3", + "tracing", +] + +[[package]] +name = "red_knot_server" +version = "0.0.0" +dependencies = [ + "anyhow", + "crossbeam", + "jod-thread", + "libc", + "lsp-server", + "lsp-types", + "red_knot_workspace", + "ruff_db", + "ruff_notebook", + "ruff_python_ast", + "ruff_source_file", + "ruff_text_size", + "rustc-hash 2.0.0", + "serde", + "serde_json", + "shellexpand", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "red_knot_test" +version = "0.0.0" +dependencies = [ + "anyhow", + "colored", + "memchr", + "red_knot_python_semantic", + "red_knot_vendored", + "regex", + "ruff_db", + "ruff_index", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", + "rustc-hash 2.0.0", + "salsa", + "smallvec", +] + +[[package]] +name = "red_knot_vendored" +version = "0.0.0" +dependencies = [ + "path-slash", + "ruff_db", + "walkdir", + "zip", +] + +[[package]] +name = "red_knot_wasm" +version = "0.0.0" +dependencies = [ + "console_error_panic_hook", + "console_log", + "js-sys", + "log", + "red_knot_python_semantic", + "red_knot_workspace", + "ruff_db", + "ruff_notebook", + "wasm-bindgen", + "wasm-bindgen-test", +] + +[[package]] +name = "red_knot_workspace" +version = "0.0.0" +dependencies = [ + "anyhow", + "crossbeam", + "notify", + "rayon", + "red_knot_python_semantic", + "red_knot_vendored", + "ruff_cache", + "ruff_db", + "ruff_python_ast", + "ruff_text_size", + "rustc-hash 2.0.0", + "salsa", + "tempfile", + "tracing", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror 1.0.67", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "ruff" +version = "0.7.4" +dependencies = [ + "anyhow", + "argfile", + "assert_fs", + "bincode", + "bitflags 2.6.0", + "cachedir", + "chrono", + "clap", + "clap_complete_command", + "clearscreen", + "colored", + "filetime", + "globwalk", + "ignore", + "indoc", + "insta", + "insta-cmd", + "is-macro", + "itertools 0.13.0", + "log", + "mimalloc", + "notify", + "path-absolutize", + "rayon", + "regex", + "ruff_cache", + "ruff_db", + "ruff_diagnostics", + "ruff_graph", + "ruff_linter", + "ruff_macros", + "ruff_notebook", + "ruff_python_ast", + "ruff_python_formatter", + "ruff_server", + "ruff_source_file", + "ruff_text_size", + "ruff_workspace", + "rustc-hash 2.0.0", + "serde", + "serde_json", + "shellexpand", + "strum", + "tempfile", + "test-case", + "thiserror 2.0.3", + "tikv-jemallocator", + "toml", + "tracing", + "walkdir", + "wild", +] + +[[package]] +name = "ruff_benchmark" +version = "0.0.0" +dependencies = [ + "codspeed-criterion-compat", + "criterion", + "mimalloc", + "rayon", + "red_knot_python_semantic", + "red_knot_workspace", + "ruff_db", + "ruff_linter", + "ruff_python_ast", + "ruff_python_formatter", + "ruff_python_parser", + "ruff_python_trivia", + "rustc-hash 2.0.0", + "serde", + "serde_json", + "tikv-jemallocator", + "ureq", + "url", +] + +[[package]] +name = "ruff_cache" +version = "0.0.0" +dependencies = [ + "filetime", + "glob", + "globset", + "itertools 0.13.0", + "regex", + "ruff_macros", + "seahash", +] + +[[package]] +name = "ruff_db" +version = "0.0.0" +dependencies = [ + "camino", + "countme", + "dashmap 6.1.0", + "filetime", + "ignore", + "insta", + "matchit", + "path-slash", + "ruff_cache", + "ruff_notebook", + "ruff_python_ast", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", + "rustc-hash 2.0.0", + "salsa", + "serde", + "tempfile", + "thiserror 2.0.3", + "tracing", + "tracing-subscriber", + "tracing-tree", + "web-time", + "zip", +] + +[[package]] +name = "ruff_dev" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap", + "ignore", + "imara-diff", + "indicatif", + "indoc", + "itertools 0.13.0", + "libcst", + "pretty_assertions", + "rayon", + "regex", + "ruff", + "ruff_diagnostics", + "ruff_formatter", + "ruff_linter", + "ruff_notebook", + "ruff_python_ast", + "ruff_python_codegen", + "ruff_python_formatter", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_workspace", + "schemars", + "serde", + "serde_json", + "similar", + "strum", + "tempfile", + "toml", + "tracing", + "tracing-indicatif", + "tracing-subscriber", +] + +[[package]] +name = "ruff_diagnostics" +version = "0.0.0" +dependencies = [ + "anyhow", + "is-macro", + "log", + "ruff_text_size", + "serde", +] + +[[package]] +name = "ruff_formatter" +version = "0.0.0" +dependencies = [ + "drop_bomb", + "ruff_cache", + "ruff_macros", + "ruff_text_size", + "rustc-hash 2.0.0", + "schemars", + "serde", + "static_assertions", + "tracing", + "unicode-width 0.1.13", +] + +[[package]] +name = "ruff_graph" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "red_knot_python_semantic", + "ruff_cache", + "ruff_db", + "ruff_linter", + "ruff_macros", + "ruff_python_ast", + "ruff_python_parser", + "salsa", + "schemars", + "serde", + "zip", +] + +[[package]] +name = "ruff_index" +version = "0.0.0" +dependencies = [ + "ruff_macros", + "static_assertions", +] + +[[package]] +name = "ruff_linter" +version = "0.7.4" +dependencies = [ + "aho-corasick", + "annotate-snippets 0.9.2", + "anyhow", + "bitflags 2.6.0", + "chrono", + "clap", + "colored", + "fern", + "glob", + "globset", + "imperative", + "insta", + "is-macro", + "is-wsl", + "itertools 0.13.0", + "libcst", + "log", + "memchr", + "natord", + "path-absolutize", + "pathdiff", + "pep440_rs 0.7.2", + "pyproject-toml", + "quick-junit", + "regex", + "ruff_cache", + "ruff_diagnostics", + "ruff_macros", + "ruff_notebook", + "ruff_python_ast", + "ruff_python_codegen", + "ruff_python_index", + "ruff_python_literal", + "ruff_python_parser", + "ruff_python_semantic", + "ruff_python_stdlib", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", + "rustc-hash 2.0.0", + "schemars", + "serde", + "serde_json", + "similar", + "smallvec", + "strum", + "strum_macros", + "test-case", + "thiserror 2.0.3", + "toml", + "typed-arena", + "unicode-normalization", + "unicode-width 0.1.13", + "unicode_names2", + "url", +] + +[[package]] +name = "ruff_macros" +version = "0.0.0" +dependencies = [ + "itertools 0.13.0", + "proc-macro2", + "quote", + "ruff_python_trivia", + "syn 2.0.87", +] + +[[package]] +name = "ruff_notebook" +version = "0.0.0" +dependencies = [ + "anyhow", + "itertools 0.13.0", + "rand", + "ruff_diagnostics", + "ruff_source_file", + "ruff_text_size", + "serde", + "serde_json", + "serde_with", + "test-case", + "thiserror 2.0.3", + "uuid", +] + +[[package]] +name = "ruff_python_ast" +version = "0.0.0" +dependencies = [ + "aho-corasick", + "bitflags 2.6.0", + "compact_str", + "is-macro", + "itertools 0.13.0", + "memchr", + "ruff_cache", + "ruff_macros", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", + "rustc-hash 2.0.0", + "salsa", + "schemars", + "serde", +] + +[[package]] +name = "ruff_python_ast_integration_tests" +version = "0.0.0" +dependencies = [ + "insta", + "ruff_python_ast", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_text_size", +] + +[[package]] +name = "ruff_python_codegen" +version = "0.0.0" +dependencies = [ + "ruff_python_ast", + "ruff_python_literal", + "ruff_python_parser", + "ruff_source_file", + "ruff_text_size", +] + +[[package]] +name = "ruff_python_formatter" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap", + "countme", + "insta", + "itertools 0.13.0", + "memchr", + "regex", + "ruff_cache", + "ruff_formatter", + "ruff_macros", + "ruff_python_ast", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", + "rustc-hash 2.0.0", + "schemars", + "serde", + "serde_json", + "similar", + "smallvec", + "static_assertions", + "thiserror 2.0.3", + "tracing", +] + +[[package]] +name = "ruff_python_index" +version = "0.0.0" +dependencies = [ + "ruff_python_ast", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", +] + +[[package]] +name = "ruff_python_literal" +version = "0.0.0" +dependencies = [ + "bitflags 2.6.0", + "itertools 0.13.0", + "ruff_python_ast", + "unic-ucd-category", +] + +[[package]] +name = "ruff_python_parser" +version = "0.0.0" +dependencies = [ + "annotate-snippets 0.9.2", + "anyhow", + "bitflags 2.6.0", + "bstr", + "compact_str", + "insta", + "memchr", + "ruff_python_ast", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", + "rustc-hash 2.0.0", + "static_assertions", + "unicode-ident", + "unicode-normalization", + "unicode_names2", + "walkdir", +] + +[[package]] +name = "ruff_python_resolver" +version = "0.0.0" +dependencies = [ + "env_logger", + "insta", + "log", + "tempfile", +] + +[[package]] +name = "ruff_python_semantic" +version = "0.0.0" +dependencies = [ + "bitflags 2.6.0", + "is-macro", + "ruff_cache", + "ruff_index", + "ruff_macros", + "ruff_python_ast", + "ruff_python_parser", + "ruff_python_stdlib", + "ruff_text_size", + "rustc-hash 2.0.0", + "schemars", + "serde", +] + +[[package]] +name = "ruff_python_stdlib" +version = "0.0.0" +dependencies = [ + "bitflags 2.6.0", + "unicode-ident", +] + +[[package]] +name = "ruff_python_trivia" +version = "0.0.0" +dependencies = [ + "itertools 0.13.0", + "ruff_source_file", + "ruff_text_size", + "unicode-ident", +] + +[[package]] +name = "ruff_python_trivia_integration_tests" +version = "0.0.0" +dependencies = [ + "insta", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_text_size", +] + +[[package]] +name = "ruff_server" +version = "0.2.2" +dependencies = [ + "anyhow", + "crossbeam", + "ignore", + "insta", + "jod-thread", + "libc", + "lsp-server", + "lsp-types", + "regex", + "ruff_diagnostics", + "ruff_formatter", + "ruff_linter", + "ruff_notebook", + "ruff_python_ast", + "ruff_python_codegen", + "ruff_python_formatter", + "ruff_python_index", + "ruff_python_parser", + "ruff_source_file", + "ruff_text_size", + "ruff_workspace", + "rustc-hash 2.0.0", + "serde", + "serde_json", + "shellexpand", + "thiserror 2.0.3", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "ruff_source_file" +version = "0.0.0" +dependencies = [ + "memchr", + "ruff_text_size", + "serde", +] + +[[package]] +name = "ruff_text_size" +version = "0.0.0" +dependencies = [ + "schemars", + "serde", + "serde_test", + "static_assertions", +] + +[[package]] +name = "ruff_wasm" +version = "0.7.4" +dependencies = [ + "console_error_panic_hook", + "console_log", + "js-sys", + "log", + "ruff_formatter", + "ruff_linter", + "ruff_python_ast", + "ruff_python_codegen", + "ruff_python_formatter", + "ruff_python_index", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", + "ruff_workspace", + "serde", + "serde-wasm-bindgen", + "wasm-bindgen", + "wasm-bindgen-test", +] + +[[package]] +name = "ruff_workspace" +version = "0.0.0" +dependencies = [ + "anyhow", + "colored", + "etcetera", + "glob", + "globset", + "ignore", + "is-macro", + "itertools 0.13.0", + "log", + "matchit", + "path-absolutize", + "path-slash", + "pep440_rs 0.7.2", + "regex", + "ruff_cache", + "ruff_formatter", + "ruff_graph", + "ruff_linter", + "ruff_macros", + "ruff_python_ast", + "ruff_python_formatter", + "ruff_python_semantic", + "ruff_source_file", + "rustc-hash 2.0.0", + "schemars", + "serde", + "shellexpand", + "strum", + "tempfile", + "toml", +] + +[[package]] +name = "rust-stemmers" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + +[[package]] +name = "rustix" +version = "0.38.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.23.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustls-webpki" +version = "0.102.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "salsa" +version = "0.18.0" +source = "git+https://github.com/salsa-rs/salsa.git?rev=254c749b02cde2fd29852a7463a33e800b771758#254c749b02cde2fd29852a7463a33e800b771758" +dependencies = [ + "append-only-vec", + "arc-swap", + "crossbeam", + "dashmap 6.1.0", + "hashlink", + "indexmap", + "lazy_static", + "parking_lot", + "rustc-hash 2.0.0", + "salsa-macro-rules", + "salsa-macros", + "smallvec", + "tracing", +] + +[[package]] +name = "salsa-macro-rules" +version = "0.1.0" +source = "git+https://github.com/salsa-rs/salsa.git?rev=254c749b02cde2fd29852a7463a33e800b771758#254c749b02cde2fd29852a7463a33e800b771758" + +[[package]] +name = "salsa-macros" +version = "0.18.0" +source = "git+https://github.com/salsa-rs/salsa.git?rev=254c749b02cde2fd29852a7463a33e800b771758#254c749b02cde2fd29852a7463a33e800b771758" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.87", + "synstructure", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.87", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "serde" +version = "1.0.214" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde_derive" +version = "1.0.214" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "serde_derive_internals" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "serde_json" +version = "1.0.132" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_test" +version = "1.0.177" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f901ee573cab6b3060453d2d5f0bae4e6d628c23c0a962ff9b5f1d7c8d4f1ed" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_with" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" +dependencies = [ + "serde", + "serde_derive", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shellexpand" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" +dependencies = [ + "dirs 5.0.1", +] + +[[package]] +name = "similar" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strip-ansi-escapes" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" +dependencies = [ + "vte", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.87", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "tempfile" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "terminal_size" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +dependencies = [ + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "terminfo" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" +dependencies = [ + "dirs 4.0.0", + "fnv", + "nom", + "phf", + "phf_codegen", +] + +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + +[[package]] +name = "test-case" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" +dependencies = [ + "test-case-macros", +] + +[[package]] +name = "test-case-core" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "test-case-macros" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "test-case-core", +] + +[[package]] +name = "thiserror" +version = "1.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3c6efbfc763e64eb85c11c25320f0737cb7364c4b6336db90aa9ebe27a0bbd" +dependencies = [ + "thiserror-impl 1.0.67", +] + +[[package]] +name = "thiserror" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +dependencies = [ + "thiserror-impl 2.0.3", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b607164372e89797d78b8e23a6d67d5d1038c1c65efd52e1389ef8b77caba2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-flame" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9" +dependencies = [ + "lazy_static", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-indicatif" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069580424efe11d97c3fef4197fa98c004fa26672cc71ad8770d224e23b1951d" +dependencies = [ + "indicatif", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term 0.46.0", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-tree" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f459ca79f1b0d5f71c54ddfde6debfc59c8b6eeb46808ae492077f739dc7b49c" +dependencies = [ + "nu-ansi-term 0.50.1", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-ucd-category" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8d4591f5fcfe1bd4453baaf803c40e1b1e69ff8455c47620440b46efef91c0" +dependencies = [ + "matches", + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + +[[package]] +name = "unicode_names2" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1673eca9782c84de5f81b82e4109dcfb3611c8ba0d52930ec4a9478f547b2dd" +dependencies = [ + "phf", + "unicode_names2_generator", +] + +[[package]] +name = "unicode_names2_generator" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91e5b84611016120197efd7dc93ef76774f4e084cd73c9fb3ea4a86c570c56e" +dependencies = [ + "getopts", + "log", + "phf_codegen", + "rand", +] + +[[package]] +name = "unscanny" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" +dependencies = [ + "base64", + "flate2", + "log", + "once_cell", + "rustls", + "rustls-pki-types", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +dependencies = [ + "getrandom", + "rand", + "uuid-macro-internal", + "wasm-bindgen", +] + +[[package]] +name = "uuid-macro-internal" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b91f57fe13a38d0ce9e28a03463d8d3c2468ed03d75375110ec71d93b449a08" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vt100" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84cd863bf0db7e392ba3bd04994be3473491b31e66340672af5d11943c6274de" +dependencies = [ + "itoa", + "log", + "unicode-width 0.1.13", + "vte", +] + +[[package]] +name = "vte" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +dependencies = [ + "arrayvec", + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.87", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" + +[[package]] +name = "wasm-bindgen-test" +version = "0.3.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d381749acb0943d357dcbd8f0b100640679883fcdeeef04def49daf8d33a5426" +dependencies = [ + "console_error_panic_hook", + "js-sys", + "minicov", + "scoped-tls", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test-macro", +] + +[[package]] +name = "wasm-bindgen-test-macro" +version = "0.3.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "which" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" +dependencies = [ + "either", + "home", + "rustix", + "winsafe", +] + +[[package]] +name = "wild" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" +dependencies = [ + "glob", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + +[[package]] +name = "yansi-term" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +dependencies = [ + "winapi", +] + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", + "flate2", + "zstd", +] + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.11+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 2449165caeb0e..7bbb02e100b47 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -11,12 +11,11 @@ nix-update-script, versionCheckHook, libiconv, - nixosTests, }: python3Packages.buildPythonPackage rec { pname = "ruff"; - version = "0.8.0"; + version = "0.7.4"; pyproject = true; outputs = [ @@ -28,7 +27,7 @@ python3Packages.buildPythonPackage rec { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-yenGZ7TuiHtY/3AIjMPlHVtQPP6PHMc1wdezfZdVtK0="; + hash = "sha256-viDjUfj/OWYU7Fa7mqD2gYoirKFSaTXPPi0iS7ibiiU="; }; # Do not rely on path lookup at runtime to find the ruff binary @@ -39,9 +38,12 @@ python3Packages.buildPythonPackage rec { 'return "${placeholder "bin"}/bin/ruff"' ''; - cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - hash = "sha256-O5+uVYWtSMEj7hBrc/FUuqRBN4hUlEbtDPF42kpL7PA="; + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ="; + "salsa-0.18.0" = "sha256-zUF2ZBorJzgo8O8ZEnFaitAvWXqNwtHSqx4JE8nByIg="; + }; }; nativeBuildInputs = @@ -77,7 +79,6 @@ python3Packages.buildPythonPackage rec { passthru = { tests = { inherit ruff-lsp; - nixos-test-driver-busybox = nixosTests.nixos-test-driver.busybox; }; updateScript = nix-update-script { }; }; @@ -92,7 +93,6 @@ python3Packages.buildPythonPackage rec { # According to the maintainers, those tests are from an experimental crate that isn't actually # used by ruff currently and can thus be safely skipped. checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ - "--skip=added_package" "--skip=add_search_path" "--skip=changed_file" "--skip=changed_versions_file" @@ -105,15 +105,13 @@ python3Packages.buildPythonPackage rec { "--skip=hard_links_to_target_outside_workspace" "--skip=move_file_to_trash" "--skip=move_file_to_workspace" - "--skip=nested_packages_delete_root" "--skip=new_file" "--skip=new_ignored_file" - "--skip=removed_package" "--skip=rename_file" "--skip=search_path" "--skip=unix::changed_metadata" - "--skip=unix::symlinked_module_search_path" "--skip=unix::symlink_inside_workspace" + "--skip=unix::symlinked_module_search_path" ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/sa/sakura/package.nix b/pkgs/by-name/sa/sakura/package.nix index cc883a488d687..d58eceae1654c 100644 --- a/pkgs/by-name/sa/sakura/package.nix +++ b/pkgs/by-name/sa/sakura/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { options. No more no less. ''; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ astsmtl codyopel ]; + maintainers = with lib.maintainers; [ astsmtl codyopel AndersonTorres ]; platforms = lib.platforms.linux; mainProgram = "sakura"; }; diff --git a/pkgs/by-name/sa/samurai/package.nix b/pkgs/by-name/sa/samurai/package.nix index 15a20cd343f14..675160751d1e0 100644 --- a/pkgs/by-name/sa/samurai/package.nix +++ b/pkgs/by-name/sa/samurai/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/michaelforney/samurai"; license = with licenses; [ mit asl20 ]; # see LICENSE - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill AndersonTorres ]; mainProgram = "samu"; platforms = platforms.all; }; diff --git a/pkgs/by-name/sc/scilla/package.nix b/pkgs/by-name/sc/scilla/package.nix index 77aeeae08e5ef..24daa9f386c7a 100644 --- a/pkgs/by-name/sc/scilla/package.nix +++ b/pkgs/by-name/sc/scilla/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "scilla"; - version = "1.3.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "edoardottt"; repo = "scilla"; rev = "refs/tags/v${version}"; - hash = "sha256-V6QJqjuVLE6jpwv4XbsdPx8kpfTRjV4QH5O6lng9+h4="; + hash = "sha256-ms52ii2cbZSZtcyxhVN+FbGP6hysoLvS7XwdPqxYymU="; }; - vendorHash = "sha256-yTsiEA6NI2atN1VrclwVe1xz7CEFfcuRt4yMuz2CFog="; + vendorHash = "sha256-tOg4T9yQm1aj5G89lUeRUTxi4YrwpRi5KDcpWw4TimY="; ldflags = [ "-w" diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix index a6070810332ba..ac647e93b1958 100644 --- a/pkgs/by-name/se/seabios/package.nix +++ b/pkgs/by-name/se/seabios/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { use of coreboot. ''; license = with lib.licenses; [ lgpl3Plus ]; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isUnix lib.systems.inspect.patterns.isx86; badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; }; diff --git a/pkgs/by-name/sn/snis-assets/manifest.txt b/pkgs/by-name/sn/snis-assets/manifest.txt deleted file mode 100644 index 03ea9c02d74bc..0000000000000 --- a/pkgs/by-name/sn/snis-assets/manifest.txt +++ /dev/null @@ -1,810 +0,0 @@ -sjOw4TTK5Z3VR3TRlKn2ZXkqYxmKgrmTet5/0Mptji4= share/snis/replacement-files/asteroid3-1.png -GJUaKbdAiIUrPOGbKEwL/Tpl5e1J3aIxwdMNrO/4oKE= share/snis/replacement-files/cargocontainer.png -5T0UY00RwSeimTTStaZhD5ZCqrGS2u5tdem6+pmo/34= share/snis/replacement-files/asteroid3-3.png -p/FXO9QCmsACU6aUU9glVBCJES1LMKhYplDBnkwrz/A= share/snis/replacement-files/default-assets.txt -aL9xwQM63RIrO67fLHnbxBhQhd3suKmUUiNzGYSpdjw= share/snis/replacement-files/asteroid3-5.png -HH53P+DTtbVpDlQdjwqdZ5pJnZadPl5KHpUD78Sc7J4= share/snis/replacement-files/Attribution.txt -uNx3bqm/YO+/g9Ry4FmUEIvvhXOJoX2C4EjunL694Dg= share/snis/replacement-files/asteroid3-2.png -NDndMpnUcvBeD/7WX3CjyqB++7lCnuRpghXQOBWM3eY= share/snis/replacement-files/asteroid3-4.png -j5TX9zHhyprGk5yVjEl2D3vBL/HOnwlLEt5PpLh9bOs= share/snis/replacement-files/asteroid3-0.png -le/Q9RBlNupL/FpO+DYDKuzH5LjSgKcUU7q46MGDF00= share/snis/replacement_assets.txt -C71kMWifWo8QtMvylnc+T0A9EPnIGik5Ir86IUziF6M= share/snis/solarsystems/tau-scorpii/image2.png -B5zg4F2MLmLUJcvemLbRq9q6QuPj5lFHJD5Srmh2olA= share/snis/solarsystems/tau-scorpii/rustywall0.png -+DdaRv3zMir6szFMjdrkW7A8DtjXtKJxchqhl1XK6B8= share/snis/solarsystems/tau-scorpii/rocky1-rgb-3.png -mre/vZjS4xPOk8JZ9zAOtDxaBvVpAgURjlx+eTsfQOU= share/snis/solarsystems/tau-scorpii/image1.png -X3UMV+tEqus+6Og289IJl9g4zxqnYIsOj8/SX9bfNeE= share/snis/solarsystems/tau-scorpii/erth-2.png -LAgRRKkMZ7/6+6ePVNBwbwaqqXU0DPBCUYPPrTwhbXw= share/snis/solarsystems/tau-scorpii/image4.png -ogJqbuhH9cHjRVCAn5m0mCJncrw/BZoSZfcfqgpXsCc= share/snis/solarsystems/tau-scorpii/sun.png -T3Dp6T0Qq6rTVXN4grHLpVfae4o1RP/x+GUhZP+WCqI= share/snis/solarsystems/tau-scorpii/bluish2.png -+f71U9Om+hi3HzBPvyyScaVU+gRNLc6oFfUim0rydSI= share/snis/solarsystems/tau-scorpii/rocky1-rgb-1.png -HahmNn6qdGxfp5kx/7FqVmSlUaJv1aH0/L0yZvRE0m4= share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-1.png -8bexz5SuTFse8sUAO7viJTcNzvcf7NZyPoRiMdQY++8= share/snis/solarsystems/tau-scorpii/gasgiant-d-1.png -QzIjiiEyfsAuaU8NEzUu8TVLM6sgSqBwQXtSxSi1BKE= share/snis/solarsystems/tau-scorpii/gasgiant-d-0.png -4M9pCloqsUg0ZaKdq1K4jwZcs17I5LZ3CwSK0mpbTJ4= share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-3.png -kHxbIuXVUVIjHsUFvRGwtwZxdksledJs2RifOlHotQg= share/snis/solarsystems/tau-scorpii/jungle3.png -zhxkaO+fpav5pYHvBziCG7KJqGnbxxijmoBltrFYu0M= share/snis/solarsystems/tau-scorpii/bluish5.png -UKswAtwyu7LF+nnGPh4/5RiK04ZBl4Zvc9tLleVtGRU= share/snis/solarsystems/tau-scorpii/rocky1-rgb-5.png -vXcNeFnv9ci+aDJ5s9m1qX0ymT7CoGMVQ2EdsoJo7js= share/snis/solarsystems/tau-scorpii/rustywall3.png -/Yn5syDR7RHaa+B3jLUOw+9bUMwMB5mWyE/MtwjRrPI= share/snis/solarsystems/tau-scorpii/erth-0.png -cMqsnhf7ht9uBW9DgpHBM1910jGMR33QDeONwUXMAAM= share/snis/solarsystems/tau-scorpii/rustywall1.png -EXXYG5LvzUJoIlo7v3V1pLKqOT7ZouOPaBinVVaoM2w= share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-5.png -91gD8EcdcZU9KYyl+WyqmwmfzuCMp/wmF8+T+rHQlgg= share/snis/solarsystems/tau-scorpii/bluish4.png -lQANFKE3EukGDv90xIetNGtsxyEIRnk/g7b+O/A7vKc= share/snis/solarsystems/tau-scorpii/jungle5.png -QsbH7rMQzckt98ZTB/xw3C2qwcWiV1RAjyO+E3YW9pI= share/snis/solarsystems/tau-scorpii/rocky1-rgb-4.png -1SImVY09TWyqdBTbio6TsRJUsdva8+OMWIN9TjTLy5k= share/snis/solarsystems/tau-scorpii/erth-4.png -nlUGG6W5WGEO6FCqO0NA+4fa7lCi8S1KOSSiMqu/PWo= share/snis/solarsystems/tau-scorpii/Attribution.txt -0WQEbu5yLerSMJNV8po0Igt6XDGpu6dO/5VXl005iqk= share/snis/solarsystems/tau-scorpii/rocky1-rgb-2.png -4oJGgGCmiLww20eTPSx+Efs3Y+usttkH7ZrRDMKEVs8= share/snis/solarsystems/tau-scorpii/rocky1-rgb-0.png -vzHOkng55CIlKP6iUwSMMEI4p3wmEHCfsBSf4X70T0s= share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-0.png -Zx4sBxQpSwrhklTHOnamnGJJYU3W8C9Gd+3pOg0kC9g= share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-4.png -3VD8Fn5HXcIK9rNWRS7sSjhFKZIl62oJNvyPUn+uTXs= share/snis/solarsystems/tau-scorpii/gasgiant-d-2.png -dxm4SULnf3udF+54Q9SUBkobp/cVO+6AlBGe16RH3oA= share/snis/solarsystems/tau-scorpii/bluish0.png -2ZLk/7xX4fzs3GmTaSub8YubTyy1x6jCrHG+Tj83JSc= share/snis/solarsystems/tau-scorpii/bluish3.png -moudMzqKg+zKA2kFUP4sgbW43jsW3m70ikGFXl2Nh9I= share/snis/solarsystems/tau-scorpii/rustywall4.png -Sns8FlObo7AEqOU3f2WUxtx6c691qgv+v2jZnJTww2I= share/snis/solarsystems/tau-scorpii/assets.txt -UbYREhAf2Row2PXQPfDI77fTVqj34AeAzBZ9AU84QLc= share/snis/solarsystems/tau-scorpii/bluish1.png -i4ZCxzAAIeolg/v2x7eseNeMYuFYJZHDjJjl4XFu+wg= share/snis/solarsystems/tau-scorpii/erth-1.png -LlFGwZkV2ti5saZ8l67+30QhVxGsV8lvS+DVKpEsTRk= share/snis/solarsystems/tau-scorpii/erth-5.png -23VPjuRbYu6J0CbP04pmohsMVhl2e6NFhy5lPjhYadc= share/snis/solarsystems/tau-scorpii/image5.png -c3fiFEoGvidQeRnAblTUhwB+gyaRZaXwIvsloQ4nqh0= share/snis/solarsystems/tau-scorpii/gasgiant-d-5.png -npIg5gbJpvvVKbyl6oGPZShGAEbQ8mmM3thrzalEIKk= share/snis/solarsystems/tau-scorpii/erth-3.png -y4ZlyuY7UylLSYB2JK3YZuXoWArtCf5s2cZb4iniu3A= share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-2.png -CSMsoNJaLM7DwgyftUzzt+PDzJxQp12GymSdr6dPSWE= share/snis/solarsystems/tau-scorpii/rustywall2.png -OFdhugrs+lk0hAcMe5rrUMIPpJgDVg1LiNCy209FrTc= share/snis/solarsystems/tau-scorpii/jungle2.png -gdebjVi9iZJVz/moavujdR2P4qpCI1ZpeVckiq/Zxzc= share/snis/solarsystems/tau-scorpii/gasgiant-d-3.png -Cgyv3cMNT/c9m/Fa6hM1X8U5Hc9apwAGJcGSZzI2rlo= share/snis/solarsystems/tau-scorpii/jungle0.png -Bd/juNW8ixHzrK1q4z+jRxxMOGxFEU2m8+a5j2tluL8= share/snis/solarsystems/tau-scorpii/image3.png -t0bgh90qvRbcJ7CF5Kh5Mu7fSVnlU6Tsv+GWn4l/HQE= share/snis/solarsystems/tau-scorpii/rustywall5.png -frLIT38RTxtmkPrpk4rFV/wBVQWSWWZaVVD38rC7QuA= share/snis/solarsystems/tau-scorpii/image0.png -WnBnha8YClNoGzwxY6dhLCEkESxxtcU+cGEW/IpI3r0= share/snis/solarsystems/tau-scorpii/jungle4.png -tgXWEUab+5QiqfNZtCt8ci7NZ9C3OR6vgorUDSg5oa0= share/snis/solarsystems/tau-scorpii/gasgiant-d-4.png -8XOmxpTiIZCCKFKnBah93kMLsdaztXZJ0QFr6IZxUJo= share/snis/solarsystems/tau-scorpii/jungle1.png -cjOxxQoY3ukMclMiGcVUc9Pfd/IDOrX0EMAbuPveqgc= share/snis/solarsystems/karado/maurz1.png -JA7DukfwN7EJT7rQ3I3cJUlvQyEjgHhHOHdRqeqZUfw= share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-2.png -w9HP4HpW3lWlNR5+N1UeeC8PwhycteQs7EJX6cp5fek= share/snis/solarsystems/karado/ounii-normalmap-masked3.png -ZBUhZKybhHW7GweOOQHRMW76T7jEZoDNF1U3i4B8lTU= share/snis/solarsystems/karado/maurz3.png -RinAAet1RTbqfBdQ30LQG4gOYsk8zhAuYhLkH7jjXtM= share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-1.png -PnZmAoT3W+uxcobndKiHkakNWLbF1Rac5mwGz9akwrA= share/snis/solarsystems/karado/maurz-normalmap0.png -RWThrArd3WTfh6cTEXM1FDY6EFzA5obEL/29fShvt4Y= share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-0.png -Y5DLC48a0E8uqQwfA/eGntMD6E1A+V9thYV5OPflkrU= share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-1.png -14iLpLU0s35gowiRjSACDCHwZKuDMqEt9wDHmqN9pJk= share/snis/solarsystems/karado/sun.png -yh1dkDIDuayS2SKotKB+1H3blC+F+/oA2tkWZFuXHDk= share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-5.png -2M1dHDNvDjELPngfdDsH1UeOVWjcM13vo6JFBuVrQkk= share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-4.png -yEFIDxnMm641GesZCRDqlF2zmaXUNeZ6FbbXzq7w+oo= share/snis/solarsystems/karado/kolaron1.png -GdlVdQ+gvvRw/0UgYVKcyvq8NNY5UYiSWNbtHpqkk5s= share/snis/solarsystems/karado/skybox-4.png -N5nykk1TRl0n5cmUaEzAJ8QNia9YS0YuuvxTlRuw+Bc= share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-0.png -Iv5GAs8X8J3EinXErg24YW1akOhBC8J6Me1xxK23/VU= share/snis/solarsystems/karado/tounah-normalmap1.png -bL6WHvF2rzB0Yiqhs8eYM1NWml0PHY/2trCbY2tvn5g= share/snis/solarsystems/karado/ounii-with-clouds-0.png -9lMDCFq6Pn12CBuv5WGjlyIuEsXY+/SVIOeBdziKewM= share/snis/solarsystems/karado/tounah3.png -BjBFiOIekiDH1unfKJZwnyh4FsKa7hyDK6+tPVDk0dA= share/snis/solarsystems/karado/tounah-normalmap3.png -DgXtZtj48sxP2gMfKQ6kuisBmiiQvaiW9b9nHo0cKUE= share/snis/solarsystems/karado/skybox-0.png -JR16aeqQ28v4sgBYYPZJ2JyYpXSQ9SUxTlRQjjmMYJY= share/snis/solarsystems/karado/ounii-normalmap-masked0.png -3plkE7cBhcS2onMeBrRomwK6xGubM4toGv+h6yAznNc= share/snis/solarsystems/karado/norphi5.png -eSxWcYTH3mz5L39oJuDJLry+Q8vHpF1HrqXDvRIumgk= share/snis/solarsystems/karado/maurz5.png -jyI/fdAeKFNCm4fJlTETwZG+4VyL+CRXGboyxZQYxSo= share/snis/solarsystems/karado/norphi-normalmap4.png -8w5uI8/KKVIGcPNWv1C+SwA4xfyorL7UwcNYOzznaYs= share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-5.png -u4lCbrVm3UnL8TvvnHgyMmqSwHdyA2BBSu4/Oas3KyE= share/snis/solarsystems/karado/ounii-with-clouds-4.png -sqyByb/XbSy65hWGpDWmmBEppzhYxJbPGFjz770thWI= share/snis/solarsystems/karado/kolaron3.png -HO+3JBz384geu4RyeJvvl/82n5au+Ntp7L8EmhgNdVw= share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-3.png -WhRN3Ef/NsoOBzRDeiEmv8EIK1FQ9dcUR9QA8x5FCGI= share/snis/solarsystems/karado/kolaron4.png -eoKlgavlafYSnuGi4dtQaz7czPt5zC6hHpTGZeMt80g= share/snis/solarsystems/karado/maurz-normalmap3.png -NpcnSI5gr1OMWYVit8qb4V94yhuF3bomy/5LCL7aXGQ= share/snis/solarsystems/karado/maurz0.png -OeazFTVT6nNiu3o1rvY+2sKMIZpImY/lfnq7oTCaYG4= share/snis/solarsystems/karado/norphi4.png -wUgdl8IKV7Tn6WdaCQGjh0F/uxH4oS4Sxuvo5Dsaqk4= share/snis/solarsystems/karado/tounah1.png -9CNWfsodxC8om8vUByFdjyJHo+lz/qDikcQrsYR/+Uo= share/snis/solarsystems/karado/ounii-normalmap-masked1.png -NvTkAOZ5qcG311dUEHUHpNbpLFXCtK1arN9D8bh2mSk= share/snis/solarsystems/karado/kolaron5.png -7dSfrm6Lgm4H9b1xc8H13S+EjhbmvZgdICLGKM/1zBQ= share/snis/solarsystems/karado/kolaron0.png -y5DauNIPTxnWOD+AHqjgJNVpOYVSjswKs6z2YRFuDBY= share/snis/solarsystems/karado/skybox-2.png -3oClYVJc1+e4evArG4ZOJiNuytxzEHSgLUmHrBPSKFA= share/snis/solarsystems/karado/maurz-normalmap4.png -JXn4j6ZQWXj3pPOq3yGY/uOvlLSbR0ZVVwNOvijPTpc= share/snis/solarsystems/karado/maurz-normalmap5.png -BzF/YVrzb7Rv94oBhLfmA7P3RWnnN5nzBvoi2QEf1sg= share/snis/solarsystems/karado/skybox-3.png -k64xflcXPLhOV7i9LvdZvSFbks/RAy+f7bsl9REfxCE= share/snis/solarsystems/karado/ounii-with-clouds-2.png -1y6lDCz+N2omPkZ2l1t+0q0J/w14//Z/Ewq7+G0mMdM= share/snis/solarsystems/karado/ounii-with-clouds-5.png -ldSkzeahDlNZnwlgxOmSs58RZ27lCzmvVQQJS5BXQdo= share/snis/solarsystems/karado/tounah-normalmap0.png -Uu8ZseislfkYfxqmPPSHuJ+mgyj7zdQ02EDKMKDIeVc= share/snis/solarsystems/karado/skybox-1.png -eSL0yROs572/a16mT790Q+xon9AZhjWEut/loTIMU18= share/snis/solarsystems/karado/Attribution.txt -d1CWAWEAIjxiXZTSnml7/bdNzV1OCSeie/+asy+DKk0= share/snis/solarsystems/karado/ounii-normalmap-masked2.png -AYc/uhxerl++taDUCZ836cbr17VKsSI3ShzIu9HsWqc= share/snis/solarsystems/karado/norphi-normalmap5.png -1vKjxAgNcuRKBZ5Tr94ICodqpXuZX/2cGy8Sx8yqGzc= share/snis/solarsystems/karado/tounah4.png -bA5NFdtGWTkY2CMoAYEkl54FyMy3Ft4J7iUvCB28RhI= share/snis/solarsystems/karado/tounah0.png -EDwWGkYcKyoGnXkOiAFAsDNjXG7vRV6VhC16dyHLqe0= share/snis/solarsystems/karado/ounii-with-clouds-1.png -WkJ6h3j78FSu39N2K+pTC2ISC3vdyqFbFLp8y7L534o= share/snis/solarsystems/karado/skybox-5.png -/479dJqdJZedoX/k3+dJo8diAnvJNORAZeiFPNrrJZg= share/snis/solarsystems/karado/ounii-with-clouds-3.png -GPcVRzOlVGciu+MpFu3qcDfr683gmIKXL63291IEAKs= share/snis/solarsystems/karado/norphi-normalmap0.png -OCzM7Omev6AzO+wO43/NBs6oWo97wwzuet3r4cs5j1Y= share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-3.png -bPyHQyescyDQfVyrqiQDqb5QDsRKA92lnrLbROs7J+8= share/snis/solarsystems/karado/tounah2.png -lXThLDuEbH3PzHv+gtEqTwpb0gTPVsoGBQKIUdMzA8Y= share/snis/solarsystems/karado/norphi-normalmap1.png -LDtnTIx/E71pDdc1PlzKDpFDdkxDZaQxYNw1+M1ZqhQ= share/snis/solarsystems/karado/assets.txt -nqN4db1OS5mMUOW89Y5qH7tx7NtsHEISq1B+SjJngg0= share/snis/solarsystems/karado/norphi0.png -NOdBbewc3kDH36OLSQzt5FK2hl6T+AtnAfMyR/gPRjk= share/snis/solarsystems/karado/maurz-normalmap2.png -0UcErE67TYJhPAm6EvueDe5AO6Jc8s/+Jty8reo8G7w= share/snis/solarsystems/karado/maurz2.png -feXt3aiJYDebd7sfijzkVQ++6mRqptxZv/P7oe8zS2I= share/snis/solarsystems/karado/maurz-normalmap1.png -Px46fgE4Da5qrxAdzLzBCMm7xmk46ULMUotU40JazL4= share/snis/solarsystems/karado/norphi1.png -LUWvUAS5XYhiLfWVKSpHaTAAuYdcctMXV2S7Y0bttHo= share/snis/solarsystems/karado/norphi-normalmap2.png -W8Du6C1jWmOM8EoIFBGvEmY33c7EPANCNhyCvcEkWv8= share/snis/solarsystems/karado/kolaron2.png -7r6POKa0wwzc8VNjzwOkQDQdl0zYN4+M60ygoESf2VE= share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-2.png -LDHCSW/tkpI5cxqSi38ecuKJ2Yn1bGVJl7wClqyPIyY= share/snis/solarsystems/karado/maurz4.png -iaiMLBLN5XlLs1qiKnxmXvlF3XR5GSvIOqvC0U8Nw4I= share/snis/solarsystems/karado/tounah-normalmap4.png -kZLLzolKmFcy856LMgXzdKHvzZTParhtOP3XR2Cvuz8= share/snis/solarsystems/karado/tounah-normalmap5.png -JI9Ej0PyDTqNtvtaQwnWTBQiKujoY0cyk+UBgZEhE6Q= share/snis/solarsystems/karado/norphi2.png -9RvzLm1UA/kkoa0++cbfyaDh1OcFRwhc2tGzLQ9A8Aw= share/snis/solarsystems/karado/ounii-normalmap-masked5.png -99god8h1yAo8HY32bZXXIXrE7sbGWADBTV2U2Tj9ElY= share/snis/solarsystems/karado/norphi3.png -GHn/28itRbFZRWNrBn5fOe3w/t+2iXJSw1UME0NXDPI= share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-4.png -XRFWZCP0hLkjXg+LNR6n7cffZDGGxhNfjAX2e5l9L20= share/snis/solarsystems/karado/ounii-normalmap-masked4.png -486du5aoVCgiJxrsmnqcoLekT1VHF19C8JZPSezZLzM= share/snis/solarsystems/karado/norphi-normalmap3.png -y9btB0QKqoHs4z+rDM7ujjyiA/3WTfa+K2RowRQSR1w= share/snis/solarsystems/karado/tounah5.png -0VGEbUJwf9bfJjB7G85qbC3wqPFjJ4NxXymu1+nX06M= share/snis/solarsystems/karado/tounah-normalmap2.png -pCJmzEWA/dF/F1i67N2VzQwPOkWigxKS54d+EVNRlwk= share/snis/solarsystems/zolon/p32.png -RWpBFnQCyuj1FGbA89t7b/XR433KyCxYue9WbLB8U0A= share/snis/solarsystems/zolon/e1-normalmap5.png -1CZnBW62bZTL0VonTUM6ToIMXQm7DpJQA/Lydmtk8Ek= share/snis/solarsystems/zolon/p54.png -1pHrVkyrCnKGOUzFmP1OyzUDAGLdyRDpIVBpCb886v4= share/snis/solarsystems/zolon/p3-normalmap4.png -ICmySzuzck56LI6lG8FmihWuI2eV/t38arZLlM1YV3s= share/snis/solarsystems/zolon/p3-normalmap3.png -NQxWQADuLmz0dn9tqeXVRj90qzlq+p4wF50PaCv4M8Q= share/snis/solarsystems/zolon/p60.png -QwNYP4iUGPZAD6UWn5mfPWYVkvJH+ObI2VGUEbt/AB8= share/snis/solarsystems/zolon/e14.png -qE7fCliK95DIOxtRklA3pXTxJdX1Jmzvk2bKyaUjPl8= share/snis/solarsystems/zolon/p3-normalmap0.png -orTtjzh9MBeNS7uPoEyKhXpBruTqeaHbq/VyjSQVOZ0= share/snis/solarsystems/zolon/p22.png -2A43kXfM6dUyeZFtLwzUxAlNJcdbEmX2Jtq+UQLhclQ= share/snis/solarsystems/zolon/p013.png -W2zOTkttEZMlyHowGmCcgjJGFZVUvjR9JJ0C98Glg2g= share/snis/solarsystems/zolon/e13.png -dHkumWSOWeJeXXaHq9h8kNG0l9sDfreWZSVYzJ2SbS8= share/snis/solarsystems/zolon/e11.png -AC2qXLc+ml1oNW6KmOeIZ8qSHgbK0Lk0jbXKU/U7sYU= share/snis/solarsystems/zolon/e12.png -2D+Rgrr1TUk7JrP5mdEw4XhQxQzgBrGCBF/20FFc9+c= share/snis/solarsystems/zolon/p52.png -3p/Uy1lb+I+lz7lB+b2Iicnxb0/mkgppVr3xjtroysM= share/snis/solarsystems/zolon/e1-normalmap2.png -tMc3wIiR4ula2Ouwbppgr+T082XkBBg6ak0bcOzgM9U= share/snis/solarsystems/zolon/p62.png -SCYTxGiq2VXG47tepRfyUvsUS+YSt1o90qH3Ugrnw9w= share/snis/solarsystems/zolon/skybox2.png -Y2b14W37pku1bO8YZyfRrsqYlwwJnC3FZWyeWknujW0= share/snis/solarsystems/zolon/p30.png -fcfUDI4Fhj+dFYE+oW8ktuysXWnP/2IAeYKNZwXteI0= share/snis/solarsystems/zolon/p51.png -bV9Lt6BjUUCoI8aCc7opbLJ6UgDVEbyTNQj200vbsAc= share/snis/solarsystems/zolon/skybox4.png -etW4gNw6vDKvgChi5KXIQYLIzKyE+97Ur/zVWFSAbB8= share/snis/solarsystems/zolon/p23.png -YQAkzhgMWt7M6ZtCrM5G3nDhI/nY0oRGVD81bu4878A= share/snis/solarsystems/zolon/p20.png -1fjiJG142meeinsvpo3H03i057chuOmrJLSbmgAbkSE= share/snis/solarsystems/zolon/p010.png -XmMloYE+ANsPPDyYnFoROaUGb9Ur0gRRraBLjGMKWcY= share/snis/solarsystems/zolon/e1-normalmap1.png -ntNEzKfWV7cvydVMbpjem/OPXz4WctXKlx+pqjFPxeE= share/snis/solarsystems/zolon/p31.png -rDoyk3FoxMvC1BhjFaRGRHpGz3jS7PRy/tsBu0BjeQ4= share/snis/solarsystems/zolon/p015.png -hpmBkeOV90lTELjki+jSKyODML4WysRR9Vt+ZeDJPFo= share/snis/solarsystems/zolon/redstar.png -lZQnQNNWajjDg/G7sSveKDjawdzFqPzMSY3XxWYlXp4= share/snis/solarsystems/zolon/skybox5.png -UwNEZrEaG9X8VyeE95ZmKzzHhVK9ZCo4iKZWnzMDQw4= share/snis/solarsystems/zolon/p012.png -HC1NCJaJO39nfr66mqR/k5WrtqVYAHL1lOdGzZrsF8k= share/snis/solarsystems/zolon/Attribution.txt -u3S3jNMGs7uMmNzyOhnj6bP/AIgKaHQfrgUy+JtcMzg= share/snis/solarsystems/zolon/p65.png -ZdQ0KPE61oNj2RuFR/JMIKX9FL+wmmq4GEMZzmfOwhI= share/snis/solarsystems/zolon/p64.png -hqIaSYp1nZF4K3u69O06AF+yAn5hesDbilzde3eOSIQ= share/snis/solarsystems/zolon/p24.png -AjmPDQPSCR+z+32ZvfHITVLxEhfer2V+0C+aTyMDZbY= share/snis/solarsystems/zolon/p3-normalmap5.png -QyAVTD71r5W6DFZKSMBQkV/pBfpEzB/8k1Scp04K+zY= share/snis/solarsystems/zolon/p50.png -nu3SQROyOZn744vgUefRw3Oi86qADVm4V7JqI0TmanQ= share/snis/solarsystems/zolon/e10.png -BrEm/kf5Ear4DNVvu6N3dTMFy7rHy3XTJDoaLqL8mQo= share/snis/solarsystems/zolon/p014.png -dX6zkx3PrG0apVP1CFCy4KcMyc1D2l2Fg6TxLL43OqE= share/snis/solarsystems/zolon/p011.png -eXgbTz66XXXxIZ64Z6A+HduuUZXKawjhuaMGcxl6IWQ= share/snis/solarsystems/zolon/e15.png -VSmivKXuN1Aq5cBNtZkmTcm4N53KGn2/kdj+BGFoH6M= share/snis/solarsystems/zolon/p53.png -7z8NcIHYOhIZzp6VEJ+mJPsUozlMrqdUM2t7qHKmBfk= share/snis/solarsystems/zolon/p3-normalmap2.png -L0Y8iAZoJdLejrZOgl4HPJOxRUtVpEqXKWNrfuS0J60= share/snis/solarsystems/zolon/p3-normalmap1.png -4/Xxz7rvtNX6zd7XCu2NjzZg4nQuYCgGroTJCdUXqJE= share/snis/solarsystems/zolon/e1-normalmap3.png -GxO2tUU4jf7CF3dMKDNJCJSzvFcagO9VGAy3hJ7Q2Ug= share/snis/solarsystems/zolon/assets.txt -iFCYvHqjYpl/LODnJHcFH2w8eG8lXwkTMepaaKEP/uw= share/snis/solarsystems/zolon/skybox0.png -0HR0TKmJSMndKEjWGw8jykahzwVMFXiJcQ8CvbMZZTQ= share/snis/solarsystems/zolon/p61.png -yV8kSM9mWev/Dh96Iu3jbXGQIj1NOesR+f2NSV2/Zzc= share/snis/solarsystems/zolon/p33.png -CP511Wcv68tIBiuqnNTM3wmEZHhlKNm19lyS2WkTKz8= share/snis/solarsystems/zolon/p34.png -Rh/uMBBk5RtbbB5arHlTd4ZmbbKjmzBNVFzvrvn9KMM= share/snis/solarsystems/zolon/skybox1.png -e8RPc4RZTEcczhoeRSrrjTHFzuLeJ4RHWH0/bv+7l88= share/snis/solarsystems/zolon/e1-normalmap0.png -QE6fRspyXXw5iG1j/xV+rVkya9F24sttV0bHJtda/Jk= share/snis/solarsystems/zolon/e1-normalmap4.png -CqIOPO7ELMmh5U/ulb1znkL/4qmnb6rcRjTc12rKfgU= share/snis/solarsystems/zolon/p35.png -2o86QuhI/CtDBXcCF0fm1r4CtKb+Ri/Zs7TWAbURltU= share/snis/solarsystems/zolon/p63.png -KrNWfrpklVxXqBJePdKCEioQiHMwGgOzgcptFD53ECI= share/snis/solarsystems/zolon/p25.png -gVjWgNp69yd7chjDa8y4Y1rwI5iYCieTYnYAXOlDzdg= share/snis/solarsystems/zolon/p55.png -pqR0ZfDPrwuLe6rPObo5gE74UBTXGRIXGl6rw6EzADY= share/snis/solarsystems/zolon/skybox3.png -qicxB/X/ERyWCQVAYZeP1TWCitHs6NmIVxDZouBlAGk= share/snis/solarsystems/zolon/p21.png -qUGExE3srvvIv7FQeUbX5T+IiHSBnB7kXArmg2PCv20= share/snis/solarsystems/zaurno/planetx4.png -r5mQPyTyjUnC4xVMukbunYbBdNDH8QRXxw0T/WvOGR8= share/snis/solarsystems/zaurno/rustyplanet-normalmap3.png -x33aVFuYXOjZr+bj+CDTTwSVXEsjamsEQGzjJCdAqfs= share/snis/solarsystems/zaurno/rustyplanet0.png -qtRGWcoWSKQLix9KiSha6MSNr48I+s/9wxV5jLwA4oI= share/snis/solarsystems/zaurno/blueplanet21.png -bVG7NtkyqWr64mAVxZAo6dsBkBmGat+YF+MyOoMedhY= share/snis/solarsystems/zaurno/planetx-normalmap4.png -GuYtK+QiGtdsbPq1vCiX2+fzfUGarr9hs58wgayHOmk= share/snis/solarsystems/zaurno/eplanet-with-clouds-3.png -fgSUV8N5uQ/SA74U/wM/flQvPvnsTxZUb7O0PEDCgZY= share/snis/solarsystems/zaurno/blue-planet22.png -zpz/hXjC3wkDltH2uwPGULtEi/M7htTxW+8kK9zKhhM= share/snis/solarsystems/zaurno/blueplanet24.png -rIHzD0vOiLuI2GuEnVU9UELQBlt4Fy+oFzJToJNAIuI= share/snis/solarsystems/zaurno/green-planet21.png -tYtr38t3R15KX+Zx3h4heh3jL2HGWTqXFApcEDUpziI= share/snis/solarsystems/zaurno/rustyplanet-normalmap5.png -FVmNDB6ejTWwevd23iA3PLg8ksBFW5i3jvAHzMlfNuw= share/snis/solarsystems/zaurno/rustyplanet4.png -c1V/CyfQ2+7xzsIubaSlpAD9TEihnbxTSP/iCkkRLjo= share/snis/solarsystems/zaurno/blue-planet24.png -eF+kzNCtcYuJ/ynfEF12y2qbUJZx8KLlN7YTxo1XOc8= share/snis/solarsystems/zaurno/purpleplanet22.png -QRDnG3PEBejVHRJvO2YXGQIBGq3aW1lcg6Y1/fMD9/8= share/snis/solarsystems/zaurno/eplanet-normalmap-masked3.png -mgEzfAiH8Z+jxT8JnW4DKeMU3+ry0MaSSebrV26IOTA= share/snis/solarsystems/zaurno/planetx3.png -V9mK/oH2+a+Bq4bWhh2hJSdn03pO1SX4qz4C9Shw2bw= share/snis/solarsystems/zaurno/eplanet-with-clouds-5.png -tYtr38t3R15KX+Zx3h4heh3jL2HGWTqXFApcEDUpziI= share/snis/solarsystems/zaurno/planetx-normalmap5.png -Q/4RpA6oIdTX+cEfpDnwtriO3GTMzk0xuMM8i4Kp7+8= share/snis/solarsystems/zaurno/blueplanet23.png -W8MKskwHORQtP/UaOoT+7DLZIJDRasQs7i1m4dlWoug= share/snis/solarsystems/zaurno/skybox2.png -pwwkU8wttRHLhCNB0xQyWzsvkNrdvXJyQCBqtOASffA= share/snis/solarsystems/zaurno/blueplanet25.png -Alu9xtYT9W+HnGxcavenrd39+14pbZNkQscytg6jWKs= share/snis/solarsystems/zaurno/skybox4.png -ETZC9jOUvc5LiLQ0oQlh7gh7XFaFL0SpyppwCf5mJuk= share/snis/solarsystems/zaurno/rustyplanet2.png -OWF44jjgPIhbSkBW+ifeSiNlLU2V3+ZiZ4PKsgPjjb0= share/snis/solarsystems/zaurno/green-planet22.png -sNaxfrTvk3UeocBWDf4LVjlEDXLwEXMfd0HMcqzI104= share/snis/solarsystems/zaurno/planetx-normalmap2.png -fO9JRdr2ZFJtmdhDQcGQs4Jv6hEanwslFXWQD3ddYqo= share/snis/solarsystems/zaurno/planetx1.png -v4MDx2rG3FSh6fPTu2MzmlzCduDDeqY5c4d1kfZvzN0= share/snis/solarsystems/zaurno/eplanet-normalmap-masked1.png -VNL3xiEsVIUUR501DKjYIM9NCdPNL58oKahSSmJav0o= share/snis/solarsystems/zaurno/green-planet24.png -PKGIYxmb8A2/mh9Mxi5Op2Hup+5Q5/KarlQEC6Kj4UE= share/snis/solarsystems/zaurno/eplanet-with-clouds-2.png -cRxilkV9X1xXn0UmiWuVSvf7fNuXpEi/km211AB4nWI= share/snis/solarsystems/zaurno/eplanet-normalmap-masked0.png -Ay7Nn5zSsKbWbRgeqVvsMLC0vguTW3GfufFn0QP5PY4= share/snis/solarsystems/zaurno/planetx0.png -juX/RJ5L+Vr+n1L37ixC0rBDBawDWGCnnZ0D2NgSgEc= share/snis/solarsystems/zaurno/green-planet20.png -+ZMGxjBfuwGbF4rwIabZXouvN89jw2pJsoZ/JJOGBI8= share/snis/solarsystems/zaurno/skybox5.png -yqbi0dTnAIYx2d9XUWZDDrYl3sP4FcfUX1sjkQRpVxY= share/snis/solarsystems/zaurno/green-planet2.png -FuutGNlvZ7J8/6yo4imN5dPISZB0iq5mo3FxzrIFQBg= share/snis/solarsystems/zaurno/eplanet-normalmap-masked2.png -VAB5VLGLv4pHbcXPSTwF6/biawlHsh3s56fIYkYofSc= share/snis/solarsystems/zaurno/planetx-normalmap1.png -Yr3d7WehefaFEM7YKB5TL3Sg8JuHu7abkEM4gwXZ4V4= share/snis/solarsystems/zaurno/purpleplanet23.png -NXOoyEYyfCpHo8KK933CsuSgypwUSYwNIWoe/vPx70g= share/snis/solarsystems/zaurno/blue-planet21.png -AKBqxRC0o+M28L7G3cQuib7+aQiEiUTFKerb1pHoZdU= share/snis/solarsystems/zaurno/purpleplanet20.png -CB+MvvkyDJH66fQUJCXSXmr9qWrZYO9Wm7Z4u3pImuM= share/snis/solarsystems/zaurno/blueplanet20.png -bVn0PZHqYqKH0Md7zBtYZEMP+4VWWEGYEKZ/lOI2jWw= share/snis/solarsystems/zaurno/Attribution.txt -sNaxfrTvk3UeocBWDf4LVjlEDXLwEXMfd0HMcqzI104= share/snis/solarsystems/zaurno/rustyplanet-normalmap2.png -zNu4ac+NJ11uZWxFUGqS1skiWIRQhSSsMYBG1xs+Eak= share/snis/solarsystems/zaurno/blue-planet23.png -GAQL5XP1eH1Ngv3vRDDMqmWCJ7kFiMrd//7NA8HnTuM= share/snis/solarsystems/zaurno/rustyplanet-normalmap0.png -VCIyMe8MW5LnxXBhLwmZBc4z2gscUjonDbYwTiA1pSQ= share/snis/solarsystems/zaurno/blue-planet25.png -G9qsbvwDqQ446m2Xl2SsLzQsJ3ppnMHbw6y/GhEXHZw= share/snis/solarsystems/zaurno/blue-planet20.png -n7dLBIYvD649WRxRbQlvZs5pSQUJLbECwYZ7U8eRnN8= share/snis/solarsystems/zaurno/eplanet-normalmap-masked4.png -VAB5VLGLv4pHbcXPSTwF6/biawlHsh3s56fIYkYofSc= share/snis/solarsystems/zaurno/rustyplanet-normalmap1.png -Ao4cWPX1u4gARf6Ux5CEpx+rlNjzWdW3trsVfB6vLa0= share/snis/solarsystems/zaurno/eplanet-normalmap-masked5.png -3xIbtf8CqbAku0yId4OwDZDwbJFZaP/xj0qdzfngfXk= share/snis/solarsystems/zaurno/planetx2.png -pigv1/HBbULhBPZGHyCqKgFW6OLqkh5GHwsQTbRrBYE= share/snis/solarsystems/zaurno/assets.txt -8G3yQMTr2ljatAbpTSDW5Eo5biUfw8HhfxnbzYOu3Ug= share/snis/solarsystems/zaurno/skybox0.png -OTWLNbPt08nczBE+Le6LleTaqm1DY0e5yzzszPe/HI8= share/snis/solarsystems/zaurno/rustyplanet3.png -ZYrTbkHiAs7LGGtD7vlxY+/phGr1EBfIFz7AyoBrRMg= share/snis/solarsystems/zaurno/rustyplanet1.png -9sHTLZNMTSOejmvNXUeRW2I866mX2kj87uegXQsENHk= share/snis/solarsystems/zaurno/planetx5.png -n4RyZtk5J6Abr6Cf7fcRszKbG1hExxIql+O0K/LFoxU= share/snis/solarsystems/zaurno/purpleplanet24.png -bVG7NtkyqWr64mAVxZAo6dsBkBmGat+YF+MyOoMedhY= share/snis/solarsystems/zaurno/rustyplanet-normalmap4.png -r5mQPyTyjUnC4xVMukbunYbBdNDH8QRXxw0T/WvOGR8= share/snis/solarsystems/zaurno/planetx-normalmap3.png -gVsulMCOnqkjzv3dxkRMXDY8G8LQwjxi0Yw5wCQaTqs= share/snis/solarsystems/zaurno/eplanet-with-clouds-4.png -KQqP0nX9PO1KM+OC8lSn8/x89JEd2OAzCXROGE9sxow= share/snis/solarsystems/zaurno/skybox1.png -d652OsBsI/l9woHkKsTJlsTT6v2LjFb7SEb3v7dWfwA= share/snis/solarsystems/zaurno/eplanet-with-clouds-0.png -8nkAtwZ/pujSppKi5ecTetsJbO3TaueoJSsisl5WR04= share/snis/solarsystems/zaurno/purpleplanet25.png -GAQL5XP1eH1Ngv3vRDDMqmWCJ7kFiMrd//7NA8HnTuM= share/snis/solarsystems/zaurno/planetx-normalmap0.png -i8nUMFG7u+wvJW3ojPjEwIndDmv8+oBBp/T9XumLzyU= share/snis/solarsystems/zaurno/blueplanet22.png -TUbTrWVJPH2gNEnOPVS0oI55TBM+nVbmfagQlOZnmcI= share/snis/solarsystems/zaurno/eplanet-with-clouds-1.png -hEn0fkaK496Zf4ubtRifJ1VYwQTVfG+8nIpTNxb3JwQ= share/snis/solarsystems/zaurno/rustyplanet5.png -gqnO96sSyoZj/p1Bl2BCvLcaGLsPPFhCrcFe89sVWzc= share/snis/solarsystems/zaurno/purpleplanet21.png -HixBGDr7SMvgvOOJ7nsdXraYaSdwe30U/VYAwuwfW9M= share/snis/solarsystems/zaurno/green-planet23.png -TyLru2RLAR6XD4w0Wyc2+1FV2RsFa+HD+zMbhjFxIUM= share/snis/solarsystems/zaurno/green-planet25.png -N01r8nUusMlrRP2kJ2ljx9wHHRnCcQARulvR8IozSxI= share/snis/solarsystems/zaurno/zaurno.png -tnAAF5HEcUYQ9ZLnQm349t6LsF3aqYpiQ8ywuyyccGk= share/snis/solarsystems/zaurno/skybox3.png -VAB5VLGLv4pHbcXPSTwF6/biawlHsh3s56fIYkYofSc= share/snis/solarsystems/default/dorjna-normalmap1.png -sIXr0Bj4VfkmueCi99V+Cyu2DcJDX0JTjVMxHlDbRfI= share/snis/solarsystems/default/dorjna4.png -5KJIuBAE1QM6JKI5p8lL0tkZdSGzTX5OTnFdnvY2BqQ= share/snis/solarsystems/default/doobion-with-clouds-4.png -9yvHoWDCYr71kgS/JVe0dl0tTcnJHwmLcPyRXWT4m1c= share/snis/solarsystems/default/dorjna0.png -zO6CzsXEQQhnddEF+C7wWaEs8OUgU8t5vr1FFv2PjAs= share/snis/solarsystems/default/dorjna5.png -nwohqXZFyDjM4WhmYyCDHX3A7h9XrQv52o2uEfNDd+Q= share/snis/solarsystems/default/doobion-normalmap-masked5.png -k7+yV4PTzTLAgencwzTVmA+l/sH8wnpoYIQZyOlA0BE= share/snis/solarsystems/default/doobion-normalmap-masked3.png -GAQL5XP1eH1Ngv3vRDDMqmWCJ7kFiMrd//7NA8HnTuM= share/snis/solarsystems/default/dorjna-normalmap0.png -r5mQPyTyjUnC4xVMukbunYbBdNDH8QRXxw0T/WvOGR8= share/snis/solarsystems/default/dorjna-normalmap3.png -zjyld77VeakgNxjsP5QMvTQRKGQW7WHvmC0n998+LLc= share/snis/solarsystems/default/dorjna2.png -c3ONINYNvRueU4fQ11YVhwuczEvnHR4ojywOjqj/sio= share/snis/solarsystems/default/Attribution.txt -7uIMMaCaxtTrcdpn7OC7b7thjVI4DcIcdMazlFULqvE= share/snis/solarsystems/default/doobion-with-clouds-3.png -xamy7rEb/miCg5YkYWq1xlrcStBTni6udNE8UEptKwM= share/snis/solarsystems/default/doobion-normalmap-masked0.png -Rw5vvnELq7zQfee0TQGH2VpwOVzLtenoVT9ce7aN2pM= share/snis/solarsystems/default/doobion-with-clouds-1.png -p6TqlUk2CQgcQ61dc2NyqvHb4musgcmeuA7TaZJ8YqY= share/snis/solarsystems/default/doobion-with-clouds-2.png -tYtr38t3R15KX+Zx3h4heh3jL2HGWTqXFApcEDUpziI= share/snis/solarsystems/default/dorjna-normalmap5.png -6IDBbqRLs2EDcYhiyCcYAY0Qc+gbuoflCipyrIU5Zgg= share/snis/solarsystems/default/doobion-normalmap-masked1.png -tsDC31yeqLRdhwimLmfSvC+CwRxQc3xhCpKrk0vGN24= share/snis/solarsystems/default/dorjna1.png -UyBlhUkxDMo/I1U0NBMopuARzwFzeMG7H2WSu+eV6Vs= share/snis/solarsystems/default/doobion-normalmap-masked4.png -sNaxfrTvk3UeocBWDf4LVjlEDXLwEXMfd0HMcqzI104= share/snis/solarsystems/default/dorjna-normalmap2.png -8OSKN0W/qMsVt+WnovWMQG8PB7sizZ/bVCqZP/R/b3o= share/snis/solarsystems/default/dorjna3.png -H6Gy4m8U5jF6xUylI/9luYMSJww9T+l5xYcD0seVgY4= share/snis/solarsystems/default/doobion-with-clouds-5.png -bVG7NtkyqWr64mAVxZAo6dsBkBmGat+YF+MyOoMedhY= share/snis/solarsystems/default/dorjna-normalmap4.png -xUqXbIomxf0Aa/WBuugG8AUPSu8C0wLMXO6ula59UlQ= share/snis/solarsystems/default/doobion-normalmap-masked2.png -DSPYnoHjPQMAahf6IM0ecH+u8lA+/T3etenKBUVq050= share/snis/solarsystems/default/doobion-with-clouds-0.png -FAMy4WIyKLVcQuIIYuArdZk8E3n7Og4KwtPlUOreQT4= share/snis/solarsystems/sirius/hedas-normal1.png -HYzl8w3bgbZaGce2EWJ//6bYWT3vnFBuuCUg/N3PM/I= share/snis/solarsystems/sirius/hedas5.png -VnZDvtQTbhQ7JQHDdxXHkzVaexgoOPFQfM6++aEd1uA= share/snis/solarsystems/sirius/hedas2.png -/Vjv29yT47sXGrMrt07DMpqxjCqA2xDmhMKysQCnfdw= share/snis/solarsystems/sirius/kadar0.png -hTLzcczwDwuC6LIJriOjszzxjDdeOSZfAbmE4XiXGP8= share/snis/solarsystems/sirius/kadar4.png -LcdL7SKjZDz98Px+X7ZRJbI1qZdWY0dKNcSf4MYux40= share/snis/solarsystems/sirius/corealto0.png -aEd4aergJW9VlRvbncaLbMbyN6TsftLFLKH9yXCLCj4= share/snis/solarsystems/sirius/zukon5.png -/1hdDuZhP9BoiTYyTtRs1/h8sSBOWrYydEAnrgXvohQ= share/snis/solarsystems/sirius/sun.png -2WXEu6aMY7u7OLzTVEXTU1LRWhAB/SAlw94Vn+cKzD0= share/snis/solarsystems/sirius/ourck-with-clouds-4.png -ebF5ex1gi6+Pr3qDp76zQY0yf+F5nRdBsmmwvotKtq0= share/snis/solarsystems/sirius/greenhaze5.png -oWC/wCmxpTNP/9tohpojGDViEufcrNWZMCpGgKSXpl4= share/snis/solarsystems/sirius/hedas-normal4.png -WqMJMjwIkO0lrj8U/wlBanrFhkpGoHNtfax8P6kcQfA= share/snis/solarsystems/sirius/corealto1.png -jFxrrOLlIFvqA9RIeGM596Hflgot/UaJmwLi4HwbR90= share/snis/solarsystems/sirius/ourck-with-clouds-5.png -3Hd+/FQUzcHjXmtd4lmW5usRTuMDY5qoy9GdHJIqOZs= share/snis/solarsystems/sirius/corealto2.png -fJcSWL0wQOxovlD6cOKS/eIQ8YJVy27hr28UXK4aNaM= share/snis/solarsystems/sirius/corealto4.png -v/m3G2kd11bo/Q+KJGiXlj9BdFWH1o1LNKjTGNjhni4= share/snis/solarsystems/sirius/greenhaze3.png -2qNUcfu3rrGmouw2J021pke3CFLVRTPM+xSoiy+J0FY= share/snis/solarsystems/sirius/vorloxx1.png -bSpKmVOFBUDAcE/OEZIi2+glsLqW865UgS4xBSL8KjQ= share/snis/solarsystems/sirius/kadar3.png -VduM1PTe3LRT9oSKFoaQHMzFRKx2sHofcVW3awA7HKk= share/snis/solarsystems/sirius/greenhaze2.png -j8s01LQ5hrhqtm3OpuguusGd1iR7lB+yJHmgujEIn98= share/snis/solarsystems/sirius/corealto5.png -kVx6rVDuLywLCM8gXJRgEaFSW5ZoldJESdBVQkzbd+Q= share/snis/solarsystems/sirius/corealto3.png -ApYBrbMNPtUC5yshGeqJgGig02eGqN9DHjaUUNB0G1k= share/snis/solarsystems/sirius/ourck-with-clouds-3.png -HOrHbDAAopA3wLoQm2+Bbxub9s2dbfeB0QYVggyM3TQ= share/snis/solarsystems/sirius/hedas0.png -b7cvV9/6vK5fyHu5DWeZNR2IuyexvNZLLozioD1FKFk= share/snis/solarsystems/sirius/hedas-normal5.png -Eqm+1LPTBJYcnfCAhLw1Qo1Pje6UFHurUhYlnAtQ9rE= share/snis/solarsystems/sirius/kadar1.png -Xt7GRzMaXaTqXWLq7jtnxtowiUSER2Uft72h0h+yv7Q= share/snis/solarsystems/sirius/hedas1.png -zjGjVCQkMP0lfx3SYH2oeqNDJPGCExFSmMsrqrZC6Jc= share/snis/solarsystems/sirius/ourck-with-clouds-2.png -7pbF7oWOvkMLMughk4PDUUcrJ/UBE/1ajyVamLJ//Po= share/snis/solarsystems/sirius/vorloxx2.png -rKqNFsPmghfA6aNU/24EQACr2vq7tSgewvDY1n+V/eg= share/snis/solarsystems/sirius/Attribution.txt -u2NtWoyYZ4aDbKdqQfUawMQ4i9xhFmsL7bQJw05FBG0= share/snis/solarsystems/sirius/zukon0.png -/2B5NKM7TdpqwGLutEd4t26bzNw3aX6OZ/8/IUVjgJs= share/snis/solarsystems/sirius/zukon3.png -d2O/P1s7HZk/L33BcB1rL5w4/loz8c7mfOcLPP2JONQ= share/snis/solarsystems/sirius/greenhaze4.png -KgVhir+0buTtrUmTea48i8NaLeJ/IytovxVJFcUqJLs= share/snis/solarsystems/sirius/hedas4.png -4becAyUHYeGshvGvbeuSFOrt6jl2O9+RS7Wy92xjL64= share/snis/solarsystems/sirius/greenhaze1.png -hEI0dp/7CDIpP/JGNPy3ib1bMvF2bF/9pw0BpyxY46g= share/snis/solarsystems/sirius/assets.txt -5D0AfPTDRcgt3HqkWgE9vOVSd1KVeNTA0XcF3Hiv1Qc= share/snis/solarsystems/sirius/kadar5.png -4giKwYbDgQqAIW+wRaQm0PbfIpi2VsEMAH7qke0P5ic= share/snis/solarsystems/sirius/hedas-normal2.png -rkgVlAL6bFFbOzXsB16BrSzKc4EkcuOjv2FgvgIwIBo= share/snis/solarsystems/sirius/zukon4.png -35jmZnOzC8myHLR/tiWhaxPQqlsnpkCpT4GDJAeoYdQ= share/snis/solarsystems/sirius/zukon1.png -20GYo3frFjE1tMXNtzfAdXOZX67jDcYUk7N+CgnWxKA= share/snis/solarsystems/sirius/vorloxx3.png -ZqtblU2UEq2XVmFeQv+fx31w9ePUbc1++U8a26XaQqg= share/snis/solarsystems/sirius/ourck-with-clouds-1.png -KP31+2Wh4E1J6wSiPbvxDqG212QoYZyF/sN5pnMypRs= share/snis/solarsystems/sirius/zukon2.png -NMJA3wZh2jS+QZYpgvBGgv5vLgqbRk7cHel5/K2x/qQ= share/snis/solarsystems/sirius/hedas-normal0.png -OLZBmMS6AAuKXrvj5JqP7O+da3JazfLDDJGts6tWpu8= share/snis/solarsystems/sirius/greenhaze0.png -jvdgIwPyS187U392KjKujMfaRY7Rwf8EampqZ9COh/U= share/snis/solarsystems/sirius/ourck-with-clouds-0.png -lGvRL9acky+8DyOuMLDQ4Ilt4389ihSPlHjE34Vgw2M= share/snis/solarsystems/sirius/vorloxx0.png -+jGXPd3L1U+pTPj1TInZbMaAeomvsJlgkT+qeWZwBXg= share/snis/solarsystems/sirius/vorloxx5.png -96S107ZhXChmMJCMsU+WsVM2BBSgmEfJp9WRl/eTDqY= share/snis/solarsystems/sirius/hedas-normal3.png -GJpeF5TnySNxXeYHdjhV64MeO9FbyxxH2IfAgw1yyVA= share/snis/solarsystems/sirius/vorloxx4.png -ZZJevH4WlEaFW2K7fiHlZaOKUSDOVxzie8okz9X5r/E= share/snis/solarsystems/sirius/hedas3.png -XeBQUaNINp+mNOe96dHC9LJEwpspvA//KaTuoo2HwfE= share/snis/solarsystems/sirius/kadar2.png -45kNBDay9iflwV5ZJMidr05Z1B8Og3d6GQpyi7V1/Os= share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-2.png -J+8gHsNquDS/TBHOr/tWqBLFnipaYPJeVq+jSgOGFtI= share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-1.png -qTWQrRPCAj2QiKxZ8T5y77lVkBmSMvZaV840T5nIj0I= share/snis/solarsystems/varco/rocky1-rgb-3.png -aig7metG82KALgB65zs9cqr4Jf1vjtPQd4xR+abgz2Y= share/snis/solarsystems/varco/earthlike2-normalmap-rgb-1.png -iE7g2ycanvRlGSzn8bKIZ2qw/emZyKfHwFT5dVRVxvo= share/snis/solarsystems/varco/rocky2-rgb-3.png -iCXdBH1kbTej3LSYEFgvoeT4kC5oGxnCTQc9V0MMn28= share/snis/solarsystems/varco/rocky1-rgb-1.png -OL5IpXvvudBstbfIeXf4ayoUDwzLP/1fJ20zV4dCgW4= share/snis/solarsystems/varco/rocky2-rgb-2.png -DiPXSd/PxqGiykJYTN72CwIlgU1AJAR94oS1L5UUc/0= share/snis/solarsystems/varco/rocky1-normalmap-rgb-1.png -IbwHIOoPVY50TGK89ZC4r7urFn9RK05epPjy0N7TDKk= share/snis/solarsystems/varco/earthlike1-normalmap-rgb-5.png -EElmDoBRdnQ74CYYnjYgftBdf6+pfwuTIWdXUK/poaE= share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-5.png -bPBP53VR2DWLuc6tphFv9iRyUxOu+VkKRNCOwzyH9zs= share/snis/solarsystems/varco/rocky2-rgb-4.png -ebJsQQwlTddriqbEr3HxnbQQlhXuQfd6bYZJ2hZw+DI= share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-0.png -zhloJokjnL69H2P3s6KuHBIB4GukFLAtNzFHxt2IqkY= share/snis/solarsystems/varco/gasgiant2-rgb-2.png -GxyRwRguF9IzY28DKS6dYlTh/DLm5ka0Cwg/nZwzqWE= share/snis/solarsystems/varco/rocky1-normalmap-rgb-3.png -+jONm1AIkMov5YCwyhRhjazT7VCpzt/UG3fLclwiUX8= share/snis/solarsystems/varco/gasgiant2-rgb-5.png -tYNgF2nz7BXK8ePEQreK7wJ4VqB66fExCvZh6QmMbf0= share/snis/solarsystems/varco/rocky2-normalmap-rgb-2.png -NwGEBxalgracq4y8qVohziZc/C6wup79+qFH41RDwdU= share/snis/solarsystems/varco/earthlike2-normalmap-rgb-4.png -GDDm6l7PiTMR9oSzyAQ8RUJKIf+KSf78ZiWPoa9geUE= share/snis/solarsystems/varco/rocky2-normalmap-rgb-1.png -tmpC6S/HMDtFUkAAJupnuo/D4Rm8datqzi5brhEonC8= share/snis/solarsystems/varco/skybox2.png -JEL/QGY4XeJlWOiPnMNM70kq0RDlkUSzbYvd8/CVve4= share/snis/solarsystems/varco/rocky1-rgb-5.png -dY1xG/oJexnnnohp4jcZtHNPfVtV04M8CQ5HDWOkoHQ= share/snis/solarsystems/varco/earthlike2-normalmap-rgb-2.png -qJGGUbEAdmsZv729EkGlio67QEBvzlpfPMUHvQireHw= share/snis/solarsystems/varco/skybox4.png -9x0mSj/Hrt58utVWTJMxrbEx13jG6G/VYLuOcjJECys= share/snis/solarsystems/varco/rocky2-normalmap-rgb-5.png -5ZuqshgZ8RUTllah/pbPeLLr5GY63am8gJqBxOQhzrE= share/snis/solarsystems/varco/gasgiant2-rgb-0.png -5WCIzB4JeSClLCYd6sj3MICNXVZ0IcIsbTqbZNC8188= share/snis/solarsystems/varco/earthlike1-normalmap-rgb-0.png -/cX3f5Mp2JeuXgHt3Go9OlfkdZLJeeL2ImZ+sL0n4vk= share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-5.png -/ZElOlR6oUJWi23MTH68pTAG4r2WQu6bmaFvlqXx4RI= share/snis/solarsystems/varco/earthlike2-normalmap-rgb-5.png -iqdyiT4tMbzDBp0vneccU+G6lpWOKPJzjoxH8qiQxjo= share/snis/solarsystems/varco/earthlike2-normalmap-rgb-0.png -tuCrg2Vt7VgnJlrvTwEoMSlw2vVr71aDabuaXjEjt8M= share/snis/solarsystems/varco/rocky1-normalmap-rgb-5.png -4KowrbPo46fcxXEXk4hzyB1EfuApgxTieYPCM2CaqzI= share/snis/solarsystems/varco/skybox5.png -0VD5iTGUFQuB5qShWUr4+dSatY8K8taF3yIwB/E86ew= share/snis/solarsystems/varco/earthlike1-normalmap-rgb-2.png -FOUi83ck5URgBeYbMcVqZnQ6KoCDR9ogtlKflyV4Uqo= share/snis/solarsystems/varco/rocky1-rgb-4.png -2eJ8YB8sBTgIYOH56sOwxS09phwjjKH7q8rnmgDKv2A= share/snis/solarsystems/varco/earthlike1-normalmap-rgb-4.png -k0M7y3TOmKF9wBa2xHmzm0+Odl5qOkJFIcq0CEw2JBo= share/snis/solarsystems/varco/cyansun.png -avIQ9AmsfvIFa+CeUAoVwMf0XVFEQEHhLcKQKaZfQq0= share/snis/solarsystems/varco/gasgiant1-rgb-2.png -ZGmm07cAWnab6YNI4804xKa1uhtanPWJhLSYUCKdnB0= share/snis/solarsystems/varco/rocky2-normalmap-rgb-4.png -0HYgrYu4GZz1twT3MQuIFLAAX1N5MsDoDUIhygtzITs= share/snis/solarsystems/varco/Attribution.txt -+QtWehf6QEbGOdCwxoRijW0N13vMhZr5+mg/UjVQfXI= share/snis/solarsystems/varco/rocky1-rgb-2.png -tqQibk3qJ9DLFT2fommVsShJZ6ZU/In0yn/E5vEzVjg= share/snis/solarsystems/varco/rocky2-rgb-1.png -tk4v4ML5qS9PsMdBxfRkGDzl6VHeu7nqyZ9WDkRhQgM= share/snis/solarsystems/varco/rocky1-rgb-0.png -fdvOUX5NSBAC0N6UhBM80KwSq7PqT57TDXrDjGniq04= share/snis/solarsystems/varco/rocky1-normalmap-rgb-0.png -CMhKXNM86d0uxrGMkbOV/XCYhldzfJXXLkhvwZ/oRQw= share/snis/solarsystems/varco/rocky1-normalmap-rgb-4.png -B4/x5htXm734f42CY7b1w6aA4EdG86r4aAV93u1ioH0= share/snis/solarsystems/varco/gasgiant2-rgb-4.png -PE+3P2LmEJKrcfRsiS3PaHoUobPV2v/FBjCsYoTERnI= share/snis/solarsystems/varco/gasgiant1-rgb-4.png -D/Uogk3SsiSCf4PzIim5qjgOfSgW7M9w4enpRPv/PxU= share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-3.png -x9E/9JHenQOXmYEDAmzxBXY0Y7MMK0hCKaKLuSlbJwA= share/snis/solarsystems/varco/rocky2-rgb-5.png -nqBawbQrLij82Y7ngpFeNAbSAr78s3kg9nqm7RcCq9U= share/snis/solarsystems/varco/assets.txt -Ho92BAcS3dnxajTd7+10N/r2i0FsPCAqik70c0JOT1c= share/snis/solarsystems/varco/skybox0.png -+WtUZCl+eRckhs1aN1+SRGyKbusip793IQMrZPSwHiw= share/snis/solarsystems/varco/gasgiant1-rgb-3.png -y25+up8Oqh7mlBGP2X3mdvZCc+8O7StgrtxO1+MFC64= share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-0.png -bp1+7ihRZpoukBNHF6sAcfY3EdIXeJPYIOedSma2qU0= share/snis/solarsystems/varco/earthlike1-normalmap-rgb-3.png -kbF82UuRkOVa7vUF3WqLJbyNNed8z//cTn/u5hz+2k0= share/snis/solarsystems/varco/rocky2-normalmap-rgb-0.png -ROpzG2+NRxKYQvNu6oVk6/LZEhLjsqk1YabklQXD8oI= share/snis/solarsystems/varco/gasgiant2-rgb-3.png -3R4ZX8Lj152xkDnH/xTnRq5CWrv7EvRUnF2Ju7ZSJB4= share/snis/solarsystems/varco/rocky1-normalmap-rgb-2.png -Cg/yGwXLLFSeD+TjKBaDErt/vA8KH9fCLcm1/5MhsJE= share/snis/solarsystems/varco/earthlike1-normalmap-rgb-1.png -DNqrIZym09ahYmh8lYSPZ62fqm4jXcsupOZkVp71ks8= share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-2.png -BGxt7lC1xQCdF4RA308rt8BBZa1klNbIgQrE1GQ+30Q= share/snis/solarsystems/varco/skybox1.png -hiQd0EMWTTL3tqoxd1CA4WOSAAUZwIeLqLPQZ4J1NF0= share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-4.png -qbjV/XbwRyz3/60c1zRGuZIJrt+W0TBkiwjjQ18g5Vo= share/snis/solarsystems/varco/gasgiant1-rgb-5.png -TFAQKo5AO089kIPgD1TC7Oq1re5kIbaugMNr1kv268k= share/snis/solarsystems/varco/earthlike2-normalmap-rgb-3.png -+8ZY/UHbNxBYdMdNVv6dgXi4zN8onGkNeFR18rjeb6k= share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-4.png -hIeMJEvU8QS62m5bZxtWDU/DGKKIBzz5XhmO7e9JzIw= share/snis/solarsystems/varco/gasgiant2-rgb-1.png -VA1xIe2MfpKlk0sq46Ku+WBBwXyzyVy7dnXWPHPRL30= share/snis/solarsystems/varco/gasgiant1-rgb-1.png -JBfcPnjAjipuvh8fmPREAoXjrLT8PUwEW8uzPy16qo4= share/snis/solarsystems/varco/gasgiant1-rgb-0.png -sLJOdLCg/WKqhYr+xP49WGVB+MzTI1VLGSMTQKbLBgw= share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-3.png -1Mm3XBhOG3rwO3/zitFDXQEQp33ITKV4IgkaeSTHKqM= share/snis/solarsystems/varco/skybox3.png -vr8X76f5YDEAbfA0UgnXvEP3oAOx31h6XQnSDGV0g6w= share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-1.png -yCBh2pxU+wOHaDKWzW6Elk1WDZSAALhWi2NFNyNCgU4= share/snis/solarsystems/varco/rocky2-rgb-0.png -AfjOAN/53eI1+Sl218R1jRE4CGJpvsS0XI/Im6Rxigc= share/snis/solarsystems/varco/rocky2-normalmap-rgb-3.png -iwtnl97wonMty289zCdlXtm73XFG9YYtXS+kbAk3mQA= share/snis/solarsystems/polaris/albara1.png -oDrUBGPPAKZ3ow6ZFXRsk+TkF/q5+Rip0SwllSTmXto= share/snis/solarsystems/polaris/nemalta0.png -dOOgkAgI+zUN5Nhn01POWLbfqRyQXc1FHd3XALsvzJs= share/snis/solarsystems/polaris/vedekri4.png -d57loKDnKdOkYtbbenYHY6lyB7cyuw0BBgZ0oRMD8V8= share/snis/solarsystems/polaris/violethaze4.png -caBJqZR1MZ54PWZAcT7di0suxEDws7dHc/bSdzQLOUE= share/snis/solarsystems/polaris/nemalta5.png -+9bFZQUxDuRyTTkTwK97HHeiV+Uqfx2WoyJZrmDDLHs= share/snis/solarsystems/polaris/violethaze0.png -E5KCx1ct154qS5ICUzy+AJENTGtYr+ml21ZBTdZz6BM= share/snis/solarsystems/polaris/sun.png -hLRypc7xzmUOfAm7p21qe7pQPgLyzAkywi/e69kHGWY= share/snis/solarsystems/polaris/elibon5.png -7+MamM9cC/9sYPvtZ0+MLhlxUWvqHS0gkMrNUQ0vAGA= share/snis/solarsystems/polaris/violethaze3.png -R/3vac/SJy0EVKeoWX9hSJ67T0TjLQ1VkamyG5u0auo= share/snis/solarsystems/polaris/elibon4.png -KD5J+DWwdFQSXycJtdvGXThP3zqZUboSXcM9yy8RUgc= share/snis/solarsystems/polaris/zebina-with-clouds-4.png -sYRLAnoRQWMoQWmghNq0B9eeUzWyUHTGklaKWzxIWYY= share/snis/solarsystems/polaris/aronov1.png -noCTDPnEDaBGacEuzv61ue5wkpkXLFmvSYaro8NBAPk= share/snis/solarsystems/polaris/aronov0.png -0FOWT7CRIVr4Lwu1a2Jc4ptEAVTXgdS2YkKXZ6bGMKw= share/snis/solarsystems/polaris/albara2.png -nMcEM59k5gtlH8jI5vryOqJzZ1mQZKDP4acV+goUyQ0= share/snis/solarsystems/polaris/nemalta2.png -cgmo8BensHPQ322h0ODREEPj+KkzlxutodrMM9lImTc= share/snis/solarsystems/polaris/zebina-with-clouds-5.png -mTyFx3CbbWZ2TsKS0tA4YZQcu1aqM+W7y3o1Sssx91I= share/snis/solarsystems/polaris/aronov2.png -tdA3YFJigRNgqEQtero+2sbpUGRX5mAsWqccTHK0CgI= share/snis/solarsystems/polaris/nemalta4.png -/NufHzjKjG3ouOojRmVaVDOWRh0tC1pBtrS/oBhYYwM= share/snis/solarsystems/polaris/albara5.png -uojpbLVHA/D7Ow42NKfftBQUUctOq7FaTRO1Kxh0n3g= share/snis/solarsystems/polaris/violethaze5.png -AjombVeB7jyAG4dPuo8m4OVTfJ5i+1OZW3eBCsCRViY= share/snis/solarsystems/polaris/zebina-with-clouds-3.png -q778f3nY8CAEZsaq8RhdIu9m+r0A+WDkSZtNMKvQxtU= share/snis/solarsystems/polaris/zebina-with-clouds-0.png -aO7AA3JAo6kd4gp1JeJ1E+mLG2lCQeXwh4CFoYOehHw= share/snis/solarsystems/polaris/zebina-with-clouds-1.png -2jYJdFmXYBf/qFizewZNy72of41F+U0OI/vxzXHwiO0= share/snis/solarsystems/polaris/albara4.png -HW7fALZFUtkyjONohXmESF8g+wnK4NYqWyng9DQO06I= share/snis/solarsystems/polaris/vedekri1.png -FgmF4SZdKr9PDnLsUukv5UOz5V8OPm2yrPuNz5/zWVY= share/snis/solarsystems/polaris/zebina-with-clouds-2.png -JBR3NyPGWNWWAtcd/u/ccBJUIgwLALWTTLYuDBr68w0= share/snis/solarsystems/polaris/elibon1.png -zbp2xS/oyV47vDz3UZK9Bd1p74qQf+m/CtnmHGVwUXY= share/snis/solarsystems/polaris/Attribution.txt -TynfucWGYJseinaYbRub1D9z+N5+NC4juPX31Dsmq3I= share/snis/solarsystems/polaris/vedekri2.png -cmR2DoifrhWcMn4s+JWWd8Hst7wPc1NCnPw86JFTY9o= share/snis/solarsystems/polaris/vedekri5.png -f3oNTlGd/Ywahzfkct1+3L3dlI2AVuaQGyrQh41uw+8= share/snis/solarsystems/polaris/aronov4.png -ttOCTjJ8pIBAnISlnvqfPvYHv37B/jBNjtwJABt7zvU= share/snis/solarsystems/polaris/nemalta3.png -jc2UAQJ8IJ7yAfOiXRC/9EotnP22Z+Zo9LnSgPge6Ts= share/snis/solarsystems/polaris/aronov3.png -nLIebY4F9LQQmuIdQwVvoJeZPuLHZsTunJQWQkTB1Dc= share/snis/solarsystems/polaris/violethaze2.png -ob6EARWyo5dWlgP/hTkRuUbDdXPlKxwBHAtFpEuMNvY= share/snis/solarsystems/polaris/assets.txt -0my0COe4DcS35GWF/5RFNIAXPZRSWak7Ez+fiPB3o00= share/snis/solarsystems/polaris/nemalta1.png -UaR8GWaLGCYgFmd1oTwFN3DUa1D1glwVGydF54biFmA= share/snis/solarsystems/polaris/elibon0.png -r/YdXNGNfipb/lRzRi2t28kVNZ4+izx0e/o3k8eoNNc= share/snis/solarsystems/polaris/aronov5.png -xpJ+m0heCjoEZOKC2DOcK58fQi93X5n1pKiWjDD1z10= share/snis/solarsystems/polaris/elibon2.png -VqW6BjQRVDqDLAXmE8dDzRet3RsyW8cNFcgojpyP4Es= share/snis/solarsystems/polaris/vedekri3.png -8AQw5nZnjrfSHIMbpf7buENdL8lpug7/0njLe+4AwiU= share/snis/solarsystems/polaris/albara3.png -wAnczRkVAmRwMNK4zG7z9kjMjhP+p3Sf0G2mI6/9fTs= share/snis/solarsystems/polaris/elibon3.png -Vpa1GoMtkBpMlT+ClTxQ1fBYF2OrGIlDNIQAhUuMub8= share/snis/solarsystems/polaris/albara0.png -OtAfS3JP370KbVdpwUwpS2HeFC9OCuC/am0HyVnPMEU= share/snis/solarsystems/polaris/violethaze1.png -XEGeXVOjBipOFQor77wbkSm+hQYBPaFE5s6jq8B0uVQ= share/snis/solarsystems/polaris/vedekri0.png -PLF1+3KtXYIXEccW1HLCXrKoPdBHgEJowAcnEfbZN58= share/snis/solarsystems/quidgebo/kratoria5.png -jBAyj1QG+vyVA2UgTNoYIPz96+VxxKpdgWJwp/dHgf8= share/snis/solarsystems/quidgebo/kang-with-clouds-0.png -dSlKRwxv0BAIWEwYUqe1BRTjYNnDYDKVDeqrLhoNuJc= share/snis/solarsystems/quidgebo/kratoria-normalmap3.png -MSBCWsYas6LdAmy7Yy+tE9hUiEDoIv6yKbBm3QFKGbY= share/snis/solarsystems/quidgebo/kang-normalmap-masked4.png -b9v7ffSTCB9ZFDenAAhwgLHH3jE5lHbG3+Yyd8fsom4= share/snis/solarsystems/quidgebo/lettek2.png -YsJ/StaidIAVdoHlRgGi2PlZ8GWtZQiPmVlOQl2jUSw= share/snis/solarsystems/quidgebo/sun.png -fAjzv2lBvZeQTtEzTh5G3pc5vIaYmnbitbgZB9EuxlY= share/snis/solarsystems/quidgebo/bluegreen-skybox4.png -r+EH9cPN/dbWINA3Q0pE7nO9M1GUwDSaNaynBjZ3S+E= share/snis/solarsystems/quidgebo/lettek5.png -fJ9Cvfgpjv/rNGbQVTDK/2jMNQVsXvJPEGEKltKKxaE= share/snis/solarsystems/quidgebo/kang-normalmap-masked5.png -6f/B4HFLh5d1iajseINB+C2uyd24MNOem1t+lMB7Soo= share/snis/solarsystems/quidgebo/guleldob2.png -1EWkSq7803Dzv5mRkHSrQRkRRHz0bviQu8TVrxwf44U= share/snis/solarsystems/quidgebo/lettek4.png -QjRMGnpOeRIqwd50/OfVgKziHvinWBgAxvp7UULfK3w= share/snis/solarsystems/quidgebo/kojax-normal-masked3.png -0jnYlfpRV3+jQcbyYvBPJyc7M034ttq0RY+s+//esG0= share/snis/solarsystems/quidgebo/lettek-normalmap1.png -f534Qf91Cd/5Lh0xZftuTWbZqnypU3bZgDoRgchBpy0= share/snis/solarsystems/quidgebo/kojax-normal-masked4.png -wAM1cWZbO5tGqQDLhkf4VWhLBGE9GxGTX3t9hZkz9pE= share/snis/solarsystems/quidgebo/behko2.png -Sc7YCiE8borxZr0b2MmR3SWmK3mIlOGF4p+uj8lXeLI= share/snis/solarsystems/quidgebo/behko3.png -lfOTubdM1u9ksbN0vx7sqPSDqzDstyzeCfqDICJPF1M= share/snis/solarsystems/quidgebo/behko0.png -4fDkozTa9t2rZk56GNLolw12auy0r/Wtcm5Bbit1liE= share/snis/solarsystems/quidgebo/kratoria2.png -wgFTS+fmaDJ9YKt6RXPkx/X2Oq3+fZgie3Uss6zyT+0= share/snis/solarsystems/quidgebo/lettek-normalmap0.png -kfzGVJjwqfxvNUp3uoFDmj2pYuY0kh652uH7SdfF3sQ= share/snis/solarsystems/quidgebo/lettek-normalmap4.png -UMtH4lm8Er2rbcW/a3Uoxg68vMkoY4cbwkF+QDyW7eY= share/snis/solarsystems/quidgebo/kojax-with-clouds-5.png -31gF7oRhj5RGLj7IZhZRQ1v3Rbty7NLgP933lM0FoSg= share/snis/solarsystems/quidgebo/kojax-normal-masked5.png -KJdABvovoFXOJaLDswGV6a5lKFfV2qJtf/xSdEwOcMc= share/snis/solarsystems/quidgebo/kojax-normal-masked2.png -JLGPe0LfjGvlzREaaCyw+/aVf62ZO8C/zMwcnJgGRko= share/snis/solarsystems/quidgebo/kratoria-normalmap2.png -Swi2R+JYzp4Z5RK64HSIRvXRvM93pNNtlbMRMxYruAE= share/snis/solarsystems/quidgebo/lettek-normalmap2.png -nARQLNdm090STkB37Mif6ZV7mq37WJARxc/HCez9AmE= share/snis/solarsystems/quidgebo/behko1.png -Oib/X3EV4iLmuhsYleRbofbPtx1yx/dKqbJhYUDB+UM= share/snis/solarsystems/quidgebo/kratoria1.png -osHNjGV7NDdTz7a6shoizSi/4QSZ18we3lvx3rBW5po= share/snis/solarsystems/quidgebo/kojax-normal-masked1.png -5Rru/MmfP/Pob5I80jmHLm49SXSv4AU0rIQzOKSwnUk= share/snis/solarsystems/quidgebo/bluegreen-skybox5.png -DWmRJs/21oU3nhIvLbO7U+eIDdliwtFWirxNFpJcmqo= share/snis/solarsystems/quidgebo/kojax-with-clouds-3.png -CgKZcLW7Xl4FMJzTyV7x9QhqOPOZu8Y21tPeEJNT25o= share/snis/solarsystems/quidgebo/kojax-with-clouds-2.png -9rsxpZS2At9axrGJHGgtcWwkPfupNmIdwEihvf5GzTo= share/snis/solarsystems/quidgebo/lettek3.png -qcHt3XlbJ7F6SELiaLAxLvkv2aReEnGraxzZ7xgaY6A= share/snis/solarsystems/quidgebo/kratoria4.png -DeggS/E4+5+iHKtPfvQl59+dhGLcHMvnLKgBr03a8eA= share/snis/solarsystems/quidgebo/kojax-normal-masked0.png -lso/dzDCbgQP5x9tTcU4ML2VFiYW4jeDSdebyJR98jY= share/snis/solarsystems/quidgebo/lettek0.png -BLHKiarFEmGTx4R68P75CSAOuLugon6cWLP/dXFYsCQ= share/snis/solarsystems/quidgebo/kratoria3.png -oFO5Ix91NzHmpQSmFMVLwxso2QFGVN/+GTK+8RrOd4o= share/snis/solarsystems/quidgebo/kang-with-clouds-2.png -r03/Uy3lOLY3hRJZni/OUxa0M/mr4Ond0o934CM/yUY= share/snis/solarsystems/quidgebo/guleldob3.png -OGTZEm3WBbmxdU6uwnKN1IzA6/2a+fV3v504DsVC4iM= share/snis/solarsystems/quidgebo/guleldob1.png -UNHhth48Za0zyt3XZgqaoB6q3gY5CbzBDNZNQPMQ1kE= share/snis/solarsystems/quidgebo/behko5.png -WiEdV0h+nKRVsBV3I/v1iYIWJ29Tx6Mr/LhxEug4unQ= share/snis/solarsystems/quidgebo/bluegreen-skybox3.png -uoJWB8xb0BNjsLaqpXkJOTNF/VH6ar0z5QyVvYiNRFE= share/snis/solarsystems/quidgebo/kratoria-normalmap0.png -VPGH+wECFyCTfGcAvVIvmdCpwqonMeiZtRNodtINFYw= share/snis/solarsystems/quidgebo/kang-normalmap-masked3.png -9c5qWUY2aPTm09yvnSayVCq18EFlyKCxdzpWWmZ3J9w= share/snis/solarsystems/quidgebo/kang-with-clouds-1.png -6XoVD0lBTnkge9cOQAcfq0btoo0yI5b5gOZ+yMEDRXo= share/snis/solarsystems/quidgebo/lettek1.png -veUt12SvQJSIJnLOIJe/s8vRNhe1zlg9OYo6EoLNrPI= share/snis/solarsystems/quidgebo/Attribution.txt -OJNtO63OKGJlXwu1Gnvx9NQMqWmBnHP6vfrwPzpU7UQ= share/snis/solarsystems/quidgebo/kang-with-clouds-4.png -WJLthEAZusoPiYv5fPig2ONNj/DbbuAkHNK2Neiy9jE= share/snis/solarsystems/quidgebo/guleldob0.png -yPoEl85Gu8hMdc/oWYF82lNcycLsQUgPXICcQwhWuwQ= share/snis/solarsystems/quidgebo/kang-normalmap-masked0.png -T8s9H9FvUZsBtwv33iB/wjRFb9vMXMW1iAmGB5r+KBk= share/snis/solarsystems/quidgebo/bluegreen-skybox2.png -LPV3+nFgZgRZNT+6Di0pDr7rfll8/hRJzwWB4VhSGVM= share/snis/solarsystems/quidgebo/kratoria-normalmap1.png -y1OQxl5hFLckgpi5kuCxozJIyNFSTFRUkeRtEKINzpc= share/snis/solarsystems/quidgebo/bluegreen-skybox1.png -NHfKqLAqL/MARWO4BSUnr3poFO2heQRDOrjA/zEH+io= share/snis/solarsystems/quidgebo/assets.txt -KM8qPvcPfsMGBb7IUhAOIZzDJEx/DNNaKREA9HGMaSg= share/snis/solarsystems/quidgebo/kang-normalmap-masked2.png -cz1efSK3P00vX/WXvuqZTVFbySYw+4klIteWBrjzWLI= share/snis/solarsystems/quidgebo/guleldob5.png -Pku+HjQb+blTFNjVAZFlNegZBz/ZF8gj/NvKftqr8x4= share/snis/solarsystems/quidgebo/kang-with-clouds-5.png -2cQLVBJh1hO0K84H9ZgefLbnYdLdRCMp7sZhq7eNGlI= share/snis/solarsystems/quidgebo/kratoria-normalmap4.png -lI8w7Plg2irGWlaWclRY5YqrvgHoXwDF9QYnlPY+A7Y= share/snis/solarsystems/quidgebo/guleldob4.png -jqRaqmzC6x9F/CrGkchIvcIw/ANsUc24bW+8nFbXN68= share/snis/solarsystems/quidgebo/bluegreen-skybox0.png -nLd1rP2Pt/osQa0TzvLqoiJ9oUQV6KFO/kNb0adEDHQ= share/snis/solarsystems/quidgebo/kang-with-clouds-3.png -Q18PMVjD/FMt8ZnM6aNKqwC/juYvPqdTC2VyQNr12mc= share/snis/solarsystems/quidgebo/kratoria-normalmap5.png -935dU6dDMOnsKKxIyVvwRWXnKruG2I4wpHk4WTolNhE= share/snis/solarsystems/quidgebo/kojax-with-clouds-1.png -OAMOoPAuW5lDhQI278RI+cutMQbZzCwLXgRWCXoFRI4= share/snis/solarsystems/quidgebo/behko4.png -Jfzo+iQOqlH7UXivhihqxb8ansmdx81TxF0YHbXEF1g= share/snis/solarsystems/quidgebo/lettek-normalmap3.png -3SUjwxItKA2fNc2GMN+aLbVmWmEF6hS2RA4IMWJJqBI= share/snis/solarsystems/quidgebo/kojax-with-clouds-0.png -Hz7rt0FZsMftl9c/npTgvdKma6peOTFvnlxmjSWZUa0= share/snis/solarsystems/quidgebo/lettek-normalmap5.png -WwjfojhGTX1LyujM5SYGDgr4seRM80RoYXNiFGdqPsg= share/snis/solarsystems/quidgebo/kratoria0.png -nXq3Shk5Ych83l4bgbr3Hkdx0W6scBPF0V7scnXb37E= share/snis/solarsystems/quidgebo/kang-normalmap-masked1.png -dZfp5pRqDOdn6NJ4XwLoecpj+INCp4AUmUVo8Nm7YT0= share/snis/solarsystems/quidgebo/kojax-with-clouds-4.png -kBMBUOWEc3+q93oiqnUjH456Lro6pWUYhlwN5z0Apqo= share/snis/textures/nebula4.png -bL2QLHimTgHgMcCWXjABNNWAeYZjfYcSMG69Fe8NNqk= share/snis/textures/image2.png -b7DXIzd+nWDSRWbk8DQ7//qw2MQeuPlOzyjSdbEXzK4= share/snis/textures/asteroid1-1.png -W7nfdb9VMbOKGdqV9TaTcdG4zNtSli2SSjcBSm1GDZE= share/snis/textures/shield-effect-5.png -feegihOIQG+xoKvmDVShGBw3LMKR167sRb1AxaC9UlQ= share/snis/textures/docking_port_emit.png -tsSFJS0rPmfjZ/4vVm7OMQBe2Wz0deR9R/yxBimD6SQ= share/snis/textures/test0.png -/PIgiWpw1O0OEq2QIKYrFAugwg0LcmHcmlfJ1MGVCDU= share/snis/textures/image1.png -NLvU/59v05tYPC9aRQ2BX6LzgKUNBgCOQRJ45vak2RE= share/snis/textures/SearchTex.h -2k/LQHxaE/xCvzOCE6TYLa5uWCUudkypBi7qCjO2z0M= share/snis/textures/red-laser-texture.png -5W0Rrv0uY9lHl6Iw/sEmMudao9mfHpdyjrY79Ixzjjg= share/snis/textures/image4.png -b3doaoh0jEx1/QyFLRFgywywdgZLg7bHhOoWxMOzOA8= share/snis/textures/nebula1.png -qa+GMZIFUsi0alvpPK6/x5trzi1uCh4s7XGVFyRb7l8= share/snis/textures/planet-texture2-2.png -OPgWwgxcS/1b3THaFrtNnzYt+99K9B6dWC7oUCs32Ko= share/snis/textures/spacemonster_emit.png -1fp2JpcUTe67K59cqJArUYfd92M9Y0RKkyr/GMhbhZ4= share/snis/textures/planet-texture4-2.png -wPh3eMWNFOnV0lTcukc5Q/nWYcie8psvzQKhPsmchWE= share/snis/textures/laserflash.png -wuV4OTamtbsgjwyuwGkMhfU5uo1lbeq7/kO0I4KR5II= share/snis/textures/sun.png -wAQxZvLuWOYmjcuxXItq74gXRHbiIynmimqAabkS1Y0= share/snis/textures/asteroid1-4.png -/i2k0BycH0BjQRnET8t4Xu922o32opuUaXUfCWZQbAA= share/snis/textures/planet-texture4-0.png -aa/sAw9XYjnlMWjhVa7VPsOHuRx6ZJL4v33K4+X6LSk= share/snis/textures/orange-haze1.png -JUsA8yAlIcrqPj/8uV9jje9p8/ZFfNafSuvhjK+3WTE= share/snis/textures/orange-haze4.png -uRpM1zUVx9v/BpzOzIsErChjRFWX1qGTrplbO1J2YZk= share/snis/textures/planet-texture2.png -voVPrggGISbkzaT+cRogpazpuz5Ne+lFzUwYlMYX9pE= share/snis/textures/shield-effect-1.png -owLzXsDKnWs7MzLR870qGzjLtaS1sjqyn5EyRWpdguk= share/snis/textures/planet-texture3-2.png -5YQoYXRPmMCZesHY2vOLwrKZNCGYEPXPIEdMPzSXu1s= share/snis/textures/planet-texture1-5.png -9kqPPo3QACOiODvDpMedgliJNH0AXEXhupk75xwDV2A= share/snis/textures/asteroid2-1.png -rBFPOm85oxatWFk10GqW2adMvur0e+6sH8jMaexieh0= share/snis/textures/docking_port_texture.png -NOHJklr2vy7n3gcCtZ15+wB03B/mwQl9xiWk3zsXucw= share/snis/textures/planet-texture1-0.png -ve8rIg6fQKd1bl5A0nNsy8KToA6+yQdiVhzMD4G9HNU= share/snis/textures/warpgate_emit.png -yGWnyrjkJwmM2QLLuOwzk0defPeoYntdU94b+T2rIKk= share/snis/textures/planet-texture0.png -tG/Md9d9DKqpGnBs6bxloJQ2c53TbFGPdewrLwVnxvU= share/snis/textures/warp-effect.png -WOe3mrkFNULfde8Os6CwkapWPnoYxa1nTCvAjRlaOh0= share/snis/textures/planet-texture2-1.png -SXczITkM31MVG282IGBGRBrQSiXW68GinNumxy4pKlQ= share/snis/textures/planet-texture3-4.png -9Dhmsk+ghc0tK3yeOb9+bC0W5MkBs6wcmu0F+bqMEZs= share/snis/textures/planet-texture2-5.png -t3aV9sHRKm0U6xayfyaauS8D9YSMAe/ka270tyA6JAs= share/snis/textures/asteroid1-2.png -Gn01DUplOZYicSMwnTGM/Zv0C4rFoG7iv/u9p18RJo8= share/snis/textures/shield-effect-0.png -oY2FYcveIasOV17y1VIEp/gXRhX6vsZiB8eP+ekUby0= share/snis/textures/spacemonster_tentacle_texture.png -Gg5pfg1VAhwpJihcAh2a5we5J51v0OgXUhRza1f5ljk= share/snis/textures/planet-texture1-1.png -iT0RupvQ2De8n1lZiPNH9iUbR91tDIipsukKTUT1nkY= share/snis/textures/asteroid2-3.png -XCxxYpC/SwJvRbeJcNdYxoaKzeUhe9jZJManDee/m0I= share/snis/textures/planet-texture1.png -Naq8wd8scSEYKG6cVgbvyxlHaQYBLY/VSIAsxYut9gk= share/snis/textures/planet-texture3-3.png -5m2KMC48kMJkkwE2OezWQIsjzxkCoOfjJ4Mfo9AQDgs= share/snis/textures/test3.png -Gdy3R4/Cy+6hIXdC5Vm+vNJA+6A2u0ygncA4sNdAu+c= share/snis/textures/shield-effect-3.png -JuZa9PqoVj2CDW9FQUf0URuGdNRjs0T1TUOlAJigVJg= share/snis/textures/planet-texture4-1.png -7JmkvpneenxcJTqGegRR1bpS8wVJlLf77pLX9xEkFOc= share/snis/textures/thrustyellow.png -ZtclgRtGBoVC3zFOVt9iwor62ykWDqE7Gt+xYoU7A60= share/snis/textures/orange-haze2.png -sxU2loGuXwL8sXOXoDZHZuJwlvO8OYiebE26lC7+1gY= share/snis/textures/planet-texture3-0.png -7hxqo6H36Z1Y8st5iAs76FV21jHexzrz0SfXsCFLFZE= share/snis/textures/planet-texture3.png -0yeR1oiabw34pMhqaCTAS0v9JYGo3bkfzolxy1gVBJ4= share/snis/textures/asteroid2-4.png -pwwdS8LBUqJPEQ9z9LMsv2i7UzIl1eQVosWCqeTMQk0= share/snis/textures/planet-texture0-3.png -hhr5x4ldUKGu4h/HYT/OYPAupSEAXAC3lX2xnNlHcJk= share/snis/textures/planet-texture0-2.png -CaqJmkUepAE/9XwchABVq9qw+YVAemIFtRanMaBTy4k= share/snis/textures/snis-splash.png -j5Zu+URDtGDmBMyWJCJFrCGi6yoQl6yN0poCJpjnPiw= share/snis/textures/asteroid1-3.png -ptMqPDagFV5ByB9SOhHMi8v1MYI06rrir/hpTcW/8ak= share/snis/textures/shield-effect-2.png -3t7DYfH3UFIMziOoeo1S/quImsFujuWt0yZAZlg3utU= share/snis/textures/test5.png -nA/khdo2xQUIeT/8OrJ8IsuC0QZEW0s10D/PF+igjoE= share/snis/textures/planet-texture3-5.png -CWxKTsAMnghzp9x+HvL/lUHIKUTPhs+TaKkJLMSZ4Ok= share/snis/textures/asteroid2-0.png -PSBtm8dv1Vrux9NouwJcaxyIBXo/wycjk5JBULkq0Aw= share/snis/textures/planet-texture0-1.png -ztlnzpogbeURJd+s+35g+rBU21IcZX1G/ypLUBdrkpQ= share/snis/textures/nebula0.png -LZASA8tymfnSe6yHTEKARdtFsB1ld6fNBWqIZU5yfpo= share/snis/textures/spaceplateemit.png -uwjrhAuKKOa5oI3IEdOYjgcD94eb0SIbAnb/CVx+gto= share/snis/textures/orange-haze0.png -ZiQ2WTzBnfzxlKP95jzRWp6Or8sH5GLyhzFs+DzJCHA= share/snis/textures/black_hole.png -6EibwBx7mB4hiQhdpzhDBrKcc71V1w7JH8roJWhCeek= share/snis/textures/planet-texture1-2.png -pNgkfKcRmgg+V9A4Rx9gSOm15m8w8A3r2/Dc1tHeArg= share/snis/textures/green-laser-texture.png -DR4OvjL8ufLgr/8qgByf+C2UZZ5Yu5Q/yDZegUXaRYw= share/snis/textures/space-blue-plasma.png -/Q2L1u/FdupRZ+n+atY3WFS0aS9aZ1Q9YRVzVzPZD84= share/snis/textures/test1.png -BNfw7Xu1/+c0J+yVnBwyH8iUkrKFRXiw6bYuBCD9FBM= share/snis/textures/spaceplate_small.png -SHkdQE7qE1yITbv/+IDJy0p5QdoiyGI6lzeWL7rOlIg= share/snis/textures/wormhole.png -uGbZCQTfxPcD1hH/Qvv8igPMgNWPUVTzU0pggXRkCW4= share/snis/textures/nebula2.png -6L9z71blRXrSBZ8BQ3BCNeRk+wcedBRLwf0ABzPQk7U= share/snis/textures/planet-texture2-3.png -95SsABCf3Z7i/Bk9nC/ZhG/1xyojtmS0qITXejNBvpE= share/snis/textures/missile_texture.png -gBzdRXag8Vck4/bhs3bjwVljB52r97vM6Dp6KXJiUZk= share/snis/textures/Attribution.txt -zpYzUcnGqk41Wqyqc6npGE3wxnOXBHwwJCU8O+nOoYw= share/snis/textures/warp-tunnel.png -3GFnC6NCI/IcECWu4xSAsYewu2wx+tczNxOXJCtXQYk= share/snis/textures/thrustred.png -My+PtVBAWSEcf45XOdzJcUm7P1HpM/SaAp9BDUAG/8A= share/snis/textures/orange-haze3.png -A3qz9q0y2rblriaOgzVV0vZw50SnN9M6OYDldwXJQnE= share/snis/textures/green-burst.png -VMlOSXA8axqkHvzypyqFZCLhTOWFenhcWlmFP6S3CqI= share/snis/textures/shield-effect-4.png -w58o5Iyca4xOVFWO5gQb+hFJhvntQ7P1ma/Ef+DGFsw= share/snis/textures/spacemonster_tentacle_emit.png -ilj59TckPx6ajaJYigTaF5gwEhNJFc9ArRMF7ueM3SQ= share/snis/textures/thrustgreen.png -X8pGQCpoI3L7X2CVlYFNIiS7xdq3lYmvt0b00lt/0jA= share/snis/textures/spaceplate.png -TXXk9FKF5QU350JafBDJOfzmYbg51UWY19TASNxaGFY= share/snis/textures/spaceplate_small_emit.png -4FqB9Y/+wj0QXQmbOPHuMzFKXRHlN+OAFtib+8I+gHQ= share/snis/textures/planet-texture0-0.png -JoGKUw73Pk+sLm0hkLkp+p2eDySZNhAbOgcSF/jtCOI= share/snis/textures/thrust.png -tc7uDnh4NBpAuluvVCy+E+3rG9n11RBTv0D64znMTrU= share/snis/textures/red-torpedo-texture.png -HHIQ/ad1iMCcyz6ecTKdlxBREkPFrXVnOSkjqTRr6OA= share/snis/textures/planet-texture4-4.png -45Uo93rnr/shVSubbiEEd5Apic8U11zd1SPOvrCmVpc= share/snis/textures/spacemonster_texture.png -VYYA8t08+Zf6eTWbWc+DELnqNskO12rucmWiYQQ8zDI= share/snis/textures/planet-texture0-5.png -Nm7HChSSNgv1NPoh0uOKzHapg1VZdXXv1hswKbI/eTE= share/snis/textures/image5.png -ne7cK9xjNp0TnB60xuc80HbtVjsjQGoKUKESBMwQlig= share/snis/textures/nebula3.png -Yt+H9/UlHzJH8sO7bqhogS3+fkja/l5CkD3U9meKPQU= share/snis/textures/planet-texture2-4.png -Uhfs2DKZ/hWurebH1SPdo1alVtYeFjSyNMMa/9OUtAk= share/snis/textures/test4.png -q0SvA9m1ippSHPvEvpowWXD3JJinyGDB0XSnncc56LQ= share/snis/textures/asteroid2-5.png -rtHEKMD4UjmW15AOGUToti/IQOYW+DdMRXRGNVcI7pc= share/snis/textures/thrustviolet.png -gYiz/GPlAQ0mjHAb/AWFAeqlXxf+uSlDUNWjr3Zyk0E= share/snis/textures/asteroid2-2.png -yrh5TIvvcyWUnn6pMV1HvUwpvvF2LjTDdEbO/vOOwGs= share/snis/textures/blue-tractor-texture.png -unhj+PvE4o9KrqOxrlRIlgH+p4fVKTkZVxzfiqBU+Lc= share/snis/textures/planetary-ring0.png -rx3P/9vVkyJ0Rdn0SshUpnDCIimm2aocGwYeeMBVp6w= share/snis/textures/green-spark.png -haxAJCl2GlOqmcVk4DIimSeJyI6k3QlAIwK0fCfC3BU= share/snis/textures/planet-texture3-1.png -y3Y/adrgA6lvTrH6DTd6nV2CvQVLoY4FTsqFFFchvI4= share/snis/textures/planet-texture1-3.png -1f1b6fo/pdell2aQJC4dUdHU/Nh+HUMTOyzopyObUPE= share/snis/textures/test2.png -sA2gp9PL5W8dC2dhD5pMPrxTrO+1VheCBS+GMmabjmo= share/snis/textures/thrustblue.png -6AjSTtLE/nBSuRfIV62pz1ehHTwenunC4Bmd0kB1wes= share/snis/textures/planet-texture0-4.png -7htWUMHShDuD6/2HISWkabC5DNrfK+RQ6tojClMOAso= share/snis/textures/asteroid1-5.png -JyViATMb/oIRvvsn6TuMy55hvPDZYom5tGfb1z0YwF0= share/snis/textures/planet-texture1-4.png -LPCcBs9F3JchXn/GC/Om3/lS83kGEEWXpTJ4zsoF8Bo= share/snis/textures/planet-texture4-3.png -Wh2sQl00I5MrG90MTszGg49mvUT4WPxM1CI0GcxnpLA= share/snis/textures/orange-haze5.png -8oOAQ8QdEN8I63f0TO038P4LKvK/uki3HggGuNiaQUI= share/snis/textures/AreaTex.h -+IFK3O9cCGTHz6TwI55eWXt7OqjMGlRCoYqkXIagUUg= share/snis/textures/warpgate_texture.png -tga4EBDAxQZ8s77XkwJhAxZseKcnZrI/Lv1g6HsGby0= share/snis/textures/planet-texture4-5.png -uwA6q5a5bz83tVj0y6/RmHqysXcgCwGQzhB33xIqWzg= share/snis/textures/planet-texture2-0.png -aTAJfiPS21rNKKkiuVrDj6LOkFGUaYdIY1FXhfXB/nE= share/snis/textures/spark-texture.png -IBnxZWhqS8Fj6CHlHba2yfBAXb/8J0SYo3nrO8Vc2UU= share/snis/textures/image3.png -PSZIRVnPrAMDprYiMJsB8lmEukf+QTh322sYrPO8jfM= share/snis/textures/image0.png -QJS0T/lJngrJzpUlyjyE043e/ugOZnph7bEz/k9/l3s= share/snis/textures/nebula5.png -CxYDZH5UWzGdN1EVKucT/zoKxe6vygqUdITQ4aMNCwA= share/snis/textures/asteroid1-0.png -M3w0qG8Auz2fuxzZU8HSHGHWuxbd7IlAAaBwojIvuIM= share/snis/sounds/warpdrive.ogg -62vHepCtfezI2OL5K9Tw6j1tkhuRUT1s76Lxs5jqxC4= share/snis/sounds/flak_gun_sound.ogg -aSugcnnCHsivuunEXPUYdUrdQNF0xe0BxQnwMMT/o0o= share/snis/sounds/hull-creak-8.ogg -lMSgVlq5FA54KmLsgunTT6aL0NRMMU0tt+YvCz5PRWI= share/snis/sounds/ui16.ogg -zMYjh+1jm9IvWYHo/u1Yj1VuFvMJ8Iwb7CN0+VDoJig= share/snis/sounds/dangerous-radiation.ogg -wSgcpszHLNfaxJLmNO7XYmiomLLzZ2ZtwV0TRvKOXYI= share/snis/sounds/missile_launch.ogg -XxVoCkrZgGurURqHY4sFLyPAuHQbDXSXwS+2D6cIKMY= share/snis/sounds/ui22.ogg -XcAgZrNcd+n7RgAC0dyn2t5jjaB4UCHAEzgylw6jfDw= share/snis/sounds/incoming-fire-detected.ogg -hetNQl4T013LTFC2F1j0AN7dgaWQNQN77TYTFs4mybw= share/snis/sounds/lower-shields-and-hit-lights.ogg -MpL0mRob1jPCCtSr/pPHHF6fUyTrL7GGInVeMPfLnV0= share/snis/sounds/ui21.ogg -vBfcd8VRYLyFNmXtTauqDC3C/AxwoQDe1htJcaFzJZM= share/snis/sounds/ui3.ogg -yNZ91msi1zqfg5Ula2ic4Y9xOiKuv3j/sokOFD2ivzk= share/snis/sounds/ui8.ogg -F63fHH+D0PxV8Hk+VTGUnvsGCSudlD4A+ndhUswQWFk= share/snis/sounds/ui17.ogg -JO6gnvjr4nwqJ5tjzXm5hihyk5P8lFdRQVltk7HP5Rg= share/snis/sounds/big_explosion.ogg -3fhHYOSUUbMMMAIxyL2Sl39qM+nDRw6B0z5JbS1lli0= share/snis/sounds/new-starship.ogg -VS45opPywO/V6la5E6ibPVGU3RXGrpLoKP3bPBuIeSU= share/snis/sounds/mining-bot-standing-by.ogg -37720d7H6hXQ3iDOo3aycRT+oj14XJixDi26TF+Qm90= share/snis/sounds/docking-system-engaged.ogg -OSKIkdz8+mYqju6o9X/2FRitt+xrFBuw+o3RjbY3+IU= share/snis/sounds/quindar-outro.ogg -DTBDto+t0skvJVkEnXmvqVS1WrYgEAolFIZL3zfij8w= share/snis/sounds/hull-creak-9.ogg -bB8jW2pjOmjkKmUdG10KE/zkPe9ZBkfql+ekYW5h+tU= share/snis/sounds/hull-creak-3.ogg -GbZbjqnXgZdELVpmcv6UTVHS0+mDbYac9NoMznUnIj0= share/snis/sounds/ui12.ogg -lDH3PDcYRw5vHDrr76LYjCuHvz/gvkBuUULQG5j/cJA= share/snis/sounds/ui1.ogg -UuLLgvRsgVEU/bNunir0jR4vRScyhAMtnCUXfQBxLfA= share/snis/sounds/hull-creak-2.ogg -mCVOXTLHB9QTD9nZ/lZrgSfB6wQPO91xwXtoEZ3XBoU= share/snis/sounds/admiral-thompson-msg-3.ogg -GmJXF9hiiQhEGENq0rZUAfQKRvPp1wc3BoqA+P+SfTs= share/snis/sounds/too-far-away.ogg -ZYNZkH1CCUqQNCClQs1Ql+ioUOQoxMy/kka+TLnoVME= share/snis/sounds/science-data-acquired.ogg -FbSSyqJLEmVFtZYrDM85oBcHAaW6zsS3wC2h6dXyGFY= share/snis/sounds/ui20.ogg -dFeSEAOfIyOZ9NduuIBXM9h+92nP8B/HOTKTyW2U54g= share/snis/sounds/onscreen.ogg -x+iE3J6qD2C1WrnKjdIzXjgI0yQp5x6lpWciGSoCnNE= share/snis/sounds/hull-creak-0.ogg -NVGnh4o64IrS3wwKzpAnSkkfZ1ySA9vj5t9FFH20FVE= share/snis/sounds/ui10.ogg -KOEMtSC+szli1eXEuYjuprQn2hANzLywd9E27pxCAPQ= share/snis/sounds/ui23.ogg -qHHyg8zMVHfy65ZKU4EzzHu6AyzXBQGc+y88Kyc4wy8= share/snis/sounds/bigshotlaser.ogg -wcuiI4KG+nrKt27FVvq5i9w1RlLlsB2XbYyp6xN6E6g= share/snis/sounds/entering-high-security-area.ogg -6UozVwDXgR0gLMWhke1VuyrMjYRtkT2nKZt9up+YYuA= share/snis/sounds/changescreen.ogg -cDeoyDoVEi++APEaZShuKA153BMsPvsgoMOgn7U92LA= share/snis/sounds/mining-bot-deployed.ogg -sY5H6X+BtCDNHCF0HdqtOTHrRSqbgXqxrYL0A5a1gV0= share/snis/sounds/ui25.ogg -Aa0UYl62UcXNwPS/iv0eIbMrqEdYn18wai3c0PczhLQ= share/snis/sounds/ui26.ogg -QTrI549AI9iqot3E1dOe9YnbG5uF4RXrg3YP9AM/ODQ= share/snis/sounds/ui15.ogg -rxT45RNv0iaX19dzKZ6ztbqNtC7RGXPwYzDNentgU5k= share/snis/sounds/ui9.ogg -JP1byeSOzXpeD9AcWigPMZbPO7+PKlOYaazi4zcCRbE= share/snis/sounds/tty-chatter.ogg -LlxVnlR5ZEmEjYmx9RrdrsBR6bBe+tOaUWuICX7UY6Q= share/snis/sounds/transporter-sound.ogg -hJK8wU7Ou+bKyYAtxvdt5c3naGJgk2FSlYvCsE+UmCQ= share/snis/sounds/ui24.ogg -HzO1nHFz8nFH0BQ570/R4Fb8j7V2x3Wb8QRKPUbIkNM= share/snis/sounds/admiral-thompson-msg-2.ogg -Dsw2OIM2fY77XIFee+bCYcLyjYjSHpP5sqVvSsIKfUc= share/snis/sounds/red-alert.ogg -jUcyAUHF1ZfE1Y69R4NMBirgACyI5UPABgrDXGJK6rE= share/snis/sounds/ui7.ogg -Y96lZp9UYrIs0yuwtzactjMrBc/K2sQwrtj8/LJz6fA= share/snis/sounds/wombat-clear-to-depart.ogg -M6/b5s/q85+M46C1m7I47pJiUe8TYMKfQVSBw/QvX7s= share/snis/sounds/permission-to-dock-denied.ogg -I2rpkcSnFp7E3iIiwxvOsYPYhE46yA3Tb4o+gxPpp5E= share/snis/sounds/hull-creak-5.ogg -B7C0bHJrFjVaTtvGZtARQuvGzO+wFsjL9tzxHsYjsgI= share/snis/sounds/ui27.ogg -fC3HQU+0R8pQhUOaXvEgBBh6Hqqrbx2p/tJFAWxOKdE= share/snis/sounds/atmospheric-friction.ogg -Xi99nPux36r2gs48NgvH1oXslfAMiorb/5UDCuDNWJE= share/snis/sounds/laser-fail.ogg -u6Y4Sv+K7xUeGu35Rn5Gk3yZH7PzezNaBsZ0O8uGvf8= share/snis/sounds/hull-creak-6.ogg -SI6WgFEWvhAfPXHRNXkZaJW0T4qvuaMtK/RETHJDmPM= share/snis/sounds/ui19.ogg -IO/Bnaopag3yqYqlhTDMBEqr9P62QrZfY0dHs5K/bhw= share/snis/sounds/ui28.ogg -+PoUsFmqU46EDTd9dy8Vrtuh94fH0IQ3aQWZmamVBuE= share/snis/sounds/fuel-levels-critical.ogg -S1XDYaz1S21zFlgu49VcOSw0G8f3QzgYQgB/v/mR7fg= share/snis/sounds/science-probe.ogg -jV1giKFKU6HyOkswYjxyICWJu9VgmsIUdLLucCV6OYs= share/snis/sounds/spaceship-crash.ogg -l/gs4KL7yfVhe022w/wRYZfXHq0afDIaj8JYv1ZgPvA= share/snis/sounds/hull-creak-7.ogg -m6RJLsU600W5cE62CRc3YPJXpHN3Tna6DVnQV4aKgd0= share/snis/sounds/torpedo-loading.ogg -J29bTFpvcj76HuXask4cCWUgaRVCjZi5U5KhKp2NTz8= share/snis/sounds/Attribution.txt -HKbh7frj2RRjznHtfEM52b3GvOSjyJTULWoCfyVqtPM= share/snis/sounds/permission-to-dock-granted.ogg -dtxJIatbBd0oo69QLyJXuWE8qMPmAGqsPxFeY8cofWI= share/snis/sounds/admiral-thompson-msg-1.ogg -8PKVRRE9MKjsc4XWcbzaRhdY5TXQOxnpZmGPJEqGvss= share/snis/sounds/permission-to-dock-has-expired.ogg -+UUCF4s6zcXDSk5OdnhK9tnkxO8HF1sC64S2mQSfJXw= share/snis/sounds/alarm_buzzer.ogg -TgpAlop/PjMQZ0tdVIyYM2EkFWdvWIgxg2TMsif9wTg= share/snis/sounds/slider-noise.ogg -D7nFmIgGwYBCdTFVxoUUnO26gyZVxO58GLxSpsOlgeA= share/snis/sounds/atlas_rocket_sample.ogg -wrQ8oxfGgi2CU94MxsvjH4XUvnHA2F+FqI7S4ikTTH0= share/snis/sounds/robot-remove-component.ogg -ErOZM6hPxAiQ0quCZ/qsdMx47hI9iaqrMTHWpeuM4Kk= share/snis/sounds/ui18.ogg -AbpHGcgLb+kRsJGnwFEktk7uzpZOCcBY74+YBdrKVGs= share/snis/sounds/.gitignore -HFw3Y9tECsE4EIgO3EpxW0LAQb6IqKmEZmwWsJQqzHw= share/snis/sounds/crewmember-has-joined.ogg -stbsVMZbvmUXpN/UaaGiSv40poGPmIenbP9kW/jHUqk= share/snis/sounds/spacemonster_slap.ogg -AcO73sTqhfaKsDrq4sW+n3j/jaUzmPWyoNtjeAoNmC0= share/snis/sounds/ui5.ogg -O5EtUcOTKsVTwDEGyn2VD/B5vGkOxuIsDmoPQQ6aLJs= share/snis/sounds/ui13.ogg -VEF2hHz9zWUK0Go0JJn1rXzI7jcZ/yCcJly84UNWRI4= share/snis/sounds/leaving-high-security-area.ogg -95s2aGzB4eMcxVkHuSEv1RewrvthJRnFfKbtsZXAeJ0= share/snis/sounds/admiral-thompson-msg-4.ogg -ZgWbO9P0rAi1nyTEgksvXgpUA7zNuhuAOlN1BBwZmXI= share/snis/sounds/docking-system-disengaged.ogg -jdUxacVMD/2GjfdeSRTAky5lxP+DVT1SYxcnPVIgpbA= share/snis/sounds/warning-hull-breach-imminent.ogg -xF4P6tuRW5S4le1X2FUU1zY8DYgG0cAZfKHawhDe2QE= share/snis/sounds/ui29.ogg -Il128EgLTTz5QY6s+oI42DWsLtVs0W1jDzANzmjmtzk= share/snis/sounds/ui14.ogg -cA+vw8MrPNzgXNCR3i5w5hj1X7xj/Ogim+8R5uRJBOw= share/snis/sounds/warp-drive-fumble.ogg -7obOHtqTvy4EokgZyOOI2zOuVzsatyH9IyDv15LyxDU= share/snis/sounds/ui4.ogg -zIOlRvU3ipx2E+zPXvbo0+oL2W1smOmZbHIbDrurVNk= share/snis/sounds/comms-hail.ogg -YNbfTWkx18z/k7CLkYbJuB4esR16vdYNjVMMOyjnKu8= share/snis/sounds/quindar-intro.ogg -isYjrKmyfr+pIv+A64XG1s4T25i2DwC+4uKAozwyWHk= share/snis/sounds/hull-creak-4.ogg -VkSEd4RnpgCpOvP6BCeZf3fdkgNzEo9Mxt1B2dhD7ZI= share/snis/sounds/mining-bot-stowed.ogg -yjsXJuRNERzsEwys8PveeFxD9iWfp9AISHJPnm+1UG4= share/snis/sounds/ui2.ogg -AJDpU8jHPRPn+vNR070eaYKx1Firm8oPvqGBu8b6qSw= share/snis/sounds/short-warpdrive.ogg -7OxYJni0/YO0zqo3bQE3nTWuOl6FPnR7DttabqSqfcg= share/snis/sounds/ui6.ogg -LB3ii6IxRCfUOw3O/DdsluAle8OWsRvOXW5oVem7aiY= share/snis/sounds/docking-sound.ogg -+ZWq894h5qmkABEkpDZq1rF7ndzvQQyi+rm4pUaL9Pk= share/snis/sounds/offscreen.ogg -f/Eib5QZ37pZ6vn2phnthLR3eVAvZxDaHGM2eRn9NM0= share/snis/sounds/ui11.ogg -kkzmh1bGfUaBfRWTj5eu6ETOyjfRfjAbmiSSLlpl2qc= share/snis/sounds/term_ready.ogg -Nee451qKNDAhvOeN5QYEeDEDaTR4xER08yRNAy0MUPs= share/snis/sounds/maneuvering_thruster.ogg -ngeI6CXcbW/GQz0O+hAwknKOQz4djqCeLB0R4wCn92E= share/snis/sounds/reverse.ogg -JS/yUyuYwypcy00E3D0DfONyfgA2V5hw9NhZnZ+AwiA= share/snis/sounds/proximity-alert.ogg -MnRA39onaLzm2rXRKp2DS4mClIpcutmZrAOAyQw4UP0= share/snis/sounds/welcome-to-starbase.ogg -0TLz3pMG+j8snPVo3RQBx+aO9E3mlKSyoA/CHvrkqEM= share/snis/sounds/term_reboot.ogg -br+y2UEhv5wVEj6fS5Q+z07a/cHaj34jJn7nvg5boI4= share/snis/sounds/hull-creak-1.ogg -elHA3oDhlCDRW9bBhP4HE9IRZzlhUnFI4BNkZ8ggjJY= share/snis/sounds/robot-insert-component.ogg -k6nsIygzYVrngPTq4X2zpcPEsMZf6CcC9c96DNtnJR8= share/snis/sounds/flak_hit.ogg -4SM0tn49+sgBfbrEkLd/hSBp7M0G9w4R+eZj8WC02Dc= share/snis/models/destroyer.scad_params.h -aQoNlN7oYyb24vWfxbtx63tIGYr38aoS57qXAg+4DuM= share/snis/models/dreadknight/dreadknight.mtl -hQ2mYWh41srrD8fbo/T52+c66UTvhIcVZIyveYDgdf0= share/snis/models/dreadknight/dreadknight.obj -ivzypSOWxxT9CL6WwwDA0wtemGXgF2c4C1rvBdR8PZQ= share/snis/models/dreadknight/dreadknightlights.png -EVJTZPmnPbEbR0b/inMQUteTPAArQPUYLV+Z7EKvw34= share/snis/models/dreadknight/dreadknight-exhaust-plumes.h -Jbh5f3hXc8CbEvqpd8tcGxF9T9/nVkBft+/9Dbscl1o= share/snis/models/dreadknight/dreadknight.png -00EpW1J+nYarLBElWWSG08wnx6KIuwnWWSwVvGvXxso= share/snis/models/scrambler.scad_params.h -3KcLByqnDm1JBX2gOK/bN4SYOxbOkMs91C01FqyE1ls= share/snis/models/battlestar.scad_params.h -6dsu43LBlz10kSh5GF22GCzqfnnfEWJdB+ZcElIAbYI= share/snis/models/spaceship2.scad_params.h -h7+qegmO8ifXFX0HAM/qKKwbagfqNGf4hIjReih/D0I= share/snis/models/starbase5.scad_params.h -WppubL8BzxjkbBGQWRoLUECSAl/QqLfihGhBuozyx6E= share/snis/models/swordfish.scad_params.h -ClIE4b7hI3WlK4D7F3EgDIElz344DqKqSUbIU8MjXuU= share/snis/models/missile.scad_params.h -vn6y23k9Zr6Frxeglh2VFuCOYWTYK1N0LYK1f3GwHvs= share/snis/models/research-vessel.scad_params.h -0iZfzuSf2hG/wovW4mgeZWAEk3s96uqlhDfDSdnb4NE= share/snis/models/disruptor.scad_params.h -bG4MPZiUG9BAB2L2zr1WhIVg9rHGb8xwf1+zr4U8M/A= share/snis/models/disruptor/disruptor.png -i8liNlQ0IehELSMk8ClhnUevZamo1vKEd3kmVHasfnE= share/snis/models/disruptor/disruptor.mtl -gDswiLtyCHStzmvDktzxqx1FrNepqJY1zULliViiqYU= share/snis/models/disruptor/disruptorlights.png -n2EDbPD+GBstmlZQIgUmOLqucn7mVOVqTjPdMaXpfYs= share/snis/models/disruptor/disruptor.obj -iUVp2H2z5YpOGETcdM4vm4zo4Ccw3EMBJqFSaCmB83A= share/snis/models/tanker.scad_params.h -5/D+3pQ7PG0LHNs65EWhJqo1LnTCY+QTt9Z1NEokyQQ= share/snis/models/battlestar/battlestar_normal.png -Vs/+Al0B0YlHtYrt+gR9A2oaN7kRQ//isVSV0ADGWu4= share/snis/models/battlestar/license.txt -QMw9CkEvogVWuHgRcZvJdTEmcwv1kbduzfWnb/NmREs= share/snis/models/battlestar/battlestar_emission.png -SfZKS5JUjsTT6iThcBwcNFFgCZl0o/WIEOWNg4Ip/B0= share/snis/models/battlestar/battlestar.mtl -lp2voLpqU/R4QR041FCdN3h9waPkIEcc9tS9tEcNn40= share/snis/models/battlestar/battlestar_diffuse.png -r8tZGQ2QwzMXNxuH6xKGMYW/f/BjWSdyhZ5XKLtbiZ8= share/snis/models/battlestar/battlestar_specular.png -6NZk6tJfFoeocVwTf0YBsgLJZnwgNP5sMDa0fpYxAUw= share/snis/models/battlestar/battlestar.obj -eycmBh9OBER8KDIdJBzhmWvcYBbIeW88GGyCTgeC7m0= share/snis/models/carrier/carrier01_emission.png -DDd3En+pSQltDOsx1jfjO7LXIlj+4ITLqgiJsMG5n8I= share/snis/models/carrier/license.txt -/hSXxmS/jf2mXhXQhFu53Q2ZU/VS+Sar+3crW7S+hAw= share/snis/models/carrier/carrier01_diffuse.png -9fW5rC4y06mG2l64ZF1acETdha3bhTk/LyBwuXyl3lM= share/snis/models/carrier/carrier01_specular.png -q62h3qkvbsmcYLTHawlQyrodRIxZTK0qnY2XW9LfJBY= share/snis/models/carrier/carrier01.obj -phh8zTry1CxS4jzA4UZSGVTbC1ExqJw1O4t9xi+u0xg= share/snis/models/carrier/carrier01.mtl -mFgiL+aEG1fVHbsH92PbVcN70fLTRuztrbqFGwAzkbk= share/snis/models/carrier/carrier01_normal.png -4BQJdaEuaKMi0XvqtSVDyWvFXqT4E2Mi4nUAH+w/44k= share/snis/models/carrier/carrier.scad_params.h -NJHvywL4JEM6fUvbBOy6NbVz2okloHeS9t08Um4yAwc= share/snis/models/wombat.scad_params.h -0/6Z2JGKVfj5wJr6VDcNQIK03NgbmHq0b5tJRCflKHM= share/snis/models/enforcer.scad_params.h -fQqYCjFWIGXW3YIxzWPOxdb8/YGJONXz7iPehhBSNbA= share/snis/models/conqueror/conquerorlights.png -8/1xXyxXPDP/WF15y5+kogGOMYL3nC8xl6EtJljnRhM= share/snis/models/conqueror/conqueror.obj -N8REjR+jbR7pptHQw0n2YJoeeigPnADzQ0KJF8iczJ0= share/snis/models/conqueror/conqueror.png -TSk0BX5uZ+KKkgfiINd86TiNSuHL9yD/QbkP4nao3do= share/snis/models/conqueror/conqueror.mtl -dt8dkwhHdrY17VE4HZxpZ0PK4K3lf0t13WgQirPouFI= share/snis/models/asteroid-miner.scad_params.h -sQqvPcJPsYoGMc14nuQQ5JC2dSZxWGaWelOYFXPGIf8= share/snis/models/starbase2/starbase2-lighting.png -SfA3vzZjJTqhfpMmd2P7FTQtbeb8Nl0aOK8Ahi72Ja8= share/snis/models/starbase2/starbase2.obj -6VJrGLd9e2xbRF/QylQDP3fMufOaE9OoxStT+fUUEDg= share/snis/models/starbase2/starbase2.mtl -JERd1e/04vxOzguRo6wxRVE2lA8dd/fRFpw3bP5y4Wk= share/snis/models/starbase2/starbase2.png -SPpdavzu1mIYBWZ7k8MurOKqomrLudQ/w+hpEywQGlA= share/snis/models/transport.scad_params.h -IvQB5JfGu72JyMY/VCuWCbb5prN4l50is2D0XCJJuyQ= share/snis/models/spaceship3.scad_params.h -1llp0sIB0j/bMcS6TLPd2GuHh4tFMdwKQ1JFGwXn4BU= share/snis/models/spaceship.scad_params.h -vExK3t9dNZyApXb9dpWU32KoTCbGh+YBjZ/6fv45/Cg= share/snis/models/freighter.scad_params.h -V9OtwxUEU/d1akq6lNjWqWXc2/NyJQUIilsxR7CH3vc= share/snis/models/skorpio.scad_params.h -pj2rSZW73/ByWCcd3oPlUtqw3iTwgpalJGeFairE9WY= share/snis/models/cargocontainer/cargocontainer.png -g79l4GF9d6RoSUK6tgGhDw63axXfQD5g4dTJF/am6VM= share/snis/models/cargocontainer/cargocontainer.mtl -ejOEV9+f8ZifoxttJAHBsfdgUccADVgNJTeQkfJjpC4= share/snis/models/cargocontainer/cargocontainer.obj -laEqDNPt8s+1AP29Mja2nA5G9pG7pn0KezfuJKUFRZM= share/snis/models/cargocontainer/LICENSE -YnH/ahz38kZ4QnpuwsSwzeQI9fY40AooMM2autwFSr4= share/snis/models/wombat/snis3006lights.png -J2ITCLPl//7kBY19LAfA6vXNQ6C7bMz7jSa1lNHjWh0= share/snis/models/wombat/snis3006.obj -IVeO66j21TOqPNvr4UISTcfs9IoJz0VREBKpelurkzk= share/snis/models/wombat/snis3006.mtl -T2xvBU+qbg7gSuR06HbGPfuaEwaRfDhwI9Q/+aeYWLI= share/snis/models/wombat/snis3006.png -tZUd0fg7gzU8Yg3Oc2KR/oSpogeeQe1Hj6fTddHyTT0= share/snis/models/cruiser.scad_params.h -FK641cM9Cn3HrzxDzz+0+MBA9NMsiEaVpL7PkKpY+10= share/snis/models/vanquisher.scad_params.h -iSxkdU2+fCDobdSaH+65ZaN1XOx9nv9Pv01eN9JbqP0= share/snis/models/mantis.scad_params.h -+gyWpxtCPZDK4SjKAMBYnXgwvktwOtEK0GCNWPi4/OM= share/snis/models/enforcer/enforcer.png -037Rxd7G89RRYD/sKy+1K6LVQbhNzm4PxmR2xmZOqxY= share/snis/models/enforcer/enforcer.mtl -0iqatsYJNqoLONjqz4QrFY71lPUjm5l+uIiPdTDZ8qE= share/snis/models/enforcer/enforcer.obj -qI8pk3yex9c9NCNZCFzok4jdokRUe9awP49XCnY/vTE= share/snis/models/research-vessel/research-vessel.mtl -o+lB6nXxZcmrr6GoswoUv8ULY3pbkL/tc3n7dDuf8iA= share/snis/models/research-vessel/research-vessel.obj -xqwZ1a6qJ2JYQwjzP6IJuMWafdvVWMcKqrxvl8YfJzk= share/snis/models/research-vessel/research-vessel.png -Rn6FK2QXFzJrzTJ/4XTSZ9/shg4eAqwEeuqav6ktkTM= share/snis/models/starbase/starbase.mtl -saHGlegSC8YLUq/9LFBU+jh4vkxKiO8m0eqdOA+SiYY= share/snis/models/starbase/starbase-lighting.png -xHYqm7W/f3lHTbjcEslxna3JUTr/lASichFar5JkF6A= share/snis/models/starbase/starbase.png -GxlsExc94q4j/CG9a02TrQBxtf2zFWMxt6qdYb4T0tk= share/snis/models/starbase/starbase.obj -8Ql80Ex6EPNYG924uh4MLJFFt81pRdBopqocbyxufwM= share/snis/models/conqueror.scad_params.h -YB1UcmKP0SN0qYfJZH21+jZ+Ih/Z3B2KMmWGW/lkcRU= share/snis/models/dragonhawk.scad_params.h -zbRK2eGImSTOiyKnntKfLxCT1bN3NBhKSRLV01OQYMo= share/snis/models/escapepod.scad_params.h diff --git a/pkgs/by-name/sn/snis-assets/package.nix b/pkgs/by-name/sn/snis-assets/package.nix deleted file mode 100644 index 6fb49f5377af9..0000000000000 --- a/pkgs/by-name/sn/snis-assets/package.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - fetchurl, -}: - -let - # Original manifest file at https://spacenerdsinspace.com/snis-assets/manifest.txt transformed using - # awk '{print $2}' manifest.txt | grep -v -E '\.stl$' | xargs cksum -a sha256 --base64 --untagged - manifest = ./manifest.txt; - assets = lib.lists.init (lib.strings.splitString "\n" (builtins.readFile manifest)); - ASSET_URL = "https://spacenerdsinspace.com/snis-assets"; -in -stdenv.mkDerivation { - pname = "snis_assets"; - version = "2024-08-02"; - - srcs = map ( - line: - let - asset = lib.strings.splitString " " line; - in - fetchurl { - url = "${ASSET_URL}/${builtins.elemAt asset 1}"; - hash = "sha256-${builtins.elemAt asset 0}"; - } - ) assets; - - dontUnpack = true; - - installPhase = '' - mkdir -p $out - read -r -a store_paths <<< "$srcs" - mapfile -t out_paths < <(awk '{print $2}' ${manifest}) - - for i in ''${!store_paths[@]} - do - install -m 444 -D ''${store_paths[$i]} $out/''${out_paths[$i]} - done - ''; - - meta = with lib; { - description = "Assets for Space Nerds In Space, a multi-player spaceship bridge simulator"; - homepage = "https://smcameron.github.io/space-nerds-in-space/"; - license = [ - licenses.cc-by-sa-30 - licenses.cc-by-30 - licenses.cc0 - licenses.publicDomain - ]; - maintainers = with maintainers; [ alyaeanyx ]; - platforms = platforms.linux; - hydraPlatforms = [ ]; - }; -} diff --git a/pkgs/by-name/sn/snis-unwrapped/package.nix b/pkgs/by-name/sn/snis-unwrapped/package.nix deleted file mode 100644 index 07ae89fa3c04f..0000000000000 --- a/pkgs/by-name/sn/snis-unwrapped/package.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - coreutils, - portaudio, - libbsd, - libpng, - libvorbis, - SDL2, - makeWrapper, - lua5_2, - glew, - openssl, - picotts, - alsa-utils, - espeak-classic, - sox, - libopus, - openscad, - libxcrypt-legacy, -}: - -stdenv.mkDerivation { - pname = "snis_launcher"; - version = "2024-08-02"; - - src = fetchFromGitHub { - owner = "smcameron"; - repo = "space-nerds-in-space"; - rev = "1dadfca31513561cf95f1229af34341bd1a1bb2a"; - sha256 = "sha256-Qi4lbq1rsayMdRWMAF44K2DNtlZxNUyjnO6kXCW5QhA="; - }; - - enableParallelBuilding = true; - - postPatch = '' - substituteInPlace Makefile \ - --replace "OPUSARCHIVE=libopus.a" "OPUSARCHIVE=" \ - --replace "-I./opus-1.3.1/include" "-I${libopus.dev}/include/opus" - substituteInPlace snis_text_to_speech.sh \ - --replace "pico2wave" "${sox}/bin/pico2wave" \ - --replace "espeak" "${espeak-classic}/bin/espeak" \ - --replace "play" "${sox}/bin/play" \ - --replace "aplay" "${alsa-utils}/bin/aplay" \ - --replace "/bin/rm" "${coreutils}/bin/rm" - ''; - - nativeBuildInputs = [ - pkg-config - openscad - makeWrapper - ]; - - buildInputs = [ - coreutils - portaudio - libbsd - libpng - libvorbis - SDL2 - lua5_2 - glew - openssl - picotts - sox - alsa-utils - libopus - libxcrypt-legacy - ]; - - makeFlags = [ "PREFIX=$(out)" ]; - buildFlags = [ - "all" - "models" - ]; - - meta = with lib; { - description = "Space Nerds In Space, a multi-player spaceship bridge simulator"; - homepage = "https://smcameron.github.io/space-nerds-in-space/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ alyaeanyx ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/sn/snis/package.nix b/pkgs/by-name/sn/snis/package.nix index 4db2fb5f39571..2b1d168467cfb 100644 --- a/pkgs/by-name/sn/snis/package.nix +++ b/pkgs/by-name/sn/snis/package.nix @@ -1,32 +1,74 @@ -{ - buildEnv, - snis-unwrapped, - snis-assets, - makeWrapper, +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, coreutils +, portaudio +, libbsd +, libpng +, libvorbis +, SDL2 +, makeWrapper +, lua5_2 +, glew +, openssl +, picotts +, alsa-utils +, espeak-classic +, sox +, libopus +, openscad +, libxcrypt }: -buildEnv { - name = "snis-${snis-unwrapped.version}"; - nativeBuildInputs = [ makeWrapper ]; +stdenv.mkDerivation { + pname = "snis_launcher"; + version = "unstable-2021-10-17"; - paths = [ - snis-unwrapped - snis-assets - ]; + src = fetchFromGitHub { + owner = "smcameron"; + repo = "space-nerds-in-space"; + rev = "e70d3c63e33c940feb53c8d818ce2d8ea2aadf00"; + sha256 = "sha256-HVCb1iFn7GWNpedtFCgLyd0It8s4PEmUwDfb8ap1TDc="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace "OPUSARCHIVE=libopus.a" "OPUSARCHIVE=" \ + --replace "-I./opus-1.3.1/include" "-I${libopus.dev}/include/opus" + substituteInPlace snis_launcher \ + --replace "PREFIX=." "PREFIX=$out" + substituteInPlace snis_text_to_speech.sh \ + --replace "pico2wave" "${sox}/bin/pico2wave" \ + --replace "espeak" "${espeak-classic}/bin/espeak" \ + --replace "play" "${sox}/bin/play" \ + --replace "aplay" "${alsa-utils}/bin/aplay" \ + --replace "/bin/rm" "${coreutils}/bin/rm" + ''; - pathsToLink = [ - "/" - "/bin" - ]; + nativeBuildInputs = [ pkg-config openscad makeWrapper ]; + buildInputs = [ coreutils portaudio libbsd libpng libvorbis SDL2 lua5_2 glew openssl picotts sox alsa-utils libopus libxcrypt ]; postBuild = '' - for i in $out/bin/*; do - wrapProgram "$i" \ - --set SNIS_ASSET_DIR "$out/share/snis" - done + make models -j$NIX_BUILD_CORES + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -R share $out/share + cp -R bin $out/bin + cp snis_launcher $out/bin/ + # without this, snis_client crashes on Wayland + wrapProgram $out/bin/snis_client --set SDL_VIDEODRIVER x11 + runHook postInstall ''; - meta = snis-unwrapped // { - hydraPlatforms = [ ]; + meta = with lib; { + description = "Space Nerds In Space, a multi-player spaceship bridge simulator"; + homepage = "https://smcameron.github.io/space-nerds-in-space/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ alyaeanyx ]; + platforms = platforms.linux; }; } diff --git a/pkgs/by-name/so/soplex/package.nix b/pkgs/by-name/so/soplex/package.nix index 2ee0976e6c9d9..90d97c7077384 100644 --- a/pkgs/by-name/so/soplex/package.nix +++ b/pkgs/by-name/so/soplex/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "soplex"; - version = "712"; + version = "7.1.1"; src = fetchFromGitHub { owner = "scipopt"; repo = "soplex"; rev = "release-${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}"; - hash = "sha256-8muN9wYDQX5CULifKBYO/t9whS2LsatrYB2khlV0akg="; + hash = "sha256-f4PMJz/VHCx5Uk7M9JdE+4Qpf29X3S/umoiAo8NXYrU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/st/starpls-bin/package.nix b/pkgs/by-name/st/starpls-bin/package.nix new file mode 100644 index 0000000000000..98ae3ffa31c5a --- /dev/null +++ b/pkgs/by-name/st/starpls-bin/package.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchurl, autoPatchelfHook }: + +stdenv.mkDerivation (finalAttrs: { + pname = "starpls-bin"; + version = "0.1.14"; + + src = { + x86_64-linux = fetchurl { + url = "https://github.com/withered-magic/starpls/releases/download/v${finalAttrs.version}/starpls-linux-amd64"; + hash = "sha256-PYU+Jv3uaJqJKw6zSNOPl+NlIQgfm38cOrRqTdNXY+8="; + }; + aarch64-darwin = fetchurl { + url = "https://github.com/withered-magic/starpls/releases/download/v${finalAttrs.version}/starpls-darwin-arm64"; + hash = "sha256-9d1ybebguEUJu2PvMcToQEd8M4ajRrQUvBZqS6o0sbw="; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isElf [ + autoPatchelfHook + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isElf [ + (lib.getLib stdenv.cc.cc) + ]; + + installPhase = '' + install -D $src $out/bin/starpls + ''; + + meta = with lib; { + homepage = "https://github.com/withered-magic/starpls"; + description = "A language server for Starlark"; + license = licenses.asl20; + platforms = [ "aarch64-darwin" "x86_64-linux" ]; + maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "starpls"; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/st/starpls/manifest.json b/pkgs/by-name/st/starpls/manifest.json deleted file mode 100644 index 99de0529906ff..0000000000000 --- a/pkgs/by-name/st/starpls/manifest.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": "0.1.15", - "assets": { - "x86_64-linux": { - "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.15/starpls-linux-amd64", - "hash": "sha256-6rLYCRg7K36xKxW0nI86w6u1MjAPGTtJQbY5HCSukTE=" - }, - "aarch64-linux": { - "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.15/starpls-linux-aarch64", - "hash": "sha256-sHyPcaBlhZrepfnVGE5CxvZZOrBMT0qDP9hHj78CXJQ=" - }, - "aarch64-darwin": { - "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.15/starpls-darwin-arm64", - "hash": "sha256-Q8U+Vagwb9F63N5UA8sAOd+tfCvyZMdtAmZcNgtwiSo=" - } - } -} diff --git a/pkgs/by-name/st/starpls/package.nix b/pkgs/by-name/st/starpls/package.nix deleted file mode 100644 index 7cbe984d31c79..0000000000000 --- a/pkgs/by-name/st/starpls/package.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - autoPatchelfHook, - testers, - starpls, -}: - -let - manifest = lib.importJSON ./manifest.json; -in -stdenv.mkDerivation (finalAttrs: { - pname = "starpls"; - version = manifest.version; - - src = - let - system = stdenv.hostPlatform.system; - in - fetchurl (manifest.assets.${system} or (throw "Unsupported system: ${system}")); - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isElf [ - autoPatchelfHook - ]; - - buildInputs = lib.optionals stdenv.hostPlatform.isElf [ - (lib.getLib stdenv.cc.cc) - ]; - - installPhase = '' - install -D $src $out/bin/starpls - ''; - - passthru = { - tests.version = testers.testVersion { - package = starpls; - command = "starpls version"; - version = "v${finalAttrs.version}"; - }; - updateScript = ./update.py; - }; - - meta = { - description = "Language server for Starlark"; - homepage = "https://github.com/withered-magic/starpls"; - license = lib.licenses.asl20; - platforms = builtins.attrNames manifest.assets; - maintainers = with lib.maintainers; [ aaronjheng ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - mainProgram = "starpls"; - }; -}) diff --git a/pkgs/by-name/st/starpls/update.py b/pkgs/by-name/st/starpls/update.py deleted file mode 100755 index c019a893d1893..0000000000000 --- a/pkgs/by-name/st/starpls/update.py +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i python -p "python3.withPackages (ps: with ps; [ ps.httpx ps.socksio ])" - -import json -import os -import pathlib -import subprocess - -import httpx - -platforms = { - "x86_64-linux": "linux-amd64", - "aarch64-linux": "linux-aarch64", - "aarch64-darwin": "darwin-arm64", -} - -if __name__ == "__main__": - headers = {} - token = os.getenv("GITHUB_TOKEN") - if token is not None: - headers["Authorization"] = "Bearer {}".format(token) - - resp = httpx.get( - "https://api.github.com/repos/withered-magic/starpls/releases/latest", - headers=headers, - ) - - latest_release = resp.json().get("tag_name") - version = latest_release.removeprefix("v") - - assets = { - "version": version, - "assets": {}, - } - - for k, v in platforms.items(): - url = "https://github.com/withered-magic/starpls/releases/download/v{}/starpls-{}".format( - version, v - ) - - process = subprocess.run( - ["nix-prefetch-url", "--type", "sha256", url], - capture_output=True, - text=True, - ) - - process.check_returncode() - - process = subprocess.run( - ["nix-hash", "--type", "sha256", "--to-sri", process.stdout.rstrip()], - capture_output=True, - text=True, - ) - - process.check_returncode() - - hash = process.stdout.rstrip() - assets["assets"][k] = { - "url": url, - "hash": hash, - } - - (pathlib.Path(__file__).parent / "manifest.json").write_text( - json.dumps(assets, indent=2) + "\n" - ) diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix index f1d349af65494..d788afe3e88e3 100644 --- a/pkgs/by-name/su/superfile/package.nix +++ b/pkgs/by-name/su/superfile/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "superfile"; - version = "1.1.6"; + version = "1.1.5"; src = fetchFromGitHub { owner = "yorukot"; repo = "superfile"; rev = "v${version}"; - hash = "sha256-3zQDErfst0CAE9tdOUtPGtGWuOo/K8x/M+r6+RPrlCM="; + hash = "sha256-/MdcfZpYr7vvPIq0rqLrPRPPU+cyp2y0EyxQPf9znwQ="; }; - vendorHash = "sha256-DU0Twutepmk+8lkBM2nDChbsSHh4awt5m33ACUtH4AQ="; + vendorHash = "sha256-8WGmksKH0rmfRH6Xxd0ACl1FS7YPphG7hsIB5/o38lQ="; ldflags = ["-s" "-w"]; diff --git a/pkgs/by-name/su/supermariowar/package.nix b/pkgs/by-name/su/supermariowar/package.nix index f661e69d9b43e..cac54270548b4 100644 --- a/pkgs/by-name/su/supermariowar/package.nix +++ b/pkgs/by-name/su/supermariowar/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "supermariowar"; - version = "2023-unstable-2024-10-17"; + version = "2023-unstable-2024-09-21"; src = fetchFromGitHub { owner = "mmatyas"; repo = "supermariowar"; - rev = "a04d6f4069d2ef90a76bf562d1fd937c9cf56140"; - hash = "sha256-4WsjSjT3uN5hBqUtH6UaTxHUYkwvjiYrWzRqY3vBpAE="; + rev = "7e7ebe39cadba5d0bd9d7e87a08264332c2f1f12"; + hash = "sha256-kBwaqw0GZvLWE5GqgfieLRU4s8wYFtTZyl1MgwWGbMc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sw/sword/package.nix b/pkgs/by-name/sw/sword/package.nix index 7ee1646ad2277..d2be17e78d92a 100644 --- a/pkgs/by-name/sw/sword/package.nix +++ b/pkgs/by-name/sw/sword/package.nix @@ -117,6 +117,7 @@ stdenv.mkDerivation ( ''; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ + AndersonTorres greg ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/sx/sxhkd/package.nix b/pkgs/by-name/sx/sxhkd/package.nix index 2ae07339b4209..ea688c23e714b 100644 --- a/pkgs/by-name/sx/sxhkd/package.nix +++ b/pkgs/by-name/sx/sxhkd/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/baskerville/sxhkd"; license = lib.licenses.bsd2; mainProgram = "sxhkd"; - maintainers = with lib.maintainers; [ vyp ncfavier ]; + maintainers = with lib.maintainers; [ vyp AndersonTorres ncfavier ]; inherit (libxcb.meta) platforms; }; }) diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index 6aa9f47e7699a..7bcb0c565974c 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -1,89 +1,77 @@ -{ - lib, - fetchFromGitLab, - libseccomp, - mandoc, - nix-update-script, - pkg-config, - rustPlatform, - scdoc, - sydbox, - testers, +{ lib +, stdenv +, fetchurl +, pkg-config +, autoreconfHook +, python3 +, perl +, libxslt +, docbook_xsl +, docbook_xml_dtd_42 +, libseccomp +, installTests ? true, gnumake, which +, debugBuild ? false, libunwind }: -rustPlatform.buildRustPackage rec { - pname = "sydbox"; - version = "3.28.3"; +stdenv.mkDerivation rec { + pname = "sydbox-1"; + version = "2.2.0"; - outputs = [ - "out" - "man" - ]; + outputs = [ "out" "dev" "man" "doc" ] + ++ lib.optional installTests "installedTests"; - src = fetchFromGitLab { - domain = "gitlab.exherbo.org"; - owner = "Sydbox"; - repo = "sydbox"; - rev = "refs/tags/v${version}"; - hash = "sha256-9IegNFkOWYt+jdpN0rk4S/qyD/NSPaSqmFnMmCl/3Tk="; + src = fetchurl { + url = "https://git.exherbo.org/${pname}.git/snapshot/${pname}-${version}.tar.xz"; + sha256 = "0664myrrzbvsw73q5b7cqwgv4hl9a7vkm642s1r96gaxm16jk0z7"; }; - cargoHash = "sha256-6/D//mkPDRW01SCLmQGWwFCClZ84aJUPhleWGVCJaKM="; - nativeBuildInputs = [ - mandoc pkg-config - scdoc + autoreconfHook + python3 + perl + libxslt.bin + docbook_xsl + docbook_xml_dtd_42 ]; - buildInputs = [ libseccomp ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + buildInputs = [ + libseccomp + ] ++ lib.optional debugBuild libunwind + ++ lib.optionals installTests [ + gnumake + python3 + perl + which + ]; - checkFlags = [ - # rm -rf tmpdir: Os { code: 2, kind: NotFound, message: "No such file or directory" } - "--skip=fs::tests::test_relative_symlink_resolution" - # Failed to write C source file!: Os { code: 13, kind: PermissionDenied, message: "Permission denied" } - "--skip=proc::tests::test_proc_set_at_secure_test_32bit_dynamic" - # /bin/false: Os { code: 2, kind: NotFound, message: "No such file or directory" } - "--skip=syd_test" + enableParallelBuilding = true; - # Endlessly stall. Maybe a sandbox issue? - "--skip=caps" - "--skip=landlock::compat::Compatible::set_compatibility" - "--skip=landlock::fs::PathBeneath" - "--skip=landlock::fs::PathFd" - "--skip=landlock::fs::path_beneath_rules" - "--skip=proc::proc_cmdline" - "--skip=proc::proc_comm" - ]; + configureFlags = [ ] + ++ lib.optionals installTests [ "--enable-installed-tests" + "--libexecdir=${placeholder "installedTests"}/libexec" ] + ++ lib.optional debugBuild "--enable-debug"; - # TODO: Have these directories be created upstream similar to the vim files - postInstall = '' - mkdir -p $out/share/man/man{1,2,5,7} + makeFlags = [ "SYD_INCLUDEDIR=${stdenv.cc.libc.dev}/include" ]; - make $makeFlags install-{man,vim} + doCheck = true; + checkPhase = '' + # Many of the regular test cases in t/ do not work inside the build sandbox + make -C syd check ''; - passthru = { - tests.version = testers.testVersion { - package = sydbox; - command = "syd -V"; - }; - - updateScript = nix-update-script { }; - }; + postInstall = if installTests then '' + moveToOutput bin/syd-test $installedTests + '' else '' + # Tests are installed despite --disable-installed-tests + rm -r $out/bin/syd-test $out/libexec + ''; - meta = { + meta = with lib; { + homepage = "https://sydbox.exherbo.org/"; description = "seccomp-based application sandbox"; - homepage = "https://gitlab.exherbo.org/sydbox/sydbox"; - changelog = "https://gitlab.exherbo.org/sydbox/sydbox/-/blob/v${version}/ChangeLog.md"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - mvs - getchoo - ]; - mainProgram = "syd"; - platforms = lib.platforms.linux; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ mvs ]; }; } diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix index 46a1a32ad3876..38aad6a345b26 100644 --- a/pkgs/by-name/sy/syshud/package.nix +++ b/pkgs/by-name/sy/syshud/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "syshud"; - version = "0-unstable-2024-11-12"; + version = "0-unstable-2024-11-04"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syshud"; - rev = "734d632ca0665a288d1308f883d974462fa2d349"; - hash = "sha256-Rk0q/veBEJh8BHZZoFcGZ+Beh8mWGGi2OiuGlM0NEgs="; + rev = "157b725a3f29d67f16c25fb3062b62ad6fec4e15"; + hash = "sha256-q04xYOdnnyUyiFc72Gzk65fWzQgYSOACPUXIk7kvIP8="; }; postPatch = '' diff --git a/pkgs/by-name/ta/taxi/package.nix b/pkgs/by-name/ta/taxi/package.nix index 9552afd1a635c..4b3303ecd0acd 100644 --- a/pkgs/by-name/ta/taxi/package.nix +++ b/pkgs/by-name/ta/taxi/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Alecaddd/taxi"; description = "FTP Client that drives you anywhere"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; platforms = platforms.linux; mainProgram = "com.github.alecaddd.taxi"; }; diff --git a/pkgs/by-name/te/technitium-dns-server-library/package.nix b/pkgs/by-name/te/technitium-dns-server-library/package.nix deleted file mode 100644 index 1abde74faa6e7..0000000000000 --- a/pkgs/by-name/te/technitium-dns-server-library/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildDotnetModule, - fetchFromGitHub, - dotnetCorePackages, - nix-update-script, -}: -buildDotnetModule rec { - pname = "technitium-dns-server-library"; - version = "dns-server-v13.2"; - - src = fetchFromGitHub { - owner = "TechnitiumSoftware"; - repo = "TechnitiumLibrary"; - rev = "refs/tags/${version}"; - hash = "sha256-stfxYe0flE1daPuXw/GAgY52ZD7pkqnBIBvmSVPWWjI="; - name = "${pname}-${version}"; - }; - - dotnet-sdk = dotnetCorePackages.sdk_8_0; - - nugetDeps = ./nuget-deps.nix; - - projectFile = [ - "TechnitiumLibrary.ByteTree/TechnitiumLibrary.ByteTree.csproj" - "TechnitiumLibrary.Net/TechnitiumLibrary.Net.csproj" - ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - changelog = "https://github.com/TechnitiumSoftware/DnsServer/blob/master/CHANGELOG.md"; - description = "Library for Authorative and Recursive DNS server for Privacy and Security"; - homepage = "https://github.com/TechnitiumSoftware/DnsServer"; - license = lib.licenses.gpl3Only; - mainProgram = "technitium-dns-server-library"; - maintainers = with lib.maintainers; [ fabianrig ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.nix b/pkgs/by-name/te/technitium-dns-server/library-nuget-deps.nix similarity index 100% rename from pkgs/by-name/te/technitium-dns-server-library/nuget-deps.nix rename to pkgs/by-name/te/technitium-dns-server/library-nuget-deps.nix diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix index 283791658a1c1..ae5cccf2902e2 100644 --- a/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/pkgs/by-name/te/technitium-dns-server/package.nix @@ -3,19 +3,40 @@ buildDotnetModule, fetchFromGitHub, dotnetCorePackages, - technitium-dns-server-library, nixosTests, - nix-update-script, }: +let + technitium-library = buildDotnetModule rec { + pname = "TechnitiumLibrary"; + version = "13.0.2"; + + src = fetchFromGitHub { + owner = "TechnitiumSoftware"; + repo = "TechnitiumLibrary"; + rev = "refs/tags/dns-server-v${version}"; + hash = "sha256-mMNZZvM/UvQTiyeOgPHXXFxmsiGPe4Jal1aSEMEM5Xc="; + name = "${pname}-${version}"; + }; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + + nugetDeps = ./library-nuget-deps.nix; + + projectFile = [ + "TechnitiumLibrary.ByteTree/TechnitiumLibrary.ByteTree.csproj" + "TechnitiumLibrary.Net/TechnitiumLibrary.Net.csproj" + ]; + }; +in buildDotnetModule rec { pname = "technitium-dns-server"; - version = "13.2"; + version = "13.0.2"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "DnsServer"; rev = "refs/tags/v${version}"; - hash = "sha256-oxLMBs+XkzvlfSst6ZD56ZIgiXwm0Px8Tn3Trdd/6H8="; + hash = "sha256-2dFjr3f4ZlLBJzuObSYIkSdtcyZ8dC6M7/S1p7WoG0c="; name = "${pname}-${version}"; }; @@ -29,7 +50,7 @@ buildDotnetModule rec { # move dependencies from TechnitiumLibrary to the expected directory preBuild = '' mkdir -p ../TechnitiumLibrary/bin - cp -r ${technitium-dns-server-library}/lib/${technitium-dns-server-library.pname}/* ../TechnitiumLibrary/bin/ + cp -r ${technitium-library}/lib/TechnitiumLibrary/* ../TechnitiumLibrary/bin/ ''; postFixup = '' @@ -40,8 +61,6 @@ buildDotnetModule rec { inherit (nixosTests) technitium-dns-server; }; - passthru.updateScript = nix-update-script { }; - meta = { changelog = "https://github.com/TechnitiumSoftware/DnsServer/blob/master/CHANGELOG.md"; description = "Authorative and Recursive DNS server for Privacy and Security"; diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix deleted file mode 100644 index bc2aa1ef07f0c..0000000000000 --- a/pkgs/by-name/te/television/package.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - testers, - television, - nix-update-script, -}: -rustPlatform.buildRustPackage rec { - pname = "television"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "alexpasmantier"; - repo = "television"; - rev = "refs/tags/" + version; - hash = "sha256-mbf39AcW7MYu0A6D7poX6TChJccqweBvUbzJ1Ib+ABI="; - }; - - cargoHash = "sha256-aWEqPIAcq5ZWCf0ZOYnswmj2dR0+41D1HMna0TAhxcE="; - - passthru = { - tests.version = testers.testVersion { - package = television; - command = "XDG_DATA_HOME=$TMPDIR tv --version"; - }; - updateScript = nix-update-script { }; - }; - - meta = { - description = "Television is a blazingly fast general purpose fuzzy finder"; - - longDescription = '' - Television is a blazingly fast general purpose fuzzy finder TUI written - in Rust. It is inspired by the neovim telescope plugin and is designed - to be fast, efficient, simple to use and easily extensible. It is built - on top of tokio, ratatui and the nucleo matcher used by the helix editor. - ''; - - homepage = "https://github.com/alexpasmantier/television"; - changelog = "https://github.com/alexpasmantier/television/releases/tag/${version}"; - license = lib.licenses.mit; - mainProgram = "tv"; - maintainers = with lib.maintainers; [ - louis-thevenet - getchoo - ]; - }; -} diff --git a/pkgs/by-name/te/textlint/package.nix b/pkgs/by-name/te/textlint/package.nix index f415f3dbceda3..cd508c1e200c8 100644 --- a/pkgs/by-name/te/textlint/package.nix +++ b/pkgs/by-name/te/textlint/package.nix @@ -28,13 +28,13 @@ buildNpmPackage rec { pname = "textlint"; - version = "14.3.0"; + version = "14.2.1"; src = fetchFromGitHub { owner = "textlint"; repo = "textlint"; rev = "refs/tags/v${version}"; - hash = "sha256-FbPJr7oTsU7WC5RTXyG7X5d0KPJJqRbjGwM/F023Cx8="; + hash = "sha256-M3ahoQxEBTGfQy2k3QqIefh0emgGF9q+AwWTReKWbhM="; }; patches = [ @@ -44,7 +44,7 @@ buildNpmPackage rec { ./remove-workspaces.patch ]; - npmDepsHash = "sha256-l+1JntqIPttuYXKsVEdJOB1qQfsoheZk+7Z7OJ67z5E="; + npmDepsHash = "sha256-6qP3caFg4Cpm7yckjopRdX/D8jH9ObLCba1k2TiQWCA="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tidb/package.nix b/pkgs/by-name/ti/tidb/package.nix index be1b9d39290ac..3c251dacb7d26 100644 --- a/pkgs/by-name/ti/tidb/package.nix +++ b/pkgs/by-name/ti/tidb/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tidb"; - version = "8.4.0"; + version = "8.3.0"; src = fetchFromGitHub { owner = "pingcap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AVREHQnEBCU5Z9aiYWVi2jzZ5amb/Bc0jJogwGunU84="; + sha256 = "sha256-dlLT1vwRZ6vbfCRcMxevJQ99T2Aq4qaAVwitmcd9yJ4="; }; - vendorHash = "sha256-zRTFmXNTc2M24q8ClqsjNsok4RMi1Yyfe2ItE8I2Ww4="; + vendorHash = "sha256-NZv4DrPygSNCcK0A7VTGz0wIuHSR+Tf5Dhf5JuqiQ5A="; ldflags = [ "-X github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=${version}" diff --git a/pkgs/by-name/tl/tllist/package.nix b/pkgs/by-name/tl/tllist/package.nix index d800279a8a4c1..62bcbf0241f3b 100644 --- a/pkgs/by-name/tl/tllist/package.nix +++ b/pkgs/by-name/tl/tllist/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { structs, enums and unions. ''; license = licenses.mit; - maintainers = with maintainers; [ fionera ]; + maintainers = with maintainers; [ fionera AndersonTorres ]; platforms = platforms.all; }; }) diff --git a/pkgs/by-name/to/tomlc99/package.nix b/pkgs/by-name/to/tomlc99/package.nix index 2790e94b7c0dc..5ed4fd07b4720 100644 --- a/pkgs/by-name/to/tomlc99/package.nix +++ b/pkgs/by-name/to/tomlc99/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cktan/tomlc99"; description = "TOML v1.0.0-compliant library written in C99"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; }; } diff --git a/pkgs/by-name/tp/tplay/package.nix b/pkgs/by-name/tp/tplay/package.nix index 1de2fe2e4daf0..600e61fa77955 100644 --- a/pkgs/by-name/tp/tplay/package.nix +++ b/pkgs/by-name/tp/tplay/package.nix @@ -13,16 +13,16 @@ }: rustPlatform.buildRustPackage rec { pname = "tplay"; - version = "0.6.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "maxcurzi"; repo = "tplay"; rev = "v${version}"; - hash = "sha256-SRn7kg5FdSimKMFowKNUIan+MrojtNO0apeehIRTzfw="; + hash = "sha256-/3ui0VOxf+kYfb0JQXPVbjAyXPph2LOg2xB0DGmAbwc="; }; - cargoHash = "sha256-ztWs20Vl+fX0enL12pybiM6lhFh0/EFa1aSTRpzz64g="; + cargoHash = "sha256-zRkIEH37pvxHUbnfg25GW1Z7od9XMkRmP2Qvs64uUjg="; checkFlags = [ # requires network access "--skip=pipeline::image_pipeline::tests::test_process" diff --git a/pkgs/by-name/tr/tryton/package.nix b/pkgs/by-name/tr/tryton/package.nix index bbfd3098d927c..2da566d277600 100644 --- a/pkgs/by-name/tr/tryton/package.nix +++ b/pkgs/by-name/tr/tryton/package.nix @@ -19,12 +19,12 @@ python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "7.4.0"; + version = "7.2.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-FEPgJakSEqX4aUl9yHtRSTDPsFcD/mBNYoZIGDXXRIQ="; + hash = "sha256-dyJ+PsMUinJWYZjcwUuDLHQyB+m5AdfCR+gXfUrvjDc="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix index a9ebde1eb8541..a1cf6380d0c04 100644 --- a/pkgs/by-name/ts/tsukimi/package.nix +++ b/pkgs/by-name/ts/tsukimi/package.nix @@ -10,23 +10,23 @@ openssl, libepoxy, wrapGAppsHook4, + makeDesktopItem, stdenv, nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "tsukimi"; - version = "0.17.3"; + version = "0.16.9"; src = fetchFromGitHub { owner = "tsukinaha"; repo = "tsukimi"; rev = "v${version}"; - hash = "sha256-2AmDP4R06toNrtjV0HSO+Fj8mrXbLgC7bMQPvl10un0="; + hash = "sha256-SeABeXg2dpGYxGiDDwn811egRe8BYVdxK8hz7qfBagQ="; fetchSubmodules = true; }; - useFetchCargoVendor = true; - cargoHash = "sha256-3xu4h9ZHlqnaB6Pgn2ixyBF3VS6OF8ZkLaNU4unir7A="; + cargoHash = "sha256-o6FjBauHjdhxNXpqlJc/yNNTkRJyX3R4smAMrdFUjLA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ud/udevil/package.nix b/pkgs/by-name/ud/udevil/package.nix index 0da470f9a99fd..9c50b189cc150 100644 --- a/pkgs/by-name/ud/udevil/package.nix +++ b/pkgs/by-name/ud/udevil/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { homepage = "https://ignorantguru.github.io/udevil/"; description = "Mount without password"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ud/udiskie/package.nix b/pkgs/by-name/ud/udiskie/package.nix index 50abfb13e57ed..58fa8054c67d7 100644 --- a/pkgs/by-name/ud/udiskie/package.nix +++ b/pkgs/by-name/ud/udiskie/package.nix @@ -106,6 +106,6 @@ python3Packages.buildPythonApplication rec { - password caching (requires python keyutils 0.3) ''; license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ AndersonTorres dotlambda ]; }; } diff --git a/pkgs/by-name/ud/udunits/package.nix b/pkgs/by-name/ud/udunits/package.nix index 394058a3315c5..48ffb94175f98 100644 --- a/pkgs/by-name/ud/udunits/package.nix +++ b/pkgs/by-name/ud/udunits/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { converting values. ''; license = licenses.asl20; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ AndersonTorres pSub ]; platforms = platforms.all; mainProgram = "udunits2"; }; diff --git a/pkgs/by-name/va/variety/package.nix b/pkgs/by-name/va/variety/package.nix index ddfa2f9ea8510..748dd7fcf18e1 100644 --- a/pkgs/by-name/va/variety/package.nix +++ b/pkgs/by-name/va/variety/package.nix @@ -95,6 +95,6 @@ python3.pkgs.buildPythonApplication rec { blur, as well as options to layer quotes and a clock onto the background. ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ p3psi zfnmxt ]; + maintainers = with maintainers; [ p3psi AndersonTorres zfnmxt ]; }; } diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index 2c005cbfa4342..427263200911f 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -305,7 +305,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Cross-platform media player and streaming server"; homepage = "https://www.videolan.org/vlc/"; license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ alois31 ]; + maintainers = with lib.maintainers; [ AndersonTorres alois31 ]; platforms = lib.platforms.linux; mainProgram = "vlc"; }; diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix index bb3c4df40ef19..75fb3d74c2a71 100644 --- a/pkgs/by-name/wa/waf/package.nix +++ b/pkgs/by-name/wa/waf/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.com/ita1024/waf/blob/waf-${finalAttrs.version}/ChangeLog"; license = lib.licenses.bsd3; mainProgram = "waf"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (python3.meta) platforms; sourceProvenance = [ lib.sourceTypes.fromSource ]; }; diff --git a/pkgs/by-name/wa/wayclip/package.nix b/pkgs/by-name/wa/wayclip/package.nix deleted file mode 100644 index 43e75ad16b871..0000000000000 --- a/pkgs/by-name/wa/wayclip/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchFromSourcehut, - nix-update-script, - wayland, - wayland-scanner, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "wayclip"; - version = "0.4.2"; - - outputs = [ - "out" - "man" - ]; - - src = fetchFromSourcehut { - owner = "~noocsharp"; - repo = "wayclip"; - rev = finalAttrs.version; - hash = "sha256-/xii/FF8JPv6KbMMxzww9AYqYJrpKYowsxQ5Bz7m+/M="; - }; - - strictDeps = true; - - nativeBuildInputs = [ wayland-scanner ]; - - buildInputs = [ wayland ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = { - description = "Wayland clipboard utility"; - homepage = "https://sr.ht/~noocsharp/wayclip/"; - license = lib.licenses.isc; - maintainers = with lib.maintainers; [ getchoo ]; - mainProgram = "waycopy"; - inherit (wayland.meta) platforms; - }; -}) diff --git a/pkgs/by-name/wl/wl-crosshair/package.nix b/pkgs/by-name/wl/wl-crosshair/package.nix deleted file mode 100644 index 1c993efa08984..0000000000000 --- a/pkgs/by-name/wl/wl-crosshair/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - fetchFromGitHub, - makeBinaryWrapper, - rustPlatform, -}: -rustPlatform.buildRustPackage { - pname = "wl-crosshair"; - version = "0.1.0-unstable-2024-05-09"; - - src = fetchFromGitHub { - owner = "lelgenio"; - repo = "wl-crosshair"; - rev = "39b716cf410a1b45006f50f32f8d63de5c43aedb"; - hash = "sha256-q5key9BWJjJQqECrhflso9ZTzULBeScvromo0S4fjqE="; - }; - - cargoHash = "sha256-+QAvwnMMADj8Guo1idWj4uqmdxTLK95CB2BwP4QeQ18="; - - nativeBuildInputs = [ makeBinaryWrapper ]; - - postInstall = '' - mkdir -p $out/share - cp -r ./cursors $out/share/cursors - wrapProgram $out/bin/wl-crosshair \ - --set-default WL_CROSSHAIR_IMAGE_PATH $out/share/cursors/inverse-v.png - ''; - - meta = { - description = "A crosshair overlay for wlroots compositor"; - homepage = "https://github.com/lelgenio/wl-crosshair"; - license = lib.licenses.unfree; # didn't found a license - mainProgram = "wl-crosshair"; - maintainers = with lib.maintainers; [ Guanran928 ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index 173e47248b8ec..ed0f3b0f30d3d 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2024.18"; + version = "2024.16"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-zwOsZG7YU00wz2ZUbOVgGNQxRU81nURjW+B+XTruOuQ="; + hash = "sha256-r9NtNuPmc8J1y3MxA4oSdRmPKDQeDQENdKbNVlcGwAI="; }; meta = { diff --git a/pkgs/by-name/xm/xmldiff/package.nix b/pkgs/by-name/xm/xmldiff/package.nix index 6d9ce6076e336..dc0885a71f3f5 100644 --- a/pkgs/by-name/xm/xmldiff/package.nix +++ b/pkgs/by-name/xm/xmldiff/package.nix @@ -36,6 +36,6 @@ python3.pkgs.buildPythonApplication { readable diffs in those situations. ''; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ anpryl ]; + maintainers = with lib.maintainers; [ AndersonTorres anpryl ]; }; } diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index f9e5dc7e9ed0c..c3efe2aaeb7af 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -90,13 +90,13 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.162.5"; + version = "0.162.3"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-ZrjrJbRvyw5insK+v5fxKj8ouylIPxapDVFgLb3M3uE="; + hash = "sha256-B0iTJMVUpsSVZ0l2bdPnWc7YaZErKnxqiuhgYopmJ/4="; }; patches = @@ -118,7 +118,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-/KjZTtkSI7njErwgwJY5OEM172TreBfq80w8bA3xg2k="; + cargoHash = "sha256-88x9x+EoH1Vi34CdFdYRD8EQzGHU+8DTHd0tT+tyW8k="; nativeBuildInputs = [ diff --git a/pkgs/by-name/zi/zile/package.nix b/pkgs/by-name/zi/zile/package.nix index 26f0f3484d444..35714e8d3c0e0 100644 --- a/pkgs/by-name/zi/zile/package.nix +++ b/pkgs/by-name/zi/zile/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { every Emacs user should feel at home. ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub AndersonTorres ]; platforms = platforms.unix; mainProgram = "zile"; }; diff --git a/pkgs/by-name/zx/zxing-cpp/package.nix b/pkgs/by-name/zx/zxing-cpp/package.nix index 30a304867d585..affac873f2cd3 100644 --- a/pkgs/by-name/zx/zxing-cpp/package.nix +++ b/pkgs/by-name/zx/zxing-cpp/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { formats. ''; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ lukegb ]; + maintainers = with lib.maintainers; [ AndersonTorres lukegb ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix index fe48972b0573a..f0622f56cd95f 100644 --- a/pkgs/data/fonts/font-awesome/default.nix +++ b/pkgs/data/fonts/font-awesome/default.nix @@ -61,7 +61,7 @@ in hash = "sha256-gd23ZplNY56sm1lfkU3kPXUOmNmY5SRnT0qlQZRNuBo="; }; v6 = font-awesome { - version = "6.7.1"; - hash = "sha256-Lzy12F0qEGzvdyN9SC3nyh2eTc80HM4qR5U6h0G15bo="; + version = "6.6.0"; + hash = "sha256-tQ9Hxph5YiPZMiO9gs2HCkRJ8cdECa2swgS++cytEnM="; }; } diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 489b9f98f39d4..edb942833123c 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -23,119 +23,119 @@ in }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. - libgnome-keyring = throw "The ‘gnome.libgnome-keyring’ was moved to top-level. Please use ‘pkgs.libgnome-keyring’ directly."; # Added on 2024-06-22. - libchamplain = throw "The ‘gnome.libchamplain’ was removed as unused. Please use ‘pkgs.libchamplain’ directly."; # Added on 2024-08-11. - libsoup = throw "The ‘gnome.libsoup’ was removed as unused. Please use ‘pkgs.libsoup’."; # Added on 2024-08-11. + libgnome-keyring = lib.warn "The ‘gnome.libgnome-keyring’ was moved to top-level. Please use ‘pkgs.libgnome-keyring’ directly." pkgs.libgnome-keyring; # Added on 2024-06-22. + libchamplain = lib.warn "The ‘gnome.libchamplain’ was removed as unused. Please use ‘pkgs.libchamplain’ directly." pkgs.libchamplain; # Added on 2024-08-11. + libsoup = lib.warn "The ‘gnome.libsoup’ was removed as unused. Please use ‘pkgs.libsoup’." pkgs.libsoup; # Added on 2024-08-11. gedit = throw "The ‘gnome.gedit’ alias was removed. Please use ‘pkgs.gedit’ directly."; # converted to throw on 2023-12-27 gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27 gnome-online-miners = throw "The ‘gnome.gnome-online-miners’ was removed, it was broken and abandoned."; # added on 2024-08-11. - accerciser = throw "The ‘gnome.accerciser’ was moved to top-level. Please use ‘pkgs.accerciser’ directly."; # Added on 2024-06-22. - adwaita-icon-theme = throw "The ‘gnome.adwaita-icon-theme’ was moved to top-level. Please use ‘pkgs.adwaita-icon-theme’ directly."; # Added on 2024-06-22. - aisleriot = throw "The ‘gnome.aisleriot’ was moved to top-level. Please use ‘pkgs.aisleriot’ directly."; # Added on 2024-08-11. - atomix = throw "The ‘gnome.atomix’ was moved to top-level. Please use ‘pkgs.atomix’ directly."; # Added on 2024-08-11. - baobab = throw "The ‘gnome.baobab’ was moved to top-level. Please use ‘pkgs.baobab’ directly."; # Added on 2024-06-22. - caribou = throw "The ‘gnome.caribou’ was moved to top-level. Please use ‘pkgs.caribou’ directly."; # Added on 2024-08-11. - cheese = throw "The ‘gnome.cheese’ was moved to top-level. Please use ‘pkgs.cheese’ directly."; # Added on 2024-06-22. - dconf-editor = throw "The ‘gnome.dconf-editor’ was moved to top-level. Please use ‘pkgs.dconf-editor’ directly."; # Added on 2024-06-22. - devhelp = throw "The ‘gnome.devhelp’ was moved to top-level. Please use ‘pkgs.devhelp’ directly."; # Added on 2024-06-22. - eog = throw "The ‘gnome.eog’ was moved to top-level. Please use ‘pkgs.eog’ directly."; # Added on 2024-06-22. - epiphany = throw "The ‘gnome.epiphany’ was moved to top-level. Please use ‘pkgs.epiphany’ directly."; # Added on 2024-06-22. - evince = throw "The ‘gnome.evince’ was moved to top-level. Please use ‘pkgs.evince’ directly."; # Added on 2024-06-13. - evolution-data-server = throw "The ‘gnome.evolution-data-server’ was moved to top-level. Please use ‘pkgs.evolution-data-server’ directly."; # Added on 2024-06-13. - file-roller = throw "The ‘gnome.file-roller’ was moved to top-level. Please use ‘pkgs.file-roller’ directly."; # Added on 2024-06-13. - five-or-more = throw "The ‘gnome.five-or-more’ was moved to top-level. Please use ‘pkgs.five-or-more’ directly."; # Added on 2024-08-11. - four-in-a-row = throw "The ‘gnome.four-in-a-row’ was moved to top-level. Please use ‘pkgs.four-in-a-row’ directly."; # Added on 2024-08-11. - gdm = throw "The ‘gnome.gdm’ was moved to top-level. Please use ‘pkgs.gdm’ directly."; # Added on 2024-08-11. - geary = throw "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly."; # Added on 2024-06-22. - ghex = throw "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly."; # Added on 2024-06-22. - gitg = throw "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly."; # Added on 2024-06-22. - gnome-applets = throw "The ‘gnome.gnome-applets’ was moved to top-level. Please use ‘pkgs.gnome-applets’ directly."; # Added on 2024-08-31. - gnome-autoar = throw "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly."; # Added on 2024-06-13. - gnome-backgrounds = throw "The ‘gnome.gnome-backgrounds’ was moved to top-level. Please use ‘pkgs.gnome-backgrounds’ directly."; # Added on 2024-08-11. - gnome-bluetooth = throw "The ‘gnome.gnome-bluetooth’ was moved to top-level. Please use ‘pkgs.gnome-bluetooth’ directly."; # Added on 2024-08-28. - gnome-bluetooth_1_0 = throw "The ‘gnome.gnome-bluetooth_1_0’ was moved to top-level. Please use ‘pkgs.gnome-bluetooth_1_0’ directly."; # Added on 2024-08-28. - gnome-boxes = throw "The ‘gnome.gnome-boxes’ was moved to top-level. Please use ‘pkgs.gnome-boxes’ directly."; # Added on 2024-08-11. - gnome-characters = throw "The ‘gnome.gnome-characters’ was moved to top-level. Please use ‘pkgs.gnome-characters’ directly."; # Added on 2024-08-11. - gnome-chess = throw "The ‘gnome.gnome-chess’ was moved to top-level. Please use ‘pkgs.gnome-chess’ directly."; # Added on 2024-08-11. - gnome-clocks = throw "The ‘gnome.gnome-clocks’ was moved to top-level. Please use ‘pkgs.gnome-clocks’ directly."; # Added on 2024-08-11. - gnome-color-manager = throw "The ‘gnome.gnome-color-manager’ was moved to top-level. Please use ‘pkgs.gnome-color-manager’ directly."; # Added on 2024-08-11. - gnome-common = throw "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly."; # Added on 2024-06-22. - gnome-calculator = throw "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly."; # Added on 2024-06-22. - gnome-calendar = throw "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly."; # Added on 2024-06-22. - gnome-contacts = throw "The ‘gnome.gnome-contacts’ was moved to top-level. Please use ‘pkgs.gnome-contacts’ directly."; # Added on 2024-08-11. - gnome-control-center = throw "The ‘gnome.gnome-control-center’ was moved to top-level. Please use ‘pkgs.gnome-control-center’ directly."; # Added on 2024-08-28. - gnome-dictionary = throw "The ‘gnome.gnome-dictionary’ was moved to top-level. Please use ‘pkgs.gnome-dictionary’ directly."; # Added on 2024-06-22. - gnome-disk-utility = throw "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly."; # Added on 2024-06-22. - gnome-flashback = throw "The ‘gnome.gnome-flashback’ was moved to top-level. Please use ‘pkgs.gnome-flashback’ directly."; # Added on 2024-08-31. - gnome-font-viewer = throw "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly."; # Added on 2024-06-22. - gnome-initial-setup = throw "The ‘gnome.gnome-initial-setup’ was moved to top-level. Please use ‘pkgs.gnome-initial-setup’ directly."; # Added on 2024-08-11. - gnome-keyring = throw "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly."; # Added on 2024-06-22. - gnome-klotski = throw "The ‘gnome.gnome-klotski’ was moved to top-level. Please use ‘pkgs.gnome-klotski’ directly."; # Added on 2024-08-11. - gnome-logs = throw "The ‘gnome.gnome-logs’ was moved to top-level. Please use ‘pkgs.gnome-logs’ directly."; # Added on 2024-08-11. - gnome-mahjongg = throw "The ‘gnome.gnome-mahjongg’ was moved to top-level. Please use ‘pkgs.gnome-mahjongg’ directly."; # Added on 2024-08-11. - gnome-maps = throw "The ‘gnome.gnome-maps’ was moved to top-level. Please use ‘pkgs.gnome-maps’ directly."; # Added on 2024-08-11. - gnome-mines = throw "The ‘gnome.gnome-mines’ was moved to top-level. Please use ‘pkgs.gnome-mines’ directly."; # Added on 2024-08-11. - gnome-music = throw "The ‘gnome.gnome-music’ was moved to top-level. Please use ‘pkgs.gnome-music’ directly."; # Added on 2024-08-11. - gnome-nettool = throw "The ‘gnome.gnome-nettool’ was moved to top-level. Please use ‘pkgs.gnome-nettool’ directly."; # Added on 2024-08-11. - gnome-nibbles = throw "The ‘gnome.gnome-nibbles’ was moved to top-level. Please use ‘pkgs.gnome-nibbles’ directly."; # Added on 2024-08-11. - gnome-notes = throw "The ‘gnome.gnome-notes’ was moved to top-level. Please use ‘pkgs.gnome-notes’ directly."; # Added on 2024-08-11. - gnome-packagekit = throw "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly."; # Added on 2024-06-22. - gnome-panel = throw "The ‘gnome.gnome-panel’ was moved to top-level. Please use ‘pkgs.gnome-panel’ directly."; # Added on 2024-08-31. - gnome-panel-with-modules = throw "The ‘gnome.gnome-panel-with-modules’ was moved to top-level. Please use ‘pkgs.gnome-panel-with-modules’ directly."; # Added on 2024-08-31. - gnome-power-manager = throw "The ‘gnome.gnome-power-manager’ was moved to top-level. Please use ‘pkgs.gnome-power-manager’ directly."; # Added on 2024-08-11. - gnome-remote-desktop = throw "The ‘gnome.gnome-remote-desktop’ was moved to top-level. Please use ‘pkgs.gnome-remote-desktop’ directly."; # Added on 2024-08-11. - gnome-robots = throw "The ‘gnome.gnome-robots’ was moved to top-level. Please use ‘pkgs.gnome-robots’ directly."; # Added on 2024-08-11. - gnome-screenshot = throw "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly."; # Added on 2024-06-22. - gnome-session = throw "The ‘gnome.gnome-session’ was moved to top-level. Please use ‘pkgs.gnome-session’ directly."; # Added on 2024-08-28. - gnome-session-ctl = throw "The ‘gnome.gnome-session-ctl’ was moved to top-level. Please use ‘pkgs.gnome-session-ctl’ directly."; # Added on 2024-08-28. - gnome-settings-daemon = throw "The ‘gnome.gnome-settings-daemon’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon’ directly."; # Added on 2024-08-28. - gnome-settings-daemon43 = throw "The ‘gnome.gnome-settings-daemon43’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon43’ directly."; # Added on 2024-08-28. - gnome-shell = throw "The ‘gnome.gnome-shell’ was moved to top-level. Please use ‘pkgs.gnome-shell’ directly."; # Added on 2024-08-28. - gnome-shell-extensions = throw "The ‘gnome.gnome-shell-extensions’ was moved to top-level. Please use ‘pkgs.gnome-shell-extensions’ directly."; # Added on 2024-08-11. - gnome-software = throw "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly."; # Added on 2024-08-11. - gnome-sound-recorder = throw "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly."; # Added on 2024-08-11. - gnome-sudoku = throw "The ‘gnome.gnome-sudoku’ was moved to top-level. Please use ‘pkgs.gnome-sudoku’ directly."; # Added on 2024-08-11. - gnome-system-monitor = throw "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly."; # Added on 2024-06-22. - gnome-taquin = throw "The ‘gnome.gnome-taquin’ was moved to top-level. Please use ‘pkgs.gnome-taquin’ directly."; # Added on 2024-08-11. - gnome-terminal = throw "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly."; # Added on 2024-06-13. - gnome-tetravex = throw "The ‘gnome.gnome-tetravex’ was moved to top-level. Please use ‘pkgs.gnome-tetravex’ directly."; # Added on 2024-08-11. - gnome-themes-extra = throw "The ‘gnome.gnome-themes-extra’ was moved to top-level. Please use ‘pkgs.gnome-themes-extra’ directly."; # Added on 2024-06-22. - gnome-tweaks = throw "The ‘gnome.gnome-tweaks’ was moved to top-level. Please use ‘pkgs.gnome-tweaks’ directly."; # Added on 2024-06-22. - gnome-user-share = throw "The ‘gnome.gnome-user-share’ was moved to top-level. Please use ‘pkgs.gnome-user-share’ directly."; # Added on 2024-06-13. - gnome-weather = throw "The ‘gnome.gnome-weather’ was moved to top-level. Please use ‘pkgs.gnome-weather’ directly."; # Added on 2024-08-11. - gpaste = throw "The ‘gnome.gpaste’ was moved to top-level. Please use ‘pkgs.gpaste’ directly."; # Added on 2024-06-22. - gtkhtml = throw "The ‘gnome.gtkhtml’ was moved to top-level. Please use ‘pkgs.gtkhtml’ directly."; # Added on 2024-08-11. - gucharmap = throw "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly."; # Added on 2024-06-22. - hitori = throw "The ‘gnome.hitori’ was moved to top-level. Please use ‘pkgs.hitori’ directly."; # Added on 2024-08-11. - iagno = throw "The ‘gnome.iagno’ was moved to top-level. Please use ‘pkgs.iagno’ directly."; # Added on 2024-08-11. - lightsoff = throw "The ‘gnome.lightsoff’ was moved to top-level. Please use ‘pkgs.lightsoff’ directly."; # Added on 2024-08-11. - metacity = throw "The ‘gnome.metacity’ was moved to top-level. Please use ‘pkgs.metacity’ directly."; # Added on 2024-08-11. - mutter = throw "The ‘gnome.mutter’ was moved to top-level. Please use ‘pkgs.mutter’ directly."; # Added on 2024-08-28. - mutter43 = throw "The ‘gnome.mutter43’ was moved to top-level. Please use ‘pkgs.mutter43’ directly."; # Added on 2024-08-28. - nautilus = throw "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly."; # Added on 2024-06-13. - networkmanager-openvpn = throw "The ‘gnome.networkmanager-openvpn’ was moved to top-level. Please use ‘pkgs.networkmanager-openvpn’ directly."; # Added on 2024-08-31. - networkmanager-vpnc = throw "The ‘gnome.networkmanager-vpnc’ was moved to top-level. Please use ‘pkgs.networkmanager-vpnc’ directly."; # Added on 2024-08-31. - networkmanager-openconnect = throw "The ‘gnome.networkmanager-openconnect’ was moved to top-level. Please use ‘pkgs.networkmanager-openconnect’ directly."; # Added on 2024-08-31. - networkmanager-fortisslvpn = throw "The ‘gnome.networkmanager-fortisslvpn’ was moved to top-level. Please use ‘pkgs.networkmanager-fortisslvpn’ directly."; # Added on 2024-08-31. - networkmanager-l2tp = throw "The ‘gnome.networkmanager-l2tp’ was moved to top-level. Please use ‘pkgs.networkmanager-l2tp’ directly."; # Added on 2024-08-31. - networkmanager-iodine = throw "The ‘gnome.networkmanager-iodine’ was moved to top-level. Please use ‘pkgs.networkmanager-iodine’ directly."; # Added on 2024-08-31. - nautilus-python = throw "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly."; # Added on 2024-06-13. - polari = throw "The ‘gnome.polari’ was moved to top-level. Please use ‘pkgs.polari’ directly."; # Added on 2024-08-11. - pomodoro = throw "The ‘gnome.pomodoro’ was moved to top-level. Please use ‘pkgs.gnome-pomodoro’ directly."; # Added on 2024-06-22. - quadrapassel = throw "The ‘gnome.quadrapassel’ was moved to top-level. Please use ‘pkgs.quadrapassel’ directly."; # Added on 2024-08-11. - rygel = throw "The ‘gnome.rygel’ was moved to top-level. Please use ‘pkgs.rygel’ directly."; # Added on 2024-06-22. - seahorse = throw "The ‘gnome.seahorse’ was moved to top-level. Please use ‘pkgs.seahorse’ directly."; # Added on 2024-06-22. - simple-scan = throw "The ‘gnome.simple-scan’ was moved to top-level. Please use ‘pkgs.simple-scan’ directly."; # Added on 2024-06-22. - sushi = throw "The ‘gnome.sushi’ was moved to top-level. Please use ‘pkgs.sushi’ directly."; # Added on 2024-06-22. - swell-foop = throw "The ‘gnome.swell-foop’ was moved to top-level. Please use ‘pkgs.swell-foop’ directly."; # Added on 2024-08-11. - tali = throw "The ‘gnome.tali’ was moved to top-level. Please use ‘pkgs.tali’ directly."; # Added on 2024-08-11. - totem = throw "The ‘gnome.totem’ was moved to top-level. Please use ‘pkgs.totem’ directly."; # Added on 2024-06-22. - vinagre = throw "The ‘gnome.vinagre’ was moved to top-level. Please use ‘pkgs.vinagre’ directly."; # Added on 2024-08-11. - yelp = throw "The ‘gnome.yelp’ was moved to top-level. Please use ‘pkgs.yelp’ directly."; # Added on 2024-06-22. - yelp-xsl = throw "The ‘gnome.yelp-xsl’ was moved to top-level. Please use ‘pkgs.yelp-xsl’ directly."; # Added on 2024-06-22. - zenity = throw "The ‘gnome.zenity’ was moved to top-level. Please use ‘pkgs.zenity’ directly."; # Added on 2024-06-22. + accerciser = lib.warn "The ‘gnome.accerciser’ was moved to top-level. Please use ‘pkgs.accerciser’ directly." pkgs.accerciser; # Added on 2024-06-22. + adwaita-icon-theme = lib.warn "The ‘gnome.adwaita-icon-theme’ was moved to top-level. Please use ‘pkgs.adwaita-icon-theme’ directly." pkgs.adwaita-icon-theme; # Added on 2024-06-22. + aisleriot = lib.warn "The ‘gnome.aisleriot’ was moved to top-level. Please use ‘pkgs.aisleriot’ directly." pkgs.aisleriot; # Added on 2024-08-11. + atomix = lib.warn "The ‘gnome.atomix’ was moved to top-level. Please use ‘pkgs.atomix’ directly." pkgs.atomix; # Added on 2024-08-11. + baobab = lib.warn "The ‘gnome.baobab’ was moved to top-level. Please use ‘pkgs.baobab’ directly." pkgs.baobab; # Added on 2024-06-22. + caribou = lib.warn "The ‘gnome.caribou’ was moved to top-level. Please use ‘pkgs.caribou’ directly." pkgs.caribou; # Added on 2024-08-11. + cheese = lib.warn "The ‘gnome.cheese’ was moved to top-level. Please use ‘pkgs.cheese’ directly." pkgs.cheese; # Added on 2024-06-22. + dconf-editor = lib.warn "The ‘gnome.dconf-editor’ was moved to top-level. Please use ‘pkgs.dconf-editor’ directly." pkgs.dconf-editor; # Added on 2024-06-22. + devhelp = lib.warn "The ‘gnome.devhelp’ was moved to top-level. Please use ‘pkgs.devhelp’ directly." pkgs.devhelp; # Added on 2024-06-22. + eog = lib.warn "The ‘gnome.eog’ was moved to top-level. Please use ‘pkgs.eog’ directly." pkgs.eog; # Added on 2024-06-22. + epiphany = lib.warn "The ‘gnome.epiphany’ was moved to top-level. Please use ‘pkgs.epiphany’ directly." pkgs.epiphany; # Added on 2024-06-22. + evince = lib.warn "The ‘gnome.evince’ was moved to top-level. Please use ‘pkgs.evince’ directly." pkgs.evince; # Added on 2024-06-13. + evolution-data-server = lib.warn "The ‘gnome.evolution-data-server’ was moved to top-level. Please use ‘pkgs.evolution-data-server’ directly." pkgs.evolution-data-server; # Added on 2024-06-13. + file-roller = lib.warn "The ‘gnome.file-roller’ was moved to top-level. Please use ‘pkgs.file-roller’ directly." pkgs.file-roller; # Added on 2024-06-13. + five-or-more = lib.warn "The ‘gnome.five-or-more’ was moved to top-level. Please use ‘pkgs.five-or-more’ directly." pkgs.five-or-more; # Added on 2024-08-11. + four-in-a-row = lib.warn "The ‘gnome.four-in-a-row’ was moved to top-level. Please use ‘pkgs.four-in-a-row’ directly." pkgs.four-in-a-row; # Added on 2024-08-11. + gdm = lib.warn "The ‘gnome.gdm’ was moved to top-level. Please use ‘pkgs.gdm’ directly." pkgs.gdm; # Added on 2024-08-11. + geary = lib.warn "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly." pkgs.geary; # Added on 2024-06-22. + ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22. + gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22. + gnome-applets = lib.warn "The ‘gnome.gnome-applets’ was moved to top-level. Please use ‘pkgs.gnome-applets’ directly." pkgs.gnome-applets; # Added on 2024-08-31. + gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13. + gnome-backgrounds = lib.warn "The ‘gnome.gnome-backgrounds’ was moved to top-level. Please use ‘pkgs.gnome-backgrounds’ directly." pkgs.gnome-backgrounds; # Added on 2024-08-11. + gnome-bluetooth = lib.warn "The ‘gnome.gnome-bluetooth’ was moved to top-level. Please use ‘pkgs.gnome-bluetooth’ directly." pkgs.gnome-bluetooth; # Added on 2024-08-28. + gnome-bluetooth_1_0 = lib.warn "The ‘gnome.gnome-bluetooth_1_0’ was moved to top-level. Please use ‘pkgs.gnome-bluetooth_1_0’ directly." pkgs.gnome-bluetooth_1_0; # Added on 2024-08-28. + gnome-boxes = lib.warn "The ‘gnome.gnome-boxes’ was moved to top-level. Please use ‘pkgs.gnome-boxes’ directly." pkgs.gnome-boxes; # Added on 2024-08-11. + gnome-characters = lib.warn "The ‘gnome.gnome-characters’ was moved to top-level. Please use ‘pkgs.gnome-characters’ directly." pkgs.gnome-characters; # Added on 2024-08-11. + gnome-chess = lib.warn "The ‘gnome.gnome-chess’ was moved to top-level. Please use ‘pkgs.gnome-chess’ directly." pkgs.gnome-chess; # Added on 2024-08-11. + gnome-clocks = lib.warn "The ‘gnome.gnome-clocks’ was moved to top-level. Please use ‘pkgs.gnome-clocks’ directly." pkgs.gnome-clocks; # Added on 2024-08-11. + gnome-color-manager = lib.warn "The ‘gnome.gnome-color-manager’ was moved to top-level. Please use ‘pkgs.gnome-color-manager’ directly." pkgs.gnome-color-manager; # Added on 2024-08-11. + gnome-common = lib.warn "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly." pkgs.gnome-common; # Added on 2024-06-22. + gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22. + gnome-calendar = lib.warn "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly." pkgs.gnome-calendar; # Added on 2024-06-22. + gnome-contacts = lib.warn "The ‘gnome.gnome-contacts’ was moved to top-level. Please use ‘pkgs.gnome-contacts’ directly." pkgs.gnome-contacts; # Added on 2024-08-11. + gnome-control-center = lib.warn "The ‘gnome.gnome-control-center’ was moved to top-level. Please use ‘pkgs.gnome-control-center’ directly." pkgs.gnome-control-center; # Added on 2024-08-28. + gnome-dictionary = lib.warn "The ‘gnome.gnome-dictionary’ was moved to top-level. Please use ‘pkgs.gnome-dictionary’ directly." pkgs.gnome-dictionary; # Added on 2024-06-22. + gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22. + gnome-flashback = lib.warn "The ‘gnome.gnome-flashback’ was moved to top-level. Please use ‘pkgs.gnome-flashback’ directly." pkgs.gnome-flashback; # Added on 2024-08-31. + gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22. + gnome-initial-setup = lib.warn "The ‘gnome.gnome-initial-setup’ was moved to top-level. Please use ‘pkgs.gnome-initial-setup’ directly." pkgs.gnome-initial-setup; # Added on 2024-08-11. + gnome-keyring = lib.warn "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly." pkgs.gnome-keyring; # Added on 2024-06-22. + gnome-klotski = lib.warn "The ‘gnome.gnome-klotski’ was moved to top-level. Please use ‘pkgs.gnome-klotski’ directly." pkgs.gnome-klotski; # Added on 2024-08-11. + gnome-logs = lib.warn "The ‘gnome.gnome-logs’ was moved to top-level. Please use ‘pkgs.gnome-logs’ directly." pkgs.gnome-logs; # Added on 2024-08-11. + gnome-mahjongg = lib.warn "The ‘gnome.gnome-mahjongg’ was moved to top-level. Please use ‘pkgs.gnome-mahjongg’ directly." pkgs.gnome-mahjongg; # Added on 2024-08-11. + gnome-maps = lib.warn "The ‘gnome.gnome-maps’ was moved to top-level. Please use ‘pkgs.gnome-maps’ directly." pkgs.gnome-maps; # Added on 2024-08-11. + gnome-mines = lib.warn "The ‘gnome.gnome-mines’ was moved to top-level. Please use ‘pkgs.gnome-mines’ directly." pkgs.gnome-mines; # Added on 2024-08-11. + gnome-music = lib.warn "The ‘gnome.gnome-music’ was moved to top-level. Please use ‘pkgs.gnome-music’ directly." pkgs.gnome-music; # Added on 2024-08-11. + gnome-nettool = lib.warn "The ‘gnome.gnome-nettool’ was moved to top-level. Please use ‘pkgs.gnome-nettool’ directly." pkgs.gnome-nettool; # Added on 2024-08-11. + gnome-nibbles = lib.warn "The ‘gnome.gnome-nibbles’ was moved to top-level. Please use ‘pkgs.gnome-nibbles’ directly." pkgs.gnome-nibbles; # Added on 2024-08-11. + gnome-notes = lib.warn "The ‘gnome.gnome-notes’ was moved to top-level. Please use ‘pkgs.gnome-notes’ directly." pkgs.gnome-notes; # Added on 2024-08-11. + gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. + gnome-panel = lib.warn "The ‘gnome.gnome-panel’ was moved to top-level. Please use ‘pkgs.gnome-panel’ directly." pkgs.gnome-panel; # Added on 2024-08-31. + gnome-panel-with-modules = lib.warn "The ‘gnome.gnome-panel-with-modules’ was moved to top-level. Please use ‘pkgs.gnome-panel-with-modules’ directly." pkgs.gnome-panel-with-modules; # Added on 2024-08-31. + gnome-power-manager = lib.warn "The ‘gnome.gnome-power-manager’ was moved to top-level. Please use ‘pkgs.gnome-power-manager’ directly." pkgs.gnome-power-manager; # Added on 2024-08-11. + gnome-remote-desktop = lib.warn "The ‘gnome.gnome-remote-desktop’ was moved to top-level. Please use ‘pkgs.gnome-remote-desktop’ directly." pkgs.gnome-remote-desktop; # Added on 2024-08-11. + gnome-robots = lib.warn "The ‘gnome.gnome-robots’ was moved to top-level. Please use ‘pkgs.gnome-robots’ directly." pkgs.gnome-robots; # Added on 2024-08-11. + gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. + gnome-session = lib.warn "The ‘gnome.gnome-session’ was moved to top-level. Please use ‘pkgs.gnome-session’ directly." pkgs.gnome-session; # Added on 2024-08-28. + gnome-session-ctl = lib.warn "The ‘gnome.gnome-session-ctl’ was moved to top-level. Please use ‘pkgs.gnome-session-ctl’ directly." pkgs.gnome-session-ctl; # Added on 2024-08-28. + gnome-settings-daemon = lib.warn "The ‘gnome.gnome-settings-daemon’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon’ directly." pkgs.gnome-settings-daemon; # Added on 2024-08-28. + gnome-settings-daemon43 = lib.warn "The ‘gnome.gnome-settings-daemon43’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon43’ directly." pkgs.gnome-settings-daemon43; # Added on 2024-08-28. + gnome-shell = lib.warn "The ‘gnome.gnome-shell’ was moved to top-level. Please use ‘pkgs.gnome-shell’ directly." pkgs.gnome-shell; # Added on 2024-08-28. + gnome-shell-extensions = lib.warn "The ‘gnome.gnome-shell-extensions’ was moved to top-level. Please use ‘pkgs.gnome-shell-extensions’ directly." pkgs.gnome-shell-extensions; # Added on 2024-08-11. + gnome-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11. + gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11. + gnome-sudoku = lib.warn "The ‘gnome.gnome-sudoku’ was moved to top-level. Please use ‘pkgs.gnome-sudoku’ directly." pkgs.gnome-sudoku; # Added on 2024-08-11. + gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. + gnome-taquin = lib.warn "The ‘gnome.gnome-taquin’ was moved to top-level. Please use ‘pkgs.gnome-taquin’ directly." pkgs.gnome-taquin; # Added on 2024-08-11. + gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13. + gnome-tetravex = lib.warn "The ‘gnome.gnome-tetravex’ was moved to top-level. Please use ‘pkgs.gnome-tetravex’ directly." pkgs.gnome-tetravex; # Added on 2024-08-11. + gnome-themes-extra = lib.warn "The ‘gnome.gnome-themes-extra’ was moved to top-level. Please use ‘pkgs.gnome-themes-extra’ directly." pkgs.gnome-themes-extra; # Added on 2024-06-22. + gnome-tweaks = lib.warn "The ‘gnome.gnome-tweaks’ was moved to top-level. Please use ‘pkgs.gnome-tweaks’ directly." pkgs.gnome-tweaks; # Added on 2024-06-22. + gnome-user-share = lib.warn "The ‘gnome.gnome-user-share’ was moved to top-level. Please use ‘pkgs.gnome-user-share’ directly." pkgs.gnome-user-share; # Added on 2024-06-13. + gnome-weather = lib.warn "The ‘gnome.gnome-weather’ was moved to top-level. Please use ‘pkgs.gnome-weather’ directly." pkgs.gnome-weather; # Added on 2024-08-11. + gpaste = lib.warn "The ‘gnome.gpaste’ was moved to top-level. Please use ‘pkgs.gpaste’ directly." pkgs.gpaste; # Added on 2024-06-22. + gtkhtml = lib.warn "The ‘gnome.gtkhtml’ was moved to top-level. Please use ‘pkgs.gtkhtml’ directly." pkgs.gtkhtml; # Added on 2024-08-11. + gucharmap = lib.warn "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly." pkgs.gucharmap; # Added on 2024-06-22. + hitori = lib.warn "The ‘gnome.hitori’ was moved to top-level. Please use ‘pkgs.hitori’ directly." pkgs.hitori; # Added on 2024-08-11. + iagno = lib.warn "The ‘gnome.iagno’ was moved to top-level. Please use ‘pkgs.iagno’ directly." pkgs.iagno; # Added on 2024-08-11. + lightsoff = lib.warn "The ‘gnome.lightsoff’ was moved to top-level. Please use ‘pkgs.lightsoff’ directly." pkgs.lightsoff; # Added on 2024-08-11. + metacity = lib.warn "The ‘gnome.metacity’ was moved to top-level. Please use ‘pkgs.metacity’ directly." pkgs.metacity; # Added on 2024-08-11. + mutter = lib.warn "The ‘gnome.mutter’ was moved to top-level. Please use ‘pkgs.mutter’ directly." pkgs.mutter; # Added on 2024-08-28. + mutter43 = lib.warn "The ‘gnome.mutter43’ was moved to top-level. Please use ‘pkgs.mutter43’ directly." pkgs.mutter43; # Added on 2024-08-28. + nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13. + networkmanager-openvpn = lib.warn "The ‘gnome.networkmanager-openvpn’ was moved to top-level. Please use ‘pkgs.networkmanager-openvpn’ directly." pkgs.networkmanager-openvpn; # Added on 2024-08-31. + networkmanager-vpnc = lib.warn "The ‘gnome.networkmanager-vpnc’ was moved to top-level. Please use ‘pkgs.networkmanager-vpnc’ directly." pkgs.networkmanager-vpnc; # Added on 2024-08-31. + networkmanager-openconnect = lib.warn "The ‘gnome.networkmanager-openconnect’ was moved to top-level. Please use ‘pkgs.networkmanager-openconnect’ directly." pkgs.networkmanager-openconnect; # Added on 2024-08-31. + networkmanager-fortisslvpn = lib.warn "The ‘gnome.networkmanager-fortisslvpn’ was moved to top-level. Please use ‘pkgs.networkmanager-fortisslvpn’ directly." pkgs.networkmanager-fortisslvpn; # Added on 2024-08-31. + networkmanager-l2tp = lib.warn "The ‘gnome.networkmanager-l2tp’ was moved to top-level. Please use ‘pkgs.networkmanager-l2tp’ directly." pkgs.networkmanager-l2tp; # Added on 2024-08-31. + networkmanager-iodine = lib.warn "The ‘gnome.networkmanager-iodine’ was moved to top-level. Please use ‘pkgs.networkmanager-iodine’ directly." pkgs.networkmanager-iodine; # Added on 2024-08-31. + nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13. + polari = lib.warn "The ‘gnome.polari’ was moved to top-level. Please use ‘pkgs.polari’ directly." pkgs.polari; # Added on 2024-08-11. + pomodoro = lib.warn "The ‘gnome.pomodoro’ was moved to top-level. Please use ‘pkgs.gnome-pomodoro’ directly." pkgs.gnome-pomodoro; # Added on 2024-06-22. + quadrapassel = lib.warn "The ‘gnome.quadrapassel’ was moved to top-level. Please use ‘pkgs.quadrapassel’ directly." pkgs.quadrapassel; # Added on 2024-08-11. + rygel = lib.warn "The ‘gnome.rygel’ was moved to top-level. Please use ‘pkgs.rygel’ directly." pkgs.rygel; # Added on 2024-06-22. + seahorse = lib.warn "The ‘gnome.seahorse’ was moved to top-level. Please use ‘pkgs.seahorse’ directly." pkgs.seahorse; # Added on 2024-06-22. + simple-scan = lib.warn "The ‘gnome.simple-scan’ was moved to top-level. Please use ‘pkgs.simple-scan’ directly." pkgs.simple-scan; # Added on 2024-06-22. + sushi = lib.warn "The ‘gnome.sushi’ was moved to top-level. Please use ‘pkgs.sushi’ directly." pkgs.sushi; # Added on 2024-06-22. + swell-foop = lib.warn "The ‘gnome.swell-foop’ was moved to top-level. Please use ‘pkgs.swell-foop’ directly." pkgs.swell-foop; # Added on 2024-08-11. + tali = lib.warn "The ‘gnome.tali’ was moved to top-level. Please use ‘pkgs.tali’ directly." pkgs.tali; # Added on 2024-08-11. + totem = lib.warn "The ‘gnome.totem’ was moved to top-level. Please use ‘pkgs.totem’ directly." pkgs.totem; # Added on 2024-06-22. + vinagre = lib.warn "The ‘gnome.vinagre’ was moved to top-level. Please use ‘pkgs.vinagre’ directly." pkgs.vinagre; # Added on 2024-08-11. + yelp = lib.warn "The ‘gnome.yelp’ was moved to top-level. Please use ‘pkgs.yelp’ directly." pkgs.yelp; # Added on 2024-06-22. + yelp-xsl = lib.warn "The ‘gnome.yelp-xsl’ was moved to top-level. Please use ‘pkgs.yelp-xsl’ directly." pkgs.yelp-xsl; # Added on 2024-06-22. + zenity = lib.warn "The ‘gnome.zenity’ was moved to top-level. Please use ‘pkgs.zenity’ directly." pkgs.zenity; # Added on 2024-06-22. #### Removals anjuta = throw "`anjuta` was removed after not being maintained upstream and losing control of its official domain."; # 2024-01-16 diff --git a/pkgs/development/compilers/corretto/11.nix b/pkgs/development/compilers/corretto/11.nix index 6094f07057a01..c1bf6347947cc 100644 --- a/pkgs/development/compilers/corretto/11.nix +++ b/pkgs/development/compilers/corretto/11.nix @@ -26,12 +26,12 @@ let # Corretto, too. "--disable-warnings-as-errors" ]; - version = "11.0.25.9.1"; + version = "11.0.24.8.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-11"; rev = version; - hash = "sha256-ewGGj4BHmwoPdULeT3PSI0Fo9T3cFbTO7cZXhzuKISY="; + sha256 = "sha256-MD/ipEulQCEgfqqa0QQrD6x6GQwirQfb8OT2UBDLYEE="; }; }; in diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix index ec1c7d7597984..90ca350a355d8 100644 --- a/pkgs/development/compilers/corretto/17.nix +++ b/pkgs/development/compilers/corretto/17.nix @@ -21,12 +21,12 @@ let ; jdk = jdk17; gradle = gradle_7; - version = "17.0.13.11.1"; + version = "17.0.12.7.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-17"; rev = version; - hash = "sha256-2jMre5aI02uDFjSgToTyVNriyb4EuZ01lKsNi822o5Q="; + sha256 = "sha256-aRn1hqaqNsBkp2jHHkwMKc8cNiBM+TYVm3tVMPJJ1YE="; }; }; in diff --git a/pkgs/development/compilers/corretto/21.nix b/pkgs/development/compilers/corretto/21.nix index 731eecca1fb3d..a5ab64d02c248 100644 --- a/pkgs/development/compilers/corretto/21.nix +++ b/pkgs/development/compilers/corretto/21.nix @@ -21,12 +21,12 @@ let ; jdk = jdk21; gradle = gradle_7; - version = "21.0.5.11.1"; + version = "21.0.4.7.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-21"; rev = version; - hash = "sha256-Df2Pq2aPrTxD4FeqG12apE/USfQULmMGsDsgXrmCINc="; + sha256 = "sha256-EQqktd2Uz9PhkCaqvbuzmONcSiRppQ40tpLB3mqu2wo="; }; }; in diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index ae77a19385e91..0de05fb0f6c87 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -117,11 +117,14 @@ jdk.overrideAttrs ( # Some of the OpenJDK derivation set their `pos` by hand. We need to # overwrite this in order to point to Corretto, not OpenJDK. pos = __curPos; - meta = oldAttrs.meta // { - homepage = "https://aws.amazon.com/corretto"; - license = lib.licenses.gpl2Only; - description = "Amazon's distribution of OpenJDK"; - maintainers = with lib.maintainers; [ rollf ]; - }; + meta = + with lib; + oldAttrs.meta + // { + homepage = "https://aws.amazon.com/corretto"; + license = licenses.gpl2Only; + description = "Amazon's distribution of OpenJDK"; + maintainers = with maintainers; [ rollf ]; + }; } ) diff --git a/pkgs/development/coq-modules/lemma-overloading/default.nix b/pkgs/development/coq-modules/lemma-overloading/default.nix deleted file mode 100644 index 8f4f12b02ba4e..0000000000000 --- a/pkgs/development/coq-modules/lemma-overloading/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, mkCoqDerivation, coq, mathcomp-ssreflect, version ? null }: - -mkCoqDerivation rec { - pname = "lemma-overloading"; - inherit version; - - defaultVersion = with lib.versions; - lib.switch [ coq.coq-version mathcomp-ssreflect.version ] [ - { cases = [ (range "8.10" "8.12") (range "1.7" "1.11") ]; out = "8.12.0"; } - { cases = [ (range "8.10" "8.11") (range "1.7" "1.11") ]; out = "8.11.0"; } - { cases = [ (range "8.8" "8.11") (range "1.7" "1.10") ]; out = "8.10.0"; } - { cases = [ (range "8.8" "8.9") (range "1.7" "1.8") ]; out = "8.9.0"; } - { cases = [ (isEq "8.8") (range "1.6.2" "1.7") ]; out = "8.8.0"; } - ] null; - - release = { - "8.12.0".sha256 = "sha256-ul1IhxFwhLTy3+rmo3gvjHI3Z8A8avN0Rzq0YDy2bjs="; - "8.11.0".sha256 = "sha256-RI3KdSEYxUbjfZWKO7atGdEqDU8WmLJSFeF6TLlgUFc="; - "8.10.0".sha256 = "sha256-qpHh/iz2fFtGwUedjJ6fuOh8uq1mlL4ETxc9zDJ6800="; - "8.9.0".sha256 = "sha256-dE9O94DvcF93TUTU7ky9pvGZgTtPZWz6826b6Js/nHc="; - "8.8.0".sha256 = "sha256-Iq3KfESMnZF8hhGKuvZHx+hAMEaoCP7MhhQEI6xfoO8="; - }; - releaseRev = v: "v${v}"; - - propagatedBuildInputs = [ mathcomp-ssreflect ]; - - meta = with lib; { - description = "Libraries demonstrating design patterns for programming and proving with canonical structures in Coq"; - maintainers = with lib.maintainers; [ cohencyril ]; - license = licenses.gpl3Plus; - }; -} diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix index 71a7451746005..f7be0aa9f4fd2 100644 --- a/pkgs/development/cuda-modules/cudatoolkit/default.nix +++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix @@ -69,18 +69,26 @@ backendStdenv.mkDerivation rec { "doc" ]; - nativeBuildInputs = [ - perl - makeWrapper - rsync - addDriverRunpath - autoPatchelfHook - autoAddDriverRunpath - markForCudatoolkitRootHook - ] ++ lib.optionals (lib.versionAtLeast version "11.8") [ qt6Packages.wrapQtAppsHook ]; + nativeBuildInputs = + [ + perl + makeWrapper + rsync + addDriverRunpath + autoPatchelfHook + autoAddDriverRunpath + markForCudatoolkitRootHook + ] + ++ lib.optionals (lib.versionOlder version "11") [ libsForQt5.wrapQtAppsHook ] + ++ lib.optionals (lib.versionAtLeast version "11.8") [ qt6Packages.wrapQtAppsHook ]; propagatedBuildInputs = [ setupCudaHook ]; buildInputs = - [ + lib.optionals (lib.versionOlder version "11") [ + libsForQt5.qt5.qtwebengine + libglut + libGLU + ] + ++ [ # To get $GDK_PIXBUF_MODULE_FILE via setup-hook gdk-pixbuf @@ -160,58 +168,105 @@ backendStdenv.mkDerivation rec { "${placeholder "out"}/nvvm/lib64" ]; - autoPatchelfIgnoreMissingDeps = [ - # This is the hardware-dependent userspace driver that comes from - # nvidia_x11 package. It must be deployed at runtime in - # /run/opengl-driver/lib or pointed at by LD_LIBRARY_PATH variable, rather - # than pinned in runpath - "libcuda.so.1" + autoPatchelfIgnoreMissingDeps = + [ + # This is the hardware-dependent userspace driver that comes from + # nvidia_x11 package. It must be deployed at runtime in + # /run/opengl-driver/lib or pointed at by LD_LIBRARY_PATH variable, rather + # than pinned in runpath + "libcuda.so.1" - # The krb5 expression ships libcom_err.so.3 but cudatoolkit asks for the - # older - # This dependency is asked for by target-linux-x64/CollectX/RedHat/x86_64/libssl.so.10 - # - do we even want to use nvidia-shipped libssl? - "libcom_err.so.2" - ]; + # The krb5 expression ships libcom_err.so.3 but cudatoolkit asks for the + # older + # This dependency is asked for by target-linux-x64/CollectX/RedHat/x86_64/libssl.so.10 + # - do we even want to use nvidia-shipped libssl? + "libcom_err.so.2" + ] + ++ lib.optionals (lib.versionOlder version "10.1") [ + # For Cuda 10.0, nVidia also shipped a jre implementation which needed + # two old versions of ffmpeg which are not available in nixpkgs + "libavcodec.so.54" + "libavcodec.so.53" + "libavformat.so.54" + "libavformat.so.53" + ]; - preFixup = '' - ${lib.getExe' patchelf "patchelf"} $out/lib64/libnvrtc.so --add-needed libnvrtc-builtins.so - ''; + preFixup = + if (lib.versionAtLeast version "10.1" && lib.versionOlder version "11") then + '' + ${lib.getExe' patchelf "patchelf"} $out/targets/*/lib/libnvrtc.so --add-needed libnvrtc-builtins.so + '' + else + '' + ${lib.getExe' patchelf "patchelf"} $out/lib64/libnvrtc.so --add-needed libnvrtc-builtins.so + ''; unpackPhase = '' sh $src --keep --noexec + + ${lib.optionalString (lib.versionOlder version "10.1") '' + cd pkg/run_files + sh cuda-linux*.run --keep --noexec + sh cuda-samples*.run --keep --noexec + mv pkg ../../$(basename $src) + cd ../.. + rm -rf pkg + + for patch in $runPatches; do + sh $patch --keep --noexec + mv pkg $(basename $patch) + done + ''} ''; installPhase = '' runHook preInstall mkdir $out - mkdir -p $out/bin $out/lib64 $out/include $doc - for dir in pkg/builds/* pkg/builds/cuda_nvcc/nvvm pkg/builds/cuda_cupti/extras/CUPTI; do - if [ -d $dir/bin ]; then - mv $dir/bin/* $out/bin - fi - if [ -d $dir/doc ]; then - (cd $dir/doc && find . -type d -exec mkdir -p $doc/\{} \;) - (cd $dir/doc && find . \( -type f -o -type l \) -exec mv \{} $doc/\{} \;) - fi - if [ -L $dir/include ] || [ -d $dir/include ]; then - (cd $dir/include && find . -type d -exec mkdir -p $out/include/\{} \;) - (cd $dir/include && find . \( -type f -o -type l \) -exec mv \{} $out/include/\{} \;) - fi - if [ -L $dir/lib64 ] || [ -d $dir/lib64 ]; then - (cd $dir/lib64 && find . -type d -exec mkdir -p $out/lib64/\{} \;) - (cd $dir/lib64 && find . \( -type f -o -type l \) -exec mv \{} $out/lib64/\{} \;) - fi - done - mv pkg/builds/cuda_nvcc/nvvm $out/nvvm + ${lib.optionalString (lib.versionOlder version "10.1") '' + cd $(basename $src) + export PERL5LIB=. + perl ./install-linux.pl --prefix="$out" + cd .. + for patch in $runPatches; do + cd $(basename $patch) + perl ./install_patch.pl --silent --accept-eula --installdir="$out" + cd .. + done + ''} + ${lib.optionalString (lib.versionAtLeast version "10.1" && lib.versionOlder version "11") '' + cd pkg/builds/cuda-toolkit + mv * $out/ + rm -f $out/nsight-systems-*/host-linux-x64/libstdc++.so* + ''} + ${lib.optionalString (lib.versionAtLeast version "11") '' + mkdir -p $out/bin $out/lib64 $out/include $doc + for dir in pkg/builds/* pkg/builds/cuda_nvcc/nvvm pkg/builds/cuda_cupti/extras/CUPTI; do + if [ -d $dir/bin ]; then + mv $dir/bin/* $out/bin + fi + if [ -d $dir/doc ]; then + (cd $dir/doc && find . -type d -exec mkdir -p $doc/\{} \;) + (cd $dir/doc && find . \( -type f -o -type l \) -exec mv \{} $doc/\{} \;) + fi + if [ -L $dir/include ] || [ -d $dir/include ]; then + (cd $dir/include && find . -type d -exec mkdir -p $out/include/\{} \;) + (cd $dir/include && find . \( -type f -o -type l \) -exec mv \{} $out/include/\{} \;) + fi + if [ -L $dir/lib64 ] || [ -d $dir/lib64 ]; then + (cd $dir/lib64 && find . -type d -exec mkdir -p $out/lib64/\{} \;) + (cd $dir/lib64 && find . \( -type f -o -type l \) -exec mv \{} $out/lib64/\{} \;) + fi + done + mv pkg/builds/cuda_nvcc/nvvm $out/nvvm - mv pkg/builds/cuda_sanitizer_api $out/cuda_sanitizer_api - ln -s $out/cuda_sanitizer_api/compute-sanitizer/compute-sanitizer $out/bin/compute-sanitizer + mv pkg/builds/cuda_sanitizer_api $out/cuda_sanitizer_api + ln -s $out/cuda_sanitizer_api/compute-sanitizer/compute-sanitizer $out/bin/compute-sanitizer - mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64 - mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64 - rm $out/host-linux-x64/libstdc++.so* + mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64 + mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64 + rm $out/host-linux-x64/libstdc++.so* + ''} ${ lib.optionalString (lib.versionAtLeast version "11.8" && lib.versionOlder version "12") # error: auto-patchelf could not satisfy dependency libtiff.so.5 wanted by /nix/store/.......-cudatoolkit-12.0.1/host-linux-x64/Plugins/imageformats/libqtiff.so @@ -246,10 +301,20 @@ backendStdenv.mkDerivation rec { rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why? + ${lib.optionalString (lib.versionOlder version "10.1") '' + # let's remove the 32-bit libraries, they confuse the lib64->lib mover + rm -rf $out/lib + ''} + ${lib.optionalString (lib.versionAtLeast version "12.0") '' rm $out/host-linux-x64/libQt6* ''} + # Remove some cruft. + ${lib.optionalString ( + (lib.versionAtLeast version "7.0") && (lib.versionOlder version "10.1") + ) "rm $out/bin/uninstall*"} + # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them) if [ -d "$out"/cuda-samples ]; then mv "$out"/cuda-samples "$out"/samples @@ -278,11 +343,19 @@ backendStdenv.mkDerivation rec { # Remove OpenCL libraries as they are provided by ocl-icd and driver. rm -f $out/lib64/libOpenCL* + ${lib.optionalString (lib.versionAtLeast version "10.1" && (lib.versionOlder version "11")) '' + mv $out/lib64 $out/lib + mv $out/extras/CUPTI/lib64/libcupti* $out/lib + ''} # nvprof do not find any program to profile if LD_LIBRARY_PATH is not set wrapProgram $out/bin/nvprof \ --prefix LD_LIBRARY_PATH : $out/lib '' + + lib.optionalString (lib.versionOlder version "8.0") '' + # Hack to fix building against recent Glibc/GCC. + echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook + '' # 11.8 includes a broken symlink, include/include, pointing to targets/x86_64-linux/include + lib.optionalString (lib.versions.majorMinor version == "11.8") '' rm $out/include/include @@ -292,7 +365,7 @@ backendStdenv.mkDerivation rec { ''; postInstall = '' - for b in nvvp; do + for b in nvvp ${lib.optionalString (lib.versionOlder version "11") "nsight"}; do wrapProgram "$out/bin/$b" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" done diff --git a/pkgs/development/cuda-modules/cudatoolkit/releases.nix b/pkgs/development/cuda-modules/cudatoolkit/releases.nix index 147bf89adf0ad..05f7b144ec4b4 100644 --- a/pkgs/development/cuda-modules/cudatoolkit/releases.nix +++ b/pkgs/development/cuda-modules/cudatoolkit/releases.nix @@ -10,6 +10,24 @@ # } # Releases = AttrSet CudaVersion Release { + "10.0" = { + version = "10.0.130"; + url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux"; + sha256 = "16p3bv1lwmyqpxil8r951h385sy9asc578afrc7lssa68c71ydcj"; + }; + + "10.1" = { + version = "10.1.243"; + url = "https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run"; + sha256 = "0caxhlv2bdq863dfp6wj7nad66ml81vasq2ayf11psvq2b12vhp7"; + }; + + "10.2" = { + version = "10.2.89"; + url = "http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run"; + sha256 = "04fasl9sjkb1jvchvqgaqxprnprcz7a8r52249zp2ijarzyhf3an"; + }; + "11.0" = { version = "11.0.3"; url = "https://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda_11.0.3_450.51.06_linux.run"; diff --git a/pkgs/development/cuda-modules/cudnn/releases.nix b/pkgs/development/cuda-modules/cudnn/releases.nix index 586bdecf67c05..2b4afc160abe7 100644 --- a/pkgs/development/cuda-modules/cudnn/releases.nix +++ b/pkgs/development/cuda-modules/cudnn/releases.nix @@ -96,6 +96,48 @@ ]; # x86_64 linux-x86_64 = [ + { + version = "7.4.2.24"; + minCudaVersion = "10.0"; + maxCudaVersion = "10.0"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.4.2/cudnn-10.0-linux-x64-v7.4.2.24.tgz"; + hash = "sha256-Lt/IagK1DRfojEeJVaMy5qHoF05+U6NFi06lH68C2qM="; + } + { + version = "7.6.5.32"; + minCudaVersion = "10.0"; + maxCudaVersion = "10.0"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.0-linux-x64-v7.6.5.32.tgz"; + hash = "sha256-KDVeOV8LK5OsLIO2E2CzW6bNA3fkTni+GXtrYbS0kro="; + } + { + version = "7.6.5.32"; + minCudaVersion = "10.1"; + maxCudaVersion = "10.1"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.1-linux-x64-v7.6.5.32.tgz"; + hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM="; + } + { + version = "7.6.5.32"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.2-linux-x64-v7.6.5.32.tgz"; + hash = "sha256-YAJn8squ0v1Y6yFLpmnY6jXzlqfRm5SCLms2+fcIjCA='"; + } + { + version = "8.0.5.39"; + minCudaVersion = "10.1"; + maxCudaVersion = "10.1"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-10.1-linux-x64-v8.0.5.39.tgz"; + hash = "sha256-kJCElSmIlrM6qVBjo0cfk8NmJ9esAcF9w211xl7qSgA="; + } + { + version = "8.0.5.39"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-10.2-linux-x64-v8.0.5.39.tgz"; + hash = "sha256-IfhMBcZ78eyFnnfDjM1b8VSWT6HDCPRJlZvkw1bjgvM="; + } { version = "8.0.5.39"; minCudaVersion = "11.0"; @@ -110,6 +152,13 @@ url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-11.1-linux-x64-v8.0.5.39.tgz"; hash = "sha256-HQRr+nk5navMb2yxUHkYdUQ5RC6gyp4Pvs3URvmwDM4="; } + { + version = "8.1.1.33"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-10.2-linux-x64-v8.1.1.33.tgz"; + hash = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0="; + } { version = "8.1.1.33"; minCudaVersion = "11.0"; @@ -117,6 +166,13 @@ url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-11.2-linux-x64-v8.1.1.33.tgz"; hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; } + { + version = "8.2.4.15"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-10.2-linux-x64-v8.2.4.15.tgz"; + hash = "sha256-0jyUoxFaHHcRamwSfZF1+/WfcjNkN08mo0aZB18yIvE="; + } { version = "8.2.4.15"; minCudaVersion = "11.0"; @@ -124,6 +180,13 @@ url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-11.4-linux-x64-v8.2.4.15.tgz"; hash = "sha256-Dl0t+JC5ln76ZhnaQhMQ2XMjVlp58FoajLm3Fluq0Nc="; } + { + version = "8.3.3.40"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.3/local_installers/10.2/cudnn-linux-x86_64-8.3.3.40_cuda10.2-archive.tar.xz"; + hash = "sha256-2FVPKzLmKV1fyPOsJeaPlAWLAYyAHaucFD42gS+JJqs="; + } { version = "8.3.3.40"; minCudaVersion = "11.0"; @@ -131,6 +194,13 @@ url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.3/local_installers/11.5/cudnn-linux-x86_64-8.3.3.40_cuda11.5-archive.tar.xz"; hash = "sha256-6r6Wx1zwPqT1N5iU2RTx+K4UzqsSGYnoSwg22Sf7dzE="; } + { + version = "8.4.1.50"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.4.1.50_cuda10.2-archive.tar.xz"; + hash = "sha256-I88qMmU6lIiLVmaPuX7TTbisgTav839mssxUo3lQNjg="; + } { version = "8.4.1.50"; minCudaVersion = "11.0"; @@ -138,6 +208,13 @@ url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.4.1.50_cuda11.6-archive.tar.xz"; hash = "sha256-7JbSN22B/KQr3T1MPXBambKaBlurV/kgVhx2PinGfQE="; } + { + version = "8.5.0.96"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.5.0.96_cuda10-archive.tar.xz"; + hash = "sha256-1mzhbbzR40WKkHnQLtJHhg0vYgf7G8a0OBcCwIOkJjM="; + } { version = "8.5.0.96"; minCudaVersion = "11.0"; @@ -145,6 +222,13 @@ url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.5.0.96_cuda11-archive.tar.xz"; hash = "sha256-VFSm/ZTwCHKMqumtrZk8ToXvNjAuJrzkO+p9RYpee20="; } + { + version = "8.6.0.163"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda10-archive.tar.xz"; + hash = "sha256-t4sr/GrFqqdxu2VhaJQk5K1Xm/0lU4chXG8hVL09R9k="; + } { version = "8.6.0.163"; minCudaVersion = "11.0"; @@ -152,6 +236,13 @@ url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda11-archive.tar.xz"; hash = "sha256-u8OW30cpTGV+3AnGAGdNYIyxv8gLgtz0VHBgwhcRFZ4="; } + { + version = "8.7.0.84"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.7.0.84_cuda10-archive.tar.xz"; + hash = "sha256-bZhaqc8+GbPV2FQvvbbufd8VnEJgvfkICc2N3/gitRg="; + } { version = "8.7.0.84"; minCudaVersion = "11.0"; diff --git a/pkgs/development/cuda-modules/cutensor/extension.nix b/pkgs/development/cuda-modules/cutensor/extension.nix index 2abffe025d63d..1f6ea36552425 100644 --- a/pkgs/development/cuda-modules/cutensor/extension.nix +++ b/pkgs/development/cuda-modules/cutensor/extension.nix @@ -101,7 +101,10 @@ let (attrsets.attrByPath [ pname redistArch - ] null feature) != null; + ] null feature) != null + + # NOTE: This is an ad hoc hack; manifest schemas do not support version constraints yet + && !(lib.versionOlder cudaVersion "11.0" && lib.versionAtLeast redistrib.${pname}.version "2.0.2"); # TODO(@connorbaker): With an auxilliary file keeping track of the CUDA versions each release supports, # we could filter out releases that don't support our CUDA version. diff --git a/pkgs/development/cuda-modules/gpus.nix b/pkgs/development/cuda-modules/gpus.nix index 15f98be92cd09..cf6e0a1eaf360 100644 --- a/pkgs/development/cuda-modules/gpus.nix +++ b/pkgs/development/cuda-modules/gpus.nix @@ -27,6 +27,23 @@ # Without your work, this would have been much more difficult. # https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/ [ + { + # GeForce 700, GT-730 + archName = "Kepler"; + computeCapability = "3.0"; + isJetson = false; + minCudaVersion = "10.0"; + dontDefaultAfter = "10.2"; + maxCudaVersion = "10.2"; + } + { + archName = "Kepler"; + computeCapability = "3.2"; + isJetson = false; + minCudaVersion = "10.0"; + dontDefaultAfter = "10.2"; + maxCudaVersion = "10.2"; + } { # Tesla K40 archName = "Kepler"; diff --git a/pkgs/development/cuda-modules/nvcc-compatibilities.nix b/pkgs/development/cuda-modules/nvcc-compatibilities.nix index eb73cd93edfed..d4189400e2fc9 100644 --- a/pkgs/development/cuda-modules/nvcc-compatibilities.nix +++ b/pkgs/development/cuda-modules/nvcc-compatibilities.nix @@ -22,6 +22,28 @@ let # attrs :: AttrSet CudaVersion CompilerCompatibilities attrs = { # Our baseline + # https://docs.nvidia.com/cuda/archive/10.0/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features + "10.0" = { + clangMaxMajorVersion = "6"; + clangMinMajorVersion = "6"; + gccMaxMajorVersion = "7"; + gccMinMajorVersion = "5"; + }; + + # Added support for Clang 7 and GCC 8 + # https://docs.nvidia.com/cuda/archive/10.1/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features + "10.1" = attrs."10.0" // { + clangMaxMajorVersion = "7"; + gccMaxMajorVersion = "8"; + }; + + # Added clang 8 + # https://docs.nvidia.com/cuda/archive/10.2/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features + "10.2" = attrs."10.1" // { + clangMaxMajorVersion = "8"; + }; + + # Added support for Clang 9 and GCC 9 # https://docs.nvidia.com/cuda/archive/11.0/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features "11.0" = { clangMaxMajorVersion = "9"; diff --git a/pkgs/development/cuda-modules/tensorrt/releases.nix b/pkgs/development/cuda-modules/tensorrt/releases.nix index c42218eebe961..e8c75b6ccdee0 100644 --- a/pkgs/development/cuda-modules/tensorrt/releases.nix +++ b/pkgs/development/cuda-modules/tensorrt/releases.nix @@ -43,6 +43,14 @@ ]; # x86_64 linux-x86_64 = [ + { + version = "8.0.3.4"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + cudnnVersion = "8.2"; + filename = "TensorRT-8.0.3.4.Linux.x86_64-gnu.cuda-10.2.cudnn8.2.tar.gz"; + hash = "sha256-LxcXgwe1OCRfwDsEsNLIkeNsOcx3KuF5Sj+g2dY6WD0="; + } { version = "8.0.3.4"; minCudaVersion = "11.0"; @@ -51,6 +59,14 @@ filename = "TensorRT-8.0.3.4.Linux.x86_64-gnu.cuda-11.3.cudnn8.2.tar.gz"; hash = "sha256-MXdDUCT/SqWm26jB7QarEcwOG/O7cS36Y6Q0IvQTE/M="; } + { + version = "8.2.5.1"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + cudnnVersion = "8.2"; + filename = "TensorRT-8.2.5.1.Linux.x86_64-gnu.cuda-10.2.cudnn8.2.tar.gz"; + hash = "sha256-XV2Bf2LH8OM2GEMjV80MDweb1hSVF/wFUcaW3KP2m8Q="; + } { # The docs claim this supports through 11.5 despite the file name indicating 11.4. version = "8.2.5.1"; @@ -60,6 +76,14 @@ filename = "TensorRT-8.2.5.1.Linux.x86_64-gnu.cuda-11.4.cudnn8.2.tar.gz"; hash = "sha256-LcNpYvDiT7AavqzK1MRlijo2qDN7jznigeS77US713E="; } + { + version = "8.4.3.1"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + cudnnVersion = "8.4"; + filename = "TensorRT-8.4.3.1.Linux.x86_64-gnu.cuda-10.2.cudnn8.4.tar.gz"; + hash = "sha256-2c3Zzt93FBWWQtrSIvpbzzS6BT9s0NzALzdwXGLOZEU="; + } { # The docs claim this supports through 11.7 despite the file name indicating 11.6. version = "8.4.3.1"; @@ -69,6 +93,14 @@ filename = "TensorRT-8.4.3.1.Linux.x86_64-gnu.cuda-11.6.cudnn8.4.tar.gz"; hash = "sha256-jXwghcFjncxzh1BIwjWYqFJs4wiRNoduMdkCWOSeT2E="; } + { + version = "8.5.3.1"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + cudnnVersion = "8.6"; + filename = "TensorRT-8.5.3.1.Linux.x86_64-gnu.cuda-10.2.cudnn8.6.tar.gz"; + hash = "sha256-WCt6yfOmFbrjqdYCj6AE2+s2uFpISwk6urP+2I0BnGQ="; + } { version = "8.5.3.1"; minCudaVersion = "11.0"; diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix index 13c3b101f5aae..e5abb6760978b 100644 --- a/pkgs/development/interpreters/php/8.4.nix +++ b/pkgs/development/interpreters/php/8.4.nix @@ -1,11 +1,14 @@ -{ callPackage, ... }@_args: +{ callPackage, fetchurl, ... }@_args: let base = callPackage ./generic.nix ( _args // { - version = "8.4.1"; - hash = "sha256-74onARjtEot2X8MfGYx/RlDIFxQRsPajoaOroR/KzCM="; + version = "8.4.0RC4"; + phpSrc = fetchurl { + url = "https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz"; + hash = "sha256-s/ihnYRfSqVlAV/4YZZAfrUzKE60NlrFlT9edK5h3LA="; + }; } ); in diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix index 067d923e05505..d000b57b0e220 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.17.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix @@ -1869,8 +1869,7 @@ with self; typerep = janePackage { pname = "typerep"; - version = "0.17.1"; - hash = "sha256-hw03erwLx9IAbkBibyhZxofA5jIi12rFJOHNEVYpLSk="; + hash = "sha256-0KwJdWtibgjxghFmOYKyPrcOAfoLpxYGBZm2KpH8tgA="; meta.description = "Typerep is a library for runtime types"; propagatedBuildInputs = [ base ]; }; diff --git a/pkgs/development/ocaml-modules/merlin-extend/default.nix b/pkgs/development/ocaml-modules/merlin-extend/default.nix index 17013a11caad0..a8ccd2cf4a015 100644 --- a/pkgs/development/ocaml-modules/merlin-extend/default.nix +++ b/pkgs/development/ocaml-modules/merlin-extend/default.nix @@ -2,11 +2,13 @@ buildDunePackage rec { pname = "merlin-extend"; - version = "0.6.2"; + version = "0.6"; + + useDune2 = true; src = fetchurl { - url = "https://github.com/let-def/merlin-extend/releases/download/v${version}/merlin-extend-${version}.tbz"; - hash = "sha256-R1WOfzC2RGLyucgvt/eHEzrPoNUTJFK2rXhI4LD013k="; + url = "https://github.com/let-def/merlin-extend/releases/download/v${version}/merlin-extend-v${version}.tbz"; + sha256 = "0hvc4mz92x3rl2dxwrhvhzwl4gilnyvvwcqgr45vmdpyjyp3dwn2"; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 4d7c7b982e43d..8a94ed44f0988 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -7,7 +7,7 @@ }: let - version = "5.1.24"; + version = "5.1.23"; in buildPecl { inherit version; @@ -17,9 +17,25 @@ buildPecl { owner = "krakjoe"; repo = "apcu"; rev = "v${version}"; - sha256 = "sha256-g+Oo6y+24VOWHaDZ23iItkGwOa5bTtKMAjZOmAi6EOo="; + sha256 = "sha256-UDKLLCCnYJj/lCD8ZkkDf2WYZMoIbcP75+0/IXo4vdQ="; }; + patches = [ + # Fix broken test (apc_entry_002) with PHP 8.4 alpha1 + # See https://github.com/krakjoe/apcu/issues/510 + (fetchpatch { + url = "https://github.com/krakjoe/apcu/commit/9dad016db50cc46321afec592ea9b49520c1cf13.patch"; + hash = "sha256-8CPUNhEGCVVSXWYridN1+4N4JzCfXZbmUIsPYs/9jfk="; + }) + + # Fix ZTS detection in tests with PHP 8.4 + # https://github.com/krakjoe/apcu/pull/511 + (fetchpatch { + url = "https://github.com/krakjoe/apcu/commit/15766e615264620427c2db37061ca9614d3b7319.patch"; + hash = "sha256-gbSkx47Uo9E28CfJJj4+3ydcw8cXW9NNN/3FuYYTVPY="; + }) + ]; + buildInputs = [ pcre2 ]; doCheck = true; makeFlags = [ "phpincludedir=$(dev)/include" ]; diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix index aca3f8e522cc4..e27c617665561 100644 --- a/pkgs/development/python-modules/accuweather/default.nix +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "accuweather"; - version = "4.0.0"; + version = "3.0.0"; pyproject = true; - disabled = pythonOlder "3.12"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "bieniu"; repo = "accuweather"; rev = "refs/tags/${version}"; - hash = "sha256-7k5aA9Pm9DWjPXwsmHP6jMhnobVJpsLGPgs3YCvnzco="; + hash = "sha256-hnKwK0I8C8Xh7yn4yk2DqowqgyZYDB22IEllm5MeIGo="; }; build-system = [ setuptools ]; @@ -44,11 +44,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "accuweather" ]; - meta = { + meta = with lib; { description = "Python wrapper for getting weather data from AccuWeather servers"; homepage = "https://github.com/bieniu/accuweather"; changelog = "https://github.com/bieniu/accuweather/releases/tag/${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ jamiemagee ]; + license = licenses.asl20; + maintainers = with maintainers; [ jamiemagee ]; }; } diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index 874e9a2532444..d38b0f88960c7 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.9.32"; + version = "0.9.25"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-Fglvycbwrd1OTaFWZiVbEF8JC1WEogbjtxvF4FEWG5c="; + hash = "sha256-rw86RzP8AI+zWchC9c01vdedc6r4gfF5A8DltWW5YRY="; }; pythonRelaxDeps = [ "typer" ]; diff --git a/pkgs/development/python-modules/aiosonic/default.nix b/pkgs/development/python-modules/aiosonic/default.nix index ec52ae7cbea49..b5f4e5406b8bf 100644 --- a/pkgs/development/python-modules/aiosonic/default.nix +++ b/pkgs/development/python-modules/aiosonic/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "aiosonic"; - version = "0.22.0"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "sonic182"; repo = "aiosonic"; rev = "refs/tags/${version}"; - hash = "sha256-wBYGiSTSRhi11uqTyGgF1YpnBVoDraCr2GKC8VkQEWc="; + hash = "sha256-YvqRuxl+Dgnsla/iotvWREdh93jwnXaq+F9py9MGP0o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/apsystems-ez1/default.nix b/pkgs/development/python-modules/apsystems-ez1/default.nix index 265526e5e7b0d..f9a50715322b4 100644 --- a/pkgs/development/python-modules/apsystems-ez1/default.nix +++ b/pkgs/development/python-modules/apsystems-ez1/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "apsystems-ez1"; - version = "2.4.0"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "SonnenladenGmbH"; repo = "APsystems-EZ1-API"; rev = "refs/tags/${version}"; - hash = "sha256-H4vhF4CgZmKmBF+v6SpnpIOlPBkFLL50W+Ua+gDr/7I="; + hash = "sha256-CG+QpdJfZt1S6IDDjabRjwuRflURFc1QYo39kf/p0Zw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/pkgs/development/python-modules/azure-keyvault-administration/default.nix index fc667dbcbf1ef..f8bf2b1c83f61 100644 --- a/pkgs/development/python-modules/azure-keyvault-administration/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-administration/default.nix @@ -11,15 +11,14 @@ buildPythonPackage rec { pname = "azure-keyvault-administration"; - version = "4.5.0"; + version = "4.4.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "azure_keyvault_administration"; - inherit version; - hash = "sha256-ZTlnbspwVgrXaruNW9OviuyxcVgX7ZFe5gCGfyZbfpU="; + inherit pname version; + hash = "sha256-ems2y59UTzV1D/L6lMg7l7PvIMH+G0JOpoAY7ucD8d8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 00f6225f7674d..66e16fbee10c0 100644 --- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -12,15 +12,14 @@ buildPythonPackage rec { pname = "azure-keyvault-certificates"; - version = "4.9.0"; + version = "4.8.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "azure_keyvault_certificates"; - inherit version; - hash = "sha256-ndBPj/5AkViCgut1SAuzHlhN2ZQNCfnepn+sg2Ppflk="; + inherit pname version; + hash = "sha256-xWEnPkQCwlEUhzSGyYv6GyxHiGIp1BAOh9rxAO4Edyg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 3e53dd4ce7df0..54200ab0e0ff0 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -13,15 +13,14 @@ buildPythonPackage rec { pname = "azure-keyvault-keys"; - version = "4.10.0"; + version = "4.9.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "azure_keyvault_keys"; - inherit version; - hash = "sha256-URIGrpCuwXJqTW/1qS11S9DA8eh1GJE2jTD7cLYpVfE="; + inherit pname version; + hash = "sha256-CGMtzW7OKGVyBOmiVq1kNp/isOOF7UM0n5MvAH2J93Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index 72f6d68ecc0bf..916897d5bf00d 100644 --- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -11,15 +11,14 @@ buildPythonPackage rec { pname = "azure-keyvault-secrets"; - version = "4.9.0"; + version = "4.8.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "azure_keyvault_secrets"; - inherit version; - hash = "sha256-KgO7L/2aDWyK0cMw2dAxAROYWp3gZgfs43j9cqWIn+E="; + inherit pname version; + hash = "sha256-VjbAodiiDjxXmcs8z/1Ovz8NGst8rpUmhhgzr4sP6BQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 5182db653cfb7..305f98a6459df 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "33.0.0"; + version = "32.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_containerservice"; inherit version; - hash = "sha256-hoWD3NuKSQXeA6hKm3kD12octZrNnDc28CvHQ7UEfJ4="; + hash = "sha256-rxOS1MT1F0tbt+OyjpITfSmPOt1U5AJ3LfKvzPEmO6A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 78e82de8f9032..ff5d9d0bf27b2 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "9.7.0"; + version = "9.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_cosmosdb"; inherit version; - hash = "sha256-tQctMZ8RlT2PEuIkWa3tGRLV8n5ELh2LSVlqhQBUEKE="; + hash = "sha256-Znx9io9UKw55cuYydK9TatmFGH4kpswuPI7vNVYIgfw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix b/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix index 94e4a143e6b64..b24b2e0d3c925 100644 --- a/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix @@ -4,23 +4,22 @@ azure-mgmt-core, buildPythonPackage, fetchPypi, - isodate, + msrest, pythonOlder, setuptools, - typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-extendedlocation"; - version = "2.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { - pname = "azure_mgmt_extendedlocation"; - inherit version; - hash = "sha256-O1wdLwoh8V6bF29EAgbHAqH3f6S5ffHKQAH5kavPfNE="; + inherit pname version; + extension = "zip"; + hash = "sha256-jRo6EFP8Dg3i9U8HLfjED9QFfWbdg+X3o9PSf4eus9o="; }; build-system = [ setuptools ]; @@ -28,13 +27,9 @@ buildPythonPackage rec { dependencies = [ azure-common azure-mgmt-core - isodate - typing-extensions + msrest ]; - # Tests are only available in mono repo - doCheck = false; - pythonImportsCheck = [ "azure.mgmt.extendedlocation" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix b/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix index 3df70e35796ac..57d67492ccafa 100644 --- a/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix @@ -1,44 +1,37 @@ { lib, - azure-common, - azure-mgmt-core, buildPythonPackage, fetchPypi, msrest, - pythonOlder, - setuptools, + msrestazure, + azure-common, + azure-mgmt-nspkg, }: buildPythonPackage rec { pname = "azure-mgmt-scheduler"; - version = "7.0.0"; - pyproject = true; - - disabled = pythonOlder "3.8"; + version = "2.0.0"; + format = "setuptools"; src = fetchPypi { - pname = "azure_mgmt_scheduler"; - inherit version; - hash = "sha256-hzabrRKnOzxk2e0/HlJvS7QvWnibgLfqn8EW+vsFH6U="; + inherit pname version; + extension = "zip"; + sha256 = "c6e6edd386ddc4c21d54b1497c3397b970bc127b71809b51bd2391cb1f3d1a14"; }; - build-system = [ setuptools ]; - - dependencies = [ - azure-common - azure-mgmt-core + propagatedBuildInputs = [ msrest + msrestazure + azure-common + azure-mgmt-nspkg ]; # has no tests doCheck = false; - pythonImportsCheck = [ "azure.mgmt.scheduler" ]; - meta = with lib; { description = "This is the Microsoft Azure Scheduler Management Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-scheduler_7.0.0/sdk/scheduler/azure-mgmt-scheduler/CHANGELOG.md"; - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-scheduler_${version}/sdk/scheduler/azure-mgmt-scheduler/CHANGELOG.md"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index cc5e94105915d..04e4ee8bf5a81 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.20.0"; + version = "12.19.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_storage_file_share"; inherit version; - hash = "sha256-8SD8Z7rgqEwbVNBvqnDfNRvhTROVuaCFNQ6DP300emU="; + hash = "sha256-6npBdNxsUvUKyMMPIoFZ/MNnXR+Lp3G40O/LwxB0Ang="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index 5bd7ca9b33a7b..515c3f167e912 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.20.2"; + version = "0.20.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-adapters"; rev = "refs/tags/v${version}"; - hash = "sha256-JeYqzwlR0zY0BGC6iFCTu9EDlYnu+wdpGeje2xKwcVI="; + hash = "sha256-dQjoaBK+WMHQss/7nQRRCE8Jv4S0iq6awa/t3SMGUiE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix index 9833bed552d46..1d0a48549c169 100644 --- a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix +++ b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -28,8 +28,7 @@ buildPythonPackage rec { "-o cache_dir=$(mktemp -d)" # Monitor https://github.com/certbot/certbot/issues/9606 for a solution - "-W" - "ignore::DeprecationWarning" + "-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'" ]; meta = certbot.meta // { diff --git a/pkgs/development/python-modules/certbot-dns-ovh/default.nix b/pkgs/development/python-modules/certbot-dns-ovh/default.nix index 6e976eccb8cea..4858b58279696 100644 --- a/pkgs/development/python-modules/certbot-dns-ovh/default.nix +++ b/pkgs/development/python-modules/certbot-dns-ovh/default.nix @@ -1,25 +1,22 @@ { - acme, buildPythonPackage, + acme, certbot, dns-lexicon, pytestCheckHook, pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "certbot-dns-ovh"; - pyproject = true; + format = "setuptools"; inherit (certbot) src version; disabled = pythonOlder "3.6"; sourceRoot = "${src.name}/certbot-dns-ovh"; - build-system = [ setuptools ]; - - dependencies = [ + propagatedBuildInputs = [ acme certbot dns-lexicon @@ -31,8 +28,9 @@ buildPythonPackage rec { "-o cache_dir=$(mktemp -d)" # Monitor https://github.com/certbot/certbot/issues/9606 for a solution - "-W" - "ignore::DeprecationWarning" + "-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'" + "-W 'ignore:Package lexicon.providers is deprecated and will be removed in Lexicon 4>=.:DeprecationWarning'" + "-W 'ignore:Legacy configuration object has been used to load the ConfigResolver.:DeprecationWarning'" ]; meta = certbot.meta // { diff --git a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix index c0910bdf40f8f..d4883bd2ad02a 100644 --- a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix +++ b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix @@ -28,8 +28,7 @@ buildPythonPackage rec { "-o cache_dir=$(mktemp -d)" # Monitor https://github.com/certbot/certbot/issues/9606 for a solution - "-W" - "ignore::DeprecationWarning" + "-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'" ]; meta = certbot.meta // { diff --git a/pkgs/development/python-modules/certbot-dns-route53/default.nix b/pkgs/development/python-modules/certbot-dns-route53/default.nix index 01156dd0b7991..798631b0c79e3 100644 --- a/pkgs/development/python-modules/certbot-dns-route53/default.nix +++ b/pkgs/development/python-modules/certbot-dns-route53/default.nix @@ -5,21 +5,16 @@ certbot, pytestCheckHook, pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "certbot-dns-route53"; - pyproject = true; + format = "setuptools"; inherit (certbot) src version; disabled = pythonOlder "3.6"; - sourceRoot = "${src.name}/certbot-dns-route53"; - - build-system = [ setuptools ]; - - dependencies = [ + propagatedBuildInputs = [ acme boto3 certbot @@ -31,10 +26,11 @@ buildPythonPackage rec { "-o cache_dir=$(mktemp -d)" # Monitor https://github.com/certbot/certbot/issues/9606 for a solution - "-W" - "ignore::DeprecationWarning" + "-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'" ]; + sourceRoot = "${src.name}/certbot-dns-route53"; + meta = certbot.meta // { description = "Route53 DNS Authenticator plugin for Certbot"; }; diff --git a/pkgs/development/python-modules/cffsubr/default.nix b/pkgs/development/python-modules/cffsubr/default.nix index 28332b92d734e..46dabb2711af7 100644 --- a/pkgs/development/python-modules/cffsubr/default.nix +++ b/pkgs/development/python-modules/cffsubr/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, afdko, buildPythonPackage, @@ -48,6 +49,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "cffsubr" ]; meta = with lib; { + broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/adobe-type-tools/cffsubr/releases/tag/v${version}"; description = "Standalone CFF subroutinizer based on AFDKO tx"; mainProgram = "cffsubr"; diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index ef33cb69e1ce3..443a7e8c1da60 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.6.4.post1"; + version = "1.6.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UKx2zJ8Qq3vUbkSnHFGmknBRtJm0QH308pqxPXQblC8="; + hash = "sha256-4yVAYZN1in7WcwjetS5yd4KhnjhOGDN45/9iCYvgrtw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 99b9e3d4a36aa..da178007ba92e 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.50.2"; + version = "0.50.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F3JXdL8rsKSPHQltknB0ksGH8krgiWCvCwwvqXlY/VE="; + hash = "sha256-V51NtUvW75GMUlAhftsVuAt7EVgrjiT85DcCdow/Li0="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/duden/default.nix b/pkgs/development/python-modules/duden/default.nix index dc47ee1e976ee..a4da49d62f179 100644 --- a/pkgs/development/python-modules/duden/default.nix +++ b/pkgs/development/python-modules/duden/default.nix @@ -49,6 +49,7 @@ let license = with lib.licenses; [ mit ]; mainProgram = "duden"; maintainers = with lib.maintainers; [ + AndersonTorres linuxissuper ]; }; diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 0a1e330349b02..67a309fcee042 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.22.3"; + version = "0.22.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-N2ATC/GALKd8JUrkvlvHe9JPzwzbB5GPTBavo17DW5Y="; + hash = "sha256-rauk8rY3i5fWUrE8lszyC9KBVjTZ7zhXO98cMhIiiz8="; }; build-system = [ diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 5be11fe011b85..a3f45ce57f5d8 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.16.1"; + version = "2.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_redis"; inherit version; - hash = "sha256-vB3Ht3k5evXO77NrRVkeUAj4oWNdpvZOHpm8OKgqzpY="; + hash = "sha256-bQjLUjstRlekL8/kMt41zfjq+XnnUUhPHaJ6lwRpAZY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jianpu-ly/default.nix b/pkgs/development/python-modules/jianpu-ly/default.nix deleted file mode 100644 index 411f7df5ee458..0000000000000 --- a/pkgs/development/python-modules/jianpu-ly/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools, - lilypond, -}: - -buildPythonPackage rec { - pname = "jianpu-ly"; - version = "1.801"; - pyproject = true; - - src = fetchPypi { - inherit version; - pname = "jianpu_ly"; - hash = "sha256-piK9Ym94cKdaHGz/ogX7ylyAF1ww0jCdRXnHN6lu2MI="; - }; - - dependencies = [ lilypond ]; - - build-system = [ setuptools ]; - - pythonImportsCheck = [ "jianpu_ly" ]; - - # no tests in shipped with upstream - doCheck = false; - - meta = { - homepage = "https://ssb22.user.srcf.net/mwrhome/jianpu-ly.html"; - description = "Assists with printing jianpu"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ifurther ]; - }; -} diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 662399de3c77c..05822ea24a7e7 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -150,8 +150,8 @@ rec { "sha256-nr00I/1oqR16ZIw3+iA2BrS0C0Wr7UlJ48VnuOFIcb0="; mypy-boto3-autoscaling = - buildMypyBoto3Package "autoscaling" "1.35.66" - "sha256-ptNNL5PwQsM73gG0RyzpDmI6n9kWngg25VCC3Z8+SLg="; + buildMypyBoto3Package "autoscaling" "1.35.64" + "sha256-UwbbspFXW+5byIur1AV1FVslKf9RZnYgcQ3J5MOiMh8="; mypy-boto3-autoscaling-plans = buildMypyBoto3Package "autoscaling-plans" "1.35.0" @@ -230,8 +230,8 @@ rec { "sha256-0aFQDfgRrI69RZZA9bMcFNqseE2KAPxPZ7xus5Hntag="; mypy-boto3-cloudfront = - buildMypyBoto3Package "cloudfront" "1.35.66" - "sha256-pv5dVwGAe2CgnVDcg1s7ysUhtHsK+SQN/6m3NtMXusc="; + buildMypyBoto3Package "cloudfront" "1.35.58" + "sha256-s71YfOrIIPFeAci2Ca+q5QyV4+JjQ5xdQ5sU8SZE29c="; mypy-boto3-cloudhsm = buildMypyBoto3Package "cloudhsm" "1.35.0" @@ -330,8 +330,8 @@ rec { "sha256-goeKEyNrj2ofR5v0nEpDZ1CLNpR0qvN13u8KS1sImZQ="; mypy-boto3-compute-optimizer = - buildMypyBoto3Package "compute-optimizer" "1.35.66" - "sha256-Iwi1LaWrIytRxtW38kVnYVIXihIy5ZFhRGaGHa9X+VM="; + buildMypyBoto3Package "compute-optimizer" "1.35.0" + "sha256-pP0c6lk9l3seKkYBW9AjoaypkRWw4YwDgJjIpkwkLMA="; mypy-boto3-config = buildMypyBoto3Package "config" "1.35.0" @@ -358,8 +358,8 @@ rec { "sha256-rYvtpy8Uac5YO4x/WSvUHz0aY8vYVf30gW1aLyYDbRM="; mypy-boto3-controltower = - buildMypyBoto3Package "controltower" "1.35.66" - "sha256-95toJlk39dNRYWXUFxbBSWa9r/wodCkOwMPXvcl+aoc="; + buildMypyBoto3Package "controltower" "1.35.59" + "sha256-fLh9uKE/8iAb/dOIgxe3wKJizZkXjlfBmO2hEr4/L1U="; mypy-boto3-cur = buildMypyBoto3Package "cur" "1.35.0" @@ -406,8 +406,8 @@ rec { "sha256-HCSark4bQG673j5KZ1ZULwNiOBk/cichkGwuH1XNAPk="; mypy-boto3-discovery = - buildMypyBoto3Package "discovery" "1.35.66" - "sha256-qJiWEjsheL19hoIdrnDZVXOTIcK9SWo9+HKfQh6CZaw="; + buildMypyBoto3Package "discovery" "1.35.0" + "sha256-kM9eR8OQ2la4tad+Q2PvO0auuEQNj0My5q4l8//9i+I="; mypy-boto3-dlm = buildMypyBoto3Package "dlm" "1.35.0" @@ -446,8 +446,8 @@ rec { "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.35.66" - "sha256-SrS3g6U8vP1rKN0ISPcaXsf8a8VFtmhF6GYXTG29/+o="; + buildMypyBoto3Package "ec2" "1.35.64" + "sha256-hyYGaUhX5OOZa6SdbS5WNoa9hz1EHVzArwJnqw7xJws="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.35.0" @@ -462,12 +462,12 @@ rec { "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.35.66" - "sha256-0DmtbDZK4a4BjvhPcFEWIzWF8L+hCRYW+OF+cRhl0Rc="; + buildMypyBoto3Package "ecs" "1.35.64" + "sha256-3kD4U7XmqHVIYrSOU361t+OCf0GLjaORpV0vQB/rEyg="; mypy-boto3-efs = - buildMypyBoto3Package "efs" "1.35.65" - "sha256-Pf+g7g5cjPoIqAL5sJqqMtPWU0hqGDQnfzwoxNgL5OE="; + buildMypyBoto3Package "efs" "1.35.0" + "sha256-6o825Pz7Vbg/xuFXR7mTLv3zWcLoRIqbFqjRcQtZOJ8="; mypy-boto3-eks = buildMypyBoto3Package "eks" "1.35.57" @@ -494,8 +494,8 @@ rec { "sha256-fw/vfzKXXQSG7xj9FolkJgzciHBz4ELlFh2MlEJ6wQI="; mypy-boto3-elbv2 = - buildMypyBoto3Package "elbv2" "1.35.66" - "sha256-f2o9uGQF2dRZ3xUtAwWcTV+g4VbDphexuW2kn/Ik+9k="; + buildMypyBoto3Package "elbv2" "1.35.53" + "sha256-MQYmmlnrK7sbbO9AiVavD79ImyUZIMavuHz/rn1gTTs="; mypy-boto3-emr = buildMypyBoto3Package "emr" "1.35.39" @@ -574,8 +574,8 @@ rec { "sha256-RJEZBr3yU/lGEainrpidLsdYBvVOPMq3cIaIpsTAziQ="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.35.65" - "sha256-FnVW/E8XSVLq9k4vwWpF71V/33yoW8HSJcWh6SeBg0I="; + buildMypyBoto3Package "glue" "1.35.53" + "sha256-eUXh24klobdPHgxu3Wjg638PeAu3ArlO3tsxewthfDo="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.35.0" @@ -726,8 +726,8 @@ rec { "sha256-lBZ9MJQsuM0vRyrDcelDXTIhP9sex6CjnRjYY3qjIdE="; mypy-boto3-keyspaces = - buildMypyBoto3Package "keyspaces" "1.35.65" - "sha256-hn0qygyjRs7+PR4526zoyh4ZO8bLVsG0MD/v1iKhqwU="; + buildMypyBoto3Package "keyspaces" "1.35.52" + "sha256-R3DERqUmmKGjXyJROJDYU+JTIzmrjiXmYCau0rpWujQ="; mypy-boto3-kinesis = buildMypyBoto3Package "kinesis" "1.35.26" @@ -770,8 +770,8 @@ rec { "sha256-QuVCDfj8bAtFhEnrsGqDYHFbl6awqAjLDjeJn5Rq0IM="; mypy-boto3-lambda = - buildMypyBoto3Package "lambda" "1.35.66" - "sha256-JOU9kpDiRxbwwf01H0BfQcVftHmHGEOXHBrYIdi5NoQ="; + buildMypyBoto3Package "lambda" "1.35.58" + "sha256-xoBzY+4YV5s9bf98CQ9ktGKh8kO+Rv5oRzM2JOMeu/w="; mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.35.0" @@ -862,8 +862,8 @@ rec { "sha256-v+a4wc62OnHXJv5BHy/oq88FRn3piimmenmAPAOZXOA="; mypy-boto3-mediaconvert = - buildMypyBoto3Package "mediaconvert" "1.35.66" - "sha256-NJRSgwKHlb0ORdkg2ovACyfegmm5Tpzmxm/izLqpt/k="; + buildMypyBoto3Package "mediaconvert" "1.35.60" + "sha256-iURmmne8xlDftE34C1f6EMIM0Ub10vL25isLU4Q6ROI="; mypy-boto3-medialive = buildMypyBoto3Package "medialive" "1.35.23" @@ -878,8 +878,8 @@ rec { "sha256-ur1A0iPMGgfI0XNSOiXX4VF5nR6XJcnpk0KM62Ujp/0="; mypy-boto3-mediapackagev2 = - buildMypyBoto3Package "mediapackagev2" "1.35.66" - "sha256-sG9IY1p72flgZY8JvyB7GdhT8WR6FUHpg6Lq8cEDzo0="; + buildMypyBoto3Package "mediapackagev2" "1.35.50" + "sha256-kvY0A+v7yJ/NUiqy8HnA4EmGOnbqlQI8lj70S4k5+dk="; mypy-boto3-mediastore = buildMypyBoto3Package "mediastore" "1.35.0" @@ -938,8 +938,8 @@ rec { "sha256-iYVnkwqOe0UMOqI1NcD58Ej3Bk84adPWC3yq7/+3x8I="; mypy-boto3-mwaa = - buildMypyBoto3Package "mwaa" "1.35.65" - "sha256-uApZ8ugwNylCVcXEtYoIRi5gST9QPdRwj3g0cZ2Q2Bg="; + buildMypyBoto3Package "mwaa" "1.35.0" + "sha256-J1tV2BTUW2Bu8ll+Yn0cJpUpMCCCkfqUEAnis/OJxrA="; mypy-boto3-neptune = buildMypyBoto3Package "neptune" "1.35.24" @@ -966,8 +966,8 @@ rec { "sha256-jHEgFpoHJmep4Lv+ge3DSDthO6d9zt23lWBp0MztcHQ="; mypy-boto3-omics = - buildMypyBoto3Package "omics" "1.35.66" - "sha256-BrCTaS8B9svbA5yYkkmWChLmezKlj2sSQLsMz+J3q7M="; + buildMypyBoto3Package "omics" "1.35.7" + "sha256-CwD0stU2217XD+SXTp+WRyf/qH3EOA5PuBSdTWcXOGU="; mypy-boto3-opensearch = buildMypyBoto3Package "opensearch" "1.35.58" @@ -1082,12 +1082,12 @@ rec { "sha256-kwKCaPtSl9xFVw0cTDbveXOFs5r7YzowGfceDSo+qnc="; mypy-boto3-rbin = - buildMypyBoto3Package "rbin" "1.35.66" - "sha256-12AIEWhTwK3YdCUhImozJeO83Ye9G2D1VaKMeqbV/pE="; + buildMypyBoto3Package "rbin" "1.35.0" + "sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.35.66" - "sha256-CFDLW93aGFPGukS7jcG/DTA+pHKfjN+YLQ5NkfCKstk="; + buildMypyBoto3Package "rds" "1.35.64" + "sha256-6B3bAEd3qBDsfi6K0wSjvERi+cacRHpmRWBe9nDdzLE="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.35.64" @@ -1354,8 +1354,8 @@ rec { "sha256-i0NmNRPwEypr4m0vNtJDXHEAbCcqdxTexY3MDaltvh8="; mypy-boto3-timestream-query = - buildMypyBoto3Package "timestream-query" "1.35.66" - "sha256-al4vTjuFg1CNtQ0u35zNsDPafgyAlNwTMLBfmlA/5Kk="; + buildMypyBoto3Package "timestream-query" "1.35.46" + "sha256-kdbDOZuuccSC9k+X0VXRkCUkdpKyeD9ge3bj/JxLBlQ="; mypy-boto3-timestream-write = buildMypyBoto3Package "timestream-write" "1.35.0" @@ -1426,12 +1426,12 @@ rec { "sha256-Om/TFPBZh3xr0inpGzCpvTNij9DTPq8dV1ikX8g4YtE="; mypy-boto3-workspaces = - buildMypyBoto3Package "workspaces" "1.35.66" - "sha256-z5mP/vfVc21NGQ1i5usm+uol9V3aQqDJn0ot1AJxaCI="; + buildMypyBoto3Package "workspaces" "1.35.43" + "sha256-l6Jfcb3+7RbUuXBsQvtYGqffbVobjFldwscGSIJR6Cs="; mypy-boto3-workspaces-web = - buildMypyBoto3Package "workspaces-web" "1.35.66" - "sha256-36tsFJx1Q5vVGfdkHflOfd6r2rTqSmQzN+O1JBtJ1iI="; + buildMypyBoto3Package "workspaces-web" "1.35.23" + "sha256-/uATkqLhOOPKwegWRQOSRGeM2tmq+VbWY3t780IvSek="; mypy-boto3-xray = buildMypyBoto3Package "xray" "1.35.0" diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index 555199e326aec..4490f4c5855ee 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "plotnine"; - version = "0.14.2"; + version = "0.14.1"; pyproject = true; src = fetchFromGitHub { owner = "has2k1"; repo = "plotnine"; rev = "refs/tags/v${version}"; - hash = "sha256-hO6HxzzCCFfZVvqCaFf7JfWYFFfU9umFgNM1+Z1HBuQ="; + hash = "sha256-K2Feqg3UiffZ4izYzrCW+iu7dH61sItOUVtwvzTMth0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 1bbca6d3919f2..8bfa57692252d 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "1.5.2"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-DC/pytBgzQJ38GshFR1IgvxUN2IJnqPn49FvS6dY5Js="; + hash = "sha256-WcoHK8UZ7qOVoUBCSoTDZ+6fC568AyXFCBys/7sjJx8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index e158428c2cd66..8802981fd3b5d 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20241121"; + version = "1.0.2.20241108"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d437em6EKBDGL2JufpNX1o+kO3basx5e/xb7m4d2qec="; + hash = "sha256-OsuirJ28KmKPnjntwXw6xrPKCX7wu/iGeeX/zIpf6qc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 7278ff2efc816..a96386890be15 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.23.0"; + version = "1.22.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-nGOxGZxPTlU5/nI2m+MXzzcVA+twxfNL1Jf51xT0XLc="; + hash = "sha256-letF0s/zJKdMT2nGnZpMFufja0bsL0zlwG+dCSK5BA4="; }; pythonRelaxDeps = [ "tenacity" ]; diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix index 7e00237e2e9c5..5846e23b98c75 100644 --- a/pkgs/development/python-modules/pylacus/default.nix +++ b/pkgs/development/python-modules/pylacus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pylacus"; - version = "1.12.0"; + version = "1.11.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "PyLacus"; rev = "refs/tags/v${version}"; - hash = "sha256-M7xPJKM/8fY8RBU2ESzaYOfENICCRNexORJGkerD4FM="; + hash = "sha256-kCYpv6rCvjeXlyB+x6AgT9DY9EvccoQKaWpR19ZJhLc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 5f9701230544d..c1727a85f8fb5 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -3,7 +3,6 @@ stdenv, bitstring, buildPythonPackage, - buildPackages, cffi, fetchPypi, pycparser, @@ -31,10 +30,6 @@ buildPythonPackage rec { pycparser ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - nativeBuildInputs = [ cffi ]; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace vex/Makefile-gcc \ --replace-fail '/usr/bin/ar' 'ar' diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index d5aff40fe5769..9e4f03008b11a 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.11.2"; + version = "0.11.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-VHuZhnesfY/bGIGMiT3VWFQXSisntNfbdDJy3tH0SlU="; + hash = "sha256-cY5EEIab+6JzDI3QpsFbPPdf3mJ+Pax1pkZKNewVkTI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index c9ffbc56b4432..485210d20b3f9 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -1,33 +1,28 @@ { lib, buildPythonPackage, - docutils, fetchPypi, + docutils, + readme-renderer, packaging, pygments, pytestCheckHook, pythonOlder, - readme-renderer, - setuptools, }: buildPythonPackage rec { pname = "restview"; - version = "3.0.2"; - pyproject = true; + version = "3.0.1"; + format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-i011oL7Xa2e0Vu9wEfTrbJilVsn4N2Qt8iAscxL8zBo="; + hash = "sha256-jBoXHBWdRtFdVWn3cCGCiIOhIdb5uvdY1kH8HlSwWuU="; }; - pythonRelaxDeps = [ "readme-renderer" ]; - - build-system = [ setuptools ]; - - dependencies = [ + propagatedBuildInputs = [ docutils readme-renderer packaging @@ -45,10 +40,10 @@ buildPythonPackage rec { meta = with lib; { description = "ReStructuredText viewer"; + mainProgram = "restview"; homepage = "https://mg.pov.lt/restview/"; changelog = "https://github.com/mgedmin/restview/blob/${version}/CHANGES.rst"; - license = licenses.gpl3Plus; + license = licenses.gpl3Only; maintainers = with maintainers; [ koral ]; - mainProgram = "restview"; }; } diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 7850e0a18f507..b17589b562abf 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.251.0"; + version = "0.243.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-khr4uwbRaO/7gw7N17qBRN1qnoMKw13lLzxEzBoB8TY="; + hash = "sha256-m+KaUd0rl0RRZzVPI+ldwW77YGLq45egkV5vYYz4dW8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 8859822716dd9..a4044fc8a0ced 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "tldextract"; - version = "5.1.3"; + version = "5.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "john-kurkowski"; repo = "tldextract"; rev = "refs/tags/${version}"; - hash = "sha256-gcgQGZS/dsTTC4Szpjreb2fAsVZxxOCE1erVvU1q4xM="; + hash = "sha256-rieDDSCit9UcMpCMs2X3+cCS41Wbrp4WWVMzKj/jwEM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index a5b07a10e5050..3d5384614c3c4 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - setuptools, internetarchive, fetchPypi, yt-dlp, @@ -11,19 +10,18 @@ buildPythonPackage rec { pname = "tubeup"; - version = "2024.11.13"; - pyproject = true; + version = "2023.9.19"; + format = "setuptools"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BPkcz+y90NVDX2jjwOZ/9F/Oedg+LXc34Tee6ZfJ1vQ="; + hash = "sha256-Pp4h0MBoYhczmxPq21cLiYpLUeFP+2JoACcFpBl3b0E="; }; - build-system = [ setuptools ]; - dependencies = [ + propagatedBuildInputs = [ internetarchive docopt yt-dlp diff --git a/pkgs/development/python-modules/wgnlpy/default.nix b/pkgs/development/python-modules/wgnlpy/default.nix deleted file mode 100644 index 11cb4e38b0466..0000000000000 --- a/pkgs/development/python-modules/wgnlpy/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - cryptography, - pyroute2, -}: - -buildPythonPackage rec { - pname = "wgnlpy"; - version = "0.1.5"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ArgosyLabs"; - repo = "wgnlpy"; - rev = "v${version}"; - hash = "sha256-5XAfBiKx4SqouA57PxmaCb0ea7mT2VeUI1tgnQE/ZwQ="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - cryptography - pyroute2 - ]; - - pythonImportsCheck = [ - "wgnlpy" - "wgnlpy.nlas" - ]; - - meta = { - description = "Netlink connector to WireGuard"; - homepage = "https://github.com/ArgosyLabs/wgnlpy"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ marcel ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 019255e593550..5752f9535f80d 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -54,6 +54,24 @@ let }; in { + cargo-pgrx_0_10_2 = generic { + version = "0.10.2"; + hash = "sha256-FqjfbJmSy5UCpPPPk4bkEyvQCnaH9zYtkI7txgIn+ls="; + cargoHash = "sha256-syZ3cQq8qDHBLvqmNDGoxeK6zXHJ47Jwkw3uhaXNCzI="; + }; + + cargo-pgrx_0_11_2 = generic { + version = "0.11.2"; + hash = "sha256-8NlpMDFaltTIA8G4JioYm8LaPJ2RGKH5o6sd6lBHmmM="; + cargoHash = "sha256-qTb3JV3u42EilaK2jP9oa5D09mkuHyRbGGRs9Rg4TzI="; + }; + + cargo-pgrx_0_11_3 = generic { + version = "0.11.3"; + hash = "sha256-UHIfwOdXoJvR4Svha6ud0FxahP1wPwUtviUwUnTmLXU="; + cargoHash = "sha256-j4HnD8Zt9uhlV5N7ldIy9564o9qFEqs5KfXHmnQ1WEw="; + }; + cargo-pgrx_0_12_0_alpha_1 = generic { version = "0.12.0-alpha.1"; hash = "sha256-0m9oaqjU42RYyttkTihADDrRMjr2WoK/8sInZALeHws="; diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix index 4c9f97fa05d14..7b0b67ad302e4 100644 --- a/pkgs/games/heroic/fhsenv.nix +++ b/pkgs/games/heroic/fhsenv.nix @@ -44,7 +44,6 @@ buildFHSEnv { let xorgDeps = pkgs: with pkgs.xorg; [ - libICE libpthreadstubs libSM libX11 @@ -54,15 +53,11 @@ buildFHSEnv { libXcursor libXdmcp libXext - libXfixes libXi libXinerama libXmu libXrandr libXrender - libXScrnSaver - libXt - libXtst libXv libXxf86vm ]; diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix deleted file mode 100644 index e51f7d067f52d..0000000000000 --- a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - callPackage, - fetchFromGitHub, -}: - -callPackage ../generic.nix rec { - pname = "tower-pixel-dungeon"; - version = "0.3.2"; - - src = fetchFromGitHub { - owner = "FixAkaTheFix"; - repo = "Tower-Pixel-Dungeon"; - rev = "TPDv${lib.replaceStrings [ "." ] [ "" ] version}"; - hash = "sha256-ZyqrrSuA++L7FOUj6Ytk2lld0YMY4B7WOCzpohOKhdU="; - }; - - sourceRoot = src.name + "/pixel-towers-master"; - - desktopName = "Tower Pixel Dungeon"; - - # Sprite sources (Paint.NET files) interfere with the build process. - postPatch = '' - rm core/src/main/assets/{levelsplashes,sprites}/*.pdn - ''; - - meta = { - homepage = "https://github.com/FixAkaTheFix/Tower-Pixel-Dungeon"; - downloadPage = "https://github.com/FixAkaTheFix/Tower-Pixel-Dungeon/releases"; - description = "Turn-based tower defense game based on Shattered Pixel Dungeon"; - }; -} diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json deleted file mode 100644 index 1448fe4b65f89..0000000000000 --- a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", - "!version": 1, - "https://repo.maven.apache.org/maven2": { - "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.11.0": { - "jar": "sha256-my0CJorGB5QwSi4E5ep1H62fX5bsyvFdgCOm4LF6994=", - "module": "sha256-o7gpPFXSp2lb60LCcKrfKpQcK4NqQL8Ob4W6OOY0VwY=", - "pom": "sha256-wa55d83hp9muWlhfDe8Ap2d4LzcR5/+RYTX2UPA2HOo=" - }, - "com/badlogicgames/gdx#gdx-freetype-platform/1.11.0": { - "pom": "sha256-a5PHPPIyrqNpnueP5GEkJ14KwbsROJkXUcz96l8Au9c=" - }, - "com/badlogicgames/gdx#gdx-freetype-platform/1.11.0/natives-desktop": { - "jar": "sha256-9GCzmqhP9bnWC4mT4j/zKtpWellmThTrfha7VcWk9yE=" - }, - "com/badlogicgames/gdx#gdx-freetype/1.11.0": { - "jar": "sha256-u5hP1RQ13YCN0HaSWOqzJikXG19OnkPzmvRUPh7E3yI=", - "module": "sha256-n5oGuAY9dyn7H94+ippXm3vuPUqevY+xrDubsj78b/M=", - "pom": "sha256-xkjQNIE46uOtYmScUTA8R5rr5czpsbXQeLX3rkVQG+0=" - }, - "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": { - "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=", - "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=", - "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng=" - }, - "com/badlogicgames/gdx#gdx-platform/1.11.0": { - "pom": "sha256-8cBBk8LQnXP8lVNQL05ZFMIOgDWrdpoZ0z4bxJJ0AkA=" - }, - "com/badlogicgames/gdx#gdx-platform/1.11.0/natives-desktop": { - "jar": "sha256-yUFpxwl25LGMCL1qKWtETqiLtUlF67EtHy5DK5L4OTA=" - }, - "com/badlogicgames/gdx#gdx/1.11.0": { - "jar": "sha256-IxU8Z+GVYGROD6EjUjK12F7kHPKJKBwtp+yMKONXULk=", - "module": "sha256-twUVE1CLWninINOZQrsifRvrOrzgBpskstIAA2TPbbM=", - "pom": "sha256-2W6H3BZixRugifIY1Cy3/U3b3sZQiytosvCsZ5dvJSU=" - }, - "com/badlogicgames/gdx-controllers#gdx-controllers-core/2.2.3": { - "jar": "sha256-mONKsUmJoPsqyIG6IaxNEqbOTeQoPzmypPFlumEqOlA=", - "pom": "sha256-UFwJ02ifZMr31qLz/PeKizwEFLIuRH4BlTHJDBCqmGU=" - }, - "com/badlogicgames/gdx-controllers#gdx-controllers-desktop/2.2.3": { - "jar": "sha256-UkirjqKl+0SixFdVEQLsNAP/JYm6hKImCti8cv6X6oM=", - "pom": "sha256-yc9KDEo6Bu+vBLORaza3fL3F71YdCpy6GhdiPxH8Tt8=" - }, - "com/badlogicgames/jamepad#jamepad/2.0.20.0": { - "jar": "sha256-6fFqB9SpRCSs0DiOw6P+TsZLfhiWxlgUwv9rRisTs2Y=", - "module": "sha256-vXFX36GUJsdj2VgYbnHR3+lKnBRgBeEI9pwUameDrmY=", - "pom": "sha256-+gwaoDndosNqw/VslH3vLEOptLnkbCPhrqddHQaZ3eQ=" - }, - "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { - "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", - "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" - }, - "org/jcraft#jorbis/0.0.17": { - "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", - "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" - }, - "org/json#json/20170516": { - "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", - "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" - }, - "org/lwjgl#lwjgl-glfw/3.3.1": { - "jar": "sha256-CLvDTrdS+GPjf4OrHHsMIvfLJtD4+wpKSoxgKKxFs4U=", - "pom": "sha256-TKQrQ8iqDodIWWB0d0C5lFqqH99+QTTm+iTo+d8cF2A=" - }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux": { - "jar": "sha256-Ze0Ev/fQf+ybf958OxHEBShsjWbk609Mm3kuJn7OWwY=" - }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux-arm32": { - "jar": "sha256-hOvo8klGPrF84PrpnYsto8G/kcjUEHOjtYNFd7dS4/s=" - }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux-arm64": { - "jar": "sha256-IgDyzcENHaZ215o+oFybpVnaCZUFwbdWtu0iL2FagSA=" - }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-macos": { - "jar": "sha256-G2z/nmSKci7gzBRmlhIFKqW6gJRp+os/sh8kw6vnDek=" - }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-macos-arm64": { - "jar": "sha256-nHlVeHSNWPQtXUcu2A0ulpk71Psf/ABYztosYx7zmJo=" - }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-windows": { - "jar": "sha256-nnROy4QCnXrO2uh24lV2WRhKKa/uVeRT9KslZzSb+Ek=" - }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-windows-x86": { - "jar": "sha256-pYAgBm4ePVP/xMf7ShWMDLP/tPM6rrPlTSVScyGUxBI=" - }, - "org/lwjgl#lwjgl-jemalloc/3.3.1": { - "jar": "sha256-7kn8Co2UVkUuVM1vd3gj7aZm4sY/wU1lsv0sws/tXb4=", - "pom": "sha256-+ZSGEVVV8RPaHOOs1f7LyWk7X9o1P/era9Lj1//dsn4=" - }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux": { - "jar": "sha256-m3mvXH/Q2UkG7h0qU6NCCidQfWYiS0/0a59ncmRd7TQ=" - }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux-arm32": { - "jar": "sha256-Bj8Lsu2V5d4q0G4Q0xJ/hJDdviBKyj5qOc5C3pF4TF8=" - }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux-arm64": { - "jar": "sha256-X4nVRq4fr1Gv+/sMZBR60swze/ajLwv4fEbTTDQvxdU=" - }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-macos": { - "jar": "sha256-B6qwMJQFjjiph2upM54IoiQDlO+Ii35/z9R2I1j22Wg=" - }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-macos-arm64": { - "jar": "sha256-500OE6wC9BAsIMF/DUFmCK2FNDSV7K4wAp32VousLSc=" - }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-windows": { - "jar": "sha256-Il8331UAYUZ1vprLYnjLbJyAo0kmR5iyz8fsQ08e1HI=" - }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-windows-x86": { - "jar": "sha256-Y5uy113z3Vnqewv4uEfgr1cHRpTXk5ILoclTeJeyw9g=" - }, - "org/lwjgl#lwjgl-openal/3.3.1": { - "jar": "sha256-cyXuG5GooQwGJsabVXqI8t9qwb3KDlLiqS0yQknyytA=", - "pom": "sha256-+ZzowctqhyXSbdyzNFxAPNu8x8qO6WYIu/PCxP2WaiE=" - }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-linux": { - "jar": "sha256-C3OB9R7cYQy2ByRdw0p2LSsht0R4FARAaKGmADu4eDg=" - }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-linux-arm32": { - "jar": "sha256-PQ39lwowYdM7FdvxjT7u/PB83EFx6skgUU8DhkY4mmI=" - }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-linux-arm64": { - "jar": "sha256-RPO9inlEGNtNU+51Rtkdl9nK9/QuE+ojU2PMM18u9ig=" - }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-macos": { - "jar": "sha256-UYTKJLjf6XJVtstVjFKb1qOImBu+VeITcY4/0r2ehuQ=" - }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-macos-arm64": { - "jar": "sha256-wi7Lzvj+5K7q+YEDLfPiy8MKkRqQJS7awfFJeX1YdXU=" - }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-windows": { - "jar": "sha256-X35maqJMqLP7dY5ywD/7nYCbMEicantH6tZ8aXf/ZU4=" - }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-windows-x86": { - "jar": "sha256-fVtbb61e+7Lowk80dgDHy8bv3RNh/TewtaEzGSMehR4=" - }, - "org/lwjgl#lwjgl-opengl/3.3.1": { - "jar": "sha256-5DbSFE86Nv/3cv1kIzMWgJt5XzkN79TVVmD8aG58KDQ=", - "pom": "sha256-LL9XxnqNBGatgI4aJ/4908EQ6KwC3IqyushKhRl3VUE=" - }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux": { - "jar": "sha256-vPzZ+N/SKUiK2ew1PUjHsC3lyiG63UCS8ZAiOaHtBpA=" - }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux-arm32": { - "jar": "sha256-IDPJfXY+YL2sAX/bsI06Q7vlwXqjZ7QsU3ycw6tAYY8=" - }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux-arm64": { - "jar": "sha256-EFjEunNUzavz75NZUeKT91tJYedT13/XU13ccy4oPyg=" - }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-macos": { - "jar": "sha256-cR8plyiIUJJiqVfxsxOL+ptQVRnRHfbldj0cmj+LPF0=" - }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-macos-arm64": { - "jar": "sha256-29EQBE6uitvKjjx6cwUpo1FVnnTOqIe7PNbvDcAW8pU=" - }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-windows": { - "jar": "sha256-hRubWTysIeOvUd1MMD6N8/5qNEo/gda5vMGG5+VAv9o=" - }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-windows-x86": { - "jar": "sha256-aD2K09DQl3puoYuIpMvn6P1PBsGrIbq+2riDCXQLzGA=" - }, - "org/lwjgl#lwjgl-stb/3.3.1": { - "jar": "sha256-ZOXMzi/Hy88Mg0pb6GQtniSYzj/jHBT/HfdBh4o/gSE=", - "pom": "sha256-dKgsbPvqhNIxAk2f2FgO2VumPCAafUeqsmO6hofDCVk=" - }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-linux": { - "jar": "sha256-+BuZjoxdYj1XHi/NRvy4e30w7SXfd95jrsjP7bNMSnA=" - }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-linux-arm32": { - "jar": "sha256-6xnGjFt5MUjKOT24bzHQ3pVALZ9MFOUADjkYSA9iKkc=" - }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-linux-arm64": { - "jar": "sha256-XOyb0h8xIAJaLIOB3BCax+yI5o5xX9fK27kPXVVfZZs=" - }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-macos": { - "jar": "sha256-oXjWYDA5nGmJeN/kqVALdVep2vTAYeg8iHAzfpsL0+c=" - }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-macos-arm64": { - "jar": "sha256-DXoP8tto86vkFpFn4vSJ3/d72igvQvhuQelEvnxDbdg=" - }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-windows": { - "jar": "sha256-/W/3om6GRa95oNIcpz6NyeRz80AtEzPlRKgdIcpQd+c=" - }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-windows-x86": { - "jar": "sha256-v3PjtRu0MOWIvRWOlsyimOmMoS8p3FzxRFwfDFw5uhs=" - }, - "org/lwjgl#lwjgl-tinyfd/3.3.1": { - "jar": "sha256-SI9R7ZXw+sSNHYfLDjusCMAS3L9u88FohoXXCM28zVY=", - "pom": "sha256-78RtVita7rFRzJnBhn5KUeVLzwWs+2EwOtZUh45Nyq8=" - }, - "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-linux": { - "jar": "sha256-e9cLKCM/RiGdoZiaw+n27vcuvyEc43Uv8eZFzqQYpM8=" - }, - "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-linux-arm64": { - "jar": "sha256-pLai7OGbhNkzyXmwx1+46BgCpoLVJEmWXDP0xaH+cAw=" - }, - "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-macos": { - "jar": "sha256-H1yGorLASVqlahKnTHwvwsk1PMOKoAzBOjJAR2QcMk0=" - }, - "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-macos-arm64": { - "jar": "sha256-EY1ViXZdZobUeDcZwt6MpmWiSX2LncKK00/RDtU0P6o=" - }, - "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-windows": { - "jar": "sha256-7McVIQloBZdWnZsyIEXynBp93uxxgs9pGJ2uFUE4ucg=" - }, - "org/lwjgl#lwjgl/3.3.1": { - "jar": "sha256-z4P5DjL7lz/17fyk7zX1XKUbtwpXm2ofKQdE9VLo5IQ=", - "pom": "sha256-xMXHr6uOt4JTZqIwhsPf7droMIwRXF1iF6gm7DJLN+M=" - }, - "org/lwjgl#lwjgl/3.3.1/natives-linux": { - "jar": "sha256-Iu8q+jGhdAozfsnGgGxrjZfpMaY+LEMnDLrxT7P2/E4=" - }, - "org/lwjgl#lwjgl/3.3.1/natives-linux-arm32": { - "jar": "sha256-9rVYGOx25ewBfiW8OvbsTbe3ol56KhdW+i/6uojIZWQ=" - }, - "org/lwjgl#lwjgl/3.3.1/natives-linux-arm64": { - "jar": "sha256-T9lq94+cKTsXAAEcfbGg7AI3xNGIPjf6vgj3To0uAiQ=" - }, - "org/lwjgl#lwjgl/3.3.1/natives-macos": { - "jar": "sha256-9I5hCpgdylFbm75zRcx240UME0BLBS2Kw1fvCvjpCr8=" - }, - "org/lwjgl#lwjgl/3.3.1/natives-macos-arm64": { - "jar": "sha256-cZfomrgKKiGDtO6SXMtE5XLwy3V6kndq34JlJpIAo2o=" - }, - "org/lwjgl#lwjgl/3.3.1/natives-windows": { - "jar": "sha256-CT0T1ipkNLxla/EKOzfiUw/ZrzsLwg+OlUW+WGWdFEM=" - }, - "org/lwjgl#lwjgl/3.3.1/natives-windows-x86": { - "jar": "sha256-6QwfnPVwGu7ymC6/CQWiuZH0YiuKf4JQ6vCHO1oKAiM=" - }, - "org/sonatype/oss#oss-parent/7": { - "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" - }, - "org/sonatype/oss#oss-parent/9": { - "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" - } - } -} diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index e65790ef26080..fb664e92cf176 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -1,18 +1,15 @@ -{ - lib, - stdenv, - fetchFromGitHub, - kernel, - libdrm, - python3, +{ lib +, stdenv +, fetchFromGitHub +, kernel +, libdrm +, python3 }: let - python3WithLibs = python3.withPackages ( - ps: with ps; [ - pybind11 - ] - ); + python3WithLibs = python3.withPackages (ps: with ps; [ + pybind11 + ]); in stdenv.mkDerivation (finalAttrs: { pname = "evdi"; @@ -44,11 +41,7 @@ stdenv.mkDerivation (finalAttrs: { "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; - hardeningDisable = [ - "format" - "pic" - "fortify" - ]; + hardeningDisable = [ "format" "pic" "fortify" ]; installPhase = '' runHook preInstall @@ -59,16 +52,13 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - meta = { - broken = kernel.kernelOlder "4.19" || kernel.kernelAtLeast "6.12"; + meta = with lib; { + broken = kernel.kernelOlder "4.19"; changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${finalAttrs.version}"; description = "Extensible Virtual Display Interface"; homepage = "https://www.displaylink.com/"; - license = with lib.licenses; [ - lgpl21Only - gpl2Only - ]; - maintainers = with lib.maintainers; [ drupol ]; - platforms = lib.platforms.linux; + license = with licenses; [ lgpl21Only gpl2Only ]; + maintainers = [ ]; + platforms = platforms.linux; }; }) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d9b9efb8838d3..4e0e3feb67df5 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,61 +2,61 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.10.230-hardened1.patch", - "sha256": "0z18m3q52kayrwgg0aaa46qvg4qnk31cwwdaxikl9sblq32020b2", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.230-hardened1/linux-hardened-v5.10.230-hardened1.patch" + "name": "linux-hardened-v5.10.229-hardened1.patch", + "sha256": "0bagy0x1kwm05x9mlgisjrlybk9yl91maxw6fai2si5m4xb3xv7n", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.229-hardened1/linux-hardened-v5.10.229-hardened1.patch" }, - "sha256": "0isbb0ixqg4yzlh3lmdvnax4m1ikf2q4wk0b9vgqc63p7gpm066d", - "version": "5.10.230" + "sha256": "1q6di05rk4bsy91r03zw6vz14zzcpvv25dv7gw0yz1gzpgkbb9h8", + "version": "5.10.229" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.15.173-hardened1.patch", - "sha256": "16pi07p3xgiqhzfw4y2shq70xwyrngyjj8mnzsdkyp88nja5d721", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.173-hardened1/linux-hardened-v5.15.173-hardened1.patch" + "name": "linux-hardened-v5.15.171-hardened1.patch", + "sha256": "08fbvra05rj0xcj9a8hd6mhv4lis2mhp57v7x4mw7rxxz2vim4bz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.171-hardened1/linux-hardened-v5.15.171-hardened1.patch" }, - "sha256": "1a3x3ld6g7ny0hdfqfvj5j2i5sx5l5p236pdnsr0icn9ri3jljwa", - "version": "5.15.173" + "sha256": "0fra5zwcixgl6fg9hgdzlfcqng6pg09h2j7xqhi4qg0jv1jf0lr9", + "version": "5.15.171" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.4.286-hardened1.patch", - "sha256": "0cqfqr5j7g6qq14r9mb5yzdfr71brvyb4xww9ir2sysa5i2qc2j6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.286-hardened1/linux-hardened-v5.4.286-hardened1.patch" + "name": "linux-hardened-v5.4.285-hardened1.patch", + "sha256": "1zm846mzvz1x88iskfw8513jkhlphxkd4v2qs86maxlgiz5zcxqp", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.285-hardened1/linux-hardened-v5.4.285-hardened1.patch" }, - "sha256": "0z48n7vahg318bgkccy8xqgl87vfb8zmn995cqh7z38fvzrm81qq", - "version": "5.4.286" + "sha256": "1722sc365ajxmqyr4r49yp73mzdckay3rx5c2gx29xzny9zc6cmy", + "version": "5.4.285" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.1.118-hardened1.patch", - "sha256": "0jk1ndy7xw6x425v1q945gawyi44bygryq71jxpf33z99xyqbyid", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.118-hardened1/linux-hardened-v6.1.118-hardened1.patch" + "name": "linux-hardened-v6.1.116-hardened1.patch", + "sha256": "0q597vszhgj6bgq56j11nq01mjjxl0ws8kqcr839fzkcgn1h6xv9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.116-hardened1/linux-hardened-v6.1.116-hardened1.patch" }, - "sha256": "0k12d4l03ziiba1b4f6jfxv5ir0lrd6kshlasr62rhv1f6yq81q1", - "version": "6.1.118" + "sha256": "109vhc1hcfx6sacw4553xmwbj1gqx3zqjq5zg11z7a72dqrnisqp", + "version": "6.1.116" }, "6.11": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.11.9-hardened1.patch", - "sha256": "1w3c7vni6pwlyav796fanj5cx5k3w7gsdpwihnniskyy9j1pvi4g", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.11.9-hardened1/linux-hardened-v6.11.9-hardened1.patch" + "name": "linux-hardened-v6.11.7-hardened1.patch", + "sha256": "1rfvlhgl78ixsb75aah9173h8jp37c8i0hs7b4484vljmqv0khcy", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.11.7-hardened1/linux-hardened-v6.11.7-hardened1.patch" }, - "sha256": "1d44yfk105bsf9f853f2fpnzqd0xbqn8drg1dv4ri5dxldx8lrbm", - "version": "6.11.9" + "sha256": "1cpbycx79nl517rz573mja52bgzm249mhqzp424r5mqp91jfrx8b", + "version": "6.11.7" }, "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.6.62-hardened1.patch", - "sha256": "1rk6plakzwa4bsi0cibl1l3g13bzry65533wk2khbgsikqnyi9fq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.62-hardened1/linux-hardened-v6.6.62-hardened1.patch" + "name": "linux-hardened-v6.6.60-hardened1.patch", + "sha256": "090bs6nvc9by5higmxfwmzlqjrhbhqs21gsmpxvm18p9l3s08dq3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.60-hardened1/linux-hardened-v6.6.60-hardened1.patch" }, - "sha256": "0dlkgph6chvqrask746wjijqp62vmvrp3n2dkldr8d2mfw8mdhz2", - "version": "6.6.62" + "sha256": "1vsjb7ifmf6ic6zv16fbrxjvffqc1mkndza76hjr9aw2a0ny7yaj", + "version": "6.6.60" } } diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index a2887cdb2b4ee..4d6006943d5c0 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:1rsglb7zwbn4f6wv4g95jl8ra1wbs03k7xyfdlmwzl3vgzx3bnzv" }, "6.1": { - "version": "6.1.119", - "hash": "sha256:0y1j8bz99d5vkxklzpwhns5r77lpz2prszf6whfahi58s0wszkdf" + "version": "6.1.118", + "hash": "sha256:0k12d4l03ziiba1b4f6jfxv5ir0lrd6kshlasr62rhv1f6yq81q1" }, "5.15": { "version": "5.15.173", @@ -20,15 +20,15 @@ "hash": "sha256:0z48n7vahg318bgkccy8xqgl87vfb8zmn995cqh7z38fvzrm81qq" }, "6.6": { - "version": "6.6.63", - "hash": "sha256:0d8q0vwv3lcix3wiq2n53rir3h298flg2l0ghpify4rlh2s4l1fi" + "version": "6.6.62", + "hash": "sha256:0dlkgph6chvqrask746wjijqp62vmvrp3n2dkldr8d2mfw8mdhz2" }, "6.11": { - "version": "6.11.10", - "hash": "sha256:0xzynjyyr16my0wrla4ggpjbh4g7nsqixaimz5hrsqlhaa8q9hab" + "version": "6.11.9", + "hash": "sha256:1d44yfk105bsf9f853f2fpnzqd0xbqn8drg1dv4ri5dxldx8lrbm" }, "6.12": { - "version": "6.12.1", - "hash": "sha256:06f6y37fi7galj001wwrq5pz3vhdl9nryydf3f4yqwnkdpcb34q1" + "version": "6.12", + "hash": "sha256:1sr58vsh39hdwk0z27lg14isqwn4g8m4r7a8z2rsyhkfwlmmd8mi" } } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 905aa1838a7c8..c445af0654a1c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.11.3"; + version = "2024.11.2"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix index e257f96db6b3f..65e56d0746f36 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mushroom"; - version = "4.2.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "piitaya"; repo = "lovelace-mushroom"; rev = "v${version}"; - hash = "sha256-nUGRn5fRP47F3+/wpU9j2HfAliz94O8GkS7jB+07bKE="; + hash = "sha256-d38FyJ3pQ6L0AY2j6aTB8CRxJt8LDgT1A9ZpMoQgbXo="; }; - npmDepsHash = "sha256-62wYR7Qkmcb4f2dWe6M3HMvrX9GyinNdTz0JeuismiA="; + npmDepsHash = "sha256-9i7pJh1dmhKobGFcLvZlc0JfaygwVuBvm6ttphl7SWg="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 818b834349af8..d373e2528b407 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -439,7 +439,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.11.3"; + hassVersion = "2024.11.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -457,13 +457,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-9b4HPSCPYUUwKxn0JBw5uN6nI97jvgqBHFRUNhDue/k="; + hash = "sha256-cP9Q700JLnThAPDfeJ8mx+PSI6I62hjA49TpAMHN2Wk="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-W7Z6C3kMyEIkY/3zQHm1OMMN7Tuj3ThsubLo6KjVotw="; + hash = "sha256-qBKcY8PybEJeExTjxs9bgiM6YWjyoSLE1dzgrD1Hdtc="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 9dcf47815bb7c..3f7c19381d2e4 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.11.3"; + version = "2024.11.2"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-wctoMEduYZxGiSNgZWq4OPgBaiykwTY7FP8PhRsMh0I="; + hash = "sha256-P9fhFl91IJyRCacJ5lDJu036hgzcNMCF7LO4Brv4P6c="; }; build-system = [ diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 952e4e4e0dcc6..12a242a4ed28d 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -65,8 +65,8 @@ in }; tomcat10 = common { - version = "10.1.33"; - hash = "sha256-Oysh1hzVh7X4ONoYQ3Y/6qXoZP4Fl1oQHa3gki3lCJU="; + version = "10.1.30"; + hash = "sha256-jeWoCPPcdirOZ5SM2Q0TJ7EWgWYiBE3IdQ8EIH35Ci4="; }; tomcat11 = common { diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index e95a4af44b87a..ce933af360ddc 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "grafana"; - version = "11.3.1"; + version = "11.3.0+security-01"; subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; @@ -16,7 +16,7 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-r8+GdAI1W7Y4wLL8GTLzXUTaOzvLb/YQ4XWHmYs1biI="; + hash = "sha256-t8D5JHhWJdsnY+SR+eiHy+jHkasAg8b5+uQ38OEFyR4="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 @@ -51,9 +51,9 @@ buildGoModule rec { dontFixup = true; outputHashMode = "recursive"; outputHash = rec { - x86_64-linux = "sha256-s9PGuuGwB4Ixw0cekrg0oldQxRU6xmb3KjFrNPRiGLs="; + x86_64-linux = "sha256-8XuRhipddv28msoSpG5WjpHc7NUEh4/+wRutKrY9r1U="; aarch64-linux = x86_64-linux; - aarch64-darwin = "sha256-NVx+ipUPova7yN56Ag0b13Jb6CsD0fwHfPpwyDbQs+Y="; + aarch64-darwin = "sha256-IOuE2QjZmeCOZdqA49RWoAtz2FROGqWo8Dp4wFnEkkk="; x86_64-darwin = aarch64-darwin; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index 7254d237e70d2..d4dacb6db75d6 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -169,16 +169,6 @@ "agpl" ] }, - "news": { - "hash": "sha256-m2Q+vq7G5oPr9fwIX+65NReaxzcxXehQBQ52T4VrYfw=", - "url": "https://github.com/nextcloud/news/releases/download/25.0.0/news.tar.gz", - "version": "25.0.0", - "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", - "homepage": "https://github.com/nextcloud/news", - "licenses": [ - "agpl" - ] - }, "notes": { "hash": "sha256-dpMCehjhPQoOA+MVdLeGc370hmqWzmsMczgV08m/cO4=", "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index d9af7fd328244..1130d429b0169 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -169,16 +169,6 @@ "agpl" ] }, - "news": { - "hash": "sha256-m2Q+vq7G5oPr9fwIX+65NReaxzcxXehQBQ52T4VrYfw=", - "url": "https://github.com/nextcloud/news/releases/download/25.0.0/news.tar.gz", - "version": "25.0.0", - "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", - "homepage": "https://github.com/nextcloud/news", - "licenses": [ - "agpl" - ] - }, "notes": { "hash": "sha256-dpMCehjhPQoOA+MVdLeGc370hmqWzmsMczgV08m/cO4=", "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz", diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index 53f07b447d423..0b8f718d0c969 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.63"; + version = "2.59"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-yVTQhkRsyZ3L4LPSv6Ffj6cYKqP9bSty60JQ9BhQFxA="; + hash = "sha256-CIn+/LC6z+2lnU8w3EzrBIBg94J9OnCxME2mZW65OwE="; }; buildInputs = [ curl openssl ]; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 673ddf4b9eac2..cca196dab006b 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -149,7 +149,13 @@ buildPostgresqlExtension (finalAttrs: { homepage = "https://postgis.net/"; changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${finalAttrs.version}/NEWS"; license = licenses.gpl2Plus; - maintainers = with maintainers; teams.geospatial.members ++ [ marcweber ]; + maintainers = + with maintainers; + teams.geospatial.members + ++ [ + marcweber + wolfgangwalther + ]; inherit (postgresql.meta) platforms; }; }) diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix index 02b72cdb83de3..b6d9ec4294c02 100644 --- a/pkgs/test/cuda/default.nix +++ b/pkgs/test/cuda/default.nix @@ -4,6 +4,11 @@ cudaPackages, + cudaPackages_10_0, + cudaPackages_10_1, + cudaPackages_10_2, + cudaPackages_10, + cudaPackages_11_0, cudaPackages_11_1, cudaPackages_11_2, diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index e65d909b41f86..a041635746b40 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -25,13 +25,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "whisper-cpp"; - version = "1.7.2"; + version = "1.7.1"; src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; rev = "refs/tags/v${finalAttrs.version}" ; - hash = "sha256-y30ZccpF3SCdRGa+P3ddF1tT1KnvlI4Fexx81wZxfTk="; + hash = "sha256-EDFUVjud79ZRCzGbOh9L9NcXfN3ikvsqkVSOME9F9oo="; }; # The upstream download script tries to download the models to the diff --git a/pkgs/tools/package-management/akku/default.nix b/pkgs/tools/package-management/akku/default.nix index bb1fc6c1e2563..78cbcace5d5c8 100644 --- a/pkgs/tools/package-management/akku/default.nix +++ b/pkgs/tools/package-management/akku/default.nix @@ -1,5 +1,11 @@ -{ lib, newScope, fetchurl }: +{ lib, newScope, stdenv, fetchurl }: lib.makeScope newScope (self: rec { + + fetchAkku = { name, url, sha256, ... }: + fetchurl { + inherit url sha256; + }; + akkuDerivation = self.callPackage ./akkuDerivation.nix { }; akku = self.callPackage ./akku.nix { }; @@ -8,11 +14,11 @@ lib.makeScope newScope (self: rec { overrides = self.callPackage ./overrides.nix { }; makeAkkuPackage = akkuself: pname: { version, dependencies, dev-dependencies, license, url, sha256, source, synopsis ? "", homepage ? "", ... }: - (akkuDerivation { - pname = "akku-${pname}"; - inherit version; - src = fetchurl { + (akkuDerivation rec { + inherit version pname; + src = fetchAkku { inherit url sha256; + name = pname; }; buildInputs = builtins.map (x: akkuself.${x}) dependencies; r7rs = source == "snow-fort"; diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index 42bf787198dfb..054eec51a16c0 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -4,13 +4,13 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "1.3.7"; + version = "1.3.6"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - hash = "sha256-Y9hXCO82SvnoxGsk3l2YkoakzxpHGZXew3gnl3+kX1k="; + hash = "sha256-CGRR+rOlcFTfvXRxx6x7m0qK6YE6HZGvmMx+X7zu1sQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -23,7 +23,7 @@ let ''; }; - vendorHash = "sha256-Gya0lTY3Im7b6HIkYoqb+nwNgOEqt1OookJZlbibBqs="; + vendorHash = "sha256-PDf3nUvDDBg+POMpklx45VhhjlB55pUMRhQMlwq7lnI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 49cfbb338f308..3d4824d77135c 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.84.0"; + version = "3.82.13"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-r/7mpq5yQCcPoNr4d/3ShR6V+cyX8p2vFcGkiza1WLk="; + hash = "sha256-QAo6BvkqG0EklyKLRMExNv+AZZeuTELYY0FdP8LDbZs="; }; - vendorHash = "sha256-SNhWDGvLAT2vP43x0chvzyjvpku7YGDvA7P+V175gIg="; + vendorHash = "sha256-P/Kt/ZLdjiULcRIXRVfUT9nkDGpl46VHRkeqt0mwaWc="; proxyVendor = true; diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index ebad0fda64ad7..6d1e778da376c 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ - bbarker ehmry ftrvxmtrx kovirobi ylh + AndersonTorres bbarker ehmry ftrvxmtrx kovirobi ylh ]; mainProgram = "9"; platforms = platforms.unix; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bfa9d66f486f0..04ba2fdd74b8d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -182,7 +182,6 @@ mapAliases { ### C ### - caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20 calligra = kdePackages.calligra; # Added 2024-09-27 callPackage_i686 = pkgsi686Linux.callPackage; cask = emacs.pkgs.cask; # Added 2022-11-12 @@ -237,10 +236,6 @@ mapAliases { containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09 crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11 critcl = tclPackages.critcl; # Added 2024-10-02 - cudaPackages_10_0 = throw "CUDA 10.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20 - cudaPackages_10_1 = throw "CUDA 10.1 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20 - cudaPackages_10_2 = throw "CUDA 10.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20 - cudaPackages_10 = throw "CUDA 10 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17 @@ -1107,7 +1102,6 @@ mapAliases { sexp = sexpp; # Added 2023-07-03 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 shipyard = jumppad; # Added 2023-06-06 - signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain"; shout = nodePackages.shout; # Added unknown; moved 2024-10-19 sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21 SkypeExport = skypeexport; # Added 2024-06-12 @@ -1152,7 +1146,6 @@ mapAliases { sqldeveloper = throw "sqldeveloper was dropped due to being severely out-of-date and having a dependency on JavaFX for Java 8, which we do not support"; # Added 2024-11-02 srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 - starpls-bin = starpls; starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 steamPackages = { steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2063c9ecfddc..63180c24f1f4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3088,6 +3088,11 @@ with pkgs; cron = isc-cron; + cudaPackages_10_0 = callPackage ./cuda-packages.nix { cudaVersion = "10.0"; }; + cudaPackages_10_1 = callPackage ./cuda-packages.nix { cudaVersion = "10.1"; }; + cudaPackages_10_2 = callPackage ./cuda-packages.nix { cudaVersion = "10.2"; }; + cudaPackages_10 = recurseIntoAttrs cudaPackages_10_2; + cudaPackages_11_0 = callPackage ./cuda-packages.nix { cudaVersion = "11.0"; }; cudaPackages_11_1 = callPackage ./cuda-packages.nix { cudaVersion = "11.1"; }; cudaPackages_11_2 = callPackage ./cuda-packages.nix { cudaVersion = "11.2"; }; @@ -5261,7 +5266,7 @@ with pkgs; sigil = libsForQt5.callPackage ../applications/editors/sigil { }; - inherit (callPackage ../applications/networking/instant-messengers/signal-desktop {}) signal-desktop; + inherit (callPackage ../applications/networking/instant-messengers/signal-desktop {}) signal-desktop signal-desktop-beta; slither-analyzer = with python3Packages; toPythonApplication slither-analyzer; @@ -6975,10 +6980,13 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration; }; inherit (callPackages ../development/tools/rust/cargo-pgrx { }) + cargo-pgrx_0_10_2 + cargo-pgrx_0_11_2 + cargo-pgrx_0_11_3 cargo-pgrx_0_12_0_alpha_1 cargo-pgrx_0_12_6 ; - cargo-pgrx = cargo-pgrx_0_12_6; + cargo-pgrx = cargo-pgrx_0_11_2; buildPgrxExtension = callPackage ../development/tools/rust/cargo-pgrx/buildPgrxExtension.nix { inherit (darwin.apple_sdk.frameworks) Security; @@ -17295,7 +17303,6 @@ with pkgs; experienced-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/experienced-pixel-dungeon { }; summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon { }; shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon { }; - tower-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/tower-pixel-dungeon { }; # get binaries without data built by Hydra simutrans_binaries = lowPrio simutrans.binaries; @@ -18055,11 +18062,15 @@ with pkgs; ### SCIENCE / MATH caffe = callPackage ../applications/science/math/caffe ({ + inherit (config) cudaSupport; + cudaPackages = cudaPackages_10_1; opencv4 = opencv4WithoutCuda; # Used only for image loading. blas = openblas; inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; } // (config.caffe or {})); + caffeWithCuda = caffe.override { cudaSupport = true; }; + gap-minimal = lowPrio (gap.override { packageSet = "minimal"; }); gap-full = lowPrio (gap.override { packageSet = "full"; }); diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index e757116796ab4..dbee4637a8487 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -87,7 +87,6 @@ let ITree = callPackage ../development/coq-modules/ITree { }; itree-io = callPackage ../development/coq-modules/itree-io { }; json = callPackage ../development/coq-modules/json {}; - lemma-overloading = callPackage ../development/coq-modules/lemma-overloading {}; LibHyps = callPackage ../development/coq-modules/LibHyps {}; ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 69661ef6f3c17..74e9b08ec6ec6 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -685,7 +685,7 @@ in { hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) ] - ++ lib.optionals (lib.versionAtLeast php.version "8.3" && lib.versionOlder php.version "8.4") [ + ++ lib.optionals (lib.versionAtLeast php.version "8.3") [ # https://github.com/php/php-src/pull/16733 (fix soap test) (fetchpatch { url = "https://github.com/php/php-src/commit/5c308d61db104854e4ff84ab123e3ea56e1b4046.patch"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 98f605fa667b4..27a73c44ae363 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -101,7 +101,6 @@ mapAliases ({ BTrees = btrees; # added 2023-02-19 cacheyou = throw "cacheyou has been removed, as it was no longer used for the only consumer pdm"; # added 2023-12-21 cadquery = throw "cadquery was removed, because it was disabled on all python version since 3.8 and marked as broken"; # added 2024-05-13 - caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20 can = python-can; # added 2024-08-12 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 case = throw "case has been removed, since it is an unused leaf package with a dependency on the nose test framework"; # added 2024-07-08 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9010ea5411db..62a1df04f4d3e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1989,6 +1989,11 @@ self: super: with self; { inherit (self) python numpy boost; }); + caffeWithCuda = toPythonModule (pkgs.caffeWithCuda.override { + pythonSupport = true; + inherit (self) python numpy boost; + }); + caio = callPackage ../development/python-modules/caio { }; cairocffi = callPackage ../development/python-modules/cairocffi { }; @@ -6544,8 +6549,6 @@ self: super: with self; { jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; - jianpu-ly = callPackage ../development/python-modules/jianpu-ly { }; - jieba = callPackage ../development/python-modules/jieba { }; jinja2 = callPackage ../development/python-modules/jinja2 { }; @@ -17757,8 +17760,6 @@ self: super: with self; { wget = callPackage ../development/python-modules/wget { }; - wgnlpy = callPackage ../development/python-modules/wgnlpy { }; - whatthepatch = callPackage ../development/python-modules/whatthepatch { }; wheel = callPackage ../development/python-modules/wheel { }; diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index 945f0e6d2954e..f655114737e9e 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -118,6 +118,7 @@ let python3Packages = { boxx = linux; bpycv = linux; + caffe = linux; catboost = linux; chainer = linux; cupy = linux;