diff --git a/.envrc b/.envrc new file mode 100644 index 000000000000..1d953f4bd735 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use nix diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index f079fba5eaac..b1c4f7b1f40a 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -121,3 +121,17 @@ c759efa5e7f825913f9a69ef20f025f50f56dc4d # python3Packages: format with nixfmt 59b1aef59071cae6e87859dc65de973d2cc595c0 + +# treewide description changes (#317959) +bf995e3641950f4183c1dd9010349263dfa0123b +755b915a158c9d588f08e9b08da9f7f3422070cc +f8c4a98e8e138e21353a2c33b90db3359f539b37 + +# vscode-extensions.*: format with nixfmt (RFC 166) +7bf9febfa6271012b1ef86647a3a06f06875fdcf + +# remove uses of mdDoc (#303841) +1a24330f792c8625746d07d842290e6fd95ae6f9 +acd0e3898feb321cb9a71a0fd376f1157d0f4553 +1b28414d2886c57343864326dbb745a634d3e37d +6afb255d976f85f3359e4929abd6f5149c323a02 diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 03e33afa3aa4..24be3d045d3a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -19,6 +19,7 @@ # Develompent support /.editorconfig @Mic92 @zowoq /shell.nix @infinisil @NixOS/Security +/.envrc @infinisil @NixOS/Security # Libraries /lib @infinisil @@ -53,7 +54,7 @@ /pkgs/build-support/setup-hooks/auto-patchelf.py @layus /pkgs/pkgs-lib @infinisil ## Format generators/serializers -/pkgs/pkgs-lib/formats/libconfig @ckiee @h7x4 +/pkgs/pkgs-lib/formats/libconfig @h7x4 /pkgs/pkgs-lib/formats/hocon @h7x4 # pkgs/by-name @@ -108,6 +109,9 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius # NixOS QEMU virtualisation /nixos/virtualisation/qemu-vm.nix @raitobezarius +# ACME +/nixos/modules/security/acme @arianvp @flokli @aanderse # no merge permission: @m1cr0man @emilazy + # Systemd /nixos/modules/system/boot/systemd.nix @NixOS/systemd /nixos/modules/system/boot/systemd @NixOS/systemd @@ -129,8 +133,11 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius /pkgs/common-updater/scripts/update-source-version @jtojnar # Python-related code and docs -/doc/languages-frameworks/python.section.md @mweinelt -/pkgs/development/interpreters/python/hooks +/doc/languages-frameworks/python.section.md @mweinelt @natsukium +/maintainers/scripts/update-python-libraries @natsukium +/pkgs/development/interpreters/python @natsukium +/pkgs/top-level/python-packages.nix @natsukium +/pkgs/top-level/release-python.nix @natsukium # Haskell /doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn @ncfavier @@ -225,18 +232,15 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/modules/services/networking/ntp @thoughtpolice # Network -/pkgs/tools/networking/octodns @Janik-Haag /pkgs/tools/networking/kea/default.nix @mweinelt /pkgs/tools/networking/babeld/default.nix @mweinelt /nixos/modules/services/networking/babeld.nix @mweinelt /nixos/modules/services/networking/kea.nix @mweinelt /nixos/modules/services/networking/knot.nix @mweinelt -nixos/modules/services/networking/networkmanager.nix @Janik-Haag /nixos/modules/services/monitoring/prometheus/exporters/kea.nix @mweinelt /nixos/tests/babeld.nix @mweinelt /nixos/tests/kea.nix @mweinelt /nixos/tests/knot.nix @mweinelt -/nixos/tests/networking/* @Janik-Haag # Web servers /doc/packages/nginx.section.md @raitobezarius @@ -322,9 +326,9 @@ pkgs/by-name/fo/forgejo/package.nix @adamcstephens @bendlas @emilylange /doc/languages-frameworks/dotnet.section.md @corngood # Node.js -/pkgs/build-support/node/build-npm-package @lilyinstarlight @winterqt -/pkgs/build-support/node/fetch-npm-deps @lilyinstarlight @winterqt -/doc/languages-frameworks/javascript.section.md @lilyinstarlight @winterqt +/pkgs/build-support/node/build-npm-package @winterqt +/pkgs/build-support/node/fetch-npm-deps @winterqt +/doc/languages-frameworks/javascript.section.md @winterqt # environment.noXlibs option aka NoX /nixos/modules/config/no-x-libs.nix @SuperSandro2000 diff --git a/.github/labeler.yml b/.github/labeler.yml index 90c25048299e..a233749e74d7 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -34,9 +34,9 @@ - nixos/modules/services/editors/emacs.nix - nixos/modules/services/editors/emacs.xml - nixos/tests/emacs-daemon.nix + - pkgs/applications/editors/emacs/build-support/**/* - pkgs/applications/editors/emacs/elisp-packages/**/* - pkgs/applications/editors/emacs/**/* - - pkgs/build-support/emacs/**/* - pkgs/top-level/emacs-packages.nix "6.topic: Enlightenment DE": @@ -74,6 +74,13 @@ - lib/systems/flake-systems.nix - nixos/modules/config/nix-flakes.nix +"6.topic: flutter": + - any: + - changed-files: + - any-glob-to-any-file: + - pkgs/build-support/flutter/*.nix + - pkgs/development/compilers/flutter/**/*.nix + "6.topic: GNOME": - any: - changed-files: @@ -149,7 +156,7 @@ - any: - changed-files: - any-glob-to-any-file: - - pkgs/development/compilers/llvm/* + - pkgs/development/compilers/llvm/**/* "6.topic: lua": - any: diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml index 7b08d9f95131..0c0727eba122 100644 --- a/.github/workflows/check-by-name.yml +++ b/.github/workflows/check-by-name.yml @@ -58,7 +58,7 @@ jobs: if [[ "$mergeable" == "null" ]]; then if (( retryCount == 0 )); then - echo "Not retrying anymore, probably GitHub is having internal issues" + echo "Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com/" exit 1 else (( retryCount -= 1 )) || true diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index bddd39711e40..519d90c442d9 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -35,10 +35,6 @@ jobs: pairs: - from: master into: haskell-updates - - from: release-23.11 - into: staging-next-23.11 - - from: staging-next-23.11 - into: staging-23.11 - from: release-24.05 into: staging-next-24.05 - from: staging-next-24.05 diff --git a/.gitignore b/.gitignore index 2753c9073832..db5517cfde91 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ tags /doc/manual.pdf /source/ .version-suffix +.direnv .DS_Store .mypy_cache diff --git a/doc/build-helpers.md b/doc/build-helpers.md index 06737e166760..010665484cfd 100644 --- a/doc/build-helpers.md +++ b/doc/build-helpers.md @@ -20,6 +20,7 @@ There is no uniform interface for build helpers. build-helpers/fetchers.chapter.md build-helpers/trivial-build-helpers.chapter.md build-helpers/testers.chapter.md +build-helpers/dev-shell-tools.chapter.md build-helpers/special.md build-helpers/images.md hooks/index.md diff --git a/doc/build-helpers/dev-shell-tools.chapter.md b/doc/build-helpers/dev-shell-tools.chapter.md new file mode 100644 index 000000000000..21636df8017b --- /dev/null +++ b/doc/build-helpers/dev-shell-tools.chapter.md @@ -0,0 +1,29 @@ +# Development Shell helpers {#chap-devShellTools} + +The `nix-shell` command has popularized the concept of transient shell environments for development or testing purposes. + +However, `nix-shell` is not the only way to create such environments, and even `nix-shell` itself can indirectly benefit from this library. + +This library provides a set of functions that help create such environments. + +## `devShellTools.valueToString` {#sec-devShellTools-valueToString} + +Converts Nix values to strings in the way the [`derivation` built-in function](https://nix.dev/manual/nix/2.23/language/derivations) does. + +:::{.example} +## `valueToString` usage examples + +```nix +devShellTools.valueToString (builtins.toFile "foo" "bar") +=> "/nix/store/...-foo" +``` + +```nix +devShellTools.valueToString false +=> "" +``` diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index 0cc271f5db8c..2167df3f1748 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -869,7 +869,7 @@ It produces packages that cannot be built automatically. fetchtorrent { config = { peer-limit-global = 100; }; url = "magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c"; - sha256 = ""; + hash = ""; } ``` diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md index 34cfc00a4953..a10e60de8c6d 100644 --- a/doc/build-helpers/testers.chapter.md +++ b/doc/build-helpers/testers.chapter.md @@ -120,9 +120,10 @@ It has two modes: Checks that the output from running a command contains the specified version string in it as a whole word. -Although simplistic, this test assures that the main program can run. -While there's no substitute for a real test case, it does catch dynamic linking errors and such. -It also provides some protection against accidentally building the wrong version, for example when using an "old" hash in a fixed-output derivation. +NOTE: In most cases, [`versionCheckHook`](#versioncheckhook) should be preferred, but this function is provided and documented here anyway. The motivation for adding either tests would be: + +- Catch dynamic linking errors and such and missing environment variables that should be added by wrapping. +- Probable protection against accidentally building the wrong version, for example when using an "old" hash in a fixed-output derivation. By default, the command to be run will be inferred from the given `package` attribute: it will check `meta.mainProgram` first, and fall back to `pname` or `name`. diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md index 4f2754903f9b..a56f6d097989 100644 --- a/doc/build-helpers/trivial-build-helpers.chapter.md +++ b/doc/build-helpers/trivial-build-helpers.chapter.md @@ -468,7 +468,7 @@ This is for consistency with the convention of software packages placing executa The created file is marked as executable. The file's contents will be put into `/nix/store//bin/`. -The store path will include the the name, and it will be a directory. +The store path will include the name, and it will be a directory. ::: {.example #ex-writeScriptBin} # Usage of `writeScriptBin` diff --git a/doc/hooks/index.md b/doc/hooks/index.md index 1534ef85ccb9..6d01c6cbcbe5 100644 --- a/doc/hooks/index.md +++ b/doc/hooks/index.md @@ -29,6 +29,7 @@ scons.section.md tetex-tex-live.section.md unzip.section.md validatePkgConfig.section.md +versionCheckHook.section.md waf.section.md zig.section.md xcbuild.section.md diff --git a/doc/hooks/versionCheckHook.section.md b/doc/hooks/versionCheckHook.section.md new file mode 100644 index 000000000000..55b9fa916c40 --- /dev/null +++ b/doc/hooks/versionCheckHook.section.md @@ -0,0 +1,35 @@ +# versionCheckHook {#versioncheckhook} + +This hook adds a `versionCheckPhase` to the [`preInstallCheckHooks`](#ssec-installCheck-phase) that runs the main program of the derivation with a `--help` or `--version` argument, and checks that the `${version}` string is found in that output. You use it like this: + +```nix +{ + lib, + stdenv, + versionCheckHook, + # ... +}: + +stdenv.mkDerivation (finalAttrs: { + # ... + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + # ... +}) +``` + +Note that for [`buildPythonPackage`](#buildpythonpackage-function) and [`buildPythonApplication`](#buildpythonapplication-function), `doInstallCheck` is enabled by default. + +It does so in a clean environment (using `env --ignore-environment`), and it checks for the `${version}` string in both the `stdout` and the `stderr` of the command. It will report to you in the build log the output it received and it will fail the build if it failed to find `${version}`. + +The variables that this phase control are: + +- `dontVersionCheck`: Disable adding this hook to the [`preDistPhases`](#var-stdenv-preDist). Useful if you do want to load the bash functions of the hook, but run them differently. +- `versionCheckProgram`: The full path to the program that should print the `${version}` string. Defaults roughly to `${placeholder "out"}/bin/${pname}`. Using `$out` in the value of this variable won't work, as environment variables from this variable are not expanded by the hook. Hence using `placeholder` is unavoidable. +- `versionCheckProgramArg`: The argument that needs to be passed to `versionCheckProgram`. If undefined the hook tries first `--help` and then `--version`. Examples: `version`, `-V`, `-v`. +- `preVersionCheck`: A hook to run before the check is done. +- `postVersionCheck`: A hook to run after the check is done. diff --git a/doc/languages-frameworks/dart.section.md b/doc/languages-frameworks/dart.section.md index 1b065ff4cde7..dfb456ba1941 100644 --- a/doc/languages-frameworks/dart.section.md +++ b/doc/languages-frameworks/dart.section.md @@ -114,7 +114,7 @@ flutter322.buildFlutterApplication { owner = "canonical"; repo = "firmware-updater"; rev = "6e7dbdb64e344633ea62874b54ff3990bd3b8440"; - sha256 = "sha256-s5mwtr5MSPqLMN+k851+pFIFFPa0N1hqz97ys050tFA="; + hash = "sha256-s5mwtr5MSPqLMN+k851+pFIFFPa0N1hqz97ys050tFA="; fetchSubmodules = true; }; diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index caf213845e6c..0a70083e7971 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -194,7 +194,7 @@ This helper has the same arguments as `buildDotnetModule`, with a few difference * `pname` and `version` are required, and will be used to find the NuGet package of the tool * `nugetName` can be used to override the NuGet package name that will be downloaded, if it's different from `pname` -* `nugetSha256` is the hash of the fetched NuGet package. Set this to `lib.fakeHash256` for the first build, and it will error out, giving you the proper hash. Also remember to update it during version updates (it will not error out if you just change the version while having a fetched package in `/nix/store`) +* `nugetHash` is the hash of the fetched NuGet package. `nugetSha256` is also supported, but not recommended. Set this to `lib.fakeHash` for the first build, and it will error out, giving you the proper hash. Also remember to update it during version updates (it will not error out if you just change the version while having a fetched package in `/nix/store`) * `dotnet-runtime` is set to `dotnet-sdk` by default. When changing this, remember that .NET tools fetched from NuGet require an SDK. Here is an example of packaging `pbm`, an unfree binary without source available: @@ -205,7 +205,7 @@ buildDotnetGlobalTool { pname = "pbm"; version = "1.3.1"; - nugetSha256 = "sha256-ZG2HFyKYhVNVYd2kRlkbAjZJq88OADe3yjxmLuxXDUo="; + nugetHash = "sha256-ZG2HFyKYhVNVYd2kRlkbAjZJq88OADe3yjxmLuxXDUo="; meta = { homepage = "https://cmd.petabridge.com/index.html"; @@ -241,15 +241,15 @@ $ nuget-to-nix out > deps.nix Which `nuget-to-nix` will generate an output similar to below ```nix { fetchNuGet }: [ - (fetchNuGet { pname = "FosterFramework"; version = "0.1.15-alpha"; sha256 = "0pzsdfbsfx28xfqljcwy100xhbs6wyx0z1d5qxgmv3l60di9xkll"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.1"; sha256 = "1gjz379y61ag9whi78qxx09bwkwcznkx2mzypgycibxk61g11da1"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.1"; sha256 = "1drbgqdcvbpisjn8mqfgba1pwb6yri80qc4mfvyczqwrcsj5k2ja"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.1"; sha256 = "1g5b30f4l8a1zjjr3b8pk9mcqxkxqwa86362f84646xaj4iw3a4d"; }) - (fetchNuGet { pname = "SharpGLTF.Core"; version = "1.0.0-alpha0031"; sha256 = "0ln78mkhbcxqvwnf944hbgg24vbsva2jpih6q3x82d3h7rl1pkh6"; }) - (fetchNuGet { pname = "SharpGLTF.Runtime"; version = "1.0.0-alpha0031"; sha256 = "0lvb3asi3v0n718qf9y367km7qpkb9wci38y880nqvifpzllw0jg"; }) - (fetchNuGet { pname = "Sledge.Formats"; version = "1.2.2"; sha256 = "1y0l66m9rym0p1y4ifjlmg3j9lsmhkvbh38frh40rpvf1axn2dyh"; }) - (fetchNuGet { pname = "Sledge.Formats.Map"; version = "1.1.5"; sha256 = "1bww60hv9xcyxpvkzz5q3ybafdxxkw6knhv97phvpkw84pd0jil6"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "FosterFramework"; version = "0.1.15-alpha"; hash = "sha256-lM6eYgOGjl1fx6WFD7rnRi/YAQieM0mx60h0p5dr+l8="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.1"; hash = "sha256-QbUQXjCzr8j8u/5X0af9jE++EugdoxMhT08F49MZX74="; }) + (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.1"; hash = "sha256-SopZpGaZ48/8dpUwDFDM3ix+g1rP4Yqs1PGuzRp+K7c="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.1"; hash = "sha256-jajBI5GqG2IIcsIMgxTHfXbMapoXrZGl/EEhShwYq7w="; }) + (fetchNuGet { pname = "SharpGLTF.Core"; version = "1.0.0-alpha0031"; hash = "sha256-Bs4baD5wNIH6wAbGK4Xaem0i3luQkOQs37izBWdFx1I="; }) + (fetchNuGet { pname = "SharpGLTF.Runtime"; version = "1.0.0-alpha0031"; hash = "sha256-TwJO6b8ubmwBQh6NyHha8+JT5zHDJ4dROBbsEbUaa1M="; }) + (fetchNuGet { pname = "Sledge.Formats"; version = "1.2.2"; hash = "sha256-0Ddhuwpu3wwIzA4NuPaEVdMkx6tUukh8uKD6nKoxFPg="; }) + (fetchNuGet { pname = "Sledge.Formats.Map"; version = "1.1.5"; hash = "sha256-hkYJ2iWIz7vhPWlDOw2fvTenlh+4/D/37Z71tCEwnK8="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) ] ``` diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 743327770891..b4999aec8746 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -143,7 +143,7 @@ You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` ## Updating GNOME packages {#ssec-gnome-updating} -Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome`. Read the package’s `NEWS` file to see what changed. +Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome`. Read the package’s `NEWS` file to see what changed. ## Frequently encountered issues {#ssec-gnome-common-issues} diff --git a/doc/languages-frameworks/index.md b/doc/languages-frameworks/index.md index 32cb2121620b..021f4807fb22 100644 --- a/doc/languages-frameworks/index.md +++ b/doc/languages-frameworks/index.md @@ -90,6 +90,7 @@ qt.section.md r.section.md ruby.section.md rust.section.md +scheme.section.md swift.section.md texlive.section.md titanium.section.md diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 827c85146537..07b7fad74a6e 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1315,9 +1315,6 @@ we can do: ```nix { - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; pythonRelaxDeps = [ "pkg1" "pkg3" @@ -1340,7 +1337,6 @@ example: ```nix { - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = true; } ``` @@ -1362,8 +1358,11 @@ instead of a dev dependency). Keep in mind that while the examples above are done with `requirements.txt`, `pythonRelaxDepsHook` works by modifying the resulting wheel file, so it should work with any of the [existing hooks](#setup-hooks). -It indicates that `pythonRelaxDepsHook` has no effect on build time dependencies, such as in `build-system`. -If a package requires incompatible build time dependencies, they should be removed in `postPatch` with `substituteInPlace` or something similar. + +The `pythonRelaxDepsHook` has no effect on build time dependencies, such as +those specified in `build-system`. If a package requires incompatible build +time dependencies, they should be removed in `postPatch` through +`substituteInPlace` or similar. #### Using unittestCheckHook {#using-unittestcheckhook} diff --git a/doc/languages-frameworks/scheme.section.md b/doc/languages-frameworks/scheme.section.md new file mode 100644 index 000000000000..b18ff2d7dee0 --- /dev/null +++ b/doc/languages-frameworks/scheme.section.md @@ -0,0 +1,35 @@ +# Scheme {#sec-scheme} + +## Package Management {#sec-scheme-package-management} + +### Akku {#sec-scheme-package-management-akku} + +About two hundred R6RS & R7RS libraries from [Akku](https://akkuscm.org/) +(which also mirrors [snow-fort](https://snow-fort.org/pkg)) +are available inside the `akkuPackages` attrset, and the Akku executable +itself is at the top level as `akku`. The packages could be used +in a derivation's `buildInputs`, work inside of `nix-shell`, and +are tested using [Chez](https://www.scheme.com/) & +[Chibi](https://synthcode.com/wiki/chibi-scheme) +Scheme during build time. + +Including a package as a build input is done in the typical Nix fashion. +For example, to include +[a bunch of SRFIs](https://akkuscm.org/packages/chez-srfi/) +primarily for Chez Scheme in a derivation, one might write: + +```nix +{ + buildInputs = [ + chez + akkuPackages.chez-srfi + ]; +} + +``` + +The package index is located in `pkgs/tools/package-management/akku` +as `deps.toml`, and should be updated occasionally by running `./update.sh` +in the directory. Doing so will pull the source URLs for new packages and +more recent versions, then write them to the TOML. + diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index b6fb1099a4a4..05ef288141c3 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -83,12 +83,13 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c ```nix stdenvNoCC.mkDerivation rec { src = texlive.pkgs.iwona; + dontUnpack = true; inherit (src) pname version; installPhase = '' runHook preInstall - install -Dm644 fonts/opentype/nowacki/iwona/*.otf -t $out/share/fonts/opentype + install -Dm644 $src/fonts/opentype/nowacki/iwona/*.otf -t $out/share/fonts/opentype runHook postInstall ''; } diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index b5955b96eeb6..e6de030ff9c1 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -22,6 +22,10 @@ Meta-attributes are not passed to the builder of the package. Thus, a change to ## Standard meta-attributes {#sec-standard-meta-attributes} +If the package is to be submitted to Nixpkgs, please check out the +[requirements for meta attributes](https://github.com/NixOS/nixpkgs/tree/master/pkgs#meta-attributes) +in the contributing documentation. + It is expected that each meta-attribute is one of the following: ### `description` {#var-meta-description} @@ -29,11 +33,21 @@ It is expected that each meta-attribute is one of the following: A short (one-line) description of the package. This is displayed on [search.nixos.org](https://search.nixos.org/packages). -Don’t include a period at the end. Don’t include newline characters. Capitalise the first character. For brevity, don’t repeat the name of package --- just describe what it does. +The general requirements of a description are: + +- Be short, just one sentence. +- Be capitalized. +- Not start with definite ("The") or indefinite ("A"/"An") article. +- Not start with the package name. + - More generally, it should not refer to the package name. +- Not end with a period (or any punctuation for that matter). +- Provide factual information. + - Avoid subjective language. + Wrong: `"libpng is a library that allows you to decode PNG images."` -Right: `"A library for decoding PNG images"` +Right: `"Library for decoding PNG images"` ### `longDescription` {#var-meta-longDescription} diff --git a/doc/stdenv/passthru.chapter.md b/doc/stdenv/passthru.chapter.md index 008b908b2f48..142b978d5880 100644 --- a/doc/stdenv/passthru.chapter.md +++ b/doc/stdenv/passthru.chapter.md @@ -75,40 +75,17 @@ The Nixpkgs systems for continuous integration [Hydra](https://hydra.nixos.org/) #### Package tests {#var-passthru-tests-packages} []{#var-meta-tests-packages} -Tests that are part of the source package, if they run quickly, are typically executed in the [`installCheckPhase`](#var-stdenv-phases). -This phase is also suitable for performing a `--version` test for packages that support such flag. -Most programs distributed by Nixpkgs support such a `--version` flag, and successfully calling the program with that flag indicates that the package at least got compiled properly. +Besides tests provided by upstream, that you run in the [`checkPhase`](#ssec-check-phase), you may want to define tests derivations in the `passthru.tests` attribute, which won't change the build. `passthru.tests` have several advantages over running tests during any of the [standard phases](#sec-stdenv-phases): -:::{.example #ex-checking-build-installCheckPhase} +- They access the package as consumers would, independently from the environment in which it was built +- They can be run and debugged without rebuilding the package, which is useful if that takes a long time +- They don't add overhead to each build, as opposed checks added to the [`distPhase`](#ssec-distribution-phase), such as [`versionCheckHook`](#versioncheckhook). -## Checking builds with `installCheckPhase` +It is also possible to use `passthru.tests` to test the version with [`testVersion`](#tester-testVersion), but since that is pretty trivial and recommended thing to do, we recommend using [`versionCheckHook`](#versioncheckhook) for that, which has the following advantages over `passthru.tests`: -When building `git`, a rudimentary test for successful compilation would be running `git --version`: - -```nix -stdenv.mkDerivation (finalAttrs: { - pname = "git"; - version = "1.2.3"; - # ... - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - echo checking if 'git --version' mentions ${finalAttrs.version} - $out/bin/git --version | grep ${finalAttrs.version} - runHook postInstallCheck - ''; - # ... -}) -``` -::: - -However, tests that are non-trivial will better fit into `passthru.tests` because they: - -- Access the package as consumers would, independently from the environment in which it was built -- Can be run and debugged without rebuilding the package, which is useful if that takes a long time -- Don't add overhad to each build, as opposed to `installCheckPhase` - -It is also possible to use `passthru.tests` to test the version with [`testVersion`](#tester-testVersion). +- If the `versionCheckPhase` (the phase defined by [`versionCheckHook`](#versioncheckhook)) fails, it triggers a failure which can't be ignored if you use the package, or if you find out about it in a [`nixpkgs-review`](https://github.com/Mic92/nixpkgs-review) report. +- Sometimes packages become silently broken - meaning they fail to launch but their build passes because they don't perform any tests in the `checkPhase`. If you use this tool infrequently, such a silent breakage may rot in your system / profile configuration, and you will not notice the failure until you will want to use this package. Testing such basic functionality ensures you have to deal with the failure when you update your system / profile. +- When you open a PR, [ofborg](https://github.com/NixOS/ofborg)'s CI _will_ run `passthru.tests` of [packages that are directly changed by your PR (according to your commits' messages)](https://github.com/NixOS/ofborg?tab=readme-ov-file#automatic-building), but if you'd want to use the [`@ofborg build`](https://github.com/NixOS/ofborg?tab=readme-ov-file#build) command for dependent packages, you won't have to specify in addition the `.tests` attribute of the packages you want to build, and no body will be able to avoid these tests. For more on how to write and run package tests for Nixpkgs, see the [testing section in the package contributor guide](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#package-tests). diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 6048a9a48223..a2c69ba6bd14 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -762,6 +762,8 @@ Before and after running `make`, the hooks `preBuild` and `postBuild` are called The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make $checkTarget`, but only if the [`doCheck` variable](#var-stdenv-doCheck) is enabled. +It is highly recommended, for packages' sources that are not distributed with any tests, to at least use [`versionCheckHook`](#versioncheckhook) to test that the resulting executable is basically functional. + #### Variables controlling the check phase {#variables-controlling-the-check-phase} ##### `doCheck` {#var-stdenv-doCheck} @@ -1515,6 +1517,10 @@ This flag can break dynamic shared object loading. For instance, the module syst intel_drv.so: undefined symbol: vgaHWFreeHWRec ``` +#### `zerocallusedregs` {#zerocallusedregs} + +Adds the `-fzero-call-used-regs=used-gpr` compiler option. This causes the general-purpose registers that an architecture's calling convention considers "call-used" to be zeroed on return from the function. This can make it harder for attackers to construct useful ROP gadgets and also reduces the chance of data leakage from a function call. + ### Hardening flags disabled by default {#sec-hardening-flags-disabled-by-default} The following flags are disabled by default and should be enabled with `hardeningEnable` for packages that take untrusted input like network services. @@ -1532,16 +1538,22 @@ Adds the `-fPIE` compiler and `-pie` linker options. Position Independent Execut Static libraries need to be compiled with `-fPIE` so that executables can link them in with the `-pie` linker option. If the libraries lack `-fPIE`, you will get the error `recompile with -fPIE`. -#### `zerocallusedregs` {#zerocallusedregs} - -Adds the `-fzero-call-used-regs=used-gpr` compiler option. This causes the general-purpose registers that an architecture's calling convention considers "call-used" to be zeroed on return from the function. This can make it harder for attackers to construct useful ROP gadgets and also reduces the chance of data leakage from a function call. - #### `trivialautovarinit` {#trivialautovarinit} Adds the `-ftrivial-auto-var-init=pattern` compiler option. This causes "trivially-initializable" uninitialized stack variables to be forcibly initialized with a nonzero value that is likely to cause a crash (and therefore be noticed). Uninitialized variables generally take on their values based on fragments of previous program state, and attackers can carefully manipulate that state to craft malicious initial values for these variables. Use of this flag is controversial as it can prevent tools that detect uninitialized variable use (such as valgrind) from operating correctly. +This should be turned off or fixed for build errors such as: + +``` +sorry, unimplemented: __builtin_clear_padding not supported for variable length aggregates +``` + +#### `stackclashprotection` {#stackclashprotection} + +This flag adds the `-fstack-clash-protection` compiler option, which causes growth of a program's stack to access each successive page in order. This should force the guard page to be accessed and cause an attempt to "jump over" this guard page to crash. + [^footnote-stdenv-ignored-build-platform]: The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always *specified* as interfaces, not concrete implementation. [^footnote-stdenv-native-dependencies-in-path]: Currently, this means for native builds all dependencies are put on the `PATH`. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the `depsBuild*` and `nativeBuildInputs` would be added to the `PATH`. [^footnote-stdenv-propagated-dependencies]: Nix itself already takes a package’s transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like [setup hooks](#ssec-setup-hooks) also are run as if it were a propagated dependency. diff --git a/lib/default.nix b/lib/default.nix index 9c6f886c9ee4..ef0bb60ab8c5 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -66,7 +66,7 @@ let # TODO: For consistency, all builtins should also be available from a sub-library; # these are the only ones that are currently not - inherit (builtins) addErrorContext isPath trace; + inherit (builtins) addErrorContext isPath trace typeOf unsafeGetAttrPos; inherit (self.trivial) id const pipe concat or and xor bitAnd bitOr bitXor bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum diff --git a/lib/licenses.nix b/lib/licenses.nix index a608d3ec3f54..c5d05437efc0 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -917,7 +917,7 @@ in mkLicense lset) ({ ncbiPd = { spdxId = "NCBI-PD"; - fullname = "NCBI Public Domain Notice"; + fullName = "NCBI Public Domain Notice"; # Due to United States copyright law, anything with this "license" does not have a copyright in the # jurisdiction of the United States. However, other jurisdictions may assign the United States # government copyright to the work, and the license explicitly states that in such a case, no license @@ -1161,7 +1161,7 @@ in mkLicense lset) ({ shortName = "TSL"; fullName = "Timescale License Agreegment"; url = "https://github.com/timescale/timescaledb/blob/main/tsl/LICENSE-TIMESCALE"; - unfree = true; + free = false; }; tcltk = { @@ -1297,7 +1297,7 @@ in mkLicense lset) ({ zsh = { url = "https://github.com/zsh-users/zsh/blob/master/LICENCE"; - fulllName = "Zsh License"; + fullName = "Zsh License"; }; zpl20 = { diff --git a/lib/modules.nix b/lib/modules.nix index 79892f50c4fe..b9e9ca1e5d78 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -2,6 +2,7 @@ let inherit (lib) + addErrorContext all any attrByPath @@ -13,13 +14,16 @@ let elem filter foldl' + functionArgs getAttrFromPath + genericClosure head id imap1 isAttrs isBool isFunction + isInOldestRelease isList isString length @@ -32,9 +36,17 @@ let optionalString recursiveUpdate reverseList sort + seq setAttrByPath + substring + throwIfNot + trace + typeOf types + unsafeGetAttrPos + warn warnIf + zipAttrs zipAttrsWith ; inherit (lib.options) @@ -89,8 +101,8 @@ let }: let withWarnings = x: - lib.warnIf (evalModulesArgs?args) "The args argument to evalModules is deprecated. Please set config._module.args instead." - lib.warnIf (evalModulesArgs?check) "The check argument to evalModules is deprecated. Please set config._module.check instead." + warnIf (evalModulesArgs?args) "The args argument to evalModules is deprecated. Please set config._module.args instead." + warnIf (evalModulesArgs?check) "The check argument to evalModules is deprecated. Please set config._module.check instead." x; legacyModules = @@ -265,9 +277,9 @@ let let optText = showOption (prefix ++ firstDef.prefix); defText = - builtins.addErrorContext + addErrorContext "while evaluating the error message for definitions for `${optText}', which is an option that does not exist" - (builtins.addErrorContext + (addErrorContext "while evaluating a definition from `${firstDef.file}'" ( showDefs [ firstDef ]) ); @@ -298,7 +310,7 @@ let else throw baseMsg else null; - checked = builtins.seq checkUnmatched; + checked = seq checkUnmatched; extendModules = extendArgs@{ modules ? [], @@ -312,7 +324,7 @@ let prefix = extendArgs.prefix or evalModulesArgs.prefix or []; }); - type = lib.types.submoduleWith { + type = types.submoduleWith { inherit modules specialArgs class; }; @@ -344,8 +356,8 @@ let else throw ( "Could not load a value as a module, because it is of type ${lib.strings.escapeNixString m._type}" - + lib.optionalString (fallbackFile != unknownModule) ", in file ${toString fallbackFile}." - + lib.optionalString (m._type == "configuration") " If you do intend to import this configuration, please only import the modules that make up the configuration. You may have to create a `let` binding, file or attribute to give yourself access to the relevant modules.\nWhile loading a configuration into the module system is a very sensible idea, it can not be done cleanly in practice." + + optionalString (fallbackFile != unknownModule) ", in file ${toString fallbackFile}." + + optionalString (m._type == "configuration") " If you do intend to import this configuration, please only import the modules that make up the configuration. You may have to create a `let` binding, file or attribute to give yourself access to the relevant modules.\nWhile loading a configuration into the module system is a very sensible idea, it can not be done cleanly in practice." # Extended explanation: That's because a finalized configuration is more than just a set of modules. For instance, it has its own `specialArgs` that, by the nature of `specialArgs` can't be loaded through `imports` or the the `modules` argument. So instead, we have to ask you to extract the relevant modules and use those instead. This way, we keep the module system comparatively simple, and hopefully avoid a bad surprise down the line. ) else if isList m then @@ -415,7 +427,7 @@ let moduleKey = file: m: if isString m then - if builtins.substring 0 1 m == "/" + if substring 0 1 m == "/" then m else toString modulesPath + "/" + m @@ -433,11 +445,11 @@ let else if isAttrs m then throw "Module `${file}` contains a disabledModules item that is an attribute set, presumably a module, that does not have a `key` attribute. This means that the module system doesn't have any means to identify the module that should be disabled. Make sure that you've put the correct value in disabledModules: a string path relative to modulesPath, a path value, or an attribute set with a `key` attribute." - else throw "Each disabledModules item must be a path, string, or a attribute set with a key attribute, or a value supported by toString. However, one of the disabledModules items in `${toString file}` is none of that, but is of type ${builtins.typeOf m}."; + else throw "Each disabledModules item must be a path, string, or a attribute set with a key attribute, or a value supported by toString. However, one of the disabledModules items in `${toString file}` is none of that, but is of type ${typeOf m}."; disabledKeys = concatMap ({ file, disabled }: map (moduleKey file) disabled) disabled; keyFilter = filter (attrs: ! elem attrs.key disabledKeys); - in map (attrs: attrs.module) (builtins.genericClosure { + in map (attrs: attrs.module) (genericClosure { startSet = keyFilter modules; operator = attrs: keyFilter attrs.modules; }); @@ -475,7 +487,7 @@ let } else # shorthand syntax - lib.throwIfNot (isAttrs m) "module ${file} (${key}) does not look like a module." + throwIfNot (isAttrs m) "module ${file} (${key}) does not look like a module." { _file = toString m._file or file; _class = m._class or null; key = toString m.key or key; @@ -485,10 +497,10 @@ let config = addFreeformType (removeAttrs m ["_class" "_file" "key" "disabledModules" "require" "imports" "freeformType"]); }; - applyModuleArgsIfFunction = key: f: args@{ config, options, lib, ... }: + applyModuleArgsIfFunction = key: f: args@{ config, ... }: if isFunction f then applyModuleArgs key f args else f; - applyModuleArgs = key: f: args@{ config, options, lib, ... }: + applyModuleArgs = key: f: args@{ config, ... }: let # Module arguments are resolved in a strict manner when attribute set # deconstruction is used. As the arguments are now defined with the @@ -503,10 +515,10 @@ let # not their values. The values are forwarding the result of the # evaluation of the option. context = name: ''while evaluating the module argument `${name}' in "${key}":''; - extraArgs = builtins.mapAttrs (name: _: - builtins.addErrorContext (context name) + extraArgs = mapAttrs (name: _: + addErrorContext (context name) (args.${name} or config._module.args.${name}) - ) (lib.functionArgs f); + ) (functionArgs f); # Note: we append in the opposite order such that we can add an error # context on the explicit arguments of "args" too. This update @@ -547,16 +559,16 @@ let (n: concatLists) (map (module: let subtree = module.options; in - if !(builtins.isAttrs subtree) then + if !(isAttrs subtree) then throw '' - An option declaration for `${builtins.concatStringsSep "." prefix}' has type - `${builtins.typeOf subtree}' rather than an attribute set. + An option declaration for `${concatStringsSep "." prefix}' has type + `${typeOf subtree}' rather than an attribute set. Did you mean to define this outside of `options'? '' else mapAttrs (n: option: - [{ inherit (module) _file; pos = builtins.unsafeGetAttrPos n subtree; options = option; }] + [{ inherit (module) _file; pos = unsafeGetAttrPos n subtree; options = option; }] ) subtree ) @@ -565,17 +577,17 @@ let # The root of any module definition must be an attrset. checkedConfigs = assert - lib.all + all (c: # TODO: I have my doubts that this error would occur when option definitions are not matched. # The implementation of this check used to be tied to a superficially similar check for # options, so maybe that's why this is here. isAttrs c.config || throw '' - In module `${c.file}', you're trying to define a value of type `${builtins.typeOf c.config}' + In module `${c.file}', you're trying to define a value of type `${typeOf c.config}' rather than an attribute set for the option - `${builtins.concatStringsSep "." prefix}'! + `${concatStringsSep "." prefix}'! - This usually happens if `${builtins.concatStringsSep "." prefix}' has option + This usually happens if `${concatStringsSep "." prefix}' has option definitions inside that are not matched. Please check how to properly define this option by e.g. referring to `man 5 configuration.nix'! '' @@ -667,7 +679,7 @@ let let nonOptions = filter (m: !isOption m.options) decls; in - throw "The option `${showOption loc}' in module `${(lib.head optionDecls)._file}' would be a parent of the following options, but its type `${(lib.head optionDecls).options.type.description or ""}' does not support nested options.\n${ + throw "The option `${showOption loc}' in module `${(head optionDecls)._file}' would be a parent of the following options, but its type `${(head optionDecls).options.type.description or ""}' does not support nested options.\n${ showRawDecls loc nonOptions }" else @@ -806,7 +818,7 @@ let "The type `types.${opt.type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${opt.type.deprecationMessage}"; in warnDeprecation opt // - { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value; + { value = addErrorContext "while evaluating the option `${showOption loc}':" value; inherit (res.defsFinal') highestPrio; definitions = map (def: def.value) res.defsFinal; files = map (def: def.file) res.defsFinal; @@ -822,7 +834,7 @@ let let # Process mkMerge and mkIf properties. defs' = concatMap (m: - map (value: { inherit (m) file; inherit value; }) (builtins.addErrorContext "while evaluating definitions from `${m.file}':" (dischargeProperties m.value)) + map (value: { inherit (m) file; inherit value; }) (addErrorContext "while evaluating definitions from `${m.file}':" (dischargeProperties m.value)) ) defs; # Process mkOverride properties. @@ -972,12 +984,12 @@ let mergeAttrDefinitionsWithPrio = opt: let defsByAttr = - lib.zipAttrs ( - lib.concatLists ( - lib.concatMap + zipAttrs ( + concatLists ( + concatMap ({ value, ... }@def: map - (lib.mapAttrsToList (k: value: { ${k} = def // { inherit value; }; })) + (mapAttrsToList (k: value: { ${k} = def // { inherit value; }; })) (pushDownProperties value) ) opt.definitionsWithLocations @@ -985,9 +997,9 @@ let ); in assert opt.type.name == "attrsOf" || opt.type.name == "lazyAttrsOf"; - lib.mapAttrs + mapAttrs (k: v: - let merging = lib.mergeDefinitions (opt.loc ++ [k]) opt.type.nestedTypes.elemType v; + let merging = mergeDefinitions (opt.loc ++ [k]) opt.type.nestedTypes.elemType v; in { value = merging.mergedValue; inherit (merging.defsFinal') highestPrio; @@ -1023,9 +1035,9 @@ let mkForce = mkOverride 50; mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’ - defaultPriority = lib.warnIf (lib.isInOldestRelease 2305) "lib.modules.defaultPriority is deprecated, please use lib.modules.defaultOverridePriority instead." defaultOverridePriority; + defaultPriority = warnIf (isInOldestRelease 2305) "lib.modules.defaultPriority is deprecated, please use lib.modules.defaultOverridePriority instead." defaultOverridePriority; - mkFixStrictness = lib.warn "lib.mkFixStrictness has no effect and will be removed. It returns its argument unmodified, so you can just remove any calls." id; + mkFixStrictness = warn "lib.mkFixStrictness has no effect and will be removed. It returns its argument unmodified, so you can just remove any calls." id; mkOrder = priority: content: { _type = "order"; @@ -1121,7 +1133,7 @@ let inherit from to; visible = false; warn = true; - use = builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'."; + use = trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'."; }; mkRenamedOptionModuleWith = { @@ -1139,8 +1151,8 @@ let }: doRename { inherit from to; visible = false; - warn = lib.isInOldestRelease sinceRelease; - use = lib.warnIf (lib.isInOldestRelease sinceRelease) + warn = isInOldestRelease sinceRelease; + use = warnIf (isInOldestRelease sinceRelease) "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'."; }; @@ -1372,8 +1384,8 @@ let config = lib.importTOML file; }; - private = lib.mapAttrs - (k: lib.warn "External use of `lib.modules.${k}` is deprecated. If your use case isn't covered by non-deprecated functions, we'd like to know more and perhaps support your use case well, instead of providing access to these low level functions. In this case please open an issue in https://github.com/nixos/nixpkgs/issues/.") + private = mapAttrs + (k: warn "External use of `lib.modules.${k}` is deprecated. If your use case isn't covered by non-deprecated functions, we'd like to know more and perhaps support your use case well, instead of providing access to these low level functions. In this case please open an issue in https://github.com/nixos/nixpkgs/issues/.") { inherit applyModuleArgsIfFunction diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 074239b3fb6f..0b8aeda208e3 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -323,6 +323,7 @@ let os = /**/ if rust ? platform then rust.platform.os or "none" else if final.isDarwin then "macos" + else if final.isWasm && !final.isWasi then "unknown" # Needed for {wasm32,wasm64}-unknown-unknown. else final.parsed.kernel.name; # https://doc.rust-lang.org/reference/conditional-compilation.html#target_family diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 750b1d025e02..280d0b47d574 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -94,6 +94,8 @@ checkConfigOutput '^true$' config.result ./module-argument-default.nix # gvariant checkConfigOutput '^true$' config.assertion ./gvariant.nix +checkConfigOutput '"ok"' config.result ./specialArgs-lib.nix + # https://github.com/NixOS/nixpkgs/pull/131205 # We currently throw this error already in `config`, but throwing in `config.wrong1` would be acceptable. checkConfigError 'It seems as if you.re trying to declare an option by placing it into .config. rather than .options.' config.wrong1 ./error-mkOption-in-config.nix diff --git a/lib/tests/modules/specialArgs-lib.nix b/lib/tests/modules/specialArgs-lib.nix new file mode 100644 index 000000000000..8c9d2103862a --- /dev/null +++ b/lib/tests/modules/specialArgs-lib.nix @@ -0,0 +1,28 @@ +{ config, lib, ... }: + +{ + options = { + result = lib.mkOption { }; + weird = lib.mkOption { + type = lib.types.submoduleWith { + # I generally recommend against overriding lib, because that leads to + # slightly incompatible dialects of the module system. + # Nonetheless, it's worth guarding the property that the module system + # evaluates with a completely custom lib, as a matter of separation of + # concerns. + specialArgs.lib = { }; + modules = [ ]; + }; + }; + }; + config.weird = args@{ ... /* note the lack of a `lib` argument */ }: + assert args.lib == { }; + assert args.specialArgs == { lib = { }; }; + { + options.foo = lib.mkOption { }; + config.foo = lib.mkIf true "alright"; + }; + config.result = + assert config.weird.foo == "alright"; + "ok"; +} diff --git a/lib/trivial.nix b/lib/trivial.nix index 20a3ffebbc2b..546aed746d1c 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -379,7 +379,7 @@ in { */ oldestSupportedRelease = # Update on master only. Do not backport. - 2311; + 2405; /** Whether a feature is supported in all supported releases (at the time of diff --git a/lib/types.nix b/lib/types.nix index 518b987dcd92..ae482eeef751 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -73,7 +73,6 @@ let outer_types = rec { - __attrsFailEvaluation = true; isType = type: x: (x._type or "") == type; setType = typeName: value: value // { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7352b09c2db1..9a69d198926f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -71,6 +71,12 @@ github = "0b11stan"; githubId = 27831931; }; + _0david0mp = { + email = "davidmrpr@proton.me"; + github = "0david0mp"; + githubId = 54892055; + name = "David mp"; + }; _0nyr = { email = "onyr.maintainer@gmail.com"; github = "0nyr"; @@ -227,6 +233,12 @@ githubId = 12578560; name = "Quinn Bohner"; }; + _71zenith = { + email = "71zenith@proton.me"; + github = "71zenith"; + githubId = 92977828; + name = "Mori Zen"; + }; _8aed = { email = "8aed@riseup.net"; github = "8aed"; @@ -1115,6 +1127,12 @@ github = "AmeerTaweel"; githubId = 20538273; }; + amerino = { + name = "Alberto Merino"; + email = "amerinor01@gmail.com"; + github = "amerinor01"; + githubId = 22280447; + }; amesgen = { email = "amesgen@amesgen.de"; github = "amesgen"; @@ -1196,6 +1214,12 @@ githubId = 754494; name = "Anders Asheim Hennum"; }; + andershus = { + email = "anders.husebo@eviny.no"; + github = "andershus"; + githubId = 93526270; + name = "Anders Husebø"; + }; andersk = { email = "andersk@mit.edu"; github = "andersk"; @@ -1780,12 +1804,6 @@ githubId = 104313094; name = "Andrey Shaat"; }; - ashkitten = { - email = "ashlea@protonmail.com"; - github = "ashkitten"; - githubId = 9281956; - name = "ash lea"; - }; ashley = { email = "ashley@kira64.xyz"; github = "kira64xyz"; @@ -2272,13 +2290,6 @@ githubId = 19501722; keys = [ { fingerprint = "C593 27B5 9D0F 2622 23F6 1D03 C1C0 F299 52BC F558"; } ]; }; - bb010g = { - email = "me@bb010g.com"; - matrix = "@bb010g:matrix.org"; - github = "bb010g"; - githubId = 340132; - name = "Brayden Banks"; - }; bb2020 = { github = "bb2020"; githubId = 19290397; @@ -2421,14 +2432,6 @@ githubId = 7118777; keys = [ { fingerprint = "E9A3 7864 2165 28CE 507C CA82 72EA BF75 C331 CD25"; } ]; }; - Benjamin-L = { - name = "Benjamin Lee"; - email = "benjamin@computer.surgery"; - matrix = "@benjamin:computer.surgery"; - github = "Benjamin-L"; - githubId = 6504174; - keys = [ { fingerprint = "9D84 09A0 44FC 1EEB AE2D FA30 FB96 24E2 885D 55A4"; } ]; - }; benkuhn = { email = "ben@ben-kuhn.com"; github = "ben-kuhn"; @@ -2613,6 +2616,11 @@ githubId = 30630233; name = "Timo Triebensky"; }; + birdee = { + name = "birdee"; + github = "BirdeeHub"; + githubId = 85372418; + }; birkb = { email = "birk@batchworks.de"; github = "birkb"; @@ -2799,6 +2807,12 @@ githubId = 3465841; name = "Boris Sukholitko"; }; + bot-wxt1221 = { + email = "3264117476@qq.com"; + github = "Bot-wxt1221"; + githubId = 74451279; + name = "Bot-wxt1221"; + }; bouk = { name = "Bouke van der Bijl"; email = "i@bou.ke"; @@ -2980,12 +2994,6 @@ githubId = 2379774; name = "Sean Buckley"; }; - buffet = { - email = "niclas@countingsort.com"; - github = "buffet"; - githubId = 33751841; - name = "Niclas Meyer"; - }; bugworm = { email = "bugworm@zoho.com"; github = "bugworm"; @@ -3713,14 +3721,6 @@ githubId = 1448923; name = "Christian Kauhaus"; }; - ckie = { - email = "nixpkgs-0efe364@ckie.dev"; - github = "ckiee"; - githubId = 25263210; - keys = [ { fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215"; } ]; - name = "ckie"; - matrix = "@ckie:ckie.dev"; - }; cko = { email = "christine.koppelt@gmail.com"; github = "cko"; @@ -3759,6 +3759,12 @@ githubId = 848609; name = "Michael Bishop"; }; + clevor = { + email = "myclevorname@gmail.com"; + github = "myclevorname"; + githubId = 140354451; + name = "Samuel Connelly"; + }; clkamp = { email = "c@lkamp.de"; github = "clkamp"; @@ -4117,6 +4123,12 @@ githubId = 34543609; name = "creator54"; }; + crertel = { + email = "chris@kedagital.com"; + github = "crertel"; + githubId = 1707779; + name = "Chris Ertel"; + }; crinklywrappr = { email = "crinklywrappr@pm.me"; name = "Daniel Fitzpatrick"; @@ -4352,6 +4364,12 @@ githubId = 24708079; name = "Dan Eads"; }; + danid3v = { + email = "sch220233@spengergasse.at"; + github = "DaniD3v"; + githubId = 124387056; + name = "DaniD3v"; + }; danielalvsaaker = { email = "daniel.alvsaaker@proton.me"; github = "danielalvsaaker"; @@ -4728,12 +4746,6 @@ github = "deinferno"; githubId = 14363193; }; - delan = { - name = "Delan Azabani"; - email = "delan@azabani.com"; - github = "delan"; - githubId = 465303; - }; delehef = { name = "Franklin Delehelle"; email = "nix@odena.eu"; @@ -5092,6 +5104,12 @@ githubId = 56017218; keys = [ { fingerprint = "E6F4 BFB4 8DE3 893F 68FC A15F FF5F 4B30 A41B BAC8"; } ]; }; + Djabx = { + email = "alexandre@badez.eu"; + github = "Djabx"; + githubId = 69534; + name = "Alexandre Badez"; + }; djacu = { email = "daniel.n.baker@gmail.com"; github = "djacu"; @@ -5327,6 +5345,12 @@ githubId = 6199462; name = "Dmytro Rets"; }; + dretyuiop = { + email = "chewch03@gmail.com"; + github = "dretyuiop"; + githubId = 81854406; + name = "Chew Cheng Hong"; + }; drewrisinger = { email = "drisinger+nixpkgs@gmail.com"; github = "drewrisinger"; @@ -5373,6 +5397,11 @@ githubId = 5596239; keys = [ { fingerprint = "62BC E2BD 49DF ECC7 35C7 E153 875F 2BCF 163F 1B29"; } ]; }; + dseelp = { + name = "dsee"; + github = "DSeeLP"; + githubId = 46624152; + }; dsferruzza = { email = "david.sferruzza@gmail.com"; github = "dsferruzza"; @@ -7139,6 +7168,12 @@ githubId = 37017396; name = "gbtb"; }; + gcleroux = { + email = "guillaume@cleroux.dev"; + github = "gcleroux"; + githubId = 73357644; + name = "Guillaume Cléroux"; + }; gdamjan = { email = "gdamjan@gmail.com"; matrix = "@gdamjan:spodeli.org"; @@ -7524,7 +7559,8 @@ name = "Yacine Hmito"; }; gracicot = { - email = "gracicot42@gmail.com"; + email = "dev@gracicot.com"; + matrix = "@gracicot-59e8f173d73408ce4f7ac803:gitter.im"; github = "gracicot"; githubId = 2906673; name = "Guillaume Racicot"; @@ -8016,12 +8052,6 @@ githubId = 222664; name = "Matthew Leach"; }; - hexchen = { - email = "nix@lilwit.ch"; - github = "hexchen"; - githubId = 41522204; - name = "hexchen"; - }; hexclover = { email = "hexclover@outlook.com"; github = "hexclover"; @@ -8035,6 +8065,12 @@ name = "Nova Witterick"; keys = [ { fingerprint = "4304 6B43 8D83 078E 3DF7 10D6 DEB0 E15C 6D2A 5A7C"; } ]; }; + heywoodlh = { + email = "nixpkgs@heywoodlh.io"; + github = "heywoodlh"; + githubId = 18178614; + name = "Spencer Heywood"; + }; hh = { email = "hh@m-labs.hk"; github = "HarryMakes"; @@ -8182,6 +8218,12 @@ githubId = 25618740; name = "Vincent Cui"; }; + hornwall = { + email = "hannes@hornwall.me"; + github = "hornwall"; + githubId = 1064477; + name = "Hannes Hornwall"; + }; hoverbear = { email = "operator+nix@hoverbear.org"; matrix = "@hoverbear:matrix.org"; @@ -8424,6 +8466,12 @@ email = "astrid@astrid.tech"; name = "ifd3f"; }; + if-loop69420 = { + github = "if-loop69420"; + githubId = 81078181; + email = "j.sztavi@pm.me"; + name = "Jeremy Sztavinovszki"; + }; iFreilicht = { github = "iFreilicht"; githubId = 9742635; @@ -8946,6 +8994,13 @@ github = "jali-clarke"; githubId = 17733984; }; + jamalam = { + email = "james@jamalam.tech"; + name = "jamalam"; + github = "Jamalam360"; + githubId = 56727311; + keys = [ { fingerprint = "B1B2 2BA0 FC39 D4B4 2240 5F55 D86C D68E 8DB2 E368"; } ]; + }; james-atkins = { name = "James Atkins"; github = "james-atkins"; @@ -8957,13 +9012,6 @@ githubId = 1358764; name = "Jamie Magee"; }; - janik = { - name = "Janik"; - email = "janik@aq0.de"; - matrix = "@janik0:matrix.org"; - github = "Janik-Haag"; - githubId = 80165193; - }; jankaifer = { name = "Jan Kaifer"; email = "jan@kaifer.cz"; @@ -8982,6 +9030,11 @@ githubId = 3874017; name = "Jappie Klooster"; }; + jaredmontoya = { + name = "Jared Montoya"; + github = "jaredmontoya"; + githubId = 49511278; + }; jasoncarr = { email = "jcarr250@gmail.com"; github = "jasoncarr0"; @@ -9087,6 +9140,12 @@ github = "jceb"; githubId = 101593; }; + jcelerier = { + name = "Jean-Michaël Celerier"; + email = "jeanmichael.celerier@gmail.com"; + github = "jcelerier"; + githubId = 2772730; + }; jchw = { email = "johnwchadwick@gmail.com"; github = "jchv"; @@ -10147,12 +10206,6 @@ githubId = 46386452; name = "Jeroen Wijenbergh"; }; - jwoudenberg = { - email = "nixpkgs@jasperwoudenberg.com"; - github = "jwoudenberg"; - githubId = 1525551; - name = "Jasper Woudenberg"; - }; jwygoda = { email = "jaroslaw@wygoda.me"; github = "jwygoda"; @@ -11336,12 +11389,6 @@ githubId = 13804737; keys = [ { fingerprint = "7FE2 113A A08B 695A C8B8 DDE6 AE53 B4C2 E58E DD45"; } ]; }; - lf- = { - email = "nix-maint@lfcode.ca"; - github = "lf-"; - githubId = 6652840; - name = "Jade"; - }; lgcl = { email = "dev@lgcl.de"; name = "Leon Vack"; @@ -11423,40 +11470,25 @@ githubId = 3696783; name = "Leroy Hopson"; }; - liketechnik = { - name = "Florian Warzecha"; - - email = "liketechnik@disroot.org"; - github = "liketechnik"; - githubId = 24209689; - - keys = [ { fingerprint = "92D8 A09D 03DD B774 AABD 53B9 E136 2F07 D750 DB5C"; } ]; - }; lilacious = { email = "yuchenhe126@gmail.com"; github = "Lilacious"; githubId = 101508537; name = "Yuchen He"; }; + LilleAila = { + name = "Olai"; + email = "olai@olai.dev"; + github = "LilleAila"; + githubId = 67327023; + keys = [ { fingerprint = "8185 29F9 BB4C 33F0 69BB 9782 D1AC CDCF 2B9B 9799"; } ]; + }; lillycham = { email = "lillycat332@gmail.com"; github = "lillycat332"; githubId = 54189319; name = "Lilly Cham"; }; - lilyball = { - email = "lily@sb.org"; - github = "lilyball"; - githubId = 714; - name = "Lily Ballard"; - }; - lilyinstarlight = { - email = "lily@lily.flowers"; - matrix = "@lily:lily.flowers"; - github = "lilyinstarlight"; - githubId = 298109; - name = "Lily Foster"; - }; limeytexan = { email = "limeytexan@gmail.com"; github = "limeytexan"; @@ -12008,6 +12040,12 @@ github = "itslychee"; name = "Lychee"; }; + lyndeno = { + name = "Lyndon Sanche"; + email = "lsanche@lyndeno.ca"; + github = "Lyndeno"; + githubId = 13490857; + }; lynty = { email = "ltdong93+nix@gmail.com"; github = "Lynty"; @@ -12259,6 +12297,12 @@ githubId = 30078229; name = "marble"; }; + marcel = { + email = "me@m4rc3l.de"; + github = "MarcelCoding"; + githubId = 34819524; + name = "Marcel"; + }; marcovergueira = { email = "vergueira.marco@gmail.com"; github = "marcovergueira"; @@ -12350,12 +12394,6 @@ githubId = 33522919; name = "Marshall Arruda"; }; - martfont = { - name = "Martino Fontana"; - email = "tinozzo123@tutanota.com"; - github = "SuperSamus"; - githubId = 40663462; - }; martijnvermaat = { email = "martijn@vermaat.name"; github = "martijnvermaat"; @@ -12950,7 +12988,7 @@ name = "Merlin Humml"; }; mguentner = { - email = "code@klandest.in"; + email = "code@mguentner.de"; github = "mguentner"; githubId = 668926; name = "Maximilian Güntner"; @@ -14049,10 +14087,6 @@ githubId = 4532582; keys = [ { fingerprint = "BDEA AB07 909D B96F 4106 85F1 CC15 0758 46BC E91B"; } ]; }; - nayala = { - name = "Nia"; - matrix = "@fly:asra.gr"; - }; nazarewk = { name = "Krzysztof Nazarewski"; email = "nixpkgs@kdn.im"; @@ -14719,12 +14753,6 @@ github = "nullishamy"; githubId = 99221043; }; - nullx76 = { - email = "nix@xirion.net"; - github = "NULLx76"; - githubId = 1809198; - name = "Victor Roest"; - }; numinit = { email = "me@numin.it"; github = "numinit"; @@ -15330,12 +15358,6 @@ githubId = 4580157; name = "Patrick Hobusch"; }; - patka = { - email = "patka@patka.dev"; - github = "patka-123"; - githubId = 69802930; - name = "patka"; - }; patrickdag = { email = "patrick-nixos@failmail.dev"; github = "PatrickDaG"; @@ -15386,7 +15408,7 @@ githubId = 53442728; }; paveloom = { - email = "paveloom@riseup.net"; + email = "contact@paveloom.dev"; github = "paveloom"; githubId = 49961859; name = "Pavel Sobolev"; @@ -15466,6 +15488,12 @@ githubId = 817039; name = "Paulo Casaretto"; }; + pcboy = { + email = "david@joynetiks.com"; + github = "pcboy"; + githubId = 943430; + name = "David Hagege"; + }; pedrohlc = { email = "root@pedrohlc.com"; github = "PedroHLC"; @@ -15508,12 +15536,6 @@ githubId = 13225611; name = "Nicolas Martin"; }; - pennae = { - name = "pennae"; - email = "github@quasiparticle.net"; - github = "pennae"; - githubId = 82953136; - }; perchun = { name = "Perchun Pak"; email = "nixpkgs@perchun.it"; @@ -16786,6 +16808,12 @@ githubId = 52847440; name = "Ryan Burns"; }; + rcoeurjoly = { + email = "rolandcoeurjoly@gmail.com"; + github = "RCoeurjoly"; + githubId = 16906199; + name = "Roland Coeurjoly"; + }; rconybea = { email = "n1xpkgs@hushmail.com"; github = "rconybea"; @@ -17345,12 +17373,6 @@ github = "roshaen"; githubId = 58213083; }; - rossabaker = { - name = "Ross A. Baker"; - email = "ross@rossabaker.com"; - github = "rossabaker"; - githubId = 142698; - }; RossComputerGuy = { name = "Tristan Ross"; email = "tristan.ross@midstall.com"; @@ -17473,6 +17495,12 @@ githubId = 61306; name = "Rene Treffer"; }; + rubenhoenle = { + email = "git@hoenle.xyz"; + github = "rubenhoenle"; + githubId = 56157634; + name = "Ruben Hönle"; + }; ruby0b = { github = "ruby0b"; githubId = 106119328; @@ -17599,6 +17627,12 @@ githubId = 70191398; name = "Ryan Cao"; }; + ryand56 = { + email = "git@ryand.ca"; + github = "ryand56"; + githubId = 22267679; + name = "Ryan Omasta"; + }; ryane = { email = "ryanesc@gmail.com"; github = "ryane"; @@ -18478,6 +18512,14 @@ githubId = 53050011; name = "Yohann Boniface"; }; + sigmasquadron = { + name = "Fernando Rodrigues"; + email = "alpha@sigmasquadron.net"; + matrix = "@sigmasquadron:matrix.org"; + github = "SigmaSquadron"; + githubId = 174749595; + keys = [ { fingerprint = "E3CD E225 47C6 2DB6 6CCD BC06 CC3A E2EA 0000 0000"; } ]; + }; sikmir = { email = "sikmir@disroot.org"; matrix = "@sikmir:matrix.org"; @@ -18909,11 +18951,6 @@ githubId = 10437171; keys = [ { fingerprint = "75F0 AB7C FE01 D077 AEE6 CAFD 353E 4A18 EE0F AB72"; } ]; }; - spacefault = { - github = "spacefault"; - githubId = 74156492; - name = "spacefault"; - }; spacefrogg = { email = "spacefrogg-nixos@meterriblecrew.net"; github = "spacefrogg"; @@ -19531,13 +19568,6 @@ githubId = 28858039; name = "Tuomas Mäkinen"; }; - tadeokondrak = { - email = "me@tadeo.ca"; - github = "tadeokondrak"; - githubId = 4098453; - name = "Tadeo Kondrak"; - keys = [ { fingerprint = "0F2B C0C7 E77C 5B42 AC5B 4C18 FBE6 07FC C495 16D3"; } ]; - }; tadfisher = { email = "tadfisher@gmail.com"; github = "tadfisher"; @@ -19771,6 +19801,12 @@ githubId = 1755789; name = "Robert Irelan"; }; + tembleking = { + name = "Fede Barcelona"; + email = "fede_rico_94@hotmail.com"; + github = "tembleking"; + githubId = 2988780; + }; tengkuizdihar = { name = "Tengku Izdihar"; email = "tengkuizdihar@gmail.com"; @@ -21041,13 +21077,6 @@ github = "victormeriqui"; githubId = 1396008; }; - victormignot = { - email = "root@victormignot.fr"; - github = "victormignot"; - githubId = 58660971; - name = "Victor Mignot"; - keys = [ { fingerprint = "CA5D F91A D672 683A 1F65 BBC9 0317 096D 20E0 067B"; } ]; - }; vidbina = { email = "vid@bina.me"; github = "vidbina"; @@ -21066,12 +21095,6 @@ githubId = 5837359; name = "Adrian Pistol"; }; - vigress8 = { - email = "vig@disroot.org"; - github = "vigress8"; - githubId = 150687949; - name = "Vigress"; - }; vikanezrimaya = { email = "vika@fireburn.ru"; github = "vikanezrimaya"; @@ -21749,6 +21772,12 @@ github = "x0ba"; githubId = 64868985; }; + x123 = { + name = "x123"; + email = "nix@boxchop.city"; + github = "x123"; + githubId = 5481629; + }; x3ro = { name = "^x3ro"; email = "nix@x3ro.dev"; @@ -22004,6 +22033,12 @@ githubId = 58453832; keys = [ { fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; } ]; }; + yelite = { + name = "Lite Ye"; + email = "yelite958@gmail.com"; + github = "yelite"; + githubId = 3517225; + }; YellowOnion = { name = "Daniel Hill"; email = "daniel@gluo.nz"; @@ -22322,6 +22357,12 @@ githubId = 250877; name = "Elmar Athmer"; }; + zazedd = { + name = "Leonardo Santos"; + email = "leomendesantos@gmail.com"; + github = "zazedd"; + githubId = 93401987; + }; zbioe = { name = "Iury Fukuda"; email = "zbioe@protonmail.com"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index d4b6190f1925..7359e4451ccf 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -6,6 +6,7 @@ argparse,,,,,, basexx,,,,,, binaryheap,,,,,,vcunat busted,,,,,, +busted-htest,,,,,,mrcjkb cassowary,,,,,,alerque cldr,,,,,,alerque compat53,,,,,,vcunat @@ -97,7 +98,7 @@ lua-utils.nvim,,,,,,mrcjkb lua-yajl,,,,,,pstn lua-iconv,,,,7.0.0,, luuid,,,,20120509-2,, -luv,,,,1.44.2-1,, +luv,,,,1.48.0-2,, lush.nvim,,,https://luarocks.org/dev,,,teto lyaml,,,,,,lblasc lz.n,,,,,,mrcjkb @@ -136,7 +137,6 @@ telescope.nvim,,,,,5.1, telescope-manix,,,,,, tiktoken_core,,,,,,natsukium tl,,,,,,mephistophiles -toml,,,,,,mrcjkb toml-edit,,,,,5.1,mrcjkb tree-sitter-norg,,,,,5.1,mrcjkb vstruct,,,,,, diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 3aff32caf581..6ff8596e678e 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -158,7 +158,7 @@ let to run all update scripts for all packages that lists \`garbas\` as a maintainer and have \`updateScript\` defined, or: - % nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus + % nix-shell maintainers/scripts/update.nix --argstr package nautilus to run update script for specific package, or diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index fb88ea3fed3b..d5c7a218b4b5 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -715,10 +715,7 @@ with lib.maintainers; }; node = { - members = [ - lilyinstarlight - winter - ]; + members = [ winter ]; scope = "Maintain Node.js runtimes and build tooling."; shortName = "Node.js"; enableFeatureFreezePing = true; @@ -772,7 +769,7 @@ with lib.maintainers; aanderse drupol ma27 - patka + piotrkwiecinski talyz ]; githubTeams = [ "php" ]; diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index b6db40878ba7..9f3ff2ac6bac 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -174,8 +174,6 @@ commands: OK > set_network 0 psk "mypassword" OK -> set_network 0 key_mgmt WPA-PSK -OK > enable_network 0 OK ``` @@ -191,8 +189,6 @@ OK OK > set_network 0 password "mypassword" OK -> set_network 0 key_mgmt WPA-EAP -OK > enable_network 0 OK ``` diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index b1b18b35e9c2..0328865ba733 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -225,6 +225,19 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `appimageTools.wrapAppImage` now creates the binary at `$out/bin/${pname}` rather than `$out/bin/${pname}-${version}`, which will break downstream workarounds. +- `apptainer` and `singularity` now prioritize system-wide `PATH` over those constructed from dependent packages when searching for third-party utilities. The `PATH` to search for third-party utilities, known as `defaultPath` inside Apptainer/Singularity source code, is now constructed from the following sources, ordered by their precedence: + - `systemBinPaths`, a new argument introduced to specify system-wide `"/**/bin"` directories. + - The FHS `defaultPath` value set by Apptainer/Singularity developers, making Apptainer/Singularity work out of the box in FHS systems. + - `defaultPathInputs`, a list of packages to form the fall-back `PATH`. + + This change is required to enable Sylabs SingularityCE (`singularity`) to run images, as it requires a `fusermount3` commant with the SUID bit set. + + `newuidmapPath` and `newgidmapPath` arguments are deprecated in favour of `systemBinPaths`. Their support will be removed in future releases. + + `programs.singularity.systemBinPaths` option is introduced to specify the `systemBinPaths` argument of the overridden package. It includes `"/run/wrappers/bin"` even if specified empty. + + `programs.singularity.enableFakeroot` option is deprecated and has no effect. `--fakeroot` support is now always enabled as long as `programs.singularity.systemBinPaths` is not forcefully overridden. + - `azure-cli` now has extension support. For example, to install the `aks-preview` extension, use ```nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 03d862e068f9..3f16677ead65 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -8,6 +8,7 @@ - [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured as `hardware.amdgpu.amdvlk` option. This also allows configuring runtime settings of AMDVLK and enabling experimental features. +- The `moonlight-qt` package ([Moonlight game streaming](https://moonlight-stream.org/)) now has HDR support on Linux systems. ## New Services {#sec-release-24.11-new-services} @@ -19,12 +20,18 @@ - [Flood](https://flood.js.org/), a beautiful WebUI for various torrent clients. Available as [services.flood](options.html#opt-services.flood). +- [Eintopf](https://eintopf.info), community event and calendar web application. Available as [services.eintopf](options.html#opt-services.eintopf). + - [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable). - [wg-access-server](https://github.com/freifunkMUC/wg-access-server/), an all-in-one WireGuard VPN solution with a web ui for connecting devices. Available at [services.wg-access-server](#opt-services.wg-access-server.enable). +- [Envision](https://gitlab.com/gabmus/envision), a UI for building, configuring and running Monado, the open source OpenXR runtime. Available as [programs.envision](#opt-programs.envision.enable). + - [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld). +- [Glance](https://github.com/glanceapp/glance), a self-hosted dashboard that puts all your feeds in one place. Available as [services.glance](option.html#opt-services.glance). + ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} - `transmission` package has been aliased with a `trace` warning to `transmission_3`. Since [Transmission 4 has been released last year](https://github.com/transmission/transmission/releases/tag/4.0.0), and Transmission 3 will eventually go away, it was decided perform this warning alias to make people aware of the new version. The `services.transmission.package` defaults to `transmission_3` as well because the upgrade can cause data loss in certain specific usage patterns (examples: [#5153](https://github.com/transmission/transmission/issues/5153), [#6796](https://github.com/transmission/transmission/issues/6796)). Please make sure to back up to your data directory per your usage: @@ -33,6 +40,8 @@ - `androidenv.androidPkgs_9_0` has been removed, and replaced with `androidenv.androidPkgs` for a more complete Android SDK including support for Android 9 and later. +- `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected. + - `wstunnel` has had a major version upgrade that entailed rewriting the program in Rust. The module was updated to accommodate for breaking changes. Breaking changes to the module API were minimised as much as possible, @@ -58,6 +67,20 @@ it is set, instead of the previous hardcoded default of `${networking.hostName}.${security.ipa.domain}`. +- The fcgiwrap module now allows multiple instances running as distinct users. + The option `services.fgciwrap` now takes an attribute set of the + configuration of each individual instance. + This requires migrating any previous configuration keys from + `services.fcgiwrap.*` to `services.fcgiwrap.some-instance.*`. + The ownership and mode of the UNIX sockets created by this service are now + configurable and private by default. + Processes also now run as a dynamically allocated user by default instead of + root. + +- `services.cgit` now runs as the cgit user by default instead of root. + This change requires granting access to the repositories to this user or + setting the appropriate one through `services.cgit.some-instance.user`. + - `nvimpager` was updated to version 0.13.0, which changes the order of user and nvimpager settings: user commands in `-c` and `--cmd` now override the respective default settings because they are executed later. @@ -71,6 +94,10 @@ - `services.ddclient.use` has been deprecated: `ddclient` now supports separate IPv4 and IPv6 configuration. Use `services.ddclient.usev4` and `services.ddclient.usev6` instead. +- `teleport` has been upgraded from major version 15 to major version 16. + Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) + and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324). + - `vaultwarden` lost the capability to bind to privileged ports. If you rely on this behavior, override the systemd unit to allow `CAP_NET_BIND_SERVICE` in your local configuration. @@ -87,6 +114,10 @@ - Android NDK version 26 and SDK version 33 are now the default versions used for cross compilation to android. +- `nodePackages.vscode-css-languageserver-bin`, `nodePackages.vscode-html-languageserver-bin`, + and `nodePackages.vscode-json-languageserver-bin` were dropped due to an unmaintained upstream. + The `vscode-langservers-extracted` package is a maintained drop-in replacement. + - `haskell.lib.compose.justStaticExecutables` now disallows references to GHC in the output by default, to alert users to closure size issues caused by [#164630](https://github.com/NixOS/nixpkgs/issues/164630). See ["Packaging @@ -106,6 +137,14 @@ for `stateVersion` ≥ 24.11. (It was previously using SQLite for structured data and the filesystem for blobs). +- The `shiori` service now requires an HTTP secret value `SHIORI_HTTP_SECRET_KEY` to be provided via environment variable. The nixos module therefore, now provides an environmentFile option: + + ``` + # This is how a environment file can be generated: + # $ printf "SHIORI_HTTP_SECRET_KEY=%s\n" "$(openssl rand -hex 16)" > /path/to/env-file + services.shiori.environmentFile = "/path/to/env-file"; + ``` + - `libe57format` has been updated to `>= 3.0.0`, which contains some backward-incompatible API changes. See the [release note](https://github.com/asmaloney/libE57Format/releases/tag/v3.0.0) for more details. - `gitlab` deprecated support for *runner registration tokens* in GitLab 16.0, disabled their support in GitLab 17.0 and will @@ -116,6 +155,8 @@ GitLab administrators should migrate to the [new runner registration workflow](https://docs.gitlab.com/17.0/ee/ci/runners/new_creation_workflow.html#using-registration-tokens-after-gitlab-170) with *runner authentication tokens* until the release of GitLab 18.0. +- `gitlab` has been updated from 16.x to 17.x and requires at least `postgresql` 14.9, as stated in the [documentation](https://docs.gitlab.com/17.1/ee/install/requirements.html#postgresql-requirements). Check the [upgrade guide](#module-services-postgres-upgrading) in the NixOS manual on how to upgrade your PostgreSQL installation. + - `zx` was updated to v8, which introduces several breaking changes. See the [v8 changelog](https://github.com/google/zx/releases/tag/8.0.0) for more information. @@ -142,10 +183,18 @@ - The `services.prometheus.exporters.minio` option has been removed, as it's upstream implementation was broken and unmaintained. Minio now has built-in [Prometheus metrics exposure](https://min.io/docs/minio/linux/operations/monitoring/collect-minio-metrics-using-prometheus.html), which can be used instead. +- The `services.patroni.raft` option has been removed, as Raft has been [deprecated by upstream since 3.0.0](https://github.com/patroni/patroni/blob/master/docs/releases.rst#version-300) + +- `services.roundcube.maxAttachmentSize` will multiply the value set with `1.37` to offset overhead introduced by the base64 encoding applied to attachments. + ## Other Notable Changes {#sec-release-24.11-notable-changes} +- The `zerocallusedregs` hardening flag is enabled by default on compilers that support it. + +- The `stackclashprotection` hardening flag has been added, though disabled by default. + - `hareHook` has been added as the language framework for Hare. From now on, it, not the `hare` package, should be added to `nativeBuildInputs` when building Hare programs. @@ -156,6 +205,9 @@ The derivation now installs "impl" headers selectively instead of by a wildcard. Use `imgui.src` if you just want to access the unpacked sources. +- `security.pam.u2f` now follows RFC42. + All module options are now settable through the freeform `.settings`. + - Cinnamon has been updated to 6.2. - Following Mint 22 defaults, the Cinnamon module no longer ships geary and hexchat by default. - Nemo is now built with gtk-layer-shell support, note that for now it will be expected to see nemo-desktop diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 17e03baf3bb7..210fbd1a0e99 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -1,5 +1,5 @@ /** - Generates documentation for [nix modules](https://nix.dev/tutorials/module-system/module-system.html). + Generates documentation for [nix modules](https://nix.dev/tutorials/module-system/index.html). It uses the declared `options` to generate documentation in various formats. diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index c1c1828a2c12..82bbfae0178b 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -23,6 +23,7 @@ let isPath isString listToAttrs + mapAttrs nameValuePair optionalString removePrefix @@ -140,11 +141,35 @@ utils = rec { ]; } "_secret" -> { ".example[1].relevant.secret" = "/path/to/secret"; } */ - recursiveGetAttrWithJqPrefix = item: attr: + recursiveGetAttrWithJqPrefix = item: attr: mapAttrs (_name: set: set.${attr}) (recursiveGetAttrsetWithJqPrefix item attr); + + /* Similar to `recursiveGetAttrWithJqPrefix`, but returns the whole + attribute set containing `attr` instead of the value of `attr` in + the set. + + Example: + recursiveGetAttrsetWithJqPrefix { + example = [ + { + irrelevant = "not interesting"; + } + { + ignored = "ignored attr"; + relevant = { + secret = { + _secret = "/path/to/secret"; + quote = true; + }; + }; + } + ]; + } "_secret" -> { ".example[1].relevant.secret" = { _secret = "/path/to/secret"; quote = true; }; } + */ + recursiveGetAttrsetWithJqPrefix = item: attr: let recurse = prefix: item: if item ? ${attr} then - nameValuePair prefix item.${attr} + nameValuePair prefix item else if isDerivation item then [] else if isAttrs item then map (name: @@ -206,6 +231,58 @@ utils = rec { } ] } + + The attribute set { _secret = "/path/to/secret"; } can contain extra + options, currently it accepts the `quote = true|false` option. + + If `quote = true` (default behavior), the content of the secret file will + be quoted as a string and embedded. Otherwise, if `quote = false`, the + content of the secret file will be parsed to JSON and then embedded. + + Example: + If the file "/path/to/secret" contains the JSON document: + + [ + { "a": "topsecretpassword1234" }, + { "b": "topsecretpassword5678" } + ] + + genJqSecretsReplacementSnippet { + example = [ + { + irrelevant = "not interesting"; + } + { + ignored = "ignored attr"; + relevant = { + secret = { + _secret = "/path/to/secret"; + quote = false; + }; + }; + } + ]; + } "/path/to/output.json" + + would generate a snippet that, when run, outputs the following + JSON file at "/path/to/output.json": + + { + "example": [ + { + "irrelevant": "not interesting" + }, + { + "ignored": "ignored attr", + "relevant": { + "secret": [ + { "a": "topsecretpassword1234" }, + { "b": "topsecretpassword5678" } + ] + } + } + ] + } */ genJqSecretsReplacementSnippet = genJqSecretsReplacementSnippet' "_secret"; @@ -213,7 +290,11 @@ utils = rec { # attr which identifies the secret to be changed. genJqSecretsReplacementSnippet' = attr: set: output: let - secrets = recursiveGetAttrWithJqPrefix set attr; + secretsRaw = recursiveGetAttrsetWithJqPrefix set attr; + # Set default option values + secrets = mapAttrs (_name: set: { + quote = true; + } // set) secretsRaw; stringOrDefault = str: def: if str == "" then def else str; in '' if [[ -h '${output}' ]]; then @@ -227,7 +308,7 @@ utils = rec { + concatStringsSep "\n" (imap1 (index: name: '' - secret${toString index}=$(<'${secrets.${name}}') + secret${toString index}=$(<'${secrets.${name}.${attr}}') export secret${toString index} '') (attrNames secrets)) @@ -236,7 +317,7 @@ utils = rec { + escapeShellArg (stringOrDefault (concatStringsSep " | " - (imap1 (index: name: ''${name} = $ENV.secret${toString index}'') + (imap1 (index: name: ''${name} = ($ENV.secret${toString index}${optionalString (!secrets.${name}.quote) " | fromjson"})'') (attrNames secrets))) ".") + '' diff --git a/nixos/modules/config/fonts/ghostscript.nix b/nixos/modules/config/fonts/ghostscript.nix index a5508b948990..5db7c0ac7179 100644 --- a/nixos/modules/config/fonts/ghostscript.nix +++ b/nixos/modules/config/fonts/ghostscript.nix @@ -18,6 +18,6 @@ with lib; }; config = mkIf config.fonts.enableGhostscriptFonts { - fonts.packages = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ]; + fonts.packages = [ pkgs.ghostscript.fonts ]; }; } diff --git a/nixos/modules/config/stevenblack.nix b/nixos/modules/config/stevenblack.nix index 5b85073c6908..95f6c9e73eb3 100644 --- a/nixos/modules/config/stevenblack.nix +++ b/nixos/modules/config/stevenblack.nix @@ -1,34 +1,49 @@ -{ config, lib, pkgs, ... }: - +{ + config, + lib, + pkgs, + ... +}: let - inherit (lib) optionals mkOption mkEnableOption types mkIf elem concatStringsSep maintainers; + inherit (lib) + getOutput + maintainers + mkEnableOption + mkIf + mkOption + mkPackageOption + types + ; + cfg = config.networking.stevenblack; - - # needs to be in a specific order - activatedHosts = with cfg; [ ] - ++ optionals (elem "fakenews" block) [ "fakenews" ] - ++ optionals (elem "gambling" block) [ "gambling" ] - ++ optionals (elem "porn" block) [ "porn" ] - ++ optionals (elem "social" block) [ "social" ]; - - hostsPath = "${pkgs.stevenblack-blocklist}/alternates/" + concatStringsSep "-" activatedHosts + "/hosts"; in { options.networking.stevenblack = { enable = mkEnableOption "the stevenblack hosts file blocklist"; + package = mkPackageOption pkgs "stevenblack-blocklist" { }; + block = mkOption { - type = types.listOf (types.enum [ "fakenews" "gambling" "porn" "social" ]); + type = types.listOf ( + types.enum [ + "fakenews" + "gambling" + "porn" + "social" + ] + ); default = [ ]; description = "Additional blocklist extensions."; }; }; config = mkIf cfg.enable { - networking.hostFiles = [ ] - ++ optionals (activatedHosts != [ ]) [ hostsPath ] - ++ optionals (activatedHosts == [ ]) [ "${pkgs.stevenblack-blocklist}/hosts" ]; + networking.hostFiles = map (x: "${getOutput x cfg.package}/hosts") ([ "ads" ] ++ cfg.block); }; - meta.maintainers = [ maintainers.moni maintainers.artturin ]; + meta.maintainers = with maintainers; [ + moni + artturin + frontear + ]; } diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index 7c6851473f42..f0b692a759d1 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -234,7 +234,7 @@ foreach my $u (@{$spec->{users}}) { # Ensure home directory incl. ownership and permissions. if ($u->{createHome} and !$is_dry) { - make_path($u->{home}, { mode => oct($u->{homeMode}) }) if ! -e $u->{home}; + make_path($u->{home}, { mode => 0755 }) if ! -e $u->{home}; chown $u->{uid}, $u->{gid}, $u->{home}; chmod oct($u->{homeMode}), $u->{home}; } diff --git a/nixos/modules/hardware/decklink.nix b/nixos/modules/hardware/decklink.nix deleted file mode 100644 index d179e1d7634f..000000000000 --- a/nixos/modules/hardware/decklink.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.hardware.decklink; - kernelPackages = config.boot.kernelPackages; -in -{ - options.hardware.decklink.enable = lib.mkEnableOption "hardware support for the Blackmagic Design Decklink audio/video interfaces"; - - config = lib.mkIf cfg.enable { - boot.kernelModules = [ "blackmagic" "blackmagic-io" "snd_blackmagic-io" ]; - boot.extraModulePackages = [ kernelPackages.decklink ]; - systemd.packages = [ pkgs.blackmagic-desktop-video ]; - systemd.services.DesktopVideoHelper.wantedBy = [ "multi-user.target" ]; - }; -} diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 0e9adefff5e1..4692ed15a956 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -297,7 +297,10 @@ in description = "Update timer for locate database"; partOf = [ "update-locatedb.service" ]; wantedBy = [ "timers.target" ]; - timerConfig.OnCalendar = cfg.interval; + timerConfig = { + OnCalendar = cfg.interval; + Persistent = true; + }; }; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4d227916c499..fc62e9db1785 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -59,7 +59,6 @@ ./hardware/cpu/intel-microcode.nix ./hardware/cpu/intel-sgx.nix ./hardware/cpu/x86-msr.nix - ./hardware/decklink.nix ./hardware/device-tree.nix ./hardware/digitalbitbox.nix ./hardware/flipperzero.nix @@ -181,6 +180,7 @@ ./programs/dublin-traceroute.nix ./programs/ecryptfs.nix ./programs/environment.nix + ./programs/envision.nix ./programs/evince.nix ./programs/extra-container.nix ./programs/fcast-receiver.nix @@ -1370,6 +1370,7 @@ ./services/web-apps/documize.nix ./services/web-apps/dokuwiki.nix ./services/web-apps/dolibarr.nix + ./services/web-apps/eintopf.nix ./services/web-apps/engelsystem.nix ./services/web-apps/ethercalc.nix ./services/web-apps/filesender.nix @@ -1379,6 +1380,7 @@ ./services/web-apps/freshrss.nix ./services/web-apps/galene.nix ./services/web-apps/gerrit.nix + ./services/web-apps/glance.nix ./services/web-apps/gotify-server.nix ./services/web-apps/gotosocial.nix ./services/web-apps/grocy.nix diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix index 8b3df97ae0db..a7015c8bcc61 100644 --- a/nixos/modules/profiles/qemu-guest.nix +++ b/nixos/modules/profiles/qemu-guest.nix @@ -5,13 +5,5 @@ { boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; - boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" ]; - - boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable) - '' - # Set the system time from the hardware clock to work around a - # bug in qemu-kvm > 1.5.2 (where the VM clock is initialised - # to the *boot time* of the host). - hwclock -s - ''; + boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" "virtio_gpu" ]; } diff --git a/nixos/modules/programs/envision.nix b/nixos/modules/programs/envision.nix new file mode 100644 index 000000000000..8849420a6b5f --- /dev/null +++ b/nixos/modules/programs/envision.nix @@ -0,0 +1,43 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.envision; +in +{ + + options = { + programs.envision = { + enable = lib.mkEnableOption "envision"; + + package = lib.mkPackageOption pkgs "envision" {}; + + openFirewall = lib.mkEnableOption "the default ports in the firewall for the WiVRn server" // { + default = true; + }; + }; + }; + + config = lib.mkIf cfg.enable { + services.avahi = { + enable = true; + publish = { + enable = true; + userServices = true; + }; + }; + + environment.systemPackages = [ cfg.package ]; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ 9757 ]; + allowedUDPPorts = [ 9757 ]; + }; + }; + + meta.maintainers = pkgs.envision.meta.maintainers; +} diff --git a/nixos/modules/programs/file-roller.nix b/nixos/modules/programs/file-roller.nix index f64bd732855b..d58af9cd59a5 100644 --- a/nixos/modules/programs/file-roller.nix +++ b/nixos/modules/programs/file-roller.nix @@ -14,7 +14,7 @@ in { enable = lib.mkEnableOption "File Roller, an archive manager for GNOME"; - package = lib.mkPackageOption pkgs [ "gnome" "file-roller" ] { }; + package = lib.mkPackageOption pkgs "file-roller" { }; }; diff --git a/nixos/modules/programs/geary.nix b/nixos/modules/programs/geary.nix index cfd5bed78d97..7c22d88a9ad5 100644 --- a/nixos/modules/programs/geary.nix +++ b/nixos/modules/programs/geary.nix @@ -13,7 +13,7 @@ in { }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.gnome.geary ]; + environment.systemPackages = [ pkgs.geary ]; programs.dconf.enable = true; services.gnome.gnome-keyring.enable = true; services.gnome.gnome-online-accounts.enable = true; diff --git a/nixos/modules/programs/gnome-disks.nix b/nixos/modules/programs/gnome-disks.nix index 954f1fd9bc07..8c0cee906c56 100644 --- a/nixos/modules/programs/gnome-disks.nix +++ b/nixos/modules/programs/gnome-disks.nix @@ -32,9 +32,9 @@ config = lib.mkIf config.programs.gnome-disks.enable { - environment.systemPackages = [ pkgs.gnome.gnome-disk-utility ]; + environment.systemPackages = [ pkgs.gnome-disk-utility ]; - services.dbus.packages = [ pkgs.gnome.gnome-disk-utility ]; + services.dbus.packages = [ pkgs.gnome-disk-utility ]; }; diff --git a/nixos/modules/programs/gnome-terminal.nix b/nixos/modules/programs/gnome-terminal.nix index a5dda83edd11..a065adfe61c4 100644 --- a/nixos/modules/programs/gnome-terminal.nix +++ b/nixos/modules/programs/gnome-terminal.nix @@ -19,9 +19,9 @@ in }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.gnome.gnome-terminal ]; - services.dbus.packages = [ pkgs.gnome.gnome-terminal ]; - systemd.packages = [ pkgs.gnome.gnome-terminal ]; + environment.systemPackages = [ pkgs.gnome-terminal ]; + services.dbus.packages = [ pkgs.gnome-terminal ]; + systemd.packages = [ pkgs.gnome-terminal ]; programs.bash.vteIntegration = true; programs.zsh.vteIntegration = true; diff --git a/nixos/modules/programs/gpaste.nix b/nixos/modules/programs/gpaste.nix index 32b81434bdd9..f0c3baf10da0 100644 --- a/nixos/modules/programs/gpaste.nix +++ b/nixos/modules/programs/gpaste.nix @@ -18,12 +18,12 @@ ###### implementation config = lib.mkIf config.programs.gpaste.enable { - environment.systemPackages = [ pkgs.gnome.gpaste ]; - services.dbus.packages = [ pkgs.gnome.gpaste ]; - systemd.packages = [ pkgs.gnome.gpaste ]; + environment.systemPackages = [ pkgs.gpaste ]; + services.dbus.packages = [ pkgs.gpaste ]; + systemd.packages = [ pkgs.gpaste ]; # gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas. - services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ]; + services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gpaste ]; # gpaste-reloaded applet doesn't work without the typelib - services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ]; + services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ]; }; } diff --git a/nixos/modules/programs/nautilus-open-any-terminal.nix b/nixos/modules/programs/nautilus-open-any-terminal.nix index 8a38c4cb5e48..ff0e77607b5e 100644 --- a/nixos/modules/programs/nautilus-open-any-terminal.nix +++ b/nixos/modules/programs/nautilus-open-any-terminal.nix @@ -19,7 +19,7 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ - gnome.nautilus-python + nautilus-python nautilus-open-any-terminal ]; programs.dconf = lib.optionalAttrs (cfg.terminal != null) { diff --git a/nixos/modules/programs/qdmr.nix b/nixos/modules/programs/qdmr.nix index efd0e1fc9885..1444be9c6923 100644 --- a/nixos/modules/programs/qdmr.nix +++ b/nixos/modules/programs/qdmr.nix @@ -8,7 +8,7 @@ let cfg = config.programs.qdmr; in { - meta.maintainers = [ lib.maintainers.janik ]; + meta.maintainers = [ ]; options = { programs.qdmr = { diff --git a/nixos/modules/programs/seahorse.nix b/nixos/modules/programs/seahorse.nix index 53fff50e0a8b..3f6ec8c1a6a6 100644 --- a/nixos/modules/programs/seahorse.nix +++ b/nixos/modules/programs/seahorse.nix @@ -21,14 +21,14 @@ config = lib.mkIf config.programs.seahorse.enable { - programs.ssh.askPassword = lib.mkDefault "${pkgs.gnome.seahorse}/libexec/seahorse/ssh-askpass"; + programs.ssh.askPassword = lib.mkDefault "${pkgs.seahorse}/libexec/seahorse/ssh-askpass"; environment.systemPackages = [ - pkgs.gnome.seahorse + pkgs.seahorse ]; services.dbus.packages = [ - pkgs.gnome.seahorse + pkgs.seahorse ]; }; diff --git a/nixos/modules/programs/singularity.nix b/nixos/modules/programs/singularity.nix index bc989ad2dbaf..d1115b361593 100644 --- a/nixos/modules/programs/singularity.nix +++ b/nixos/modules/programs/singularity.nix @@ -56,9 +56,12 @@ in enableFakeroot = lib.mkOption { type = lib.types.bool; default = true; - example = false; description = '' Whether to enable the `--fakeroot` support of Singularity/Apptainer. + + This option is deprecated and has no effect. + `--fakeroot` support is enabled automatically, + as `systemBinPaths = [ "/run/wrappers/bin" ]` is always specified. ''; }; enableSuid = lib.mkOption { @@ -74,22 +77,34 @@ in Whether to enable the SUID support of Singularity/Apptainer. ''; }; + systemBinPaths = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + description = '' + (Extra) system-wide /**/bin paths + for Apptainer/Singularity to find command-line utilities in. + + `"/run/wrappers/bin"` is included by default to make + utilities with SUID bit set available to Apptainer/Singularity. + Use `lib.mkForce` to shadow the default values. + ''; + }; }; config = lib.mkIf cfg.enable { programs.singularity.packageOverriden = ( cfg.package.override ( - lib.optionalAttrs cfg.enableExternalLocalStateDir { externalLocalStateDir = "/var/lib"; } - // lib.optionalAttrs cfg.enableFakeroot { - newuidmapPath = "/run/wrappers/bin/newuidmap"; - newgidmapPath = "/run/wrappers/bin/newgidmap"; + { + systemBinPaths = cfg.systemBinPaths; } + // lib.optionalAttrs cfg.enableExternalLocalStateDir { externalLocalStateDir = "/var/lib"; } // lib.optionalAttrs cfg.enableSuid { enableSuid = true; starterSuidPath = "/run/wrappers/bin/${cfg.package.projectName}-suid"; } ) ); + programs.singularity.systemBinPaths = [ "/run/wrappers/bin" ]; environment.systemPackages = [ cfg.packageOverriden ]; security.wrappers."${cfg.packageOverriden.projectName}-suid" = lib.mkIf cfg.enableSuid { setuid = true; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index f77e819d0c83..b63eb6276a81 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -7,6 +7,13 @@ with lib; let + moduleSettingsType = with types; attrsOf (nullOr (oneOf [ bool str int pathInStore ])); + moduleSettingsDescription = '' + Boolean values render just the key if true, and nothing if false. + Null values are ignored. + All other values are rendered as key-value pairs. + ''; + mkRulesTypeOption = type: mkOption { # These options are experimental and subject to breaking changes without notice. description = '' @@ -71,12 +78,12 @@ let ''; }; settings = mkOption { - type = with types; attrsOf (nullOr (oneOf [ bool str int pathInStore ])); + type = moduleSettingsType; default = {}; description = '' Settings to add as `module-arguments`. - Boolean values render just the key if true, and nothing if false. Null values are ignored. All other values are rendered as key-value pairs. + ${moduleSettingsDescription} ''; }; }; @@ -660,11 +667,7 @@ let (let p11 = config.security.pam.p11; in { name = "p11"; enable = cfg.p11Auth; control = p11.control; modulePath = "${pkgs.pam_p11}/lib/security/pam_p11.so"; args = [ "${pkgs.opensc}/lib/opensc-pkcs11.so" ]; }) - (let u2f = config.security.pam.u2f; in { name = "u2f"; enable = cfg.u2fAuth; control = u2f.control; modulePath = "${pkgs.pam_u2f}/lib/security/pam_u2f.so"; settings = { - inherit (u2f) debug interactive cue origin; - authfile = u2f.authFile; - appid = u2f.appId; - }; }) + (let u2f = config.security.pam.u2f; in { name = "u2f"; enable = cfg.u2fAuth; control = u2f.control; modulePath = "${pkgs.pam_u2f}/lib/security/pam_u2f.so"; inherit (u2f) settings; }) (let ussh = config.security.pam.ussh; in { name = "ussh"; enable = config.security.pam.ussh.enable && cfg.usshAuth; control = ussh.control; modulePath = "${pkgs.pam_ussh}/lib/security/pam_ussh.so"; settings = { ca_file = ussh.caFile; authorized_principals = ussh.authorizedPrincipals; @@ -723,7 +726,7 @@ let disable_interactive = true; }; } { name = "kwallet"; enable = cfg.kwallet.enable; control = "optional"; modulePath = "${cfg.kwallet.package}/lib/security/pam_kwallet5.so"; } - { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; } + { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so"; } { name = "intune"; enable = config.services.intune.enable; control = "optional"; modulePath = "${pkgs.intune-portal}/lib/security/pam_intune.so"; } { name = "gnupg"; enable = cfg.gnupg.enable; control = "optional"; modulePath = "${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"; settings = { store-only = cfg.gnupg.storeOnly; @@ -789,7 +792,7 @@ let { name = "krb5"; enable = config.security.pam.krb5.enable; control = "sufficient"; modulePath = "${pam_krb5}/lib/security/pam_krb5.so"; settings = { use_first_pass = true; }; } - { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = { + { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = { use_authtok = true; }; } ]; @@ -858,7 +861,7 @@ let debug = true; }; } { name = "kwallet"; enable = cfg.kwallet.enable; control = "optional"; modulePath = "${cfg.kwallet.package}/lib/security/pam_kwallet5.so"; } - { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = { + { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = { auto_start = true; }; } { name = "gnupg"; enable = cfg.gnupg.enable; control = "optional"; modulePath = "${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"; settings = { @@ -952,6 +955,12 @@ in imports = [ (mkRenamedOptionModule [ "security" "pam" "enableU2F" ] [ "security" "pam" "u2f" "enable" ]) (mkRenamedOptionModule [ "security" "pam" "enableSSHAgentAuth" ] [ "security" "pam" "sshAgentAuth" "enable" ]) + (mkRenamedOptionModule [ "security" "pam" "u2f" "authFile" ] [ "security" "pam" "u2f" "settings" "authfile" ]) + (mkRenamedOptionModule [ "security" "pam" "u2f" "appId" ] [ "security" "pam" "u2f" "settings" "appid" ]) + (mkRenamedOptionModule [ "security" "pam" "u2f" "origin" ] [ "security" "pam" "u2f" "settings" "origin" ]) + (mkRenamedOptionModule [ "security" "pam" "u2f" "debug" ] [ "security" "pam" "u2f" "settings" "debug" ]) + (mkRenamedOptionModule [ "security" "pam" "u2f" "interactive" ] [ "security" "pam" "u2f" "settings" "interactive" ]) + (mkRenamedOptionModule [ "security" "pam" "u2f" "cue" ] [ "security" "pam" "u2f" "settings" "cue" ]) ]; ###### interface @@ -1144,57 +1153,6 @@ in ''; }; - authFile = mkOption { - default = null; - type = with types; nullOr path; - description = '' - By default `pam-u2f` module reads the keys from - {file}`$XDG_CONFIG_HOME/Yubico/u2f_keys` (or - {file}`$HOME/.config/Yubico/u2f_keys` if XDG variable is - not set). - - If you want to change auth file locations or centralize database (for - example use {file}`/etc/u2f-mappings`) you can set this - option. - - File format is: - `username:first_keyHandle,first_public_key: second_keyHandle,second_public_key` - This file can be generated using {command}`pamu2fcfg` command. - - More information can be found [here](https://developers.yubico.com/pam-u2f/). - ''; - }; - - appId = mkOption { - default = null; - type = with types; nullOr str; - description = '' - By default `pam-u2f` module sets the application - ID to `pam://$HOSTNAME`. - - When using {command}`pamu2fcfg`, you can specify your - application ID with the `-i` flag. - - More information can be found [here](https://developers.yubico.com/pam-u2f/Manuals/pam_u2f.8.html) - ''; - }; - - origin = mkOption { - default = null; - type = with types; nullOr str; - description = '' - By default `pam-u2f` module sets the origin - to `pam://$HOSTNAME`. - Setting origin to an host independent value will allow you to - reuse credentials across machines - - When using {command}`pamu2fcfg`, you can specify your - application ID with the `-o` flag. - - More information can be found [here](https://developers.yubico.com/pam-u2f/Manuals/pam_u2f.8.html) - ''; - }; - control = mkOption { default = "sufficient"; type = types.enum [ "required" "requisite" "sufficient" "optional" ]; @@ -1209,33 +1167,104 @@ in ''; }; - debug = mkOption { - default = false; - type = types.bool; - description = '' - Debug output to stderr. - ''; - }; + settings = mkOption { + type = types.submodule { + freeformType = moduleSettingsType; - interactive = mkOption { - default = false; - type = types.bool; - description = '' - Set to prompt a message and wait before testing the presence of a U2F device. - Recommended if your device doesn’t have a tactile trigger. - ''; - }; + options = { + authfile = mkOption { + default = null; + type = with types; nullOr path; + description = '' + By default `pam-u2f` module reads the keys from + {file}`$XDG_CONFIG_HOME/Yubico/u2f_keys` (or + {file}`$HOME/.config/Yubico/u2f_keys` if XDG variable is + not set). - cue = mkOption { - default = false; - type = types.bool; - description = '' - By default `pam-u2f` module does not inform user - that he needs to use the u2f device, it just waits without a prompt. + If you want to change auth file locations or centralize database (for + example use {file}`/etc/u2f-mappings`) you can set this + option. - If you set this option to `true`, - `cue` option is added to `pam-u2f` - module and reminder message will be displayed. + File format is: + `username:first_keyHandle,first_public_key: second_keyHandle,second_public_key` + This file can be generated using {command}`pamu2fcfg` command. + + More information can be found [here](https://developers.yubico.com/pam-u2f/). + ''; + }; + + appid = mkOption { + default = null; + type = with types; nullOr str; + description = '' + By default `pam-u2f` module sets the application + ID to `pam://$HOSTNAME`. + + When using {command}`pamu2fcfg`, you can specify your + application ID with the `-i` flag. + + More information can be found [here](https://developers.yubico.com/pam-u2f/Manuals/pam_u2f.8.html) + ''; + }; + + origin = mkOption { + default = null; + type = with types; nullOr str; + description = '' + By default `pam-u2f` module sets the origin + to `pam://$HOSTNAME`. + Setting origin to an host independent value will allow you to + reuse credentials across machines + + When using {command}`pamu2fcfg`, you can specify your + application ID with the `-o` flag. + + More information can be found [here](https://developers.yubico.com/pam-u2f/Manuals/pam_u2f.8.html) + ''; + }; + + debug = mkOption { + default = false; + type = types.bool; + description = '' + Debug output to stderr. + ''; + }; + + interactive = mkOption { + default = false; + type = types.bool; + description = '' + Set to prompt a message and wait before testing the presence of a U2F device. + Recommended if your device doesn’t have a tactile trigger. + ''; + }; + + cue = mkOption { + default = false; + type = types.bool; + description = '' + By default `pam-u2f` module does not inform user + that he needs to use the u2f device, it just waits without a prompt. + + If you set this option to `true`, + `cue` option is added to `pam-u2f` + module and reminder message will be displayed. + ''; + }; + }; + }; + default = { }; + example = { + authfile = "/etc/u2f_keys"; + authpending_file = ""; + userpresence = 0; + pinverification = 1; + }; + description = '' + Options to pass to the PAM module. + + ${moduleSettingsDescription} ''; }; }; diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index a3c0715c9e60..abb7925e0935 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -104,6 +104,9 @@ let --what="sleep" \ --why="Scheduled backup" \ '' + backupScript; + unitConfig = optionalAttrs (isLocalPath cfg.repo) { + RequiresMountsFor = [ cfg.repo ]; + }; serviceConfig = { User = cfg.user; Group = cfg.group; diff --git a/nixos/modules/services/backup/duplicity.nix b/nixos/modules/services/backup/duplicity.nix index 033d0cffd8d6..46625ec5460e 100644 --- a/nixos/modules/services/backup/duplicity.nix +++ b/nixos/modules/services/backup/duplicity.nix @@ -42,6 +42,28 @@ in ''; }; + includeFileList = mkOption { + type = types.nullOr types.path; + default = null; + example = /path/to/fileList.txt; + description = '' + File containing newline-separated list of paths to include into the + backups. See the FILE SELECTION section in {manpage}`duplicity(1)` for + details on the syntax. + ''; + }; + + excludeFileList = mkOption { + type = types.nullOr types.path; + default = null; + example = /path/to/fileList.txt; + description = '' + File containing newline-separated list of paths to exclude into the + backups. See the FILE SELECTION section in {manpage}`duplicity(1)` for + details on the syntax. + ''; + }; + targetUrl = mkOption { type = types.str; example = "s3://host:port/prefix"; @@ -154,6 +176,8 @@ in ${lib.optionalString (cfg.cleanup.maxIncr != null) "${dup} remove-all-inc-of-but-n-full ${toString cfg.cleanup.maxIncr} ${target} --force ${extra}"} exec ${dup} ${if cfg.fullIfOlderThan == "always" then "full" else "incr"} ${lib.escapeShellArgs ( [ cfg.root cfg.targetUrl ] + ++ lib.optionals (cfg.includeFileList != null) [ "--include-filelist" cfg.includeFileList ] + ++ lib.optionals (cfg.excludeFileList != null) [ "--exclude-filelist" cfg.excludeFileList ] ++ concatMap (p: [ "--include" p ]) cfg.include ++ concatMap (p: [ "--exclude" p ]) cfg.exclude ++ (lib.optionals (cfg.fullIfOlderThan != "never" && cfg.fullIfOlderThan != "always") [ "--full-if-older-than" cfg.fullIfOlderThan ]) diff --git a/nixos/modules/services/cluster/patroni/default.nix b/nixos/modules/services/cluster/patroni/default.nix index d1a165603fda..3b563bb89fff 100644 --- a/nixos/modules/services/cluster/patroni/default.nix +++ b/nixos/modules/services/cluster/patroni/default.nix @@ -10,6 +10,15 @@ let configFile = format.generate configFileName cfg.settings; in { + imports = [ + (lib.mkRemovedOptionModule [ "services" "patroni" "raft" ] '' + Raft has been deprecated by upstream. + '') + (lib.mkRemovedOptionModule [ "services" "patroni" "raftPort" ] '' + Raft has been deprecated by upstream. + '') + ]; + options.services.patroni = { enable = mkEnableOption "Patroni"; @@ -68,7 +77,7 @@ in type = types.path; default = "/var/lib/patroni"; description = '' - Folder where Patroni data will be written, used by Raft as well if enabled. + Folder where Patroni data will be written, this is where the pgpass password file will be written. ''; }; @@ -120,22 +129,6 @@ in ''; }; - raft = mkOption { - type = types.bool; - default = false; - description = '' - This will configure Patroni to use its own RAFT implementation instead of using a dedicated DCS. - ''; - }; - - raftPort = mkOption { - type = types.port; - default = 5010; - description = '' - The port on which RAFT listens. - ''; - }; - softwareWatchdog = mkOption { type = types.bool; default = false; @@ -178,12 +171,6 @@ in connect_address = "${cfg.nodeIp}:${toString cfg.restApiPort}"; }; - raft = mkIf cfg.raft { - data_dir = "${cfg.dataDir}/raft"; - self_addr = "${cfg.nodeIp}:5010"; - partner_addrs = map (ip: ip + ":5010") cfg.otherNodesIps; - }; - postgresql = { listen = "${cfg.nodeIp}:${toString cfg.postgresqlPort}"; connect_address = "${cfg.nodeIp}:${toString cfg.postgresqlPort}"; @@ -235,7 +222,7 @@ in KillMode = "process"; } (mkIf (cfg.postgresqlDataDir == "/var/lib/postgresql/${cfg.postgresqlPackage.psqlSchema}" && cfg.dataDir == "/var/lib/patroni") { - StateDirectory = "patroni patroni/raft postgresql postgresql/${cfg.postgresqlPackage.psqlSchema}"; + StateDirectory = "patroni postgresql postgresql/${cfg.postgresqlPackage.psqlSchema}"; StateDirectoryMode = "0750"; }) ]; @@ -251,7 +238,6 @@ in environment.systemPackages = [ pkgs.patroni cfg.postgresqlPackage - (mkIf cfg.raft pkgs.python310Packages.pysyncobj) ]; environment.etc."${configFileName}".source = configFile; diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 1771ca0b980b..c603aff38038 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -137,8 +137,10 @@ let "--builds-dir ${service.buildsDir}" ++ optional (service.cloneUrl != null) "--clone-url ${service.cloneUrl}" - ++ optional (service.preCloneScript != null) - "--pre-clone-script ${service.preCloneScript}" + ++ optional (service.preGetSourcesScript != null) + "--pre-get-sources-script ${service.preGetSourcesScript}" + ++ optional (service.postGetSourcesScript != null) + "--post-get-sources-script ${service.postGetSourcesScript}" ++ optional (service.preBuildScript != null) "--pre-build-script ${service.preBuildScript}" ++ optional (service.postBuildScript != null) @@ -495,13 +497,20 @@ in { Whitelist allowed services. ''; }; - preCloneScript = mkOption { + preGetSourcesScript = mkOption { type = types.nullOr types.path; default = null; description = '' Runner-specific command script executed before code is pulled. ''; }; + postGetSourcesScript = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Runner-specific command script executed after code is pulled. + ''; + }; preBuildScript = mkOption { type = types.nullOr types.path; default = null; diff --git a/nixos/modules/services/continuous-integration/woodpecker/agents.nix b/nixos/modules/services/continuous-integration/woodpecker/agents.nix index ce5926a246bb..b88bc6a0ccac 100644 --- a/nixos/modules/services/continuous-integration/woodpecker/agents.nix +++ b/nixos/modules/services/continuous-integration/woodpecker/agents.nix @@ -109,7 +109,7 @@ let }; in { - meta.maintainers = with lib.maintainers; [ janik ambroisie ]; + meta.maintainers = with lib.maintainers; [ ambroisie ]; options = { services.woodpecker-agents = { diff --git a/nixos/modules/services/continuous-integration/woodpecker/server.nix b/nixos/modules/services/continuous-integration/woodpecker/server.nix index 54d8da8a59e5..6e3cfb0b0114 100644 --- a/nixos/modules/services/continuous-integration/woodpecker/server.nix +++ b/nixos/modules/services/continuous-integration/woodpecker/server.nix @@ -8,7 +8,7 @@ let cfg = config.services.woodpecker-server; in { - meta.maintainers = with lib.maintainers; [ janik ambroisie ]; + meta.maintainers = with lib.maintainers; [ ambroisie ]; options = { diff --git a/nixos/modules/services/databases/monetdb.nix b/nixos/modules/services/databases/monetdb.nix index 5025eb30369b..ee24cf2b0fc2 100644 --- a/nixos/modules/services/databases/monetdb.nix +++ b/nixos/modules/services/databases/monetdb.nix @@ -6,7 +6,7 @@ let cfg = config.services.monetdb; in { - meta.maintainers = with maintainers; [ StillerHarpo primeos ]; + meta.maintainers = with maintainers; [ StillerHarpo ]; ###### interface options = { diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 0b871aa38183..e1de29ba3b59 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -21,8 +21,11 @@ in { history-service libusermetrics lomiri + lomiri-calculator-app + lomiri-clock-app lomiri-download-manager lomiri-filemanager-app + lomiri-polkit-agent lomiri-schemas # exposes some required dbus interfaces lomiri-session # wrappers to properly launch the session lomiri-sounds @@ -35,7 +38,7 @@ in { morph-browser qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session suru-icon-theme - # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043 + telephony-service ]); variables = { # To override the keyboard layouts in Lomiri @@ -84,7 +87,7 @@ in { ] ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [ ayatana-indicator-sound ]) ++ (with pkgs.lomiri; [ - # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043 + telephony-service ] ++ lib.optionals config.networking.networkmanager.enable [ lomiri-indicator-network ]); @@ -145,6 +148,18 @@ in { ExecStart = "${pkgs.lomiri.lomiri-url-dispatcher}/libexec/lomiri-url-dispatcher/lomiri-update-directory /run/current-system/sw/share/lomiri-url-dispatcher/urls/"; }; }; + + "lomiri-polkit-agent" = rec { + description = "Lomiri Polkit agent"; + wantedBy = [ "lomiri.service" "lomiri-full-greeter.service" "lomiri-full-shell.service" "lomiri-greeter.service" "lomiri-shell.service" ]; + after = [ "graphical-session.target" ]; + partOf = wantedBy; + serviceConfig = { + Type = "simple"; + Restart = "always"; + ExecStart = "${pkgs.lomiri.lomiri-polkit-agent}/libexec/lomiri-polkit-agent/policykit-agent"; + }; + }; }; systemd.services = { diff --git a/nixos/modules/services/desktops/espanso.nix b/nixos/modules/services/desktops/espanso.nix index a6b8a078247b..a2c4b77b9046 100644 --- a/nixos/modules/services/desktops/espanso.nix +++ b/nixos/modules/services/desktops/espanso.nix @@ -8,6 +8,7 @@ in { options = { services.espanso = { enable = mkEnableOption "Espanso"; + wayland = mkEnableOption "use the Wayland compatible espanso package"; package = mkPackageOption pkgs "espanso" { example = "pkgs.espanso-wayland"; }; diff --git a/nixos/modules/services/desktops/gnome/gnome-keyring.nix b/nixos/modules/services/desktops/gnome/gnome-keyring.nix index 02b198fd81cb..550c6ba8eff5 100644 --- a/nixos/modules/services/desktops/gnome/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome/gnome-keyring.nix @@ -26,33 +26,22 @@ in }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.gnome.gnome-keyring ]; + environment.systemPackages = [ pkgs.gnome-keyring ]; services.dbus.packages = [ - pkgs.gnome.gnome-keyring + pkgs.gnome-keyring pkgs.gcr ]; - xdg.portal.extraPortals = [ pkgs.gnome.gnome-keyring ]; + xdg.portal.extraPortals = [ pkgs.gnome-keyring ]; - security.pam.services = lib.mkMerge [ - { - login.enableGnomeKeyring = true; - } - (lib.mkIf config.services.xserver.displayManager.gdm.enable { - gdm-password.enableGnomeKeyring = true; - gdm-autologin.enableGnomeKeyring = true; - }) - (lib.mkIf (config.services.xserver.displayManager.gdm.enable && config.services.fprintd.enable) { - gdm-fingerprint.enableGnomeKeyring = true; - }) - ]; + security.pam.services.login.enableGnomeKeyring = true; security.wrappers.gnome-keyring-daemon = { owner = "root"; group = "root"; capabilities = "cap_ipc_lock=ep"; - source = "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon"; + source = "${pkgs.gnome-keyring}/bin/gnome-keyring-daemon"; }; }; } diff --git a/nixos/modules/services/desktops/gnome/gnome-user-share.nix b/nixos/modules/services/desktops/gnome/gnome-user-share.nix index 2c6d94b7bdfc..518beb80419a 100644 --- a/nixos/modules/services/desktops/gnome/gnome-user-share.nix +++ b/nixos/modules/services/desktops/gnome/gnome-user-share.nix @@ -26,11 +26,11 @@ config = lib.mkIf config.services.gnome.gnome-user-share.enable { environment.systemPackages = [ - pkgs.gnome.gnome-user-share + pkgs.gnome-user-share ]; systemd.packages = [ - pkgs.gnome.gnome-user-share + pkgs.gnome-user-share ]; }; diff --git a/nixos/modules/services/desktops/gnome/rygel.nix b/nixos/modules/services/desktops/gnome/rygel.nix index c980b239d521..7ce7e079b6af 100644 --- a/nixos/modules/services/desktops/gnome/rygel.nix +++ b/nixos/modules/services/desktops/gnome/rygel.nix @@ -23,12 +23,12 @@ ###### implementation config = lib.mkIf config.services.gnome.rygel.enable { - environment.systemPackages = [ pkgs.gnome.rygel ]; + environment.systemPackages = [ pkgs.rygel ]; - services.dbus.packages = [ pkgs.gnome.rygel ]; + services.dbus.packages = [ pkgs.rygel ]; - systemd.packages = [ pkgs.gnome.rygel ]; + systemd.packages = [ pkgs.rygel ]; - environment.etc."rygel.conf".source = "${pkgs.gnome.rygel}/etc/rygel.conf"; + environment.etc."rygel.conf".source = "${pkgs.rygel}/etc/rygel.conf"; }; } diff --git a/nixos/modules/services/desktops/gnome/sushi.nix b/nixos/modules/services/desktops/gnome/sushi.nix index 946030e4bb22..7f7360488eb4 100644 --- a/nixos/modules/services/desktops/gnome/sushi.nix +++ b/nixos/modules/services/desktops/gnome/sushi.nix @@ -31,9 +31,9 @@ config = lib.mkIf config.services.gnome.sushi.enable { - environment.systemPackages = [ pkgs.gnome.sushi ]; + environment.systemPackages = [ pkgs.sushi ]; - services.dbus.packages = [ pkgs.gnome.sushi ]; + services.dbus.packages = [ pkgs.sushi ]; }; diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index 78f627d33e2d..2914877bdccd 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -93,13 +93,17 @@ in maxAttachmentSize = mkOption { type = types.int; default = 18; + apply = configuredMaxAttachmentSize: "${toString (configuredMaxAttachmentSize * 1.37)}M"; description = '' The maximum attachment size in MB. - - Note: Since roundcube only uses 70% of max upload values configured in php - 30% is added automatically to [](#opt-services.roundcube.maxAttachmentSize). + [upstream issue comment]: https://github.com/roundcube/roundcubemail/issues/7979#issuecomment-808879209 + ::: {.note} + Since there is some overhead in base64 encoding applied to attachments, + 37% will be added + to the value set in this option in order to offset the overhead. For example, setting + `maxAttachmentSize` to `100` would result in `137M` being the real value in the configuration. + See [upstream issue comment] for more details on the motivations behind this. + ::: ''; - apply = configuredMaxAttachmentSize: "${toString (configuredMaxAttachmentSize * 1.3)}M"; }; configureNginx = lib.mkOption { diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix index 776243a68af5..1025788f0d84 100644 --- a/nixos/modules/services/mail/stalwart-mail.nix +++ b/nixos/modules/services/mail/stalwart-mail.nix @@ -9,12 +9,28 @@ let dataDir = "/var/lib/stalwart-mail"; useLegacyStorage = versionOlder config.system.stateVersion "24.11"; + parsePorts = listeners: let + parseAddresses = listeners: lib.flatten(lib.mapAttrsToList (name: value: value.bind) listeners); + splitAddress = addr: strings.splitString ":" addr; + extractPort = addr: strings.toInt(builtins.foldl' (a: b: b) "" (splitAddress addr)); + in + builtins.map(address: extractPort address) (parseAddresses listeners); + in { options.services.stalwart-mail = { enable = mkEnableOption "the Stalwart all-in-one email server"; package = mkPackageOption pkgs "stalwart-mail" { }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open TCP firewall ports, which are specified in + {option}`services.stalwart-mail.settings.listener` on all interfaces. + ''; + }; + settings = mkOption { inherit (configFormat) type; default = { }; @@ -138,6 +154,11 @@ in { # Make admin commands available in the shell environment.systemPackages = [ cfg.package ]; + + networking.firewall = mkIf (cfg.openFirewall + && (builtins.hasAttr "listener" cfg.settings.server)) { + allowedTCPPorts = parsePorts cfg.settings.server.listener; + }; }; meta = { diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix index 8cb51bb0b7a7..6660d5e977ff 100644 --- a/nixos/modules/services/misc/dictd.nix +++ b/nixos/modules/services/misc/dictd.nix @@ -62,6 +62,9 @@ in description = "DICT.org Dictionary Server"; wantedBy = [ "multi-user.target" ]; environment = { LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; }; + # Work around the fact that dictd doesn't handle SIGTERM; it terminates + # with code 143 instead of exiting with code 0. + serviceConfig.SuccessExitStatus = [ 143 ]; serviceConfig.Type = "forking"; script = "${pkgs.dict}/sbin/dictd -s -c ${dictdb}/share/dictd/dictd.conf --locale en_US.UTF-8"; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 7b96a182f0d9..492c669f180a 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -12,7 +12,7 @@ let postgresqlPackage = if config.services.postgresql.enable then config.services.postgresql.package else - pkgs.postgresql_13; + pkgs.postgresql_14; gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket"; gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket"; @@ -1119,8 +1119,8 @@ in { message = "services.gitlab.secrets.jwsFile must be set!"; } { - assertion = versionAtLeast postgresqlPackage.version "13.6.0"; - message = "PostgreSQL >=13.6 is required to run GitLab 16. Follow the instructions in the manual section for upgrading PostgreSQL here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading"; + assertion = versionAtLeast postgresqlPackage.version "14.9"; + message = "PostgreSQL >= 14.9 is required to run GitLab 17. Follow the instructions in the manual section for upgrading PostgreSQL here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading"; } ]; @@ -1282,6 +1282,7 @@ in { "d ${gitlabConfig.production.shared.path}/registry 0750 ${cfg.user} ${cfg.group} -" "d ${gitlabConfig.production.shared.path}/terraform_state 0750 ${cfg.user} ${cfg.group} -" "d ${gitlabConfig.production.shared.path}/ci_secure_files 0750 ${cfg.user} ${cfg.group} -" + "d ${gitlabConfig.production.shared.path}/external-diffs 0750 ${cfg.user} ${cfg.group} -" "L+ /run/gitlab/config - - - - ${cfg.statePath}/config" "L+ /run/gitlab/log - - - - ${cfg.statePath}/log" "L+ /run/gitlab/tmp - - - - ${cfg.statePath}/tmp" diff --git a/nixos/modules/services/misc/jellyseerr.nix b/nixos/modules/services/misc/jellyseerr.nix index 7599a1af3384..9aab517e0493 100644 --- a/nixos/modules/services/misc/jellyseerr.nix +++ b/nixos/modules/services/misc/jellyseerr.nix @@ -9,6 +9,7 @@ in options.services.jellyseerr = { enable = mkEnableOption ''Jellyseerr, a requests manager for Jellyfin''; + package = mkPackageOption pkgs "jellyseerr" { }; openFirewall = mkOption { type = types.bool; @@ -32,10 +33,10 @@ in serviceConfig = { Type = "exec"; StateDirectory = "jellyseerr"; - WorkingDirectory = "${pkgs.jellyseerr}/libexec/jellyseerr/deps/jellyseerr"; + WorkingDirectory = "${cfg.package}/libexec/jellyseerr/deps/jellyseerr"; DynamicUser = true; - ExecStart = "${pkgs.jellyseerr}/bin/jellyseerr"; - BindPaths = [ "/var/lib/jellyseerr/:${pkgs.jellyseerr}/libexec/jellyseerr/deps/jellyseerr/config/" ]; + ExecStart = lib.getExe cfg.package; + BindPaths = [ "/var/lib/jellyseerr/:${cfg.package}/libexec/jellyseerr/deps/jellyseerr/config/" ]; Restart = "on-failure"; ProtectHome = true; ProtectSystem = "strict"; diff --git a/nixos/modules/services/misc/languagetool.nix b/nixos/modules/services/misc/languagetool.nix index ba563dace473..2a7e68c9053a 100644 --- a/nixos/modules/services/misc/languagetool.nix +++ b/nixos/modules/services/misc/languagetool.nix @@ -1,14 +1,17 @@ -{ config, lib, options, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; let cfg = config.services.languagetool; - settingsFormat = pkgs.formats.javaProperties {}; -in { + settingsFormat = pkgs.formats.javaProperties { }; +in +{ options.services.languagetool = { enable = mkEnableOption "the LanguageTool server, a multilingual spelling, style, and grammar checker that helps correct or paraphrase texts"; + package = mkPackageOption pkgs "languagetool" { }; + port = mkOption { type = types.port; default = 8081; @@ -31,7 +34,7 @@ in { ''; }; - settings = lib.mkOption { + settings = mkOption { type = types.submodule { freeformType = settingsFormat.type; @@ -49,11 +52,25 @@ in { for supported settings. ''; }; + + jrePackage = mkPackageOption pkgs "jre" { }; + + jvmOptions = mkOption { + description = '' + Extra command line options for the JVM running languagetool. + More information can be found here: https://docs.oracle.com/en/java/javase/19/docs/specs/man/java.html#standard-options-for-java + ''; + default = [ ]; + type = types.listOf types.str; + example = [ + "-Xmx512m" + ]; + }; }; config = mkIf cfg.enable { - systemd.services.languagetool = { + systemd.services.languagetool = { description = "LanguageTool HTTP server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; @@ -65,13 +82,17 @@ in { RestrictNamespaces = [ "" ]; SystemCallFilter = [ "@system-service" "~ @privileged" ]; ProtectHome = "yes"; + Restart = "on-failure"; ExecStart = '' - ${pkgs.languagetool}/bin/languagetool-http-server \ - --port ${toString cfg.port} \ - ${optionalString cfg.public "--public"} \ - ${optionalString (cfg.allowOrigin != null) "--allow-origin ${cfg.allowOrigin}"} \ - "--config" ${settingsFormat.generate "languagetool.conf" cfg.settings} - ''; + ${cfg.jrePackage}/bin/java \ + -cp ${cfg.package}/share/languagetool-server.jar \ + ${toString cfg.jvmOptions} \ + org.languagetool.server.HTTPServer \ + --port ${toString cfg.port} \ + ${optionalString cfg.public "--public"} \ + ${optionalString (cfg.allowOrigin != null) "--allow-origin ${cfg.allowOrigin}"} \ + "--config" ${settingsFormat.generate "languagetool.conf" cfg.settings} + ''; }; }; }; diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index c460514783ef..a0a32f1702bf 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -5,9 +5,6 @@ let cfg = config.services.ollama; ollamaPackage = cfg.package.override { inherit (cfg) acceleration; - linuxPackages = config.boot.kernelPackages // { - nvidia_x11 = config.hardware.nvidia.package; - }; }; in { diff --git a/nixos/modules/services/misc/renovate.nix b/nixos/modules/services/misc/renovate.nix index 25a719c91cbd..9062b7424b68 100644 --- a/nixos/modules/services/misc/renovate.nix +++ b/nixos/modules/services/misc/renovate.nix @@ -128,6 +128,7 @@ in RestrictAddressFamilies = [ "AF_INET" "AF_INET6" + "AF_UNIX" ]; RestrictNamespaces = true; RestrictRealtime = true; diff --git a/nixos/modules/services/misc/rkvm.nix b/nixos/modules/services/misc/rkvm.nix index 9d41669e00f6..b149c3d3979f 100644 --- a/nixos/modules/services/misc/rkvm.nix +++ b/nixos/modules/services/misc/rkvm.nix @@ -7,7 +7,7 @@ let toml = pkgs.formats.toml { }; in { - meta.maintainers = with maintainers; [ ckie ]; + meta.maintainers = with maintainers; [ ]; options.services.rkvm = { enable = mkOption { diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix index 1b16ef7958ad..fc57683de328 100644 --- a/nixos/modules/services/misc/snapper.nix +++ b/nixos/modules/services/misc/snapper.nix @@ -96,48 +96,48 @@ let }; TIMELINE_LIMIT_HOURLY = mkOption { - type = types.str; - default = "10"; + type = types.int; + default = 10; description = '' Limits for timeline cleanup. ''; }; TIMELINE_LIMIT_DAILY = mkOption { - type = types.str; - default = "10"; + type = types.int; + default = 10; description = '' Limits for timeline cleanup. ''; }; TIMELINE_LIMIT_WEEKLY = mkOption { - type = types.str; - default = "0"; + type = types.int; + default = 0; description = '' Limits for timeline cleanup. ''; }; TIMELINE_LIMIT_MONTHLY = mkOption { - type = types.str; - default = "10"; + type = types.int; + default = 10; description = '' Limits for timeline cleanup. ''; }; TIMELINE_LIMIT_QUARTERLY = mkOption { - type = types.str; - default = "0"; + type = types.int; + default = 0; description = '' Limits for timeline cleanup. ''; }; TIMELINE_LIMIT_YEARLY = mkOption { - type = types.str; - default = "10"; + type = types.int; + default = 10; description = '' Limits for timeline cleanup. ''; @@ -353,4 +353,6 @@ in ) (attrNames cfg.configs); } ); + + meta.maintainers = with lib.maintainers; [ Djabx ]; } diff --git a/nixos/modules/services/misc/sonarr.nix b/nixos/modules/services/misc/sonarr.nix index 228a2d48f5a9..60e73198d60d 100644 --- a/nixos/modules/services/misc/sonarr.nix +++ b/nixos/modules/services/misc/sonarr.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, utils, ... }: with lib; @@ -54,7 +54,11 @@ in Type = "simple"; User = cfg.user; Group = cfg.group; - ExecStart = "${cfg.package}/bin/NzbDrone -nobrowser -data='${cfg.dataDir}'"; + ExecStart = utils.escapeSystemdExecArgs [ + (lib.getExe cfg.package) + "-nobrowser" + "-data=${cfg.dataDir}" + ]; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index d09cd87febff..8db63d538633 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -202,10 +202,10 @@ in { ]; services = { - fcgiwrap = lib.mkIf useNginx { - enable = true; - preforkProcesses = cfg.cameras; - inherit user group; + fcgiwrap.zoneminder = lib.mkIf useNginx { + process.prefork = cfg.cameras; + process.user = user; + process.group = group; }; mysql = lib.mkIf cfg.database.createLocally { @@ -225,9 +225,7 @@ in { default = true; root = "${pkg}/share/zoneminder/www"; listen = [ { addr = "0.0.0.0"; inherit (cfg) port; } ]; - extraConfig = let - fcgi = config.services.fcgiwrap; - in '' + extraConfig = '' index index.php; location / { @@ -257,7 +255,7 @@ in { fastcgi_param HTTP_PROXY ""; fastcgi_intercept_errors on; - fastcgi_pass ${fcgi.socketType}:${fcgi.socketAddress}; + fastcgi_pass unix:${config.services.fcgiwrap.zoneminder.socket.address}; } location /cache/ { diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 32919950adc1..eae2658b7ffb 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -105,7 +105,7 @@ let }; url = mkOption { type = types.str; - default = "localhost"; + default = ""; description = "Url of the datasource."; }; editable = mkOption { diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager-webhook-logger.nix b/nixos/modules/services/monitoring/prometheus/alertmanager-webhook-logger.nix index b4307a76e1b0..b3665b66ba40 100644 --- a/nixos/modules/services/monitoring/prometheus/alertmanager-webhook-logger.nix +++ b/nixos/modules/services/monitoring/prometheus/alertmanager-webhook-logger.nix @@ -32,9 +32,15 @@ in ${escapeShellArgs cfg.extraFlags} ''; + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "" ]; DynamicUser = true; NoNewPrivileges = true; + MemoryDenyWriteExecute = true; + + LockPersonality = true; + ProtectProc = "invisible"; ProtectSystem = "strict"; ProtectHome = "tmpfs"; @@ -43,6 +49,8 @@ in PrivateDevices = true; PrivateIPC = true; + ProcSubset = "pid"; + ProtectHostname = true; ProtectClock = true; ProtectKernelTunables = true; @@ -50,7 +58,10 @@ in ProtectKernelLogs = true; ProtectControlGroups = true; + Restart = "on-failure"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix index d1d8f2caaf63..f40ac3c9138f 100644 --- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -181,15 +181,57 @@ in { -i "${alertmanagerYml}" ''; serviceConfig = { - Restart = "always"; - StateDirectory = "alertmanager"; - DynamicUser = true; # implies PrivateTmp - EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; - WorkingDirectory = "/tmp"; ExecStart = "${cfg.package}/bin/alertmanager" + optionalString (length cmdlineArgs != 0) (" \\\n " + concatStringsSep " \\\n " cmdlineArgs); ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; + + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "" ]; + DynamicUser = true; + NoNewPrivileges = true; + + MemoryDenyWriteExecute = true; + + LockPersonality = true; + + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ProtectHome = "tmpfs"; + + PrivateTmp = true; + PrivateDevices = true; + PrivateIPC = true; + + ProcSubset = "pid"; + + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + + Restart = "always"; + + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_NETLINK" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + + StateDirectory = "alertmanager"; + SystemCallFilter = [ + "@system-service" + "~@cpu-emulation" + "~@privileged" + "~@reboot" + "~@setuid" + "~@swap" + ]; + + WorkingDirectory = "/tmp"; }; }; }) diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index dc357f6cc5fb..0a9d4ef98522 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -29,6 +29,7 @@ let "blackbox" "buildkite-agent" "collectd" + "deluge" "dmarc" "dnsmasq" "dnssec" @@ -408,6 +409,14 @@ in Please ensure you have either `services.prometheus.exporters.idrac.configuration' or `services.prometheus.exporters.idrac.configurationPath' set! ''; + } { + assertion = cfg.deluge.enable -> ( + (cfg.deluge.delugePassword == null) != (cfg.deluge.delugePasswordFile == null) + ); + message = '' + Please ensure you have either `services.prometheus.exporters.deluge.delugePassword' + or `services.prometheus.exporters.deluge.delugePasswordFile' set! + ''; } ] ++ (flip map (attrNames exporterOpts) (exporter: { assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall; message = '' @@ -437,6 +446,13 @@ in hardware.rtl-sdr.enable = mkDefault true; })] ++ [(mkIf config.services.postfix.enable { services.prometheus.exporters.postfix.group = mkDefault config.services.postfix.setgidGroup; + })] ++ [(mkIf config.services.prometheus.exporters.deluge.enable { + system.activationScripts = { + deluge-exported.text = '' + mkdir -p /etc/deluge-exporter + echo "DELUGE_PASSWORD=$(cat ${config.services.prometheus.exporters.deluge.delugePasswordFile})" > /etc/deluge-exporter/password + ''; + }; })] ++ (mapAttrsToList (name: conf: mkExporterConf { inherit name; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix b/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix new file mode 100644 index 000000000000..5943b46eeb5f --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix @@ -0,0 +1,85 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.prometheus.exporters.deluge; + inherit (lib) mkOption types concatStringsSep; +in +{ + port = 9354; + + extraOpts = { + delugeHost = mkOption { + type = types.str; + default = "localhost"; + description = '' + Hostname where deluge server is running. + ''; + }; + + delugePort = mkOption { + type = types.port; + default = 58846; + description = '' + Port where deluge server is listening. + ''; + }; + + delugeUser = mkOption { + type = types.str; + default = "localclient"; + description = '' + User to connect to deluge server. + ''; + }; + + delugePassword = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Password to connect to deluge server. + + This stores the password unencrypted in the nix store and is thus considered unsafe. Prefer + using the delugePasswordFile option. + ''; + }; + + delugePasswordFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + File containing the password to connect to deluge server. + ''; + }; + + exportPerTorrentMetrics = mkOption { + type = types.bool; + default = false; + description = '' + Enable per-torrent metrics. + + This may significantly increase the number of time series depending on the number of + torrents in your Deluge instance. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-deluge-exporter}/bin/deluge-exporter + ''; + Environment = [ + "LISTEN_PORT=${toString cfg.port}" + "LISTEN_ADDRESS=${toString cfg.listenAddress}" + + "DELUGE_HOST=${cfg.delugeHost}" + "DELUGE_USER=${cfg.delugeUser}" + "DELUGE_PORT=${toString cfg.delugePort}" + ] ++ lib.optionals (cfg.delugePassword != null) [ + "DELUGE_PASSWORD=${cfg.delugePassword}" + ] ++ lib.optionals cfg.exportPerTorrentMetrics [ + "PER_TORRENT_METRICS=1" + ]; + EnvironmentFile = lib.optionalString (cfg.delugePasswordFile != null) "/etc/deluge-exporter/password"; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix b/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix index 097ea3959478..e470ebe2eb59 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix @@ -1,17 +1,20 @@ -{ config -, lib -, pkgs -, options -, ... +{ + config, + lib, + pkgs, + utils, + ... }: let inherit (lib) - escapeShellArgs + getExe mkOption optionals types - ; + ; + + inherit (utils) escapeSystemdExecArgs; cfg = config.services.prometheus.exporters.fastly; in @@ -39,17 +42,19 @@ in serviceOpts = { serviceConfig = { LoadCredential = "fastly-api-token:${cfg.tokenPath}"; + Environment = [ "FASTLY_API_TOKEN=%d/fastly-api-token" ]; + ExecStart = escapeSystemdExecArgs ( + [ + (getExe pkgs.prometheus-fastly-exporter) + "-listen" + "${cfg.listenAddress}:${toString cfg.port}" + ] + ++ optionals (cfg.configFile != null) [ + "--config-file" + cfg.configFile + ] + ++ cfg.extraFlags + ); }; - script = let - call = escapeShellArgs ([ - "${pkgs.prometheus-fastly-exporter}/bin/fastly-exporter" - "-listen" "${cfg.listenAddress}:${toString cfg.port}" - ] ++ optionals (cfg.configFile != null) [ - "--config-file" cfg.configFile - ] ++ cfg.extraFlags); - in '' - export FASTLY_API_TOKEN="$(cat $CREDENTIALS_DIRECTORY/fastly-api-token)" - ${call} - ''; }; } diff --git a/nixos/modules/services/monitoring/prometheus/pushgateway.nix b/nixos/modules/services/monitoring/prometheus/pushgateway.nix index 80e2339f5925..d4f9c4a29f38 100644 --- a/nixos/modules/services/monitoring/prometheus/pushgateway.nix +++ b/nixos/modules/services/monitoring/prometheus/pushgateway.nix @@ -147,12 +147,52 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - Restart = "always"; - DynamicUser = true; ExecStart = "${cfg.package}/bin/pushgateway" + optionalString (length cmdlineArgs != 0) (" \\\n " + concatStringsSep " \\\n " cmdlineArgs); + + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "" ]; + DynamicUser = true; + NoNewPrivileges = true; + + MemoryDenyWriteExecute = true; + + LockPersonality = true; + + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ProtectHome = "tmpfs"; + + PrivateTmp = true; + PrivateDevices = true; + PrivateIPC = true; + + ProcSubset = "pid"; + + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + + Restart = "always"; + + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + StateDirectory = if cfg.persistMetrics then cfg.stateDir else null; + SystemCallFilter = [ + "@system-service" + "~@cpu-emulation" + "~@privileged" + "~@reboot" + "~@setuid" + "~@swap" + ]; }; }; }; diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index 2c05eaad25ac..6fd3b5707ab6 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -10,6 +10,7 @@ let opt = options.services.smartd; nm = cfg.notifications.mail; + ns = cfg.notifications.systembus-notify; nw = cfg.notifications.wall; nx = cfg.notifications.x11; @@ -28,6 +29,12 @@ let ${pkgs.smartmontools}/sbin/smartctl -a -d "$SMARTD_DEVICETYPE" "$SMARTD_DEVICE" } | ${nm.mailer} -i "${nm.recipient}" ''} + ${optionalString ns.enable '' + ${pkgs.dbus}/bin/dbus-send --system \ + / net.nuetzlich.SystemNotifications.Notify \ + "string:Problem detected with disk: $SMARTD_DEVICESTRING" \ + "string:Warning message from smartd is: $SMARTD_MESSAGE" + ''} ${optionalString nw.enable '' { ${pkgs.coreutils}/bin/cat << EOF @@ -159,6 +166,24 @@ in }; }; + systembus-notify = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whenever to send systembus-notify notifications. + + WARNING: enabling this option (while convenient) should *not* be done on a + machine where you do not trust the other users as it allows any other + local user to DoS your session by spamming notifications. + + To actually see the notifications in your GUI session, you need to have + `systembus-notify` running as your user, which this + option handles by enabling {option}`services.systembus-notify`. + ''; + }; + }; + wall = { enable = mkOption { default = true; @@ -247,6 +272,8 @@ in serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}"; }; + services.systembus-notify.enable = mkDefault ns.enable; + }; } diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index c70d0cf7beac..a887f964ca42 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -55,6 +55,7 @@ let PIDFile = "/run/${appName}.pid"; Type = "notify"; NotifyAccess = "all"; #may not do anything... + Slice = "system-samba.slice"; }; unitConfig.RequiresMountsFor = "/var/lib/samba"; @@ -216,6 +217,11 @@ in wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; }; + + slices.system-samba = { + description = "Samba slice"; + }; + # Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd # for correct use with systemd services = { diff --git a/nixos/modules/services/networking/bee.nix b/nixos/modules/services/networking/bee.nix index da11ac9399ab..72483c41d02d 100644 --- a/nixos/modules/services/networking/bee.nix +++ b/nixos/modules/services/networking/bee.nix @@ -101,8 +101,7 @@ in { preStart = with cfg.settings; '' if ! test -f ${password-file}; then - < /dev/urandom tr -dc _A-Z-a-z-0-9 2> /dev/null | head -c32 > ${password-file} - chmod 0600 ${password-file} + < /dev/urandom tr -dc _A-Z-a-z-0-9 2> /dev/null | head -c32 | install -m 600 /dev/stdin ${password-file} echo "Initialized ${password-file} from /dev/urandom" fi if [ ! -f ${data-dir}/keys/libp2p.key ]; then diff --git a/nixos/modules/services/networking/blocky.nix b/nixos/modules/services/networking/blocky.nix index b98c8b7bdb73..4bc6ffa3f46a 100644 --- a/nixos/modules/services/networking/blocky.nix +++ b/nixos/modules/services/networking/blocky.nix @@ -12,6 +12,8 @@ in options.services.blocky = { enable = mkEnableOption "blocky, a fast and lightweight DNS proxy as ad-blocker for local network with many features"; + package = mkPackageOption pkgs "blocky" { }; + settings = mkOption { type = format.type; default = { }; @@ -30,7 +32,7 @@ in serviceConfig = { DynamicUser = true; - ExecStart = "${pkgs.blocky}/bin/blocky --config ${configFile}"; + ExecStart = "${getExe cfg.package} --config ${configFile}"; Restart = "on-failure"; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; diff --git a/nixos/modules/services/networking/cgit.nix b/nixos/modules/services/networking/cgit.nix index 0ccbef756812..de8128ed5a59 100644 --- a/nixos/modules/services/networking/cgit.nix +++ b/nixos/modules/services/networking/cgit.nix @@ -25,14 +25,14 @@ let regexLocation = cfg: regexEscape (stripLocation cfg); - mkFastcgiPass = cfg: '' + mkFastcgiPass = name: cfg: '' ${if cfg.nginx.location == "/" then '' fastcgi_param PATH_INFO $uri; '' else '' fastcgi_split_path_info ^(${regexLocation cfg})(/.+)$; fastcgi_param PATH_INFO $fastcgi_path_info; '' - }fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; + }fastcgi_pass unix:${config.services.fcgiwrap."cgit-${name}".socket.address}; ''; cgitrcLine = name: value: "${name}=${ @@ -72,25 +72,11 @@ let ${cfg.extraConfig} ''; - mkCgitReposDir = cfg: - if cfg.scanPath != null then - cfg.scanPath - else - pkgs.runCommand "cgit-repos" { - preferLocalBuild = true; - allowSubstitutes = false; - } '' - mkdir -p "$out" - ${ - concatStrings ( - mapAttrsToList - (name: value: '' - ln -s ${escapeShellArg value.path} "$out"/${escapeShellArg name} - '') - cfg.repos - ) - } - ''; + fcgiwrapUnitName = name: "fcgiwrap-cgit-${name}"; + fcgiwrapRuntimeDir = name: "/run/${fcgiwrapUnitName name}"; + gitProjectRoot = name: cfg: if cfg.scanPath != null + then cfg.scanPath + else "${fcgiwrapRuntimeDir name}/repos"; in { @@ -154,6 +140,18 @@ in type = types.lines; default = ""; }; + + user = mkOption { + description = "User to run the cgit service as."; + type = types.str; + default = "cgit"; + }; + + group = mkOption { + description = "Group to run the cgit service as."; + type = types.str; + default = "cgit"; + }; }; })); }; @@ -165,18 +163,46 @@ in message = "Exactly one of services.cgit.${vhost}.scanPath or services.cgit.${vhost}.repos must be set."; }) cfgs; - services.fcgiwrap.enable = true; + users = mkMerge (flip mapAttrsToList cfgs (_: cfg: { + users.${cfg.user} = { + isSystemUser = true; + inherit (cfg) group; + }; + groups.${cfg.group} = { }; + })); + + services.fcgiwrap = flip mapAttrs' cfgs (name: cfg: + nameValuePair "cgit-${name}" { + process = { inherit (cfg) user group; }; + socket = { inherit (config.services.nginx) user group; }; + } + ); + + systemd.services = flip mapAttrs' cfgs (name: cfg: + nameValuePair (fcgiwrapUnitName name) + (mkIf (cfg.repos != { }) { + serviceConfig.RuntimeDirectory = fcgiwrapUnitName name; + preStart = '' + GIT_PROJECT_ROOT=${escapeShellArg (gitProjectRoot name cfg)} + mkdir -p "$GIT_PROJECT_ROOT" + cd "$GIT_PROJECT_ROOT" + ${concatLines (flip mapAttrsToList cfg.repos (name: repo: '' + ln -s ${escapeShellArg repo.path} ${escapeShellArg name} + ''))} + ''; + } + )); services.nginx.enable = true; - services.nginx.virtualHosts = mkMerge (mapAttrsToList (_: cfg: { + services.nginx.virtualHosts = mkMerge (mapAttrsToList (name: cfg: { ${cfg.nginx.virtualHost} = { locations = ( genAttrs' [ "cgit.css" "cgit.png" "favicon.ico" "robots.txt" ] - (name: nameValuePair "= ${stripLocation cfg}/${name}" { + (fileName: nameValuePair "= ${stripLocation cfg}/${fileName}" { extraConfig = '' - alias ${cfg.package}/cgit/${name}; + alias ${cfg.package}/cgit/${fileName}; ''; }) ) // { @@ -184,10 +210,10 @@ in fastcgiParams = rec { SCRIPT_FILENAME = "${pkgs.git}/libexec/git-core/git-http-backend"; GIT_HTTP_EXPORT_ALL = "1"; - GIT_PROJECT_ROOT = mkCgitReposDir cfg; + GIT_PROJECT_ROOT = gitProjectRoot name cfg; HOME = GIT_PROJECT_ROOT; }; - extraConfig = mkFastcgiPass cfg; + extraConfig = mkFastcgiPass name cfg; }; "${stripLocation cfg}/" = { fastcgiParams = { @@ -196,7 +222,7 @@ in HTTP_HOST = "$server_name"; CGIT_CONFIG = mkCgitrc cfg; }; - extraConfig = mkFastcgiPass cfg; + extraConfig = mkFastcgiPass name cfg; }; }; }; diff --git a/nixos/modules/services/networking/cloudflare-dyndns.nix b/nixos/modules/services/networking/cloudflare-dyndns.nix index ab5b1a08539a..a15de2ddd861 100644 --- a/nixos/modules/services/networking/cloudflare-dyndns.nix +++ b/nixos/modules/services/networking/cloudflare-dyndns.nix @@ -28,6 +28,16 @@ in ''; }; + frequency = mkOption { + type = types.nullOr types.str; + default = "*:0/5"; + description = '' + Run cloudflare-dyndns with the given frequency (see + {manpage}`systemd.time(7)` for the format). + If null, do not run automatically. + ''; + }; + proxied = mkOption { type = types.bool; default = false; @@ -67,7 +77,6 @@ in description = "CloudFlare Dynamic DNS Client"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - startAt = "*:0/5"; environment = { CLOUDFLARE_DOMAINS = toString cfg.domains; @@ -88,6 +97,8 @@ in in "${pkgs.cloudflare-dyndns}/bin/cloudflare-dyndns ${toString args}"; }; + } // optionalAttrs (cfg.frequency != null) { + startAt = cfg.frequency; }; }; } diff --git a/nixos/modules/services/networking/cloudflared.nix b/nixos/modules/services/networking/cloudflared.nix index 60f6b7c46689..c0d1012ffb80 100644 --- a/nixos/modules/services/networking/cloudflared.nix +++ b/nixos/modules/services/networking/cloudflared.nix @@ -131,7 +131,7 @@ let `cloudflared` starts a proxy server to translate HTTP traffic into TCP when proxying, for example, SSH or RDP. This configures what type of proxy will be started. Valid options are: - `""` for the regular proxy - - `"socks"` for a SOCKS5 proxy. Refer to the [https://developers.cloudflare.com/cloudflare-one/tutorials/kubectl/](tutorial on connecting through Cloudflare Access using kubectl) for more information. + - `"socks"` for a SOCKS5 proxy. Refer to the [tutorial on connecting through Cloudflare Access using kubectl](https://developers.cloudflare.com/cloudflare-one/tutorials/kubectl/) for more information. ''; }; }; @@ -167,7 +167,7 @@ in description = '' Credential file. - See [https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/tunnel-useful-terms/#credentials-file](Credentials file). + See [Credentials file](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/tunnel-useful-terms/#credentials-file). ''; }; @@ -178,7 +178,7 @@ in description = '' Enable warp routing. - See [https://developers.cloudflare.com/cloudflare-one/tutorials/warp-to-tunnel/](Connect from WARP to a private network on Cloudflare using Cloudflare Tunnel). + See [Connect from WARP to a private network on Cloudflare using Cloudflare Tunnel](https://developers.cloudflare.com/cloudflare-one/tutorials/warp-to-tunnel/). ''; }; }; @@ -204,7 +204,7 @@ in description = '' Service to pass the traffic. - See [https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/configuration/local-management/ingress/#supported-protocols](Supported protocols). + See [Supported protocols](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/configuration/local-management/ingress/#supported-protocols). ''; example = "http://localhost:80, tcp://localhost:8000, unix:/home/production/echo.sock, hello_world or http_status:404"; }; @@ -226,7 +226,7 @@ in description = '' Ingress rules. - See [https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/configuration/local-management/ingress/](Ingress rules). + See [Ingress rules](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/configuration/local-management/ingress/). ''; example = { "*.domain.com" = "http://localhost:80"; diff --git a/nixos/modules/services/networking/deconz.nix b/nixos/modules/services/networking/deconz.nix index 88b0ee612d87..e023f8e866c0 100644 --- a/nixos/modules/services/networking/deconz.nix +++ b/nixos/modules/services/networking/deconz.nix @@ -122,6 +122,7 @@ in RuntimeDirectory = name; RuntimeDirectoryMode = "0700"; StateDirectory = name; + SuccessExitStatus = [ 143 ]; WorkingDirectory = stateDir; # For access to /dev/ttyACM0 (ConBee). SupplementaryGroups = [ "dialout" ]; diff --git a/nixos/modules/services/networking/firefox-syncserver.nix b/nixos/modules/services/networking/firefox-syncserver.nix index a9fcd883beb0..674a424fb0a4 100644 --- a/nixos/modules/services/networking/firefox-syncserver.nix +++ b/nixos/modules/services/networking/firefox-syncserver.nix @@ -316,7 +316,7 @@ in }; meta = { - maintainers = with lib.maintainers; [ pennae ]; + maintainers = with lib.maintainers; [ ]; doc = ./firefox-syncserver.md; }; } diff --git a/nixos/modules/services/networking/mihomo.nix b/nixos/modules/services/networking/mihomo.nix index d4bb10496279..a425952b54ce 100644 --- a/nixos/modules/services/networking/mihomo.nix +++ b/nixos/modules/services/networking/mihomo.nix @@ -2,10 +2,11 @@ # cfg.configFile contains secrets such as proxy servers' credential! # we dont want plaintext secrets in world-readable `/nix/store`. -{ lib -, config -, pkgs -, ... +{ + lib, + config, + pkgs, + ... }: let cfg = config.services.mihomo; @@ -17,7 +18,6 @@ in package = lib.mkPackageOption pkgs "mihomo" { }; configFile = lib.mkOption { - default = null; type = lib.types.nullOr lib.types.path; description = "Configuration file to use."; }; @@ -67,7 +67,7 @@ in ExecStart = lib.concatStringsSep " " [ (lib.getExe cfg.package) "-d /var/lib/private/mihomo" - (lib.optionalString (cfg.configFile != null) "-f \${CREDENTIALS_DIRECTORY}/config.yaml") + "-f \${CREDENTIALS_DIRECTORY}/config.yaml" (lib.optionalString (cfg.webui != null) "-ext-ui ${cfg.webui}") (lib.optionalString (cfg.extraOpts != null) cfg.extraOpts) ]; diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 9825af47777e..7baaf93a1bcf 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -721,7 +721,7 @@ in }; meta = { - maintainers = with lib.maintainers; [ pennae ]; + maintainers = with lib.maintainers; [ ]; doc = ./mosquitto.md; }; } diff --git a/nixos/modules/services/networking/nebula.nix b/nixos/modules/services/networking/nebula.nix index 56eed04c3e8d..d69af8d16b52 100644 --- a/nixos/modules/services/networking/nebula.nix +++ b/nixos/modules/services/networking/nebula.nix @@ -51,8 +51,8 @@ in }; key = mkOption { - type = types.path; - description = "Path to the host key."; + type = types.oneOf [types.nonEmptyStr types.path]; + description = "Path or reference to the host key."; example = "/etc/nebula/host.key"; }; @@ -241,7 +241,7 @@ in ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; - ProtectSystem = "strict"; + ProtectSystem = true; RestrictNamespaces = true; RestrictSUIDSGID = true; User = networkId; @@ -269,4 +269,6 @@ in ${nameToId netName} = {}; }) enabledNetworks); }; + + meta.maintainers = [ numinit ]; } diff --git a/nixos/modules/services/networking/networkd-dispatcher.nix b/nixos/modules/services/networking/networkd-dispatcher.nix index 427835870e59..cced406934c1 100644 --- a/nixos/modules/services/networking/networkd-dispatcher.nix +++ b/nixos/modules/services/networking/networkd-dispatcher.nix @@ -13,7 +13,7 @@ in { enable = mkEnableOption '' Networkd-dispatcher service for systemd-networkd connection status - change. See [https://gitlab.com/craftyguy/networkd-dispatcher](upstream instructions) + change. See [upstream instructions](https://gitlab.com/craftyguy/networkd-dispatcher) for usage ''; @@ -35,7 +35,7 @@ in { ''; description = '' Declarative configuration of networkd-dispatcher rules. See - [https://gitlab.com/craftyguy/networkd-dispatcher](upstream instructions) + [upstream instructions](https://gitlab.com/craftyguy/networkd-dispatcher) for an introduction and example scripts. ''; type = types.attrsOf (types.submodule { diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index b7143cf520f9..fda8245ba97d 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -127,7 +127,7 @@ in { meta = { - maintainers = teams.freedesktop.members ++ [ lib.maintainers.janik ]; + maintainers = teams.freedesktop.members; }; ###### interface diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 0de07a9b870c..9e54dfc17dfe 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -266,6 +266,13 @@ let else if builtins.isList x then "{ ${lib.concatMapStringsSep ", " toLua x} }" else throw "Invalid Lua value"; + settingsToLua = prefix: settings: generators.toKeyValue { + listsAsDuplicateKeys = false; + mkKeyValue = k: generators.mkKeyValueDefault { + mkValueString = toLua; + } " = " (prefix + k); + } (filterAttrs (k: v: v != null) settings); + createSSLOptsStr = o: '' ssl = { cafile = "/etc/ssl/certs/ca-bundle.crt"; @@ -418,15 +425,26 @@ let httpUploadPath = mkOption { type = types.str; description = '' - Directory where the uploaded files will be stored. By - default, uploaded files are put in a sub-directory of the - default Prosody storage path (usually /var/lib/prosody). + Directory where the uploaded files will be stored when the http_upload module is used. + By default, uploaded files are put in a sub-directory of the default Prosody storage path (usually /var/lib/prosody). ''; default = "/var/lib/prosody"; }; }; }; + httpFileShareOpts = { ... }: { + freeformType = with types; + let atom = oneOf [ int bool str (listOf atom) ]; in + attrsOf (nullOr atom) // { + description = "int, bool, string or list of them"; + }; + options.domain = mkOption { + type = with types; nullOr str; + description = "Domain name for a http_file_share service."; + }; + }; + vHostOpts = { ... }: { options = { @@ -650,7 +668,7 @@ in uploadHttp = mkOption { description = '' - Configures the Prosody builtin HTTP server to handle user uploads. + Configures the old Prosody builtin HTTP server to handle user uploads. ''; type = types.nullOr (types.submodule uploadHttpOpts); default = null; @@ -659,6 +677,17 @@ in }; }; + httpFileShare = mkOption { + description = '' + Configures the http_file_share module to handle user uploads. + ''; + type = types.nullOr (types.submodule httpFileShareOpts); + default = null; + example = { + domain = "uploads.my-xmpp-example-host.org"; + }; + }; + muc = mkOption { type = types.listOf (types.submodule mucOpts); default = [ ]; @@ -716,6 +745,17 @@ in description = "Additional prosody configuration"; }; + log = mkOption { + type = types.lines; + default = ''"*syslog"''; + description = "Logging configuration. See [](https://prosody.im/doc/logging) for more details"; + example = '' + { + { min = "warn"; to = "*syslog"; }; + } + ''; + }; + }; }; @@ -740,11 +780,10 @@ in You need to setup at least a MUC domain to comply with XEP-0423. '' + genericErrMsg;} - { assertion = cfg.uploadHttp != null || !cfg.xmppComplianceSuite; + { assertion = cfg.uploadHttp != null || cfg.httpFileShare != null || !cfg.xmppComplianceSuite; message = '' - You need to setup the uploadHttp module through - config.services.prosody.uploadHttp to comply with - XEP-0423. + You need to setup the http_upload or http_file_share modules through config.services.prosody.uploadHttp + or config.services.prosody.httpFileShare to comply with XEP-0423. '' + genericErrMsg;} ]; in errors; @@ -753,8 +792,11 @@ in environment.etc."prosody/prosody.cfg.lua".text = let - httpDiscoItems = optionals (cfg.uploadHttp != null) - [{ url = cfg.uploadHttp.domain; description = "HTTP upload endpoint";}]; + httpDiscoItems = optional (cfg.uploadHttp != null) { + url = cfg.uploadHttp.domain; description = "HTTP upload endpoint"; + } ++ optional (cfg.httpFileShare != null) { + url = cfg.httpFileShare.domain; description = "HTTP file share endpoint"; + }; mucDiscoItems = builtins.foldl' (acc: muc: [{ url = muc.domain; description = "${muc.domain} MUC endpoint";}] ++ acc) [] @@ -764,7 +806,7 @@ in pidfile = "/run/prosody/prosody.pid" - log = "*syslog" + log = ${cfg.log} data_path = "${cfg.dataDir}" plugin_paths = { @@ -833,7 +875,6 @@ in '') cfg.muc} ${ lib.optionalString (cfg.uploadHttp != null) '' - -- TODO: think about migrating this to mod-http_file_share instead. Component ${toLua cfg.uploadHttp.domain} "http_upload" http_upload_file_size_limit = ${cfg.uploadHttp.uploadFileSizeLimit} http_upload_expire_after = ${cfg.uploadHttp.uploadExpireAfter} @@ -841,6 +882,11 @@ in http_upload_path = ${toLua cfg.uploadHttp.httpUploadPath} ''} + ${lib.optionalString (cfg.httpFileShare != null) '' + Component ${toLua cfg.httpFileShare.domain} "http_file_share" + ${settingsToLua " http_file_share_" (cfg.httpFileShare // { domain = null; })} + ''} + ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: '' VirtualHost "${v.domain}" enabled = ${boolToString v.enabled}; diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index 395796d39db8..c788069fbaa5 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -291,5 +291,5 @@ in }; }; - meta.maintainers = with maintainers; [ jwoudenberg ]; + meta.maintainers = with maintainers; [ ]; } diff --git a/nixos/modules/services/networking/scion/scion-control.nix b/nixos/modules/services/networking/scion/scion-control.nix index 95d78a87ac85..0cc190d619b6 100644 --- a/nixos/modules/services/networking/scion/scion-control.nix +++ b/nixos/modules/services/networking/scion/scion-control.nix @@ -3,8 +3,10 @@ with lib; let + globalCfg = config.services.scion; cfg = config.services.scion.scion-control; toml = pkgs.formats.toml { }; + connectionDir = if globalCfg.stateless then "/run" else "/var/lib"; defaultConfig = { general = { id = "cs"; @@ -12,13 +14,13 @@ let reconnect_to_dispatcher = true; }; beacon_db = { - connection = "/run/scion-control/control.beacon.db"; + connection = "${connectionDir}/scion-control/control.beacon.db"; }; path_db = { - connection = "/run/scion-control/control.path.db"; + connection = "${connectionDir}/scion-control/control.path.db"; }; trust_db = { - connection = "/run/scion-control/control.trust.db"; + connection = "${connectionDir}/scion-control/control.trust.db"; }; log.console = { level = "info"; @@ -62,7 +64,7 @@ in DynamicUser = true; Restart = "on-failure"; BindPaths = [ "/dev/shm:/run/shm" ]; - RuntimeDirectory = "scion-control"; + ${if globalCfg.stateless then "RuntimeDirectory" else "StateDirectory"} = "scion-control"; }; }; }; diff --git a/nixos/modules/services/networking/scion/scion-daemon.nix b/nixos/modules/services/networking/scion/scion-daemon.nix index 8528bec1d52e..6ee2a4b505f2 100644 --- a/nixos/modules/services/networking/scion/scion-daemon.nix +++ b/nixos/modules/services/networking/scion/scion-daemon.nix @@ -3,8 +3,10 @@ with lib; let + globalCfg = config.services.scion; cfg = config.services.scion.scion-daemon; toml = pkgs.formats.toml { }; + connectionDir = if globalCfg.stateless then "/run" else "/var/lib"; defaultConfig = { general = { id = "sd"; @@ -12,10 +14,10 @@ let reconnect_to_dispatcher = true; }; path_db = { - connection = "/run/scion-daemon/sd.path.db"; + connection = "${connectionDir}/scion-daemon/sd.path.db"; }; trust_db = { - connection = "/run/scion-daemon/sd.trust.db"; + connection = "${connectionDir}/scion-daemon/sd.trust.db"; }; log.console = { level = "info"; @@ -57,7 +59,7 @@ in ExecStart = "${pkgs.scion}/bin/scion-daemon --config ${configFile}"; Restart = "on-failure"; DynamicUser = true; - RuntimeDirectory = "scion-daemon"; + ${if globalCfg.stateless then "RuntimeDirectory" else "StateDirectory"} = "scion-daemon"; }; }; }; diff --git a/nixos/modules/services/networking/scion/scion-dispatcher.nix b/nixos/modules/services/networking/scion/scion-dispatcher.nix index 7c9f5e6a385e..1f4193fae79e 100644 --- a/nixos/modules/services/networking/scion/scion-dispatcher.nix +++ b/nixos/modules/services/networking/scion/scion-dispatcher.nix @@ -3,6 +3,7 @@ with lib; let + globalCfg = config.services.scion; cfg = config.services.scion.scion-dispatcher; toml = pkgs.formats.toml { }; defaultConfig = { @@ -66,7 +67,7 @@ in ExecStartPre = "${pkgs.coreutils}/bin/rm -rf /run/shm/dispatcher"; ExecStart = "${pkgs.scion}/bin/scion-dispatcher --config ${configFile}"; Restart = "on-failure"; - RuntimeDirectory = "scion-dispatcher"; + ${if globalCfg.stateless then "RuntimeDirectory" else "StateDirectory"} = "scion-dispatcher"; }; }; }; diff --git a/nixos/modules/services/networking/scion/scion-router.nix b/nixos/modules/services/networking/scion/scion-router.nix index 2cac44ab767e..47ff320b6a8f 100644 --- a/nixos/modules/services/networking/scion/scion-router.nix +++ b/nixos/modules/services/networking/scion/scion-router.nix @@ -3,6 +3,7 @@ with lib; let + globalCfg = config.services.scion; cfg = config.services.scion.scion-router; toml = pkgs.formats.toml { }; defaultConfig = { @@ -42,7 +43,7 @@ in ExecStart = "${pkgs.scion}/bin/scion-router --config ${configFile}"; Restart = "on-failure"; DynamicUser = true; - RuntimeDirectory = "scion-router"; + ${if globalCfg.stateless then "RuntimeDirectory" else "StateDirectory"} = "scion-router"; }; }; }; diff --git a/nixos/modules/services/networking/scion/scion.nix b/nixos/modules/services/networking/scion/scion.nix index b8bfef8b93b5..0ae959484d32 100644 --- a/nixos/modules/services/networking/scion/scion.nix +++ b/nixos/modules/services/networking/scion/scion.nix @@ -8,6 +8,22 @@ in { options.services.scion = { enable = mkEnableOption "all of the scion components and services"; + stateless = mkOption { + type = types.bool; + default = true; + description = '' + Setting this value to false (stateful) can lead to improved caching and + performance. + + This option decides whether to persist the SCION path sqlite databases + on disk or not. Persisting this data can lead to database corruption in + extreme cases such as power outage, meaning SCION fails to work on the + next boot. This is being investigated. + + If true, /run/scion-* is used for data + If false, use /var/lib/scion-* is used for data + ''; + }; bypassBootstrapWarning = mkOption { type = types.bool; default = false; diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index 3fb3eac45cc8..a07cde847cf6 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -337,7 +337,11 @@ in }; # use nginx to serve the smokeping web service - services.fcgiwrap.enable = mkIf cfg.webService true; + services.fcgiwrap.smokeping = mkIf cfg.webService { + process.user = cfg.user; + process.group = cfg.user; + socket = { inherit (config.services.nginx) user group; }; + }; services.nginx = mkIf cfg.webService { enable = true; virtualHosts."smokeping" = { @@ -349,7 +353,7 @@ in locations."/smokeping.fcgi" = { extraConfig = '' include ${config.services.nginx.package}/conf/fastcgi_params; - fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; + fastcgi_pass unix:${config.services.fcgiwrap.smokeping.socket.address}; fastcgi_param SCRIPT_FILENAME ${smokepingHome}/smokeping.fcgi; fastcgi_param DOCUMENT_ROOT ${smokepingHome}; ''; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 45503ef89aaa..94ff838b50e0 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -368,6 +368,15 @@ in { ''; }; + type = mkOption { + type = types.enum [ "sendreceive" "sendonly" "receiveonly" "receiveencrypted" ]; + default = "sendreceive"; + description = '' + Controls how the folder is handled by Syncthing. + See . + ''; + }; + devices = mkOption { type = types.listOf types.str; default = []; diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix index 520da45c94e2..20d2dadbb7e2 100644 --- a/nixos/modules/services/security/sks.nix +++ b/nixos/modules/services/security/sks.nix @@ -10,7 +10,7 @@ let ''; in { - meta.maintainers = with maintainers; [ primeos calbrecht jcumming ]; + meta.maintainers = with maintainers; [ calbrecht jcumming ]; options = { diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix index 991f6a559545..6a4dc7014970 100644 --- a/nixos/modules/services/security/yubikey-agent.nix +++ b/nixos/modules/services/security/yubikey-agent.nix @@ -10,7 +10,7 @@ in { ###### interface - meta.maintainers = with maintainers; [ philandstuff rawkode jwoudenberg ]; + meta.maintainers = with maintainers; [ philandstuff rawkode ]; options = { diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index 5d7258cac778..7148d62b9084 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -16,6 +16,7 @@ let ++ optional cfg.btrfs.enable btrfs-progs ++ optional cfg.ext4.enable e2fsprogs ++ optional cfg.xfs.enable xfsprogs + ++ cfg.extraPackages ; hasFs = fsName: lib.any (fs: fs.fsType == fsName) (lib.attrValues config.fileSystems); settingsFormat = pkgs.formats.yaml { }; @@ -79,6 +80,14 @@ in ''; }; + extraPackages = mkOption { + type = types.listOf types.package; + default = [ ]; + description = '' + List of additional packages to be available within cloud-init jobs. + ''; + }; + settings = mkOption { description = '' Structured cloud-init configuration. @@ -163,7 +172,7 @@ in { text = cfg.config; } ; - systemd.network.enable = cfg.network.enable; + systemd.network.enable = mkIf cfg.network.enable true; systemd.services.cloud-init-local = { description = "Initial cloud-init job (pre-networking)"; diff --git a/nixos/modules/services/torrent/rtorrent.nix b/nixos/modules/services/torrent/rtorrent.nix index e0ce33d13462..609b06b5e706 100644 --- a/nixos/modules/services/torrent/rtorrent.nix +++ b/nixos/modules/services/torrent/rtorrent.nix @@ -182,7 +182,7 @@ in { # XMLRPC scgi_local = (cfg.rpcsock) - schedule = scgi_group,0,0,"execute.nothrow=chown,\":rtorrent\",(cfg.rpcsock)" + schedule = scgi_group,0,0,"execute.nothrow=chown,\":${cfg.group}\",(cfg.rpcsock)" schedule = scgi_permission,0,0,"execute.nothrow=chmod,\"g+w,o=\",(cfg.rpcsock)" ''; diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index b8e9330498c0..6b05886756fe 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -98,11 +98,11 @@ in { services.kmscon.extraConfig = let xkb = optionals cfg.useXkbConfig - lib.mapAttrsToList (n: v: "xkb-${n}=${v}") ( + (lib.mapAttrsToList (n: v: "xkb-${n}=${v}") ( lib.filterAttrs (n: v: builtins.elem n ["layout" "model" "options" "variant"] && v != "") config.services.xserver.xkb - ); + )); render = optionals cfg.hwRender [ "drm" "hwaccel" ]; fonts = optional (cfg.fonts != null) "font-name=${lib.concatMapStringsSep ", " (f: f.name) cfg.fonts}"; in lib.concatStringsSep "\n" (xkb ++ render ++ fonts); diff --git a/nixos/modules/services/web-apps/eintopf.nix b/nixos/modules/services/web-apps/eintopf.nix new file mode 100644 index 000000000000..a2b304445597 --- /dev/null +++ b/nixos/modules/services/web-apps/eintopf.nix @@ -0,0 +1,92 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.eintopf; + +in { + options.services.eintopf = { + + enable = mkEnableOption "Eintopf community event calendar web app"; + + settings = mkOption { + type = types.attrsOf types.str; + default = { }; + description = '' + Settings to configure web service. See + + for available options. + ''; + example = literalExpression '' + { + EINTOPF_ADDR = ":1234"; + EINTOPF_ADMIN_EMAIL = "admin@example.org"; + EINTOPF_TIMEZONE = "Europe/Berlin"; + } + ''; + }; + + secrets = lib.mkOption { + type = with types; listOf path; + description = '' + A list of files containing the various secrets. Should be in the + format expected by systemd's `EnvironmentFile` directory. + ''; + default = [ ]; + }; + + }; + + config = mkIf cfg.enable { + + systemd.services.eintopf = { + description = "Community event calendar web app"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + environment = cfg.settings; + serviceConfig = { + ExecStart = "${pkgs.eintopf}/bin/eintopf"; + WorkingDirectory = "/var/lib/eintopf"; + StateDirectory = "eintopf" ; + EnvironmentFile = [ cfg.secrets ]; + + # hardening + AmbientCapabilities = ""; + CapabilityBoundingSet = "" ; + DevicePolicy = "closed"; + DynamicUser = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" ]; + UMask = "0077"; + }; + }; + + }; + + meta.maintainers = with lib.maintainers; [ onny ]; + +} diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 021101fecaa4..7a22e1523192 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -5,6 +5,15 @@ let cfg = config.services.freshrss; poolName = "freshrss"; + + extension-env = pkgs.buildEnv { + name = "freshrss-extensions"; + paths = cfg.extensions; + }; + env-vars = { + DATA_PATH = cfg.dataDir; + THIRDPARTY_EXTENSIONS_PATH = "${extension-env}/share/freshrss/"; + }; in { meta.maintainers = with maintainers; [ etu stunkymonkey mattchrist ]; @@ -14,6 +23,31 @@ in package = mkPackageOption pkgs "freshrss" { }; + extensions = mkOption { + type = types.listOf types.package; + default = [ ]; + defaultText = literalExpression "[]"; + example = literalExpression '' + with freshrss-extensions; [ + youtube + ] ++ [ + (freshrss-extensions.buildFreshRssExtension { + FreshRssExtUniqueId = "ReadingTime"; + pname = "reading-time"; + version = "1.5"; + src = pkgs.fetchFromGitLab { + domain = "framagit.org"; + owner = "Lapineige"; + repo = "FreshRSS_Extension-ReadingTime"; + rev = "fb6e9e944ef6c5299fa56ffddbe04c41e5a34ebf"; + hash = "sha256-C5cRfaphx4Qz2xg2z+v5qRji8WVSIpvzMbethTdSqsk="; + }; + }) + ] + ''; + description = "Additional extensions to be used."; + }; + defaultUser = mkOption { type = types.str; default = "admin"; @@ -214,9 +248,7 @@ in "pm.max_spare_servers" = 5; "catch_workers_output" = true; }; - phpEnv = { - DATA_PATH = "${cfg.dataDir}"; - }; + phpEnv = env-vars; }; }; @@ -259,9 +291,7 @@ in RemainAfterExit = true; }; restartIfChanged = true; - environment = { - DATA_PATH = cfg.dataDir; - }; + environment = env-vars; script = let @@ -293,9 +323,7 @@ in description = "FreshRSS feed updater"; after = [ "freshrss-config.service" ]; startAt = "*:0/5"; - environment = { - DATA_PATH = cfg.dataDir; - }; + environment = env-vars; serviceConfig = defaultServiceConfig // { ExecStart = "${cfg.package}/app/actualize_script.php"; }; diff --git a/nixos/modules/services/web-apps/glance.md b/nixos/modules/services/web-apps/glance.md new file mode 100644 index 000000000000..f65b32b3ba91 --- /dev/null +++ b/nixos/modules/services/web-apps/glance.md @@ -0,0 +1,39 @@ +# Glance {#module-services-glance} + +Glance is a self-hosted dashboard that puts all your feeds in one place. + +Visit [the Glance project page](https://github.com/glanceapp/glance) to learn +more about it. + +## Quickstart {#module-services-glance-quickstart} + +Checkout the [configuration docs](https://github.com/glanceapp/glance/blob/main/docs/configuration.md) to learn more. +Use the following configuration to start a public instance of Glance locally: + +```nix +{ + services.glance = { + enable = true; + settings = { + pages = [ + { + name = "Home"; + columns = [ + { + size = "full"; + widgets = [ + { type = "calendar"; } + { + type = "weather"; + location = "Nivelles, Belgium"; + } + ]; + } + ]; + } + ]; + }; + openFirewall = true; + }; +} +``` diff --git a/nixos/modules/services/web-apps/glance.nix b/nixos/modules/services/web-apps/glance.nix new file mode 100644 index 000000000000..fbc310daea77 --- /dev/null +++ b/nixos/modules/services/web-apps/glance.nix @@ -0,0 +1,141 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.glance; + + inherit (lib) + mkEnableOption + mkPackageOption + mkOption + mkIf + getExe + types + ; + + settingsFormat = pkgs.formats.yaml { }; +in +{ + options.services.glance = { + enable = mkEnableOption "glance"; + package = mkPackageOption pkgs "glance" { }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + options = { + server = { + host = mkOption { + description = "Glance bind address"; + default = "127.0.0.1"; + example = "0.0.0.0"; + type = types.str; + }; + port = mkOption { + description = "Glance port to listen on"; + default = 8080; + example = 5678; + type = types.port; + }; + }; + pages = mkOption { + type = settingsFormat.type; + description = '' + List of pages to be present on the dashboard. + + See + ''; + default = [ + { + name = "Calendar"; + columns = [ + { + size = "full"; + widgets = [ { type = "calendar"; } ]; + } + ]; + } + ]; + example = [ + { + name = "Home"; + columns = [ + { + size = "full"; + widgets = [ + { type = "calendar"; } + { + type = "weather"; + location = "Nivelles, Belgium"; + } + ]; + } + ]; + } + ]; + }; + }; + }; + default = { }; + description = '' + Configuration written to a yaml file that is read by glance. See + + for more. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open the firewall for Glance. + This adds `services.glance.settings.server.port` to `networking.firewall.allowedTCPPorts`. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.glance = { + description = "Glance feed dashboard server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = + let + glance-yaml = settingsFormat.generate "glance.yaml" cfg.settings; + in + "${getExe cfg.package} --config ${glance-yaml}"; + WorkingDirectory = "/var/lib/glance"; + StateDirectory = "glance"; + RuntimeDirectory = "glance"; + RuntimeDirectoryMode = "0755"; + PrivateTmp = true; + DynamicUser = true; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + PrivateUsers = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProcSubset = "pid"; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + UMask = "0077"; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.settings.server.port ]; }; + }; + + meta.doc = ./glance.md; + meta.maintainers = [ lib.maintainers.drupol ]; +} diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index b11626ec2dc3..600ad3053605 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -64,129 +64,135 @@ let else throw "Unsupported database type: ${cfg.database.type} for socket: ${cfg.database.socket}"; - mediawikiConfig = pkgs.writeText "LocalSettings.php" '' - + ''; + }; + + databaseUrl = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + example = "postgres:///shiori?host=/run/postgresql"; + description = "The connection URL to connect to MySQL or PostgreSQL"; + }; }; }; - config = mkIf cfg.enable { - systemd.services.shiori = with cfg; { + config = lib.mkIf cfg.enable { + systemd.services.shiori = { description = "Shiori simple bookmarks manager"; wantedBy = [ "multi-user.target" ]; - - environment.SHIORI_DIR = "/var/lib/shiori"; + after = [ "postgresql.service" "mysql.service" ]; + environment = { + SHIORI_DIR = "/var/lib/shiori"; + } // lib.optionalAttrs (cfg.databaseUrl != null) { + SHIORI_DATABASE_URL = cfg.databaseUrl; + }; serviceConfig = { - ExecStart = "${package}/bin/shiori serve --address '${address}' --port '${toString port}' --webroot '${webRoot}'"; + ExecStart = + "${cfg.package}/bin/shiori server --address '${cfg.address}' --port '${ + toString cfg.port + }' --webroot '${cfg.webRoot}'"; DynamicUser = true; StateDirectory = "shiori"; @@ -50,15 +73,24 @@ in { RuntimeDirectory = "shiori"; # Security options - + EnvironmentFile = + lib.optional (cfg.environmentFile != null) cfg.environmentFile; BindReadOnlyPaths = [ "/nix/store" # For SSL certificates, and the resolv.conf "/etc" - ]; + ] ++ lib.optional (config.services.postgresql.enable && + cfg.databaseUrl != null && + lib.strings.hasPrefix "postgres://" cfg.databaseUrl) + "/run/postgresql" + ++ lib.optional (config.services.mysql.enable && + cfg.databaseUrl != null && + lib.strings.hasPrefix "mysql://" cfg.databaseUrl) + "/var/run/mysqld"; CapabilityBoundingSet = ""; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; DeviceAllow = ""; @@ -78,7 +110,7 @@ in { ProtectKernelTunables = true; RestrictNamespaces = true; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; RestrictRealtime = true; RestrictSUIDSGID = true; @@ -88,11 +120,17 @@ in { SystemCallErrorNumber = "EPERM"; SystemCallFilter = [ "@system-service" - "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid" + "~@cpu-emulation" + "~@debug" + "~@keyring" + "~@memlock" + "~@obsolete" + "~@privileged" + "~@setuid" ]; }; }; }; - meta.maintainers = with maintainers; [ minijackson ]; + meta.maintainers = with lib.maintainers; [ minijackson CaptainJawZ ]; } diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 4d49b29efff6..46cb09959579 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -435,7 +435,7 @@ in example = literalExpression '' [ "proxy_connect" - { name = "jk"; path = "''${pkgs.tomcat_connectors}/modules/mod_jk.so"; } + { name = "jk"; path = "''${pkgs.apacheHttpdPackages.mod_jk}/modules/mod_jk.so"; } ] ''; description = '' @@ -538,25 +538,13 @@ in ''; }; - enableMellon = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the mod_auth_mellon module."; - }; + enableMellon = mkEnableOption "the mod_auth_mellon module"; - enablePHP = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the PHP module."; - }; + enablePHP = mkEnableOption "the PHP module"; phpPackage = mkPackageOption pkgs "php" { }; - enablePerl = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the Perl module (mod_perl)."; - }; + enablePerl = mkEnableOption "the Perl module (mod_perl)"; phpOptions = mkOption { type = types.lines; diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix index 3250e9c05ed6..29ddd39942c6 100644 --- a/nixos/modules/services/web-servers/fcgiwrap.nix +++ b/nixos/modules/services/web-servers/fcgiwrap.nix @@ -3,70 +3,128 @@ with lib; let - cfg = config.services.fcgiwrap; + forEachInstance = f: flip mapAttrs' config.services.fcgiwrap (name: cfg: + nameValuePair "fcgiwrap-${name}" (f cfg) + ); + in { - - options = { - services.fcgiwrap = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable fcgiwrap, a server for running CGI applications over FastCGI."; - }; - - preforkProcesses = mkOption { - type = types.int; + options.services.fcgiwrap = mkOption { + description = "Configuration for fcgiwrap instances."; + default = { }; + type = types.attrsOf (types.submodule ({ config, ... }: { options = { + process.prefork = mkOption { + type = types.ints.positive; default = 1; description = "Number of processes to prefork."; }; - socketType = mkOption { + process.user = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + User as which this instance of fcgiwrap will be run. + Set to `null` (the default) to use a dynamically allocated user. + ''; + }; + + process.group = mkOption { + type = types.nullOr types.str; + default = null; + description = "Group as which this instance of fcgiwrap will be run."; + }; + + socket.type = mkOption { type = types.enum [ "unix" "tcp" "tcp6" ]; default = "unix"; description = "Socket type: 'unix', 'tcp' or 'tcp6'."; }; - socketAddress = mkOption { + socket.address = mkOption { type = types.str; - default = "/run/fcgiwrap.sock"; + default = "/run/fcgiwrap-${config._module.args.name}.sock"; example = "1.2.3.4:5678"; - description = "Socket address. In case of a UNIX socket, this should be its filesystem path."; + description = '' + Socket address. + In case of a UNIX socket, this should be its filesystem path. + ''; }; - user = mkOption { + socket.user = mkOption { type = types.nullOr types.str; default = null; - description = "User permissions for the socket."; + description = '' + User to be set as owner of the UNIX socket. + Defaults to the process running user. + ''; }; - group = mkOption { + socket.group = mkOption { type = types.nullOr types.str; default = null; - description = "Group permissions for the socket."; + description = '' + Group to be set as owner of the UNIX socket. + Defaults to the process running group. + ''; }; - }; + + socket.mode = mkOption { + type = types.nullOr types.str; + default = if config.socket.type == "unix" then "0600" else null; + defaultText = literalExpression '' + if config.socket.type == "unix" then "0600" else null + ''; + description = '' + Mode to be set on the UNIX socket. + Defaults to private to the socket's owner. + ''; + }; + }; })); }; - config = mkIf cfg.enable { - systemd.services.fcgiwrap = { + config = { + assertions = concatLists (mapAttrsToList (name: cfg: [ + { + assertion = cfg.socket.user != null -> cfg.socket.type == "unix"; + message = "Socket owner can only be set for the UNIX socket type."; + } + { + assertion = cfg.socket.group != null -> cfg.socket.type == "unix"; + message = "Socket owner can only be set for the UNIX socket type."; + } + { + assertion = cfg.socket.mode != null -> cfg.socket.type == "unix"; + message = "Socket mode can only be set for the UNIX socket type."; + } + ]) config.services.fcgiwrap); + + systemd.services = forEachInstance (cfg: { after = [ "nss-user-lookup.target" ]; - wantedBy = optional (cfg.socketType != "unix") "multi-user.target"; + wantedBy = optional (cfg.socket.type != "unix") "multi-user.target"; serviceConfig = { - ExecStart = "${pkgs.fcgiwrap}/sbin/fcgiwrap -c ${builtins.toString cfg.preforkProcesses} ${ - optionalString (cfg.socketType != "unix") "-s ${cfg.socketType}:${cfg.socketAddress}" - }"; - } // (if cfg.user != null && cfg.group != null then { - User = cfg.user; - Group = cfg.group; - } else { } ); - }; + ExecStart = '' + ${pkgs.fcgiwrap}/sbin/fcgiwrap ${cli.toGNUCommandLineShell {} ({ + c = cfg.process.prefork; + } // (optionalAttrs (cfg.socket.type != "unix") { + s = "${cfg.socket.type}:${cfg.socket.address}"; + }))} + ''; + } // (if cfg.process.user != null then { + User = cfg.process.user; + Group = cfg.process.group; + } else { + DynamicUser = true; + }); + }); - systemd.sockets = if (cfg.socketType == "unix") then { - fcgiwrap = { - wantedBy = [ "sockets.target" ]; - socketConfig.ListenStream = cfg.socketAddress; + systemd.sockets = forEachInstance (cfg: mkIf (cfg.socket.type == "unix") { + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = cfg.socket.address; + SocketUser = cfg.socket.user; + SocketGroup = cfg.socket.group; + SocketMode = cfg.socket.mode; }; - } else { }; + }); }; } diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index b4e739029335..7f43a939970b 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -61,7 +61,7 @@ in { ''; type = types.listOf types.package; default = []; - example = literalExpression "[ pkgs.gnome.gpaste ]"; + example = literalExpression "[ pkgs.gpaste ]"; }; extraGSettingsOverrides = mkOption { @@ -132,7 +132,7 @@ in { gnome-menus # Required by Budgie Control Center. - gnome.zenity + zenity # Provides `gsettings`. glib @@ -162,7 +162,7 @@ in { ++ cfg.sessionPath; # Both budgie-desktop-view and nemo defaults to this emulator. - programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal); + programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal); # Fonts. fonts.packages = [ diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index fa67441e7ac4..0dc21862d834 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -27,7 +27,7 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExpression "[ pkgs.gnome.gpaste ]"; + example = literalExpression "[ pkgs.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. @@ -163,8 +163,8 @@ in libgnomekbd # theme - gnome.adwaita-icon-theme - gnome.gnome-themes-extra + adwaita-icon-theme + gnome-themes-extra gtk3.out # other @@ -229,11 +229,11 @@ in }) (mkIf serviceCfg.apps.enable { - programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome.gnome-disk-utility); - programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal); - programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller); + programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome-disk-utility); + programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal); + programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller); - environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [ + environment.systemPackages = with pkgs // pkgs.cinnamon; utils.removePackagesByName [ # cinnamon team apps bulky warpinator diff --git a/nixos/modules/services/x11/desktop-managers/gnome.md b/nixos/modules/services/x11/desktop-managers/gnome.md index 2b4bd06df04f..9943f138dc60 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.md +++ b/nixos/modules/services/x11/desktop-managers/gnome.md @@ -114,7 +114,7 @@ in `dconf-editor` ## Shell Extensions {#sec-gnome-shell-extensions} Most Shell extensions are packaged under the `gnomeExtensions` attribute. -Some packages that include Shell extensions, like `gnome.gpaste`, don’t have their extension decoupled under this attribute. +Some packages that include Shell extensions, like `gpaste`, don’t have their extension decoupled under this attribute. You can install them like any other package: diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index fe50d930b5af..11d5fcbfee23 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -89,7 +89,7 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExpression "[ pkgs.gnome.gpaste ]"; + example = literalExpression "[ pkgs.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GNOME Shell extensions or GSettings-conditional autostart. @@ -176,7 +176,7 @@ in environment.gnome.excludePackages = mkOption { default = []; - example = literalExpression "[ pkgs.gnome.totem ]"; + example = literalExpression "[ pkgs.totem ]"; type = types.listOf types.package; description = "Which packages gnome should exclude from the default environment"; }; @@ -373,7 +373,7 @@ in gnome-shell ]; optionalPackages = with pkgs.gnome; [ - adwaita-icon-theme + pkgs.adwaita-icon-theme nixos-background-info gnome-backgrounds gnome-bluetooth @@ -399,28 +399,28 @@ in with pkgs.gnome; utils.removePackagesByName ([ - baobab - epiphany + pkgs.baobab + pkgs.epiphany pkgs.gnome-text-editor - gnome-calculator - gnome-calendar + pkgs.gnome-calculator + pkgs.gnome-calendar gnome-characters gnome-clocks pkgs.gnome-console gnome-contacts - gnome-font-viewer + pkgs.gnome-font-viewer gnome-logs gnome-maps gnome-music - gnome-system-monitor + pkgs.gnome-system-monitor gnome-weather pkgs.loupe - nautilus + pkgs.nautilus pkgs.gnome-connections - simple-scan + pkgs.simple-scan pkgs.snapshot - totem - yelp + pkgs.totem + pkgs.yelp ] ++ lib.optionals config.services.flatpak.enable [ # Since PackageKit Nix support is not there yet, # only install gnome-software if flatpak is enabled. @@ -432,12 +432,12 @@ in # Since some of these have a corresponding package, we only # enable that program module if the package hasn't been excluded # through `environment.gnome.excludePackages` - programs.evince.enable = notExcluded pkgs.gnome.evince; - programs.file-roller.enable = notExcluded pkgs.gnome.file-roller; - programs.geary.enable = notExcluded pkgs.gnome.geary; - programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility; - programs.seahorse.enable = notExcluded pkgs.gnome.seahorse; - services.gnome.sushi.enable = notExcluded pkgs.gnome.sushi; + programs.evince.enable = notExcluded pkgs.evince; + programs.file-roller.enable = notExcluded pkgs.file-roller; + programs.geary.enable = notExcluded pkgs.geary; + programs.gnome-disks.enable = notExcluded pkgs.gnome-disk-utility; + programs.seahorse.enable = notExcluded pkgs.seahorse; + services.gnome.sushi.enable = notExcluded pkgs.sushi; # VTE shell integration for gnome-console programs.bash.vteIntegration = mkDefault true; @@ -482,9 +482,9 @@ in # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst (lib.mkIf serviceCfg.core-developer-tools.enable { - environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [ - dconf-editor - devhelp + environment.systemPackages = utils.removePackagesByName [ + pkgs.dconf-editor + pkgs.devhelp pkgs.gnome-builder # boxes would make sense in this option, however # it doesn't function well enough to be included diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 0e9a06706d4f..01bf3aad202a 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -44,7 +44,7 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExpression "[ pkgs.gnome.gpaste ]"; + example = literalExpression "[ pkgs.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. @@ -207,7 +207,7 @@ in desktop-file-utils glib # for gsettings program gnome-menus - gnome.adwaita-icon-theme + adwaita-icon-theme gtk3.out # for gtk-launch program onboard orca # elementary/greeter#668 @@ -284,11 +284,11 @@ in }) (mkIf serviceCfg.apps.enable { - programs.evince.enable = mkDefault (notExcluded pkgs.gnome.evince); - programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller); + programs.evince.enable = mkDefault (notExcluded pkgs.evince); + programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller); environment.systemPackages = utils.removePackagesByName ([ - pkgs.gnome.gnome-font-viewer + pkgs.gnome-font-viewer ] ++ (with pkgs.pantheon; [ elementary-calculator elementary-calendar diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index aee2f5b35db2..98d3555ccbc5 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -84,8 +84,8 @@ in glib # for gsettings gtk3.out # gtk-update-icon-cache - gnome.gnome-themes-extra - gnome.adwaita-icon-theme + gnome-themes-extra + adwaita-icon-theme hicolor-icon-theme tango-icon-theme xfce4-icon-theme diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 51ab08e74f86..1a39b365db5f 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -6,6 +6,7 @@ let cfg = config.services.xserver.displayManager; gdm = pkgs.gnome.gdm; + pamCfg = config.security.pam.services; settingsFormat = pkgs.formats.ini { }; configFile = settingsFormat.generate "custom.conf" cfg.gdm.settings; @@ -155,7 +156,7 @@ in gdm # for gnome-login.session config.services.displayManager.sessionData.desktops pkgs.gnome.gnome-control-center # for accessibility icon - pkgs.gnome.adwaita-icon-theme + pkgs.adwaita-icon-theme pkgs.hicolor-icon-theme # empty icon theme as a base ]; } // optionalAttrs (xSessionWrapper != null) { @@ -183,7 +184,7 @@ in # Otherwise GDM will not be able to start correctly and display Wayland sessions systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ]; - environment.systemPackages = [ pkgs.gnome.adwaita-icon-theme ]; + environment.systemPackages = [ pkgs.adwaita-icon-theme ]; # We dont use the upstream gdm service # it has to be disabled since the gdm package has it @@ -321,15 +322,20 @@ in session include login ''; + # This would block password prompt when included by gdm-password. + # GDM will instead run gdm-fingerprint in parallel. login.fprintAuth = mkIf config.services.fprintd.enable false; + gdm-fingerprint.text = mkIf config.services.fprintd.enable '' auth required pam_shells.so auth requisite pam_nologin.so auth requisite pam_faillock.so preauth auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so - auth optional pam_permit.so auth required pam_env.so - auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so + ${lib.optionalString pamCfg.login.enableGnomeKeyring '' + auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so + auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so + ''} account include login diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix index 930ee96b384d..8975d6fb9f0f 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix @@ -34,8 +34,8 @@ in { theme = { package = mkOption { type = types.package; - default = pkgs.gnome.gnome-themes-extra; - defaultText = literalExpression "pkgs.gnome.gnome-themes-extra"; + default = pkgs.gnome-themes-extra; + defaultText = literalExpression "pkgs.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 30940da103a9..0907aeb839ba 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -47,8 +47,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome.gnome-themes-extra; - defaultText = literalExpression "pkgs.gnome.gnome-themes-extra"; + default = pkgs.gnome-themes-extra; + defaultText = literalExpression "pkgs.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; @@ -68,8 +68,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome.adwaita-icon-theme; - defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme"; + default = pkgs.adwaita-icon-theme; + defaultText = literalExpression "pkgs.adwaita-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; @@ -89,8 +89,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome.adwaita-icon-theme; - defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme"; + default = pkgs.adwaita-icon-theme; + defaultText = literalExpression "pkgs.adwaita-icon-theme"; description = '' The package path that contains the cursor theme given in the name option. ''; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix index 299d3bae5f06..d20b26491aee 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix @@ -33,8 +33,8 @@ in theme = { package = mkOption { type = types.package; - default = pkgs.gnome.gnome-themes-extra; - defaultText = literalExpression "pkgs.gnome.gnome-themes-extra"; + default = pkgs.gnome-themes-extra; + defaultText = literalExpression "pkgs.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; @@ -52,8 +52,8 @@ in iconTheme = { package = mkOption { type = types.package; - default = pkgs.gnome.adwaita-icon-theme; - defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme"; + default = pkgs.adwaita-icon-theme; + defaultText = literalExpression "pkgs.adwaita-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; @@ -90,8 +90,8 @@ in cursorTheme = { package = mkOption { type = types.package; - default = pkgs.gnome.adwaita-icon-theme; - defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme"; + default = pkgs.adwaita-icon-theme; + defaultText = literalExpression "pkgs.adwaita-icon-theme"; description = '' The package path that contains the cursor theme given in the name option. ''; diff --git a/nixos/modules/services/x11/window-managers/herbstluftwm.nix b/nixos/modules/services/x11/window-managers/herbstluftwm.nix index 7edaf4e980ec..94c9f4aa91c8 100644 --- a/nixos/modules/services/x11/window-managers/herbstluftwm.nix +++ b/nixos/modules/services/x11/window-managers/herbstluftwm.nix @@ -33,7 +33,10 @@ in (cfg.configFile != null) ''-c "${cfg.configFile}"'' ; - in "${cfg.package}/bin/herbstluftwm ${configFileClause} &"; + in '' + ${cfg.package}/bin/herbstluftwm ${configFileClause} & + waitPID=$! + ''; }; environment.systemPackages = [ cfg.package ]; }; diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index cbeec4588f59..650ce593e945 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -166,6 +166,10 @@ in UseDNS no ''} + ${optionalString (!config.boot.initrd.systemd.enable) '' + SshdSessionPath /bin/sshd-session + ''} + ${cfg.extraConfig} ''; in mkIf enabled { @@ -191,6 +195,7 @@ in boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${package}/bin/sshd + copy_bin_and_libs ${package}/libexec/sshd-session cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib ''; @@ -265,7 +270,10 @@ in config.boot.initrd.network.ssh.authorizedKeys ++ (map (file: lib.fileContents file) config.boot.initrd.network.ssh.authorizedKeyFiles)); }; - storePaths = ["${package}/bin/sshd"]; + storePaths = [ + "${package}/bin/sshd" + "${package}/libexec/sshd-session" + ]; services.sshd = { description = "SSH Daemon"; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 694d34d1c059..71ef8695c2d8 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -12,7 +12,7 @@ import subprocess import sys import warnings import json -from typing import NamedTuple, Dict, List +from typing import NamedTuple, Any from dataclasses import dataclass # These values will be replaced with actual values during the package build @@ -21,7 +21,7 @@ BOOT_MOUNT_POINT = "@bootMountPoint@" LOADER_CONF = f"{EFI_SYS_MOUNT_POINT}/loader/loader.conf" # Always stored on the ESP NIXOS_DIR = "@nixosDir@" TIMEOUT = "@timeout@" -EDITOR = "@editor@" == "1" +EDITOR = "@editor@" == "1" # noqa: PLR0133 CONSOLE_MODE = "@consoleMode@" BOOTSPEC_TOOLS = "@bootspecTools@" DISTRO_NAME = "@distroName@" @@ -38,17 +38,22 @@ class BootSpec: init: str initrd: str kernel: str - kernelParams: List[str] + kernelParams: list[str] # noqa: N815 label: str system: str toplevel: str - specialisations: Dict[str, "BootSpec"] - sortKey: str - initrdSecrets: str | None = None + specialisations: dict[str, "BootSpec"] + sortKey: str # noqa: N815 + initrdSecrets: str | None = None # noqa: N815 libc = ctypes.CDLL("libc.so.6") +FILE = None | int + +def run(cmd: list[str], stdout: FILE = None) -> subprocess.CompletedProcess[str]: + return subprocess.run(cmd, check=True, text=True, stdout=stdout) + class SystemIdentifier(NamedTuple): profile: str | None generation: int @@ -112,17 +117,20 @@ def get_bootspec(profile: str | None, generation: int) -> BootSpec: boot_json_f = open(boot_json_path, 'r') bootspec_json = json.load(boot_json_f) else: - boot_json_str = subprocess.check_output([ - f"{BOOTSPEC_TOOLS}/bin/synthesize", - "--version", - "1", - system_directory, - "/dev/stdout"], - universal_newlines=True) + boot_json_str = run( + [ + f"{BOOTSPEC_TOOLS}/bin/synthesize", + "--version", + "1", + system_directory, + "/dev/stdout", + ], + stdout=subprocess.PIPE, + ).stdout bootspec_json = json.loads(boot_json_str) return bootspec_from_json(bootspec_json) -def bootspec_from_json(bootspec_json: Dict) -> BootSpec: +def bootspec_from_json(bootspec_json: dict[str, Any]) -> BootSpec: specialisations = bootspec_json['org.nixos.specialisation.v1'] specialisations = {k: bootspec_from_json(v) for k, v in specialisations.items()} systemdBootExtension = bootspec_json.get('org.nixos.systemd-boot', {}) @@ -157,7 +165,7 @@ def write_entry(profile: str | None, generation: int, specialisation: str | None try: if bootspec.initrdSecrets is not None: - subprocess.check_call([bootspec.initrdSecrets, f"{BOOT_MOUNT_POINT}%s" % (initrd)]) + run([bootspec.initrdSecrets, f"{BOOT_MOUNT_POINT}%s" % (initrd)]) except subprocess.CalledProcessError: if current: print("failed to create initrd secrets!", file=sys.stderr) @@ -192,13 +200,17 @@ def write_entry(profile: str | None, generation: int, specialisation: str | None def get_generations(profile: str | None = None) -> list[SystemIdentifier]: - gen_list = subprocess.check_output([ - f"{NIX}/bin/nix-env", - "--list-generations", - "-p", - "/nix/var/nix/profiles/%s" % ("system-profiles/" + profile if profile else "system")], - universal_newlines=True) - gen_lines = gen_list.split('\n') + gen_list = run( + [ + f"{NIX}/bin/nix-env", + "--list-generations", + "-p", + "/nix/var/nix/profiles/%s" + % ("system-profiles/" + profile if profile else "system"), + ], + stdout=subprocess.PIPE, + ).stdout + gen_lines = gen_list.split("\n") gen_lines.pop() configurationLimit = CONFIGURATION_LIMIT @@ -214,8 +226,8 @@ def get_generations(profile: str | None = None) -> list[SystemIdentifier]: def remove_old_entries(gens: list[SystemIdentifier]) -> None: - rex_profile = re.compile(r"^" + re.escape(BOOT_MOUNT_POINT) + "/loader/entries/nixos-(.*)-generation-.*\.conf$") - rex_generation = re.compile(r"^" + re.escape(BOOT_MOUNT_POINT) + "/loader/entries/nixos.*-generation-([0-9]+)(-specialisation-.*)?\.conf$") + rex_profile = re.compile(r"^" + re.escape(BOOT_MOUNT_POINT) + r"/loader/entries/nixos-(.*)-generation-.*\.conf$") + rex_generation = re.compile(r"^" + re.escape(BOOT_MOUNT_POINT) + r"/loader/entries/nixos.*-generation-([0-9]+)(-specialisation-.*)?\.conf$") known_paths = [] for gen in gens: bootspec = get_bootspec(gen.profile, gen.generation) @@ -230,10 +242,10 @@ def remove_old_entries(gens: list[SystemIdentifier]) -> None: gen_number = int(rex_generation.sub(r"\1", path)) except ValueError: continue - if not (prof, gen_number, None) in gens: + if (prof, gen_number, None) not in gens: os.unlink(path) for path in glob.iglob(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}/*"): - if not path in known_paths and not os.path.isdir(path): + if path not in known_paths and not os.path.isdir(path): os.unlink(path) @@ -263,9 +275,7 @@ def install_bootloader(args: argparse.Namespace) -> None: # be there on newly installed systems, so let's generate one so that # bootctl can find it and we can also pass it to write_entry() later. cmd = [f"{SYSTEMD}/bin/systemd-machine-id-setup", "--print"] - machine_id = subprocess.run( - cmd, text=True, check=True, stdout=subprocess.PIPE - ).stdout.rstrip() + machine_id = run(cmd, stdout=subprocess.PIPE).stdout.rstrip() if os.getenv("NIXOS_INSTALL_GRUB") == "1": warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning) @@ -288,11 +298,20 @@ def install_bootloader(args: argparse.Namespace) -> None: if os.path.exists(LOADER_CONF): os.unlink(LOADER_CONF) - subprocess.check_call([f"{SYSTEMD}/bin/bootctl", f"--esp-path={EFI_SYS_MOUNT_POINT}"] + bootctl_flags + ["install"]) + run( + [f"{SYSTEMD}/bin/bootctl", f"--esp-path={EFI_SYS_MOUNT_POINT}"] + + bootctl_flags + + ["install"] + ) else: # Update bootloader to latest if needed - available_out = subprocess.check_output([f"{SYSTEMD}/bin/bootctl", "--version"], universal_newlines=True).split()[2] - installed_out = subprocess.check_output([f"{SYSTEMD}/bin/bootctl", f"--esp-path={EFI_SYS_MOUNT_POINT}", "status"], universal_newlines=True) + available_out = run( + [f"{SYSTEMD}/bin/bootctl", "--version"], stdout=subprocess.PIPE + ).stdout.split()[2] + installed_out = run( + [f"{SYSTEMD}/bin/bootctl", f"--esp-path={EFI_SYS_MOUNT_POINT}", "status"], + stdout=subprocess.PIPE, + ).stdout # See status_binaries() in systemd bootctl.c for code which generates this installed_match = re.search(r"^\W+File:.*/EFI/(?:BOOT|systemd)/.*\.efi \(systemd-boot ([\d.]+[^)]*)\)$", @@ -311,7 +330,11 @@ def install_bootloader(args: argparse.Namespace) -> None: if installed_version < available_version: print("updating systemd-boot from %s to %s" % (installed_version, available_version)) - subprocess.check_call([f"{SYSTEMD}/bin/bootctl", f"--esp-path={EFI_SYS_MOUNT_POINT}"] + bootctl_flags + ["update"]) + run( + [f"{SYSTEMD}/bin/bootctl", f"--esp-path={EFI_SYS_MOUNT_POINT}"] + + bootctl_flags + + ["update"] + ) os.makedirs(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}", exist_ok=True) os.makedirs(f"{BOOT_MOUNT_POINT}/loader/entries", exist_ok=True) @@ -362,7 +385,7 @@ def install_bootloader(args: argparse.Namespace) -> None: os.makedirs(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}/.extra-files", exist_ok=True) - subprocess.check_call(COPY_EXTRA_FILES) + run([COPY_EXTRA_FILES]) def main() -> None: @@ -370,7 +393,7 @@ def main() -> None: parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help=f"The default {DISTRO_NAME} config to boot") args = parser.parse_args() - subprocess.check_call(CHECK_MOUNTPOINTS) + run([CHECK_MOUNTPOINTS]) try: install_bootloader(args) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 761bbe6e03d4..8ecc6cfe8b4b 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -119,10 +119,12 @@ let "VNetHeader" "User" "Group" + "KeepCarrier" ]) (assertValueOneOf "MultiQueue" boolValues) (assertValueOneOf "PacketInfo" boolValues) (assertValueOneOf "VNetHeader" boolValues) + (assertValueOneOf "KeepCarrier" boolValues) ]; # See https://www.freedesktop.org/software/systemd/man/latest/systemd.netdev.html#%5BIPVTAP%5D%20Section%20Options @@ -632,6 +634,7 @@ let "LinkLocalAddressing" "IPv6LinkLocalAddressGenerationMode" "IPv6StableSecretAddress" + "IPv4LLStartAddress" "IPv4LLRoute" "DefaultRouteOnDevice" "LLMNR" @@ -654,12 +657,16 @@ let "IPv6AcceptRA" "IPv6DuplicateAddressDetection" "IPv6HopLimit" + "IPv4ReversePathFilter" + "IPv4AcceptLocal" + "IPv4RouteLocalnet" "IPv4ProxyARP" "IPv6ProxyNDP" "IPv6ProxyNDPAddress" "IPv6SendRA" "DHCPPrefixDelegation" "IPv6MTUBytes" + "KeepMaster" "Bridge" "Bond" "VRF" @@ -701,11 +708,15 @@ let (assertMinimum "IPv6DuplicateAddressDetection" 0) (assertInt "IPv6HopLimit") (assertMinimum "IPv6HopLimit" 0) + (assertValueOneOf "IPv4ReversePathFilter" ["no" "strict" "loose"]) + (assertValueOneOf "IPv4AcceptLocal" boolValues) + (assertValueOneOf "IPv4RouteLocalnet" boolValues) (assertValueOneOf "IPv4ProxyARP" boolValues) (assertValueOneOf "IPv6ProxyNDP" boolValues) (assertValueOneOf "IPv6SendRA" boolValues) (assertValueOneOf "DHCPPrefixDelegation" boolValues) (assertByteFormat "IPv6MTUBytes") + (assertValueOneOf "KeepMaster" boolValues) (assertValueOneOf "ActiveSlave" boolValues) (assertValueOneOf "PrimarySlave" boolValues) (assertValueOneOf "ConfigureWithoutCarrier" boolValues) diff --git a/nixos/modules/system/boot/systemd/journald.nix b/nixos/modules/system/boot/systemd/journald.nix index f9f05d2b08f4..586de87dbc8e 100644 --- a/nixos/modules/system/boot/systemd/journald.nix +++ b/nixos/modules/system/boot/systemd/journald.nix @@ -72,7 +72,7 @@ in { type = types.lines; example = "Storage=volatile"; description = '' - Extra config options for systemd-journald. See man journald.conf + Extra config options for systemd-journald. See {manpage}`journald.conf(5)` for available options. ''; }; diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 0cc6d9938e22..3414c5a1fc9d 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -35,9 +35,8 @@ with lib; echo "obtaining SSH key..." mkdir -m 0700 -p /root/.ssh if [ -s /etc/ec2-metadata/public-keys-0-openssh-key ]; then - cat /etc/ec2-metadata/public-keys-0-openssh-key >> /root/.ssh/authorized_keys + (umask 177; cat /etc/ec2-metadata/public-keys-0-openssh-key >> /root/.ssh/authorized_keys) echo "new key added to authorized_keys" - chmod 600 /root/.ssh/authorized_keys fi fi diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 98e36b0669e7..75c3834adc40 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -78,6 +78,7 @@ in rec { nginx nodejs openssh + opensshTest php postgresql python @@ -139,6 +140,7 @@ in rec { "nixos.tests.simple" "nixpkgs.jdk" "nixpkgs.tests-stdenv-gcc-stageCompare" + "nixpkgs.opensshTest" ]) ]; }; diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 379496583d25..2cba04f9d395 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -200,6 +200,14 @@ in { # Tests HTTP-01 verification using Lego's built-in web server http01lego.configuration = simpleConfig; + # account hash generation with default server from <= 23.11 + http01lego_legacyAccountHash.configuration = lib.mkMerge [ + simpleConfig + { + security.acme.defaults.server = lib.mkForce null; + } + ]; + renew.configuration = lib.mkMerge [ simpleConfig { @@ -424,7 +432,7 @@ in { backoff = BackoffTracker() - def switch_to(node, name): + def switch_to(node, name, allow_fail=False): # On first switch, this will create a symlink to the current system so that we can # quickly switch between derivations root_specs = "/tmp/specialisation" @@ -438,9 +446,14 @@ in { if rc > 0: switcher_path = f"/tmp/specialisation/{name}/bin/switch-to-configuration" - node.succeed( - f"{switcher_path} test" - ) + if not allow_fail: + node.succeed( + f"{switcher_path} test" + ) + else: + node.execute( + f"{switcher_path} test" + ) # Ensures the issuer of our cert matches the chain @@ -544,7 +557,7 @@ in { check_issuer(webserver, "http.example.test", "pebble") # Perform account hash test - with subtest("Assert that account hash didn't unexpected change"): + with subtest("Assert that account hash didn't unexpectedly change"): hash = webserver.succeed("ls /var/lib/acme/.lego/accounts/") print("Account hash: " + hash) assert hash.strip() == "d590213ed52603e9128d" @@ -727,5 +740,23 @@ in { webserver.wait_for_unit(f"acme-finished-{test_domain}.target") wait_for_server() check_connection_key_bits(client, test_domain, "384") + + # Perform http-01 w/ lego test again, but using the pre-24.05 account hashing + # (see https://github.com/NixOS/nixpkgs/pull/317257) + with subtest("Check account hashing compatibility with pre-24.05 settings"): + webserver.succeed("rm -rf /var/lib/acme/.lego/accounts/*") + switch_to(webserver, "http01lego_legacyAccountHash", allow_fail=True) + # unit is failed, but in a way that this throws no exception: + try: + webserver.wait_for_unit("acme-finished-http.example.test.target") + except Exception: + # The unit is allowed – or even expected – to fail due to not being able to + # reach the actual letsencrypt server. We only use it for serialising the + # test execution, such that the account check is done after the service run + # involving the account creation has been executed at least once. + pass + hash = webserver.succeed("ls /var/lib/acme/.lego/accounts/") + print("Account hash: " + hash) + assert hash.strip() == "1ccf607d9aa280e9af00" ''; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d16b747bfa95..8d67843a81ef 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -280,6 +280,7 @@ in { ecryptfs = handleTest ./ecryptfs.nix {}; fscrypt = handleTest ./fscrypt.nix {}; fastnetmon-advanced = runTest ./fastnetmon-advanced.nix; + eintopf = handleTest ./eintopf.nix {}; ejabberd = handleTest ./xmpp/ejabberd.nix {}; elk = handleTestOn ["x86_64-linux"] ./elk.nix {}; emacs-daemon = handleTest ./emacs-daemon.nix {}; @@ -322,6 +323,7 @@ in { firefox-devedition = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-devedition; }; firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job firefox-esr-115 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-115; }; + firefox-esr-128 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-128; }; firefoxpwa = handleTest ./firefoxpwa.nix {}; firejail = handleTest ./firejail.nix {}; firewall = handleTest ./firewall.nix { nftables = false; }; @@ -337,6 +339,7 @@ in { freenet = handleTest ./freenet.nix {}; freeswitch = handleTest ./freeswitch.nix {}; freetube = discoverTests (import ./freetube.nix); + freshrss-extensions = handleTest ./freshrss-extensions.nix {}; freshrss-sqlite = handleTest ./freshrss-sqlite.nix {}; freshrss-pgsql = handleTest ./freshrss-pgsql.nix {}; freshrss-http-auth = handleTest ./freshrss-http-auth.nix {}; @@ -361,6 +364,7 @@ in { gitlab = runTest ./gitlab.nix; gitolite = handleTest ./gitolite.nix {}; gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {}; + glance = runTest ./glance.nix; glusterfs = handleTest ./glusterfs.nix {}; gnome = handleTest ./gnome.nix {}; gnome-extensions = handleTest ./gnome-extensions.nix {}; @@ -522,6 +526,8 @@ in { lxd-image-server = handleTest ./lxd-image-server.nix {}; #logstash = handleTest ./logstash.nix {}; lomiri = handleTest ./lomiri.nix {}; + lomiri-calculator-app = runTest ./lomiri-calculator-app.nix; + lomiri-clock-app = runTest ./lomiri-clock-app.nix; lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix; lomiri-system-settings = handleTest ./lomiri-system-settings.nix {}; lorri = handleTest ./lorri/default.nix {}; @@ -534,7 +540,7 @@ in { mailman = handleTest ./mailman.nix {}; man = handleTest ./man.nix {}; mariadb-galera = handleTest ./mysql/mariadb-galera.nix {}; - mastodon = discoverTests (import ./web-apps/mastodon { inherit handleTestOn; }); + mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; }); pixelfed = discoverTests (import ./web-apps/pixelfed { inherit handleTestOn; }); mate = handleTest ./mate.nix {}; mate-wayland = handleTest ./mate-wayland.nix {}; diff --git a/nixos/tests/ayatana-indicators.nix b/nixos/tests/ayatana-indicators.nix index ccb1e059a697..cfd4d8099d11 100644 --- a/nixos/tests/ayatana-indicators.nix +++ b/nixos/tests/ayatana-indicators.nix @@ -35,7 +35,7 @@ in { ayatana-indicator-sound ] ++ (with pkgs.lomiri; [ lomiri-indicator-network - # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043 + telephony-service ]); }; diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index 4160e727f047..af7c12009c36 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -7,6 +7,8 @@ let keepFile = "important_file"; keepFileData = "important_data"; localRepo = "/root/back:up"; + # a repository on a file system which is not mounted automatically + localRepoMount = "/noAutoMount"; archiveName = "my_archive"; remoteRepo = "borg@server:."; # No need to specify path privateKey = pkgs.writeText "id_ed25519" '' @@ -42,6 +44,12 @@ in { nodes = { client = { ... }: { + virtualisation.fileSystems.${localRepoMount} = { + device = "tmpfs"; + fsType = "tmpfs"; + options = [ "noauto" ]; + }; + services.borgbackup.jobs = { local = { @@ -65,6 +73,13 @@ in { startAt = [ ]; # Do not run automatically }; + localMount = { + paths = dataDir; + repo = localRepoMount; + encryption.mode = "none"; + startAt = [ ]; + }; + remote = { paths = dataDir; repo = remoteRepo; @@ -178,6 +193,17 @@ in { "cat /mnt/borg/${dataDir}/${keepFile}" ) + with subtest("localMount"): + # the file system for the repo should not be already mounted + client.fail("mount | grep ${localRepoMount}") + # ensure trying to write to the mountpoint before the fs is mounted fails + client.succeed("chattr +i ${localRepoMount}") + borg = "borg" + client.systemctl("start --wait borgbackup-job-localMount") + client.fail("systemctl is-failed borgbackup-job-localMount") + # Make sure exactly one archive has been created + assert int(client.succeed("{} list '${localRepoMount}' | wc -l".format(borg))) > 0 + with subtest("remote"): borg = "BORG_RSH='ssh -oStrictHostKeyChecking=no -i /root/id_ed25519' borg" server.wait_for_unit("sshd.service") diff --git a/nixos/tests/cgit.nix b/nixos/tests/cgit.nix index 6aed06adefdf..3107e7b964a3 100644 --- a/nixos/tests/cgit.nix +++ b/nixos/tests/cgit.nix @@ -23,7 +23,7 @@ in { nginx.location = "/(c)git/"; repos = { some-repo = { - path = "/srv/git/some-repo"; + path = "/tmp/git/some-repo"; desc = "some-repo description"; }; }; @@ -50,12 +50,12 @@ in { server.fail("curl -fsS http://localhost/robots.txt") - server.succeed("${pkgs.writeShellScript "setup-cgit-test-repo" '' + server.succeed("sudo -u cgit ${pkgs.writeShellScript "setup-cgit-test-repo" '' set -e - git init --bare -b master /srv/git/some-repo + git init --bare -b master /tmp/git/some-repo git init -b master reference cd reference - git remote add origin /srv/git/some-repo + git remote add origin /tmp/git/some-repo date > date.txt git add date.txt git -c user.name=test -c user.email=test@localhost commit -m 'add date' diff --git a/nixos/tests/cinnamon-wayland.nix b/nixos/tests/cinnamon-wayland.nix index 19529d820d9c..cba0c9f60e8d 100644 --- a/nixos/tests/cinnamon-wayland.nix +++ b/nixos/tests/cinnamon-wayland.nix @@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; # For the sessionPath subtest. - services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ]; + services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ]; }; enableOCR = true; diff --git a/nixos/tests/cinnamon.nix b/nixos/tests/cinnamon.nix index 694308152149..57300c3e4b16 100644 --- a/nixos/tests/cinnamon.nix +++ b/nixos/tests/cinnamon.nix @@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { environment.cinnamon.excludePackages = [ pkgs.gnome-text-editor ]; # For the sessionPath subtest. - services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ]; + services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ]; }; enableOCR = true; diff --git a/nixos/tests/curl-impersonate.nix b/nixos/tests/curl-impersonate.nix index 33b10da1dfd0..97143951d4b0 100644 --- a/nixos/tests/curl-impersonate.nix +++ b/nixos/tests/curl-impersonate.nix @@ -113,7 +113,7 @@ in { name = "curl-impersonate"; meta = with lib.maintainers; { - maintainers = [ lilyinstarlight ]; + maintainers = [ ]; }; nodes = { diff --git a/nixos/tests/eintopf.nix b/nixos/tests/eintopf.nix new file mode 100644 index 000000000000..a1c05d651304 --- /dev/null +++ b/nixos/tests/eintopf.nix @@ -0,0 +1,21 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "eintopf"; + meta = with pkgs.lib.maintainers; { + maintainers = [ onny ]; + }; + + nodes = { + eintopf = { config, pkgs, ... }: { + services.eintopf = { + enable = true; + }; + }; + }; + + testScript = '' + eintopf.start + eintopf.wait_for_unit("eintopf.service") + eintopf.wait_for_open_port(3333) + eintopf.succeed("curl -sSfL http://eintopf:3333 | grep 'Es sind keine Veranstaltungen eingetragen'") + ''; +}) diff --git a/nixos/tests/freshrss-extensions.nix b/nixos/tests/freshrss-extensions.nix new file mode 100644 index 000000000000..f3e893b3b5a8 --- /dev/null +++ b/nixos/tests/freshrss-extensions.nix @@ -0,0 +1,19 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "freshrss"; + + nodes.machine = { pkgs, ... }: { + services.freshrss = { + enable = true; + baseUrl = "http://localhost"; + authType = "none"; + extensions = [ pkgs.freshrss-extensions.youtube ]; + }; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.wait_for_open_port(80) + response = machine.succeed("curl -vvv -s http://127.0.0.1:80/i/?c=extension") + assert 'YouTube Video Feed' in response, "Extension not present in extensions page." + ''; +}) diff --git a/nixos/tests/frp.nix b/nixos/tests/frp.nix index 1f57c031a53a..717e8718721c 100644 --- a/nixos/tests/frp.nix +++ b/nixos/tests/frp.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "frp"; - meta.maintainers = with lib.maintainers; [ zaldnoay janik ]; + meta.maintainers = with lib.maintainers; [ zaldnoay ]; nodes = { frps = { networking = { diff --git a/nixos/tests/gitolite-fcgiwrap.nix b/nixos/tests/gitolite-fcgiwrap.nix index abf1db37003a..6e8dae6f72d7 100644 --- a/nixos/tests/gitolite-fcgiwrap.nix +++ b/nixos/tests/gitolite-fcgiwrap.nix @@ -24,7 +24,12 @@ import ./make-test-python.nix ( { networking.firewall.allowedTCPPorts = [ 80 ]; - services.fcgiwrap.enable = true; + services.fcgiwrap.gitolite = { + process.user = "gitolite"; + process.group = "gitolite"; + socket = { inherit (config.services.nginx) user group; }; + }; + services.gitolite = { enable = true; adminPubkey = adminPublicKey; @@ -59,7 +64,7 @@ import ./make-test-python.nix ( fastcgi_param SCRIPT_FILENAME ${pkgs.gitolite}/bin/gitolite-shell; # use Unix domain socket or inet socket - fastcgi_pass unix:/run/fcgiwrap.sock; + fastcgi_pass unix:${config.services.fcgiwrap.gitolite.socket.address}; ''; }; @@ -82,7 +87,7 @@ import ./make-test-python.nix ( server.wait_for_unit("gitolite-init.service") server.wait_for_unit("nginx.service") - server.wait_for_file("/run/fcgiwrap.sock") + server.wait_for_file("/run/fcgiwrap-gitolite.sock") client.wait_for_unit("multi-user.target") client.succeed( diff --git a/nixos/tests/glance.nix b/nixos/tests/glance.nix new file mode 100644 index 000000000000..daa3d9a4a816 --- /dev/null +++ b/nixos/tests/glance.nix @@ -0,0 +1,36 @@ +{ lib, ... }: + +{ + name = "glance"; + + nodes = { + machine_default = + { pkgs, ... }: + { + services.glance = { + enable = true; + }; + }; + + machine_custom_port = + { pkgs, ... }: + { + services.glance = { + enable = true; + settings.server.port = 5678; + }; + }; + }; + + testScript = '' + machine_default.start() + machine_default.wait_for_unit("glance.service") + machine_default.wait_for_open_port(8080) + + machine_custom_port.start() + machine_custom_port.wait_for_unit("glance.service") + machine_custom_port.wait_for_open_port(5678) + ''; + + meta.maintainers = [ lib.maintainers.drupol ]; +} diff --git a/nixos/tests/grafana/basic.nix b/nixos/tests/grafana/basic.nix index dd389bc8a3d1..fae6bd4dbbcf 100644 --- a/nixos/tests/grafana/basic.nix +++ b/nixos/tests/grafana/basic.nix @@ -10,7 +10,7 @@ let analytics.reporting_enabled = false; server = { - http_addr = "localhost"; + http_addr = "::1"; domain = "localhost"; }; @@ -47,7 +47,7 @@ let postgresql = { services.grafana.settings.database = { - host = "127.0.0.1:5432"; + host = "[::1]:5432"; user = "grafana"; }; services.postgresql = { @@ -91,9 +91,9 @@ in { with subtest("Declarative plugins installed"): declarativePlugins.wait_for_unit("grafana.service") - declarativePlugins.wait_for_open_port(3000) + declarativePlugins.wait_for_open_port(3000, addr="::1") declarativePlugins.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/plugins | grep grafana-clock-panel" + "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/plugins | grep grafana-clock-panel" ) declarativePlugins.shutdown() @@ -101,10 +101,10 @@ in { sqlite.wait_for_unit("grafana.service") sqlite.wait_for_open_port(3000) print(sqlite.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users -i" + "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/org/users -i" )) sqlite.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep admin\@localhost" + "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/org/users | grep admin\@localhost" ) sqlite.shutdown() @@ -112,10 +112,10 @@ in { socket.wait_for_unit("grafana.service") socket.wait_for_open_port(80) print(socket.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1/api/org/users -i" + "curl -sSfN -u testadmin:snakeoilpwd http://[::1]/api/org/users -i" )) socket.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1/api/org/users | grep admin\@localhost" + "curl -sSfN -u testadmin:snakeoilpwd http://[::1]/api/org/users | grep admin\@localhost" ) socket.shutdown() @@ -125,7 +125,7 @@ in { postgresql.wait_for_open_port(3000) postgresql.wait_for_open_port(5432) postgresql.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep admin\@localhost" + "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/org/users | grep admin\@localhost" ) postgresql.shutdown() @@ -135,7 +135,7 @@ in { mysql.wait_for_open_port(3000) mysql.wait_for_open_port(3306) mysql.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep admin\@localhost" + "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/org/users | grep admin\@localhost" ) mysql.shutdown() ''; diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index f9dd8b2961ac..775fae9b71ba 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -11,7 +11,7 @@ let analytics.reporting_enabled = false; server = { - http_addr = "localhost"; + http_addr = "::1"; domain = "localhost"; }; @@ -177,41 +177,41 @@ in { for description, machine in [nodeNix, nodeYaml, nodeYamlDir]: with subtest(f"Should start provision node: {description}"): machine.wait_for_unit("grafana.service") - machine.wait_for_open_port(3000) + machine.wait_for_open_port(3000, addr="::1") with subtest(f"Successful datasource provision with {description}"): machine.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/datasources/uid/test_datasource | grep Test\ Datasource" + "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/datasources/uid/test_datasource | grep Test\ Datasource" ) with subtest(f"Successful dashboard provision with {description}"): machine.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/dashboards/uid/test_dashboard | grep Test\ Dashboard" + "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/dashboards/uid/test_dashboard | grep Test\ Dashboard" ) with subtest(f"Successful rule provision with {description}"): machine.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/alert-rules/test_rule | grep Test\ Rule" + "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/alert-rules/test_rule | grep Test\ Rule" ) with subtest(f"Successful contact point provision with {description}"): machine.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/contact-points | grep Test\ Contact\ Point" + "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/contact-points | grep Test\ Contact\ Point" ) with subtest(f"Successful policy provision with {description}"): machine.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/policies | grep Test\ Contact\ Point" + "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/policies | grep Test\ Contact\ Point" ) with subtest(f"Successful template provision with {description}"): machine.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/templates | grep Test\ Template" + "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/templates | grep Test\ Template" ) with subtest("Successful mute timings provision with {description}"): machine.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/mute-timings | grep Test\ Mute\ Timing" + "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/mute-timings | grep Test\ Mute\ Timing" ) ''; }) diff --git a/nixos/tests/graylog.nix b/nixos/tests/graylog.nix index 3f7cc3a91439..9d19dcf028eb 100644 --- a/nixos/tests/graylog.nix +++ b/nixos/tests/graylog.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { nodes.machine = { pkgs, ... }: { virtualisation.memorySize = 4096; - virtualisation.diskSize = 4096; + virtualisation.diskSize = 1024 * 6; services.mongodb.enable = true; services.elasticsearch.enable = true; @@ -65,9 +65,18 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { in '' machine.start() machine.wait_for_unit("graylog.service") + + machine.wait_until_succeeds( + "journalctl -o cat -u graylog.service | grep 'Started REST API at <127.0.0.1:9000>'" + ) + machine.wait_for_open_port(9000) machine.succeed("curl -sSfL http://127.0.0.1:9000/") + machine.wait_until_succeeds( + "journalctl -o cat -u graylog.service | grep 'Graylog server up and running'" + ) + session = machine.succeed( "curl -X POST " + "-sSfL http://127.0.0.1:9000/api/system/sessions " @@ -87,6 +96,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { + "-H 'x-requested-by: cli' " ) + machine.wait_until_succeeds( + "journalctl -o cat -u graylog.service | grep -E 'Input \[GELF UDP/Demo/[[:alnum:]]{24}\] is now RUNNING'" + ) + machine.wait_until_succeeds( "test \"$(curl -sSfL 'http://127.0.0.1:9000/api/cluster/inputstates' " + f"-u {session}:session " diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 6a8633808702..e22c7d735a23 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -47,6 +47,9 @@ in mapAttrs (_: lP: testsForLinuxPackages lP) kernels // { passthru = { inherit testsForLinuxPackages; + # Useful for development testing of all Kernel configs without building full Kernel + configfiles = mapAttrs (_: lP: lP.kernel.configfile) kernels; + testsForKernel = kernel: testsForLinuxPackages (pkgs.linuxPackagesFor kernel); }; } diff --git a/nixos/tests/libvirtd.nix b/nixos/tests/libvirtd.nix index df80dcc21a2e..27ffaac3e62d 100644 --- a/nixos/tests/libvirtd.nix +++ b/nixos/tests/libvirtd.nix @@ -20,6 +20,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { networking.hostId = "deadbeef"; # needed for zfs security.polkit.enable = true; environment.systemPackages = with pkgs; [ virt-manager ]; + + # This adds `resolve` to the `hosts` line of /etc/nsswitch.conf; NSS modules placed after it + # will not be consulted. Therefore this tests that the libvirtd NSS modules will be + # be placed early enough for name resolution to work. + services.resolved.enable = true; }; }; diff --git a/nixos/tests/lomiri-calculator-app.nix b/nixos/tests/lomiri-calculator-app.nix new file mode 100644 index 000000000000..3231353097a7 --- /dev/null +++ b/nixos/tests/lomiri-calculator-app.nix @@ -0,0 +1,59 @@ +{ pkgs, lib, ... }: +{ + name = "lomiri-calculator-app-standalone"; + meta.maintainers = lib.teams.lomiri.members; + + nodes.machine = + { config, pkgs, ... }: + { + imports = [ ./common/x11.nix ]; + + services.xserver.enable = true; + + environment = { + systemPackages = with pkgs.lomiri; [ + suru-icon-theme + lomiri-calculator-app + ]; + variables = { + UITK_ICON_THEME = "suru"; + }; + }; + + i18n.supportedLocales = [ "all" ]; + + fonts.packages = with pkgs; [ + # Intended font & helps with OCR + ubuntu_font_family + ]; + }; + + enableOCR = true; + + testScript = '' + machine.wait_for_x() + + with subtest("lomiri calculator launches"): + machine.execute("lomiri-calculator-app >&2 &") + machine.wait_for_text("Calculator") + machine.screenshot("lomiri-calculator") + + with subtest("lomiri calculator works"): + machine.send_key("tab") # Fix focus + + machine.send_chars("22*16\n") + machine.wait_for_text("352") + machine.screenshot("lomiri-calculator_caninfactdobasicmath") + + machine.succeed("pkill -f lomiri-calculator-app") + + with subtest("lomiri calculator localisation works"): + machine.execute("env LANG=de_DE.UTF-8 lomiri-calculator-app >&2 &") + machine.wait_for_text("Rechner") + machine.screenshot("lomiri-calculator_localised") + + # History of previous run should have loaded + with subtest("lomiri calculator history works"): + machine.wait_for_text("352") + ''; +} diff --git a/nixos/tests/lomiri-clock-app.nix b/nixos/tests/lomiri-clock-app.nix new file mode 100644 index 000000000000..e68b89def534 --- /dev/null +++ b/nixos/tests/lomiri-clock-app.nix @@ -0,0 +1,48 @@ +{ pkgs, lib, ... }: +{ + name = "lomiri-clock-app-standalone"; + meta.maintainers = lib.teams.lomiri.members; + + nodes.machine = + { config, pkgs, ... }: + { + imports = [ ./common/x11.nix ]; + + services.xserver.enable = true; + + environment = { + systemPackages = with pkgs.lomiri; [ + suru-icon-theme + lomiri-clock-app + ]; + variables = { + UITK_ICON_THEME = "suru"; + }; + }; + + i18n.supportedLocales = [ "all" ]; + + fonts.packages = with pkgs; [ + # Intended font & helps with OCR + ubuntu_font_family + ]; + }; + + enableOCR = true; + + testScript = '' + machine.wait_for_x() + + with subtest("lomiri clock launches"): + machine.execute("lomiri-clock-app >&2 &") + machine.wait_for_text(r"(clock.ubports|City|Alarms)") + machine.screenshot("lomiri-clock_open") + + machine.succeed("pkill -f lomiri-clock-app") + + with subtest("lomiri clock localisation works"): + machine.execute("env LANG=de_DE.UTF-8 lomiri-clock-app >&2 &") + machine.wait_for_text(r"(Stadt|Weckzeiten)") + machine.screenshot("lomiri-clock_localised") + ''; +} diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index d1fbab7aba08..912f4564ef7b 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -74,6 +74,24 @@ in { inherit (alacritty) meta; }) + + # Polkit requests eventually time out. + # Keep triggering them until we signal detection success + (writeShellApplication { + name = "lpa-check"; + text = '' + while [ ! -f /tmp/lpa-checked ]; do + pkexec echo a + done + ''; + }) + # Signal detection success + (writeShellApplication { + name = "lpa-signal"; + text = '' + touch /tmp/lpa-checked + ''; + }) ]; }; @@ -201,7 +219,15 @@ in { machine.wait_for_text(r"(/build/source|hub.cpp|handler.cpp|void|virtual|const)") # awaiting log messages from content-hub machine.send_key("ctrl-c") - machine.send_key("alt-f4") + # Doing this here, since we need an in-session shell & separately starting a terminal again wastes time + with subtest("polkit agent works"): + machine.send_chars("exec lpa-check\n") + machine.wait_for_text(r"(Elevated permissions|Login)") + machine.screenshot("polkit_agent") + machine.execute("lpa-signal") + + # polkit test will quit terminal when agent request times out after OCR success + machine.wait_until_fails("pgrep -u ${user} -f lomiri-terminal-app") # We want the ability to launch applications with subtest("starter menu works"): @@ -282,6 +308,7 @@ in { # Testing any more would require more applications & setup, the fact that it's already being attempted is a good sign machine.send_key("esc") + machine.sleep(2) # sleep a tiny bit so morph can close & the focus can return to LSS machine.send_key("alt-f4") # The ayatana indicators are an important part of the experience, and they hold the only graphical way of exiting the session. diff --git a/nixos/tests/lorri/default.nix b/nixos/tests/lorri/default.nix index a4bdc92490ce..e9e26c03f6ca 100644 --- a/nixos/tests/lorri/default.nix +++ b/nixos/tests/lorri/default.nix @@ -17,12 +17,12 @@ import ../make-test-python.nix { # Start the daemon and wait until it is ready machine.execute("lorri daemon > lorri.stdout 2> lorri.stderr &") - machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stdout") + machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stderr") # Ping the daemon - machine.succeed("lorri internal ping shell.nix") + machine.succeed("lorri internal ping --shell-file shell.nix") # Wait for the daemon to finish the build - machine.wait_until_succeeds("grep --fixed-strings 'Completed' lorri.stdout") + machine.wait_until_succeeds("grep --fixed-strings 'Completed' lorri.stderr") ''; } diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix index c0980b23e78f..eca29292721f 100644 --- a/nixos/tests/mosquitto.nix +++ b/nixos/tests/mosquitto.nix @@ -55,7 +55,7 @@ let in { name = "mosquitto"; meta = with pkgs.lib; { - maintainers = with maintainers; [ pennae peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; }; nodes = let diff --git a/nixos/tests/networking/networkmanager.nix b/nixos/tests/networking/networkmanager.nix index e654e37d7efb..c8c44f9320d4 100644 --- a/nixos/tests/networking/networkmanager.nix +++ b/nixos/tests/networking/networkmanager.nix @@ -166,7 +166,7 @@ let in lib.mapAttrs (lib.const (attrs: makeTest (attrs // { name = "${attrs.name}-Networking-NetworkManager"; meta = { - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; }; }))) testCases diff --git a/nixos/tests/nzbhydra2.nix b/nixos/tests/nzbhydra2.nix index e1d528cd9520..6262a50b4be0 100644 --- a/nixos/tests/nzbhydra2.nix +++ b/nixos/tests/nzbhydra2.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ lib, ... }: { name = "nzbhydra2"; - meta.maintainers = with lib.maintainers; [ jamiemagee ]; + meta.maintainers = with lib.maintainers; [ matteopacini ]; nodes.machine = { pkgs, ... }: { services.nzbhydra2.enable = true; }; diff --git a/nixos/tests/pam/pam-u2f.nix b/nixos/tests/pam/pam-u2f.nix index 46e307a3f125..caa56c30bbce 100644 --- a/nixos/tests/pam/pam-u2f.nix +++ b/nixos/tests/pam/pam-u2f.nix @@ -7,12 +7,16 @@ import ../make-test-python.nix ({ ... }: { ... }: { security.pam.u2f = { - control = "required"; - cue = true; - debug = true; enable = true; - interactive = true; - origin = "nixos-test"; + control = "required"; + settings = { + cue = true; + debug = true; + interactive = true; + origin = "nixos-test"; + # Freeform option + userpresence = 1; + }; }; }; @@ -20,7 +24,7 @@ import ../make-test-python.nix ({ ... }: '' machine.wait_for_unit("multi-user.target") machine.succeed( - 'egrep "auth required .*/lib/security/pam_u2f.so.*cue.*debug.*interactive.*origin=nixos-test" /etc/pam.d/ -R' + 'egrep "auth required .*/lib/security/pam_u2f.so.*cue.*debug.*interactive.*origin=nixos-test.*userpresence=1" /etc/pam.d/ -R' ) ''; }) diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix index b6ebab9b0198..5c52abf9c720 100644 --- a/nixos/tests/plotinus.nix +++ b/nixos/tests/plotinus.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { { imports = [ ./common/x11.nix ]; programs.plotinus.enable = true; - environment.systemPackages = [ pkgs.gnome.gnome-calculator pkgs.xdotool ]; + environment.systemPackages = [ pkgs.gnome-calculator pkgs.xdotool ]; }; testScript = '' diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 56569c4de2c8..37f25546da69 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -209,6 +209,34 @@ let ''; }; + deluge = { + exporterConfig = { + enable = true; + port = 1234; + listenAddress = "127.0.0.1"; + + delugeUser = "user"; + delugePort = 2345; + delugePasswordFile = pkgs.writeText "password" "weak_password"; + }; + metricProvider = { + services.deluge.enable = true; + services.deluge.declarative = true; + services.deluge.config.daemon_port = 2345; + services.deluge.authFile = pkgs.writeText "authFile" '' + localclient:abcdef:10 + user:weak_password:10 + ''; + }; + exporterTest = '' + wait_for_unit("deluged.service") + wait_for_open_port(2345) + wait_for_unit("prometheus-deluge-exporter.service") + wait_for_open_port(1234) + succeed("curl -sSf http://localhost:1234 | grep 'deluge_torrents'") + ''; + }; + dnsmasq = { exporterConfig = { enable = true; @@ -314,10 +342,9 @@ let tokenPath = pkgs.writeText "token" "abc123"; }; - # noop: fastly's exporter can't start without first talking to fastly - # see: https://github.com/peterbourgon/fastly-exporter/issues/87 exporterTest = '' - succeed("true"); + wait_for_unit("prometheus-fastly-exporter.service") + wait_for_open_port(9118) ''; }; diff --git a/nixos/tests/prometheus/alertmanager.nix b/nixos/tests/prometheus/alertmanager.nix index feda8d8fc2bc..6301db6df62e 100644 --- a/nixos/tests/prometheus/alertmanager.nix +++ b/nixos/tests/prometheus/alertmanager.nix @@ -144,5 +144,9 @@ import ../make-test-python.nix ({ lib, pkgs, ... }: logger.wait_until_succeeds( "journalctl -o cat -u alertmanager-webhook-logger.service | grep '\"alertname\":\"InstanceDown\"'" ) + + logger.log(logger.succeed("systemd-analyze security alertmanager-webhook-logger.service | grep -v '✓'")) + + alertmanager.log(alertmanager.succeed("systemd-analyze security alertmanager.service | grep -v '✓'")) ''; }) diff --git a/nixos/tests/prometheus/pushgateway.nix b/nixos/tests/prometheus/pushgateway.nix index 7904c8bf45b0..261c41598eb0 100644 --- a/nixos/tests/prometheus/pushgateway.nix +++ b/nixos/tests/prometheus/pushgateway.nix @@ -90,5 +90,7 @@ import ../make-test-python.nix ({ lib, pkgs, ... }: "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=absent(some_metric)' | " + "jq '.data.result[0].value[1]' | grep '\"1\"'" ) + + pushgateway.log(pushgateway.succeed("systemd-analyze security pushgateway.service | grep -v '✓'")) ''; }) diff --git a/nixos/tests/scion/freestanding-deployment/default.nix b/nixos/tests/scion/freestanding-deployment/default.nix index 0c9686fbfbad..e060f9c31270 100644 --- a/nixos/tests/scion/freestanding-deployment/default.nix +++ b/nixos/tests/scion/freestanding-deployment/default.nix @@ -156,17 +156,51 @@ in # List of AS instances machines = [scion01, scion02, scion03, scion04, scion05] + # Functions to avoid many for loops + def start(allow_reboot=False): + for i in machines: + i.start(allow_reboot=allow_reboot) + + def wait_for_unit(service_name): + for i in machines: + i.wait_for_unit(service_name) + + def succeed(command): + for i in machines: + i.succeed(command) + + def reboot(): + for i in machines: + i.reboot() + + def crash(): + for i in machines: + i.crash() + + # Start all machines, allowing reboot for later + start(allow_reboot=True) + # Wait for scion-control.service on all instances - for i in machines: - i.wait_for_unit("scion-control.service") + wait_for_unit("scion-control.service") # Execute pingAll command on all instances - for i in machines: - i.succeed("${pingAll} >&2") + succeed("${pingAll} >&2") - # Restart scion-dispatcher and ping again to test robustness - for i in machines: - i.succeed("systemctl restart scion-dispatcher >&2") - i.succeed("${pingAll} >&2") + # Restart all scion services and ping again to test robustness + succeed("systemctl restart scion-* >&2") + succeed("${pingAll} >&2") + + # Reboot machines, wait for service, and ping again + reboot() + wait_for_unit("scion-control.service") + succeed("${pingAll} >&2") + + # Crash, start, wait for service, and ping again + crash() + start() + wait_for_unit("scion-control.service") + succeed("pkill -9 scion-* >&2") + wait_for_unit("scion-control.service") + succeed("${pingAll} >&2") ''; }) diff --git a/nixos/tests/shiori.nix b/nixos/tests/shiori.nix index d0f68b903f8c..ba9b42235df2 100644 --- a/nixos/tests/shiori.nix +++ b/nixos/tests/shiori.nix @@ -1,80 +1,81 @@ -import ./make-test-python.nix ({ pkgs, lib, ...}: +import ./make-test-python.nix ({ pkgs, lib, ... }: -{ - name = "shiori"; - meta.maintainers = with lib.maintainers; [ minijackson ]; + { + name = "shiori"; + meta.maintainers = with lib.maintainers; [ minijackson ]; - nodes.machine = - { ... }: - { services.shiori.enable = true; }; + nodes.machine = { ... }: { services.shiori.enable = true; }; - testScript = let - authJSON = pkgs.writeText "auth.json" (builtins.toJSON { - username = "shiori"; - password = "gopher"; - owner = true; - }); + testScript = let + authJSON = pkgs.writeText "auth.json" (builtins.toJSON { + username = "shiori"; + password = "gopher"; + owner = true; + }); - insertBookmark = { - url = "http://example.org"; - title = "Example Bookmark"; - }; + insertBookmark = { + url = "http://example.org"; + title = "Example Bookmark"; + }; - insertBookmarkJSON = pkgs.writeText "insertBookmark.json" (builtins.toJSON insertBookmark); - in '' - import json + insertBookmarkJSON = + pkgs.writeText "insertBookmark.json" (builtins.toJSON insertBookmark); + in '' + #import json - machine.wait_for_unit("shiori.service") - machine.wait_for_open_port(8080) - machine.succeed("curl --fail http://localhost:8080/") - machine.succeed("curl --fail --location http://localhost:8080/ | grep -i shiori") + machine.wait_for_unit("shiori.service") + machine.wait_for_open_port(8080) + machine.succeed("curl --fail http://localhost:8080/") + machine.succeed("curl --fail --location http://localhost:8080/ | grep -i shiori") - with subtest("login"): - auth_json = machine.succeed( - "curl --fail --location http://localhost:8080/api/login " - "-X POST -H 'Content-Type:application/json' -d @${authJSON}" - ) - auth_ret = json.loads(auth_json) - session_id = auth_ret["session"] + # The test code below no longer works because the API authentication has changed. - with subtest("bookmarks"): - with subtest("first use no bookmarks"): - bookmarks_json = machine.succeed( - ( - "curl --fail --location http://localhost:8080/api/bookmarks " - "-H 'X-Session-Id:{}'" - ).format(session_id) - ) + #with subtest("login"): + # auth_json = machine.succeed( + # "curl --fail --location http://localhost:8080/api/login " + # "-X POST -H 'Content-Type:application/json' -d @${authJSON}" + # ) + # auth_ret = json.loads(auth_json) + # session_id = auth_ret["session"] - if json.loads(bookmarks_json)["bookmarks"] != []: - raise Exception("Shiori have a bookmark on first use") + #with subtest("bookmarks"): + # with subtest("first use no bookmarks"): + # bookmarks_json = machine.succeed( + # ( + # "curl --fail --location http://localhost:8080/api/bookmarks " + # "-H 'X-Session-Id:{}'" + # ).format(session_id) + # ) - with subtest("insert bookmark"): - machine.succeed( - ( - "curl --fail --location http://localhost:8080/api/bookmarks " - "-X POST -H 'X-Session-Id:{}' " - "-H 'Content-Type:application/json' -d @${insertBookmarkJSON}" - ).format(session_id) - ) + # if json.loads(bookmarks_json)["bookmarks"] != []: + # raise Exception("Shiori have a bookmark on first use") - with subtest("get inserted bookmark"): - bookmarks_json = machine.succeed( - ( - "curl --fail --location http://localhost:8080/api/bookmarks " - "-H 'X-Session-Id:{}'" - ).format(session_id) - ) + # with subtest("insert bookmark"): + # machine.succeed( + # ( + # "curl --fail --location http://localhost:8080/api/bookmarks " + # "-X POST -H 'X-Session-Id:{}' " + # "-H 'Content-Type:application/json' -d @${insertBookmarkJSON}" + # ).format(session_id) + # ) - bookmarks = json.loads(bookmarks_json)["bookmarks"] - if len(bookmarks) != 1: - raise Exception("Shiori didn't save the bookmark") + # with subtest("get inserted bookmark"): + # bookmarks_json = machine.succeed( + # ( + # "curl --fail --location http://localhost:8080/api/bookmarks " + # "-H 'X-Session-Id:{}'" + # ).format(session_id) + # ) - bookmark = bookmarks[0] - if ( - bookmark["url"] != "${insertBookmark.url}" - or bookmark["title"] != "${insertBookmark.title}" - ): - raise Exception("Inserted bookmark doesn't have same URL or title") - ''; -}) + # bookmarks = json.loads(bookmarks_json)["bookmarks"] + # if len(bookmarks) != 1: + # raise Exception("Shiori didn't save the bookmark") + + # bookmark = bookmarks[0] + # if ( + # bookmark["url"] != "${insertBookmark.url}" + # or bookmark["title"] != "${insertBookmark.title}" + # ): + # raise Exception("Inserted bookmark doesn't have same URL or title") + ''; + }) diff --git a/nixos/tests/soju.nix b/nixos/tests/soju.nix index 23da36f7b3ab..32d1daf43d1a 100644 --- a/nixos/tests/soju.nix +++ b/nixos/tests/soju.nix @@ -8,7 +8,7 @@ let in { name = "soju"; - meta.maintainers = with lib.maintainers; [ Benjamin-L ]; + meta.maintainers = with lib.maintainers; [ ]; nodes.machine = { ... }: { services.soju = { diff --git a/nixos/tests/systemd-boot-ovmf-broken-fat-driver.patch b/nixos/tests/systemd-boot-ovmf-broken-fat-driver.patch deleted file mode 100644 index ef547c02f918..000000000000 --- a/nixos/tests/systemd-boot-ovmf-broken-fat-driver.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d87a7513c6f2f2824203032ef27caeb84892ed7e Mon Sep 17 00:00:00 2001 -From: Will Fancher -Date: Tue, 30 May 2023 16:53:20 -0400 -Subject: [PATCH] Intentionally break the fat driver - ---- - FatPkg/EnhancedFatDxe/ReadWrite.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/FatPkg/EnhancedFatDxe/ReadWrite.c b/FatPkg/EnhancedFatDxe/ReadWrite.c -index 8f525044d1f1..32c62ff7817b 100644 ---- a/FatPkg/EnhancedFatDxe/ReadWrite.c -+++ b/FatPkg/EnhancedFatDxe/ReadWrite.c -@@ -216,6 +216,11 @@ FatIFileAccess ( - Volume = OFile->Volume; - Task = NULL; - -+ if (*BufferSize > (10U * 1024U * 1024U)) { -+ IFile->Position += 10U * 1024U * 1024U; -+ return EFI_BAD_BUFFER_SIZE; -+ } -+ - // - // Write to a directory is unsupported - // diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index 54c380602bd4..a7b220d11168 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -239,7 +239,7 @@ in memtest86 = makeTest { name = "systemd-boot-memtest86"; - meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ]; + meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -254,7 +254,7 @@ in netbootxyz = makeTest { name = "systemd-boot-netbootxyz"; - meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ]; + meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -269,7 +269,7 @@ in memtestSortKey = makeTest { name = "systemd-boot-memtest-sortkey"; - meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ]; + meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -307,7 +307,7 @@ in extraEntries = makeTest { name = "systemd-boot-extra-entries"; - meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ]; + meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -326,7 +326,7 @@ in extraFiles = makeTest { name = "systemd-boot-extra-files"; - meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ]; + meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -343,7 +343,7 @@ in switch-test = makeTest { name = "systemd-boot-switch-test"; - meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ]; + meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; nodes = { inherit common; @@ -428,32 +428,6 @@ in ''; }; - # Some UEFI firmwares fail on large reads. Now that systemd-boot loads initrd - # itself, systems with such firmware won't boot without this fix - uefiLargeFileWorkaround = makeTest { - name = "uefi-large-file-workaround"; - meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; - nodes.machine = { pkgs, ... }: { - imports = [common]; - virtualisation.efi.OVMF = pkgs.OVMF.overrideAttrs (old: { - # This patch deliberately breaks the FAT driver in EDK2 to - # exhibit (part of) the firmware bug that we are testing - # for. Files greater than 10MiB will fail to be read in a - # single Read() call, so systemd-boot will fail to load the - # initrd without a workaround. The number 10MiB was chosen - # because if it were smaller than the kernel size, even the - # LoadImage call would fail, which is not the failure mode - # we're testing for. It needs to be between the kernel size - # and the initrd size. - patches = old.patches or [] ++ [ ./systemd-boot-ovmf-broken-fat-driver.patch ]; - }); - }; - - testScript = '' - machine.wait_for_unit("multi-user.target") - ''; - }; - no-bootspec = makeTest { name = "systemd-boot-no-bootspec"; diff --git a/nixos/tests/systemd-confinement/default.nix b/nixos/tests/systemd-confinement/default.nix index 15d442d476b0..4ca37b3b9126 100644 --- a/nixos/tests/systemd-confinement/default.nix +++ b/nixos/tests/systemd-confinement/default.nix @@ -153,7 +153,7 @@ import ../make-test-python.nix { }) ''; } - ]) (lib.cartesianProductOfSets { + ]) (lib.cartesianProduct { user = [ "root" "dynamic-user" "static-user" ]; privateTmp = [ true false ]; }); diff --git a/nixos/tests/teleport.nix b/nixos/tests/teleport.nix index 3621cce0599e..0d0b9a713065 100644 --- a/nixos/tests/teleport.nix +++ b/nixos/tests/teleport.nix @@ -10,6 +10,7 @@ let packages = with pkgs; { "default" = teleport; "14" = teleport_14; + "15" = teleport_15; }; minimal = package: { diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index 3c1188ca88c9..3cf99fe7fc2f 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/nixos/tests/terminal-emulators.nix @@ -42,7 +42,7 @@ let tests = { germinal.pkg = p: p.germinal; - gnome-terminal.pkg = p: p.gnome.gnome-terminal; + gnome-terminal.pkg = p: p.gnome-terminal; guake.pkg = p: p.guake; guake.cmd = "SHELL=$command guake --show"; diff --git a/nixos/tests/user-home-mode.nix b/nixos/tests/user-home-mode.nix index 070cb0b75cc9..2d6d1af3f391 100644 --- a/nixos/tests/user-home-mode.nix +++ b/nixos/tests/user-home-mode.nix @@ -12,6 +12,12 @@ import ./make-test-python.nix ({ lib, ... }: { isNormalUser = true; homeMode = "750"; }; + users.users.carol = { + initialPassword = "pass3"; + isNormalUser = true; + createHome = true; + home = "/users/carol"; + }; }; testScript = '' @@ -23,5 +29,7 @@ import ./make-test-python.nix ({ lib, ... }: { machine.send_chars("pass1\n") machine.succeed('[ "$(stat -c %a /home/alice)" == "700" ]') machine.succeed('[ "$(stat -c %a /home/bob)" == "750" ]') + machine.succeed('[ "$(stat -c %a /users)" == "755" ]') + machine.succeed('[ "$(stat -c %a /users/carol)" == "700" ]') ''; }) diff --git a/nixos/tests/vscode-remote-ssh.nix b/nixos/tests/vscode-remote-ssh.nix index de7cc6badc9a..6b5294e15420 100644 --- a/nixos/tests/vscode-remote-ssh.nix +++ b/nixos/tests/vscode-remote-ssh.nix @@ -14,7 +14,7 @@ import ./make-test-python.nix ({ lib, ... }@args: let inherit (pkgs.vscode.passthru) rev vscodeServer; in { name = "vscode-remote-ssh"; - meta.maintainers = with lib.maintainers; [ Enzime ]; + meta.maintainers = with lib.maintainers; [ ]; nodes = let serverAddress = "192.168.0.2"; diff --git a/nixos/tests/web-apps/mastodon/default.nix b/nixos/tests/web-apps/mastodon/default.nix index 178590d13b63..7f925b9ad4ed 100644 --- a/nixos/tests/web-apps/mastodon/default.nix +++ b/nixos/tests/web-apps/mastodon/default.nix @@ -1,9 +1,9 @@ -{ system ? builtins.currentSystem, handleTestOn }: +{ system ? builtins.currentSystem, pkgs, handleTestOn, ... }: let supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; in { - standard = handleTestOn supportedSystems ./standard.nix { inherit system; }; - remote-databases = handleTestOn supportedSystems ./remote-databases.nix { inherit system; }; + standard = handleTestOn supportedSystems ./standard.nix { inherit system pkgs; }; + remote-databases = handleTestOn supportedSystems ./remote-databases.nix { inherit system pkgs; }; } diff --git a/nixos/tests/ydotool.nix b/nixos/tests/ydotool.nix index 45e3d27adeb4..7a739392aa56 100644 --- a/nixos/tests/ydotool.nix +++ b/nixos/tests/ydotool.nix @@ -9,7 +9,7 @@ let textInput = "This works."; inputBoxText = "Enter input"; inputBox = pkgs.writeShellScript "zenity-input" '' - ${lib.getExe pkgs.gnome.zenity} --entry --text '${inputBoxText}:' > /tmp/output & + ${lib.getExe pkgs.zenity} --entry --text '${inputBoxText}:' > /tmp/output & ''; asUser = '' def as_user(cmd: str): diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index beca5afc721d..4069b541eb17 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,26 +1,28 @@ { lib , stdenv , audacious-plugins -, fetchurl -, gettext +, fetchFromGitHub , meson , ninja , pkg-config , qtbase +, qtsvg +, qtwayland , wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "audacious"; - version = "4.3.1"; + version = "4.4"; - src = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "sha256-heniaEFQW1HjQu5yotBfGb74lPVnoCnrs/Pgwa20IEI="; + src = fetchFromGitHub { + owner = "audacious-media-player"; + repo = "audacious"; + rev = "${pname}-${version}"; + hash = "sha256-qAJztvNI3uGmQfECJJ7tJ/xLLgMU5OiW0O3ZSJhvt0k="; }; nativeBuildInputs = [ - gettext meson ninja pkg-config @@ -29,6 +31,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase + qtsvg + qtwayland ]; mesonFlags = [ @@ -41,12 +45,14 @@ stdenv.mkDerivation rec { ln -s ${audacious-plugins}/share/audacious/Skins $out/share/audacious/ ''; - meta = with lib; { + meta = { description = "Lightweight and versatile audio player"; - homepage = "https://audacious-media-player.org/"; - maintainers = with maintainers; [ eelco ramkromberg ttuegel thiagokokada ]; - platforms = with platforms; linux; - license = with licenses; [ + homepage = "https://audacious-media-player.org"; + downloadPage = "https://github.com/audacious-media-player/audacious"; + mainProgram = "audacious"; + maintainers = with lib.maintainers; [ eelco ramkromberg ttuegel thiagokokada ]; + platforms = lib.platforms.linux; + license = with lib.licenses; [ bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING gpl2 diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/applications/audio/audacious/plugins.nix index 2d048bc358fe..b313bc04782e 100644 --- a/pkgs/applications/audio/audacious/plugins.nix +++ b/pkgs/applications/audio/audacious/plugins.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchFromGitHub , alsa-lib , audacious , curl @@ -8,7 +8,6 @@ , flac , fluidsynth , gdk-pixbuf -, gettext , lame , libbs2b , libcddb @@ -39,7 +38,7 @@ , pipewire , qtbase , qtmultimedia -, qtx11extras +, qtwayland , soxr , vgmstream , wavpack @@ -47,17 +46,18 @@ stdenv.mkDerivation rec { pname = "audacious-plugins"; - version = "4.3.1"; + version = "4.4"; - src = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "sha256-Leom469YOi1oTfJAsnsrKTK81lPfTbUAqF9P5dX9yKY="; + src = fetchFromGitHub { + owner = "audacious-media-player"; + repo = "audacious-plugins"; + rev = "${pname}-${version}"; + hash = "sha256-J9jgBl8J4W9Yvrlg1KlzYgGTmdxUZM9L11rCftKFSlE="; }; patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ]; nativeBuildInputs = [ - gettext meson ninja pkg-config @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { pipewire qtbase qtmultimedia - qtx11extras + qtwayland soxr wavpack libopenmpt @@ -116,5 +116,6 @@ stdenv.mkDerivation rec { meta = audacious.meta // { description = "Plugins for Audacious music player"; + downloadPage = "https://github.com/audacious-media-player/audacious-plugins"; }; } diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index 752088fcd822..83c5af0a53fc 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -29,7 +29,7 @@ , curl , pcre , mount -, gnome +, zenity , Accelerate , Cocoa , WebKit @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { libusb1 alsa-lib libjack2 - gnome.zenity + zenity alsa-tools libxcb xcbutil @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { # These X11 libs get dlopen'd, they cause visual bugs when unavailable. wrapProgram $out/bin/BespokeSynth \ --prefix PATH : '${lib.makeBinPath [ - gnome.zenity + zenity (python3.withPackages (ps: with ps; [ jedi ])) ]}' ''; diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix index 2a64a18326c1..37b0ca2fa047 100644 --- a/pkgs/applications/audio/callaudiod/default.nix +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "callaudiod"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "mobian1"; repo = pname; rev = version; - sha256 = "sha256-OuWn1DA+4LmN1KwouiqW3kn6CMg8jhm0FiyAgMSi1GI="; + sha256 = "sha256-gc66XrrFyhF1TvrDECBfGQc+MiDtqZPxdCn0S/43XQU="; }; strictDeps = true; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 35ba2666f0b6..d90735294d44 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -17,6 +17,7 @@ libxml2, gsettings-desktop-schemas, gnome, + adwaita-icon-theme, wrapGAppsHook3, fetchpatch, }: @@ -59,7 +60,7 @@ stdenv.mkDerivation rec { opusfile flac gsettings-desktop-schemas - gnome.adwaita-icon-theme + adwaita-icon-theme ]; doCheck = false; # fails 1 out of 9 tests diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix index 4f49564898a9..9d5c69858aef 100644 --- a/pkgs/applications/audio/exaile/default.nix +++ b/pkgs/applications/audio/exaile/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchFromGitHub , gobject-introspection, makeWrapper, wrapGAppsHook3 , gtk3, gst_all_1, python3 -, gettext, gnome, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk -, iconTheme ? gnome.adwaita-icon-theme +, gettext, adwaita-icon-theme, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk +, iconTheme ? adwaita-icon-theme , deviceDetectionSupport ? true , documentationSupport ? true , notificationSupport ? true diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/applications/audio/fdkaac/default.nix index f944d414098f..fffa6faf1006 100644 --- a/pkgs/applications/audio/fdkaac/default.nix +++ b/pkgs/applications/audio/fdkaac/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, fdk_aac }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, fdk_aac }: stdenv.mkDerivation rec { pname = "fdkaac"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "nu774"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GYvI9T5Bv2OcK0hMAQE7/tE6ajDyqkaak66b3Hc0Fls="; + hash = "sha256-nVVeYk7t4+n/BsOKs744stsvgJd+zNnbASk3bAgFTpk="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fdk_aac ]; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 0e6178006ccf..eff5bd76c9f2 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gitUpdater , glibcLocales -, gnome +, adwaita-icon-theme , gobject-introspection , gtk3 , intltool @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme ]; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 71ac598000da..247a3bb23ecb 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,7 +12,7 @@ , glib , glib-networking , glibmm -, gnome +, adwaita-icon-theme , gsettings-desktop-schemas , gtk3 , gtkmm3 @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { glib glib-networking.out glibmm - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas gtk3 gtkmm3 diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index dc4bf6333d38..79f0c61af78e 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, alsa-lib, freetype, xorg, curl, libGL, libjack2, gnome +, alsa-lib, freetype, xorg, curl, libGL, libjack2, zenity , pkg-config, makeWrapper }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr - xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome.zenity + xorg.libXcursor xorg.libXcomposite curl libGL libjack2 zenity ]; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin install -Dm755 build/helio $out/bin - wrapProgram $out/bin/helio --prefix PATH ":" ${gnome.zenity}/bin + wrapProgram $out/bin/helio --prefix PATH ":" ${zenity}/bin mkdir -p $out/share cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/applications/audio/in-formant/default.nix index a6bcc68bf5a7..3dd4a3006b2b 100644 --- a/pkgs/applications/audio/in-formant/default.nix +++ b/pkgs/applications/audio/in-formant/default.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; # currently broken on i686-linux and aarch64-linux due to other nixpkgs dependencies platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/indicator-sound-switcher/default.nix b/pkgs/applications/audio/indicator-sound-switcher/default.nix index 1a9928734827..5b6cdf7e7904 100644 --- a/pkgs/applications/audio/indicator-sound-switcher/default.nix +++ b/pkgs/applications/audio/indicator-sound-switcher/default.nix @@ -1,7 +1,6 @@ { python3Packages , lib , fetchFromGitHub -, perlPackages , gettext , gtk3 , gobject-introspection @@ -35,6 +34,7 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook3 glib gdk-pixbuf + gobject-introspection ]; buildInputs = [ @@ -45,7 +45,6 @@ python3Packages.buildPythonApplication rec { python3Packages.setuptools python3Packages.pygobject3 gtk3 - gobject-introspection librsvg libayatana-appindicator libpulseaudio diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index f45c7dc3af55..593fd72c6d0c 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -26,7 +26,6 @@ python3.pkgs.buildPythonPackage rec { poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ aiohttp diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 3fdcda98d116..f1101e7c793f 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.72"; + version = "10.74"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-vtpQhCV1hkme69liTO13vz+kxpA3zJ+U1In/4z6qLbQ="; + hash = "sha256-AxRADWS5Ka62NLj6IqX5uF39mPxoWy+zQZQ7A2+DM7Y="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/notify.nix b/pkgs/applications/audio/mopidy/notify.nix index 8b90089ef23d..ca6ab3d2bee6 100644 --- a/pkgs/applications/audio/mopidy/notify.nix +++ b/pkgs/applications/audio/mopidy/notify.nix @@ -24,6 +24,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/phijor/mopidy-notify"; description = "Mopidy extension for showing desktop notifications on track change"; license = licenses.asl20; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 4b6fe17e8225..aac6ec43c305 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -30,6 +30,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/mopidy/mopidy-spotify"; description = "Mopidy extension for playing music from Spotify"; license = licenses.asl20; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index a4aea017ea4e..33cf382ada88 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -1,8 +1,10 @@ -{ lib -, fetchFromGitHub -, python3 -, mopidy -, extraPkgs ? pkgs: [] +{ + lib, + fetchFromGitHub, + python3, + mopidy, + yt-dlp, + extraPkgs ? pkgs: [ ], }: python3.pkgs.buildPythonApplication rec { @@ -17,22 +19,36 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-iFt7r8Ljymc+grNJiOClTHkZOeo7AcYpcNc8tLMPROk="; }; - propagatedBuildInputs = with python3.pkgs; [ - beautifulsoup4 - cachetools - pykka - requests - youtube-dl - ytmusicapi - ] ++ [ - mopidy - ] ++ extraPkgs pkgs; + propagatedBuildInputs = + with python3.pkgs; + [ + beautifulsoup4 + cachetools + pykka + requests + ytmusicapi + ] + ++ [ + mopidy + yt-dlp + ] + ++ extraPkgs pkgs; nativeCheckInputs = with python3.pkgs; [ vcrpy pytestCheckHook ]; + postPatch = '' + substituteInPlace mopidy_youtube/youtube.py \ + --replace-fail 'youtube_dl_package = "youtube_dl"' 'youtube_dl_package = "yt_dlp"' + substituteInPlace tests/conftest.py \ + --replace-fail 'import youtube_dl' 'import yt_dlp' \ + --replace-fail 'patcher = mock.patch.object(youtube, "youtube_dl", spec=youtube_dl)' \ + 'patcher = mock.patch.object(youtube, "youtube_dl", spec=yt_dlp)' \ + --replace-fail '"youtube_dl_package": "youtube_dl",' '"youtube_dl_package": "yt_dlp",' + ''; + disabledTests = [ # Test requires a YouTube API key "test_get_default_config" @@ -45,9 +61,7 @@ python3.pkgs.buildPythonApplication rec { "tests/test_youtube.py" ]; - pythonImportsCheck = [ - "mopidy_youtube" - ]; + pythonImportsCheck = [ "mopidy_youtube" ]; meta = with lib; { description = "Mopidy extension for playing music from YouTube"; diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix deleted file mode 100644 index db91a2952bf2..000000000000 --- a/pkgs/applications/audio/musikcube/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ asio -, cmake -, curl -, fetchFromGitHub -, ffmpeg -, gnutls -, lame -, lib -, libev -, game-music-emu -, libmicrohttpd -, libopenmpt -, mpg123 -, ncurses -, pkg-config -, portaudio -, stdenv -, taglib -# Linux Dependencies -, alsa-lib -, pipewireSupport ? !stdenv.hostPlatform.isDarwin, pipewire -, pulseaudio -, sndioSupport ? true, sndio -, systemd -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd -# Darwin Dependencies -, Cocoa -, SystemConfiguration -, coreaudioSupport ? stdenv.hostPlatform.isDarwin, CoreAudio -}: - -stdenv.mkDerivation rec { - pname = "musikcube"; - version = "3.0.2"; - - src = fetchFromGitHub { - owner = "clangen"; - repo = pname; - rev = version; - hash = "sha512-IakZy6XsAE39awjzQI+R11JCPeQSaibx6+uX8Iea5WdlCundeovnPwSAi6RzzZl9dr2UftzzEiF4Aun8VMtqVA=="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - asio - curl - ffmpeg - gnutls - lame - libev - game-music-emu - libmicrohttpd - libopenmpt - mpg123 - ncurses - portaudio - taglib - ] ++ lib.optionals systemdSupport [ - systemd - ] ++ lib.optionals stdenv.isLinux [ - alsa-lib pulseaudio - ] ++ lib.optionals stdenv.isDarwin [ - Cocoa SystemConfiguration - ] ++ lib.optionals coreaudioSupport [ - CoreAudio - ] ++ lib.optionals sndioSupport [ - sndio - ] ++ lib.optionals pipewireSupport [ - pipewire - ]; - - cmakeFlags = [ - "-DDISABLE_STRIP=true" - ]; - - postFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname} - install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}d - ''; - - meta = { - description = "Terminal-based music player, library, and streaming audio server"; - homepage = "https://musikcube.com/"; - maintainers = with lib.maintainers; [ aanderse afh ]; - license = lib.licenses.bsd3; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index 8cf4e31b79e4..ba235b5157a5 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "muso"; homepage = "https://github.com/quebin31/muso"; license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; }; } diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index 6fce76e9a481..f52053d90509 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "16.0.0"; + version = "16.0.1"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-LYD1qjSlwv9wGBrZUaYz6Zcvl2n6cLi2aGycr4ZJWdY="; + sha256 = "sha256-MyVGWdc9ASWWW9CikK06bFYKi1DHyjFxFlMgBLdBwbU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 60b9bc23bc36..c188465f52e9 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -88,7 +88,7 @@ buildNpmPackage rec { description = "Libre and modular OSC / MIDI controller"; homepage = "https://openstagecontrol.ammd.net/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "open-stage-control"; }; diff --git a/pkgs/applications/audio/openutau/default.nix b/pkgs/applications/audio/openutau/default.nix index 17105558f2d2..289991a94431 100644 --- a/pkgs/applications/audio/openutau/default.nix +++ b/pkgs/applications/audio/openutau/default.nix @@ -83,7 +83,7 @@ buildDotnetModule rec { # worldline resampler binary - no source is available (hence "unfree") but usage of the binary is MIT unfreeRedistributable ]; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "OpenUtau"; }; diff --git a/pkgs/applications/audio/parrot/default.nix b/pkgs/applications/audio/parrot/default.nix index db5b89bb39fa..a0b2972ca037 100644 --- a/pkgs/applications/audio/parrot/default.nix +++ b/pkgs/applications/audio/parrot/default.nix @@ -5,7 +5,7 @@ , ffmpeg , libopus , makeBinaryWrapper -, nix-update-script +, unstableGitUpdater , openssl , pkg-config , stdenv @@ -35,7 +35,9 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath [ ffmpeg yt-dlp ]} ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = { description = "Hassle-free Discord music bot"; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 019c777cd046..f6b8d20f91d2 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -8,7 +8,7 @@ , libsigcxx , libcanberra-gtk3 , json-glib -, gnome +, adwaita-icon-theme , wrapGAppsHook3 }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { libsigcxx libcanberra-gtk3 json-glib - gnome.adwaita-icon-theme + adwaita-icon-theme ]; nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ]; diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix index 7bfdb1bd8a8a..5cb308988a4f 100644 --- a/pkgs/applications/audio/pd-plugins/gem/default.nix +++ b/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -7,7 +7,7 @@ , libGL , libGLU , glew -, freeglut +, libglut , libv4l , libX11 , file @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libGL libGLU glew - freeglut + libglut libv4l libX11 ]; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index dbb3a63fce6b..933d17361459 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib -, wrapGAppsHook3, pythonPackages, gtk3, gnome, gobject-introspection +, wrapGAppsHook3, pythonPackages, gtk3, adwaita-icon-theme, gobject-introspection , libnotify, libsecret, gst_all_1 }: pythonPackages.buildPythonApplication rec { @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = - [ gtk3 gobject-introspection libnotify libsecret gnome.adwaita-icon-theme ] ++ + [ gtk3 gobject-introspection libnotify libsecret adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ (with pythonPackages; [ pygobject3 pylast ]); diff --git a/pkgs/applications/audio/plugdata/default.nix b/pkgs/applications/audio/plugdata/default.nix index 9af5c4a9fa85..e58e5aabcd81 100644 --- a/pkgs/applications/audio/plugdata/default.nix +++ b/pkgs/applications/audio/plugdata/default.nix @@ -9,7 +9,7 @@ , alsa-lib , freetype , webkitgtk -, gnome +, zenity , curl , xorg , python3 @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { # These X11 libs get dlopen'd, they cause visual bugs when unavailable. wrapProgram $out/bin/plugdata \ --prefix PATH : '${lib.makeBinPath [ - gnome.zenity + zenity ]}' \ --prefix LD_LIBRARY_PATH : '${lib.makeLibraryPath [ xorg.libXrandr diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 97ea40d7438b..09ed89bb2ba2 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -45,7 +45,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = [ - python3.pkgs.pythonRelaxDepsHook wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 16786c77e4c6..65bc615d2cef 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.17"; + version = "7.18"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.isDarwin then "sha256-4+8MhvQ1LhfyhFCOMBgD4HHt0Oaj25y2U04++JuXxCM=" else { - x86_64-linux = "sha256-q3oTKcFSNec10kT1FlDaf2GS967y38VLq9GsquwN2Lg="; - aarch64-linux = "sha256-5mxVkppm1SjC0C0SFI7uEdPWewNZXlrNAxbaFcNzzbU="; + hash = if stdenv.isDarwin then "sha256-ETvWq+71G4v25F/iUjP7NWJ0QkPMKn7akfBOA7EKzKg=" else { + x86_64-linux = "sha256-kddqIKgTTImbDIFtPqV/6YsnfNYsDPLhcelJIBC4R8s="; + aarch64-linux = "sha256-PNFSifZwH+VzfljyrlQZKZ+NEiiINXnVecOXgn1gY/Q="; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index c6a0ac824566..3aa2b6cf6deb 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, libjack2, libsndfile, xorg, freetype -, libxkbcommon, cairo, glib, gnome, flac, libogg, libvorbis, libopus, cmake +, libxkbcommon, cairo, glib, zenity, flac, libogg, libvorbis, libopus, cmake , pango, pkg-config, catch2 }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libxkbcommon cairo glib - gnome.zenity + zenity freetype pango ]; @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp substituteInPlace plugins/editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \ - --replace 'zenitypath = "zenity"' 'zenitypath = "${gnome.zenity}/bin/zenity"' + --replace 'zenitypath = "zenity"' 'zenitypath = "${zenity}/bin/zenity"' substituteInPlace plugins/editor/src/editor/NativeHelpers.cpp \ - --replace '/usr/bin/zenity' '${gnome.zenity}/bin/zenity' + --replace '/usr/bin/zenity' '${zenity}/bin/zenity' ''; cmakeFlags = [ "-DSFIZZ_TESTS=ON" ]; diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix index 33724f9230e7..4a726e8bcc99 100644 --- a/pkgs/applications/audio/sfxr-qt/default.nix +++ b/pkgs/applications/audio/sfxr-qt/default.nix @@ -1,41 +1,29 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , extra-cmake-modules , qtbase , qtquickcontrols2 , SDL , python3 -, catch2 +, catch2_3 , callPackage , nixosTests }: mkDerivation rec { pname = "sfxr-qt"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "agateau"; repo = "sfxr-qt"; rev = version; - sha256 = "sha256-Ce5NJe1f+C4pPmtenHYvtkxste+nPuxJoB+N7K2nyRo="; + sha256 = "sha256-JAWDk7mGkPtQ5yaA6UT9hlAy770MHrTBhBP9G8UqFKg="; fetchSubmodules = true; }; - postPatch = '' - cp ${catch2}/include/catch2/catch.hpp 3rdparty/catch2/single_include/catch2/catch.hpp - ''; - - # Remove on next release - patches = [(fetchpatch { - name = "sfxr-qr-missing-qpainterpath-include"; - url = "https://github.com/agateau/sfxr-qt/commit/ef051f473654052112b647df987eb263e38faf47.patch"; - sha256 = "sha256-bqMnxHUzdS5oG/2hfr5MvkpwrtZW+GTN5fS2WpV2W2c="; - })]; - nativeBuildInputs = [ cmake extra-cmake-modules @@ -48,6 +36,14 @@ mkDerivation rec { SDL ]; + checkInputs = [ + catch2_3 + ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_CATCH2" true) + ]; + doCheck = true; passthru.tests = { diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 67ec87343c74..1cd653df3a3c 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "24.4"; + version = "24.5"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-nP4ngNUQvveSQBEqXlzYdaqD0SGzTDPwIiWhSabRu+8="; + sha256 = "sha256-Y497KAlUXtWhkrCd1QrqJkvWGwnzZfYRKaALiEo/7EI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix index c65208343aff..7cf8636ad107 100644 --- a/pkgs/applications/audio/sndpeek/default.nix +++ b/pkgs/applications/audio/sndpeek/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libsndfile, freeglut, alsa-lib, mesa, libGLU, libX11, libXmu +{ lib, stdenv, fetchurl, libsndfile, libglut, alsa-lib, mesa, libGLU, libX11, libXmu , libXext, libXi }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./pthread.patch ]; buildInputs = [ - freeglut + libglut alsa-lib mesa libGLU diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 8b6b9631a85d..36c0f9239973 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, wrapGAppsHook3, gettext -, python3Packages, gnome, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: +, python3Packages, adwaita-icon-theme, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; @@ -24,7 +24,7 @@ in buildPythonApplication rec { buildInputs = [ glib - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas gtk3 gdk-pixbuf diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index bc1c72cf746e..286e26bdaad3 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -224,7 +224,7 @@ stdenv.mkDerivation rec { homepage = "https://sonic-pi.net/"; description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; license = licenses.mit; - maintainers = with maintainers; [ Phlogistique kamilchm c0deaddict sohalt lilyinstarlight ]; + maintainers = with maintainers; [ Phlogistique kamilchm c0deaddict sohalt ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index ef299ac7074c..a2e2c4bc09ef 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -11,6 +11,7 @@ , brasero , libcanberra-gtk3 , gnome +, adwaita-icon-theme , gst_all_1 , libmusicbrainz5 , libdiscid @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { gtk3 brasero libcanberra-gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas libmusicbrainz5 libdiscid diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix index 27238e36d088..5e5303bb1da3 100644 --- a/pkgs/applications/audio/soundconverter/default.nix +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -1,17 +1,29 @@ -{ lib, fetchurl -# Optional due to unfree license. -, faacSupport ? false -, glib, python3Packages, gtk3, wrapGAppsHook3 -, gsettings-desktop-schemas, intltool, xvfb-run -, gobject-introspection, gst_all_1, fdk-aac-encoder }: +{ + lib, + # Optional due to unfree license. + faacSupport ? false, + fetchFromGitHub, + glib, + python3Packages, + gtk3, + wrapGAppsHook3, + gsettings-desktop-schemas, + intltool, + xvfb-run, + gobject-introspection, + gst_all_1, + fdk-aac-encoder, +}: python3Packages.buildPythonApplication rec { pname = "soundconverter"; - version = "4.0.3"; + version = "4.0.5"; - src = fetchurl { - url = "https://launchpad.net/soundconverter/trunk/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "sha256-hzIG/4LD3705erPYvXb7uoRwF9LtKKIKB3jrhpYMsZ0="; + src = fetchFromGitHub { + owner = "kassoulet"; + repo = "soundconverter"; + rev = version; + hash = "sha256-sno5EOh8HHfBTIE67VA8mheYp5wUMFRCbcS2EtKES3c="; }; buildInputs = [ @@ -30,16 +42,14 @@ python3Packages.buildPythonApplication rec { gobject-introspection ]; - propagatedBuildInputs = [ - python3Packages.gst-python - python3Packages.distutils-extra - python3Packages.setuptools - python3Packages.pygobject3 + dependencies = with python3Packages; [ + gst-python + distutils-extra + setuptools + pygobject3 ]; - nativeCheckInputs = [ - xvfb-run - ]; + nativeCheckInputs = [ xvfb-run ]; postPatch = '' substituteInPlace bin/soundconverter --replace \ @@ -47,19 +57,31 @@ python3Packages.buildPythonApplication rec { "DATA_PATH = '$out/share/soundconverter'" ''; - preCheck = let - self = { outPath = "$out"; name = "${pname}-${version}"; }; - xdgPaths = lib.concatMapStringsSep ":" glib.getSchemaDataDirPath; - in '' - export HOME=$TMPDIR - export XDG_DATA_DIRS=$XDG_DATA_DIRS:${xdgPaths [gtk3 gsettings-desktop-schemas self]} - # FIXME: Fails due to weird Gio.file_parse_name() behavior. - sed -i '49 a\ @unittest.skip("Gio.file_parse_name issues")' tests/testcases/names.py - '' + lib.optionalString (!faacSupport) '' - substituteInPlace tests/testcases/integration.py --replace \ - "for encoder in ['fdkaacenc', 'faac', 'avenc_aac']:" \ - "for encoder in ['fdkaacenc', 'avenc_aac']:" - ''; + preCheck = + let + self = { + outPath = "$out"; + name = "${pname}-${version}"; + }; + xdgPaths = lib.concatMapStringsSep ":" glib.getSchemaDataDirPath; + in + '' + export HOME=$TMPDIR + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${ + xdgPaths [ + gtk3 + gsettings-desktop-schemas + self + ] + } + # FIXME: Fails due to weird Gio.file_parse_name() behavior. + sed -i '49 a\ @unittest.skip("Gio.file_parse_name issues")' tests/testcases/names.py + '' + + lib.optionalString (!faacSupport) '' + substituteInPlace tests/testcases/gui_integration.py --replace \ + "for encoder in ['fdkaacenc', 'faac', 'avenc_aac']:" \ + "for encoder in ['fdkaacenc', 'avenc_aac']:" + ''; checkPhase = '' runHook preCheck @@ -70,7 +92,13 @@ python3Packages.buildPythonApplication rec { # Necessary to set GDK_PIXBUF_MODULE_FILE. strictDeps = false; - meta = with lib; { + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { homepage = "https://soundconverter.org/"; description = "Leading audio file converter for the GNOME Desktop"; mainProgram = "soundconverter"; @@ -79,8 +107,11 @@ python3Packages.buildPythonApplication rec { and writes WAV, FLAC, MP3, AAC and Ogg Vorbis files. Uses Python and GTK+ GUI toolkit, and runs on X Window System. ''; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ jakubgs ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + jakubgs + aleksana + ]; }; } diff --git a/pkgs/applications/audio/soundsource/default.nix b/pkgs/applications/audio/soundsource/default.nix index 8f2d743e03df..cc7a5b3d7ce9 100644 --- a/pkgs/applications/audio/soundsource/default.nix +++ b/pkgs/applications/audio/soundsource/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://rogueamoeba.com/soundsource"; license = licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index 2a250ff94665..dcce24d173ce 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -24,6 +24,7 @@ , withImage ? true , withNotify ? true , withSixel ? true +, withFuzzy ? true , stdenv , darwin , makeBinaryWrapper @@ -33,16 +34,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaud rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.18.2"; + version = "0.19.1"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bLUPQgqSsE9tF5YiFj5B+Ylyy96DhWFNjwqXbQ9H8uc="; + hash = "sha256-R8F7s8FPnCe+shNUN/u0qcxFy3IbyfVo2xZ5/E/qwaw="; }; - cargoHash = "sha256-rptGA7J63rHdmxuPIguhZYYs8tZbpidJ0fXroBBoEIM="; + cargoHash = "sha256-7vximGisIIXBrwHXSWQjO08OraaweG7ZT6v+gVdYGVc="; nativeBuildInputs = [ pkg-config @@ -83,7 +84,8 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals withDaemon [ "daemon" ] ++ lib.optionals withNotify [ "notify" ] ++ lib.optionals withStreaming [ "streaming" ] - ++ lib.optionals withSixel [ "sixel" ]; + ++ lib.optionals withSixel [ "sixel" ] + ++ lib.optionals withFuzzy [ "fzf" ]; # sixel-sys is dynamically linked to libsixel postInstall = lib.optionals (stdenv.isDarwin && withSixel) '' @@ -97,6 +99,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/aome510/spotify-player/releases/tag/v${version}"; mainProgram = "spotify_player"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dit7ya xyven1 ]; + maintainers = with lib.maintainers; [ dit7ya xyven1 _71zenith ]; }; } diff --git a/pkgs/applications/audio/spotify/darwin.nix b/pkgs/applications/audio/spotify/darwin.nix index 25899ad16783..8304bdf3a15d 100644 --- a/pkgs/applications/audio/spotify/darwin.nix +++ b/pkgs/applications/audio/spotify/darwin.nix @@ -9,17 +9,17 @@ stdenv.mkDerivation { inherit pname; - version = "1.2.17.834.g26ee1129"; + version = "1.2.40.599.g606b7f29"; src = if stdenv.isAarch64 then ( fetchurl { - url = "https://web.archive.org/web/20230808124344/https://download.scdn.co/SpotifyARM64.dmg"; - sha256 = "sha256-u22hIffuCT6DwN668TdZXYedY9PSE7ZnL+ITK78H7FI="; + url = "https://web.archive.org/web/20240622065234/https://download.scdn.co/SpotifyARM64.dmg"; + hash = "sha256-mmjxKYmsX0rFlIU19JOfPbNgOhlcZs5slLUhDhlON1c="; }) else ( fetchurl { - url = "https://web.archive.org/web/20230808124637/https://download.scdn.co/Spotify.dmg"; - sha256 = "sha256-aaYMbZpa2LvyBeXmEAjrRYfYqbudhJHR/hvCNTsNQmw="; + url = "https://web.archive.org/web/20240622065548/https://download.scdn.co/Spotify.dmg"; + hash = "sha256-hvS0xnmJQoQfNJRFsLBQk8AJjDOzDy+OGwNOq5Ms/O0="; }); nativeBuildInputs = [ undmg ]; @@ -36,6 +36,6 @@ stdenv.mkDerivation { ''; meta = meta // { - maintainers = with lib.maintainers; [ Enzime ]; + maintainers = with lib.maintainers; [ matteopacini ]; }; } diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 8886e851c3c9..43b4ae243540 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook3, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, zenity , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon , pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu, libGL # High-DPI support: Spotify's --force-device-scale-factor argument @@ -179,7 +179,7 @@ stdenv.mkDerivation { --add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \ ''} \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome.zenity}/bin" \ + --prefix PATH : "${zenity}/bin" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" runHook postFixup diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index bc53b296357b..f44904badf9c 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/pkgs/applications/audio/touchosc/default.nix @@ -18,7 +18,7 @@ , libXrender , libXxf86vm , libglvnd -, gnome +, zenity }: let @@ -39,13 +39,13 @@ let ]; runBinDeps = [ - gnome.zenity + zenity ]; in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.3.3.207"; + version = "1.3.4.209"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-peEO5haVHXvCT+F48UiKdgwuccqBuZACEXnepB4dcvY="; - armv7l-linux = "sha256-uQNoEye/Jd3T6pLJY2sN7hkTQl3AAilG5Vr9G61vFRM="; - x86_64-linux = "sha256-+/r9gRK8HyynlJ1syC2VQ6VboPEzsVNqEVrQfNLeEv0="; + aarch64-linux = "sha256-dAyZ/x6ZUYst+3Hz8RL4+FW1oeb+652Zndpqp0JnGgs="; + armv7l-linux = "sha256-ub+qcWrpv+LiXbEq6YQczJN1E4c2i/ZtKbh5e2PMuH0="; + x86_64-linux = "sha256-c8hPbJo4MUqS0Ev5QzLujJJB3hqN3KMsLVdKb6MKNts="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { description = "Next generation modular control surface"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; mainProgram = "TouchOSC"; }; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 785550a0a040..b9b60fb97b0b 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "transcribe"; - version = "9.40.0"; + version = "9.41.0"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.tar.gz"; - sha256 = "sha256-GHTr1rk7Kh5M0UYnryUlCk/G6pW3p80GJ6Ai0zXdfNs="; + sha256 = "sha256-qf5zfnl1Dhof08vJ9FNFr6qAz5Tk6z7lO1PuVcmRua0="; } else throw "Platform not supported"; @@ -106,6 +106,7 @@ stdenv.mkDerivation rec { conventional music players. ''; homepage = "https://www.seventhstring.com/xscribe/"; + changelog = "https://www.seventhstring.com/xscribe/history.html"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ iwanb ]; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 7a1ded3e2f82..0d02e5a686a1 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -7,7 +7,7 @@ , ghc_filesystem , glew , glfw -, gnome +, zenity , gtk3-x11 , imagemagick , jansson @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { # Fix reference to zenity substituteInPlace dep/osdialog/osdialog_zenity.c \ - --replace 'zenityBin[] = "zenity"' 'zenityBin[] = "${gnome.zenity}/bin/zenity"' + --replace 'zenityBin[] = "zenity"' 'zenityBin[] = "${zenity}/bin/zenity"' ''; nativeBuildInputs = [ @@ -191,7 +191,7 @@ stdenv.mkDerivation rec { ghc_filesystem glew glfw - gnome.zenity + zenity gtk3-x11 jansson libarchive diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix index e2dfc1456984..c96b99162292 100644 --- a/pkgs/applications/backup/ludusavi/default.nix +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -17,7 +17,7 @@ , libxkbcommon , vulkan-loader , wayland -, gnome +, zenity , libsForQt5 }: @@ -85,7 +85,7 @@ rustPlatform.buildRustPackage rec { in '' patchelf --set-rpath "${libPath}" "$out/bin/ludusavi" - wrapProgram $out/bin/ludusavi --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]} + wrapProgram $out/bin/ludusavi --prefix PATH : ${lib.makeBinPath [ zenity libsForQt5.kdialog ]} ''; diff --git a/pkgs/applications/backup/restic-integrity/default.nix b/pkgs/applications/backup/restic-integrity/default.nix index d0311e5d40d0..c34b1a19405b 100644 --- a/pkgs/applications/backup/restic-integrity/default.nix +++ b/pkgs/applications/backup/restic-integrity/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "CLI tool to check the integrity of a restic repository without unlocking it"; homepage = "https://git.nwex.de/networkException/restic-integrity"; license = with licenses; [ bsd2 ]; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "restic-integrity"; }; } diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix index 4981d509e236..fdac36e492f2 100644 --- a/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -40,7 +40,6 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = with python.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index ed470dec1f35..d2b90cf5952f 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.60.1"; + version = "2.60.2"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-VZzDG9qUjEBSNxQcmkqPTTDQjh7BZFqyRSaCfio8X2I="; + hash = "sha256-+KUe+wpcE59Y6ktDRpoMXQYSML9sfN4OaDV8+sKfzQQ="; fetchSubmodules = true; }; - vendorHash = "sha256-38NmSSK3a70WvhZAZ529wdAMlEuk8/4YqtadoLOn1IY="; + vendorHash = "sha256-r8Hh0UGdUbVOx9r10ymb9bJNZvxm/MzAVA9D0BaIzJg="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 7ee1ffab2559..adf818a52ffd 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,17 +9,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.14.5"; + version = "1.14.6"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IY0BKoDRMVRZTIysdUgqhTFQx0Pz+kl61vbPbhSdT8k="; + sha256 = "sha256-X9XwVZpRnkp7oVKwyvQbs8ZaWwLkuLEEHNfV5BvfVvI="; }; proxyVendor = true; - vendorHash = "sha256-vzxtoLlD1RjmKBpMPqcH/AAzk2l/NifpRl4Sp4qBYLg="; + vendorHash = "sha256-UP+bQM8ydfbILlVhuNPVIKLyXZFTzGmHizn2hYgNE4Y="; doCheck = false; diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix index e4b108ecadcf..a9f528dd8c6c 100644 --- a/pkgs/applications/blockchains/haven-cli/default.nix +++ b/pkgs/applications/blockchains/haven-cli/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "haven-cli"; - version = "3.3.4"; + version = "4.0.0"; src = fetchFromGitHub { owner = "haven-protocol-org"; repo = "haven-main"; rev = "v${version}"; - sha256 = "sha256-jKeLFWJDwS8WWRynkDgBjvjq2EDpTEJadwkNsANQXws="; + sha256 = "sha256-craPgQtavSatoVzduIQCWuakIBeXWFWa9E0ALau4AcI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 36344bf1a6e1..5f8b95411e99 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.81.2"; + version = "2.83.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-dnlIIOOYmCN209avQFMcoekB7nJpc2dJnS2OBI+dq7E="; + hash = "sha256-W7K6jRM248PCsUEVhIPeb2em70QwKJ/20RgKzuwj29g="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index 35ecdef1364c..93c3dfc93805 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -83,19 +83,19 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.10", + "getrandom", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.10", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -130,7 +130,7 @@ dependencies = [ "hex-literal", "itoa", "proptest", - "rand 0.8.5", + "rand", "ruint", "serde", "tiny-keccak", @@ -632,7 +632,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ "num-traits", - "rand 0.8.5", + "rand", ] [[package]] @@ -642,7 +642,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand 0.8.5", + "rand", "rayon", ] @@ -655,7 +655,7 @@ dependencies = [ "ark-serialize 0.4.2", "ark-std 0.4.0", "digest 0.10.7", - "rand_core 0.6.4", + "rand_core", "sha3", ] @@ -692,8 +692,24 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", + "asn1-rs-derive 0.4.0", + "asn1-rs-impl 0.1.0", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "asn1-rs" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d" +dependencies = [ + "asn1-rs-derive 0.5.0", + "asn1-rs-impl 0.2.0", "displaydoc", "nom", "num-traits", @@ -711,7 +727,19 @@ dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", + "synstructure 0.13.1", ] [[package]] @@ -725,6 +753,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "asn1-rs-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + [[package]] name = "assert_cmd" version = "2.0.12" @@ -823,6 +862,7 @@ dependencies = [ "pallet-asset-conversion-ops", "pallet-asset-conversion-tx-payment", "pallet-assets", + "pallet-assets-freezer", "pallet-aura", "pallet-authorship", "pallet-balances", @@ -870,7 +910,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -920,7 +960,7 @@ dependencies = [ "staging-xcm-executor", "westend-runtime", "westend-system-emulated-network", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -956,6 +996,7 @@ dependencies = [ "pallet-asset-conversion-ops", "pallet-asset-conversion-tx-payment", "pallet-assets", + "pallet-assets-freezer", "pallet-aura", "pallet-authorship", "pallet-balances", @@ -1002,7 +1043,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -1074,7 +1115,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] @@ -1084,11 +1125,11 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" dependencies = [ - "async-lock", + "async-lock 2.8.0", "async-task", "concurrent-queue", "fastrand 1.9.0", - "futures-lite", + "futures-lite 1.13.0", "slab", ] @@ -1098,10 +1139,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -1112,10 +1153,10 @@ checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "blocking", - "futures-lite", + "futures-lite 1.13.0", "once_cell", ] @@ -1125,27 +1166,57 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", + "polling 2.8.0", "rustix 0.37.23", "slab", "socket2 0.4.9", "waker-fn", ] +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.4.0", + "rustix 0.38.21", + "slab", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "async-lock" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.2.0", + "event-listener-strategy", + "pin-project-lite 0.2.12", ] [[package]] @@ -1154,10 +1225,10 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f" dependencies = [ - "async-io", + "async-io 1.13.0", "autocfg", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -1166,13 +1237,13 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" dependencies = [ - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "autocfg", "blocking", "cfg-if", - "event-listener", - "futures-lite", + "event-listener 2.5.3", + "futures-lite 1.13.0", "rustix 0.37.23", "signal-hook", "windows-sys 0.48.0", @@ -1187,13 +1258,13 @@ dependencies = [ "async-attributes", "async-channel", "async-global-executor", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite", + "futures-lite 1.13.0", "gloo-timers", "kv-log-macro", "log", @@ -1235,9 +1306,9 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", @@ -1269,6 +1340,17 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +[[package]] +name = "attohttpc" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" +dependencies = [ + "http 0.2.9", + "log", + "url", +] + [[package]] name = "atty" version = "0.2.14" @@ -1304,9 +1386,9 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ - "getrandom 0.2.10", + "getrandom", "instant", - "rand 0.8.5", + "rand", ] [[package]] @@ -1338,8 +1420,8 @@ dependencies = [ "dleq_vrf", "fflonk", "merlin", - "rand_chacha 0.3.1", - "rand_core 0.6.4", + "rand_chacha", + "rand_core", "ring 0.1.0", "sha2 0.10.8", "sp-ark-bls12-381", @@ -1371,6 +1453,12 @@ version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" @@ -1493,9 +1581,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -1601,11 +1689,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ "async-channel", - "async-lock", + "async-lock 2.8.0", "async-task", "atomic-waker", "fastrand 1.9.0", - "futures-lite", + "futures-lite 1.13.0", "log", ] @@ -1902,7 +1990,7 @@ dependencies = [ "bp-parachains", "bp-polkadot-core", "bp-runtime", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "finality-grandpa", "parity-scale-codec", "sp-application-crypto", @@ -2101,8 +2189,7 @@ dependencies = [ "static_assertions", "substrate-wasm-builder", "testnet-parachains-constants", - "tuplex", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -2261,9 +2348,8 @@ dependencies = [ "static_assertions", "substrate-wasm-builder", "testnet-parachains-constants", - "tuplex", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -2450,6 +2536,12 @@ dependencies = [ "libc", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cexpr" version = "0.6.0" @@ -2591,7 +2683,7 @@ dependencies = [ "multibase", "multihash 0.17.0", "serde", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -2604,7 +2696,7 @@ dependencies = [ "multibase", "multihash 0.18.1", "serde", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -2768,7 +2860,7 @@ checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354" dependencies = [ "libc", "once_cell", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -2899,7 +2991,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -2987,7 +3079,7 @@ dependencies = [ "fflonk", "getrandom_or_panic", "merlin", - "rand_chacha 0.3.1", + "rand_chacha", ] [[package]] @@ -3063,7 +3155,7 @@ version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" dependencies = [ - "getrandom 0.2.10", + "getrandom", "once_cell", "proc-macro-hack", "tiny-keccak", @@ -3155,7 +3247,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -3166,9 +3258,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -3176,9 +3268,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core2" @@ -3252,7 +3344,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -3317,7 +3409,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -3573,7 +3665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ "generic-array 0.14.7", - "rand_core 0.6.4", + "rand_core", "subtle 2.5.0", "zeroize", ] @@ -3585,7 +3677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array 0.14.7", - "rand_core 0.6.4", + "rand_core", "typenum", ] @@ -3647,7 +3739,7 @@ dependencies = [ "cumulus-test-runtime", "futures", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", @@ -3678,6 +3770,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures", "parity-scale-codec", + "parking_lot 0.12.3", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -3733,6 +3826,7 @@ dependencies = [ "sp-timestamp", "sp-tracing 16.0.0", "sp-trie", + "sp-version", "substrate-prometheus-endpoint", "tracing", ] @@ -3760,7 +3854,7 @@ dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-consensus", "sp-api", "sp-block-builder", @@ -3785,14 +3879,17 @@ dependencies = [ "futures", "futures-timer", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-primitives", + "polkadot-node-subsystem", "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-test-client", "portpicker", + "rstest", "sc-cli", "sc-client-api", + "sp-api", "sp-blockchain", "sp-consensus", "sp-core", @@ -3800,6 +3897,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-state-machine", + "sp-version", "substrate-test-utils", "tokio", "tracing", @@ -3833,9 +3931,11 @@ dependencies = [ name = "cumulus-client-pov-recovery" version = "0.7.0" dependencies = [ + "assert_matches", "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", + "cumulus-test-client", "cumulus-test-service", "futures", "futures-timer", @@ -3845,13 +3945,19 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "portpicker", - "rand 0.8.5", + "rand", + "rstest", "sc-cli", "sc-client-api", "sc-consensus", + "sc-utils", + "sp-api", + "sp-blockchain", "sp-consensus", "sp-maybe-compressed-blob", "sp-runtime", + "sp-tracing 16.0.0", + "sp-version", "substrate-test-utils", "tokio", "tracing", @@ -3956,7 +4062,7 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", - "rand 0.8.5", + "rand", "sc-client-api", "scale-info", "sp-consensus-slots", @@ -4222,6 +4328,7 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-state-machine", + "sp-version", "thiserror", ] @@ -4235,7 +4342,7 @@ dependencies = [ "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", "futures", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-availability-recovery", "polkadot-collator-protocol", "polkadot-core-primitives", @@ -4280,7 +4387,7 @@ dependencies = [ "parity-scale-codec", "pin-project", "polkadot-overseer", - "rand 0.8.5", + "rand", "sc-client-api", "sc-rpc-api", "sc-service", @@ -4436,7 +4543,7 @@ dependencies = [ "polkadot-service", "polkadot-test-service", "portpicker", - "rand 0.8.5", + "rand", "rococo-parachain-runtime", "sc-basic-authorship", "sc-block-builder", @@ -4489,7 +4596,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "socket2 0.5.6", + "socket2 0.5.7", "windows-sys 0.52.0", ] @@ -4511,29 +4618,15 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle 2.5.0", - "zeroize", -] - -[[package]] -name = "curve25519-dalek" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms", "rustc_version 0.4.0", "subtle 2.5.0", "zeroize", @@ -4558,7 +4651,7 @@ checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" dependencies = [ "byteorder", "digest 0.9.0", - "rand_core 0.6.4", + "rand_core", "subtle-ng", "zeroize", ] @@ -4671,7 +4764,21 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +dependencies = [ + "asn1-rs 0.6.1", "displaydoc", "nom", "num-bigint", @@ -4963,19 +5070,10 @@ dependencies = [ "elliptic-curve", "rfc6979", "serdect", - "signature 2.1.0", + "signature", "spki", ] -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature 1.6.4", -] - [[package]] name = "ed25519" version = "2.2.2" @@ -4983,21 +5081,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" dependencies = [ "pkcs8", - "signature 2.1.0", -] - -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek 3.2.0", - "ed25519 1.5.3", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "zeroize", + "signature", ] [[package]] @@ -5006,9 +5090,9 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ - "curve25519-dalek 4.1.2", - "ed25519 2.2.2", - "rand_core 0.6.4", + "curve25519-dalek", + "ed25519", + "rand_core", "serde", "sha2 0.10.8", "subtle 2.5.0", @@ -5021,11 +5105,11 @@ version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" dependencies = [ - "curve25519-dalek 4.1.2", - "ed25519 2.2.2", + "curve25519-dalek", + "ed25519", "hashbrown 0.14.3", "hex", - "rand_core 0.6.4", + "rand_core", "sha2 0.10.8", "zeroize", ] @@ -5049,7 +5133,7 @@ dependencies = [ "generic-array 0.14.7", "group", "pkcs8", - "rand_core 0.6.4", + "rand_core", "sec1", "serdect", "subtle 2.5.0", @@ -5178,19 +5262,6 @@ dependencies = [ "regex", ] -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.10.1" @@ -5331,6 +5402,27 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite 0.2.12", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.2.0", + "pin-project-lite 0.2.12", +] + [[package]] name = "exit-future" version = "0.2.0" @@ -5457,7 +5549,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "rand_core 0.6.4", + "rand_core", "subtle 2.5.0", ] @@ -5514,8 +5606,8 @@ dependencies = [ "log", "num-traits", "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "scale-info", ] @@ -5530,7 +5622,7 @@ dependencies = [ "futures", "log", "num-traits", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "relay-utils", ] @@ -5553,7 +5645,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.5", + "rand", "rustc-hex", "static_assertions", ] @@ -5571,7 +5663,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", - "libz-sys", "miniz_oxide", ] @@ -5693,7 +5784,7 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "rand 0.8.5", + "rand", "rand_pcg", "sc-block-builder", "sc-chain-spec", @@ -5761,7 +5852,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sp-arithmetic", "sp-core", @@ -5781,7 +5872,7 @@ dependencies = [ "frame-support", "honggfuzz", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sp-arithmetic", "sp-npos-elections", @@ -5936,7 +6027,7 @@ dependencies = [ "frame-support-procedural-tools", "itertools 0.11.0", "macro_magic", - "proc-macro-warning", + "proc-macro-warning 1.0.0", "proc-macro2 1.0.82", "quote 1.0.35", "regex", @@ -6069,6 +6160,7 @@ dependencies = [ name = "frame-system-rpc-runtime-api" version = "26.0.0" dependencies = [ + "docify", "parity-scale-codec", "sp-api", ] @@ -6137,6 +6229,16 @@ dependencies = [ "futures-util", ] +[[package]] +name = "futures-bounded" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b07bbbe7d7e78809544c6f718d875627addc73a7c3582447abc052cd3dc67e0" +dependencies = [ + "futures-timer", + "futures-util", +] + [[package]] name = "futures-channel" version = "0.3.30" @@ -6186,6 +6288,16 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "futures-core", + "pin-project-lite 0.2.12", +] + [[package]] name = "futures-macro" version = "0.3.30" @@ -6199,13 +6311,12 @@ dependencies = [ [[package]] name = "futures-rustls" -version = "0.22.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" +checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28" dependencies = [ "futures-io", - "rustls 0.20.8", - "webpki", + "rustls 0.21.7", ] [[package]] @@ -6296,17 +6407,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.10" @@ -6315,7 +6415,7 @@ checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -6324,8 +6424,8 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" dependencies = [ - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", ] [[package]] @@ -6435,9 +6535,9 @@ dependencies = [ "futures-timer", "no-std-compat", "nonzero_ext", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "quanta", - "rand 0.8.5", + "rand", "smallvec", ] @@ -6448,7 +6548,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core 0.6.4", + "rand_core", "subtle 2.5.0", ] @@ -6463,7 +6563,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", + "indexmap 2.2.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", "indexmap 2.2.3", "slab", "tokio", @@ -6521,7 +6640,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", ] [[package]] @@ -6530,7 +6649,7 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", "allocator-api2", "serde", ] @@ -6671,6 +6790,17 @@ dependencies = [ "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.5" @@ -6678,15 +6808,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.9", "pin-project-lite 0.2.12", ] [[package]] -name = "http-range-header" -version = "0.3.1" +name = "http-body" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "pin-project-lite 0.2.12", +] [[package]] name = "httparse" @@ -6716,9 +6863,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.9", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -6730,6 +6877,27 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite 0.2.12", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.1" @@ -6737,15 +6905,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.27", "log", - "rustls 0.21.6", + "rustls 0.21.7", "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", ] +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.3.1", + "hyper-util", + "log", + "rustls 0.23.10", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.3.1", + "pin-project-lite 0.2.12", + "socket2 0.5.7", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.57" @@ -6792,21 +6998,21 @@ dependencies = [ [[package]] name = "if-addrs" -version = "0.7.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" +checksum = "cabb0019d51a643781ff15c9c8a3e5dedc365c47211270f4e8f82812fedd8f0a" dependencies = [ "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "if-watch" -version = "3.0.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f" +checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e" dependencies = [ - "async-io", + "async-io 2.3.3", "core-foundation", "fnv", "futures", @@ -6816,7 +7022,26 @@ dependencies = [ "rtnetlink", "system-configuration", "tokio", - "windows 0.34.0", + "windows 0.51.1", +] + +[[package]] +name = "igd-next" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4" +dependencies = [ + "async-trait", + "attohttpc", + "bytes", + "futures", + "http 0.2.9", + "hyper 0.14.27", + "log", + "rand", + "tokio", + "url", + "xmltree", ] [[package]] @@ -6989,7 +7214,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.6", + "socket2 0.5.7", "widestring", "windows-sys 0.48.0", "winreg", @@ -7033,13 +7258,13 @@ dependencies = [ "curl", "curl-sys", "encoding_rs", - "event-listener", - "futures-lite", - "http", + "event-listener 2.5.3", + "futures-lite 1.13.0", + "http 0.2.9", "log", "mime", "once_cell", - "polling", + "polling 2.8.0", "slab", "sluice", "tracing", @@ -7072,6 +7297,26 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "jobserver" version = "0.1.26" @@ -7109,9 +7354,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad" +checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -7125,20 +7370,22 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4978087a58c3ab02efc5b07c5e5e2803024536106fd5506f558db172c889b3aa" +checksum = "08163edd8bcc466c33d79e10f695cdc98c00d1e6ddfb95cec41b6b0279dd5432" dependencies = [ + "base64 0.22.1", "futures-util", - "http", + "http 1.1.0", "jsonrpsee-core", "pin-project", - "rustls-native-certs 0.7.0", + "rustls 0.23.10", "rustls-pki-types", - "soketto", + "rustls-platform-verifier", + "soketto 0.8.0", "thiserror", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tokio-util", "tracing", "url", @@ -7146,20 +7393,23 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d" +checksum = "79712302e737d23ca0daa178e752c9334846b08321d439fd89af9a384f8c830b" dependencies = [ "anyhow", "async-trait", "beef", + "bytes", "futures-timer", "futures-util", - "hyper", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", "jsonrpsee-types", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", - "rand 0.8.5", + "rand", "rustc-hash", "serde", "serde_json", @@ -7171,15 +7421,20 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ccf93fc4a0bfe05d851d37d7c32b7f370fe94336b52a2f0efc5f1981895c2e5" +checksum = "2d90064e04fb9d7282b1c71044ea94d0bbc6eff5621c66f1a0bce9e9de7cf3ac" dependencies = [ "async-trait", - "hyper", - "hyper-rustls", + "base64 0.22.1", + "http-body 1.0.0", + "hyper 1.3.1", + "hyper-rustls 0.27.2", + "hyper-util", "jsonrpsee-core", "jsonrpsee-types", + "rustls 0.23.10", + "rustls-platform-verifier", "serde", "serde_json", "thiserror", @@ -7191,11 +7446,11 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0bb047e79a143b32ea03974a6bf59b62c2a4c5f5d42a381c907a8bbb3f75c0" +checksum = "7895f186d5921065d96e16bd795e5ca89ac8356ec423fafc6e3d7cf8ec11aee4" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro-crate 3.1.0", "proc-macro2 1.0.82", "quote 1.0.35", @@ -7204,20 +7459,24 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d8b6a9674422a8572e0b0abb12feeb3f2aeda86528c80d0350c2bd0923ab41" +checksum = "654afab2e92e5d88ebd8a39d6074483f3f2bfdf91c5ac57fe285e7127cdd4f51" dependencies = [ + "anyhow", "futures-util", - "http", - "hyper", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "jsonrpsee-core", "jsonrpsee-types", "pin-project", "route-recognizer", "serde", "serde_json", - "soketto", + "soketto 0.8.0", "thiserror", "tokio", "tokio-stream", @@ -7228,12 +7487,12 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d" +checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af" dependencies = [ - "anyhow", "beef", + "http 1.1.0", "serde", "serde_json", "thiserror", @@ -7241,11 +7500,11 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58b9db2dfd5bb1194b0ce921504df9ceae210a345bc2f6c5a61432089bbab070" +checksum = "1c28759775f5cb2f1ea9667672d3fe2b0e701d1f4b7b67954e60afe7fd058b5e" dependencies = [ - "http", + "http 1.1.0", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", @@ -7334,7 +7593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" dependencies = [ "kvdb", - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -7345,7 +7604,7 @@ checksum = "b644c70b92285f66bfc2032922a79000ea30af7bc2ab31902992a5dcb9b434f6" dependencies = [ "kvdb", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "regex", "rocksdb", "smallvec", @@ -7438,9 +7697,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libnghttp2-sys" @@ -7454,14 +7713,15 @@ dependencies = [ [[package]] name = "libp2p" -version = "0.51.4" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f35eae38201a993ece6bdc823292d6abd1bffed1c4d0f4a3517d2bd8e1d917fe" +checksum = "e94495eb319a85b70a68b85e2389a95bb3555c71c49025b78c691a854a7e6464" dependencies = [ "bytes", + "either", "futures", "futures-timer", - "getrandom 0.2.10", + "getrandom", "instant", "libp2p-allow-block-list", "libp2p-connection-limits", @@ -7478,18 +7738,21 @@ dependencies = [ "libp2p-request-response", "libp2p-swarm", "libp2p-tcp", + "libp2p-upnp", "libp2p-wasm-ext", "libp2p-websocket", "libp2p-yamux", - "multiaddr", + "multiaddr 0.18.1", "pin-project", + "rw-stream-sink", + "thiserror", ] [[package]] name = "libp2p-allow-block-list" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510daa05efbc25184458db837f6f9a5143888f1caa742426d92e1833ddd38a50" +checksum = "55b46558c5c0bf99d3e2a1a38fd54ff5476ca66dd1737b12466a1824dd219311" dependencies = [ "libp2p-core", "libp2p-identity", @@ -7499,9 +7762,9 @@ dependencies = [ [[package]] name = "libp2p-connection-limits" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4caa33f1d26ed664c4fe2cca81a08c8e07d4c1c04f2f4ac7655c2dd85467fda0" +checksum = "2f5107ad45cb20b2f6c3628c7b6014b996fcb13a88053f4569c872c6e30abf58" dependencies = [ "libp2p-core", "libp2p-identity", @@ -7511,9 +7774,9 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.39.2" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1df63c0b582aa434fb09b2d86897fa2b419ffeccf934b36f87fcedc8e835c2" +checksum = "dd44289ab25e4c9230d9246c475a22241e301b23e8f4061d3bdef304a1a99713" dependencies = [ "either", "fnv", @@ -7522,50 +7785,53 @@ dependencies = [ "instant", "libp2p-identity", "log", - "multiaddr", - "multihash 0.17.0", + "multiaddr 0.18.1", + "multihash 0.19.1", "multistream-select", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", "quick-protobuf", - "rand 0.8.5", + "rand", "rw-stream-sink", "smallvec", "thiserror", - "unsigned-varint", + "unsigned-varint 0.7.2", "void", ] [[package]] name = "libp2p-dns" -version = "0.39.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146ff7034daae62077c415c2376b8057368042df6ab95f5432ad5e88568b1554" +checksum = "e6a18db73084b4da2871438f6239fef35190b05023de7656e877c18a00541a3b" dependencies = [ + "async-trait", "futures", "libp2p-core", + "libp2p-identity", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "smallvec", - "trust-dns-resolver 0.22.0", + "trust-dns-resolver", ] [[package]] name = "libp2p-identify" -version = "0.42.2" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5455f472243e63b9c497ff320ded0314254a9eb751799a39c283c6f20b793f3c" +checksum = "45a96638a0a176bec0a4bcaebc1afa8cf909b114477209d7456ade52c61cd9cd" dependencies = [ "asynchronous-codec", "either", "futures", + "futures-bounded", "futures-timer", "libp2p-core", "libp2p-identity", "libp2p-swarm", "log", - "lru 0.10.1", + "lru 0.12.3", "quick-protobuf", "quick-protobuf-codec", "smallvec", @@ -7575,27 +7841,27 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.1.3" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" +checksum = "999ec70441b2fb35355076726a6bc466c932e9bdc66f6a11c6c0aa17c7ab9be0" dependencies = [ - "bs58 0.4.0", - "ed25519-dalek 2.1.1", - "log", - "multiaddr", - "multihash 0.17.0", + "bs58 0.5.0", + "ed25519-dalek", + "hkdf", + "multihash 0.19.1", "quick-protobuf", - "rand 0.8.5", + "rand", "sha2 0.10.8", "thiserror", + "tracing", "zeroize", ] [[package]] name = "libp2p-kad" -version = "0.43.3" +version = "0.44.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff" +checksum = "16ea178dabba6dde6ffc260a8e0452ccdc8f79becf544946692fff9d412fc29d" dependencies = [ "arrayvec 0.7.4", "asynchronous-codec", @@ -7610,20 +7876,21 @@ dependencies = [ "libp2p-swarm", "log", "quick-protobuf", - "rand 0.8.5", + "quick-protobuf-codec", + "rand", "sha2 0.10.8", "smallvec", "thiserror", "uint", - "unsigned-varint", + "unsigned-varint 0.7.2", "void", ] [[package]] name = "libp2p-mdns" -version = "0.43.1" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19983e1f949f979a928f2c603de1cf180cc0dc23e4ac93a62651ccb18341460b" +checksum = "42a2567c305232f5ef54185e9604579a894fd0674819402bb0ac0246da82f52a" dependencies = [ "data-encoding", "futures", @@ -7632,9 +7899,9 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "rand 0.8.5", + "rand", "smallvec", - "socket2 0.4.9", + "socket2 0.5.7", "tokio", "trust-dns-proto 0.22.0", "void", @@ -7642,63 +7909,69 @@ dependencies = [ [[package]] name = "libp2p-metrics" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a42ec91e227d7d0dafa4ce88b333cdf5f277253873ab087555c92798db2ddd46" +checksum = "239ba7d28f8d0b5d77760dc6619c05c7e88e74ec8fbbe97f856f20a56745e620" dependencies = [ + "instant", "libp2p-core", "libp2p-identify", + "libp2p-identity", "libp2p-kad", "libp2p-ping", "libp2p-swarm", + "once_cell", "prometheus-client", ] [[package]] name = "libp2p-noise" -version = "0.42.2" +version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3673da89d29936bc6435bafc638e2f184180d554ce844db65915113f86ec5e" +checksum = "d2eeec39ad3ad0677551907dd304b2f13f17208ccebe333bef194076cd2e8921" dependencies = [ "bytes", - "curve25519-dalek 3.2.0", + "curve25519-dalek", "futures", "libp2p-core", "libp2p-identity", "log", + "multiaddr 0.18.1", + "multihash 0.19.1", "once_cell", "quick-protobuf", - "rand 0.8.5", + "rand", "sha2 0.10.8", "snow", "static_assertions", "thiserror", - "x25519-dalek 1.1.1", + "x25519-dalek", "zeroize", ] [[package]] name = "libp2p-ping" -version = "0.42.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e57759c19c28a73ef1eb3585ca410cefb72c1a709fcf6de1612a378e4219202" +checksum = "e702d75cd0827dfa15f8fd92d15b9932abe38d10d21f47c50438c71dd1b5dae3" dependencies = [ "either", "futures", "futures-timer", "instant", "libp2p-core", + "libp2p-identity", "libp2p-swarm", "log", - "rand 0.8.5", + "rand", "void", ] [[package]] name = "libp2p-quic" -version = "0.7.0-alpha.3" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b26abd81cd2398382a1edfe739b539775be8a90fa6914f39b2ab49571ec735" +checksum = "130d451d83f21b81eb7b35b360bc7972aeafb15177784adc56528db082e6b927" dependencies = [ "bytes", "futures", @@ -7708,19 +7981,21 @@ dependencies = [ "libp2p-identity", "libp2p-tls", "log", - "parking_lot 0.12.1", - "quinn-proto", - "rand 0.8.5", - "rustls 0.20.8", + "parking_lot 0.12.3", + "quinn 0.10.2", + "rand", + "ring 0.16.20", + "rustls 0.21.7", + "socket2 0.5.7", "thiserror", "tokio", ] [[package]] name = "libp2p-request-response" -version = "0.24.1" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffdb374267d42dc5ed5bc53f6e601d4a64ac5964779c6e40bb9e4f14c1e30d5" +checksum = "d8e3b4d67870478db72bac87bfc260ee6641d0734e0e3e275798f089c3fecfd4" dependencies = [ "async-trait", "futures", @@ -7728,15 +8003,17 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-swarm", - "rand 0.8.5", + "log", + "rand", "smallvec", + "void", ] [[package]] name = "libp2p-swarm" -version = "0.42.2" +version = "0.43.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903b3d592d7694e56204d211f29d31bc004be99386644ba8731fc3e3ef27b296" +checksum = "580189e0074af847df90e75ef54f3f30059aedda37ea5a1659e8b9fca05c0141" dependencies = [ "either", "fnv", @@ -7747,7 +8024,9 @@ dependencies = [ "libp2p-identity", "libp2p-swarm-derive", "log", - "rand 0.8.5", + "multistream-select", + "once_cell", + "rand", "smallvec", "tokio", "void", @@ -7755,36 +8034,39 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fba456131824ab6acd4c7bf61e9c0f0a3014b5fc9868ccb8e10d344594cdc4f" +checksum = "c4d5ec2a3df00c7836d7696c136274c9c59705bac69133253696a6c932cd1d74" dependencies = [ "heck 0.4.1", + "proc-macro-warning 0.4.2", + "proc-macro2 1.0.82", "quote 1.0.35", - "syn 1.0.109", + "syn 2.0.61", ] [[package]] name = "libp2p-tcp" -version = "0.39.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d33698596d7722d85d3ab0c86c2c322254fce1241e91208e3679b4eb3026cf" +checksum = "b558dd40d1bcd1aaaed9de898e9ec6a436019ecc2420dd0016e712fbb61c5508" dependencies = [ "futures", "futures-timer", "if-watch", "libc", "libp2p-core", + "libp2p-identity", "log", - "socket2 0.4.9", + "socket2 0.5.7", "tokio", ] [[package]] name = "libp2p-tls" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781" +checksum = "8218d1d5482b122ccae396bbf38abdcb283ecc96fa54760e1dfd251f0546ac61" dependencies = [ "futures", "futures-rustls", @@ -7792,51 +8074,68 @@ dependencies = [ "libp2p-identity", "rcgen", "ring 0.16.20", - "rustls 0.20.8", + "rustls 0.21.7", + "rustls-webpki 0.101.4", "thiserror", - "webpki", - "x509-parser 0.14.0", + "x509-parser 0.15.1", "yasna", ] [[package]] -name = "libp2p-wasm-ext" -version = "0.39.0" +name = "libp2p-upnp" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77dff9d32353a5887adb86c8afc1de1a94d9e8c3bc6df8b2201d7cdf5c848f43" +checksum = "82775a47b34f10f787ad3e2a22e2c1541e6ebef4fe9f28f3ac553921554c94c1" +dependencies = [ + "futures", + "futures-timer", + "igd-next", + "libp2p-core", + "libp2p-swarm", + "log", + "tokio", + "void", +] + +[[package]] +name = "libp2p-wasm-ext" +version = "0.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e5d8e3a9e07da0ef5b55a9f26c009c8fb3c725d492d8bb4b431715786eea79c" dependencies = [ "futures", "js-sys", "libp2p-core", - "parity-send-wrapper", + "send_wrapper", "wasm-bindgen", "wasm-bindgen-futures", ] [[package]] name = "libp2p-websocket" -version = "0.41.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111273f7b3d3510524c752e8b7a5314b7f7a1fee7e68161c01a7d72cbb06db9f" +checksum = "3facf0691bab65f571bc97c6c65ffa836248ca631d631b7691ac91deb7fceb5f" dependencies = [ "either", "futures", "futures-rustls", "libp2p-core", + "libp2p-identity", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "quicksink", "rw-stream-sink", - "soketto", + "soketto 0.7.1", "url", - "webpki-roots 0.22.6", + "webpki-roots 0.25.2", ] [[package]] name = "libp2p-yamux" -version = "0.43.1" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd21d950662700a385d4c6d68e2f5f54d778e97068cdd718522222ef513bda" +checksum = "8eedcb62824c4300efb9cfd4e2a6edaf3ca097b9e68b36dabe45a44469fd6a85" dependencies = [ "futures", "libp2p-core", @@ -7873,7 +8172,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand 0.8.5", + "rand", "serde", "sha2 0.9.9", "typenum", @@ -8003,40 +8302,40 @@ dependencies = [ [[package]] name = "litep2p" -version = "0.5.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f02542ae3a94b4c4ffa37dc56388c923e286afa3bf65452e3984b50b2a2f316" +checksum = "0f46c51c205264b834ceed95c8b195026e700494bc3991aaba3b4ea9e20626d9" dependencies = [ "async-trait", "bs58 0.4.0", "bytes", "cid 0.10.1", - "ed25519-dalek 1.0.1", + "ed25519-dalek", "futures", "futures-timer", "hex-literal", "indexmap 2.2.3", "libc", "mockall 0.12.1", - "multiaddr", + "multiaddr 0.17.1", "multihash 0.17.0", "network-interface", "nohash-hasher", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", - "prost 0.11.9", + "prost 0.12.6", "prost-build 0.11.9", - "quinn", - "rand 0.8.5", + "quinn 0.9.4", + "rand", "rcgen", "ring 0.16.20", - "rustls 0.20.8", + "rustls 0.20.9", "serde", "sha2 0.10.8", "simple-dns", "smallvec", "snow", - "socket2 0.5.6", + "socket2 0.5.7", "static_assertions", "str0m", "thiserror", @@ -8045,13 +8344,13 @@ dependencies = [ "tokio-tungstenite", "tokio-util", "tracing", - "trust-dns-resolver 0.23.2", + "trust-dns-resolver", "uint", - "unsigned-varint", + "unsigned-varint 0.8.0", "url", "webpki", - "x25519-dalek 2.0.0", - "x509-parser 0.15.1", + "x25519-dalek", + "x509-parser 0.16.0", "yasna", "zeroize", ] @@ -8085,21 +8384,21 @@ dependencies = [ "hashbrown 0.12.3", ] -[[package]] -name = "lru" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" -dependencies = [ - "hashbrown 0.13.2", -] - [[package]] name = "lru" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5" +[[package]] +name = "lru" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown 0.14.3", +] + [[package]] name = "lru-cache" version = "0.1.2" @@ -8323,7 +8622,7 @@ checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" dependencies = [ "byteorder", "keccak", - "rand_core 0.6.4", + "rand_core", "zeroize", ] @@ -8340,7 +8639,7 @@ dependencies = [ "hex", "log", "num-traits", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "relay-utils", "sp-arithmetic", ] @@ -8352,7 +8651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532" dependencies = [ "futures", - "rand 0.8.5", + "rand", "thrift", ] @@ -8386,6 +8685,7 @@ name = "minimal-template-node" version = "0.0.0" dependencies = [ "clap 4.5.3", + "docify", "futures", "futures-timer", "jsonrpsee", @@ -8450,7 +8750,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -8465,14 +8765,14 @@ dependencies = [ "bitflags 1.3.2", "blake2 0.10.6", "c2-chacha", - "curve25519-dalek 4.1.2", + "curve25519-dalek", "either", "hashlink", "lioness", "log", - "parking_lot 0.12.1", - "rand 0.8.5", - "rand_chacha 0.3.1", + "parking_lot 0.12.3", + "rand", + "rand_chacha", "rand_distr", "subtle 2.5.0", "thiserror", @@ -8486,7 +8786,7 @@ dependencies = [ "futures", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-block-builder", "sc-client-api", "sc-offchain", @@ -8571,6 +8871,12 @@ dependencies = [ "syn 2.0.61", ] +[[package]] +name = "multi-stash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685a9ac4b61f4e728e1d2c6a7844609c16527aeb5e6c865915c08e619c16410f" + [[package]] name = "multiaddr" version = "0.17.1" @@ -8586,7 +8892,26 @@ dependencies = [ "percent-encoding", "serde", "static_assertions", - "unsigned-varint", + "unsigned-varint 0.7.2", + "url", +] + +[[package]] +name = "multiaddr" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b852bc02a2da5feed68cd14fa50d0774b92790a5bdbfa932a813926c8472070" +dependencies = [ + "arrayref", + "byteorder", + "data-encoding", + "libp2p-identity", + "multibase", + "multihash 0.19.1", + "percent-encoding", + "serde", + "static_assertions", + "unsigned-varint 0.7.2", "url", ] @@ -8612,10 +8937,10 @@ dependencies = [ "blake3", "core2", "digest 0.10.7", - "multihash-derive 0.8.0", + "multihash-derive", "sha2 0.10.8", "sha3", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -8629,10 +8954,10 @@ dependencies = [ "blake3", "core2", "digest 0.10.7", - "multihash-derive 0.8.0", + "multihash-derive", "sha2 0.10.8", "sha3", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -8642,27 +8967,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" dependencies = [ "core2", - "unsigned-varint", -] - -[[package]] -name = "multihash-codetable" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d815ecb3c8238d00647f8630ede7060a642c9f704761cd6082cb4028af6935" -dependencies = [ - "blake2b_simd", - "blake2s_simd", - "blake3", - "core2", - "digest 0.10.7", - "multihash-derive 0.9.0", - "ripemd", - "serde", - "sha1", - "sha2 0.10.8", - "sha3", - "strobe-rs", + "unsigned-varint 0.7.2", ] [[package]] @@ -8676,32 +8981,7 @@ dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "multihash-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "890e72cb7396cb99ed98c1246a97b243cc16394470d94e0bc8b0c2c11d84290e" -dependencies = [ - "core2", - "multihash 0.19.1", - "multihash-derive-impl", -] - -[[package]] -name = "multihash-derive-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38685e08adb338659871ecfc6ee47ba9b22dcc8abcf6975d379cc49145c3040" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro-error", - "proc-macro2 1.0.82", - "quote 1.0.35", - "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", ] [[package]] @@ -8712,16 +8992,16 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" +checksum = "ea0df8e5eec2298a62b326ee4f0d7fe1a6b90a09dfcf9df37b38f947a8c42f19" dependencies = [ "bytes", "futures", "log", "pin-project", "smallvec", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -8758,7 +9038,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" dependencies = [ "clap 3.2.25", - "rand 0.8.5", + "rand", ] [[package]] @@ -8874,7 +9154,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -8910,7 +9190,7 @@ dependencies = [ "node-primitives", "node-testing", "parity-db", - "rand 0.8.5", + "rand", "sc-basic-authorship", "sc-client-api", "sc-transaction-pool", @@ -9127,6 +9407,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + [[package]] name = "num-format" version = "0.4.4" @@ -9232,7 +9523,16 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", +] + +[[package]] +name = "oid-registry" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d" +dependencies = [ + "asn1-rs 0.6.1", ] [[package]] @@ -9265,7 +9565,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -9506,6 +9806,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "impl-trait-for-tuples", "log", "pallet-balances", "parity-scale-codec", @@ -9516,6 +9817,23 @@ dependencies = [ "sp-std 14.0.0", ] +[[package]] +name = "pallet-assets-freezer" +version = "0.1.0" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-assets", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", +] + [[package]] name = "pallet-atomic-swap" version = "28.0.0" @@ -9637,7 +9955,7 @@ dependencies = [ "frame-election-provider-support", "honggfuzz", "pallet-bags-list", - "rand 0.8.5", + "rand", ] [[package]] @@ -9762,7 +10080,7 @@ dependencies = [ "pallet-beefy-mmr", "pallet-mmr", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "serde", "sp-consensus-beefy", @@ -9912,7 +10230,7 @@ dependencies = [ "pallet-session", "pallet-timestamp", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sp-consensus-aura", "sp-core", @@ -9981,7 +10299,7 @@ dependencies = [ "parity-scale-codec", "paste", "pretty_assertions", - "rand 0.8.5", + "rand", "rand_pcg", "scale-info", "serde", @@ -9996,7 +10314,7 @@ dependencies = [ "staging-xcm", "staging-xcm-builder", "wasm-instrument", - "wasmi", + "wasmi 0.32.3", "wat", ] @@ -10198,7 +10516,7 @@ dependencies = [ "pallet-staking", "pallet-timestamp", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "scale-info", "sp-core", "sp-io", @@ -10221,8 +10539,8 @@ dependencies = [ "pallet-balances", "pallet-election-provider-support-benchmarking", "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "scale-info", "sp-arithmetic", "sp-core", @@ -10446,6 +10764,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-core", + "sp-inherents", "sp-io", "sp-runtime", "sp-std 14.0.0", @@ -10595,7 +10914,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec", - "rand 0.8.5", + "rand", "rand_distr", "scale-info", "serde", @@ -10829,7 +11148,7 @@ dependencies = [ "honggfuzz", "log", "pallet-nomination-pools", - "rand 0.8.5", + "rand", "sp-io", "sp-runtime", "sp-tracing 16.0.0", @@ -11269,7 +11588,7 @@ dependencies = [ "pallet-staking-reward-curve", "pallet-timestamp", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sp-core", "sp-io", @@ -11301,7 +11620,7 @@ dependencies = [ "log", "pallet-balances", "parity-scale-codec", - "rand_chacha 0.3.1", + "rand_chacha", "scale-info", "sp-arithmetic", "sp-core", @@ -11327,7 +11646,7 @@ dependencies = [ "pallet-staking-reward-curve", "pallet-timestamp", "parity-scale-codec", - "rand_chacha 0.3.1", + "rand_chacha", "scale-info", "serde", "sp-application-crypto", @@ -11380,7 +11699,7 @@ dependencies = [ "log", "pallet-balances", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "scale-info", "serde", "sp-core", @@ -11679,7 +11998,7 @@ dependencies = [ "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -11953,8 +12272,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9" dependencies = [ "bitcoin_hashes 0.13.0", - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", "serde", "unicode-normalization", ] @@ -11979,8 +12298,8 @@ dependencies = [ "log", "lz4", "memmap2 0.5.10", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "siphasher", "snap", ] @@ -12012,12 +12331,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "parity-send-wrapper" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" - [[package]] name = "parity-util-mem" version = "0.12.0" @@ -12030,7 +12343,7 @@ dependencies = [ "impl-trait-for-tuples", "lru 0.8.1", "parity-util-mem-derive", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "primitive-types", "smallvec", "winapi", @@ -12044,7 +12357,7 @@ checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ "proc-macro2 1.0.82", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", ] [[package]] @@ -12072,9 +12385,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core 0.9.8", @@ -12120,7 +12433,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle 2.5.0", ] @@ -12227,7 +12540,7 @@ dependencies = [ "staging-xcm-builder", "staging-xcm-executor", "substrate-wasm-builder", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -12328,7 +12641,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -12429,7 +12742,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -12621,9 +12934,9 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_core 0.6.4", + "rand", + "rand_chacha", + "rand_core", "schnorrkel 0.11.4", "sp-authority-discovery", "sp-core", @@ -12647,8 +12960,8 @@ dependencies = [ "polkadot-node-subsystem-test-helpers", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "sp-application-crypto", "sp-authority-discovery", "sp-core", @@ -12676,7 +12989,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", - "rand 0.8.5", + "rand", "rstest", "sc-network", "schnellru", @@ -12708,7 +13021,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", - "rand 0.8.5", + "rand", "rstest", "sc-network", "schnellru", @@ -12859,15 +13172,15 @@ dependencies = [ "futures", "futures-timer", "lazy_static", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", "polkadot-node-subsystem-util", "polkadot-primitives", "quickcheck", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "sc-network", "sc-network-common", "sp-application-crypto", @@ -12893,7 +13206,7 @@ dependencies = [ "futures", "futures-timer", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-subsystem", @@ -12949,7 +13262,7 @@ dependencies = [ "log", "merlin", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -12959,9 +13272,9 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_core 0.6.4", + "rand", + "rand_chacha", + "rand_core", "sc-keystore", "schnellru", "schnorrkel 0.11.4", @@ -12990,7 +13303,7 @@ dependencies = [ "kvdb-memorydb", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-erasure-coding", "polkadot-node-jaeger", "polkadot-node-primitives", @@ -13106,7 +13419,7 @@ dependencies = [ "kvdb", "kvdb-memorydb", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", @@ -13177,6 +13490,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "rstest", "sc-keystore", "sp-application-crypto", "sp-core", @@ -13236,7 +13550,7 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "procfs", - "rand 0.8.5", + "rand", "rococo-runtime", "rusty-fork", "sc-sysinfo", @@ -13368,7 +13682,7 @@ dependencies = [ "log", "mick-jaeger", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-primitives", "polkadot-primitives", "sc-network", @@ -13386,7 +13700,7 @@ dependencies = [ "bs58 0.5.0", "futures", "futures-timer", - "hyper", + "hyper 0.14.27", "log", "parity-scale-codec", "polkadot-primitives", @@ -13419,8 +13733,8 @@ dependencies = [ "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "sc-authority-discovery", "sc-network", "sc-network-types", @@ -13468,7 +13782,7 @@ version = "1.0.0" dependencies = [ "async-trait", "futures", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -13531,7 +13845,7 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", "polkadot-erasure-coding", "polkadot-node-jaeger", @@ -13545,7 +13859,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "prioritized-metered-channel", - "rand 0.8.5", + "rand", "sc-client-api", "schnellru", "sp-application-crypto", @@ -13566,7 +13880,7 @@ dependencies = [ "futures", "futures-timer", "orchestra", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -13584,7 +13898,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "1.13.0" +version = "1.14.0" dependencies = [ "assert_cmd", "asset-hub-rococo-runtime", @@ -13726,7 +14040,7 @@ name = "polkadot-primitives-test-helpers" version = "1.0.0" dependencies = [ "polkadot-primitives", - "rand 0.8.5", + "rand", "sp-application-crypto", "sp-core", "sp-keyring", @@ -13867,10 +14181,9 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-runtime-metrics", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rstest", - "rustc-hex", "sc-keystore", "scale-info", "serde", @@ -13985,6 +14298,7 @@ dependencies = [ "pallet-asset-rate", "pallet-asset-tx-payment", "pallet-assets", + "pallet-assets-freezer", "pallet-atomic-swap", "pallet-aura", "pallet-authority-discovery", @@ -14276,8 +14590,8 @@ dependencies = [ "tracing-gum-proc-macro", "westend-runtime-constants", "xcm-emulator", - "xcm-fee-payment-runtime-api", "xcm-procedural", + "xcm-runtime-apis", "xcm-simulator", ] @@ -14297,6 +14611,7 @@ dependencies = [ "frame-support", "frame-system", "kitchensink-runtime", + "minimal-template-runtime", "pallet-assets", "pallet-aura", "pallet-authorship", @@ -14319,6 +14634,7 @@ dependencies = [ "pallet-transaction-payment", "pallet-uniques", "pallet-utility", + "parachain-template-runtime", "parity-scale-codec", "polkadot-sdk", "polkadot-sdk-frame", @@ -14338,6 +14654,7 @@ dependencies = [ "sc-service", "scale-info", "simple-mermaid 0.1.1", + "solochain-template-runtime", "sp-api", "sp-arithmetic", "sp-core", @@ -14346,6 +14663,9 @@ dependencies = [ "sp-keyring", "sp-offchain", "sp-runtime", + "sp-runtime-interface 24.0.0", + "sp-std 14.0.0", + "sp-tracing 16.0.0", "sp-version", "staging-chain-spec-builder", "staging-node-cli", @@ -14416,7 +14736,7 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "parity-db", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", @@ -14514,7 +14834,7 @@ dependencies = [ "tracing-gum", "westend-runtime", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -14538,7 +14858,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", - "rand_chacha 0.3.1", + "rand_chacha", "sc-keystore", "sc-network", "sp-application-crypto", @@ -14606,9 +14926,9 @@ dependencies = [ "prometheus", "pyroscope", "pyroscope_pprofrs", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_core 0.6.4", + "rand", + "rand_chacha", + "rand_core", "rand_distr", "sc-keystore", "sc-network", @@ -14627,7 +14947,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-timestamp", - "strum 0.24.1", + "strum 0.26.2", "substrate-prometheus-endpoint", "tokio", "tracing-gum", @@ -14687,7 +15007,7 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.5", + "rand", "sp-core", "sp-keystore", "substrate-build-script-utils", @@ -14775,7 +15095,7 @@ dependencies = [ "polkadot-runtime-parachains", "polkadot-service", "polkadot-test-runtime", - "rand 0.8.5", + "rand", "sc-authority-discovery", "sc-chain-spec", "sc-cli", @@ -14916,6 +15236,20 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "polling" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite 0.2.12", + "rustix 0.38.21", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "poly1305" version = "0.8.0" @@ -14951,7 +15285,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" dependencies = [ - "rand 0.8.5", + "rand", ] [[package]] @@ -14967,7 +15301,7 @@ dependencies = [ "log", "nix 0.26.2", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "smallvec", "symbolic-demangle", "tempfile", @@ -15132,6 +15466,17 @@ version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" +[[package]] +name = "proc-macro-warning" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + [[package]] name = "proc-macro-warning" version = "1.0.0" @@ -15167,7 +15512,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "chrono", "flate2", "hex", @@ -15182,7 +15527,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "chrono", "hex", ] @@ -15197,19 +15542,19 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "thiserror", ] [[package]] name = "prometheus-client" -version = "0.19.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6fa99d535dd930d1249e6c79cb3c2915f9172a540fe2b02a4c8f9ca954721e" +checksum = "3c99afa9a01501019ac3a14d71d9f94050346f55ca471ce90c799a15c58f61e2" dependencies = [ "dtoa", "itoa", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "prometheus-client-derive-encode", ] @@ -15244,11 +15589,11 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.4.0", + "bitflags 2.6.0", "lazy_static", "num-traits", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rand_xorshift", "regex-syntax 0.8.2", "rusty-fork", @@ -15268,12 +15613,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.4", + "prost-derive 0.12.6", ] [[package]] @@ -15312,7 +15657,7 @@ dependencies = [ "once_cell", "petgraph", "prettyplease 0.2.12", - "prost 0.12.4", + "prost 0.12.6", "prost-types 0.12.4", "regex", "syn 2.0.61", @@ -15334,9 +15679,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", "itertools 0.11.0", @@ -15360,7 +15705,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" dependencies = [ - "prost 0.12.4", + "prost 0.12.6", ] [[package]] @@ -15413,7 +15758,7 @@ dependencies = [ "mach2", "once_cell", "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "web-sys", "winapi", ] @@ -15435,15 +15780,26 @@ dependencies = [ [[package]] name = "quick-protobuf-codec" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1693116345026436eb2f10b677806169c1a1260c1c60eaaffe3fb5a29ae23d8b" +checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98" dependencies = [ "asynchronous-codec", "bytes", "quick-protobuf", "thiserror", - "unsigned-varint", + "unsigned-varint 0.7.2", +] + +[[package]] +name = "quick_cache" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5253a3a0d56548d5b0be25414171dc780cc6870727746d05bd2bde352eee96c5" +dependencies = [ + "ahash 0.8.11", + "hashbrown 0.13.2", + "parking_lot 0.12.3", ] [[package]] @@ -15454,7 +15810,7 @@ checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" dependencies = [ "env_logger 0.8.4", "log", - "rand 0.8.5", + "rand", ] [[package]] @@ -15476,10 +15832,10 @@ checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" dependencies = [ "bytes", "pin-project-lite 0.2.12", - "quinn-proto", - "quinn-udp", + "quinn-proto 0.9.6", + "quinn-udp 0.3.2", "rustc-hash", - "rustls 0.20.8", + "rustls 0.20.9", "thiserror", "tokio", "tracing", @@ -15487,16 +15843,34 @@ dependencies = [ ] [[package]] -name = "quinn-proto" -version = "0.9.5" +name = "quinn" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989" +checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" dependencies = [ "bytes", - "rand 0.8.5", + "futures-io", + "pin-project-lite 0.2.12", + "quinn-proto 0.10.6", + "quinn-udp 0.4.1", + "rustc-hash", + "rustls 0.21.7", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" +dependencies = [ + "bytes", + "rand", "ring 0.16.20", "rustc-hash", - "rustls 0.20.8", + "rustls 0.20.9", "slab", "thiserror", "tinyvec", @@ -15504,6 +15878,23 @@ dependencies = [ "webpki", ] +[[package]] +name = "quinn-proto" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +dependencies = [ + "bytes", + "rand", + "ring 0.16.20", + "rustc-hash", + "rustls 0.21.7", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + [[package]] name = "quinn-udp" version = "0.3.2" @@ -15511,12 +15902,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" dependencies = [ "libc", - "quinn-proto", + "quinn-proto 0.9.6", "socket2 0.4.9", "tracing", "windows-sys 0.42.0", ] +[[package]] +name = "quinn-udp" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +dependencies = [ + "bytes", + "libc", + "socket2 0.5.7", + "tracing", + "windows-sys 0.48.0", +] + [[package]] name = "quote" version = "0.6.13" @@ -15541,19 +15945,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -15561,18 +15952,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -15582,16 +15963,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -15600,7 +15972,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom", ] [[package]] @@ -15610,16 +15982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ "num-traits", - "rand 0.8.5", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "rand", ] [[package]] @@ -15628,7 +15991,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -15637,7 +16000,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -15740,7 +16103,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.10", + "getrandom", "redox_syscall 0.2.16", "thiserror", ] @@ -15881,12 +16244,14 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "parity-scale-codec", - "rand 0.8.5", + "quick_cache", + "rand", "relay-utils", "sc-chain-spec", "sc-rpc-api", "sc-transaction-pool-api", "scale-info", + "serde_json", "sp-consensus-grandpa", "sp-core", "sp-rpc", @@ -15915,7 +16280,7 @@ dependencies = [ "jsonpath_lib", "log", "num-traits", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde_json", "sp-runtime", "substrate-prometheus-endpoint", @@ -15951,11 +16316,11 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", + "h2 0.3.26", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.27", + "hyper-rustls 0.24.1", "ipnet", "js-sys", "log", @@ -15963,7 +16328,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite 0.2.12", - "rustls 0.21.6", + "rustls 0.21.7", "rustls-pemfile 1.0.3", "serde", "serde_json", @@ -16037,22 +16402,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.10", + "getrandom", "libc", "spin 0.9.8", "untrusted 0.9.0", "windows-sys 0.48.0", ] -[[package]] -name = "ripemd" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "rle-decode-fast" version = "1.0.3" @@ -16251,7 +16607,7 @@ dependencies = [ "substrate-wasm-builder", "tiny-keccak", "tokio", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -16382,7 +16738,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "proptest", - "rand 0.8.5", + "rand", "rlp", "ruint-macro", "serde", @@ -16484,7 +16840,7 @@ version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys 0.4.10", @@ -16493,11 +16849,10 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ - "log", "ring 0.16.20", "sct", "webpki", @@ -16505,9 +16860,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring 0.16.20", @@ -16517,14 +16872,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "log", + "once_cell", "ring 0.17.7", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.4", "subtle 2.5.0", "zeroize", ] @@ -16575,9 +16931,36 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.2.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a716eb65e3158e90e17cd93d855216e27bde02745ab842f2cab4a39dba1bacf" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustls-platform-verifier" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.10", + "rustls-native-certs 0.7.0", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.4", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.3", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" [[package]] name = "rustls-webpki" @@ -16591,9 +16974,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring 0.17.7", "rustls-pki-types", @@ -16631,9 +17014,9 @@ dependencies = [ [[package]] name = "rw-stream-sink" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" +checksum = "d8c9026ff5d2f23da5e45bbc283f156383001bfb09c4e44256d02c1a685fe9a1" dependencies = [ "futures", "pin-project", @@ -16694,13 +17077,12 @@ dependencies = [ "libp2p", "linked_hash_set", "log", - "multihash 0.17.0", - "multihash-codetable", + "multihash 0.19.1", "parity-scale-codec", - "prost 0.12.4", + "prost 0.12.6", "prost-build 0.12.4", "quickcheck", - "rand 0.8.5", + "rand", "sc-client-api", "sc-network", "sc-network-types", @@ -16724,7 +17106,7 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-block-builder", "sc-client-api", "sc-proposer-metrics", @@ -16815,7 +17197,7 @@ dependencies = [ "names", "parity-bip39", "parity-scale-codec", - "rand 0.8.5", + "rand", "regex", "rpassword", "sc-client-api", @@ -16850,7 +17232,7 @@ dependencies = [ "futures", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -16886,9 +17268,9 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "quickcheck", - "rand 0.8.5", + "rand", "sc-client-api", "sc-state-db", "schnellru", @@ -16910,10 +17292,9 @@ version = "0.33.0" dependencies = [ "async-trait", "futures", - "futures-timer", "log", "mockall 0.11.4", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-client-api", "sc-network-types", "sc-utils", @@ -16937,7 +17318,7 @@ dependencies = [ "futures", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -16979,7 +17360,7 @@ dependencies = [ "num-rational", "num-traits", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -17048,7 +17429,7 @@ dependencies = [ "futures", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -17089,7 +17470,7 @@ dependencies = [ "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-consensus-beefy", "sc-rpc", "serde", @@ -17119,7 +17500,7 @@ dependencies = [ name = "sc-consensus-grandpa" version = "0.19.0" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", "array-bytes", "assert_matches", "async-trait", @@ -17130,8 +17511,8 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -17236,7 +17617,7 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-client-api", "sc-consensus", "sp-api", @@ -17284,7 +17665,7 @@ dependencies = [ "env_logger 0.11.3", "num_cpus", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "paste", "regex", "sc-executor-common", @@ -17346,7 +17727,7 @@ dependencies = [ "libc", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "paste", "rustix 0.36.15", "sc-allocator", @@ -17381,7 +17762,7 @@ name = "sc-keystore" version = "25.0.0" dependencies = [ "array-bytes", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde_json", "sp-application-crypto", "sp-core", @@ -17402,9 +17783,9 @@ dependencies = [ "futures-timer", "log", "mixnet", - "multiaddr", + "multiaddr 0.18.1", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-client-api", "sc-network", "sc-network-types", @@ -17442,12 +17823,12 @@ dependencies = [ "multistream-select", "once_cell", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "partial_sort", "pin-project", - "prost 0.12.4", + "prost 0.12.6", "prost-build 0.12.4", - "rand 0.8.5", + "rand", "sc-block-builder", "sc-client-api", "sc-network-common", @@ -17476,7 +17857,7 @@ dependencies = [ "tokio-stream", "tokio-test", "tokio-util", - "unsigned-varint", + "unsigned-varint 0.7.2", "void", "wasm-timer", "zeroize", @@ -17504,11 +17885,10 @@ dependencies = [ name = "sc-network-gossip" version = "0.34.0" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", "async-trait", "futures", "futures-timer", - "libp2p", "log", "parity-scale-codec", "quickcheck", @@ -17533,7 +17913,7 @@ dependencies = [ "futures", "log", "parity-scale-codec", - "prost 0.12.4", + "prost 0.12.6", "prost-build 0.12.4", "sc-client-api", "sc-network", @@ -17551,7 +17931,6 @@ dependencies = [ "array-bytes", "async-channel", "futures", - "libp2p", "log", "parity-scale-codec", "sc-network", @@ -17578,7 +17957,7 @@ dependencies = [ "log", "mockall 0.11.4", "parity-scale-codec", - "prost 0.12.4", + "prost 0.12.6", "prost-build 0.12.4", "quickcheck", "sc-block-builder", @@ -17614,8 +17993,8 @@ dependencies = [ "futures-timer", "libp2p", "log", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -17642,7 +18021,6 @@ version = "0.33.0" dependencies = [ "array-bytes", "futures", - "libp2p", "log", "parity-scale-codec", "sc-network", @@ -17660,13 +18038,14 @@ name = "sc-network-types" version = "0.10.0" dependencies = [ "bs58 0.5.0", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "libp2p-identity", "litep2p", - "multiaddr", - "multihash 0.17.0", + "log", + "multiaddr 0.18.1", + "multihash 0.19.1", "quickcheck", - "rand 0.8.5", + "rand", "thiserror", "zeroize", ] @@ -17681,16 +18060,15 @@ dependencies = [ "fnv", "futures", "futures-timer", - "hyper", - "hyper-rustls", + "hyper 0.14.27", + "hyper-rustls 0.24.1", "lazy_static", - "libp2p", "log", "num_cpus", "once_cell", "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "sc-block-builder", "sc-client-api", "sc-client-db", @@ -17732,7 +18110,7 @@ dependencies = [ "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pretty_assertions", "sc-block-builder", "sc-chain-spec", @@ -17790,11 +18168,13 @@ dependencies = [ "forwarded-header-value", "futures", "governor", - "http", - "hyper", + "http 1.1.0", + "http-body-util", + "hyper 1.3.1", "ip_network", "jsonrpsee", "log", + "serde", "serde_json", "substrate-prometheus-endpoint", "tokio", @@ -17814,9 +18194,9 @@ dependencies = [ "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pretty_assertions", - "rand 0.8.5", + "rand", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -17869,9 +18249,9 @@ dependencies = [ "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", - "rand 0.8.5", + "rand", "sc-chain-spec", "sc-client-api", "sc-client-db", @@ -17932,7 +18312,7 @@ dependencies = [ "futures", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-block-builder", "sc-client-api", "sc-client-db", @@ -17964,7 +18344,7 @@ version = "0.30.0" dependencies = [ "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sp-core", ] @@ -17975,7 +18355,7 @@ dependencies = [ "env_logger 0.11.3", "log", "parity-db", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-client-api", "sc-keystore", "sp-api", @@ -18026,7 +18406,7 @@ dependencies = [ "futures", "libc", "log", - "rand 0.8.5", + "rand", "rand_pcg", "regex", "sc-telemetry", @@ -18047,9 +18427,9 @@ dependencies = [ "futures", "libp2p", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", - "rand 0.8.5", + "rand", "sc-network", "sc-utils", "serde", @@ -18070,7 +18450,7 @@ dependencies = [ "libc", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "regex", "rustc-hash", "sc-client-api", @@ -18111,7 +18491,7 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-block-builder", "sc-client-api", "sc-transaction-pool-api", @@ -18157,7 +18537,7 @@ dependencies = [ "futures-timer", "lazy_static", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "prometheus", "sp-arithmetic", "tokio-test", @@ -18257,7 +18637,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", "cfg-if", "hashbrown 0.13.2", ] @@ -18272,7 +18652,7 @@ dependencies = [ "arrayvec 0.7.4", "curve25519-dalek-ng", "merlin", - "rand_core 0.6.4", + "rand_core", "sha2 0.9.9", "subtle-ng", "zeroize", @@ -18287,10 +18667,10 @@ dependencies = [ "aead", "arrayref", "arrayvec 0.7.4", - "curve25519-dalek 4.1.2", + "curve25519-dalek", "getrandom_or_panic", "merlin", - "rand_core 0.6.4", + "rand_core", "serde_bytes", "sha2 0.10.8", "subtle 2.5.0", @@ -18335,7 +18715,7 @@ dependencies = [ "crc", "fxhash", "log", - "rand 0.8.5", + "rand", "slab", "thiserror", ] @@ -18366,18 +18746,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.28.0" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acea373acb8c21ecb5a23741452acd2593ed44ee3d343e72baaa143bc89d0d5" +checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e67c467c38fd24bd5499dc9a18183b31575c12ee549197e3e20d57aa4fe3b7" +checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" dependencies = [ "cc", ] @@ -18393,22 +18773,23 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", + "num-bigint", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -18500,6 +18881,12 @@ dependencies = [ "pest", ] +[[package]] +name = "send_wrapper" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" + [[package]] name = "separator" version = "0.4.1" @@ -18630,7 +19017,7 @@ dependencies = [ "futures", "lazy_static", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serial_test_derive", ] @@ -18795,12 +19182,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - [[package]] name = "signature" version = "2.1.0" @@ -18808,7 +19189,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ "digest 0.10.7", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -18830,7 +19211,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cae9a3fcdadafb6d97f4c0e007e4247b114ee0f119f650c3cbf3a8b3a1479694" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", ] [[package]] @@ -18911,12 +19292,12 @@ dependencies = [ "async-channel", "async-executor", "async-fs", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-net", "async-process", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -18935,7 +19316,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0bb30cf57b7b5f6109ce17c3164445e2d6f270af2cb48f6e4d31c2967c9a9f5" dependencies = [ "arrayvec 0.7.4", - "async-lock", + "async-lock 2.8.0", "atomic-take", "base64 0.21.2", "bip39", @@ -18946,9 +19327,9 @@ dependencies = [ "derive_more", "ed25519-zebra", "either", - "event-listener", + "event-listener 2.5.3", "fnv", - "futures-lite", + "futures-lite 1.13.0", "futures-util", "hashbrown 0.14.3", "hex", @@ -18964,8 +19345,8 @@ dependencies = [ "pbkdf2", "pin-project", "poly1305", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "ruzstd", "schnorrkel 0.10.2", "serde", @@ -18975,10 +19356,10 @@ dependencies = [ "siphasher", "slab", "smallvec", - "soketto", + "soketto 0.7.1", "twox-hash", - "wasmi", - "x25519-dalek 2.0.0", + "wasmi 0.31.2", + "x25519-dalek", "zeroize", ] @@ -18989,15 +19370,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "256b5bad1d6b49045e95fe87492ce73d5af81545d8b4d8318a872d2007024c33" dependencies = [ "async-channel", - "async-lock", + "async-lock 2.8.0", "base64 0.21.2", "blake2-rfc", "derive_more", "either", - "event-listener", + "event-listener 2.5.3", "fnv", "futures-channel", - "futures-lite", + "futures-lite 1.13.0", "futures-util", "hashbrown 0.14.3", "hex", @@ -19005,10 +19386,10 @@ dependencies = [ "log", "lru 0.11.0", "no-std-net", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "serde", "serde_json", "siphasher", @@ -19033,8 +19414,8 @@ dependencies = [ "aes-gcm", "blake2 0.10.6", "chacha20poly1305", - "curve25519-dalek 4.1.2", - "rand_core 0.6.4", + "curve25519-dalek", + "rand_core", "ring 0.17.7", "rustc_version 0.4.0", "sha2 0.10.8", @@ -19106,7 +19487,7 @@ dependencies = [ "hex-literal", "parity-bytes", "parity-scale-codec", - "rand 0.8.5", + "rand", "rlp", "scale-info", "serde", @@ -19127,7 +19508,7 @@ dependencies = [ "hex", "lazy_static", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "snowbridge-amcl", "zeroize", @@ -19171,7 +19552,7 @@ dependencies = [ "log", "pallet-timestamp", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "serde", "serde_json", @@ -19295,7 +19676,6 @@ dependencies = [ "hex-literal", "log", "parity-scale-codec", - "rustc-hex", "scale-info", "snowbridge-core", "sp-core", @@ -19374,9 +19754,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -19390,15 +19770,29 @@ checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ "base64 0.13.1", "bytes", - "flate2", "futures", - "http", "httparse", "log", - "rand 0.8.5", + "rand", "sha-1 0.9.8", ] +[[package]] +name = "soketto" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", +] + [[package]] name = "solochain-template-node" version = "0.0.0" @@ -19483,6 +19877,7 @@ dependencies = [ name = "sp-api" version = "26.0.0" dependencies = [ + "docify", "hash-db", "log", "parity-scale-codec", @@ -19571,7 +19966,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "primitive-types", - "rand 0.8.5", + "rand", "scale-info", "serde", "sp-crypto-hashing", @@ -19635,7 +20030,7 @@ dependencies = [ "futures", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "schnellru", "sp-api", "sp-consensus", @@ -19788,10 +20183,10 @@ dependencies = [ "merlin", "parity-bip39", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "paste", "primitive-types", - "rand 0.8.5", + "rand", "regex", "scale-info", "schnorrkel 0.11.4", @@ -19905,7 +20300,7 @@ name = "sp-database" version = "10.0.0" dependencies = [ "kvdb", - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -19976,7 +20371,8 @@ name = "sp-io" version = "30.0.0" dependencies = [ "bytes", - "ed25519-dalek 2.1.1", + "docify", + "ed25519-dalek", "libsecp256k1", "log", "parity-scale-codec", @@ -20010,9 +20406,9 @@ name = "sp-keystore" version = "0.34.0" dependencies = [ "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", - "rand_chacha 0.3.1", + "parking_lot 0.12.3", + "rand", + "rand_chacha", "sp-core", "sp-externalities 0.25.0", ] @@ -20066,7 +20462,7 @@ name = "sp-npos-elections" version = "26.0.0" dependencies = [ "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "serde", "sp-arithmetic", @@ -20081,7 +20477,7 @@ version = "2.0.0-alpha.5" dependencies = [ "clap 4.5.3", "honggfuzz", - "rand 0.8.5", + "rand", "sp-npos-elections", "sp-runtime", ] @@ -20126,7 +20522,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "paste", - "rand 0.8.5", + "rand", "scale-info", "serde", "serde_json", @@ -20283,9 +20679,9 @@ dependencies = [ "hash-db", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pretty_assertions", - "rand 0.8.5", + "rand", "smallvec", "sp-core", "sp-externalities 0.25.0", @@ -20302,11 +20698,11 @@ name = "sp-statement-store" version = "10.0.0" dependencies = [ "aes-gcm", - "curve25519-dalek 4.1.2", - "ed25519-dalek 2.1.1", + "curve25519-dalek", + "ed25519-dalek", "hkdf", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sha2 0.10.8", "sp-api", @@ -20317,7 +20713,7 @@ dependencies = [ "sp-runtime", "sp-runtime-interface 24.0.0", "thiserror", - "x25519-dalek 2.0.0", + "x25519-dalek", ] [[package]] @@ -20423,7 +20819,7 @@ dependencies = [ name = "sp-trie" version = "29.0.0" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", "array-bytes", "criterion", "hash-db", @@ -20431,8 +20827,8 @@ dependencies = [ "memory-db", "nohash-hasher", "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "scale-info", "schnellru", "sp-core", @@ -20619,13 +21015,13 @@ dependencies = [ "parity-scale-codec", "platforms", "polkadot-sdk", - "rand 0.8.5", + "rand", "regex", "sc-service-test", "scale-info", "serde", "serde_json", - "soketto", + "soketto 0.7.1", "staging-node-inspect", "substrate-cli-test-utils", "tempfile", @@ -20795,16 +21191,14 @@ dependencies = [ ] [[package]] -name = "strobe-rs" -version = "0.8.1" +name = "string-interner" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabb238a1cccccfa4c4fb703670c0d157e1256c1ba695abf1b93bd2bb14bab2d" +checksum = "1c6a0d765f5807e98a091107bae0a56ea3799f66a5de47b2c84c94a39c09974e" dependencies = [ - "bitflags 1.3.2", - "byteorder", - "keccak", - "subtle 2.5.0", - "zeroize", + "cfg-if", + "hashbrown 0.14.3", + "serde", ] [[package]] @@ -20976,6 +21370,7 @@ name = "substrate-frame-rpc-system" version = "28.0.0" dependencies = [ "assert_matches", + "docify", "frame-system-rpc-runtime-api", "futures", "jsonrpsee", @@ -20998,7 +21393,7 @@ dependencies = [ name = "substrate-prometheus-endpoint" version = "0.17.0" dependencies = [ - "hyper", + "hyper 0.14.27", "log", "prometheus", "thiserror", @@ -21180,7 +21575,7 @@ version = "2.0.0" dependencies = [ "futures", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-transaction-pool", "sc-transaction-pool-api", "sp-blockchain", @@ -21392,6 +21787,17 @@ dependencies = [ "unicode-xid 0.2.4", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + [[package]] name = "sysinfo" version = "0.30.5" @@ -21832,10 +22238,10 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project-lite 0.2.12", "signal-hook-registry", - "socket2 0.5.6", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -21858,7 +22264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ "pin-project", - "rand 0.8.5", + "rand", "tokio", ] @@ -21868,17 +22274,17 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.6", + "rustls 0.21.7", "tokio", ] [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.22.2", + "rustls 0.23.10", "rustls-pki-types", "tokio", ] @@ -21916,7 +22322,7 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls 0.21.6", + "rustls 0.21.7", "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", @@ -22001,6 +22407,7 @@ dependencies = [ "futures-util", "pin-project", "pin-project-lite 0.2.12", + "tokio", "tower-layer", "tower-service", "tracing", @@ -22008,17 +22415,15 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", "pin-project-lite 0.2.12", "tower-layer", "tower-service", @@ -22165,7 +22570,7 @@ dependencies = [ "matchers 0.1.0", "nu-ansi-term", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "regex", "sharded-slab", "smallvec", @@ -22238,7 +22643,7 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "rand 0.8.5", + "rand", "smallvec", "socket2 0.4.9", "thiserror", @@ -22264,7 +22669,7 @@ dependencies = [ "idna 0.4.0", "ipnet", "once_cell", - "rand 0.8.5", + "rand", "smallvec", "thiserror", "tinyvec", @@ -22273,26 +22678,6 @@ dependencies = [ "url", ] -[[package]] -name = "trust-dns-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static", - "lru-cache", - "parking_lot 0.12.1", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto 0.22.0", -] - [[package]] name = "trust-dns-resolver" version = "0.23.2" @@ -22304,8 +22689,8 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "resolv-conf", "smallvec", "thiserror", @@ -22351,11 +22736,11 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.9", "httparse", "log", - "rand 0.8.5", - "rustls 0.21.6", + "rand", + "rustls 0.21.7", "sha1", "thiserror", "url", @@ -22376,7 +22761,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand 0.8.5", + "rand", "static_assertions", ] @@ -22481,6 +22866,15 @@ dependencies = [ "bytes", "futures-io", "futures-util", +] + +[[package]] +name = "unsigned-varint" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" +dependencies = [ + "bytes", "tokio-util", ] @@ -22606,9 +23000,9 @@ dependencies = [ "arrayref", "constcat", "digest 0.10.7", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_core 0.6.4", + "rand", + "rand_chacha", + "rand_core", "sha2 0.10.8", "sha3", "thiserror", @@ -22649,12 +23043,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -22835,7 +23223,24 @@ dependencies = [ "smallvec", "spin 0.9.8", "wasmi_arena", - "wasmi_core", + "wasmi_core 0.13.0", + "wasmparser-nostd", +] + +[[package]] +name = "wasmi" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50386c99b9c32bd2ed71a55b6dd4040af2580530fae8bdb9a6576571a80d0cca" +dependencies = [ + "arrayvec 0.7.4", + "multi-stash", + "num-derive", + "num-traits", + "smallvec", + "spin 0.9.8", + "wasmi_collections", + "wasmi_core 0.32.3", "wasmparser-nostd", ] @@ -22845,6 +23250,17 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" +[[package]] +name = "wasmi_collections" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c128c039340ffd50d4195c3f8ce31aac357f06804cfc494c8b9508d4b30dca4" +dependencies = [ + "ahash 0.8.11", + "hashbrown 0.14.3", + "string-interner", +] + [[package]] name = "wasmi_core" version = "0.13.0" @@ -22857,6 +23273,18 @@ dependencies = [ "paste", ] +[[package]] +name = "wasmi_core" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a23b3a7f6c8c3ceeec6b83531ee61f0013c56e51cbf2b14b0f213548b23a4b41" +dependencies = [ + "downcast-rs", + "libm", + "num-traits", + "paste", +] + [[package]] name = "wasmparser" version = "0.102.0" @@ -22869,9 +23297,9 @@ dependencies = [ [[package]] name = "wasmparser-nostd" -version = "0.100.1" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" dependencies = [ "indexmap-nostd", ] @@ -23051,7 +23479,7 @@ dependencies = [ "memfd", "memoffset 0.8.0", "paste", - "rand 0.8.5", + "rand", "rustix 0.36.15", "wasmtime-asm-macros", "wasmtime-environ", @@ -23112,21 +23540,21 @@ dependencies = [ "untrusted 0.9.0", ] -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - [[package]] name = "webpki-roots" version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +[[package]] +name = "webpki-roots" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "westend-emulated-chain" version = "0.0.0" @@ -23144,7 +23572,7 @@ dependencies = [ "staging-xcm", "westend-runtime", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -23221,7 +23649,6 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", - "rustc-hex", "scale-info", "serde", "serde_derive", @@ -23257,7 +23684,7 @@ dependencies = [ "tiny-keccak", "tokio", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -23346,19 +23773,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" -dependencies = [ - "windows_aarch64_msvc 0.34.0", - "windows_i686_gnu 0.34.0", - "windows_i686_msvc 0.34.0", - "windows_x86_64_gnu 0.34.0", - "windows_x86_64_msvc 0.34.0", -] - [[package]] name = "windows" version = "0.48.0" @@ -23368,16 +23782,35 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core 0.51.1", + "windows-targets 0.48.5", +] + [[package]] name = "windows" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core", + "windows-core 0.52.0", "windows-targets 0.52.0", ] +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -23492,12 +23925,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" -[[package]] -name = "windows_aarch64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -23516,12 +23943,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" -[[package]] -name = "windows_i686_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -23540,12 +23961,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" -[[package]] -name = "windows_i686_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -23564,12 +23979,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" -[[package]] -name = "windows_x86_64_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -23606,12 +24015,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" -[[package]] -name = "windows_x86_64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -23658,59 +24061,47 @@ dependencies = [ "tap", ] -[[package]] -name = "x25519-dalek" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" -dependencies = [ - "curve25519-dalek 3.2.0", - "rand_core 0.5.1", - "zeroize", -] - [[package]] name = "x25519-dalek" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "curve25519-dalek 4.1.2", - "rand_core 0.6.4", + "curve25519-dalek", + "rand_core", "serde", "zeroize", ] -[[package]] -name = "x509-parser" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" -dependencies = [ - "asn1-rs", - "base64 0.13.1", - "data-encoding", - "der-parser", - "lazy_static", - "nom", - "oid-registry", - "rusticata-macros", - "thiserror", - "time", -] - [[package]] name = "x509-parser" version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", "data-encoding", - "der-parser", + "der-parser 8.2.0", "lazy_static", "nom", - "oid-registry", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "x509-parser" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" +dependencies = [ + "asn1-rs 0.6.1", + "data-encoding", + "der-parser 9.0.0", + "lazy_static", + "nom", + "oid-registry 0.7.0", "rusticata-macros", "thiserror", "time", @@ -23807,30 +24198,6 @@ dependencies = [ "staging-xcm-executor", ] -[[package]] -name = "xcm-fee-payment-runtime-api" -version = "0.1.0" -dependencies = [ - "env_logger 0.9.3", - "frame-executive", - "frame-support", - "frame-system", - "log", - "pallet-assets", - "pallet-balances", - "pallet-xcm", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-io", - "sp-runtime", - "sp-std 14.0.0", - "sp-weights", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", -] - [[package]] name = "xcm-procedural" version = "7.0.0" @@ -23843,6 +24210,30 @@ dependencies = [ "trybuild", ] +[[package]] +name = "xcm-runtime-apis" +version = "0.1.0" +dependencies = [ + "env_logger 0.11.3", + "frame-executive", + "frame-support", + "frame-system", + "hex-literal", + "log", + "pallet-assets", + "pallet-balances", + "pallet-xcm", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-io", + "sp-std 14.0.0", + "sp-weights", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + [[package]] name = "xcm-simulator" version = "7.0.0" @@ -23920,16 +24311,32 @@ dependencies = [ ] [[package]] -name = "yamux" -version = "0.10.2" +name = "xml-rs" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d9ba232399af1783a58d8eb26f6b5006fbefe2dc9ef36bd283324792d03ea5" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[package]] +name = "xmltree" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7d8a75eaf6557bb84a65ace8609883db44a29951042ada9b393151532e41fcb" +dependencies = [ + "xml-rs", +] + +[[package]] +name = "yamux" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed0164ae619f2dc144909a9f082187ebb5893693d8c0196e8085283ccd4b776" dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "pin-project", + "rand", "static_assertions", ] @@ -23970,9 +24377,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 6af16ffac8a4..2b84f8039147 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -17,13 +17,13 @@ let in rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; rev = "polkadot-v${version}"; - hash = "sha256-9ZjiKv+05//Kf6q3mL1P5kOCOm1KCGmQIZkrD54pyeI="; + hash = "sha256-IKKhGjWHyHUrDVGJo1d1JXzagkydgdfd/u6jk76qxHU="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -92,8 +92,5 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ akru andresilva FlorianFranzen RaghavSood ]; # See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta. platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86); - # See comment about wasm32-unknown-unknown in rustc.nix. - broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; }; } diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 8361461fb7d3..f5d856ec1770 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -21,13 +21,13 @@ , polkit , accountsservice , gtk-doc -, gnome , gobject-introspection , vala , fetchpatch , withQt5 ? false , qtbase , yelp-tools +, yelp-xsl }: stdenv.mkDerivation rec { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { autoconf automake yelp-tools - gnome.yelp-xsl + yelp-xsl gobject-introspection gtk-doc intltool diff --git a/pkgs/applications/editors/android-studio-for-platform/common.nix b/pkgs/applications/editors/android-studio-for-platform/common.nix new file mode 100644 index 000000000000..b0e7e1c839a4 --- /dev/null +++ b/pkgs/applications/editors/android-studio-for-platform/common.nix @@ -0,0 +1,184 @@ +{ channel, pname, version, sha256Hash }: + +{ android-tools +, bash +, buildFHSEnv +, coreutils +, dpkg +, e2fsprogs +, fetchurl +, findutils +, git +, gnugrep +, gnused +, gnutar +, gtk2, glib +, gzip +, fontsConf +, fontconfig +, freetype +, libX11 +, libXext +, libXi +, libXrandr +, libXrender +, libXtst +, makeFontsConf +, makeWrapper +, ncurses5 +, openssl +, ps +, python3 +, lib +, stdenv +, unzip +, usbutils +, which +, runCommand +, xkeyboard_config +, zip +, zlib +, makeDesktopItem +, tiling_wm ? false # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper +}: + +let + drvName = "${pname}-${version}"; + filename = "asfp-${version}-linux.deb"; + + androidStudioForPlatform = stdenv.mkDerivation { + name = "${drvName}-unwrapped"; + + src = fetchurl { + url = "https://dl.google.com/android/asfp/${filename}"; + sha256 = sha256Hash; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + + installPhase = '' + cp -r "./opt/${pname}/" $out + wrapProgram $out/bin/studio.sh \ + --set-default JAVA_HOME "$out/jbr" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \ + --set FONTCONFIG_FILE ${fontsConf} \ + --prefix PATH : "${lib.makeBinPath [ + + # Checked in studio.sh + coreutils + findutils + gnugrep + which + gnused + + # Used during setup wizard + gnutar + gzip + + # Runtime stuff + git + ps + usbutils + android-tools + + # For Soong sync + openssl + python3 + unzip + zip + e2fsprogs + ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + # Crash at startup without these + fontconfig + freetype + libXext + libXi + libXrender + libXtst + libX11 + + # Support multiple monitors + libXrandr + + # For GTKLookAndFeel + gtk2 + glib + + # For Soong sync + e2fsprogs + ]}" + ''; + }; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Android Studio for Platform (${channel} channel)"; + comment = "The official Android IDE for Android platform development"; + categories = [ "Development" "IDE" ]; + startupNotify = true; + startupWMClass = "jetbrains-studio"; + }; + + # Android Studio for Platform downloads prebuilt binaries as part of the SDK. These tools + # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS + # environment is used as a work around for that. + fhsEnv = buildFHSEnv { + name = "${drvName}-fhs-env"; + multiPkgs = pkgs: [ + zlib + ncurses5 + ncurses5.dev + ]; + profile = '' + export ALLOW_NINJA_ENV=true + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib:/usr/lib32 + ''; + }; +in runCommand + drvName + { + startScript = '' + #!${bash}/bin/bash + ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudioForPlatform}/bin/studio.sh "$@" + ''; + preferLocalBuild = true; + allowSubstitutes = false; + passthru = { + unwrapped = androidStudioForPlatform; + }; + meta = with lib; { + description = "The Official IDE for Android platform development"; + longDescription = '' + Android Studio for Platform (ASfP) is the version of the Android Studio IDE + for Android Open Source Project (AOSP) platform developers who build with the Soong build system. + ''; + homepage = "https://developer.android.com/studio/platform.html"; + license = with licenses; [ asl20 unfree ]; # The code is under Apache-2.0, but: + # If one selects Help -> Licenses in Android Studio, the dialog shows the following: + # "Android Studio includes proprietary code subject to separate license, + # including JetBrains CLion(R) (www.jetbrains.com/clion) and IntelliJ(R) + # IDEA Community Edition (www.jetbrains.com/idea)." + # Also: For actual development the Android SDK is required and the Google + # binaries are also distributed as proprietary software (unlike the + # source-code itself). + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ robbins ]; + mainProgram = pname; + }; + } + '' + mkdir -p $out/{bin,share/pixmaps} + + echo -n "$startScript" > $out/bin/${pname} + chmod +x $out/bin/${pname} + + ln -s ${androidStudioForPlatform}/bin/studio.png $out/share/pixmaps/${pname}.png + ln -s ${desktopItem}/share/applications $out/share/applications + '' diff --git a/pkgs/applications/editors/android-studio-for-platform/default.nix b/pkgs/applications/editors/android-studio-for-platform/default.nix new file mode 100644 index 000000000000..1f11bd55ac3a --- /dev/null +++ b/pkgs/applications/editors/android-studio-for-platform/default.nix @@ -0,0 +1,31 @@ +{ callPackage, makeFontsConf, buildFHSEnv, tiling_wm ? false }: + +let + mkStudio = opts: callPackage (import ./common.nix opts) { + fontsConf = makeFontsConf { + fontDirectories = []; + }; + inherit buildFHSEnv; + inherit tiling_wm; + }; + stableVersion = { + version = "2023.2.1.20"; # Android Studio Iguana | 2023.2.1 Beta 2 + sha256Hash = "sha256-cM/pkSghqLUUvJVF/OVLDOxVBJlJLH8ge1bfZtDUegY="; + }; + canaryVersion = { + version = "2023.3.2.1"; # Android Studio Jellyfish | 2023.3.2 Canary 1 + sha256Hash = "sha256-XOsbMyNentklfEp1k49H3uFeiRNMCV/Seisw9K1ganM="; + }; +in { + # Attributes are named by their corresponding release channels + + stable = mkStudio (stableVersion // { + channel = "stable"; + pname = "android-studio-for-platform"; + }); + + canary = mkStudio (canaryVersion // { + channel = "canary"; + pname = "android-studio-for-platform-canary"; + }); +} diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 163948c90dbe..d7b64de97cf2 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -17,8 +17,8 @@ let sha256Hash = "sha256-84CpZfoAvJHUCO3ZBJqDbuz9xuGE/5xJfXoetJDXju8="; }; latestVersion = { - version = "2024.1.2.7"; # "Android Studio Koala Feature Drop | 2024.1.2 Canary 7" - sha256Hash = "sha256-opoAKslh8DqS/iS5gw8AxX6x89t2BNX7yaU88XNd2kM="; + version = "2024.1.2.8"; # "Android Studio Koala Feature Drop | 2024.1.2 Canary 8" + sha256Hash = "sha256-2wqZV0UqZHprfUFvhWh0IdA9TQcwlZtWECZVwZ47ICc="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index d9140fc1ea8c..d560254ee1e6 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -8,7 +8,7 @@ , enchant , gucharmap , python3 -, gnome +, adwaita-icon-theme }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gtk libxml2 enchant diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix index 48e00514cbed..d90ab0861407 100644 --- a/pkgs/applications/editors/cpeditor/default.nix +++ b/pkgs/applications/editors/cpeditor/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/Core/Runner.cpp --replace-fail "/bin/bash" "${runtimeShell}" + substituteInPlace dist/linux/cpeditor.desktop --replace-fail 'Exec=/usr/bin/cpeditor' "Exec=cpeditor" ''; meta = with lib; { diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 6219ab2b7bd2..573af80eb5b5 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -13,11 +13,11 @@ let platform_major = "4"; - platform_minor = "31"; + platform_minor = "32"; year = "2024"; - month = "03"; #release month - buildmonth = "02"; #sometimes differs from release month - timestamp = "${year}${buildmonth}290520"; + month = "06"; #release month + buildmonth = "06"; #sometimes differs from release month + timestamp = "${year}${buildmonth}010610"; gtk = gtk3; arch = if stdenv.hostPlatform.isx86_64 then "x86_64" @@ -43,8 +43,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-lZtU/IUNx2tc6TwCFQ5WS7cO/Gui2JpeknnL+Z/mBow="; - aarch64 = "sha256-iIUOiFp0uLOzwdqBV1txRhliaE2l1kbhGv1F6h0WO+w="; + x86_64 = "sha256-yMyigXPd6BhSiyoLTFQhBrHnatgXMw1BrH7xWfoT0Zo="; + aarch64 = "sha256-YZ1MhvXWcYRgQ4ZR/hXEWNKmYji/9PyKbdnm27i8Vjs="; }.${arch}; }; }; @@ -58,8 +58,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-dsl-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-gdtDI9A+sUDAFsyqEmXuIkqgd/v1WF+Euj0TSWwjeL4="; - aarch64 = "sha256-kYa+8E5KLqHdumBQiIom3eG5rM/9TFZlJyyc7HpySes="; + x86_64 = "sha256-m2kcsQicvZcIHAP0zcOGYQjS4vdiTo62o1cfDpG4Ea8="; + aarch64 = "sha256-UuMfIO6jgMpAmtGihWdJZ7RwilBVdsCaPJH3tKdwyLY="; }.${arch}; }; }; @@ -73,8 +73,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-embedcpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-5g4CAX2mu1i6aMqmbgy4R3Npk1IC/W73FrIZAQwgGCc="; - aarch64 = "sha256-KcfybNDyGglULKF3HF5v50mBs69FFryCMZ+oBtjBFiw="; + x86_64 = "sha256-dpsdjBfF83B8wGwoIsT4QW/n4Qo/w+n4mNYtILdCJKw="; + aarch64 = "sha256-kDPZJbrxEBhx/KI/9SqOtOOoMVWvYJqTLLgR9YPNH5A="; }.${arch}; }; }; @@ -88,8 +88,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-yRJWSEg0TVWpgQBSS+y8/YrjdU3PSvJoruEUwjZcrLc="; - aarch64 = "sha256-Czm8nYAkVqS8gaowDp1LrJ31iE32d6klT6JvHekL52c="; + x86_64 = "sha256-vANUS1IbYrhrpNX095XIhpaHlZhTkZe894nhrDPndJc="; + aarch64 = "sha256-ykw9Og4D3hVfUvJlbtSDUB7iOmDJ9gPVTmpXlGZX304="; }.${arch}; }; }; @@ -103,8 +103,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-PIvJeITqftd9eHhfbF+R+SQ+MXp4OmM5xi8ZDdUvXaI="; - aarch64 = "sha256-C04AICPcb9foEai3Nk4S4zxQ3oUv+i2tckwqDscpx7I="; + x86_64 = "sha256-ow4i9sDPQUAolzBymvucqpdZrn+bggxR6BD2RnyBVns="; + aarch64 = "sha256-XZY7MQr1cCToIlEXSltxWRZbHu1Ex0wzLvL1nUhuKhw="; }.${arch}; }; }; @@ -135,8 +135,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-omsAZSlCvggTjoAPQt0oGqRUZwyt5H2LswGpFt88L+I="; - aarch64 = "sha256-wcrYVlL5x+Wve2MAgnEFQ4H3a/gc2y8Fr5TmwHU9p6A="; + x86_64 = "sha256-zb6/AMe7ArSw1mzPIvaSVeuNly6WO7pHQAuYUT8eGkk="; + aarch64 = "sha256-jgT3BpD04ELV2+WuRw1mbDw6S1SYDo7jfrijSNs8GLM="; }.${arch}; }; }; @@ -150,8 +150,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-8WqHFLywYQXtzUGxBVstxGqVU55WHoApZnyZ6ur4XgU="; - aarch64 = "sha256-GlD0ykJbwdbzh1K3XQQ79yBhCJQUlmt2v8c2OMYNWp4="; + x86_64 = "sha256-fXfj0PImyd2nPUkaGvOu7BGAeIHkTocKH94oM/Vd+LU="; + aarch64 = "sha256-0EZXbngXIso8fS8bvSDPyRGCre2dF0+6wyldQ6GhGmo="; }.${arch}; }; }; @@ -165,8 +165,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-K2uo2VVL6rP9kxicJRLzsJiOFKloLD0vInSon8JsUWg="; - aarch64 = "sha256-qeEQTlFeWBag6SLXoatDeviR/NG8EcTi6VyUo9P6STM="; + x86_64 = "sha256-YIoa837bbnqm/4wuwRfx+5UNxyQJySbTX+lhL/FluS0="; + aarch64 = "sha256-0hwKU29RJdjyaF4ot0OpXt/illOsx1n38nhK5zteQBk="; }.${arch}; }; }; @@ -180,8 +180,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-Ko4NCU9jbkjAWY7Ky5tPlhXOnzkpY4GjPi6Z0CBmzzc="; - aarch64 = "sha256-RBT+xwdQcJh+YgsuCPTWy9MM2y45bhIF9DttPm6Qz+Q="; + x86_64 = "sha256-IFQkSOs0wk7chR9Ti3WG/7WDrXBWnaRH9AqC9jTmuT8="; + aarch64 = "sha256-iiS3hZWfinHYVhZsMntXQp+OgL7kcE/2jqx2JomBdIk="; }.${arch}; }; }; @@ -195,8 +195,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-dWwDv8cfUxnU/24ASYLvSTbS3xV5ugG98jYMhAXTfS8="; - aarch64 = "sha256-+bAKFZ4u5PvCdC4Ifj5inppWb6C8wh0tar66qryx76o="; + x86_64 = "sha256-+U3wHbUgxkqWZjZyAXAqkZHeoNp+CwL1NBO4myDdJhE="; + aarch64 = "sha256-zDLt3lOqf2HyUP/oqbff6XupF2Vab7+gxpQriztunH4="; }.${arch}; }; }; diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/applications/editors/emacs/build-support/buffer.nix similarity index 100% rename from pkgs/build-support/emacs/buffer.nix rename to pkgs/applications/editors/emacs/build-support/buffer.nix diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix similarity index 100% rename from pkgs/build-support/emacs/elpa.nix rename to pkgs/applications/editors/emacs/build-support/elpa.nix diff --git a/pkgs/build-support/emacs/elpa2nix.el b/pkgs/applications/editors/emacs/build-support/elpa2nix.el similarity index 100% rename from pkgs/build-support/emacs/elpa2nix.el rename to pkgs/applications/editors/emacs/build-support/elpa2nix.el diff --git a/pkgs/build-support/emacs/emacs-funcs.sh b/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh similarity index 100% rename from pkgs/build-support/emacs/emacs-funcs.sh rename to pkgs/applications/editors/emacs/build-support/emacs-funcs.sh diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix similarity index 100% rename from pkgs/build-support/emacs/generic.nix rename to pkgs/applications/editors/emacs/build-support/generic.nix diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix similarity index 76% rename from pkgs/build-support/emacs/melpa.nix rename to pkgs/applications/editors/emacs/build-support/melpa.nix index c8f656704918..29b3567ec6f4 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -38,6 +38,11 @@ in Default: pname */ , ename ? pname + /* + version: Either a stable version such as "1.2" or an unstable version. + An unstable version can use either Nix format (preferred) such as + "1.2-unstable-2024-06-01" or MELPA format such as "20240601.1230". + */ , version /* commit: Optional package history commit. @@ -71,6 +76,19 @@ genericBuild ({ inherit packageBuild commit ename recipe; + melpaVersion = + let + parsed = lib.flip builtins.match version + # match -unstable-YYYY-MM-DD format + "^.*-unstable-([[:digit:]]{4})-([[:digit:]]{2})-([[:digit:]]{2})$"; + unstableVersionInNixFormat = parsed != null; # heuristics + date = builtins.concatStringsSep "" parsed; + time = "0"; # unstable version in nix format lacks this info + in + if unstableVersionInNixFormat + then date + "." + time + else version; + preUnpack = '' mkdir -p "$NIX_BUILD_TOP/recipes" if [ -n "$recipe" ]; then @@ -96,7 +114,7 @@ genericBuild ({ -L "$NIX_BUILD_TOP/package-build" \ -l "$melpa2nix" \ -f melpa2nix-build-package \ - $ename $version $commit + $ename $melpaVersion $commit runHook postBuild ''; @@ -104,9 +122,9 @@ genericBuild ({ installPhase = '' runHook preInstall - archive="$NIX_BUILD_TOP/packages/$ename-$version.el" + archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.el" if [ ! -f "$archive" ]; then - archive="$NIX_BUILD_TOP/packages/$ename-$version.tar" + archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.tar" fi emacs --batch -Q \ diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/applications/editors/emacs/build-support/melpa2nix.el similarity index 100% rename from pkgs/build-support/emacs/melpa2nix.el rename to pkgs/applications/editors/emacs/build-support/melpa2nix.el diff --git a/pkgs/build-support/emacs/mk-wrapper-subdirs.el b/pkgs/applications/editors/emacs/build-support/mk-wrapper-subdirs.el similarity index 100% rename from pkgs/build-support/emacs/mk-wrapper-subdirs.el rename to pkgs/applications/editors/emacs/build-support/mk-wrapper-subdirs.el diff --git a/pkgs/build-support/emacs/package-build-dont-use-mtime.patch b/pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch similarity index 100% rename from pkgs/build-support/emacs/package-build-dont-use-mtime.patch rename to pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch diff --git a/pkgs/build-support/emacs/trivial.nix b/pkgs/applications/editors/emacs/build-support/trivial.nix similarity index 100% rename from pkgs/build-support/emacs/trivial.nix rename to pkgs/applications/editors/emacs/build-support/trivial.nix diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/applications/editors/emacs/build-support/wrapper.nix similarity index 100% rename from pkgs/build-support/emacs/wrapper.nix rename to pkgs/applications/editors/emacs/build-support/wrapper.nix diff --git a/pkgs/build-support/emacs/wrapper.sh b/pkgs/applications/editors/emacs/build-support/wrapper.sh similarity index 100% rename from pkgs/build-support/emacs/wrapper.sh rename to pkgs/applications/editors/emacs/build-support/wrapper.sh diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 29e2c2d85f49..8181b69d335d 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -4,25 +4,14 @@ lib.makeScope pkgs.newScope (self: let gconf = pkgs.gnome2.GConf; inherit (self) callPackage; - stdenv = if pkgs.stdenv.isDarwin - then pkgs.darwin.apple_sdk_11_0.stdenv - else pkgs.stdenv; inheritedArgs = { inherit gconf; - inherit stdenv; inherit (pkgs.darwin) sigtool; - inherit (pkgs.darwin.apple_sdk_11_0) llvmPackages_14; - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit - Quartz QuartzCore UniformTypeIdentifiers WebKit; - gnutls = - if pkgs.stdenv.isDarwin - then pkgs.gnutls.override { - inherit stdenv; - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; - } - else pkgs.gnutls; + Quartz QuartzCore WebKit; + inherit (pkgs.darwin.apple_sdk_11_0.frameworks) UniformTypeIdentifiers; }; in { sources = import ./sources.nix { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 192320fab674..f02b98e5f22d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -32,7 +32,7 @@ self: let }); }; - elpaBuild = import ../../../../build-support/emacs/elpa.nix { + elpaBuild = import ../build-support/elpa.nix { inherit lib stdenv texinfo writeText gcc; inherit (self) emacs; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 3e8ab4625fec..4f3bdc44eb61 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -32,7 +32,7 @@ self: let }); }; - elpaBuild = import ../../../../build-support/emacs/elpa.nix { + elpaBuild = import ../build-support/elpa.nix { inherit lib stdenv texinfo writeText gcc; inherit (self) emacs; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix index 36576f7c1239..391065ccfb20 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix @@ -79,7 +79,8 @@ in { lib.nameValuePair ename ( self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs: melpaBuild { - inherit pname ename commit; + inherit pname ename; + inherit (sourceArgs) commit; version = lib.optionalString (version != null) (lib.concatStringsSep "." (map toString # Hack: Melpa archives contains versions with parse errors such as [ 4 4 -4 413 ] which should be 4.4-413 diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix index fbd16c3f47af..07e234fca98b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix @@ -7,11 +7,11 @@ melpaBuild rec { pname = "ebuild-mode"; - version = "1.71"; + version = "1.72"; src = fetchzip { url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2"; - hash = "sha256-HvaiH3I6hJMb1XFFf8FOw22X+47UayCIWAGuXAVP/ls="; + hash = "sha256-GFEDWT88Boz/DxEcmFgf7u2NOoMjAN05yRiYwoYtvXc="; }; # not used but needs to be set; why? diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix index 148bb9dbc7f9..88749d10d9d5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix @@ -7,17 +7,17 @@ }: let - rev = "99067dba625db3ac54ca4d3a3c811c41de207309"; + rev = "a6c849619abcdd80dc82ec5417195414ad438fa3"; in melpaBuild { pname = "edraw"; - version = "20240612.1012"; + version = "20240701.444"; src = fetchFromGitHub { owner = "misohena"; repo = "el-easydraw"; inherit rev; - hash = "sha256-32N8kXGFCvB6IHKwUsBGpdtAAf/p3nlq8mAdZrxLt0c="; + hash = "sha256-CbcI1mmghc3HObg80bjScVDcJ1DHx9aX1WP2HlhAshs="; }; commit = rev; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix index c70835a0dacb..23f58cf3b804 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix @@ -7,8 +7,8 @@ let pname = "ligo-mode"; - version = "20230302.1616"; - commit = "d1073474efc9e0a020a4bcdf5e0c12a217265a3a"; + version = "1.7.1-unstable-2024-06-28"; + commit = "a62dff504867c4c4d9e0047114568a6e6b1eb291"; in melpaBuild { inherit pname version commit; @@ -17,7 +17,7 @@ melpaBuild { owner = "ligolang"; repo = "ligo"; rev = commit; - hash = "sha256-wz9DF9mqi8WUt1Ebd+ueUTA314rKkdbjmoWF8cKuS8I="; + hash = "sha256-YnI2sZCE5rStWsQYY/D+Am1rep4UdK28rlmPMmJeY50="; }; packageRequires = [ ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 1e9a8191b3f1..00646b6d81b3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -23,6 +23,11 @@ formats commits for you. */ +let + # Read ./recipes-archive-melpa.json in an outer let to make sure we only do this once. + defaultArchive = builtins.fromJSON (builtins.readFile ./recipes-archive-melpa.json); +in + { lib, pkgs }: variant: self: let dontConfigure = pkg: @@ -57,7 +62,7 @@ let if pkg != null then dontConfigure (externalSrc pkg pkgs.rtags) else null; - generateMelpa = lib.makeOverridable ({ archiveJson ? ./recipes-archive-melpa.json + generateMelpa = lib.makeOverridable ({ archiveJson ? defaultArchive }: let inherit (import ./libgenerated.nix lib self) melpaDerivation; @@ -66,7 +71,7 @@ let (s: s != null) (map (melpaDerivation variant) - (lib.importJSON archiveJson) + (if builtins.isList archiveJson then archiveJson else lib.importJSON archiveJson) ) ) ); diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 9dd51bcbc5a4..02857188f0f6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -91627,11 +91627,11 @@ "repo": "ksqsf/org-xlatex", "unstable": { "version": [ - 20230820, - 2133 + 20240707, + 1343 ], - "commit": "f3cac5ea904e78ae2b47723fdce96e8e87edbe7c", - "sha256": "06y7lapsp4s9h07hdsd8wigmy6r5l36qiqwmz7j1n8zp3r8xg0pw" + "commit": "8f25ba5e4784b3f12f5ac5c69b1a1d0695c53b8e", + "sha256": "1cg11gqisigpa9prkm05z7wlajffzmhjiymg7frbibhrskhfhrp0" } }, { diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 59cced7ec49a..b460fad5bb3a 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -298,12 +298,13 @@ mkDerivation (finalAttrs: { OSAKit Quartz QuartzCore - UniformTypeIdentifiers WebKit # TODO are these optional? GSS ImageCaptureCore ImageIO + ] ++ lib.optionals (variant == "macport" && stdenv.hostPlatform.isAarch64) [ + UniformTypeIdentifiers ]; # Emacs needs to find movemail at run time, see info (emacs) Movemail diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 487d8a3680a6..da243044b689 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -104,10 +104,10 @@ in emacs29 = import ./make-emacs.nix (mkArgs { pname = "emacs"; - version = "29.3"; + version = "29.4"; variant = "mainline"; - rev = "29.3"; - hash = "sha256-4yN81djeKb9Hlr6MvaDdXqf4XOl0oolXEYGqkA+KUO0="; + rev = "29.4"; + hash = "sha256-FCP6ySkN9mAdp2T09n6foS2OciqZXc/54guRZ0B4Z2s="; }); emacs28-macport = import ./make-emacs.nix (mkArgs { diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 2c9ecd828a64..efa6aaf4cbdb 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -12,6 +12,7 @@ , libgedit-gtksourceview , libgedit-tepl , libgee +, adwaita-icon-theme , gnome , glib , pkg-config @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme glib gsettings-desktop-schemas gspell diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index fb57331cc3b4..af155d9de826 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,3 +1,10 @@ +let + # `ides.json` is handwritten and contains information that doesn't change across updates, like maintainers and other metadata + # `versions.json` contains everything generated/needed by the update script version numbers, build numbers and tarball hashes + ideInfo = builtins.fromJSON (builtins.readFile ./bin/ides.json); + versions = builtins.fromJSON (builtins.readFile ./bin/versions.json); +in + { lib , stdenv , callPackage @@ -30,10 +37,6 @@ let inherit (stdenv.hostPlatform) system; - # `ides.json` is handwritten and contains information that doesn't change across updates, like maintainers and other metadata - # `versions.json` contains everything generated/needed by the update script version numbers, build numbers and tarball hashes - ideInfo = lib.importJSON ./bin/ides.json; - versions = lib.importJSON ./bin/versions.json; products = versions.${system} or (throw "Unsupported system: ${system}"); package = if stdenv.isDarwin then ./bin/darwin.nix else ./bin/linux.nix; diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index 00b2794a139f..202b973dc14a 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -511,6 +511,37 @@ }, "name": "visual-studio-keymap" }, + "14004": { + "compatible": [ + "clion", + "datagrip", + "goland", + "idea-community", + "idea-ultimate", + "mps", + "phpstorm", + "pycharm-community", + "pycharm-professional", + "rider", + "ruby-mine", + "rust-rover", + "webstorm" + ], + "builds": { + "233.13135.1068": null, + "241.17011.169": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.17890.14": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.17890.24": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip" + }, + "name": "protocol-buffers" + }, "14059": { "compatible": [ "clion", @@ -661,6 +692,7 @@ "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip": "sha256-Nb2tSxL+mAY1qJ3waipgV8ep+0R/BaYnzz7zfwtLHmk=", "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip": "sha256-tNgt0vIkdCB/LcaSj58mT6cNlw4lytRo0cZSt7sIERU=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", + "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip": "sha256-cltbHY5OOvf29otDNsF9Q2shJHDdW6UMbzDdZ6OATtI=", "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip": "sha256-6ibo1vdwO4olQTCWpWAefT3QCwgtzTo1ojilDes8Rvg=", "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip": "sha256-4bYtBaLvcXZv8eVfG09ywSbcP+7SUb4j+NZ5mb2aluE=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix index 1ad346ed01de..d2203a714c37 100644 --- a/pkgs/applications/editors/l3afpad/default.nix +++ b/pkgs/applications/editors/l3afpad/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Simple text editor forked from Leafpad using GTK+ 3.x"; homepage = "https://github.com/stevenhoneyman/l3afpad"; platforms = platforms.linux; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; mainProgram = "l3afpad"; }; diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index 333968cb8960..55fce51ac9f7 100644 --- a/pkgs/applications/editors/lite-xl/default.nix +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "lite-xl"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "lite-xl"; repo = "lite-xl"; rev = "v${version}"; - hash = "sha256-TqrFI5TFb2hnnlHYUjLDUTDK3/Wgg1gOxIP8owLi/yo="; + hash = "sha256-awXcmYAvQUdFUr2vFlnBt8WTLrACREfB7J8HoSyVPTs="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index b07f517ea474..c2e6b565de28 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -43,6 +43,14 @@ let ''; }; + nvim-with-luasnip = wrapNeovim2 "-with-lua-packages" (makeNeovimConfig { + plugins = [ { + plugin = vimPlugins.luasnip; + + } + ]; + }); + nvimAutoDisableWrap = makeNeovimConfig { }; wrapNeovim2 = suffix: config: @@ -281,4 +289,16 @@ rec { export HOME=$TMPDIR ${nvim_with_opt_plugin}/bin/nvim -i NONE +quit! -e ''; + + inherit nvim-with-luasnip; + + # check that bringing in one plugin with lua deps makes those deps visible from wrapper + # for instance luasnip has a dependency on jsregexp + can_require_transitive_deps = + runTest nvim-with-luasnip '' + export HOME=$TMPDIR + cat ${nvim-with-luasnip}/bin/nvim + ${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e + ''; + }) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 8f9a5b880032..9f0aa86de48c 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -7,7 +7,6 @@ , ruby , lua , python3Packages -, writeText , wrapNeovimUnstable , runCommand }: @@ -78,7 +77,7 @@ let ++ (extraPython3Packages ps) ++ (lib.concatMap (f: f ps) pluginPython3Packages)); - luaEnv = neovim-unwrapped.lua.withPackages(extraLuaPackages); + luaEnv = neovim-unwrapped.lua.withPackages extraLuaPackages; # as expected by packdir packpathDirs.myNeovimPackages = myVimPackage; @@ -101,13 +100,13 @@ let "--prefix" "LUA_CPATH" ";" (neovim-unwrapped.lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv) ]; - manifestRc = vimUtils.vimrcContent ({ customRC = ""; }) ; + manifestRc = vimUtils.vimrcContent { customRC = ""; }; # we call vimrcContent without 'packages' to avoid the init.vim generation - neovimRcContent = vimUtils.vimrcContent ({ + neovimRcContent = vimUtils.vimrcContent { beforePlugins = ""; customRC = lib.concatStringsSep "\n" (pluginRC ++ [customRC]); packages = null; - }); + }; in builtins.removeAttrs args ["plugins"] // { @@ -225,16 +224,57 @@ let } // grammar.meta; } '' - mkdir -p $out/parser - ln -s ${grammar}/parser $out/parser/${name}.so + mkdir -p "$out/parser" + ln -s "${grammar}/parser" "$out/parser/${name}.so" + + mkdir -p "$out/queries/${name}" + if [ -d "${grammar}/queries/${name}" ]; then + echo "moving queries from neovim queries dir" + for file in "${grammar}/queries/${name}"*; do + ln -s "$file" "$out/queries/${name}/$(basename "$file")" + done + else + if [ -d "${grammar}/queries" ]; then + echo "moving queries from standard queries dir" + for file in "${grammar}/queries/"*; do + ln -s "$file" "$out/queries/${name}/$(basename "$file")" + done + else + echo "missing queries for ${name}" + fi + fi ''); + /* + Fork of vimUtils.packDir that additionnally generates a propagated-build-inputs-file that + can be used by the lua hooks to generate a proper LUA_PATH + + Generates a packpath folder as expected by vim + Example: + packDir ( {myVimPackage = { start = [ vimPlugins.vim-fugitive ]; opt = []; }; }) + => "/nix/store/xxxxx-pack-dir" + */ + packDir = packages: + let + rawPackDir = vimUtils.packDir packages; + + in + rawPackDir.override ({ + postBuild = '' + mkdir $out/nix-support + for i in $(find -L $out -name propagated-build-inputs ); do + cat "$i" >> $out/nix-support/propagated-build-inputs + done + '';}); + + in { inherit makeNeovimConfig; inherit generateProviderRc; inherit legacyWrapper; inherit grammarToPlugin; + inherit packDir; inherit buildNeovimPlugin; buildNeovimPluginFrom2Nix = lib.warn "buildNeovimPluginFrom2Nix was renamed to buildNeovimPlugin" buildNeovimPlugin; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index e877f1e1f764..d86de46c8738 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -13,6 +13,9 @@ neovim-unwrapped: let + # inherit interpreter from neovim + lua = neovim-unwrapped.lua; + wrapper = { extraName ? "" # should contain all args but the binary. Can be either a string or list @@ -24,6 +27,8 @@ let , withNodeJs ? false , withPerl ? false , rubyEnv ? null + + # wether to create symlinks in $out/bin/vi(m) -> $out/bin/nvim , vimAlias ? false , viAlias ? false @@ -45,6 +50,8 @@ let stdenv.mkDerivation (finalAttrs: let + finalPackdir = neovimUtils.packDir packpathDirs; + rcContent = '' ${luaRcContent} '' + lib.optionalString (!isNull neovimRcContent) '' @@ -57,10 +64,10 @@ let # vim accepts a limited number of commands so we join them all [ "--add-flags" ''--cmd "lua ${providerLuaRc}"'' - # (lib.intersperse "|" hostProviderViml) - ] ++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [ - "--add-flags" ''--cmd "set packpath^=${vimUtils.packDir packpathDirs}"'' - "--add-flags" ''--cmd "set rtp^=${vimUtils.packDir packpathDirs}"'' + ] + ++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [ + "--add-flags" ''--cmd "set packpath^=${finalPackdir}"'' + "--add-flags" ''--cmd "set rtp^=${finalPackdir}"'' ] ; @@ -160,7 +167,17 @@ let + '' rm $out/bin/nvim touch $out/rplugin.vim - makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} + + echo "Looking for lua dependencies..." + source ${lua}/nix-support/utils.sh + + _addToLuaPath "${finalPackdir}" + + echo "LUA_PATH towards the end of packdir: $LUA_PATH" + + makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} \ + --prefix LUA_PATH ';' "$LUA_PATH" \ + --prefix LUA_CPATH ';' "$LUA_CPATH" ''; buildPhase = '' diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index 604758d0df5a..6bd5786089ab 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "poke"; - version = "4.1"; + version = "4.2"; src = fetchurl { url = "mirror://gnu/poke/poke-${finalAttrs.version}.tar.gz"; - hash = "sha256-COyupB9zdKzUI44Su/l+jNXlctWRfpVrc7nUMCbp10A="; + hash = "sha256-iq825h42elMUDqQOJVnp7FEud5xCvuNOesJLNLoRm94="; }; outputs = [ "out" "dev" "info" "lib" ] diff --git a/pkgs/applications/editors/quartus-prime/quartus.nix b/pkgs/applications/editors/quartus-prime/quartus.nix index 12c7039563c1..e668fe9e43fe 100644 --- a/pkgs/applications/editors/quartus-prime/quartus.nix +++ b/pkgs/applications/editors/quartus-prime/quartus.nix @@ -102,6 +102,6 @@ in stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ kwohlfahrt ]; + maintainers = with maintainers; [ bjornfor kwohlfahrt ]; }; } diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index 298f1c2f135e..10e6a04498ab 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -10,7 +10,7 @@ , aspellDicts # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries # available. -, enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ] +, enchantAspellDicts ? with aspellDicts; [ en en-computers ] }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 3278fc9ef158..983d661fef52 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -38,7 +38,7 @@ let pname = "RStudio"; - version = "2024.04.1+748"; + version = "2024.04.2+764"; RSTUDIO_VERSION_MAJOR = lib.versions.major version; RSTUDIO_VERSION_MINOR = lib.versions.minor version; RSTUDIO_VERSION_PATCH = lib.versions.patch version; @@ -50,7 +50,7 @@ let owner = "rstudio"; repo = "rstudio"; rev = "v" + version; - hash = "sha256-fzxbhN9NdM0E2rxezj2BMEZ8obUbX0Zw8haDNmfAkWs="; + hash = "sha256-j258eW1MYQrB6kkpjyolXdNuwQ3zSWv9so4q0QLsZuw="; }; mathJaxSrc = fetchurl { @@ -134,39 +134,29 @@ in ./pandoc-nix-path.patch ./use-system-quarto.patch ./ignore-etc-os-release.patch - - (fetchpatch { - name = "use-system-yaml-patch"; - url = "https://github.com/rstudio/rstudio/commit/04de8ca8b83dcc7fee9fd65e6ef58c372489d5ef.patch"; - hash = "sha256-FHSSOPsw6AAYBj/fgNT6idyxvRj3SG+fbla0UDjug1Y="; - }) - ]; postPatch = '' - substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} - - substituteInPlace src/cpp/CMakeLists.txt \ - --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"' + substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace-fail '@R@' ${R} substituteInPlace src/gwt/build.xml \ - --replace '@node@' ${nodejs} \ - --replace './lib/quarto' ${quartoSrc} + --replace-fail '@node@' ${nodejs} \ + --replace-fail './lib/quarto' ${quartoSrc} substituteInPlace src/cpp/conf/rsession-dev.conf \ - --replace '@node@' ${nodejs} + --replace-fail '@node@' ${nodejs} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ - --replace '@libclang@' ${llvmPackages.libclang.lib} \ - --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so + --replace-fail '@libclang@' ${llvmPackages.libclang.lib} \ + --replace-fail '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so substituteInPlace src/cpp/session/CMakeLists.txt \ - --replace '@pandoc@' ${pandoc} \ - --replace '@quarto@' ${quarto} + --replace-fail '@pandoc@' ${pandoc} \ + --replace-fail '@quarto@' ${quarto} substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ - --replace '@pandoc@' ${pandoc}/bin \ - --replace '@quarto@' ${quarto} + --replace-fail '@pandoc@' ${pandoc}/bin \ + --replace-fail '@quarto@' ${quarto} ''; hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); @@ -189,10 +179,10 @@ in unzip -q ${mathJaxSrc} -d dependencies/mathjax-27 - # As of Chocolate Cosmos, node 18.19.1 is used for runtime + # As of Chocolate Cosmos, node 18.20.3 is used for runtime # 18.18.2 is still used for build # see https://github.com/rstudio/rstudio/commit/facb5cf1ab38fe77813aaf36590804e4f865d780 - mkdir -p dependencies/common/node/18.19.1 + mkdir -p dependencies/common/node/18.20.3 mkdir -p dependencies/pandoc/${pandoc.version} cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index d2e3013a782d..50de9c6bfb79 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0412"; + version = "9.1.0509"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-uLdXFZ8eW+iMXrvkaEkArZmRfAiyORaEZxFFPt0TrdI="; + hash = "sha256-CATjUalRjvVjEfWT5evFAk//Oj4iB1fDBsRU5MhDyn4="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/macvim-configurable.nix b/pkgs/applications/editors/vim/macvim-configurable.nix index 5c436307897f..cca5d06ba90a 100644 --- a/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/pkgs/applications/editors/vim/macvim-configurable.nix @@ -1,8 +1,6 @@ { lib, stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: let - macvim = callPackage ./macvim.nix { inherit stdenv; }; - makeCustomizable = macvim: macvim // { # configure expects the same args as vimUtils.vimrcFile. # This is the same as the value given to neovim.override { configure = … } @@ -62,5 +60,4 @@ let override = f: makeCustomizable (macvim.override f); overrideAttrs = f: makeCustomizable (macvim.overrideAttrs f); }; -in - makeCustomizable macvim +in { inherit makeCustomizable; } diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 64aa5b639a9b..bd526b8f6ce2 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -6,15 +6,23 @@ , gettext , pkg-config , cscope -, ruby +, ruby_3_2 , tcl -, perl +, perl536 , luajit , darwin , libiconv , python3 }: +# Try to match MacVim's documented script interface compatibility +let + # Perl 5.30 - closest we get is 5.36. 5.38 is currently failing + perl = perl536; + # Ruby 3.2 + ruby = ruby_3_2; +in + let # Building requires a few system tools to be in PATH. # Some of these we could patch into the relevant source files (such as xcodebuild and @@ -26,16 +34,16 @@ let ''; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "macvim"; - version = "8.2.3455"; + version = "178"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "snapshot-172"; - sha256 = "sha256-LLLQ/V1vyKTuSXzHW3SOlOejZD5AV16NthEdMoTnfko="; + rev = "release-${finalAttrs.version}"; + hash = "sha256-JYh5fyaYuME/Lk67vrf1hYOIcAkEbwtslcnI9KRzHa8="; }; enableParallelBuilding = true; @@ -48,26 +56,26 @@ stdenv.mkDerivation { patches = [ ./macvim.patch ]; configureFlags = [ - "--enable-cscope" - "--enable-fail-if-missing" - "--with-features=huge" - "--enable-gui=macvim" - "--enable-multibyte" - "--enable-nls" - "--enable-luainterp=dynamic" - "--enable-python3interp=dynamic" - "--enable-perlinterp=dynamic" - "--enable-rubyinterp=dynamic" - "--enable-tclinterp=yes" - "--without-local-dir" - "--with-luajit" - "--with-lua-prefix=${luajit}" - "--with-python3-command=${python3}/bin/python3" - "--with-ruby-command=${ruby}/bin/ruby" - "--with-tclsh=${tcl}/bin/tclsh" - "--with-tlib=ncurses" - "--with-compiledby=Nix" - "--disable-sparkle" + "--enable-cscope" + "--enable-fail-if-missing" + "--with-features=huge" + "--enable-gui=macvim" + "--enable-multibyte" + "--enable-nls" + "--enable-luainterp=dynamic" + "--enable-python3interp=dynamic" + "--enable-perlinterp=dynamic" + "--enable-rubyinterp=dynamic" + "--enable-tclinterp=yes" + "--without-local-dir" + "--with-luajit" + "--with-lua-prefix=${luajit}" + "--with-python3-command=${python3}/bin/python3" + "--with-ruby-command=${ruby}/bin/ruby" + "--with-tclsh=${tcl}/bin/tclsh" + "--with-tlib=ncurses" + "--with-compiledby=Nix" + "--disable-sparkle" ]; # Remove references to Sparkle.framework from the project. @@ -78,37 +86,45 @@ stdenv.mkDerivation { sed -e '/Sparkle\.framework/d' -i src/MacVim/MacVim.xcodeproj/project.pbxproj ''; - # This is unfortunate, but we need to use the same compiler as Xcode, - # but Xcode doesn't provide a way to configure the compiler. - preConfigure = '' - CC=/usr/bin/clang + # This is unfortunate, but we need to use the same compiler as Xcode, but Xcode doesn't provide a + # way to configure the compiler. We also need to pull in lib/include paths for some of our build + # inputs since we don't have cc-wrapper to do that for us. + preConfigure = + let + # ideally we'd recurse, but we don't need that right now + inputs = [ ncurses ] ++ perl.propagatedBuildInputs; + ldflags = map (drv: "-L${lib.getLib drv}/lib") inputs; + cppflags = map (drv: "-isystem ${lib.getDev drv}/include") inputs; + in + '' + CC=/usr/bin/clang - DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer - configureFlagsArray+=( - --with-developer-dir="$DEV_DIR" - LDFLAGS="-L${ncurses}/lib" - CPPFLAGS="-isystem ${ncurses.dev}/include" - CFLAGS="-Wno-error=implicit-function-declaration" - ) - '' - # For some reason having LD defined causes PSMTabBarControl to fail at link-time as it - # passes arguments to ld that it meant for clang. - + '' - unset LD - '' - # When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use - # a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath - # by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim - # by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default - # behavior to build the first target in the project. Experimentally, there seems to be a scheme - # called MacVim, so we'll explicitly select that. We also need to specify the configuration too - # as the scheme seems to have the wrong default. - + '' - configureFlagsArray+=( - XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData" - --with-xcodecfg="Release" - ) - '' + DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer + configureFlagsArray+=( + --with-developer-dir="$DEV_DIR" + LDFLAGS=${lib.escapeShellArg ldflags} + CPPFLAGS=${lib.escapeShellArg cppflags} + CFLAGS="-Wno-error=implicit-function-declaration" + ) + '' + # For some reason having LD defined causes PSMTabBarControl to fail at link-time as it + # passes arguments to ld that it meant for clang. + + '' + unset LD + '' + # When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use + # a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath + # by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim + # by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default + # behavior to build the first target in the project. Experimentally, there seems to be a scheme + # called MacVim, so we'll explicitly select that. We also need to specify the configuration too + # as the scheme seems to have the wrong default. + + '' + configureFlagsArray+=( + XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData" + --with-xcodecfg="Release" + ) + '' ; # Because we're building with system clang, this means we're building against Xcode's SDK and @@ -124,7 +140,7 @@ stdenv.mkDerivation { # Xcode project or pass it as a flag to xcodebuild as well. postConfigure = '' substituteInPlace src/auto/config.mk \ - --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include" \ + --replace "PERL_CFLAGS${"\t"}=" "PERL_CFLAGS${"\t"}= -I${darwin.libutil}/include" \ --replace " -L${stdenv.cc.libc}/lib" "" \ --replace " -L${darwin.libobjc}/lib" "" \ --replace " -L${darwin.libunwind}/lib" "" \ @@ -143,17 +159,25 @@ stdenv.mkDerivation { substituteInPlace src/MacVim/vimrc --subst-var-by CSCOPE ${cscope}/bin/cscope ''; + # Note that $out/MacVim.app has a misnamed set of binaries in the Contents/bin folder (the V is + # capitalized) and is missing a bunch of them. This is why we're grabbing the version from the + # build folder. postInstall = '' mkdir -p $out/Applications cp -r src/MacVim/build/Release/MacVim.app $out/Applications rm -rf $out/MacVim.app - rm $out/bin/* - - cp src/vimtutor $out/bin - for prog in mvim ex vi vim vimdiff view rvim rvimdiff rview; do + mkdir -p $out/bin + for prog in ex vi {,g,m,r}vi{m,mdiff,ew}; do ln -s $out/Applications/MacVim.app/Contents/bin/mvim $out/bin/$prog done + for prog in {,g}vimtutor xxd; do + ln -s $out/Applications/MacVim.app/Contents/bin/$prog $out/bin/$prog + done + ln -s $out/Applications/MacVim.app/Contents/bin/gvimtutor $out/bin/mvimtutor + + mkdir -p $out/share + ln -s $out/Applications/MacVim.app/Contents/man $out/share/man # Fix rpaths exe="$out/Applications/MacVim.app/Contents/MacOS/Vim" @@ -165,7 +189,7 @@ stdenv.mkDerivation { install_name_tool -add_rpath ${ruby}/lib $exe # Remove manpages from tools we aren't providing - find $out/share/man \( -name eVim.1 -or -name xxd.1 \) -delete + find $out/Applications/MacVim.app/Contents/man -name evim.1 -delete ''; # We rely on the user's Xcode install to build. It may be located in an arbitrary place, and @@ -179,10 +203,10 @@ stdenv.mkDerivation { meta = with lib; { description = "Vim - the text editor - for macOS"; - homepage = "https://github.com/macvim-dev/macvim"; + homepage = "https://macvim.org/"; license = licenses.vim; - maintainers = with maintainers; [ lilyball ]; - platforms = platforms.darwin; + maintainers = with maintainers; [ ]; + platforms = platforms.darwin; hydraPlatforms = []; # hydra can't build this as long as we rely on Xcode and sandboxProfile }; -} +}) diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index 6af3e384a63c..223778acf60c 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -1,50 +1,60 @@ diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc -index 32c89b387..c2af70127 100644 +index 162af04..4322049 100644 --- a/src/MacVim/vimrc +++ b/src/MacVim/vimrc -@@ -9,35 +9,5 @@ set nocompatible +@@ -9,45 +9,7 @@ set nocompatible " more sensible value. Add "set backspace&" to your ~/.vimrc to reset it. set backspace+=indent,eol,start -" Python2 --" MacVim is configured by default to use the pre-installed System python2 --" version. However, following code tries to find a Homebrew, MacPorts or --" an installation from python.org: +-" MacVim is configured by default in the binary release to use the +-" pre-installed System python2 version. However, following code tries to +-" find a Homebrew, MacPorts or an installation from python.org: -if exists("&pythondll") && exists("&pythonhome") +- " Homebrew python 2.7 - if filereadable("/usr/local/Frameworks/Python.framework/Versions/2.7/Python") -- " Homebrew python 2.7 - set pythondll=/usr/local/Frameworks/Python.framework/Versions/2.7/Python +- +- " MacPorts python 2.7 - elseif filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python") -- " MacPorts python 2.7 - set pythondll=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python +- +- " https://www.python.org/downloads/mac-osx/ - elseif filereadable("/Library/Frameworks/Python.framework/Versions/2.7/Python") -- " https://www.python.org/downloads/mac-osx/ - set pythondll=/Library/Frameworks/Python.framework/Versions/2.7/Python - endif -endif - -" Python3 --" MacVim is configured by default to use Homebrew python3 version --" If this cannot be found, following code tries to find a MacPorts --" or an installation from python.org: +-" MacVim is configured by default in the binary release to set +-" pythonthreedll to Homebrew python3. If it cannot be found, the following +-" code tries to find Python3 from other popular locations. Note that we are +-" using "Current" for the version, because Vim supports the stable ABI and +-" therefore any new version of Python3 will work. -if exists("&pythonthreedll") && exists("&pythonthreehome") && - \ !filereadable(&pythonthreedll) -- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python") -- " MacPorts python 3.9 -- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python -- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.9/Python") -- " https://www.python.org/downloads/mac-osx/ -- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.9/Python +- " MacPorts python +- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/Current/Python") +- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/Current/Python +- +- " macOS default Python, installed by 'xcode-select --install' +- elseif filereadable("/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/Current/Python3") +- set pythonthreedll=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/Current/Python3 +- +- " https://www.python.org/downloads/mac-osx/ +- elseif filereadable("/Library/Frameworks/Python.framework/Versions/Current/Python") +- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/Current/Python - endif -endif -- +" Default cscopeprg to the Nix-installed path +set cscopeprg=@CSCOPE@ + + " vim: sw=2 ts=2 et diff --git a/src/Makefile b/src/Makefile -index c4a3ada37..06ee3de44 100644 +index 5b4cdff..72fee3a 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -1402,7 +1402,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ +@@ -1290,7 +1290,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ MacVim/MacVim.m MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o @@ -54,10 +64,10 @@ index c4a3ada37..06ee3de44 100644 MACVIMGUI_LIBS_DIR = MACVIMGUI_LIBS1 = diff --git a/src/auto/configure b/src/auto/configure -index 39ef81449..d8fa7ec2f 100755 +index ecf10c4..4b691d0 100755 --- a/src/auto/configure +++ b/src/auto/configure -@@ -5896,10 +5896,7 @@ $as_echo "not found" >&6; } +@@ -6247,10 +6247,7 @@ printf "%s\n" "not found" >&6; } for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do if test "X$path" != "X"; then @@ -69,7 +79,7 @@ index 39ef81449..d8fa7ec2f 100755 MZSCHEME_LIBS="${path}/libmzscheme3m.a" MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" elif test -f "${path}/libracket3m.a"; then -@@ -6287,23 +6284,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } +@@ -6646,23 +6643,6 @@ printf "%s\n" ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi if test "x$MACOS_X" = "xyes"; then @@ -93,7 +103,7 @@ index 39ef81449..d8fa7ec2f 100755 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` fi -@@ -6526,13 +6506,6 @@ __: +@@ -6902,13 +6882,7 @@ __: eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" @@ -104,10 +114,11 @@ index 39ef81449..d8fa7ec2f 100755 - vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" - fi - else ++ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` -@@ -6547,7 +6520,6 @@ eof +@@ -6923,7 +6897,6 @@ eof fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` @@ -115,8 +126,8 @@ index 39ef81449..d8fa7ec2f 100755 fi -@@ -6626,13 +6598,6 @@ rm -f core conftest.err conftest.$ac_objext \ - $as_echo "no" >&6; } +@@ -7004,13 +6977,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ + printf "%s\n" "no" >&6; } fi - if test -n "$MACSDK"; then @@ -126,13 +137,13 @@ index 39ef81449..d8fa7ec2f 100755 - PYTHON_GETPATH_CFLAGS= - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 - $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 + printf %s "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS -@@ -7557,11 +7522,7 @@ $as_echo "$tclver - OK" >&6; }; +@@ -8060,11 +8026,7 @@ printf "%s\n" "$tclver - OK" >&6; }; - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 - $as_echo_n "checking for location of Tcl include... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 + printf %s "checking for location of Tcl include... " >&6; } - if test "x$MACOS_X" != "xyes"; then tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" - else @@ -141,10 +152,10 @@ index 39ef81449..d8fa7ec2f 100755 TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then -@@ -7579,13 +7540,8 @@ $as_echo "" >&6; } +@@ -8082,13 +8044,8 @@ printf "%s\n" "" >&6; } if test -z "$SKIP_TCL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 - $as_echo_n "checking for location of tclConfig.sh script... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 + printf %s "checking for location of tclConfig.sh script... " >&6; } - if test "x$MACOS_X" != "xyes"; then tclcnf=`echo $tclinc | sed s/include/lib/g` tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" @@ -154,8 +165,8 @@ index 39ef81449..d8fa7ec2f 100755 - fi for try in $tclcnf; do if test -f "$try/tclConfig.sh"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -@@ -7774,10 +7730,6 @@ $as_echo "$rubyhdrdir" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 +@@ -8285,10 +8242,6 @@ printf "%s\n" "$rubyhdrdir" >&6; } rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"` if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" @@ -167,10 +178,10 @@ index 39ef81449..d8fa7ec2f 100755 if test "X$librubyarg" != "X"; then diff --git a/src/vim.h b/src/vim.h -index 4ff59f201..f91cb9836 100644 +index 6e33142..6185f45 100644 --- a/src/vim.h +++ b/src/vim.h -@@ -244,17 +244,6 @@ +@@ -270,17 +270,6 @@ # define SUN_SYSTEM #endif @@ -189,10 +200,10 @@ index 4ff59f201..f91cb9836 100644 # include "os_amiga.h" #endif diff --git a/src/vimtutor b/src/vimtutor -index 3b154f288..e89f26060 100755 +index 3b154f2..e89f260 100755 --- a/src/vimtutor +++ b/src/vimtutor -@@ -16,6 +16,6 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" +@@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" if test "$1" = "-g"; then # Try to use the GUI version of Vim if possible, it will fall back # on Vim if Gvim is not installed. @@ -200,3 +211,4 @@ index 3b154f288..e89f26060 100755 + seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" shift fi + diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index d679dfed6db4..60a28dd327db 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -12,7 +12,7 @@ "new": "vim-fern" }, "gina-vim": { - "date": "2024-06-19", + "date": "2024-07-03", "new": "vim-gina" }, "gist-vim": { @@ -60,7 +60,7 @@ "new": "vim-suda" }, "vim-fsharp": { - "date": "2024-06-19", + "date": "2024-07-03", "new": "zarchive-vim-fsharp" }, "vim-jade": { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 213806b2f402..dedcdf56d451 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; - version = "2024-03-06"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "df53728e05129278d6ea26271ec086aa013bed90"; - sha256 = "0yh7awf26cqfndhliizi0mfqj2111hicg3hlqjjiag96qq9csgdw"; + rev = "f081338f07216a46d3915ce46c1fcb083bcb5016"; + sha256 = "1hgwdahp5h2nfzwfgjjgdbki5jnyg5gmapvz1kd1zmcycslb85di"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2024-06-15"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "a36352930b5e5f8d33dda09eef0c9d7c96190a02"; - sha256 = "07vy515qgfc6f1y96dn0ykm0kh3ylkhf6igb23f4jv608ylz4f12"; + rev = "c1dc30666c957815b012ae67e8e61de6b48ecf86"; + sha256 = "17hrsjxyr9f59h790gvwk8gmp7zzfjjsnvb5a5lpqa0q4yxq3fzv"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -185,24 +185,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-06-18"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "67eece6d74f071035ca7b934a753d71d1677dd9b"; - sha256 = "15r8n3ch609lifv8lvyis5kn663c6jjj4zkzhyn4v4cxcxj3lb5d"; + rev = "1f603f9074118ee9975b2af0308452ca324640e5"; + sha256 = "0p9rrhlxa1dy5ym85jhr8zxai7zng0sikf5v0ywdi09vryknygxb"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-06-19"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "11c08af2ae56fac83772d21aa5133913784ca2c4"; - sha256 = "1yld7h2s1yr5l65iagk51xx4znf1vh5m7c5c4gmmp5zr2px0bn8b"; + rev = "ea67d004f86ac10e29708fbb4de84f72b87df612"; + sha256 = "15pdsx91cbl4ig7ph5nbrqm42l08wbs9dvn2d80p922ywm4vjxdq"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -267,6 +267,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/PreserveNoEOL/"; }; + Preview-nvim = buildVimPlugin { + pname = "Preview.nvim"; + version = "2024-06-01"; + src = fetchFromGitHub { + owner = "henriklovhaug"; + repo = "Preview.nvim"; + rev = "388882f3bfd09bcb0d5b4ab3d0fa5bc2dacbbc2e"; + sha256 = "sha256-Tnl2TkLY9QXk/5qX2LcX5G2aq/sysH6BnD2YqXlneIU="; + }; + meta.homepage = "https://github.com/henriklovhaug/Preview.nvim/"; + }; + QFEnter = buildVimPlugin { pname = "QFEnter"; version = "2024-05-05"; @@ -317,12 +329,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-06-15"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "35f36c50b9f1e1e916d0e3f004cb48dffd2bf737"; - sha256 = "0a3488c74hrykcmharzza5svy9c0smw9yzafpdsgw10adav2mxqb"; + rev = "b606847df9f91ab6a7d0484c2e3fae096c9fe028"; + sha256 = "13whydyh7wrw0wfpbx9sn330nybbggcks5866fqpx05zdkcv1kfc"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -389,12 +401,12 @@ final: prev: SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2024-06-02"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "af055c0c73e4d49c57acbb40d9f6e248f2a38d52"; - sha256 = "1ngh7m1mkam8vavpzgym3nii25ivw2b557hj72mi2j1f18xgvf90"; + rev = "e2250a99f7c3c0247d7e7456ee1bceb17aee1927"; + sha256 = "13152c34vzxpag8k6r3z0sk2mh1nyl3v76l893iwdi3q9hw8r9wr"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -461,12 +473,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2024-03-20"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "4556062839aa2e86f2f4f1c0b4532697d607af23"; - sha256 = "14391a213340agjafvraw1az21vj940y7ddwqwbbsrj4q18si7av"; + rev = "b5fe27bb82cc375d66a9a006cf30390bdb215ed2"; + sha256 = "1fm8dbdr26zknxcyiah7jz1v0h9cx0g4dg9c9vrm3w3ibbpy2jf0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -534,12 +546,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-06-17"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "eb25396dae306cef5b8fffbe9ae98283d2f1c199"; - sha256 = "1byzkpcc77a2zwlypgmcmzik816i4qcaydb8ssy0vxrf3nsjx9s4"; + rev = "db0af491ff13c18a966ce2f9ac7f5211aec000a7"; + sha256 = "0v0064c0prsxm7z151nd7fvfwq6na5agbh3dqnj9whnwx0k0l2zl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -595,12 +607,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-06-02"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "c7c41e157478fc9d4f65e9f640bfce75fa211fd7"; - sha256 = "1g7q3nc0y0k1hwg22mqcwypsriss6q12bx1d653sg5jsm7l8lrck"; + rev = "a35fa4d732220914d620deccbc8ef68fa1bff96f"; + sha256 = "17afk45cs61zvk01kg9brl86k4czgfvsrg87zdaszw2abhxrqgi4"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -823,12 +835,12 @@ final: prev: asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2024-05-22"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "182c636909cfd41e1d72e1278a7db6a4e5271b81"; - sha256 = "0mbr0abpwj45bnc3riv3mgfj9ic3xjbxkgwmkzjrr42zw208rki5"; + rev = "b0987750dddf0ee678d160fe50e3d5397cd0c9e9"; + sha256 = "0ifnfif65ykpkavaajwiqc8pi38c0x7b709kx1gvn0z7nr8gxf7p"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -919,12 +931,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-05-21"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "af2219b9fa99c1d7ac409bd9eac094c459d3f52d"; - sha256 = "16qs3xqlfcdcrd9phyf180hhcp28cc4z2lsg68zr3jhdlyls6yxj"; + rev = "7b1b30d3424b7ca0fb4d12ce3f3d1977cf7c5691"; + sha256 = "0dqq4na08bcpw2668ykcih5rw83k3a138x3a6q9i26wzmviyvkq5"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -1040,12 +1052,12 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-06-18"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "a1b2661f3cb248ae4fafc0cc50ca2588532e231d"; - sha256 = "0f004i98g6jvgnl561bmhzga09gdh1nizk95ahyyg6y5bkqkbrn8"; + rev = "b67ea789efd5e81692c802d2b42629db79683da1"; + sha256 = "0j16j20psjqgl4jmzh3ajrz5zzz85fs0nyg5gyp247cka5zljhr9"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; @@ -1100,12 +1112,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-06-02"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "87e09eb9e959966397bd9d8aab18d88ef349c913"; - sha256 = "1j2hm9400dlynkzxyxqzp4rz4kxjai5hiqv4b3lxg21g49lq5aa6"; + rev = "d4ffecc3e1a34f3ed9af6362529552eee79e57c2"; + sha256 = "11k0slasxzyj1xifvlj6fy1kajnlvk5kyv05f70c7k9a3kn79jpx"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1304,12 +1316,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-05-24"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe"; - sha256 = "00rvijzj17449zmsiqwp8ybcsdd84frny3kl3b7wm57bbiis9w7h"; + rev = "81820cac7c85e51e4cf179f8a66d13dbf7b032d9"; + sha256 = "1z4i45gnh71ayqxkibd7zb07k1k9y0mk6pnldbmv73nhwi9m2ypw"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1376,12 +1388,12 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2024-06-03"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "22924b7bde685e1816140f17a897950ef82b969a"; - sha256 = "18np41as7j6axbfl5l1cv5b0xpsslfj6pcc8ih1sax4awnfbpf46"; + rev = "4fb5abaef2f2e0540fe22d4d74a9841205fff9e4"; + sha256 = "00916cwvdg3rccmf4vg811gi03gpdrpsndpr9ady29dii2alb6pb"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1436,12 +1448,12 @@ final: prev: cinnamon-nvim = buildVimPlugin { pname = "cinnamon.nvim"; - version = "2024-06-19"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "declancm"; repo = "cinnamon.nvim"; - rev = "513154670f9e174e0b5dc75dd0662c5da493c284"; - sha256 = "0apnz8qmj0173dw4nnxj3zjr5695f20za599pwlmfrld0nfgaqc2"; + rev = "b6c406e2b941abbb334388d6d3e82a737e47ae11"; + sha256 = "0lw2q6hjc6yd8p6afkswp40lgg4i5agjyj161mp05lvdp06jb05x"; }; meta.homepage = "https://github.com/declancm/cinnamon.nvim/"; }; @@ -1460,12 +1472,12 @@ final: prev: citruszest-nvim = buildVimPlugin { pname = "citruszest.nvim"; - version = "2024-05-28"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "zootedb0t"; repo = "citruszest.nvim"; - rev = "665de14b9a61067a706a53c233e67126f7edf53e"; - sha256 = "11v9jxk4wln7i542mjswh964dsy8isanzhpy2px4pqnwaxq58cy7"; + rev = "cced9374c8b15eb466d67ce1c56e854abd1f0d46"; + sha256 = "1gfxnc22warpbxw6qykrc3850k3ij1zyrhx85ln57kzhsngamy5x"; }; meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; }; @@ -1544,24 +1556,24 @@ final: prev: close-buffers-vim = buildVimPlugin { pname = "close-buffers.vim"; - version = "2020-09-23"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "asheq"; repo = "close-buffers.vim"; - rev = "0b29fbc483344e2ebec96a28070698d72a8a767c"; - sha256 = "08pqnal5zfspg1wmg6laf9k46xrh3cg0yzdhl853j3ys96mfk8pf"; + rev = "a679b99cee5f3349a83f95f8200e7c1fe6603b13"; + sha256 = "1jdxh28kirhw1m5gj48skhffn03g49qw92vmr3fahk5dfqh4cyi5"; }; meta.homepage = "https://github.com/asheq/close-buffers.vim/"; }; cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2024-06-11"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "09bd61415ecdba84f378fe734680f69375260985"; - sha256 = "1ygqn0qwmgq19c46aadrqb7kysmwh5igrdj5jwy79zc6f20zh3b7"; + rev = "4be3c229fe932043fd83ad52fdf0ba9af7297789"; + sha256 = "12cyls7vsz852b2x8vhs7qwi20kcml4z7zc5b6zaamw2h74an6sm"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; }; @@ -1723,12 +1735,12 @@ final: prev: cmp-dictionary = buildVimPlugin { pname = "cmp-dictionary"; - version = "2024-03-03"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "3dab73d34a889eafdb57c666c3c2076b4c3e126b"; - sha256 = "08nyng2ykxnapih97m1wsj1fskjz7yb09g2mb3428l7zbvjjk3nq"; + rev = "e6e3ec979b586a75c53e72f2d6a035f28bb3979c"; + sha256 = "1nz0ywakqvvscrvdzk86w8f29s8mrcyln2jqgh24kvic5zwb66xj"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -2291,12 +2303,24 @@ final: prev: src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "625a5cf79443a532c81f9290b3344ed8f91d2e20"; - sha256 = "1i2l9ss9i39zdxmfzrpvwsp6lx49ly7synrr2bm6byywmpx1cp37"; + rev = "7a01ffb1e6538fe634f294908a50a7b680039284"; + sha256 = "196a66my0jy4166irhwg908dayqc2pv0yiwqgsisi8srzybacm6f"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; + codesnap-nvim = buildVimPlugin { + pname = "codesnap.nvim"; + version = "2024-05-08"; + src = fetchFromGitHub { + owner = "mistricky"; + repo = "codesnap.nvim"; + rev = "a223fd882953e56ae1a8747fdc44b8d6a2ff7a9b"; + sha256 = "1j1qw9wr2ymwj75k3yhby2fcq81b68yxp4wvd16xnq3ivyg74r3l"; + }; + meta.homepage = "https://github.com/mistricky/codesnap.nvim/"; + }; + codewindow-nvim = buildVimPlugin { pname = "codewindow.nvim"; version = "2024-06-05"; @@ -2467,12 +2491,12 @@ final: prev: compiler-nvim = buildVimPlugin { pname = "compiler.nvim"; - version = "2024-06-14"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "Zeioth"; repo = "compiler.nvim"; - rev = "520ca6e0bd924e3ca8bd26e036a3b830955cf52f"; - sha256 = "18086w0hawhf94xzbgrk2h5qsnxx58w9193v5ldwmx55l7dn9i16"; + rev = "4ad0395994f374e6c797266ea4acca90927f19aa"; + sha256 = "1fj2n5p335as4cdrn0msi8a4dmzwdcplwlka8hra2p1avrnv8lw7"; }; meta.homepage = "https://github.com/Zeioth/compiler.nvim/"; }; @@ -2551,12 +2575,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-06-19"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "bde3bee1773c96212b6c49f009e05174f932c23a"; - sha256 = "083a6glk20zj1rxnajchi6v6mah9632qmbzrs270lmjplk6dc2qk"; + rev = "cd75be867f2331b22905f47d28c0c270a69466aa"; + sha256 = "0lck0dzrisb3p4gw1qfyh4874nfj74ariw274s6nzqz39bk8nmqq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2564,12 +2588,12 @@ final: prev: conjure = buildVimPlugin { pname = "conjure"; - version = "2024-05-31"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "934687860a71d1d03e569ce11f880a4d404e69aa"; - sha256 = "1j0rsyw37wc0sh3im1m20akriyj0fmwlhbwfpkzav25wk9c8kmf2"; + rev = "a81977726f726b21d4bd75cea5bbbb7022005507"; + sha256 = "154bkh2cxar7ajyi8y4ym6ckp48b333cml73a52g6qfiggql5r33"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2624,12 +2648,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-06-14"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "88d08cf54f623341adde4b18362bffc95174dcd5"; - sha256 = "1ih8f8bbivywlaj54jaxnz6i05770qss028fafqsvn3h9cindigi"; + rev = "0668308e68b0ac28b332b204b469fbe04601536a"; + sha256 = "0vhcdzhrkh3rs88kh481310z9ma775za1gf7nf8fq1x0znd2455w"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2672,12 +2696,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-06-11"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "83808cfdebca290c84808c85b73f4dbcf5cf981f"; - sha256 = "17l52gd96kfqq4nc0z8qprigvzzrbsa1vijx7kdvgr0qbw4mr5gy"; + rev = "6b35465a58052f06b5ee0ca63606439ea7c862e8"; + sha256 = "162xqsrdv9zpqhr723z5b4m1154ryvddbj5kyxsrwccgxj6q5irv"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2720,12 +2744,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-06-19"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "909d233a8a86fd5ca8ef9eb1e404e89b81e05c41"; - sha256 = "1gbksj75hpkxn5mvvqhyhwx9l2b5xrp2vgwplydxgp3ml4f66rv7"; + rev = "c3fd47391de6999f4c939af89494d08443f71916"; + sha256 = "0vw47mbx7pw4zzrj70yli86nk407j05ll1lq7d4nb41vii3lnlyb"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2816,24 +2840,24 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-06-18"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "db76342d8dff74b9382bf1e9c9e648ee16869809"; - sha256 = "1vzhylvw54jsz3fnmbx85if1izkmzzzbpzmdzw6dvmyqiw4axj7i"; + rev = "998e6562cea3f86af74c489eeaf005ae82657886"; + sha256 = "0azwqlw14ipailh6xdlvflzlc6d2r7gn0syba5rs3cd42pdgk01f"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; dart-vim-plugin = buildVimPlugin { pname = "dart-vim-plugin"; - version = "2023-07-18"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "928302ec931caf0dcf21835cca284ccd2b192f7b"; - sha256 = "0chfg23ckqyz5gr44arfvvs2b3h34n3d0jhmhfzaw4ylspxfx548"; + rev = "4bdc04e2540edf90fda2812434c11d19dc04bc8f"; + sha256 = "1ckrf37p22ap1h9ls48jr4qk4yrvf17ylzkjki4dbpzl4kzrylbi"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; @@ -2852,12 +2876,12 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2024-06-12"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "b88c997f468a1bacb1e9b13ff3b567638caa06e6"; - sha256 = "0q77lzd9ls62dc3fbzrc401aaxah2sh1p1g9zfsxvimb4y313b7c"; + rev = "e6e33b848f0e2fe5c13f6553c568764555c390a3"; + sha256 = "14nhv9jx0f92gp49bymr5wfnsvwkfllsmb8ax9nbvj68i22baq14"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -2972,24 +2996,24 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-06-18"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "c6fa7c615ea7209ece65b2322591f0dd0167358d"; - sha256 = "1qxnk06sxrs1i5rhraiid9v6jr2nw5psgj8f0n42jfbpiadb6m2h"; + rev = "09e64956c2946bba0a060d0a0aaddde106753bd9"; + sha256 = "128z109hixhbn50aqgcdihdjc0i94sgqm95l8ra81cskhz1y00cc"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2024-06-18"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "7fe1a74a1e9abba978e3a1e02f798bf04de71a5f"; - sha256 = "0s61cwhjacnj5rvg87l263pf8rrla6ym8z89pp43wqj875d8d8s5"; + rev = "dc1efcf37e8c415ca686a4b6faaeae801ffc7ab4"; + sha256 = "1pvqxbyiccq5y9m0v23prkfi5b5p09xbn6ygckv7ppi7gb63hr2k"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3262,12 +3286,12 @@ final: prev: dial-nvim = buildVimPlugin { pname = "dial.nvim"; - version = "2024-05-18"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "7af2daaaf933b0617ded0f78b49f4d5fc45f9f64"; - sha256 = "131h6qpnzdgq72z4wkf3pm1xm848iyhbkim3689l0x950z1f56n1"; + rev = "750f802879c90ea51f92b68c35fa562ee575804a"; + sha256 = "0zcg3lyxjib9323dwilplgycxx0gcakfncficf3niw76j7zqgw9c"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; @@ -3394,12 +3418,12 @@ final: prev: edge = buildVimPlugin { pname = "edge"; - version = "2024-06-03"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "2153187e3ca56c11a7f35852bbaef6525c936b1c"; - sha256 = "17bjyn241iy7qflw8yqlzxi4536b9l6hnxcbgbxsj8a7s3f51iqd"; + rev = "95d2ccf1a962445eec8640a507b97ed10d7d865b"; + sha256 = "1islv5bd1x3s7l6x0gigi3xj9k28dz18riaakjhm0sl4p70hxc3v"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -3552,12 +3576,12 @@ final: prev: everforest = buildVimPlugin { pname = "everforest"; - version = "2024-06-02"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "9dbd4d1c3255ed801e515f2ed388f4c6ceb62f6e"; - sha256 = "1ccawa3m5crqgwz30bm6pz6rdjdnqkp6w724qrbq5d053gss42jq"; + rev = "752a026157f5befaf705bccbcb2ddb5b67703e03"; + sha256 = "0715aaryz76dl9sqsfd8kyz7nwk0g803h6pxnnhlxzpigq9fcs8m"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3720,12 +3744,12 @@ final: prev: firenvim = buildVimPlugin { pname = "firenvim"; - version = "2024-06-06"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "e412ab23c5b56b7eb3c361da8a1f8a2e94c51001"; - sha256 = "1prrmc41221f334b1cxhc7msxz5a83m0k7hg2hzspszggfgv49vh"; + rev = "c6e37476ab3b58cf01ababfe80ec9335798e70e5"; + sha256 = "0mcfm4ya7kwr6yj0wfwylqqhiv9hx7m45dpfsra7zzjs2xjpcplq"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3841,12 +3865,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-05-19"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "990a1349c29f7d474a0cd51355aba773ccc9deea"; - sha256 = "1qn6b6hmyscxiczwp1k530l1k165wlnqxjk820737d27l451c5vm"; + rev = "5aa227fa083fd740184b55b5220dfabc24a25cc7"; + sha256 = "0ga9ipycmklxcbqz8pnan1sli49qwc8wx034drmrvfpbriw3bc73"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3997,12 +4021,12 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-06-19"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "c56717d6833166adadd11cad05d979b1fb370c57"; - sha256 = "17cwiv25qg3lvlm6j5v95pdxd92470kb1495xvp2iaanzzmkl1h8"; + rev = "3b91c1a471160bd8620bdca8f18743d954994daa"; + sha256 = "1qapr7nhp8kz9dzkzkkqzlsv51qdkdv5zr457pgnf7rpk3bnf4yj"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4105,12 +4129,12 @@ final: prev: git-conflict-nvim = buildVimPlugin { pname = "git-conflict.nvim"; - version = "2024-06-03"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "git-conflict.nvim"; - rev = "bfd9fe6fba9a161fc199771d85996236a0d0faad"; - sha256 = "1lwxnfa6scw64pxq1viqrbdcsn2gf8hysqkbnn66y5518b5rc5z4"; + rev = "45cde6f0acf26d0e4b64acfa45349dd1da01e577"; + sha256 = "10gsqny5wbqyz7grvnn4c02wib06b4594rffa8bmdydvg09fb9j9"; }; meta.homepage = "https://github.com/akinsho/git-conflict.nvim/"; }; @@ -4189,12 +4213,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-06-19"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "651d5ed082605f3ed96b0f037a768ca06ecf8fc3"; - sha256 = "0fllibgmp1sfargpkswg1h3kg667y0sdazc0z5midaq8skr9crz6"; + rev = "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7"; + sha256 = "1xaxi3v67wdrgyclcrimcpfd1ggfb0wxxy2iz9xmqlkvc3g3aws1"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4249,12 +4273,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-06-19"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "78c6d7b970a79c34dc0f35149f4bd845e09803d6"; - sha256 = "0pg14jml1n27imy4rdb1ri7wi7bnh2fp8q7rah5az8k80g26ghpg"; + rev = "cde0c7a110c0f65b9e4e6baf342654268efff371"; + sha256 = "0xmyy4wahgi097ay7bs091q9d7ysvknargnlcg8l7qsq6wipl4d9"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4297,12 +4321,12 @@ final: prev: goto-preview = buildVimPlugin { pname = "goto-preview"; - version = "2024-04-05"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "3552fad4a0244ffd9ac86508e29ccc5166f19eb8"; - sha256 = "1a7dbzr3sgabcidwls7mnjbdbhjqayh1xfxwhl96ml3cqhari2k7"; + rev = "1519ea3512828c944eed5b2bbb66a8f8deb92447"; + sha256 = "1ql68yzm33jqjh2argad8zgl012sg4s7xzidazmrhl4ins6y492g"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -4405,12 +4429,12 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2024-06-03"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "905a41c86dbfed42f89c13c36f0e3407e9318910"; - sha256 = "150lr7imib2wk3pjlp6jx0w2vz005q89f7r0vnvpw1gh2f6rjl5q"; + rev = "23371661bac2b7fdd9769c685e4224990c3b9ab8"; + sha256 = "0f0kpwzl614zwbrc6rc8x5cl54dhdlngg41xr19wzcklnqzbl0w1"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -4429,24 +4453,24 @@ final: prev: gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2024-06-05"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "d4cde3853a172485961b515c36d51d757728d6e6"; - sha256 = "0aqz3gybdl1sj92p53md63pwgfs1d60k8vjc0x69wqya81dl7cn3"; + rev = "fa8138d25c061b9cbfacdd3f4dd1929e2a6d92ce"; + sha256 = "007i6gkbapyn2fv19yr5izfsv859qw4qnbdxfp7kv0sidkqdk47p"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; guard-collection = buildVimPlugin { pname = "guard-collection"; - version = "2024-06-06"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard-collection"; - rev = "c1651e33a450279b76e6aa70d131472201ef930d"; - sha256 = "1axnx1wa32mh5s2vzhhc5y1471053y5ml9gnvmiiqax94m7acvzp"; + rev = "de6587e99371aeb92cfda3415b6a696c1f55d397"; + sha256 = "0fqynfal7vk55mh13p5v5gh3fhpf26a7kajyrl79hdsr9shv5s4g"; }; meta.homepage = "https://github.com/nvimdev/guard-collection/"; }; @@ -4501,12 +4525,12 @@ final: prev: hardhat-nvim = buildVimPlugin { pname = "hardhat.nvim"; - version = "2024-06-14"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "TheSnakeWitcher"; repo = "hardhat.nvim"; - rev = "9d5b241261904ae22429877c1459e7c632dba736"; - sha256 = "1xb93g4cxy3w4jjagaqmyvf2qfii4fm5biriadkmf4a08vdxg682"; + rev = "9688bc77bf9e8e2ad97cf0f9b7701407aa2b31c2"; + sha256 = "1paddg7v3akc4s2l1br4gfwvbg1gxzgajaqman3fi56pl7lw5xy1"; }; meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/"; }; @@ -4548,36 +4572,36 @@ final: prev: haskell-scope-highlighting-nvim = buildVimPlugin { pname = "haskell-scope-highlighting.nvim"; - version = "2024-05-23"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "kiyoon"; repo = "haskell-scope-highlighting.nvim"; - rev = "8d882e6710865217394cf1cad5fc9e2becd6d6f6"; - sha256 = "1a7mnb8a0a4v3gyw7padwbqchxmjnygbvvr5m2cixlmb01ahs9ap"; + rev = "9f0f9ee26a011c3567865cdcc0443318de281ad3"; + sha256 = "1npaanvvgnqpra4wbnxjffjdvw3mks8si42pnl5pj5snascbigv5"; }; meta.homepage = "https://github.com/kiyoon/haskell-scope-highlighting.nvim/"; }; haskell-snippets-nvim = buildVimPlugin { pname = "haskell-snippets.nvim"; - version = "2024-05-20"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "haskell-snippets.nvim"; - rev = "46462fe142521bd5719412dc9d740c2e54a9186e"; - sha256 = "14cqvs09yk1b9dk8k0l322kxqahr5hzv7iiz72pjfjjk888dhdr2"; + rev = "e430927cb222718e14ac32116011b5e3df39ab51"; + sha256 = "1drsis1521x31r389j9d2gxcclbc9cfg6f0w3qgbz7yd4cyxmxnm"; }; meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; }; haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2024-06-16"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "0223bf4b47ab517030f406617c153e7d1e4a7811"; - sha256 = "1ab3s6lrqh870qcphxjsvj5q8jg7lxv27119r5qyp60rf657q39a"; + rev = "239875d842ca25d4eb7dccac574ab9a5f5271c34"; + sha256 = "1w5m248lg7c3hnm4mdrchkhxr5ack76x3dp3p4m1vgix9gl8hbl9"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4859,12 +4883,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-06-16"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "bdd5506be7fb39668692e30141f1637b691379af"; - sha256 = "0dfvg393l0rwr8lm25fkw8gh1vx592jc1ccslal81jvyjnvgc237"; + rev = "7d021c94e231d491355f5e724ba357ace296f06d"; + sha256 = "1fjh1w07lwngyxa7aqxbxw6x0npz6x1zb7k73q8zihrkz0xrhcln"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4943,12 +4967,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2024-05-23"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "d98f537c3492e87b6dc6c2e3f66ac517528f406f"; - sha256 = "0zb52msar7hl38xmi3pvjsynjabqyv2rsajrzdx46wqp018v971b"; + rev = "65e20ab94a26d0e14acac5049b8641336819dfc7"; + sha256 = "14v9mglm2zykylga0lzh9w1vcmxixya7xg2k4z4m6f4a3l21farx"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -5136,12 +5160,12 @@ final: prev: jinja-vim = buildVimPlugin { pname = "jinja.vim"; - version = "2020-06-18"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "HiPhish"; repo = "jinja.vim"; - rev = "51b8a2a504416c4959127c82eac26f14f3508975"; - sha256 = "15ax7v6crdzra4sqqmjpvl9q1p9dmsksrs4j68zqqrj6kka0zkgn"; + rev = "ca97dafc82c012b3a9005a12a673d2cfa854376d"; + sha256 = "14g85r90860a4n7ggh29s1k6brgcyycm4j1ll4y7h872v8d5265p"; }; meta.homepage = "https://github.com/HiPhish/jinja.vim/"; }; @@ -5209,12 +5233,12 @@ final: prev: kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2024-06-12"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "fe5b2c9e2549862c3dc3f3c8e9cf7ddece0f40c2"; - sha256 = "1ip8f9i822d6mmaxvzrvap19k5lr9mp8k6lgh2xyspszbgxi0nhg"; + rev = "e5f7b8a804360f0a48e40d0083a97193ee4fcc87"; + sha256 = "1066495w73a11kdpm8iah3k0pjf766ylf21jk8gjid73byl2lz0n"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -5317,36 +5341,36 @@ final: prev: lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; - version = "2024-05-01"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "17deb64279389056b6edd4b0619d8dc391798b6a"; - sha256 = "0lzihyajpjmj8g0jqbm5mgdkafbpc061bwjrsryswvgan1j5y5bv"; + rev = "3ce514080931ca6c35036dd9f90da879e9ab3204"; + sha256 = "1jfkvhlr70d8c6m413r74q4qi1kwk9ll5n48scrqk4fvpsgx8777"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-06-18"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "bc620783663ab09d16bff9fdecc07da65b2a1528"; - sha256 = "180rvpy9bv7c7gnimhwgzyxr2hml9v371ki8n73v726ssk4x1pzc"; + rev = "d0921f5b9b3d2c5e09618da55a018228edcc4d16"; + sha256 = "1yl852zim52mrj4ddc30pfgyrp58wjkfcvmiyncqgj1nsibhdnxz"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; lazydev-nvim = buildVimPlugin { pname = "lazydev.nvim"; - version = "2024-06-15"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "folke"; repo = "lazydev.nvim"; - rev = "6184ebbbc8045d70077659b7d30c705a588dc62f"; - sha256 = "1kj3p5x7h8k1xp8m5pxjkzbfigcbrschgm1kzlc3qkv0py3i5k5h"; + rev = "78d8a11fbd02ad4eafa07dd8a43a959a69fb3bf8"; + sha256 = "04qdq0wz0qz0p2khm6jdzxy70pdya9dfjc9ij4liphxjc3pf0c9y"; }; meta.homepage = "https://github.com/folke/lazydev.nvim/"; }; @@ -5365,12 +5389,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-06-10"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "3c0b48374146abd651da5623f3f73f96121a616f"; - sha256 = "145hpcg64pxxfqhryzs88q0yyw163a892npsra6rbdnca1jzlr8z"; + rev = "a46a28499bae49f5f0e99d04134ba4617a213304"; + sha256 = "00621vmbyvrgqpwlshmndnmflggb9jhislqqlmps8amqryq57y5w"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5401,24 +5425,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-06-18"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "2ec33f2a38974fe6997c42c5ce61ce84eab84cc8"; - sha256 = "0xavag2c5mq5ii14b5dvm7nm13cs97nhag28gpvjdzwgkzz3c21v"; + rev = "eca8108dcd5f41fbde2a674dceb58b81ed887dc8"; + sha256 = "02sgp1lv4s7szqw2awsaavlhvji8jn24g8hzj7d56y6hjl6pz1id"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-06-14"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "89e0d00c5aed623c1f29cf2a963fd1737358e92a"; - sha256 = "0i4xh66xydssvr4n2kknrg1qibj8ikfvy5m6ljbmhbvgxim74y48"; + rev = "847af406e688e172934ec91ba12088ffcd497e1f"; + sha256 = "1grp39x69i6yqmcflnwxj74knsv5pdxfa096sxn7h458nbdm3pma"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5473,12 +5497,12 @@ final: prev: lh-brackets = buildVimPlugin { pname = "lh-brackets"; - version = "2024-02-08"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "4899ead266d99e0b9749b9e44f6a33ea83384a7d"; - sha256 = "0bg8p4g0v3y7sikcwb1g2n3kr4rcafskg1if6gh1xnr1g0czbckw"; + rev = "e7852490097ed1bb2ea95fb08fd0fdc4d2a7ef20"; + sha256 = "1gg5hxss85bcsjrfqamiir571c8xqs03rqaiigfhbs7lhp2l7ffd"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; @@ -5725,12 +5749,12 @@ final: prev: lsp-overloads-nvim = buildVimPlugin { pname = "lsp-overloads.nvim"; - version = "2024-05-26"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "78f4cf53ff72a234d7903c1d41872c8b21c6007b"; - sha256 = "03791qzm3qv2gw176bwki4dmizjy3myzdm2c62y4hjafx4y9mn8d"; + rev = "93e11c9a01f81daa4a5644e772a7a77f53dc270f"; + sha256 = "1765fwsqxa8w6rznrhhrmxbxk8mhwxh540sllj9rfkx1nh5lszg9"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -5761,12 +5785,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2024-05-26"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "16de3b18c5f7b6230d89b8e64ce9a4801b6f8d08"; - sha256 = "1z39f3qagyhrm90hz4pilbqnbyncpxgzsx236yw9mdgfqni912ms"; + rev = "87701af045b3032515776abeb47eb8c2ddb5e679"; + sha256 = "0ik2q2jz4ldyql3z64zr5dyi8i6qja6xsczv966fkdmsckk7r1zh"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5880,12 +5904,12 @@ final: prev: luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-06-07"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "50fcf17db7c75af80e6b6109acfbfb4504768780"; - sha256 = "0aa5imzbfz50d7vpmxixqjri147x7w7883p8qm6dp2m1ygijrx30"; + rev = "ce0a05ab4e2839e1c48d072c5236cce846a387bc"; + sha256 = "17q4b9hlnj7cnijw8xcn0g3fk8q3c8smz6l125hlwzlak23b716d"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5929,12 +5953,12 @@ final: prev: lz-n = buildNeovimPlugin { pname = "lz.n"; - version = "2024-06-19"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "nvim-neorocks"; repo = "lz.n"; - rev = "ed1dfca4c69ad84558bace90740b3ea2dd6ac842"; - sha256 = "122rx7khasj0liwrw07m4x7ysq86342b3q5fzg0gdkln7nn5pv4n"; + rev = "4c790ba2c3789f580aa019712bbe3112f85e73a0"; + sha256 = "0vwpfagpm7vik1cg4cwx0r00fqvbq2id8b78wzrr090xp2a2cz50"; }; meta.homepage = "https://github.com/nvim-neorocks/lz.n/"; }; @@ -5977,12 +6001,12 @@ final: prev: markdown-nvim = buildVimPlugin { pname = "markdown.nvim"; - version = "2024-06-10"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "tadmccorkle"; repo = "markdown.nvim"; - rev = "d6dd17dd36fd8d83f5bf2fef6a9acc24ffa6ff9c"; - sha256 = "1i6ays4c4azx7fvfy4hm69psmafyvqf7q33a8692cj6q8zl5fvxd"; + rev = "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2"; + sha256 = "0p454caxkd8chg0v1m085vlmrmhkvhfwq625wgy9s8bzinja5rb0"; }; meta.homepage = "https://github.com/tadmccorkle/markdown.nvim/"; }; @@ -6011,6 +6035,18 @@ final: prev: meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; + markview-nvim = buildVimPlugin { + pname = "markview.nvim"; + version = "2024-06-28"; + src = fetchFromGitHub { + owner = "OXY2DEV"; + repo = "markview.nvim"; + rev = "f60219dce7283192d549f21847fcf8537bf6d260"; + sha256 = "E1lHSjbnOOIeieaFJ+INvxJHCbfVS3mwbQ6wrlKeGSQ="; + }; + meta.homepage = "https://github.com/OXY2DEV/markview.nvim"; + }; + mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; version = "2024-06-12"; @@ -6061,12 +6097,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2024-06-15"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "173bde5eea25e73c5ece9448e19c3e30b5b21ae1"; - sha256 = "0smlnk3d5dv33ww1k96f7mbyy6xs3ma179f86kifv08k1wn7n4xq"; + rev = "b5d0ff3ad37ba00cea3dc3dce0b0f555b481c6f4"; + sha256 = "1vlv9n8hy7lcjz3xa48pry9by41pfjv73vyjinyj91bjs7x4ln7p"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -6109,12 +6145,12 @@ final: prev: melange-nvim = buildVimPlugin { pname = "melange-nvim"; - version = "2024-05-29"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "savq"; repo = "melange-nvim"; - rev = "b76b906cd6ed3c3152a47924a8eb5dcb35b326d8"; - sha256 = "0xy98wlbdljcf08wzl4hndwadmswb3a4jmf0ynnrrkczg73pbq2b"; + rev = "f626d41b9110e6ab853538d8b939979a0f1adfeb"; + sha256 = "19xak308004015avjarqdrmwwwfkyam72kjav7g7v8pg27rqckzr"; }; meta.homepage = "https://github.com/savq/melange-nvim/"; }; @@ -6157,12 +6193,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-06-14"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "ebc8cb0c1f73ee6c53e0560957a37a2307a70f98"; - sha256 = "0jvrqs9fmn8m1h5wdnl981dpjyp4w9b5q09ypblg6dp1f817c0nf"; + rev = "b8c1d3b2f4cd637760babb8a33ad12fd5afe2ee2"; + sha256 = "0mwgyr0x21pp788k7020bb5hyj755vs7m72c7m0bh09c4f3z7aj9"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6193,12 +6229,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2024-06-14"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "e6179d25f7e696baa612aa35b951b5ca3f3e75b6"; - sha256 = "02mvgvdrq9p80gcgh668qajgc32pxhn5aahw0gkc40mc4f10lzlm"; + rev = "8065d69e73a2623203138bca9dc436df7784ef11"; + sha256 = "0gxzl1ly9cw9lqpxrrk4k28blrq4a7vcl7jl279zm981yvpbnba5"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -6253,12 +6289,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-06-01"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "47b9a56d4bc0f877ff9469910b9653c46d462db4"; - sha256 = "09sarlw6zniph9kajvmfvxy3sjn5r7g02i4dncv9q3ybasjgqya7"; + rev = "1a5360c59dc68230aac867fe262e4efc53f1b2d9"; + sha256 = "1ns9lq4bj8s2amwkj4kil3h3lkhgsf7wvyf3w9m6419svlxvzh7h"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -6301,12 +6337,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2024-04-12"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "b959ad0f38881e81e757208c6adfc9e6dc24dfc7"; - sha256 = "0x4v0bpahwqcrwqv5nc0hnfc0qyc21sgd996h5nksnxykrxvf462"; + rev = "782820896b1691ed664e4c24f1cd9793dcb33dfb"; + sha256 = "171aysqsyapw434xkibxv69p5fkwha4addkqfdssdm0wq9n9cm4q"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -6589,12 +6625,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-06-19"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "60f6dd6aa1006fa5c3ff4b7bf01586dcecbe9187"; - sha256 = "03hz05kpzrbwy2d9pdmi2yihg7svsh876fv3kk0276v9276hwi1s"; + rev = "94f1e5b81c440ec1fc7efde3c7f9448b7bab7776"; + sha256 = "0x6i732x7jxjry09fk2shn39winxgl58pjwd06v6incy1p33a9dk"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -6661,12 +6697,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-06-17"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "11dea1b67bb153cd5b4a2de348ceefa69508dfce"; - sha256 = "07d8kmn19hngl06ak2ch7p0mfjwlgyim0xkjfmnsdhxd0ksqdn49"; + rev = "e1bcfc87f3566fc43b875cc714ea348c8f88931a"; + sha256 = "1rvai4z77rv6i1p1iyy49mwl7l067a295izf3wflfkq15mhq2k8b"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6733,12 +6769,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-06-13"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "ebf75f57fa8dadd8747a678724b273b398143dc4"; - sha256 = "05zq8q88z14hd9y9ywp09kxjxpxfzb72yjm3gl7px8xxh18nqrds"; + rev = "99b32492b836b64a5ff4544d4c466496f0aec9bd"; + sha256 = "0hjbllib07aqzb531fb9lflid3p09ny9bii8ds4fnpvkbic2wl48"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6805,12 +6841,12 @@ final: prev: neotest = buildNeovimPlugin { pname = "neotest"; - version = "2024-06-09"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "f30bab1faef13d47f3905e065215c96a42d075ad"; - sha256 = "04jsfxq9xs751wspqbi850bwykyzf0d4fw4ar5gqwij34zja19h7"; + rev = "26ed90509c377d10dbdebd25b7094a886323b32b"; + sha256 = "1b0pw875qnisxxraxwwsb4r6b6234a3na1vhs6r1hz6h5xrxzqmf"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -6866,12 +6902,12 @@ final: prev: neotest-elixir = buildVimPlugin { pname = "neotest-elixir"; - version = "2023-11-26"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "jfpedroza"; repo = "neotest-elixir"; - rev = "3117ca5442c02998847131c39551b76a6ceac9d7"; - sha256 = "1apbn6awihmjxqj465h0aik6nhd2lh00k7vbpl3mrrh9pxifyglr"; + rev = "c5067bcc3ec6a0bba7b5694fa15aeb17f16aeb3c"; + sha256 = "08pxv39pc9w94pqf86i7r835zlvd584l5j7jznq1nf1yc1ms25ip"; fetchSubmodules = true; }; meta.homepage = "https://github.com/jfpedroza/neotest-elixir/"; @@ -6928,24 +6964,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-06-16"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "0481d2c79564d6658caa1a4962bdfba3a608b5d1"; - sha256 = "142j5s3fcyggkrx92w8k6d3vas2m7580k9vd6ca913adby5ys2cn"; + rev = "f5614c9cf7a056f791565183f216401b28438818"; + sha256 = "0jli4pp124ils5kxrzdba7w49jsw823rqvkjib382xa2mp5n9f3i"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-06-15"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "7b9e0419bd92f641f730e31a4236074e53a5ac99"; - sha256 = "1f9a0aa4q6c4armj9fjmbkpk2j2svgiyf1mlmq46g0mqcmhnnbbh"; + rev = "ce8b10e4e4f670b6f79224139053679864fa810b"; + sha256 = "1hbfdv8aw4bv8a69jscr7kynd0ik0506546qsvd39mh7mr257mc1"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -7084,12 +7120,12 @@ final: prev: neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; - version = "2024-04-17"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "6965a714793d9d156dadbe734c99b3a307f65c61"; - sha256 = "0dxcnkvhdlxlxa6vrjfgn5pfi3a2g78c3xz13sxggw559wmzp9lr"; + rev = "353364aa05b94b09409cbef21b79c97c5564e2ce"; + sha256 = "1sv5i68pc24zl1gbqa94gy5wccaii2glx0bgkincpyhfycf2ydz0"; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; @@ -7108,12 +7144,12 @@ final: prev: neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "2024-06-08"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "123dda90019215646700bfec70f178ad95820545"; - sha256 = "0g0nyasr7df7wsbfkcvkpwxyhsl93iq35q46fick8iq3mdf0mjl4"; + rev = "d64a8b7e8730095ff634e6586584e8543043e986"; + sha256 = "0ikam4lmbi1541sy8sqbc4psblhizf40mspnwcag6q4w7g5pswh4"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -7228,12 +7264,12 @@ final: prev: nfnl = buildVimPlugin { pname = "nfnl"; - version = "2024-05-30"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "7614d666eaea1674dc96184e0e3c1a8bc2c4a3b2"; - sha256 = "1wz7fwcycz6xwwnw0nqsgkxz4dgmabz8rr6574yvbvyjg3blr7s0"; + rev = "9f8fb93c70e9d759d849b45859f017b348618299"; + sha256 = "03bhns205gd4hwwzcs094fczxwf9bzixn15lixw257579s1bh6hn"; }; meta.homepage = "https://github.com/Olical/nfnl/"; }; @@ -7252,12 +7288,12 @@ final: prev: night-owl-nvim = buildVimPlugin { pname = "night-owl.nvim"; - version = "2024-05-28"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "oxfist"; repo = "night-owl.nvim"; - rev = "9e95ff4bb6fa0e7dfd40472b9dde19fd0b75aa0e"; - sha256 = "1bps5cp7ahnhw7z6yrpv9fyxj7jlgxmzfjk949lrw3ryz6kgzry8"; + rev = "131641a516085c5b3cacc8022581902e9f2f14af"; + sha256 = "1ni6213wixgfbg8cq2w4p0nfl5rhmrwvxhyifmvwf4x37lkhsx4l"; }; meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; }; @@ -7312,12 +7348,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-06-19"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "4c068cf7a74d77cc405aedda875f3174f7eb9143"; - sha256 = "1q5wrryf5xp13lljjgm95aavn4s2cq0p52pbxcxykm97vm1zi9n7"; + rev = "6994cf0476f1d834fb9d0b5f454b7efe650e1d24"; + sha256 = "1j16ih24yypqcsd1grd5ymczzkqd26lppdl2989mc3wwycvbvdz2"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7348,12 +7384,12 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2024-05-26"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "741ad26c4acc45f2164a3933f7825b0e555b724d"; - sha256 = "04yfraal84zin7gvhfrx9v5359m3s3gvrxydw7xp5rz2rvsraqn3"; + rev = "ecc584150f5c8a2a82f2e1d43201df0f65c63d0e"; + sha256 = "1rxj6sq1v0j0q4cj4js2xb3c36m38xgiqsr6bgyc6ri7xz8zxayx"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -7372,24 +7408,24 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-06-18"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "88ac36864b5976a64b14a8f156c616f41b32f228"; - sha256 = "0qkm5g6mfaydgbsgkkng79j3zm0nfbnim30ibjpgby74fjpmzp09"; + rev = "03c6a75661e68012e30b0ed81f050358b1e2233c"; + sha256 = "0164qmf3kw0nml1sy32yl0lzkbi4g9j3vvpb1lwh8hjz7nvhpp8k"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-06-14"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "cc0a3c45047e3daf85d07c1571d65476cfce6480"; - sha256 = "1aa2dcrrwmbh8dh8vccwz2jdwyfsy10jagvqbpmh7ax1mnmphnqv"; + rev = "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91"; + sha256 = "0975xwpagsjbl1ahkdma12fppjg7k5ami0mzjynzig000f024pq9"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7444,12 +7480,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2024-06-05"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "322978c734866996274467de084a95e4f9b5e0b1"; - sha256 = "1l1gzpza26pybg6fcjif5ypqmxl490wv82my13bwkc1v83a5x4xm"; + rev = "61574ce6e60c815b0a0c4b5655b8486ba58089a1"; + sha256 = "1vllq6lkk7karc3n8h9wj2ax6sc99h26r96h18lbvi0nsy98ss53"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -7480,12 +7516,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-06-06"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "164e8cc7fcb9006a1edd4ddfc98bf8c7f4fe2e0d"; - sha256 = "1qk0m5z5jqv875q96mavmbnpd8570d9xzr928izj807660r3b0p3"; + rev = "7b73d1111cfb41f980d25c800d86d43ad802d8b8"; + sha256 = "05llkd2l1jwcjw7cd573b2dr03zb6dgwjf6xf0a5qrj6vh9chgay"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7744,12 +7780,12 @@ final: prev: nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2024-06-03"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "ae0225d0d4a46e18e6057ab3701ef87bbbd6aaad"; - sha256 = "1g0gn0rpdmypjay0dwd9iw64qvm63g78ig839ys4z2mnwqx6vsx2"; + rev = "d777c2b32ed39f61209c09bede28d7491621a631"; + sha256 = "1fsfnir1af847hmxgc6ca3hxqpnik9dv1s7ag28kzmvy0wj8clav"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; @@ -7768,12 +7804,12 @@ final: prev: nvim-dap-virtual-text = buildVimPlugin { pname = "nvim-dap-virtual-text"; - version = "2024-05-22"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "d7c695ea39542f6da94ee4d66176f5d660ab0a77"; - sha256 = "1hqnwq2hy7qn62qxp204c9mx6japjhd6q8sfac0kfvzgw49v3khi"; + rev = "484995d573c0f0563f6a66ebdd6c67b649489615"; + sha256 = "0p889jkyia04l4nhndmg4yl88mc10hf0fzgyyqj08ybzws5z9zgr"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -7852,12 +7888,12 @@ final: prev: nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-06-19"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "6077a6376f9a15eaf3d60a12caca57adb59028b5"; - sha256 = "1lm9mjjqwgf4cqgh4xkq9kfbx9bjz6p68dfimixm3rlsvrxz2wai"; + rev = "07ea6edb98b63cb625ab4230d0479b5ccb20ebb9"; + sha256 = "049hibr0q6if429908v49gxijwpxghjph0981n70dzn2vk0ddkz0"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; @@ -7876,12 +7912,12 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2024-06-05"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "30f305d57d658615cd827146f5e56db8b6833475"; - sha256 = "0znm5am5xpz1i88fz0q6pjnvm5d41rban8wxkrxm5cyjxx1nrb3m"; + rev = "a8f6952cb1ff7bde864a34c502f1a42c360a6662"; + sha256 = "1ib95qqgk0vvn9yfag8sh0dxrl4nmxy8q87ikn50ivm7nmf2bl54"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; @@ -8007,12 +8043,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-06-07"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "941fa1220a61797a51f3af9ec6b7d74c8c7367ce"; - sha256 = "152j681hplib3vyizx1lcnkr3d411a4gi743716h759x0g20bmic"; + rev = "efc6fc83f0772283e064c53a8f9fb5645bde0bc0"; + sha256 = "1garyyavgg2xfdkw8s9jjq4p5mv5i6m54m8dszdhvkad5ni1zlvb"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -8043,12 +8079,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-06-18"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "5c33bf1f708ac8cb839469e1a03d45987fec305c"; - sha256 = "1mdqckjmk1hdxgipa2qwncwmbv6ad8mi5cqisinkz7610k55sxpm"; + rev = "cf97d2485fc3f6d4df1b79a3ea183e24c272215e"; + sha256 = "1vs6cwa07a18p1c8q4z8gfqp7iki4qwdk10ahyv4sfgk0s1wdk9j"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -8307,12 +8343,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-06-13"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "fd334e5ad0c616987d1b9114890a59c97165cf83"; - sha256 = "1s8dr79mnqw2ii54myi43fy3knd2i28c2k5g59fln2m8g90j21lg"; + rev = "965f10569d033c4e704327ef9a22d306ac20847a"; + sha256 = "0zc5dd65bcm85nwvlc9vpfzn0n7pn1xl80lm2f76nn1s4hzzxzzf"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -8379,12 +8415,12 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2024-06-04"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "ec67d4b5370094b923dfcf6b09b39142f2964861"; - sha256 = "0b99x2cc18bny35l2njlfd6cv9ynxhbmlkbpkg2ikp0k3138jga3"; + rev = "49fae98ef2bfa8342522b337892992e3495065d5"; + sha256 = "027jfxxmccfjyn2g9pzsyrx9ls9lg8fg28rac8bqrwa95v5z5dgn"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -8403,12 +8439,12 @@ final: prev: nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2024-06-09"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "b36bf49d097a09781ad6ac0cfea28b40b74570a3"; - sha256 = "1z2drdxrs058xdjdr8khf1gm7l7pmvvysxp9ynp54dz5wlvspbxv"; + rev = "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f"; + sha256 = "1d5ffrsl1ryiq8nzxx7k69gpin6zs2ys4zc5pg47qcpazx7my8qc"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -8451,36 +8487,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-06-09"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "2086e564c4d23fea714e8a6d63b881e551af2f41"; - sha256 = "0scmn05y9ya1lwz7ad7519bq1n3ha8hs7i28kgw83r5syp0bg8zc"; + rev = "8b2c5c678be4b49dff6a2df794877000113fd77b"; + sha256 = "160sk29hg0xqg02q26gi27h9si9ara4ljazqrd280igvh32xpyj5"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-06-19"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "66ae8748fd4e8550c8b17cf115c9739aea1e4067"; - sha256 = "0hll69cjhgjnbyh6xqvk9xk6pr8fna9h1rj4nz3fkmq57iwzs812"; + rev = "6cd4ce6cab184e8787f164a182954534221f2af2"; + sha256 = "04r0gd33fkxchhnd2cdfln6g0zqn8nkad1ik5f4v06k6mk3fy729"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-06-02"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "5efba33af0f39942e426340da7bc15d7dec16474"; - sha256 = "0dbw3d3d30yg79vp7008yi93n9y258imvr1baydpni571z8yinl6"; + rev = "cc908326c93473041d44398d5ebfa2bb4169d649"; + sha256 = "0gy1d7wmqvij8g5xrh5w1w5mr74sz0f4x704526wf8a40b7hpqz8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -8535,36 +8571,36 @@ final: prev: nvim-treesitter-textsubjects = buildVimPlugin { pname = "nvim-treesitter-textsubjects"; - version = "2024-05-12"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-textsubjects"; - rev = "1428108f18ce9d8cc4481dcedebeeb490eabf395"; - sha256 = "1m73vkz8cg8qqzh9aavprhg9vpzl1sw88aq6h8sb853lgw5aa5wn"; + rev = "a8d2844bba925d9450ef7ab215f3b054028288ca"; + sha256 = "063xfbmwzrazvi21s1b01lqzyq67m7r8pnr3wyrdsxl2x8rcvjkx"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-textsubjects/"; }; nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; - version = "2024-06-11"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "06fe07d7523ba8c755fac7c913fceba43b1720ee"; - sha256 = "1k23jy33abcxc84qgkw68mzbcl8fxpvg8p5phh5pgvp5n32aspbz"; + rev = "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1"; + sha256 = "0nyrbgr0dl85i6ycyjlrzihfqz5g2s7arndhd6vlgf5xg2yj0gdy"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2024-05-22"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "cb064386e667def1d241317deed9fd1b38f0dc2e"; - sha256 = "13xyrzp9gfbnrxp6v7xxpiwyk18rnw5pn3vw01f0xvnpfsqfz3w4"; + rev = "2b7dcf6aab0947b9c4195f1d8aa592cdcd944ffe"; + sha256 = "163nj4y192ik63a4c3d8z6qpxyic6xflifm5nnhq0plzws4hqnc1"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -8679,12 +8715,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-06-17"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "7e087da48bd88fb3a6c6229a97713ac35694337a"; - sha256 = "1dgqm7qjnkgz9wm8fv5j6q2f46ip9hac1csbwxv7lqavi1xw9p0l"; + rev = "e170641143704068233ba1d301e75684b67fc07c"; + sha256 = "06z445zphqz7icz65gajpj17c4g133kivnv59jw73d31rvja3jzj"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8715,24 +8751,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-06-15"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "1f0029d5283443bad9a818fd7d9db253404bf8aa"; - sha256 = "1il6jy83d56lxlgxyklvl76dxk7iikq2941jl6ihbf0v5lbig472"; + rev = "7731ca4e31b32c176a383642ffcd7d593ac17774"; + sha256 = "1gfwplw9zfxlx04b9sa0ljya1900qkdd992sn771ifnmkc4zhl6f"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-06-16"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "64a3a555b40d96faae488ed6cf5d0f8b38520891"; - sha256 = "1wmg72r6ydmrgiy4c8jv8fpgkf2wwxpyq7zv4a2bx4imhly4zccx"; + rev = "b15e4c1e647b9ddbb75a31caeb720b3b3ce4db54"; + sha256 = "1aw3ddn2cg9h0z5cxmvpyjs29crhr4sb1yfs0481m0sprfqi6ywj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8764,12 +8800,12 @@ final: prev: omnisharp-extended-lsp-nvim = buildVimPlugin { pname = "omnisharp-extended-lsp.nvim"; - version = "2024-05-22"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "Hoffs"; repo = "omnisharp-extended-lsp.nvim"; - rev = "f872cfa38b30a34e179fb028f68588d09bd44114"; - sha256 = "1xlnfr9vdvxhz09njz2lgyiww10fcg79vzm372zqw99dcqr9jm4p"; + rev = "aad7bf06b4ca0de816b919d475a75b30f5f62b61"; + sha256 = "0bjsraykq6xjzydrki7fwm3yxfvkqd46qqc0vv3yvy9hdxll4miz"; }; meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; }; @@ -8824,12 +8860,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-06-08"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "308527d45efb9f2a0bd4b4004c1c02023557ed6b"; - sha256 = "0s0wm06ymagrax1lngz81p7bhk2f9k2ivxy6vx2a7fwam8yayrfs"; + rev = "69256ee61f29727760c3d28020baf1e7b951fa12"; + sha256 = "1xy3kz5ng0lnygvgw4wb6rs40hn7j217pfv5qsdkl89jrlq9cjsf"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8908,12 +8944,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-06-14"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "cc51c1914e3f0bf20bd543a7176df5bab12ec247"; - sha256 = "1pr5fh2pr3awmxvaw0n811165nf9p3n0pp2cg4f8qs15y6ncbkq7"; + rev = "7a256b5a87e8c81a034661e9904c739f89961323"; + sha256 = "096ya9zqqhdpg25xwvdn05zw0q40nk27byprfr0bq1g6q71x3535"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8932,12 +8968,12 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-06-09"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "cbb1be0586eae18cbea38ada46af428d2bebf81a"; - sha256 = "085lx5z7abbn7rq23pma5xmymzgjajp0slg0g42wafxpn7rby9kv"; + rev = "e8787988f2f51dc4678aa13c4553613fff0132b5"; + sha256 = "0a967hspxg2r8rzj02m8l0n8b6y47gg9p56jm9m5z9jgzn6s5039"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; @@ -8956,12 +8992,12 @@ final: prev: overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-06-14"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "d78fa84c06d37b1eb3bd42b4b5467c7476e74589"; - sha256 = "130y8gjbyr3bg9l24s0iiiv40wpqq48axzvbjpraalca181zkhcd"; + rev = "8bda5b073de30533e04f61b661cb7c22d7fa4f23"; + sha256 = "03i9lvsr01ml76l1m0dzvbgwk9k25lajmgxazqn5i282s2d6bb35"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -9089,12 +9125,12 @@ final: prev: persisted-nvim = buildVimPlugin { pname = "persisted.nvim"; - version = "2024-06-15"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "olimorris"; repo = "persisted.nvim"; - rev = "0a9eebf5cc92b1113a382a660ee73f21ffd62ae7"; - sha256 = "0gyacxix6m9wpzlm6a5p1s2aa9916750fd8chgkga8m3q34bdq9a"; + rev = "4df3f8a03690add1bc2f9a79b31e1c43f5e0dd05"; + sha256 = "1l2a2ilavshxczjwb2rf405zzladsraawby7z1gflw1m3g9qgiq1"; }; meta.homepage = "https://github.com/olimorris/persisted.nvim/"; }; @@ -9173,12 +9209,12 @@ final: prev: plantuml-syntax = buildVimPlugin { pname = "plantuml-syntax"; - version = "2024-05-10"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "44054d6d2cbcf01a064858faa3364cd30d38057d"; - sha256 = "0kwk96y6cn7l7w151438sdjflfc6c6irysg00b1q4h1f4x3fcfvq"; + rev = "1592944444513c208ab5a087397ba987932af750"; + sha256 = "0j45p1f8kxgmbw8kmcvvyby082vk8dgyb2q7vscsy8zvmqszcm24"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -9256,6 +9292,18 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; }; + precognition-nvim = buildVimPlugin { + pname = "precognition.nvim"; + version = "2024-06-25"; + src = fetchFromGitHub { + owner = "tris203"; + repo = "precognition.nvim"; + rev = "2a566f03eb06859298eff837f3a6686dfa5304a5"; + sha256 = "XLcyRB4ow5nPoQ0S29bx0utV9Z/wogg7c3rozYSqlWE="; + }; + meta.homepage = "https://github.com/tris203/precognition.nvim"; + }; + presence-nvim = buildVimPlugin { pname = "presence.nvim"; version = "2023-01-29"; @@ -9415,12 +9463,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2024-03-06"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "67e09027b5d8bd948907734fc6fb15028ffdcd28"; - sha256 = "07p45qmxnc10kfn9syfqv5v5jm75rd8bs9gv90a246dxis4p0515"; + rev = "09fabb62d414e56ee3245c558aaedbdc662b6493"; + sha256 = "005lf0iq0gfkxvknkw727h516kd4ghd5nc9cayxayjlpvr65gnm3"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -9570,12 +9618,12 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2024-06-15"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "e6b10b2346bd7e469a5f17099775ad906da153ae"; - sha256 = "1m0ah5f1w18g7y78ra78yczzpdb4giwk9hsig3379f26xz5fknp2"; + rev = "c9c1a0995b7d9a534f3b9a4df7fd55240127eeb4"; + sha256 = "1fajahgd20cn75xaz4qq0dhvqr2rqr788l874n9qvk4mq4qqvnj2"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -9630,12 +9678,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-06-10"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "c7944769dc489b9e4bc493e40820c2818eab2569"; - sha256 = "14afbxl60k2197zl8vs4rskb0rs09d00kvnr0zsnvzydv5gf38pn"; + rev = "e7843c55f9df6a9db9f97dac180035c6ff895a90"; + sha256 = "02iksjxamy83zix1gr495bvigvyzpv466wz6529nydhwkv8vjnbd"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -9750,12 +9798,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2024-06-18"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "14a5a4bdf23d1971d1a6386b73b89e57590a5e7d"; - sha256 = "098zlwlrdw5icvns5a7qp4bl2ly1imv2fm3981i9wqdvvvzqmn3k"; + rev = "af4de6a35d128ce71c75a9a7846bf089aea76f50"; + sha256 = "14hxzaxsasrfridhkpsa8wva9ych633n268mlipsmibyq56i5isv"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9991,12 +10039,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-06-15"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "3d9fa9e4b31c30d6b328f2447a4dc7dceffbc2ea"; - sha256 = "1pvi03f98f6lys6l3jlra9l95dpavdc9y8ghl91mlwvlglrnwjrk"; + rev = "e186518f9d7eb4b1e43fbbe0c52bf323637194d0"; + sha256 = "01qfr9qiq39qg4d4a3wv2i6i85bwlr77l7h54xfsa3n98h93vlhh"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -10075,12 +10123,12 @@ final: prev: sonokai = buildVimPlugin { pname = "sonokai"; - version = "2024-06-03"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "a90d437f1f4e48825150065987d175e2a45fa39e"; - sha256 = "0w7y53mdpb7xi26bm9xrhsszxngidcxfpwv7z9h5bdn1x53sb8i2"; + rev = "16fa31a410183ce945e58d834a74f161a2dce5aa"; + sha256 = "0sa82fcibwwp3dvakqd9wa0lkgwgi0hr89ffal2y3c37lslzvm4s"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -10582,12 +10630,12 @@ final: prev: tabular = buildVimPlugin { pname = "tabular"; - version = "2019-02-19"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "godlygeek"; repo = "tabular"; - rev = "339091ac4dd1f17e225fe7d57b48aff55f99b23a"; - sha256 = "0jq91770wsp2waw7pywxjqx59v0vg54gfzirgcd85pg61w22bfla"; + rev = "12437cd1b53488e24936ec4b091c9324cafee311"; + sha256 = "1cnh21yhcn2f4fajdr2b6hrclnhf1sz4abra4nw7b5yk1mvfjq5a"; }; meta.homepage = "https://github.com/godlygeek/tabular/"; }; @@ -10751,24 +10799,24 @@ final: prev: telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-06-19"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "78570e237c8b2494dd74ffe196fbd01d0c9e5460"; - sha256 = "1vsfsi39i8f8x6cbsrq491s54p1gh8fh3a0vjgik7x07a9i21l6h"; + rev = "f3f93253797714aecfb95ef7e25f8ff7693430b9"; + sha256 = "1kmikgn75i93ajbi9v9rdm2v2z4gnsslfq9acy2h7lrzng4z9gav"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; telescope-fzf-native-nvim = buildVimPlugin { pname = "telescope-fzf-native.nvim"; - version = "2024-03-05"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "9ef21b2e6bb6ebeaf349a0781745549bbb870d27"; - sha256 = "0lvykmaarl5nd3iaphp8jgnxg6cly5p6ignd3i1450rpbdp1w9xg"; + rev = "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b"; + sha256 = "0h741m7rcm5kl0mq9kkzw6za2h53chavpkai1qp433plaxzlyj0q"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -10836,12 +10884,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-06-03"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "da337930d3998fad976331155e789f8785543e68"; - sha256 = "0fhic35pnalxnlqnmq4xs4k4gcp7cs8j724chd0i3pvmbixk8b8y"; + rev = "d2c8fee183d6b414128acf376f5c8d3c250ae225"; + sha256 = "1awha1dscjjxf10nha3i8mmmv44m1b99k77ap9p33s4whrmxfd2h"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -10932,12 +10980,12 @@ final: prev: telescope-undo-nvim = buildVimPlugin { pname = "telescope-undo.nvim"; - version = "2024-05-01"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "debugloop"; repo = "telescope-undo.nvim"; - rev = "95b61c01ea3a4c9e8747731148e905bbcf0ccaee"; - sha256 = "17imd6f1qykxv4wk67ihj7ir07yvcmrr0cqvidv1as3k77riclxb"; + rev = "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a"; + sha256 = "1xz2fccjp1rv7l0xzkczz4z2w32q8slc9lc6rm5219s1hl7k4nam"; }; meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; @@ -10968,12 +11016,12 @@ final: prev: telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; - version = "2024-05-08"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "natecraddock"; repo = "telescope-zf-native.nvim"; - rev = "242ee15047e3400351982ef162301a898ec5cdda"; - sha256 = "1kdjqi046nr052q9m50814k2df0nnmylgk8lcragc2z8sdnj5f73"; + rev = "3f565ad0c0643d6592b5c3fc44b09b4fb2badc21"; + sha256 = "0xcg0wj45ijkgrpgv6vr4qx2rpbm6v94sdjcwjv3ghh16hh1wc3n"; fetchSubmodules = true; }; meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; @@ -10993,12 +11041,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-06-15"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "c392f1b78eaaf870ca584bd698e78076ed301b26"; - sha256 = "14k0z9k0d8krs50filg8d38fkcpxv4gy9lilgfj2wrvssd6c9vqy"; + rev = "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a"; + sha256 = "1ysbn67rlf2p63pp8155198a5v0hv5cn2bbhdjz9r5255y5f19sk"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -11041,12 +11089,12 @@ final: prev: term-edit-nvim = buildVimPlugin { pname = "term-edit.nvim"; - version = "2023-12-03"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "chomosuke"; repo = "term-edit.nvim"; - rev = "e04f69d5828c6e6a4d81c34f75f18762fad50372"; - sha256 = "1kh70ivd6p9f3xsf09iwyy94gvkzprv08ln52sh44n90s1yr4ql4"; + rev = "32e802c6ea08304db6cbbf44e6ca9805b8c2ad51"; + sha256 = "08bawjw45fmv86b81wghczjk3km00fbxc10ia1hg3q05q4ky724w"; }; meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; @@ -11246,24 +11294,24 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2024-05-19"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "fee58a0473fd92b28c34f8f724e4918b15ba30a3"; - sha256 = "1iavy1182n0fwiv6rr6i9lb2kyqbw1fg49fy782nsbmkr25b7kc7"; + rev = "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d"; + sha256 = "12mcsq0dbzhvwq5sq5ijq9cdjxgcr3c72r6zhlgr0pcvarchl7s9"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-06-13"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "81c867c5f638597a82c82094dcb90ed42444dabc"; - sha256 = "0bq6yjzv7sza4f2mp5x7bv19pg0mj5j6xh3crz4q20l16f2i3hag"; + rev = "c8177ab6fe216f121cc0c4f59e7f1ce59670ce41"; + sha256 = "00sm68wswk2gc2sgaww6x9klbdiz69sx18a9zm9r2if41ymabyzc"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -11355,12 +11403,12 @@ final: prev: trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2024-06-14"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "58a3acfc6d8d819324dab4c87068596319032e64"; - sha256 = "0vs7s7byz80mdww86icvgk7ksvbbgm67afiw8vn19ghf2hr78s8r"; + rev = "e5d0e04121c662ce29190a57dd03655d43c59d44"; + sha256 = "1mqdsy0ainbq7rrr5jf1skw6akyr222krgajawzxbzx696hj46l0"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -11439,12 +11487,12 @@ final: prev: typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2024-06-18"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "3f942ec187523d1d82f813106ceea9be9dac5287"; - sha256 = "0yr8vmfq6rm7xd39jig1k6fjqhzb7pi0x9iy9mv5vvixj4drz21i"; + rev = "5da4d695d66f676eb6ea766b946e86f93baaafe7"; + sha256 = "0pbk9svffxky1yrl7r7dlylj8iqadbs5zn5iz24fglsv1c72ldjk"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; }; @@ -11475,12 +11523,12 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2024-04-18"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "d9a7650e76c85f8ba437e056d08dd43b01b8bfd6"; - sha256 = "1l4mq2m8s7kav6hpq6nay4xyy2jvq6jbblyy100yfb9nrzkpggpc"; + rev = "4d18ced62599ffe5b3c0e5e49566d5456121bc02"; + sha256 = "011kbs2fqg2bp8nb17ppgv92x89dlxw5sjn5y303qg13xb7f9s32"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -11535,12 +11583,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-06-18"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "e354912fe85c39ae0b148562ddf31aa622e24638"; - sha256 = "1k17nkcdx5xlsw2r6izsyh1fjjfa9mj1v77yd00wznibczd9jnkq"; + rev = "a74d4e8cb9cd860ebd79e348f8012f57625e2239"; + sha256 = "0m8dc3lixww9x9zasxf2n6g00jimqx6mzlszmggmawhj52sg76gj"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11631,12 +11679,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-05-04"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "41b6887ff6589228c7d4f213259d8e274b0f9ced"; - sha256 = "01whpq420w2ki00wpiz1dwbddxwzyq485rrw8mxbbsxsgq8plzfw"; + rev = "225c0552f55b443340eaf5505f6bee3b83fad54a"; + sha256 = "1xbiq6n1p8j8sh0yx14nxynsz26rll2ax5hwrcjc6g8ahgj38sz8"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -12699,24 +12747,24 @@ final: prev: vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2024-05-15"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "5d5ad196fcde223509d7dabbade0148f7884c5e3"; - sha256 = "146zgn6cgzk1m9r09v3sdk3vzaan80jwq1zf0fskxk1c33jg1zpm"; + rev = "8c9051c1cfc73fcf5bfe9a84db7097e4f7c0180d"; + sha256 = "0v7djs9q69aglh1gpvynbzcvaxf5fk2jh4kx9ssmwlh2070qqk8b"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-05-27"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "0dc68d9225a70d42f8645049482e090c1a8dce25"; - sha256 = "1wmx9wrcffik5b73q9g9gdhm4h84h62s5acwz9rxzwf24amdg1y3"; + rev = "2527310098e7458488e61a528614da142aa2dc42"; + sha256 = "15zjqzpap035g29f0rf0yw9017r6aapv8w351ikaivfdp05ypdbr"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -12939,12 +12987,12 @@ final: prev: vim-elixir = buildVimPlugin { pname = "vim-elixir"; - version = "2022-06-25"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "6dd03f87d825bf0a9f8611eb54076c7952d4f15c"; - sha256 = "0car62bg681al01bsf7k783m2927shdl5xjl2jlwry54l44b8hry"; + rev = "c23000a030bf14f721d10c0d74e5f8721ac2f9cd"; + sha256 = "1zv3xy3p0315nwnliyr06p03ghpmygf5af5n6psrz57m7czlb2s7"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -13263,12 +13311,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-06-12"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "64d6cafb9dcbacce18c26d7daf617ebb96b273f3"; - sha256 = "1ddab7xflb08gy168042k8w35z84hdvrbz5kx37v96skayq30rni"; + rev = "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe"; + sha256 = "0g3bx7jnyra8ia11k7bqv0j41pwkbdz7bxzffxn20dyc69vkahxz"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -13419,12 +13467,12 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2024-06-11"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "665ef24144b748b842a0a27c237e63f3447f901a"; - sha256 = "1yh9phdrax4b5v9bb37n8bzxbi6a8ca422c90f73r9cwgvfx4i2v"; + rev = "a64d097a1af1772c24d13f34529b9be2a34b7721"; + sha256 = "13g79hgfqaismmd74751v3c5nhv8dmmrv5qpqbx7ghh3zd7h65kv"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -13479,12 +13527,12 @@ final: prev: vim-gruvbox8 = buildVimPlugin { pname = "vim-gruvbox8"; - version = "2024-01-24"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "d1cf31e5215ad6f5544d9e631383aef4b6c35cb7"; - sha256 = "1bih86rm14788b73dkpfzv2ahrca3vxahd5pc39lx122ma31l639"; + rev = "008b7773e5f2cba625a5fcc5acc543b28b19cd26"; + sha256 = "0qligdiaxa7liikgm4hpda8i51y1dyzd1xq7c2kwk4ysxadlvk5k"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; @@ -14021,12 +14069,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-06-17"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "5ad2c6b625d40d929d58cddeca9c459d5f380755"; - sha256 = "0bmm3z4njnajv1qzqam9i9lfsaxfw8n792wzdyg7yklp534zaxxn"; + rev = "c771fb5f00fd219833600c8164e6befe3c163b9a"; + sha256 = "0jlyy64m6zwvjs3w61vp2zv9rwdds1g3pk4wknvq493fcyxc59wa"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -14249,12 +14297,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2024-02-25"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "f7ccf006df1aefd327c0e2c55cc8632a2db577c1"; - sha256 = "11hnym6gzvss1pwjxqsbg4f1h56hsnaypl35bd084lxhim7fz6zl"; + rev = "a8f244a4e9527992acd89c578933ad1d3940d276"; + sha256 = "1xxgyawfr3lw5qqgkalajmnanz4n1dmbw1fyv362b72jg7h19fh5"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -15150,12 +15198,12 @@ final: prev: vim-projectionist = buildVimPlugin { pname = "vim-projectionist"; - version = "2024-03-15"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "729f3630a4c19e52e1fd825802d2a1659daeaf48"; - sha256 = "07mg6m47x9ab6awlc1kviahgzmfdxm1ykvnqrlf81msa5gb4a36k"; + rev = "3736bd4a5f23b30821cbb892385bb1f1b0088cfc"; + sha256 = "0q5jly140pjf9z6cc2n8g833glwpal07lrvkcq9ay3gn9pznpjwy"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -15318,12 +15366,12 @@ final: prev: vim-rails = buildVimPlugin { pname = "vim-rails"; - version = "2024-04-12"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "8972461e64c7c4bf049f2f86ea1bc571e8077b55"; - sha256 = "08lzlk2lhfcyp45sk90h3j6diwz78c8hx0dm1wb9fykmiiipsr0c"; + rev = "2fba7907f585819a8653f0bc7dd7f437a822d9c6"; + sha256 = "0a2m0mszy2n8xi1c47a7w0kmrnxpzfirxnzjghkdm5nc2fn3rxgn"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -15366,12 +15414,12 @@ final: prev: vim-rooter = buildVimPlugin { pname = "vim-rooter"; - version = "2024-04-23"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "45e53f01e4e1c4a3ee20814de232162713aff578"; - sha256 = "12dqwhks52ng0hh98a1sbn5qjmwn77ch25h6n7kp1ffql6gjsadi"; + rev = "4a0df2f1b0f3d69e8f7e19afe464a7c3a7af89a2"; + sha256 = "07a5543ms7r129bb5d7iwhy4pdzy5ygz9w2gziczpcwj40b5932w"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -15738,12 +15786,12 @@ final: prev: vim-solarized8 = buildVimPlugin { pname = "vim-solarized8"; - version = "2024-01-24"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-solarized8"; - rev = "6178a07f442a1fe559673cef6ac2b7031ab21edb"; - sha256 = "0y0xhcd5p32sni889avjsbjm9g9afysfvfkihm763lj304rf7prs"; + rev = "c4fd8a45767dea23fe51816967cdb3c86436eaad"; + sha256 = "1673xf59xxh6npw85hzasdyxx7kbqp7hbkmyx77wc2id3la6s9x9"; }; meta.homepage = "https://github.com/lifepillar/vim-solarized8/"; }; @@ -15786,12 +15834,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2024-06-19"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "64b8125fdca0e67cfe7c415f133809a4d23eb8b5"; - sha256 = "01r9wz4sc7qlaibi2hhrymcgzrfjchif3cn9w1q71prbvchjhpnm"; + rev = "a4e55d1119689a16e659ce95b673f7174a615637"; + sha256 = "0iba20wlhqvhrsh4nfd2gfm2iwix2zz16f0izmkc2h4q741rp86n"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -16027,12 +16075,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-06-15"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "79c14672b0bfec6f92c626dc331326fdbed62b4f"; - sha256 = "0vbfnqggh2lwcpfx110phlasmdqq66fdjcgvanydj1vqpvfn8fsa"; + rev = "34aab77f7a63f20a623df45684156915f6182a55"; + sha256 = "0bvziqnnaimwrrjmz8k701ki4gdvlhvjkj4fxnb77ab8rc0sp13h"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -16351,12 +16399,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2024-04-26"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "b84a6d42c1c10678928b0bf8327f378c8bc8af5a"; - sha256 = "1sj8nfn2yd1bsfqqf9kqpivxhfjcq1zq111ls9m6xh98ccxwcj7d"; + rev = "525521677deb8401b62054bbbbc9b17f8486de3d"; + sha256 = "0i8n47y9xg1583908sa8lhkvz146ch65i9afcmgrsngjys1ihaqb"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -16772,12 +16820,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-06-13"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "8ed94566e6fe3f5b163131dc374d224d2d320db7"; - sha256 = "13na944xyy8cj6pck6af4p9hhrr3811pa43zmmj42bxrf5kpbqds"; + rev = "2dc2a5435809c13f6f4aa07964be4ef19a7864f5"; + sha256 = "1s3w4kbdvwvqmpv82hkdizcr28dyx61mwxfg0k6hkhnpr7fimz6a"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -16796,12 +16844,12 @@ final: prev: vimwiki = buildVimPlugin { pname = "vimwiki"; - version = "2024-03-16"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "69318e74c88ef7677e2496fd0a836446ceac61e8"; - sha256 = "0z7bh2zc5mxf5rdma160sdawm1czdqfhm6rq9lj1780g5snvc0ps"; + rev = "705ad1e0dded0e3b7ff5fac78547ab67c9d39bdf"; + sha256 = "0wv0lyfxd5dfgmj3j8qpf05014isrm1py9mrxkg6zh8gnbv7d72j"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -16868,12 +16916,12 @@ final: prev: vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-05-19"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "ff3926901d4160886f707a8a70b5c2e82979a7c4"; - sha256 = "0x8930yals2cwbyw4vssfhb39pvrwpq90ysh1aczcyivrajm24ir"; + rev = "46212834b32866ce45479f885ca82d2259044f46"; + sha256 = "0lp101ac8ylflvdngv2xmpl8v00djrw4ca6pbrbf5jdl0wm1fnmq"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -16952,12 +17000,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-06-17"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "da5f1e0a5acd70d4e44c54b4d6286fd8f97742ab"; - sha256 = "0aiy18yw2kkj1xb7ixlw86xlxpn1v1pqa19d05kr4jnbabdajcr4"; + rev = "e8cf7e92220fc1ed3c20c8744a511b917afba7b5"; + sha256 = "13fic83d631xxfaks2ncda3id5y8dy072sa56nkr9fr7yx9nbw6h"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -17143,6 +17191,18 @@ final: prev: meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; }; + yazi-nvim = buildVimPlugin { + pname = "yazi.nvim"; + version = "2024-06-29"; + src = fetchFromGitHub { + owner = "mikavilpas"; + repo = "yazi.nvim"; + rev = "05849f390175f2ba8fd277b224d4fd9e35455895"; + sha256 = "zj+lmxsOEW+YaCk5hb7u454gACUmqYPA/IeW6av4D7k="; + }; + meta.homepage = "https://github.com/DreamMaoMao/yazi.nvim"; + }; + yescapsquit-vim = buildVimPlugin { pname = "yescapsquit.vim"; version = "2022-08-31"; @@ -17253,12 +17313,12 @@ final: prev: zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2024-06-03"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - rev = "1f331d994d90f1dc93d023508951be437d19813e"; - sha256 = "0zq18axf849vv90nc5x3g2mr2wc6wphgwj3a8mmkr8q1rk16c9k4"; + rev = "15e24e96cb90889ebd12b5dbe800a958c716f520"; + sha256 = "1sjnwjv4spa2cn54mv2cndirypkzhm81zxjz0v7kb5pf39rlq03c"; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; }; @@ -17289,12 +17349,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-06-14"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "c0bea773a09e49e123136b099bce9ddc1bf395d2"; - sha256 = "15ccqv7r382rk8l50ims0a9m5kn4kzgd3bar5427w12skayp0d09"; + rev = "31fcfb02c47952d5c75aec893b93b2878abe5fbb"; + sha256 = "0n883l071d197xqfji5dj3qgi3dvk1v9vmr1fdr1gnc9fmcpa672"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -17325,24 +17385,24 @@ final: prev: embark-vim = buildVimPlugin { pname = "embark-vim"; - version = "2024-06-17"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "2ab955cb0b5eaf0b00cc5064234064f02822f458"; - sha256 = "0ncr3kf7s0j2ghr0321vajsfphs4cp710xxrwdhphfxdpzxjlsbw"; + rev = "dcc90e04ac9c9392bf32c1e5f701353d8c5290c7"; + sha256 = "0a5lb5a4c5c39nhwy6vyb2d8qkjpwxdmlff84m4z116q332rc9b1"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; gbprod-nord = buildVimPlugin { pname = "gbprod-nord"; - version = "2024-05-21"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "gbprod"; repo = "nord.nvim"; - rev = "c707723cf0c0f19a409a6190209d51d6ec057943"; - sha256 = "14d1l8a6g0fflkqs2ks2fgawxl1qqhx36izxvz5yacz1yqz63dnb"; + rev = "f3e3ba2b47b57fc501b096a38b37bfc12f22f298"; + sha256 = "1ph3g127qynf797vnlq5kramkslj062bjzhpnxcsr9vjsn5a9x78"; }; meta.homepage = "https://github.com/gbprod/nord.nvim/"; }; @@ -17385,12 +17445,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-06-19"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "b20ee4855bd3cb9fbe0615cf0e27bbb8b04df13e"; - sha256 = "1wcvnx0s328md2zil1gwxqsl19jin5vmpxvzajjx52yxsrgm0qrm"; + rev = "568a0cb8595f1e5363dc220f01ca6f18517ff80a"; + sha256 = "0c3ihcl10mskp5jd1f9xnvypyrf0x5db1gks2i1fb63cmh64ibld"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -17409,12 +17469,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-06-15"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "75a0044e5f4d164d93557fd49863e088f0ecf749"; - sha256 = "1md8gsibb1224df6qi2vnyxp5ja51vfppdziply33zdlh7qa6ycc"; + rev = "3c9e5cb6499f66a02c365f073145a835124a19ac"; + sha256 = "0bghzwkyqgp3g76irbadv3bx4npvnq2x16j6fdxc01906nn3iz95"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -17457,12 +17517,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-06-09"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "8c4660cfe697621bcc61d37b3651ffed94fe7fed"; - sha256 = "1gdjd9a3y2kgsjg5ivxwmqymibgzhhj1h6lg7hq811jlip3p0p63"; + rev = "e10c9c6436556405ec6b187fd459a718f5c55156"; + sha256 = "0d7cv268gzrz47brax66h2kv2b4b6ks3vzdz97si8khh70jds59d"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; @@ -17515,5 +17575,17 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; + supermaven-nvim = buildVimPlugin { + pname = "supermaven-nvim"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "supermaven-inc"; + repo = "supermaven-nvim"; + rev = "c7ab94a6bcde96c79ff51afd6a1494606bb6f10b"; + sha256 = "sha256-TeRWReHeEqP5I3tgfJdMDmHvL83NDCENRMcQrKbPiqg="; + }; + meta.homepage = "https://github.com/supermaven-inc/supermaven-nvim/"; + }; + } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index c4a0aea58999..84865e730044 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=10f21f3"; + version = "0.0.0+rev=5c9b47c"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "10f21f3f1b10584e62ecc113ab3cda1196d0ceb8"; - hash = "sha256-hBvDFLIN4n0dbpH8FKe0sY8t4Jwa0GtrLt2GG04Qgn8="; + rev = "5c9b47c6a978072808b356065fe8f223cdc8fc07"; + hash = "sha256-nln4A2zIaFvfvWMplMDV3XMlXLEFfqx68GiNoFSR2/c="; }; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; @@ -182,12 +182,12 @@ }; bp = buildGrammar { language = "bp"; - version = "0.0.0+rev=2326d70"; + version = "0.0.0+rev=4e60cf3"; src = fetchFromGitHub { owner = "ambroisie"; repo = "tree-sitter-bp"; - rev = "2326d709fb9cf73cf124fdbc803c267f851721a4"; - hash = "sha256-h9T8tfS2K85N9NLwYj6tu2MHPj4YyG/UBYoezfWuEyI="; + rev = "4e60cf3c2e613625c06f6f85540b3631e2d06cd3"; + hash = "sha256-E8xL93rZx5I1RWXduBZdfVnogmha6TFQz4KerNWrpTI="; }; meta.homepage = "https://github.com/ambroisie/tree-sitter-bp"; }; @@ -259,12 +259,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "0.0.0+rev=4864abb"; + version = "0.0.0+rev=69d7a8b"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "4864abb95a1f6e54d6b362677beef9fb674b41e9"; - hash = "sha256-asJ4BDARnQdc+d0H+DDpW+/gDGuEIbc8PVL0B3KrA0Y="; + rev = "69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71"; + hash = "sha256-WyWKf/cqMPClo8xwech3xm4if4Tu9TwA9YstBIEjkoI="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -359,12 +359,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=1f188ef"; + version = "0.0.0+rev=b93070b"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "1f188eff83b562ffae36d13e1b804ec6f3b9f1d9"; - hash = "sha256-AZXk29yM21KOTVWWUKkr1+sr7gv7ViD6kDjwrJZoCzg="; + rev = "b93070b5a91ee9537d45e59d741737b1289c5dcc"; + hash = "sha256-IINYPEysz5bI2cmFY6eNCR86b0OfBIqws5a61UxCfg4="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -425,12 +425,12 @@ }; diff = buildGrammar { language = "diff"; - version = "0.0.0+rev=629676f"; + version = "0.0.0+rev=19dd5aa"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-diff"; - rev = "629676fc3919606964231b2c7b9677d6998a2cb4"; - hash = "sha256-E2l971rSVAuSiLDVMto6hjViaxDLjA7LFQM+/evMXhk="; + rev = "19dd5aa52fe339a1d974768a09ee2537303e8ca5"; + hash = "sha256-pS+xTdJWhb0pmWecmlnQb6PwkAUTG5Sry3Jf7zWseU0="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff"; }; @@ -491,24 +491,24 @@ }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=648183d"; + version = "0.0.0+rev=809266e"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"; - hash = "sha256-O40z5VYmFeE8pkJ85Vu5DWV31YslIrwD80+4qnpoRNY="; + rev = "809266ed1694d64dedc168a18893cc254e3edf7e"; + hash = "sha256-Kxmk9v2oTTYtoLQ2n0LyNziouG56ZSgcirS8JukUmZE="; }; location = "dtd"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; earthfile = buildGrammar { language = "earthfile"; - version = "0.0.0+rev=b5bdcb5"; + version = "0.0.0+rev=5a86415"; src = fetchFromGitHub { owner = "glehmann"; repo = "tree-sitter-earthfile"; - rev = "b5bdcb5813ce0e582fbd8e03eb42c80d3cc8984e"; - hash = "sha256-fhHu8kniYOLhrlHLgfP1NHtBxURrM7GNn51zmPNcTIU="; + rev = "5a864159ff728b6d4f7d0aab3723f85a467d180f"; + hash = "sha256-w36h/4xGtGZpJu+ueZiO6K4Eln0DkNUw6a626urMbz4="; }; meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile"; }; @@ -603,12 +603,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=b8e44bc"; + version = "0.0.0+rev=da275db"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "b8e44bc0a3b2ce6bceea47c0b1c0f303a6b322b8"; - hash = "sha256-9sfucj3jx5KVt/okHyCZLIJUbYFHPO4Ld/IWWjVXKDA="; + rev = "da275db3ae46bbd00f97d11f888d8c58c14faa6d"; + hash = "sha256-05V1VLmafWgdAHaNiBj4YYl9/W54j6TNSH5CLnh0fjY="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -779,12 +779,12 @@ }; git_rebase = buildGrammar { language = "git_rebase"; - version = "0.0.0+rev=d8a4207"; + version = "0.0.0+rev=274e27e"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; - rev = "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"; - hash = "sha256-mbRu2+wZVf5Nk3XlFvLSBOUg2QqmCR2tqO7gLpOJ45k="; + rev = "274e27ea0f09371122ab55b8a812a32d6ef644e8"; + hash = "sha256-W0aDOZ2uPXHGAbt/p3slyotw4dPsmgADnRAH3e9NT1Y="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase"; }; @@ -801,12 +801,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=edd817e"; + version = "0.0.0+rev=aa5c279"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "edd817e0532f179b7f7f371dc180629070945f0c"; - hash = "sha256-iipzgO8vJJpxhf/ZJh6tsfRa54C6g9rAN9TVdycKiqc="; + rev = "aa5c279287f0895a7ebc76a06e55ac3e4b2df7c7"; + hash = "sha256-TjHaogOnerLUvCxEOBkqfc4ZtKmgmpU8vQyDmaDsO3Y="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -845,12 +845,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=7f91bf3"; + version = "0.0.0+rev=3736dfc"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "7f91bf34cadc06a96efc475df501ffca4dda9410"; - hash = "sha256-M676GDkyUGosih5R77duEy4jUrIz3bGwD+G6n68gJX0="; + rev = "3736dfc811c07fa749ca818f94c9a3977734dd26"; + hash = "sha256-BIEM9i7GItQZmOcJDMHm2yY+4xeL5x9BzZORtYOxr28="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -1032,12 +1032,12 @@ }; hcl = buildGrammar { language = "hcl"; - version = "0.0.0+rev=422cbe1"; + version = "0.0.0+rev=9e3ec98"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "422cbe1d93a8ae3847744b664041fc76876babcd"; - hash = "sha256-PrA/F8IIJDzr2HjX9NToApzbM7nO+NesMcKhOQyOyNU="; + rev = "9e3ec9848f28d26845ba300fd73c740459b83e9b"; + hash = "sha256-HM77BXavgP+H3XwHSqRdLlylmkH+idtuZqLeOV2VUiM="; }; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; @@ -1077,12 +1077,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=5e1225a"; + version = "0.0.0+rev=80517ca"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "5e1225a30712ca0a9040509806c7ba274a1bbcde"; - hash = "sha256-gBByrpw5iCGoOy1zrg0emuAd1Vd8KOKFeJLZOCWh9qU="; + rev = "80517ca13317fb8591503c0d99f2ad76e8979a72"; + hash = "sha256-3MoTDW0LyZd0wge7R5d+H7QG9zPBykXVE73eJEWMdK8="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -1143,12 +1143,12 @@ }; http = buildGrammar { language = "http"; - version = "0.0.0+rev=8d22f33"; + version = "0.0.0+rev=2dacda9"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "8d22f33faa5aa95c6526606fb656ada342e59e40"; - hash = "sha256-L+9cDLTmisZmdBXocK8u7fkJIlaZId9qeQxVWwFkdJg="; + rev = "2dacda923bafcfeae487e457df0fc1c95f6d1848"; + hash = "sha256-JunYDINufbrbVduLrrX73rD8L6MC5dEie8yq92qTFe4="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; @@ -1165,23 +1165,23 @@ }; hyprlang = buildGrammar { language = "hyprlang"; - version = "0.0.0+rev=c9012d6"; + version = "0.0.0+rev=6858695"; src = fetchFromGitHub { owner = "luckasRanarison"; repo = "tree-sitter-hyprlang"; - rev = "c9012d6dcaaa939f17c21e1fdb17b013d139e6b9"; - hash = "sha256-yI/3DVX2SgvU+mP1KVe7OA8OtqXbaZG9/mTUQjUHCgk="; + rev = "6858695eba0e63b9e0fceef081d291eb352abce8"; + hash = "sha256-5csAj7k03QEEfkZE/EBmGjqUHPlFss3EWvExT4kaiQg="; }; meta.homepage = "https://github.com/luckasRanarison/tree-sitter-hyprlang"; }; idl = buildGrammar { language = "idl"; - version = "0.0.0+rev=9f56001"; + version = "0.0.0+rev=966797b"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-idl"; - rev = "9f56001f8ed29b0ea9fa4f02813f3e83ab0a2aaa"; - hash = "sha256-L5O9pep1No4oWSM7nA71RYY2X688+rm/2pTETP7ifOA="; + rev = "966797b8c581526efdd2252f815dde6de1a8f932"; + hash = "sha256-q2aBAXUVjhcoHH7iZQllLkDF5ZMuIxNjWu72Xt+YdXA="; }; meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; }; @@ -1220,12 +1220,12 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=2a05cab"; + version = "0.0.0+rev=3b08641"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "2a05cab838dfec52daa76f10920917d2e69a85bc"; - hash = "sha256-NOnm40FSzTX6Pf4NchH0hYcTwyxX/usEVKxz8KsIlk4="; + rev = "3b08641373cb3e37bc531e6e3cdb85d02b454702"; + hash = "sha256-0bCagqSY/MFAqJNajkaR8Y6J2YiXzOF249cm0pFjTfs="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; @@ -1330,12 +1330,12 @@ }; just = buildGrammar { language = "just"; - version = "0.0.0+rev=fd814fc"; + version = "0.0.0+rev=379fbe3"; src = fetchFromGitHub { owner = "IndianBoy42"; repo = "tree-sitter-just"; - rev = "fd814fc6c579f68c2a642f5e0268cf69daae92d7"; - hash = "sha256-yuTcgNfF4oRNZkwwFpt5WLpWtTvgJJRDYo3CWnCNyiU="; + rev = "379fbe36d1e441bc9414ea050ad0c85c9d6935ea"; + hash = "sha256-rJXgKNYnAjpAh+1dfYH9W6v5t457ROLtjqU3ndzvjr8="; }; meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just"; }; @@ -1407,12 +1407,12 @@ }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=cd82eb4"; + version = "0.0.0+rev=08d8b88"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "cd82eb40d31bdfe65f846f4e06292d6c804b5e0e"; - hash = "sha256-ptUIi8cMQ4CrnqZgnzJ0rnByd78y8l607+CSPKNrLEk="; + rev = "08d8b885a3fa67a6e8aa8edd8988eaa55db46ba4"; + hash = "sha256-QOlnE5JnJHdupL12YMT6cIRcP/2GKsewPkRuWwAwliI="; }; generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; @@ -1518,23 +1518,23 @@ }; luau = buildGrammar { language = "luau"; - version = "0.0.0+rev=5aa9b88"; + version = "0.0.0+rev=fbadc96"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luau"; - rev = "5aa9b88a8e3327276ec6e72de997f04ac80b1ae4"; - hash = "sha256-7cxnELiCmLOPecca3U2CN1F4CUSbL8upxAn0PxwU6dM="; + rev = "fbadc96272f718dba267628ba7b0e694c368cef3"; + hash = "sha256-qoKLG9hPyvcpDEssSrsUnr+w6B8qvXXIXLdvoCZhjic="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-luau"; }; m68k = buildGrammar { language = "m68k"; - version = "0.0.0+rev=d097b12"; + version = "0.0.0+rev=9e082a2"; src = fetchFromGitHub { owner = "grahambates"; repo = "tree-sitter-m68k"; - rev = "d097b123f19c6eaba2bf181c05420d88b9fc489d"; - hash = "sha256-y1nioJ2R0YgGLH7dkJsTxIkejfMnh1CU+A++yTaQdb0="; + rev = "9e082a2253c50eb3d80e84bbd635e57cfb1476a2"; + hash = "sha256-QJZDozY0UO7tWemKGk3MjDrM/bjpbwCJbWXY0fTL9fQ="; }; meta.homepage = "https://github.com/grahambates/tree-sitter-m68k"; }; @@ -1575,12 +1575,12 @@ }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=79d8b25"; + version = "0.0.0+rev=2825fb5"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "79d8b25f57b48f83ae1333aff6723b83c9532e37"; - hash = "sha256-DCAMxQqWHM54yzNzF1FjaU0+vETbLhfSZXNq+62DzhE="; + rev = "2825fb578325ac308945318881445a89ea06e0f6"; + hash = "sha256-M7dECDfpRZHlkjCNvQcAneKR9KHf6HwtoHADZRjIB/Y="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1619,12 +1619,12 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=00c32d8"; + version = "0.0.0+rev=268bc99"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "00c32d8562dc957b187da110a3443307962b8da8"; - hash = "sha256-cyd9n1ydIEoBL+hnRiCSEC2S9H1hrWZlMCxVbxWyazI="; + rev = "268bc99020f7ba7a219f839e3a6a31c36ad0826b"; + hash = "sha256-jXcnM+LEY35GZd2HYtFE5Of4CBga1zZuGCPazKWAppA="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -1653,12 +1653,12 @@ }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=43433d8"; + version = "0.0.0+rev=3039ad9"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "43433d8477b24cd13acaac20a66deda49b7e2547"; - hash = "sha256-9Ei0uy+eGK9oiH7y2KIhB1E88SRzGnZinqECT3kYTVE="; + rev = "3039ad9e9af3c1ffe049a04ee83a2b489915b0b9"; + hash = "sha256-a4NU9tzQ+g9dxF3/LAkEm83QnEJcAoNcIrrQwXSSTPE="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; @@ -1697,12 +1697,12 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=b3cda61"; + version = "0.0.0+rev=0fdada1"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "b3cda619248e7dd0f216088bd152f59ce0bbe488"; - hash = "sha256-Ib83CECi3hvm2GfeAJXIkapeN8rrpFQxCWWFFsIvB/Y="; + rev = "0fdada10f1f845ca9116e279ad8f5d0ca93e9949"; + hash = "sha256-hnY0lDF4S5W5DUJXNcXt2qySnCu16AgEiGmy/zQSzu4="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; @@ -1752,24 +1752,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=0b12614"; + version = "0.0.0+rev=cd95a67"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e"; - hash = "sha256-ysMYLTIhU4jN24cPH0J8v9685ED+OQU6x/pLBeHXeYQ="; + rev = "cd95a67cea8c839d62fc5206ed1f5c66ff9ca255"; + hash = "sha256-2yuMHJtG1xHiHzMCrr72UpTjKHZP9Mxbnq77g67qouo="; }; location = "grammars/ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=0b12614"; + version = "0.0.0+rev=cd95a67"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e"; - hash = "sha256-ysMYLTIhU4jN24cPH0J8v9685ED+OQU6x/pLBeHXeYQ="; + rev = "cd95a67cea8c839d62fc5206ed1f5c66ff9ca255"; + hash = "sha256-2yuMHJtG1xHiHzMCrr72UpTjKHZP9Mxbnq77g67qouo="; }; location = "grammars/interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -1964,6 +1964,32 @@ }; meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma"; }; + problog = buildGrammar { + language = "problog"; + version = "0.0.0+rev=d8bc22c"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "foxy"; + repo = "tree-sitter-prolog"; + rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974"; + hash = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo="; + }; + location = "grammars/problog"; + meta.homepage = "https://codeberg.org/foxy/tree-sitter-prolog"; + }; + prolog = buildGrammar { + language = "prolog"; + version = "0.0.0+rev=d8bc22c"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "foxy"; + repo = "tree-sitter-prolog"; + rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974"; + hash = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo="; + }; + location = "grammars/prolog"; + meta.homepage = "https://codeberg.org/foxy/tree-sitter-prolog"; + }; promql = buildGrammar { language = "promql"; version = "0.0.0+rev=77625d7"; @@ -2121,12 +2147,12 @@ }; r = buildGrammar { language = "r"; - version = "0.0.0+rev=3914005"; + version = "0.0.0+rev=b1e211f"; src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; - rev = "391400572538ff9854341a175ed8ab4b1e45f44b"; - hash = "sha256-KM80Kud7fJzc0qIhd1y3sbdN0mH6b7L16VqOtbGxQBc="; + rev = "b1e211f52ad8f8e1e182bbbcc16dcd5e3688eb7d"; + hash = "sha256-fgK8UGNaoJf3+lao/q1Vfd+2U/YNgrZu3kbyZ1qOIus="; }; meta.homepage = "https://github.com/r-lib/tree-sitter-r"; }; @@ -2143,12 +2169,12 @@ }; ralph = buildGrammar { language = "ralph"; - version = "0.0.0+rev=48b9d9d"; + version = "0.0.0+rev=f6d81bf"; src = fetchFromGitHub { owner = "alephium"; repo = "tree-sitter-ralph"; - rev = "48b9d9d6e2b55ce8f9eb09ceb0d952e4b1cc87a0"; - hash = "sha256-Yf2vq7h7UrJmdjQbXU8HM0hjUwwRBFlEV1O+ZUyMIuk="; + rev = "f6d81bf7a4599c77388035439cf5801cd461ff77"; + hash = "sha256-o+h43yMws4utPjqEQCt5swks3KfM3hb4mguclALsUsA="; }; meta.homepage = "https://github.com/alephium/tree-sitter-ralph"; }; @@ -2251,14 +2277,25 @@ }; meta.homepage = "https://github.com/Hubro/tree-sitter-robot"; }; + robots = buildGrammar { + language = "robots"; + version = "0.0.0+rev=8e3a420"; + src = fetchFromGitHub { + owner = "opa-oz"; + repo = "tree-sitter-robots-txt"; + rev = "8e3a4205b76236bb6dbebdbee5afc262ce38bb62"; + hash = "sha256-OePLE85CWbl0hnre4Apq5Ix2GA8juGV2TE891Py4AME="; + }; + meta.homepage = "https://github.com/opa-oz/tree-sitter-robots-txt"; + }; roc = buildGrammar { language = "roc"; - version = "0.0.0+rev=df46a85"; + version = "0.0.0+rev=6ea64b6"; src = fetchFromGitHub { owner = "faldor20"; repo = "tree-sitter-roc"; - rev = "df46a85abda9f948d38f5d4e3684cec49c42fef2"; - hash = "sha256-4E9ZnMizo+1wnnkYSPNKMkTTyDKRJT+JqtUWoJH45aA="; + rev = "6ea64b6434a45472bd87b0772fd84a017de0a557"; + hash = "sha256-lmrRGSwCg2QCaEbbDeHOHo3KcIq5slpQv2zb32L9n2M="; }; meta.homepage = "https://github.com/faldor20/tree-sitter-roc"; }; @@ -2286,12 +2323,12 @@ }; ruby = buildGrammar { language = "ruby"; - version = "0.0.0+rev=dc2d7d6"; + version = "0.0.0+rev=0ffe457"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "dc2d7d6b50f9975bc3c35bbec0ba11b2617b736b"; - hash = "sha256-HV/hJwftBTCj9WomIcLB6n0LcQRHAzlQsJBNOxu6XJo="; + rev = "0ffe457fb6aabf064f173fd30ea356845cef2513"; + hash = "sha256-E46Y++kaipMWZwyfQ40tWj3CTIP25XQ90x2FsQaQ63s="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; @@ -2308,12 +2345,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=b76db43"; + version = "0.0.0+rev=599d12b"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "b76db435a7f876cf1ede837d66054c534783c72f"; - hash = "sha256-AZ1YIsnw3x84T2ubwWoekfy98L2GdgQP0R3tM8DEXLM="; + rev = "599d12b59fed092f5a3d4a7019fd85d90cb39ec1"; + hash = "sha256-OIMrIuN5lE1VBGRhIb2B52VYaihQ/sjYkf8oiqpsXCw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2353,12 +2390,12 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=865d79e"; + version = "0.0.0+rev=ea77a4d"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "865d79e236c7f0e04276c969453d021d1da4b15f"; - hash = "sha256-vZ+Av0lSJaSKUVdEGMtAtXwGIUaIUvS5CvWWfOei/30="; + rev = "ea77a4d91dd93f4483965efcc41f3faebb9131c8"; + hash = "sha256-X+fQoAe9VZekDERw55vz7viXtcVhuZxtAZDYlh4F4Tg="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; @@ -2454,12 +2491,12 @@ }; sparql = buildGrammar { language = "sparql"; - version = "0.0.0+rev=05f949d"; + version = "0.0.0+rev=d853661"; src = fetchFromGitHub { owner = "BonaBeavis"; repo = "tree-sitter-sparql"; - rev = "05f949d3c1c15e3261473a244d3ce87777374dec"; - hash = "sha256-KBalxmAukeSbjyelEy+ZqMcBlRd0V0/pntCwTeINTAQ="; + rev = "d853661ca680d8ff7f8d800182d5782b61d0dd58"; + hash = "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU="; }; meta.homepage = "https://github.com/BonaBeavis/tree-sitter-sparql"; }; @@ -2564,12 +2601,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=d657f98"; + version = "0.0.0+rev=631f1e6"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "d657f98dd6bbc34cb48438c9e5956f15a6d89f1d"; - hash = "sha256-KE+qjTP3UWKvcLJPYIJmEGeKBWAdpCzgW4/vIccueng="; + rev = "631f1e66bfbf55791b7a9ed23fa6dc90ee55550a"; + hash = "sha256-/nMRcZc5fWUJ+GpVnlERHjtahXGh6NwrNNQPkNM5Y9E="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2596,6 +2633,17 @@ }; meta.homepage = "https://github.com/ok-ryoko/tree-sitter-systemtap"; }; + systemverilog = buildGrammar { + language = "systemverilog"; + version = "0.0.0+rev=a478beb"; + src = fetchFromGitHub { + owner = "zhangwwpeng"; + repo = "tree-sitter-systemverilog"; + rev = "a478beb76be72fa8f305f5fe9cc6141ac91b91a4"; + hash = "sha256-pgZDu2tSgTtE80VXL1T+zAq2dl3B1DoEY/zzxLvqNvM="; + }; + meta.homepage = "https://github.com/zhangwwpeng/tree-sitter-systemverilog"; + }; t32 = buildGrammar { language = "t32"; version = "0.0.0+rev=6182836"; @@ -2620,12 +2668,12 @@ }; tact = buildGrammar { language = "tact"; - version = "0.0.0+rev=034df21"; + version = "0.0.0+rev=91cc49a"; src = fetchFromGitHub { owner = "tact-lang"; repo = "tree-sitter-tact"; - rev = "034df2162ed7b654efd999942e266be713c7cde0"; - hash = "sha256-2+MVrDPuhrM0HE9uRG5LpmyXYy73Pv3MY20UXwBXalM="; + rev = "91cc49a83f4f0b3a756bf7d0e65403a9cf757003"; + hash = "sha256-/u1ZLk9e7uowTnSkxrwXOOmcesqp3uDTRJOshKNc8lQ="; }; meta.homepage = "https://github.com/tact-lang/tree-sitter-tact"; }; @@ -2654,23 +2702,23 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=cf84ea5"; + version = "0.0.0+rev=a4f14aa"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "cf84ea53e2e2531f23009d676ac206090c1e2392"; - hash = "sha256-CQ11t4beqkjhtZktrawuavgQPSFzbwJrU/aSbPsqBPA="; + rev = "a4f14aa248b84df73cc1c00bf06edac8d7c96acd"; + hash = "sha256-O5eKY9twQJp0qHjIs6juEY0VtOYXAdnlzlomh9YNndI="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; terraform = buildGrammar { language = "terraform"; - version = "0.0.0+rev=422cbe1"; + version = "0.0.0+rev=9e3ec98"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "422cbe1d93a8ae3847744b664041fc76876babcd"; - hash = "sha256-PrA/F8IIJDzr2HjX9NToApzbM7nO+NesMcKhOQyOyNU="; + rev = "9e3ec9848f28d26845ba300fd73c740459b83e9b"; + hash = "sha256-HM77BXavgP+H3XwHSqRdLlylmkH+idtuZqLeOV2VUiM="; }; location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; @@ -3001,12 +3049,12 @@ }; wgsl_bevy = buildGrammar { language = "wgsl_bevy"; - version = "0.0.0+rev=1e12c79"; + version = "0.0.0+rev=0f06f24"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; - rev = "1e12c7925c41bb09818d86e30cd78644fde7d31a"; - hash = "sha256-7pntsp8mqXyQK+81FefZv32GNlJsnOWIhvJ9o6Q4FUQ="; + rev = "0f06f24e259ac725045956436b9025dab008ff9f"; + hash = "sha256-/HNDdI2Tg6YG/lAvubZtN2g6pUCk0Kl4kRTRsABIm0Y="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; }; @@ -3034,23 +3082,23 @@ }; xcompose = buildGrammar { language = "xcompose"; - version = "0.0.0+rev=2383cc6"; + version = "0.0.0+rev=fff3e72"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-xcompose"; - rev = "2383cc69a2c42cfade41c7cb971fb3862bec6df1"; - hash = "sha256-N8pJhB35IApb41TKn6NuVMEgmQGC+1Nyu5eQck1K5g8="; + rev = "fff3e72242aa110ebba6441946ea4d12d200fa68"; + hash = "sha256-PNg1z+7CuvpQdksKJOCQ59dZrv4PORdYo6CSw3GrBtk="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xcompose"; }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=648183d"; + version = "0.0.0+rev=809266e"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"; - hash = "sha256-O40z5VYmFeE8pkJ85Vu5DWV31YslIrwD80+4qnpoRNY="; + rev = "809266ed1694d64dedc168a18893cc254e3edf7e"; + hash = "sha256-Kxmk9v2oTTYtoLQ2n0LyNziouG56ZSgcirS8JukUmZE="; }; location = "xml"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; @@ -3101,12 +3149,12 @@ }; zig = buildGrammar { language = "zig"; - version = "0.0.0+rev=7c5a29b"; + version = "0.0.0+rev=2bac4cc"; src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; - rev = "7c5a29b721d409be8842017351bf007d7e384401"; - hash = "sha256-UXJCh8GvXzn+sssTrIsLViXD3TiBZhLFABYCKM+fNMQ="; + rev = "2bac4cc6c697d46a193905fef6d003bfa0bfabfd"; + hash = "sha256-IK9kCajZGwEiASa6Mv0oxuz85+QmI3S7Rl9lgHkApMc="; }; meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f2d7640a83e1..44c60783f1a8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -25,7 +25,6 @@ , fzf , gawk , git -, gnome , himalaya , htop , jq @@ -58,6 +57,7 @@ , xorg , xxd , zathura +, zenity , zsh , # codeium-nvim dependencies codeium @@ -79,6 +79,8 @@ , CoreServices , # nvim-treesitter dependencies callPackage +, # Preview-nvim dependencies + md-tui , # sg.nvim dependencies darwin , # sved dependencies @@ -406,12 +408,12 @@ codesnap-nvim = let - version = "1.3.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "mistricky"; repo = "codesnap.nvim"; rev = "refs/tags/v${version}"; - hash = "sha256-nS/bAWsBQ1L4M9437Yp6FdmHoogzalKlLIAXnRZyMp0="; + hash = "sha256-eDFUoTzrQH7hn8ZSnqi6SxQvmc0CjpSmBuY2kzt/XbA="; }; codesnap-lib = rustPlatform.buildRustPackage { pname = "codesnap-lib"; @@ -419,7 +421,7 @@ sourceRoot = "${src.name}/generator"; - cargoHash = "sha256-FTQl5WIGEf+RQKYJ4BbIE3cCeN+NYUp7VXIrpxB05tU="; + cargoHash = "sha256-Si5L0gcGfcYMN/caXpLhHHhJLcqyv2BQgYSMkU5oiDo="; nativeBuildInputs = [ pkg-config @@ -451,7 +453,10 @@ doInstallCheck = true; nvimRequireCheck = "codesnap"; - meta.homepage = "https://github.com/mistricky/codesnap.nvim/"; + meta = { + homepage = "https://github.com/mistricky/codesnap.nvim/"; + changelog = "https://github.com/mistricky/codesnap.nvim/releases/tag/v${version}"; + }; }; command-t = super.command-t.overrideAttrs { @@ -1162,11 +1167,16 @@ inherit (old) version src; sourceRoot = "${old.src.name}/spectre_oxi"; - cargoHash = "sha256-ZBlxJjkHb2buvXK6VGP6FMnSFk8RUX7IgHjNofnGDAs="; + cargoHash = "sha256-SqbU9YwZ5pvdFUr7XBAkkfoqiLHI0JwJRwH7Wj1JDNg="; preCheck = '' mkdir tests/tmp/ ''; + + checkFlags = [ + # Flaky test (https://github.com/nvim-pack/nvim-spectre/issues/244) + "--skip=tests::test_replace_simple" + ]; }; in { @@ -1275,6 +1285,15 @@ nvimRequireCheck = "plenary"; }; + Preview-nvim = super.Preview-nvim.overrideAttrs { + patches = [ + (substituteAll { + src = ./patches/preview-nvim/hardcode-mdt-binary-path.patch; + mdt = lib.getExe md-tui; + }) + ]; + }; + range-highlight-nvim = super.range-highlight-nvim.overrideAttrs { dependencies = with self; [ cmd-parser-nvim ]; }; @@ -1603,7 +1622,7 @@ vCoolor-vim = super.vCoolor-vim.overrideAttrs { # on linux can use either Zenity or Yad. - propagatedBuildInputs = [ gnome.zenity ]; + propagatedBuildInputs = [ zenity ]; meta = { description = "Simple color selector/picker plugin"; license = lib.licenses.publicDomain; diff --git a/pkgs/applications/editors/vim/plugins/patches/preview-nvim/hardcode-mdt-binary-path.patch b/pkgs/applications/editors/vim/plugins/patches/preview-nvim/hardcode-mdt-binary-path.patch new file mode 100644 index 000000000000..e8082f51c370 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/preview-nvim/hardcode-mdt-binary-path.patch @@ -0,0 +1,22 @@ +diff --git a/lua/preview.lua b/lua/preview.lua +index 6d9875d..729cc70 100644 +--- a/lua/preview.lua ++++ b/lua/preview.lua +@@ -28,7 +28,7 @@ local function open_window(file) + vim.env.MDT_WIDTH = width + + vim.cmd.vnew() +- vim.fn.termopen("mdt " .. file) ++ vim.fn.termopen("@mdt@ " .. file) + + vim.cmd("setlocal nonumber norelativenumber") + vim.api.nvim_feedkeys("a", "t", false) +@@ -49,7 +49,7 @@ end + function M.setup() + -- Check if "mdt" is installed + if vim.fn.executable("mdt") == 0 then +- install() ++ -- install() + end + + set_cmd() diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 98f71881c900..1ffe8364160b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -21,6 +21,7 @@ https://github.com/numToStr/Navigator.nvim/,, https://github.com/overcache/NeoSolarized/,, https://github.com/chrisbra/NrrwRgn/,, https://github.com/vim-scripts/PreserveNoEOL/,, +https://github.com/henriklovhaug/Preview.nvim/,HEAD, https://github.com/yssl/QFEnter/,, https://github.com/chrisbra/Recover.vim/,, https://github.com/vim-scripts/Rename/,, @@ -504,6 +505,7 @@ https://github.com/iamcco/markdown-preview.nvim/,, https://github.com/tadmccorkle/markdown.nvim/,HEAD, https://github.com/David-Kunz/markid/,HEAD, https://github.com/chentoast/marks.nvim/,, +https://github.com/OXY2DEV/markview.nvim/,HEAD, https://github.com/williamboman/mason-lspconfig.nvim/,HEAD, https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD, https://github.com/williamboman/mason.nvim/,HEAD, @@ -778,6 +780,7 @@ https://github.com/olivercederborg/poimandres.nvim/,HEAD, https://github.com/dleonard0/pony-vim-syntax/,, https://github.com/RishabhRD/popfix/,, https://github.com/nvim-lua/popup.nvim/,, +https://github.com/tris203/precognition.nvim/,HEAD, https://github.com/andweeb/presence.nvim/,, https://github.com/sotte/presenting.vim/,, https://github.com/ewilazarus/preto/,HEAD, @@ -874,6 +877,7 @@ https://github.com/folke/styler.nvim/,, https://github.com/teto/stylish.nvim/,HEAD, https://github.com/gbprod/substitute.nvim/,HEAD, https://github.com/kvrohit/substrata.nvim/,HEAD, +https://github.com/supermaven-inc/supermaven-nvim/,HEAD, https://github.com/ervandew/supertab/,, https://github.com/ur4ltz/surround.nvim/,, https://github.com/peterbjorgensen/sved/,, @@ -1444,6 +1448,7 @@ https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, https://github.com/gbprod/yanky.nvim/,HEAD, https://github.com/HerringtonDarkholme/yats.vim/,, +https://github.com/mikavilpas/yazi.nvim/,HEAD, https://github.com/lucasew/yescapsquit.vim/,HEAD, https://github.com/elkowar/yuck.vim/,HEAD, https://github.com/KabbAmine/zeavim.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 724e9004b29d..20ca197908f8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -389,8 +389,8 @@ let mktplcRef = { name = "astro-vscode"; publisher = "astro-build"; - version = "2.8.3"; - hash = "sha256-A6m31eZMlOHF0yr9MjXmsFyXgH8zmq6WLRd/w85hGw0="; + version = "2.10.2"; + hash = "sha256-lmqbZnCpkNN+i877hURRkPuRtuxRKD29bDppGBAEMGs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog"; @@ -664,10 +664,14 @@ let mktplcRef = { name = "markdown-mermaid"; publisher = "bierner"; - version = "1.17.7"; - hash = "sha256-WKe7XxBeYyzmjf/gnPH+5xNOHNhMPAKjtLorYyvT76U="; + version = "1.23.1"; + hash = "sha256-hYWSeBXhqMcMxs+Logl5zRs4MlzBeHgCC07Eghmp0OM="; }; meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-mermaid/changelog"; + description = "Adds Mermaid diagram and flowchart support to VS Code's builtin markdown preview"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-mermaid"; + homepage = "https://github.com/mjbvz/vscode-markdown-mermaid"; license = lib.licenses.mit; }; }; @@ -775,8 +779,8 @@ let mktplcRef = { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.11.30"; - hash = "sha256-1CxyvQu7WQJw87sTcpnILztt1WeSpWOgij0dEIXebPU="; + version = "0.13.17"; + hash = "sha256-hcFBMYfexNB7NMf3C7BQVTps1CBesEOxU3mW2cKXDHc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog"; @@ -853,28 +857,31 @@ let mktplcRef = { name = "catppuccin-vsc"; publisher = "catppuccin"; - version = "2.6.1"; - hash = "sha256-B56b7PeuVnkxEqvd4vL9TYO7s8fuA+LOCTbJQD9e7wY="; + version = "3.14.0"; + hash = "sha256-kNQFR1ghdFJF4XLWCFgVpeXCZ/XiHGr/O1iJyWTT3Bg="; }; meta = { + changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc/changelog"; description = "Soothing pastel theme for VSCode"; - license = lib.licenses.mit; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Catppuccin.catppuccin-vsc"; - maintainers = [ lib.maintainers.nullx76 ]; + homepage = "https://github.com/catppuccin/vscode"; + license = lib.licenses.mit; + maintainers = [ ]; }; }; catppuccin-vsc-icons = buildVscodeMarketplaceExtension { mktplcRef = { name = "catppuccin-vsc-icons"; publisher = "catppuccin"; - version = "1.10.0"; - hash = "sha256-6klrnMHAIr+loz7jf7l5EZPLBhgkJODFHL9fzl1MqFI="; + version = "1.13.0"; + hash = "sha256-4gsblUMcN7a7UgoklBjc+2uiaSERq1vmi0exLht+Xi0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc-icons/changelog"; description = "Soothing pastel icon theme for VSCode"; - license = lib.licenses.mit; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Catppuccin.catppuccin-vsc-icons"; + homepage = "https://github.com/catppuccin/vscode-icons"; + license = lib.licenses.mit; maintainers = [ lib.maintainers.laurent-f1z1 ]; }; }; @@ -1262,8 +1269,8 @@ let mktplcRef = { name = "vscode-eslint"; publisher = "dbaeumer"; - version = "2.4.4"; - hash = "sha256-NJGsMme/+4bvED/93SGojYTH03EZbtKe5LyvocywILA="; + version = "3.0.10"; + hash = "sha256-EVmexnTIQQDmj25/rql3eCfJd47zRui3TpHol6l0Vgs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; @@ -1279,8 +1286,8 @@ let mktplcRef = { name = "vscode-deno"; publisher = "denoland"; - version = "3.17.0"; - hash = "sha256-ETwpUrYbPXHSkEBq2oM1aCBwt9ItLcXMYc3YWjHLiJE="; + version = "3.38.0"; + hash = "sha256-wmcMkX1gmFhE6JukvOI3fez05dP7ZFAZz1OxmV8uu4k="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog"; @@ -2064,8 +2071,8 @@ let mktplcRef = { name = "vscode-github-actions"; publisher = "github"; - version = "0.26.2"; - hash = "sha256-sEc6Fbn4XpK8vNK32R4fjnx/R+1xYOwcuhKlo7sPd5o="; + version = "0.26.3"; + hash = "sha256-tHUpYK6RmLl1s1J+N5sd9gyxTJSNGT1Md/CqapXs5J4="; }; meta = { description = "Visual Studio Code extension for GitHub Actions workflows and runs for github.com hosted repositories"; @@ -2129,8 +2136,8 @@ let mktplcRef = { name = "Go"; publisher = "golang"; - version = "0.40.0"; - hash = "sha256-otAq6ul2l64zpRJdekCb7XZiE2vgpLUfM4NUdRPZX8w="; + version = "0.41.4"; + hash = "sha256-ntrEI/l+UjzqGJmtyfVf/+sZJstZy3fm/PSWKTd7/Q0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/golang.Go/changelog"; @@ -2169,7 +2176,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=GraphQL.vscode-graphql"; homepage = "https://github.com/graphql/graphiql/tree/main/packages/vscode-graphql"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.Enzime ]; + maintainers = [ ]; }; }; @@ -2177,15 +2184,15 @@ let mktplcRef = { name = "vscode-graphql-syntax"; publisher = "GraphQL"; - version = "1.1.0"; - hash = "sha256-qazU0UyZ9de6Huj2AYZqqBo4jVW/ZQmFJhV7XXAblxo="; + version = "1.3.6"; + hash = "sha256-74Y/LpOhAj3TSplohhJqBwJDT87nCAiKrWsF90bc8jU="; }; meta = { description = "Adds full GraphQL syntax highlighting and language support such as bracket matching"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=GraphQL.vscode-graphql-syntax"; homepage = "https://github.com/graphql/graphiql/tree/main/packages/vscode-graphql-syntax"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.Enzime ]; + maintainers = [ ]; }; }; @@ -2779,8 +2786,8 @@ let mktplcRef = { name = "vscode-publint"; publisher = "Kravets"; - version = "0.0.1"; - hash = "sha256-6nG5Yqi8liumQ2K9ynV8mNXiXGaGo/cp4Cib1kqdp1c="; + version = "0.0.3"; + hash = "sha256-1KVqfCVyCn5LJOdazp3W6FECRGOviVC4+FHn6vTn5DI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Kravets.vscode-publint/changelog"; @@ -2987,10 +2994,14 @@ let mktplcRef = { name = "rainbow-csv"; publisher = "mechatroner"; - version = "3.6.0"; - hash = "sha256-bvxMnT6oSjflAwWQZkNnEoEsVlVg86T0TMYi8tNsbdQ="; + version = "3.12.0"; + hash = "sha256-pnHaszLa4a4ptAubDUY+FQX3F6sQQUQ/sHAxyZsbhcQ="; }; meta = { + changelog = "https://marketplace.visualstudio.com/items/mechatroner.rainbow-csv/changelog"; + description = "Rainbow syntax higlighting for CSV and TSV files in Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemname=mechatroner.rainbow-csv"; + homepage = "https://github.com/mechatroner/vscode_rainbow_csv"; license = lib.licenses.mit; }; }; @@ -3029,8 +3040,6 @@ let }; }; - mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { }; - mhutchie.git-graph = buildVscodeMarketplaceExtension { mktplcRef = { name = "git-graph"; @@ -3078,7 +3087,7 @@ let description = "direnv support for Visual Studio Code"; license = lib.licenses.bsd0; downloadPage = "https://marketplace.visualstudio.com/items?itemName=mkhl.direnv"; - maintainers = [ lib.maintainers.nullx76 ]; + maintainers = [ ]; }; }; @@ -3397,8 +3406,8 @@ let mktplcRef = { name = "remote-containers"; publisher = "ms-vscode-remote"; - version = "0.347.0"; - hash = "sha256-E9H1nPWG5JuzBxbYc/yWd8Y3azEWrd9whGirl0GK7kU="; + version = "0.376.0"; + hash = "sha256-fJ8ZcwGFWXzJZ8UgnzTxR+842vjiU0qCjV/zWzbq/KQ="; }; meta = { description = "Open any folder or repository inside a Docker container"; @@ -5181,8 +5190,8 @@ let mktplcRef = { name = "pretty-ts-errors"; publisher = "yoavbls"; - version = "0.5.3"; - hash = "sha256-JSCyTzz10eoUNu76wNUuvPVVKq4KaVKobS1CAPqgXUA="; + version = "0.5.4"; + hash = "sha256-SMEqbpKYNck23zgULsdnsw4PS20XMPUpJ5kYh1fpd14="; }; meta = { description = "Make TypeScript errors prettier and human-readable in VSCode"; @@ -5353,6 +5362,7 @@ let jakebecker.elixir-ls = throw "jakebecker.elixir-ls is deprecated in favor of elixir-lsp.vscode-elixir-ls"; # Added 2024-05-29 jpoissonnier.vscode-styled-components = throw "jpoissonnier.vscode-styled-components is deprecated in favor of styled-components.vscode-styled-components"; # Added 2024-05-29 matklad.rust-analyzer = throw "matklad.rust-analyzer is deprecated in favor of rust-lang.rust-analyzer"; # Added 2024-05-29 + mgt19937.typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07 ms-vscode.go = throw "ms-vscode.go is deprecated in favor of golang.go"; # Added 2024-05-29 ms-vscode.PowerShell = throw "ms-vscode.PowerShell is deprecated in favor of super.ms-vscode.powershell"; # Added 2024-05-29 rioj7.commandOnAllFiles = throw "rioj7.commandOnAllFiles is deprecated in favor of rioj7.commandonallfiles"; # Added 2024-05-29 diff --git a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix index eb6b5ab49626..8abf052323b2 100644 --- a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix +++ b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix @@ -28,6 +28,6 @@ vscode-utils.buildVscodeMarketplaceExtension { homepage = "https://github.com/qjebbs/vscode-plantuml"; changelog = "https://marketplace.visualstudio.com/items/jebbs.plantuml/changelog"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.victormignot ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix b/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix deleted file mode 100644 index c3319e375d09..000000000000 --- a/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -# Keep pkgs/by-name/ty/typst-preview/package.nix in sync with this extension - -{ - vscode-utils, - lib, - jq, - moreutils, - typst-preview, -}: - -vscode-utils.buildVscodeMarketplaceExtension { - mktplcRef = { - name = "typst-preview"; - publisher = "mgt19937"; - version = "0.11.7"; - hash = "sha256-70dVGoSBDKCtvn7xiC/gAh4OQ8nNDiI/M900r2zlOfU="; - }; - - buildInputs = [ typst-preview ]; - - nativeBuildInputs = [ - jq - moreutils - ]; - - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."typst-preview.executable".default = "${lib.getExe typst-preview}"' package.json | sponge package.json - ''; - - meta = { - description = "Typst Preview is an extension for previewing your Typst files in vscode instantly"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview"; - homepage = "https://github.com/Enter-tainer/typst-preview-vscode"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.drupol ]; - }; -} diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 8edde8c3d733..8b29f3dbd15d 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-tQjeKqNIhsf2nLdvncH1X6R9HiSTaizBtlAgrfAGtWs="; + hash = "sha256-byylRSPfuMBsZsnV/cUJFKrPWiLZFPKGB20Stpe6b0Y="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index ac4d1d69795b..c2e41573c1ef 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0d0cgsiafmr1wmxqji7mi4hmms7zqql868bcfbq9lmkw96zw85dw"; - x86_64-darwin = "1zga9zm25h33m42cdnbkpzx5vbcwm9n7036qapq8pgrb23mals7f"; - aarch64-linux = "0wsdcny0y8xfvdf62qh792ifcq1am8i8xkchh5rscjc3xli6r86s"; - aarch64-darwin = "13jd39lm667206ga8fqbdb7mdqbkmbgq1l7wid3h4yanz87zbm99"; - armv7l-linux = "1xpvcypm0xnwjmbj2c1a245yav3nwi0g2k564x91vazfw4nmi7mv"; + x86_64-linux = "0bzf0mx1rgndpdd4a97kr01xsgsgp86gyscg8js2cvaad4265bmv"; + x86_64-darwin = "1m7f91cqbbv00difvfqld8fqkj9kvyddihmzi3zyzn4gfkv8gvf0"; + aarch64-linux = "09mxsk4qkq34yg1sd67cdasfxwdhdzcfij50fv1nl3kdjzp2i0iz"; + aarch64-darwin = "1jxjzfz6gr0pcp2anwjqwm38ma2i8fnzf5zpscfdklrlbhf438k2"; + armv7l-linux = "1yp4npgw4dkx8halsr1vm5ll1w4phx67dwd4krz1914mddx7x2kr"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.2"; + version = "1.91.0"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "5437499feb04f7a586f677b155b039bc2b3669eb"; + rev = "ea1445cc7016315d0f5728f8e8b12a45dc0a7286"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "18npvj29g9xwjyxv3a0fxipk30hgm487cfr3d91dvp5hxhl4dwwr"; + sha256 = "08mgfrwiji16q8x8kwmw3pdmb0325hfr9pd2fa5g5kmy9gnfw38v"; }; }; @@ -97,7 +97,7 @@ in homepage = "https://code.visualstudio.com/"; downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; - maintainers = with maintainers; [ eadwu synthetica bobby285271 Enzime ]; + maintainers = with maintainers; [ eadwu synthetica bobby285271 johnrtitor ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 7458618a1e14..313b7fb6ce8a 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-xsNqzicI11dM/DjY00pXaPpQdHA0ltP23g34fMWUoUA="; + sha256 = "sha256-EwBcgFHw6Mh+eS5hfTLoywH0dVt/TpNt4y6xQxe/x/Q="; }; patches = [ diff --git a/pkgs/applications/emulators/cdemu/analyzer.nix b/pkgs/applications/emulators/cdemu/analyzer.nix index 244abc4f96c7..09e5f4959bac 100644 --- a/pkgs/applications/emulators/cdemu/analyzer.nix +++ b/pkgs/applications/emulators/cdemu/analyzer.nix @@ -1,5 +1,5 @@ { cmake, pkg-config, callPackage, gobject-introspection, wrapGAppsHook3 -, python3Packages, libxml2, gnuplot, gnome, gdk-pixbuf, intltool, libmirage }: +, python3Packages, libxml2, gnuplot, adwaita-icon-theme, gdk-pixbuf, intltool, libmirage }: python3Packages.buildPythonApplication { inherit (callPackage ./common-drv-attrs.nix { @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication { hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc="; }) pname version src meta; - buildInputs = [ libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf ]; + buildInputs = [ libxml2 gnuplot libmirage adwaita-icon-theme gdk-pixbuf ]; propagatedBuildInputs = with python3Packages; [ pygobject3 matplotlib ]; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool gobject-introspection ]; diff --git a/pkgs/applications/emulators/cdemu/gui.nix b/pkgs/applications/emulators/cdemu/gui.nix index ff2ebd68ca4d..eb1d533c40f4 100644 --- a/pkgs/applications/emulators/cdemu/gui.nix +++ b/pkgs/applications/emulators/cdemu/gui.nix @@ -1,5 +1,5 @@ { callPackage, cmake, pkg-config, wrapGAppsHook3, gobject-introspection -, python3Packages, libnotify, intltool, gnome, gdk-pixbuf }: +, python3Packages, libnotify, intltool, adwaita-icon-theme, gdk-pixbuf }: python3Packages.buildPythonApplication { inherit (callPackage ./common-drv-attrs.nix { @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication { }) pname version src meta; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool gobject-introspection ]; - buildInputs = [ libnotify gnome.adwaita-icon-theme gdk-pixbuf ]; + buildInputs = [ libnotify adwaita-icon-theme gdk-pixbuf ]; propagatedBuildInputs = with python3Packages; [ pygobject3 ]; pyproject = false; diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index 589a09a6d105..3ba6288a9887 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -40,11 +40,7 @@ , xz # Used in passthru -, common-updater-scripts -, dolphin-emu -, jq , testers -, writeShellScript # Darwin-only dependencies , CoreBluetooth @@ -56,23 +52,18 @@ , VideoToolbox }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dolphin-emu"; - version = "5.0-21460"; + version = "2407"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "a9544510468740b77cf06ef28daaa65fe247fd32"; - hash = "sha256-mhD7Uaqi8GzHdR7Y81TspvCnrZH2evWuWFgXMQ2c8g0="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-8W4KyIj+rhDkWnQogjpzlEJVo3HJenfpWKimSyMGN7c="; fetchSubmodules = true; }; - patches = [ - # TODO: Remove when merged https://github.com/dolphin-emu/dolphin/pull/12736 - ./find-minizip-ng.patch - ]; - strictDeps = true; nativeBuildInputs = [ @@ -133,8 +124,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDISTRIBUTOR=NixOS" - "-DDOLPHIN_WC_REVISION=${src.rev}" - "-DDOLPHIN_WC_DESCRIBE=${version}" + "-DDOLPHIN_WC_REVISION=${finalAttrs.src.rev}" + "-DDOLPHIN_WC_DESCRIBE=${finalAttrs.version}" "-DDOLPHIN_WC_BRANCH=master" ] ++ lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" @@ -165,20 +156,10 @@ stdenv.mkDerivation rec { passthru = { tests.version = testers.testVersion { - package = dolphin-emu; + package = finalAttrs.finalPackage; command = "dolphin-emu-nogui --version"; - version = if stdenv.hostPlatform.isDarwin then "Dolphin 5.0" else version; + inherit (finalAttrs) version; }; - - updateScript = writeShellScript "dolphin-update-script" '' - set -eou pipefail - export PATH=${lib.makeBinPath [ curl jq common-updater-scripts ]} - - json="$(curl -s https://dolphin-emu.org/update/latest/beta)" - version="$(jq -r '.shortrev' <<< "$json")" - rev="$(jq -r '.hash' <<< "$json")" - update-source-version dolphin-emu "$version" --rev="$rev" - ''; }; meta = with lib; { @@ -188,8 +169,6 @@ stdenv.mkDerivation rec { branch = "master"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ - ashkitten - ]; + maintainers = with maintainers; [ pbsds ]; }; -} +}) diff --git a/pkgs/applications/emulators/dolphin-emu/find-minizip-ng.patch b/pkgs/applications/emulators/dolphin-emu/find-minizip-ng.patch deleted file mode 100644 index b8a6d81aed55..000000000000 --- a/pkgs/applications/emulators/dolphin-emu/find-minizip-ng.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fb37788513..289a25fa57 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -676,7 +676,7 @@ dolphin_find_optional_system_library_pkgconfig(ZLIB zlib-ng ZLIB::ZLIB Externals - - # https://github.com/zlib-ng/minizip-ng/commit/6c5f265a55f1a12a7a016cd2962feff91cff5d2e - add_definitions(-DMZ_COMPAT_VERSION=110) # This macro is for forwards compatibility with 4.0.4+ --dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip>=3.0.0 minizip::minizip Externals/minizip) -+dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip-ng>=3.0.0 minizip::minizip Externals/minizip) - - dolphin_find_optional_system_library(LZO Externals/LZO) - diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index b4698480a962..95b06b960857 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/shiiion/dolphin"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ashkitten Madouura ]; + maintainers = with maintainers; [ Madouura ]; broken = stdenv.isDarwin; platforms = platforms.unix; }; diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix index 9920e9e77baf..855e4cd18b3e 100644 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ b/pkgs/applications/emulators/dosbox-x/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-x"; - version = "2024.03.01"; + version = "2024.07.01"; src = fetchFromGitHub { owner = "joncampbell123"; repo = "dosbox-x"; rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-EcAp7KyqXdBACEbPgkM1INoKeGVo7hMDUx97y2RcX+k="; + hash = "sha256-mOoOvmsBW6igi5BiLNcmTSKmTeEkBK9WwPu/WKBSJC4="; }; # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 804c5b1cceee..29419af7dd74 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -38,14 +38,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.266"; + version = "0.267"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-nggpDKcZURwC4SQHiRnF7lJNaAWSniVHvsF/IjAPd9E="; + hash = "sha256-H3idND2cC0KSGa9EIEVN2diticfM9r6FwRqQYkWmEM0="; }; outputs = [ "out" "tools" ]; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 708c8db9d3e6..77b9e6cef4b5 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -5,10 +5,10 @@ "src": { "owner": "libretro", "repo": "libretro-2048", - "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2", - "hash": "sha256-gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA=" + "rev": "5474ed1ab880b3296c9860d0943d7de1970c79dd", + "hash": "sha256-i6bbxsLpSicDDGYKAxTMCMioHHfvBzVokun3PNYgDsc=" }, - "version": "unstable-2023-02-20" + "version": "unstable-2024-06-28" }, "atari800": { "fetcher": "fetchFromGitHub", @@ -35,20 +35,20 @@ "src": { "owner": "libretro", "repo": "beetle-lynx-libretro", - "rev": "48909ddd1aba4de034d9c1da70c460b1724daa3b", - "hash": "sha256-aAS9N54kA2st1+3BodiXDR4sbUDSvoFHpa28D9sohx4=" + "rev": "d982616da671c3dd9c9271dd9d95c5c7d1393191", + "hash": "sha256-pAk5uLv5/2n3lZOWp5a5IdPqHM9vLacv8/X6wni5+dE=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "beetle-ngp": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-ngp-libretro", - "rev": "673c3d924ff33d71c6a342b170eff5359244df1f", - "hash": "sha256-V3zcbEwqay3eXwXzXZkmHj3+rx9KY4r0WkzAYFZXlgY=" + "rev": "09869bb6032610714e22d09b95a81ea291937a8f", + "hash": "sha256-chMtMPUMHQ0iVcERfQApKnGQmV822QkYce2wvSj2Uck=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "beetle-pce": { "fetcher": "fetchFromGitHub", @@ -65,30 +65,30 @@ "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "a653bbbdc5cf2bf960e614efdcf9446a9aa8cdf9", - "hash": "sha256-ty4Uluo8D8x+jB7fOqI/AgpTxdttzpbeARiICd3oh9c=" + "rev": "9ebf08571e20e79db32be78a025a8b552e9a3795", + "hash": "sha256-iE81/8RMkCaJuFOMSfZzCC7BFOFBv/0cNpcJRuQC0ws=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-06-28" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "47c355b6a515aef6dc57f57df1535570108a0e21", - "hash": "sha256-ylFo/wmLQpQGYSrv9PF2DBmr/8rklmHF9R+3y8v93Rs=" + "rev": "94541ff5bf9c474aa2923fed3afc4297678c9ede", + "hash": "sha256-+E09lQmogRvLc+6TzI0FNfu18jRdZMOzEYJnQjYuldI=" }, - "version": "unstable-2023-05-28" + "version": "unstable-2024-06-28" }, "beetle-psx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "6e881f9939dd9b33fb5f5587745524a0828c9ef4", - "hash": "sha256-mFIqsybkpSF17HmrfReazYUqVLzuDGwCjzaV7BTLKJ8=" + "rev": "a90ceba8339c73abc2f28ff20ec65fce16904816", + "hash": "sha256-8e2Qw34+Y1cRxQWATj4F7+SzZEVlwk0Uoo9GHYOM8l4=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-07-05" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", @@ -115,30 +115,30 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "29b2a6e12c13d623ad94dcb64e1cb341d93ff02d", - "hash": "sha256-sbpCG3QsSn8NOjWC0snvsd7jZYClSbKI79QUnigQwzc=" + "rev": "0e6ce96d68c1565d1cfb2d64841970f19f3cfb66", + "hash": "sha256-4LEvzyIpWBH0jfTuJaRxYe1fKdrw7/Mes6UlkxNyS58=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-06-28" }, "beetle-vb": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-vb-libretro", - "rev": "9d1bd03f21dac7897f65269e1095496331efce8b", - "hash": "sha256-CT6CfRe8TOgXuJoUA0TKl71m10XeocUCTUjh88eCenU=" + "rev": "4395c809d407c8b5a80b0d0ee87783aad5fedf8f", + "hash": "sha256-lO4tbJeQIZPGhW0Ew0BOcfbwNeV+yR8PTZ/RyCIt14s=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "beetle-wswan": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-wswan-libretro", - "rev": "32bf70a3032a138baa969c22445f4b7821632c30", - "hash": "sha256-dDph7LNlvzVMVTzkUfGErMEb/tALpCADgTjnzjUHYJU=" + "rev": "440e9228592a3f603d7d09e8bee707b0163f545f", + "hash": "sha256-+98gCDBYeqUlFGzX83lwTGqSezLnzWRwapZCn4T37uE=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "blastem": { "fetcher": "fetchFromGitHub", @@ -155,20 +155,20 @@ "src": { "owner": "libretro", "repo": "bluemsx-libretro", - "rev": "df29d437204af0a5158b6ecb2d6b68296f8d979a", - "hash": "sha256-ULDnLHbEQ1+VR3axfbVaH4Kkuq/UDBA9JGuW9beraZ4=" + "rev": "1f6b5b393df17e746bec118902b1d1f6ed3e4109", + "hash": "sha256-yndOlTf4OKUP98L1EN+LW4mwtl6LWQ95ILYo8Y+2Geg=" }, - "version": "unstable-2024-05-20" + "version": "unstable-2024-06-28" }, "bsnes": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "c5963607b59c8d56d28bb4de3f7ac555e004c69e", - "hash": "sha256-YmOy2iaQYqaIp4u4cIQx8Z8jUqaIhPdJZTFgSETQprs=" + "rev": "83591216128368943c509f028d06bc0277c5752d", + "hash": "sha256-7y7ZmEigiOIGFKCNJFLWQFT8Tp4oXe3lbVOrprfLzR8=" }, - "version": "unstable-2024-06-21" + "version": "unstable-2024-07-05" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", @@ -246,10 +246,10 @@ "src": { "owner": "schellingb", "repo": "dosbox-pure", - "rev": "1e3cb35355769467ca7be192e740eb9728ecc88c", - "hash": "sha256-svVpHUOPPAFMypmeaHLCQfwTAVOZajTMKyeKvWLZlcc=" + "rev": "bcb46c4a8803028d5f64935e80433338464dfc0f", + "hash": "sha256-ce3QcKonKsuGolB2RhKlWYtHI2Et54/ITG27UkWgQn8=" }, - "version": "unstable-2024-06-03" + "version": "unstable-2024-07-07" }, "easyrpg": { "fetcher": "fetchFromGitHub", @@ -267,10 +267,10 @@ "src": { "owner": "libretro", "repo": "81-libretro", - "rev": "525d5c18f1ff3fc54c37e083a475225d9179d59d", - "hash": "sha256-H0w9hcAUVOGr0PtNLVdFQScxd3ildZZ68w+TL7vG4jk=" + "rev": "c0d56c5bc5cd48715b4e83cbb3d241a6bed94c2a", + "hash": "sha256-XkXZlH359NtOemkArSc1+UXhU55W3hVeM7zH/LRr1zo=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "fbalpha2012": { "fetcher": "fetchFromGitHub", @@ -287,162 +287,162 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "634d207adade213bbe83684be2a183d158f56e52", - "hash": "sha256-hmnb7euH2VfGnF8ztGFhXYmqaCY49APDG0Y3s4ku7Ac=" + "rev": "b63598f8120f280db24c3af5433274c6a2eb6d91", + "hash": "sha256-2fD2+VhibQGZM7twN2JHc1K4/502v1ZzmmZrE8ODLYk=" }, - "version": "unstable-2024-06-02" + "version": "unstable-2024-07-08" }, "fceumm": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "fe4a4f8a53cc7f91278f393710abb4f32c4e0a8f", - "hash": "sha256-/rZoARZf3SfN8E0o0qm34FYCYscqeEcLg3eYSXenK8s=" + "rev": "d2557ae061d7251bf3fff69ec943077d1711ad16", + "hash": "sha256-wGbmdSSRc9lZ+K89q/cS8AvSLpfZbVsXByojdnoVSqo=" }, - "version": "unstable-2024-06-15" + "version": "unstable-2024-07-05" }, "flycast": { "fetcher": "fetchFromGitHub", "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "7d645541f8f8b7f4550eabe9157d8fb82b43c1a7", - "hash": "sha256-/RLh6FO3lk6L1yhTMGLt7sjY/vwlb1y2XxmtgO5+uOk=", + "rev": "c6f50fad9d4bb735f02444fddb14f53cfb6bacfc", + "hash": "sha256-okcCxM8lyaVAMAVzcuGEWAeQvwh9IqOqFpqQYJ6gReY=", "fetchSubmodules": true }, - "version": "unstable-2024-06-23" + "version": "unstable-2024-07-05" }, "fmsx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "fmsx-libretro", - "rev": "9b5cf868825a629cc4c7086768338165d3bbf706", - "hash": "sha256-zDDAMzV+pfu+AwjgXwduPfHyW1rQnvaDpFvz++QBBkA=" + "rev": "cf97a3c6da07d5f8e98c90c907ad987ffea432e0", + "hash": "sha256-mPgmt05XDnB+eIWtOpBfZ37Cz24VBei1lLLaYsJNeAA=" }, - "version": "unstable-2024-02-08" + "version": "unstable-2024-06-28" }, "freeintv": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "freeintv", - "rev": "85bf25a39a34bbc39fe36677175d87c2b597dbe7", - "hash": "sha256-4cU/YRZZb7EWNBJX8M91Lb+bCCIlks6xX2Cf6Iq/g9g=" + "rev": "6bd91d0d83d896e66b9fd7e5e239f93f00e4ad87", + "hash": "sha256-P3devj/aAa0e/QpV68kQkLAvhrVGO8O8ijkUAobgUb0=" }, - "version": "unstable-2023-04-17" + "version": "unstable-2024-06-28" }, "fuse": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "fuse-libretro", - "rev": "9fc41a5f153e1f2fa2dbcfdd215c7ec97d98a29c", - "hash": "sha256-eEgPnSIpKC7s+4JoEHDGPlwYPa5Y8EpoxmNhyOIIcU8=" + "rev": "4d511d7fc3faa7714fa5de2e824793d35d5f4da8", + "hash": "sha256-mfCv7PvroPqzJ/nXCa74h0c7lHlbTVnJM3rNIj3UvQI=" }, - "version": "unstable-2024-06-16" + "version": "unstable-2024-06-28" }, "gambatte": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "594422484170a0a075d02d702d3367819c9d4e1a", - "hash": "sha256-pCoQ+9Sx4dBhbnJTQ00nJAb8ooUp/6pVxTdGtL2tX0c=" + "rev": "5d47507d3e25354478b216111b30741868d0362b", + "hash": "sha256-PkvV3ALtC53v+Te9lGuUWeOfXr8CZSxCdClgS59vpns=" }, - "version": "unstable-2024-06-21" + "version": "unstable-2024-06-29" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "3bf89541aca5768cda7f834e5c5a6041fd4a5f27", - "hash": "sha256-s8MmlcPdnS6esSWS3GD53X7UzwP2RNjtL3QYnPbgStQ=" + "rev": "5355eae2e1c70893a14ec0fda68de4e49cd5a0d5", + "hash": "sha256-134J1ifF9EOaPk6qqANdJawVtoa1M91Bc5jqxA0hMOM=" }, - "version": "unstable-2024-06-21" + "version": "unstable-2024-06-29" }, "gpsp": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gpsp", - "rev": "4caf7a167d159866479ea94d6b2d13c26ceb3e72", - "hash": "sha256-1hkxeTjY52YuphQuDMCITn/dIcNx/8w4FkhQjL8DWz8=" + "rev": "bfbdfda215889cad5ae314bd5221d773a343b5bd", + "hash": "sha256-l3hr5c7kIgr7Rjfneai6cTpUswMpba51TlZSSreQkyE=" }, - "version": "unstable-2024-02-10" + "version": "unstable-2024-06-28" }, "gw": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gw-libretro", - "rev": "0ecff52b11c327af52b22ea94b268c90472b6732", - "hash": "sha256-N/nZoo+duk7XhRtNdV1paWzxYUhv8nLUcnnOs2gbZuQ=" + "rev": "feab76c102166784230dc44c45cad4cb49a1c9a7", + "hash": "sha256-dtcsPTemFqgfBtFp4RF0Q2B/3bCHY4CqJGibwV+lfwI=" }, - "version": "unstable-2023-05-28" + "version": "unstable-2024-06-28" }, "handy": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-handy", - "rev": "65d6b865544cd441ef2bd18cde7bd834c23d0e48", - "hash": "sha256-F4WyiZBNTh8hjuCooZXQkzov0vcHNni6d5mbAMgzAiA=" + "rev": "15d3c87e0eba52464ed759d3702d7cb7fdd0d7e0", + "hash": "sha256-aebQGTGYF1jlZdSzb3qQ6PIyQZ00hEKfH6W6pYYQUBw=" }, - "version": "unstable-2024-01-01" + "version": "unstable-2024-06-28" }, "hatari": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "hatari", - "rev": "a4c9eb0bb79e47a2870c12b04566c1f8d25e4bf3", - "hash": "sha256-mHz2nB9Vr/PVifd6w+kz7ZCH+N8igmcS8InvevZoSpE=" + "rev": "c10a21dbe99277b06ccf7de10eceb74f5d57e921", + "hash": "sha256-R5N7EUVUKJ1GXQtnlCCE33DlDsxMzpPp6pYUHJJ/5Ig=" }, - "version": "unstable-2023-09-29" + "version": "unstable-2024-06-28" }, "mame": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "mame", - "rev": "db65a583bd2da39514a544c58362a6ac170179ac", - "hash": "sha256-FTsoLsx7IhyAw/pdaGAeNzysc7vZ3CcyXKWcBJ0pOb8=", + "rev": "1e31f3a77644341e0ff9065aff3bc249fb024978", + "hash": "sha256-NqSPyyGRK1knL/RZ1Md8JjT3W6gRBpomgZiIH2Mp3co=", "fetchSubmodules": true }, - "version": "unstable-2024-06-13" + "version": "unstable-2024-07-07" }, "mame2000": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "mame2000-libretro", - "rev": "905808fbcc3adf8c610c1c60f0e41ce4b35db1c5", - "hash": "sha256-2J3QGlSb4YhDZND4T0wmt9zzDjOuNiscsMxn9zA1TtI=" + "rev": "2ec60f6e1078cf9ba173e80432cc28fd4eea200f", + "hash": "sha256-AYZj7bvO9oc7wmEBbj6DPRzpQFHl8diIcunSSpD4Vok=" }, - "version": "unstable-2024-05-07" + "version": "unstable-2024-07-01" }, "mame2003": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "ce82eaa30932c988e9d9abc0ac5d6d637fb88cc6", - "hash": "sha256-vCqv2EhgYtJwNE2sRcs8KTg0cGlRSmhykRLkt8mUKlg=" + "rev": "c8f28b100851fa850e2be3b8b30e2839a2d175cc", + "hash": "sha256-IQ6s6mOMMHX8GjNNfc0pZFjSZyJurpm40FHcyErfOPM=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-29" }, "mame2003-plus": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "ecd00b18187c7fff75b6d9a70ac1b349e79652bb", - "hash": "sha256-1dVNNlDKDJwGHou/bY/grj/p9BJmfUwDxEiw2zQ7gSg=" + "rev": "85edcf558832f0e0e0fcf61ebe0b8d041ef6a0c1", + "hash": "sha256-AlscqXw8sV3yrMNPOjtwW8BjBKhXtfNYaLpEMZexq5g=" }, - "version": "unstable-2024-06-08" + "version": "unstable-2024-07-08" }, "mame2010": { "fetcher": "fetchFromGitHub", @@ -529,21 +529,21 @@ "src": { "owner": "Javanaise", "repo": "mrboom-libretro", - "rev": "a7af125dc9ef65c9a1b43136a75374bbac5458ee", - "hash": "sha256-hPJ8MpJOPGkckB0rj1uQ9BmY+0//Lj9jfNA9hfpdu3o=", + "rev": "22765ce7176d236d846f504318a51c448d2b469b", + "hash": "sha256-hzdc4PM/EARNEtpeATo4VohXtkeBra6rCz3tdIgBfVw=", "fetchSubmodules": true }, - "version": "unstable-2024-05-19" + "version": "unstable-2024-07-01" }, "mupen64plus": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", - "rev": "5d2ac21adb784ad72d6101290117702eef0411dd", - "hash": "sha256-PKjnoTioAvCYv2JBiPMXR4QZUgPeSQ3V4cB7mp2fqeI=" + "rev": "147dc7e552b84d5c51d09108fa5ada0268710170", + "hash": "sha256-qsjoal3r/4QRJ0B5FcupZBhf9gyeIfok5cxsjeNJhrM=" }, - "version": "unstable-2024-05-21" + "version": "unstable-2024-06-28" }, "neocd": { "fetcher": "fetchFromGitHub", @@ -560,10 +560,10 @@ "src": { "owner": "libretro", "repo": "nestopia", - "rev": "1fc8c32b91c64aed056fa6d26359f1831c455c70", - "hash": "sha256-LjdIOcwzWRSQTxJeWsQzGuYGOUsPycNzURoG029zpHk=" + "rev": "be1139ec4d89151fc65b81a3494d2b9c0fd0b7dc", + "hash": "sha256-8MoEYcywnqNtn4lntp8WcIYMTzKhaHkHyDMHMhHHxxg=" }, - "version": "unstable-2024-06-22" + "version": "unstable-2024-06-28" }, "np2kai": { "fetcher": "fetchFromGitHub", @@ -581,20 +581,20 @@ "src": { "owner": "libretro", "repo": "nxengine-libretro", - "rev": "1f371e51c7a19049e00f4364cbe9c68ca08b303a", - "hash": "sha256-4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0=" + "rev": "11fc0892dc6b99b36ecf318006834932cd5b817a", + "hash": "sha256-PlU3op50yPgDUXZxSOlltMf/30JLrotpp61UHK1uKB8=" }, - "version": "unstable-2023-02-21" + "version": "unstable-2024-06-28" }, "o2em": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-o2em", - "rev": "44fe5f306033242f7d74144105e19a7d4939477e", - "hash": "sha256-zg8wplVTKRzqa47mmWlqribg+JU4Nap4Ar/iR7y87xs=" + "rev": "c8f458d035392963823fbb50db0cec0033d9315f", + "hash": "sha256-riqMXm+3BG4Gz0wrmVFxtVhuMRtZHZqCViAupp/Q42U=" }, - "version": "unstable-2023-10-19" + "version": "unstable-2024-06-28" }, "opera": { "fetcher": "fetchFromGitHub", @@ -611,10 +611,10 @@ "src": { "owner": "libretro", "repo": "parallel-n64", - "rev": "dfc8d55686a364cad85411dabb76c7fb94acd730", + "rev": "334998e6129debe50f7ef9c5cd1e995460ae2da8", "hash": "sha256-ngENgmBQFHUYRp9DBnQLWapvfhnFra/B+jeegm8+rtE=" }, - "version": "unstable-2024-06-18" + "version": "unstable-2024-06-29" }, "pcsx2": { "fetcher": "fetchFromGitHub", @@ -631,21 +631,21 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "1cdeae2b66fc3ef486ec8016ed5fad437f1a4409", - "hash": "sha256-Zw5CWDeAy3pUV4qXFIfs6kFlEaYhNhl+6pu5fOx34j0=" + "rev": "459f02ad03fa10b5c403fed724d47fe5adfd5fb1", + "hash": "sha256-bM2o6ukVXyrH9QnczHUtZCLu6Kwl6Gc9DriLvVHJmXw=" }, - "version": "unstable-2024-06-17" + "version": "unstable-2024-06-29" }, "picodrive": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "picodrive", - "rev": "535217f16bc2848ec70985c41e1d131709352641", - "hash": "sha256-K96eN3Erw1G+vQa8pag72hrtgf+tttoNIMXdgCGNy6k=", + "rev": "d6f625a1251c78caf6f2dc81c1ffdb724587bb24", + "hash": "sha256-3RjPYXVfv1ts8Khl/9hkWMdYalNoQmHb+S8xgNfstpo=", "fetchSubmodules": true }, - "version": "unstable-2024-06-15" + "version": "unstable-2024-06-30" }, "play": { "fetcher": "fetchFromGitHub", @@ -663,31 +663,31 @@ "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "2a3aaed71135d9574f002073ceae74356b29c900", - "hash": "sha256-WU48YrRUWaJi1xcHRxP7JigaJZ8Vbm/v4w9LdD5TvLo=", + "rev": "0b76d443e2c6992107666111d6c0ab994a39451d", + "hash": "sha256-PMt8zqDbGhVUeHIA2uvBvQAfsaCwZzVcnLT8fJ6Fexo=", "fetchSubmodules": true }, - "version": "unstable-2024-06-24" + "version": "unstable-2024-07-02" }, "prboom": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-prboom", - "rev": "9d412db570d3291829b308e6d1ac17f04acdda17", - "hash": "sha256-50Nl8IyaQRLOQtTRYhJFwTH8ojMxNVVn/c+oGCeJts0=" + "rev": "2972aa92e0490194a37c9fb849ffc420abeb0ce4", + "hash": "sha256-VXrhSZpGNjfxU34b2gzxaPe0YKXv4K7+vB7MrC7/bkY=" }, - "version": "unstable-2024-05-23" + "version": "unstable-2024-06-28" }, "prosystem": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "prosystem-libretro", - "rev": "4202ac5bdb2ce1a21f84efc0e26d75bb5aa7e248", - "hash": "sha256-BR0DTWcB5g0rEoNSxBx+OxBmLELjdR2fgsmdPU7cK68=" + "rev": "a639359434cde73e6cdc651763afc587c1afb678", + "hash": "sha256-rcn1puMQXCKogONe2oUpcDEj8S6/oVRcuWLDkinZgnk=" }, - "version": "unstable-2023-08-17" + "version": "unstable-2024-06-28" }, "puae": { "fetcher": "fetchFromGitHub", @@ -704,10 +704,10 @@ "src": { "owner": "libretro", "repo": "QuickNES_Core", - "rev": "cd73f021be7dd5b1a21b71155a320364c02de4ac", - "hash": "sha256-fmTAK32ASA8M5nxUUUilm/yMNkmqSAG/gauB7fy1Kbc=" + "rev": "89d649a544e7d37a5cdbc77c811e88753fa23131", + "hash": "sha256-OPZVYQVbtIfmmKmuLQ5eVqZf+41ovyoa17YHvjKgd6w=" }, - "version": "unstable-2024-02-01" + "version": "unstable-2024-06-28" }, "same_cdi": { "fetcher": "fetchFromGitHub", @@ -724,10 +724,10 @@ "src": { "owner": "libretro", "repo": "sameboy", - "rev": "09138330990da32362246c7034cf4de2ea0a2a2b", - "hash": "sha256-hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4=" + "rev": "51433012a871a44555492273fd22f29867d12655", + "hash": "sha256-vPT2uRGbXmJ62yig/yk485/TxEEKHJeWdNrM2c0IjKw=" }, - "version": "unstable-2022-08-19" + "version": "unstable-2024-06-28" }, "scummvm": { "fetcher": "fetchFromGitHub", @@ -754,10 +754,10 @@ "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "d514d135a7d3521e16e9ea599690e36e95c5c1aa", - "hash": "sha256-qk73jA8J6QD9Fp1tjqEf3eDLhJxp206gsku42ICjqPY=" + "rev": "921f9f7b83660eb44ad263022a57a4a029057c37", + "hash": "sha256-trKxGE1WDG7JM7qbhd4o9nvSW6noYobU7nZ/Nz2NeS8=" }, - "version": "unstable-2024-06-18" + "version": "unstable-2024-07-07" }, "snes9x2002": { "fetcher": "fetchFromGitHub", @@ -774,30 +774,30 @@ "src": { "owner": "libretro", "repo": "snes9x2005", - "rev": "fd45b0e055bce6cff3acde77414558784e93e7d0", - "hash": "sha256-zjA/G62V38/hj+WjJDGAs48AcTUIiMWL8feCqLsCRnI=" + "rev": "285220ed696ec661ce5c42856e033a1586fda967", + "hash": "sha256-jKRu93zw6U9OYn35zXYJH/xCiobsZdzWROge7+sKh6M=" }, - "version": "unstable-2022-07-25" + "version": "unstable-2024-06-28" }, "snes9x2010": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "snes9x2010", - "rev": "d8b10c4cd7606ed58f9c562864c986bc960faaaf", - "hash": "sha256-7FmteYrAYr+pGNXGg9CBC4NFlijGRf7GdtJfiNjmonU=" + "rev": "84b963a2f627bbc41198e357430619f34bbebc8a", + "hash": "sha256-s358pyMH4vIQt1f0Mgw1U5gwUW0aSqVtwyeyoL/4Ok8=" }, - "version": "unstable-2023-02-20" + "version": "unstable-2024-06-28" }, "stella": { "fetcher": "fetchFromGitHub", "src": { "owner": "stella-emu", "repo": "stella", - "rev": "9381a67604a81a5ddfc931581ba7ba53bc7680cb", - "hash": "sha256-TLLUCRYy6G0ylQKZEiaUPBCkjOAEJRmTI3s7xWPGgiA=" + "rev": "69b300b6f9d46c4f9caa2df1f848a74163cd1173", + "hash": "sha256-8TgbZzmuwDUn23zR1/XKIOdrLwgzq18oMS1KOhSs1oQ=" }, - "version": "unstable-2024-06-23" + "version": "unstable-2024-06-30" }, "stella2014": { "fetcher": "fetchFromGitHub", @@ -814,20 +814,20 @@ "src": { "owner": "libretro", "repo": "swanstation", - "rev": "7a27436548128c00e70b08dde63c52118e2a6228", - "hash": "sha256-u7D044lKNAH4aAaY/Ol7BR3dNeusX4wirIMdUEGw2oM=" + "rev": "365e29cf5869a196070d73a9b2a2e2c80ac8f0ad", + "hash": "sha256-TiVGzLwK1FJlpHl70lj2Yc4q2i5KQ9WRsbMvGWy5IU0=" }, - "version": "unstable-2024-05-30" + "version": "unstable-2024-07-08" }, "tgbdual": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "tgbdual-libretro", - "rev": "a6f3018e6a23030afc1873845ee54d4b2d8ec9d3", - "hash": "sha256-MBUgYXX/Pc+TkwoS7OwbXSPssKUf6lwWx/bKhvwDkHs=" + "rev": "fba7d50b136abef0692b434091a9d735f7ad28b2", + "hash": "sha256-f6PGtUkIOyUHQbbJdgQiWmw2armjyuP1CTcWfRbx9uE=" }, - "version": "unstable-2022-08-06" + "version": "unstable-2024-07-01" }, "thepowdertoy": { "fetcher": "fetchFromGitHub", @@ -855,30 +855,30 @@ "src": { "owner": "libretro", "repo": "vbam-libretro", - "rev": "a2378f05f600a5a9cf450c60a87976b80d6a895a", - "hash": "sha256-vWm28cSEGex5h7JkJjzNPqEGtQWHK0dpK2gVDlQ3NbM=" + "rev": "b5a4788747fa46afe681080db758f4a827ff7274", + "hash": "sha256-R/WaUiVlRbytra/jJyZZvkDbmnZvsO4RLFYYTp5Rcvo=" }, - "version": "unstable-2023-08-18" + "version": "unstable-2024-06-28" }, "vba-next": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "vba-next", - "rev": "ee92625d2f1666496be4f5662508a2430e846b00", - "hash": "sha256-r3FKBD4GUUkobMJ33VceseyTyqxm/Wsa5Er6XcfGL2Q=" + "rev": "2c726f25da75a5600ef5791ce904befe06c4dddd", + "hash": "sha256-Elb6cOm2oO+3fNUaTXLN4kyhftoJ/oWXD571mXApybs=" }, - "version": "unstable-2023-06-03" + "version": "unstable-2024-06-28" }, "vecx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-vecx", - "rev": "3a5655ff67e161ef33f66b0f6c26aaf2e59ceda8", - "hash": "sha256-NGZo1bUGgw4YMyyBfTsvXPQG/P130mkXzt4GXE/yatU=" + "rev": "0e48a8903bd9cc359da3f7db783f83e22722c0cf", + "hash": "sha256-lB8NSaxDbN2qljhI0M/HFDuN0D/wMhFUQXhfSdGHsHU=" }, - "version": "unstable-2024-03-17" + "version": "unstable-2024-06-28" }, "virtualjaguar": { "fetcher": "fetchFromGitHub", diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index dfc72683d7d3..54fea4cc901e 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -176,7 +176,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } # https://bugs.winehq.org/show_bug.cgi?id=43530 # https://github.com/NixOS/nixpkgs/issues/31989 - hardeningDisable = [ "bindnow" ] + hardeningDisable = [ "bindnow" "stackclashprotection" ] ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify" ++ lib.optional (supportFlags.mingwSupport) "format"; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 9abb44fd61a4..8082194500cc 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.11"; + version = "9.12"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-36AMJk6nEWnQKoSagz5Iyudh+whCKgDfhkTr1nv4ckA="; + hash = "sha256-CRRa5yCy+fGBh5cLoGQLvzztWujceK8dfVf1B37CavY="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -88,9 +88,9 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "9.1.0"; + version = "9.2.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-igoeaDe0lN9Jkn5ddZscaQjom4ovjjrQJeHCiBiCR24="; + hash = "sha256-/VgpJE2SmFuKQEdFrd21jDqbC7ttVMpMbq+G6kZnNfk="; }; updateScript = writeShellScript "update-wine-unstable" '' @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-vqlikMatRlGxvWJ6BJu2HyBclV4x+vzNPNe8py7jKqo="; + hash = "sha256-lvjuohEo4pwCAd1KmLjUBakS5gSN+Ic6+QQ18sS3axw="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/emulators/yabause/default.nix b/pkgs/applications/emulators/yabause/default.nix index 53fcc870f1a1..7623cc49efb9 100644 --- a/pkgs/applications/emulators/yabause/default.nix +++ b/pkgs/applications/emulators/yabause/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL -, freeglut ? null, openal ? null, SDL2 ? null }: +, libglut ? null, openal ? null, SDL2 ? null }: mkDerivation rec { pname = "yabause"; @@ -11,7 +11,7 @@ mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL freeglut openal SDL2 ]; + buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL libglut openal SDL2 ]; patches = [ ./linkage-rwx-linux-elf.patch diff --git a/pkgs/applications/file-managers/browsr/default.nix b/pkgs/applications/file-managers/browsr/default.nix index ba88f782ef65..92895378c355 100644 --- a/pkgs/applications/file-managers/browsr/default.nix +++ b/pkgs/applications/file-managers/browsr/default.nix @@ -18,7 +18,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ hatchling - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/file-managers/pcmanfm/default.nix b/pkgs/applications/file-managers/pcmanfm/default.nix index 5c614fdede9f..3e8d22a65b8d 100644 --- a/pkgs/applications/file-managers/pcmanfm/default.nix +++ b/pkgs/applications/file-managers/pcmanfm/default.nix @@ -8,7 +8,7 @@ , pango , pkg-config , wrapGAppsHook3 -, gnome +, adwaita-icon-theme , withGtk3 ? true , gtk2 , gtk3 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc="; }; - buildInputs = [ glib gtk libfm' libX11 pango gnome.adwaita-icon-theme ]; + buildInputs = [ glib gtk libfm' libX11 pango adwaita-icon-theme ]; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 99810a8d496f..722363a9b070 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeatureAs (arch != null) "gcc-arch" arch) (lib.withFeature librsvgSupport "rsvg") (lib.withFeature liblqr1Support "lqr") - (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript}/share/ghostscript/fonts") + (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts") (lib.withFeature ghostscriptSupport "gslib") ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ # due to libxml2 being without DLLs ATM diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 671affec32d5..0819a314bd27 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeature librsvgSupport "pango") (lib.withFeature liblqr1Support "lqr") (lib.withFeature libjxlSupport "jxl") - (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript}/share/ghostscript/fonts") + (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts") (lib.withFeature ghostscriptSupport "gslib") ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ # due to libxml2 being without DLLs ATM diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 2bd13de7d5d6..e9ab27660605 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, fetchurl, unzip -, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, gnome +, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, adwaita-icon-theme , xorg, mozjpeg, makeWrapper, wrapGAppsHook3, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [makeWrapper wrapGAppsHook3 unzip]; - buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 adwaita-icon-theme ]; # src is producing multiple folder on unzip so we must # override unpackCmd to extract it into newly created folder diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index 05fb56bb5d7d..111e37711ef3 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "azpainter"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitLab { owner = "azelpg"; repo = pname; rev = "v${version}"; - hash = "sha256-RlsiN9pefpTYUh4M8j4Ty/Ipi9StoVcNcICd7QDirhI="; + hash = "sha256-NiQYX/Dcl/t30Jx08DKr6EP5ODS00pyEGKh/qiNT5t4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix deleted file mode 100644 index 1ff914c2740d..000000000000 --- a/pkgs/applications/graphics/batik/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "batik"; - version = "1.17"; - - src = fetchurl { - url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz"; - sha256 = "sha256-sEJphF3grlwZCEt3gHHm4JF8RpvKKBLLvKXf2lu/dhA="; - }; - - meta = with lib; { - description = "Java based toolkit for handling SVG"; - homepage = "https://xmlgraphics.apache.org/batik"; - license = licenses.asl20; - platforms = platforms.unix; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - }; - - installPhase = '' - mkdir $out - cp -r * $out/ - ''; -} diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 362de3633ab2..561a365b5621 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -38,7 +38,7 @@ , colord-gtk , libwebp , libsecret -, gnome +, adwaita-icon-theme , SDL2 , ocl-icd , pcre @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { libwebp libsecret SDL2 - gnome.adwaita-icon-theme + adwaita-icon-theme osm-gps-map pcre isocodes diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 448b371d2ca9..4ad76a3d98d9 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "24.6.1"; + version = "24.6.4"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-trBSNE5OBBNq18Dn/IwhHpD3ZQ7C5venwsBtyZxv+2k="; + hash = "sha256-6+a+70uN4Tk4pMXg3DQ3D0GcLNGFQEcPG05xxyUv1DQ="; }; # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-9Hq08DXEiOK0P+x89Gl3Y2+dN5r7aS7GNrCSVDGMpFs="; + hash = "sha256-R8eCnp/ik3EfsmsVyJfLjyScUVQSm/EdXJesS/eVIX0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 0522879d9d3e..3bdb37900de0 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -2,10 +2,14 @@ , lib , mkDerivation , fetchFromGitHub +, cargo , extra-cmake-modules +, rustc +, rustPlatform # common deps , karchive +, qtwebsockets # client deps , qtbase @@ -20,7 +24,6 @@ , kdnssd , libvpx , miniupnpc -, qtx11extras # kis # optional server deps , libmicrohttpd @@ -33,10 +36,10 @@ , buildServer ? true , buildServerGui ? true # if false builds a headless server , buildExtraTools ? false -, enableKisTablet ? false # enable improved graphics tablet support }: -with lib; +assert lib.assertMsg (buildClient || buildServer || buildExtraTools) + "You must specify at least one of buildClient, buildServer, or buildExtraTools."; let clientDeps = [ @@ -57,54 +60,57 @@ let # optional: libmicrohttpd # HTTP admin api libsodium # ext-auth support - ] ++ optional withSystemd systemd; - - kisDeps = [ - qtx11extras - ]; - - boolToFlag = bool: - if bool then "ON" else "OFF"; + ] ++ lib.optional withSystemd systemd; in mkDerivation rec { pname = "drawpile"; - version = "2.1.20"; + version = "2.2.1"; src = fetchFromGitHub { owner = "drawpile"; repo = "drawpile"; rev = version; - sha256 = "sha256-HjGsaa2BYRNxaQP9e8Z7BkVlIKByC/ta92boGbYHRWQ="; + sha256 = "sha256-NS1aQlWpn3f+SW0oUjlYwHtOS9ZgbjFTrE9grjK5REM="; }; - nativeBuildInputs = [ extra-cmake-modules ]; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-V36yiwraXK7qlJd1r8EtEA4ULxlgvMEmpn/ka3m9GjA="; + }; + + nativeBuildInputs = [ + cargo + extra-cmake-modules + rustc + rustPlatform.cargoSetupHook + ]; buildInputs = [ karchive + qtwebsockets ] - ++ optionals buildClient clientDeps - ++ optionals buildServer serverDeps - ++ optionals enableKisTablet kisDeps; + ++ lib.optionals buildClient clientDeps + ++ lib.optionals buildServer serverDeps; cmakeFlags = [ - "-Wno-dev" - "-DINITSYS=systemd" - "-DCLIENT=${boolToFlag buildClient}" - "-DSERVER=${boolToFlag buildServer}" - "-DSERVERGUI=${boolToFlag buildServerGui}" - "-DTOOLS=${boolToFlag buildExtraTools}" - "-DKIS_TABLET=${boolToFlag enableKisTablet}" + (lib.cmakeFeature "INITSYS" (lib.optionalString withSystemd "systemd")) + (lib.cmakeBool "CLIENT" buildClient) + (lib.cmakeBool "SERVER" buildServer) + (lib.cmakeBool "SERVERGUI" buildServerGui) + (lib.cmakeBool "TOOLS" buildExtraTools) ]; meta = { description = "Collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously"; - mainProgram = "drawpile-srv"; homepage = "https://drawpile.net/"; downloadPage = "https://drawpile.net/download/"; - license = licenses.gpl3; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.unix; broken = stdenv.isDarwin; + } // lib.optionalAttrs buildServer { + mainProgram = "drawpile-srv"; + } // lib.optionalAttrs buildClient { + mainProgram = "drawpile"; }; } - diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index f4adcace1ec4..bc27d93db667 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feh"; - version = "3.10.2"; + version = "3.10.3"; src = fetchFromGitHub { owner = "derf"; repo = "feh"; rev = finalAttrs.version; - hash = "sha256-378rhZhpcua3UbsY0OcGKGXdMIQCuG84YjJ9vfJhZVs="; + hash = "sha256-FtaFoLjI3HTLAxRTucp5VDYS73UuWqw9r9UWKK6T+og="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix index c5f4d08f30e4..3d8cf49711c8 100644 --- a/pkgs/applications/graphics/fiji/default.nix +++ b/pkgs/applications/graphics/fiji/default.nix @@ -7,19 +7,21 @@ , makeDesktopItem , copyDesktopItems , runtimeShell +, unzip }: + stdenv.mkDerivation rec { pname = "fiji"; - version = "20201104-1356"; + version = "20240614-2117"; src = fetchurl { - url = "https://downloads.imagej.net/${pname}/archive/${version}/${pname}-nojre.tar.gz"; - sha256 = "1jv4wjjkpid5spr2nk5xlvq3hg687qx1n5zh8zlw48y1y09c4q7a"; + url = "https://downloads.imagej.net/fiji/archive/${version}/fiji-nojre.zip"; + sha256 = "sha256-OCNnN8CYniNEIfKRHRBoJ3Fo+u5AwXoPJAzUCc4P+f0="; }; dontBuild = true; - nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems unzip ]; buildInputs = [ stdenv.cc.cc.lib ]; desktopItems = [ @@ -46,10 +48,11 @@ stdenv.mkDerivation rec { cp -R * $out/fiji rm -f $out/fiji/jars/imagej-updater-*.jar - # Disgusting hack to stop a local desktop entry being created + # Don't create a local desktop entry and avoid deprecated garbage + # collection option cat < $out/bin/.fiji-launcher-hack #!${runtimeShell} - exec \$($out/fiji/ImageJ-linux64 --dry-run "\$@") + exec \$($out/fiji/ImageJ-linux64 --default-gc --dry-run "\$@") EOF chmod +x $out/bin/.fiji-launcher-hack @@ -72,6 +75,6 @@ stdenv.mkDerivation rec { binaryNativeCode ]; license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ davisrichard437 ]; }; } diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index 5491305fad2c..dfa518c5c574 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -3,7 +3,7 @@ , fetchFromGitLab , alsa-lib , fftw -, freeglut +, libglut , freetype , glew , libjack2 @@ -33,17 +33,17 @@ stdenv.mkDerivation { buildInputs = [ alsa-lib fftw - freeglut.dev + libglut freetype glew libjack2 - libjpeg.dev + libjpeg liblo - libsndfile.dev - libtiff.dev + libsndfile + libtiff ode openal - openssl.dev + openssl racket_7_9 ]; nativeBuildInputs = [ scons ]; diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index def7e3e9dd86..1ff0fd5146df 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -4,7 +4,7 @@ , libjpeg , libGLU , libGL -, freeglut +, libglut , zlib , cmake , libX11 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libjpeg libGLU libGL freeglut zlib libX11 libxml2 libpng libXxf86vm ]; + buildInputs = [ libjpeg libGLU libGL libglut zlib libX11 libxml2 libpng libXxf86vm ]; postPatch = '' sed -i -e '/GECKO/d' CMakeLists.txt diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 4eeb330f6d27..3c44ae0bddf1 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -2,7 +2,7 @@ , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , libarchive, djvulibre, libheif, openjpeg, libjxl, libraw, lua5_3, poppler , gspell, libtiff, libwebp -, gphoto2, imagemagick, yad, exiftool, gnome, libnotify +, gphoto2, imagemagick, yad, exiftool, zenity, libnotify , wrapGAppsHook3, fetchpatch, doxygen , nix-update-script }: @@ -56,18 +56,18 @@ stdenv.mkDerivation rec { # Allow to crop image. # Requires imagemagick, exiv2 and exiftool. sed -i $out/lib/geeqie/geeqie-image-crop \ - -e '1 a export PATH=${lib.makeBinPath [ imagemagick exiv2 exiftool gnome.zenity ]}:$PATH' + -e '1 a export PATH=${lib.makeBinPath [ imagemagick exiv2 exiftool zenity ]}:$PATH' # Requires gphoto2 and libnotify sed -i $out/lib/geeqie/geeqie-tethered-photography \ - -e '1 a export PATH=${lib.makeBinPath [ gphoto2 gnome.zenity libnotify ]}:$PATH' + -e '1 a export PATH=${lib.makeBinPath [ gphoto2 zenity libnotify ]}:$PATH' # Import images from camera. # Requires gphoto2. sed -i $out/lib/geeqie/geeqie-camera-import \ - -e '1 a export PATH=${lib.makeBinPath [ gphoto2 gnome.zenity ]}:$PATH' + -e '1 a export PATH=${lib.makeBinPath [ gphoto2 zenity ]}:$PATH' # Export jpeg from raw file. # Requires exiv2, exiftool and lcms2. sed -i $out/lib/geeqie/geeqie-export-jpeg \ - -e '1 a export PATH=${lib.makeBinPath [ gnome.zenity exiv2 exiftool lcms2 ]}:$PATH' + -e '1 a export PATH=${lib.makeBinPath [ zenity exiv2 exiftool lcms2 ]}:$PATH' ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 5b92093005e0..f2400aca0fd1 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, symlinkJoin, makeWrapper, gimpPlugins, gnome, plugins ? null}: +{ lib, symlinkJoin, makeWrapper, gimpPlugins, gnome-themes-extra, plugins ? null}: let inherit (gimpPlugins) gimp; @@ -19,7 +19,7 @@ in symlinkJoin { wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ --set GIMP2_DATADIR "$out/share/gimp/2.0" \ - --prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \ + --prefix GTK_PATH : "${gnome-themes-extra}/lib/gtk-2.0" \ ${toString extraArgs} done set +x diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 461e1882d378..f5e026c75b71 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, gnome-common, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas , intltool, itstool, makeWrapper, pkg-config, yelp-tools, qrencode }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ]; buildInputs = [ barcode gtk3 gtk-doc yelp-tools - gnome.gnome-common gsettings-desktop-schemas + gnome-common gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool qrencode ]; diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 6aaf257496cd..915a9966ef2c 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, perlPackages, wrapGAppsHook3, fetchpatch, +{ lib, fetchurl, perlPackages, wrapGAppsHook3, # libs librsvg, sane-backends, sane-frontends, # runtime dependencies @@ -10,20 +10,14 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.13.2"; + version = "2.13.3"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz"; - hash = "sha256-NGz6DUa7TdChpgwmD9pcGdvYr3R+Ft3jPPSJpybCW4Q="; + hash = "sha256-QAs6fsQDe9+nKM/OAVZUHB034K72jHsKoA2LY2JQa8Y="; }; patches = [ - # fixes warnings during tests. See https://sourceforge.net/p/gscan2pdf/bugs/421 - (fetchpatch { - name = "0001-Remove-given-and-when-keywords-and-operator.patch"; - url = "https://sourceforge.net/p/gscan2pdf/bugs/_discuss/thread/602a7cedfd/1ea4/attachment/0001-Remove-given-and-when-keywords-and-operator.patch"; - hash = "sha256-JtrHUkfEKnDhWfEVdIdYVlr5b/xChTzsrrPmruLaJ5M="; - }) # fixes an error with utf8 file names. See https://sourceforge.net/p/gscan2pdf/bugs/400 ./image-utf8-fix.patch ]; @@ -113,18 +107,6 @@ perlPackages.buildPerlPackage rec { ]); checkPhase = '' - # Temporarily disable a test failing after a patch imagemagick update. - # It might only due to the reporting and matching used in the test. - # See https://github.com/NixOS/nixpkgs/issues/223446 - # See https://sourceforge.net/p/gscan2pdf/bugs/417/ - # - # Failed test 'valid TIFF created' - # at t/131_save_tiff.t line 44. - # 'test.tif TIFF 70x46 70x46+0+0 8-bit sRGB 10024B 0.000u 0:00.000 - # ' - # doesn't match '(?^:test.tif TIFF 70x46 70x46\+0\+0 8-bit sRGB [7|9][.\d]+K?B)' - rm t/131_save_tiff.t - # Temporarily disable a dubiously failing test: # t/169_import_scan.t ........................... 1/1 # # Failed test 'variable-height scan imported with expected size' @@ -135,12 +117,17 @@ perlPackages.buildPerlPackage rec { # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100) rm t/169_import_scan.t - # Disable a test which passes but reports an incorrect status - # t/0601_Dialog_Scan.t .......................... All 14 subtests passed - # t/0601_Dialog_Scan.t (Wstat: 139 Tests: 14 Failed: 0) - # Non-zero wait status: 139 - rm t/0601_Dialog_Scan.t + # Disable a test failing because of a warning interfering with the pinned output + # t/3722_user_defined.t ......................... 1/2 + # Failed test 'user_defined caught error injected in queue' + # at t/3722_user_defined.t line 41. + # got: 'error + # WARNING: The convert command is deprecated in IMv7, use "magick" instead of "convert" or "magick convert"' + # expected: 'error' + # Looks like you failed 1 test of 2. + rm t/3722_user_defined.t + export XDG_CACHE_HOME="$(mktemp -d)" xvfb-run -s '-screen 0 800x600x24' \ make test ''; diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/applications/graphics/gscreenshot/default.nix index c3468f65dcab..f0869bca596d 100644 --- a/pkgs/applications/graphics/gscreenshot/default.nix +++ b/pkgs/applications/graphics/gscreenshot/default.nix @@ -18,13 +18,13 @@ python3Packages.buildPythonApplication rec { pname = "gscreenshot"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "${pname}"; rev = "refs/tags/v${version}"; - sha256 = "sha256-BA118PwMslqvnlRES2fEgTjzfNvKNVae7GzWSyuaqYM="; + sha256 = "sha256-3CvPJLenEVpTLNZUj+TG1cEfyWGmtaPZH/FD/AgK1io="; }; # needed for wrapGAppsHook3 to function diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index fc5913969451..7de054195520 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -5,6 +5,7 @@ , pkg-config , meson , ninja +, adwaita-icon-theme , exiv2 , libheif , libjpeg @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { clutter-gtk exiv2 glib - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas gst_all_1.gst-plugins-base (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 03d7be3dfad1..7da1858cb542 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -6,6 +6,7 @@ , enableSwftools ? false , swftools , python3Packages +, pythonOlder , qtbase , qtcharts , makeDesktopItem @@ -14,14 +15,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "578"; + version = "581"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-u2SXhL57iNVjRFqerzc/TByB9ArAJx81mxOjTBVBMkg="; + hash = "sha256-Q/EdqwIMCjeDtFAPlYd04NMpEgC6xUDGK5LwxDCiI9Y="; }; nativeBuildInputs = [ @@ -60,6 +61,7 @@ python3Packages.buildPythonPackage rec { lz4 numpy opencv4 + olefile pillow pillow-heif psutil @@ -74,11 +76,15 @@ python3Packages.buildPythonPackage rec { pyyaml qtpy requests + show-in-file-manager send2trash service-identity twisted ]; + # tests rely on nose + doCheck = pythonOlder "3.12"; + nativeCheckInputs = with python3Packages; [ nose mock diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 9bfc5d7aec19..35ec592d24cc 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -19,7 +19,7 @@ , libXrender , libXxf86vm , libglvnd -, gnome +, zenity }: let @@ -39,7 +39,7 @@ let ]; runBinDeps = [ - gnome.zenity + zenity ]; in @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { description = "Real-time GPU shader editor"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ prusnak lilyinstarlight ]; + maintainers = with maintainers; [ prusnak ]; platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; mainProgram = "KodeLife"; }; diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index 9b6e71057aa2..73a15bdd291f 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.49.0"; + version = "1.50.0"; format = "other"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-AMlhhsbwLhofV/Sy/EXuE4l0UAwZf2Gxn9+x3MHno4Y="; + hash = "sha256-lyBXMctEL8Z6rscsSDHh7xLhjvnpN2q4qMVV2ek9Cyk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 19455d89c930..78b6f2d3f568 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "1.6.00"; + version = "1.6.03"; nativeBuildInputs = [ p7zip @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-R9DBlmqvV23QXzC45Z4GN0t+ysv4WM63POJGU5N7jbw="; + sha256 = "sha256-yMxCe9Bu5llAUrTLG8R+1HX65rs9fhhoVG79vxDzeWY="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix index 1dd460c2e1d2..a474550820ba 100644 --- a/pkgs/applications/graphics/opentoonz/default.nix +++ b/pkgs/applications/graphics/opentoonz/default.nix @@ -1,7 +1,7 @@ { boost , cmake , fetchFromGitHub -, freeglut +, libglut , freetype , glew , libjpeg @@ -93,7 +93,7 @@ stdenv.mkDerivation { buildInputs = [ boost - freeglut + libglut freetype glew libjpeg diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index f29e1e06ab25..945b6acf27bd 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -49,12 +49,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "pixinsight"; - version = "1.8.9-3"; + version = "1.8.9-3-20240625"; src = requireFile rec { - name = "PI-linux-x64-${finalAttrs.version}-20240619-c.tar.xz"; + name = "PI-linux-x64-${finalAttrs.version}-c.tar.xz"; url = "https://pixinsight.com/"; - hash = "sha256-WZrD+X7zE1i29+YsGJ+wbIXmlVon9bczHvvRAkQXz6M="; + hash = "sha256-jqp5pt+fC7QvENCwRjr7ENQiCZpwNhC5q76YdzRBJis="; message = '' PixInsight is available from ${url} and requires a commercial (or trial) license. After a license has been obtained, PixInsight can be downloaded from the software distribution diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 844878a34959..803d298ddfd7 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -3,6 +3,7 @@ , fetchurl , meson , ninja +, adwaita-icon-theme , gtk3 , libexif , libgphoto2 @@ -37,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; - version = "0.32.6"; + version = "0.32.7"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-dZek/6yR4YzYFEsS8tCDE6P0Bbs2gkOnMmgm99kqcLY="; + sha256 = "sha256-EvMl4BnD5jjCuWFXG8IEd2dh6CYUZ+8btodViJM11fc="; }; nativeBuildInputs = [ @@ -80,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { librsvg librest gcr - gnome.adwaita-icon-theme + adwaita-icon-theme libsecret libportal-gtk3 ]; diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 9f18033fca48..fe4286aa4b5b 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -15,8 +15,6 @@ let perlModules = with perlPackages; [ - # Not sure if these are needed - # Gnome2 Gnome2Canvas Gnome2VFS Gtk2AppIndicator Gtk2Unique ImageMagick Cairo FileBaseDir diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index f1edfe81fb63..c20f10ee0d1b 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -19,7 +19,7 @@ , pango , imagemagick , intltool -, gnome +, adwaita-icon-theme , harfbuzz , freetype , fribidi @@ -131,7 +131,7 @@ stdenv.mkDerivation { libsigcxx libxmlxx mlt - gnome.adwaita-icon-theme + adwaita-icon-theme openexr fftw ]; diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index 288eb7aef6ca..76c8b7f692af 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake, wrapGAppsHook3 -, libX11, libzip, glfw, libpng, xorg, gnome +, libX11, libzip, glfw, libpng, xorg, zenity }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/tev \ "''${gappsWrapperArgs[@]}" \ - --prefix PATH ":" "${gnome.zenity}/bin" + --prefix PATH ":" "${zenity}/bin" ''; env.CXXFLAGS = "-include cstdint"; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 3599cf70032a..ee4030053b67 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yEd"; - version = "3.23.2"; + version = "3.24"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; - sha256 = "sha256-u83OmIzq9VygKbfa886mj6BIa/9ET1btry2nR/wxeyI="; + sha256 = "sha256-4aotsOippuKUucweWERtqm/5pz2gwW1Sue48KPisQ0I="; }; nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook3 ]; diff --git a/pkgs/applications/kde/kdenlive/default.nix b/pkgs/applications/kde/kdenlive/default.nix index 85ccfb0f7408..d5d465b8c4fe 100644 --- a/pkgs/applications/kde/kdenlive/default.nix +++ b/pkgs/applications/kde/kdenlive/default.nix @@ -1,4 +1,5 @@ { mkDerivation +, substituteAll , lib , extra-cmake-modules , breeze-icons @@ -34,6 +35,7 @@ , kpurpose , kdeclarative , wrapGAppsHook3 +, glaxnimate }: let @@ -80,21 +82,27 @@ mkDerivation { kpurpose kdeclarative wrapGAppsHook3 + glaxnimate ]; + # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it # doesn't find them. See: # https://github.com/NixOS/nixpkgs/issues/83885 - patches = [ ./dependency-paths.patch ]; - - inherit mediainfo; - ffmpeg = ffmpeg-full; - mlt = mlt-full; + patches = [ + ( + substituteAll { + src = ./dependency-paths.patch; + inherit mediainfo glaxnimate; + ffmpeg = ffmpeg-full; + mlt = mlt-full; + } + ) + ]; postPatch = # Module Qt5::Concurrent must be included in `find_package` before it is used. '' sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|' - substituteAllInPlace src/kdenlivesettings.kcfg ''; dontWrapGApps = true; diff --git a/pkgs/applications/kde/kdenlive/dependency-paths.patch b/pkgs/applications/kde/kdenlive/dependency-paths.patch index ba3f7e6c8de9..013960377268 100644 --- a/pkgs/applications/kde/kdenlive/dependency-paths.patch +++ b/pkgs/applications/kde/kdenlive/dependency-paths.patch @@ -1,6 +1,5 @@ -diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg -index 029849e5f..8befe4888 100644 ---- a/src/kdenlivesettings.kcfg +diff -u b/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg +--- b/src/kdenlivesettings.kcfg +++ b/src/kdenlivesettings.kcfg @@ -517,7 +517,7 @@ @@ -44,3 +43,10 @@ index 029849e5f..8befe4888 100644 +@@ -657,5 +657,5 @@ + + +- ++ @glaxnimate@/bin/glaxnimate + + diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index d4430ac9e066..0c4193aa2e5d 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-vlap8gTZYoQS70Co99bZ16Fv9eq1N3rH7skjwrLDWiM="; + sha256 = "sha256-Z88amcPb2jCJduRu8CGQ20y2o5cXmL4rpRL0hGCEYgM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/appcleaner/default.nix b/pkgs/applications/misc/appcleaner/default.nix index eff32c76f988..62d9e2b1116f 100644 --- a/pkgs/applications/misc/appcleaner/default.nix +++ b/pkgs/applications/misc/appcleaner/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://freemacsoft.net/appcleaner"; license = licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index c81d4f65d785..0bb9a89325e5 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -32,7 +32,6 @@ buildPythonApplication rec { hash = "sha256-ns1Y0DqqnTAQMEt+oBJ/P2gqKqPsX9P3/Z4561qzuns"; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = true; diff --git a/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff b/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff new file mode 100644 index 000000000000..cc832bb10729 --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff @@ -0,0 +1,38 @@ +diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp +index 11a36dfabc..77a44e699b 100644 +--- a/src/slic3r/Utils/Http.cpp ++++ b/src/slic3r/Utils/Http.cpp +@@ -88,9 +88,13 @@ std::mutex g_mutex; + + struct form_file + { +- fs::ifstream ifs; ++ fs::ifstream ifs; + boost::filesystem::ifstream::off_type init_offset; + size_t content_length; ++ ++ form_file(fs::path const& p, const boost::filesystem::ifstream::off_type offset, const size_t content_length) ++ : ifs(p, std::ios::in | std::ios::binary), init_offset(offset), content_length(content_length) ++ {} + }; + + struct Http::priv +@@ -314,7 +318,7 @@ void Http::priv::form_add_file(const char *name, const fs::path &path, const cha + filename = path.string().c_str(); + } + +- form_files.emplace_back(form_file{{path, std::ios::in | std::ios::binary}, offset, length}); ++ form_files.emplace_back(path, offset, length); + auto &f = form_files.back(); + size_t size = length; + if (length == 0) { +@@ -381,7 +385,7 @@ void Http::priv::set_put_body(const fs::path &path) + boost::system::error_code ec; + boost::uintmax_t filesize = file_size(path, ec); + if (!ec) { +- putFile = std::make_unique(form_file{{path, std::ios_base::binary | std::ios_base::in}, 0, 0}); ++ putFile = std::make_unique(path, 0, 0); + ::curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L); + ::curl_easy_setopt(curl, CURLOPT_READDATA, (void *) (putFile.get())); + ::curl_easy_setopt(curl, CURLOPT_INFILESIZE, filesize); + diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 57ad17ea4877..70812441d348 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -37,7 +37,6 @@ opencascade-occt_7_6, openvdb, pcre, - qhull, systemd, tbb_2021_11, webkitgtk, @@ -53,7 +52,7 @@ let "--enable-debug=no" ]; }); - openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec { + openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: { buildInputs = [ openexr boost179 diff --git a/pkgs/applications/misc/bambu-studio/dont-link-opencv-world.patch b/pkgs/applications/misc/bambu-studio/dont-link-opencv-world.patch new file mode 100644 index 000000000000..f558b3099ac3 --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/dont-link-opencv-world.patch @@ -0,0 +1,14 @@ +diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt +index 38a1b2499..00c9060b3 100644 +--- a/src/libslic3r/CMakeLists.txt ++++ b/src/libslic3r/CMakeLists.txt +@@ -573,7 +573,8 @@ target_link_libraries(libslic3r + mcut + JPEG::JPEG + qoi +- opencv_world ++ opencv_core ++ opencv_imgproc + ) + + if(NOT WIN32) diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index af89be65246d..7428453a20cc 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -2,23 +2,42 @@ lib, fetchFromGitHub, bambu-studio, + opencv2, }: - bambu-studio.overrideAttrs ( finalAttrs: previousAttrs: { - version = "2.0.0"; + version = "2.1.1"; pname = "orca-slicer"; - # Don't inherit patches from bambu-studio - patches = [ ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch ]; - src = fetchFromGitHub { owner = "SoftFever"; repo = "OrcaSlicer"; rev = "v${finalAttrs.version}"; - hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw="; + hash = "sha256-7fusdSYpZb4sYl5L/+81PzMd42Nsejj+kCZsq0f7eIk="; }; + patches = + previousAttrs.patches + ++ [ + # FIXME: only required for 2.1.1, can be removed in the next version + ./0002-fix-build-for-gcc-13.diff + + ./dont-link-opencv-world.patch + ]; + + buildInputs = + previousAttrs.buildInputs + ++ [ + opencv2 + ]; + + preFixup = '' + gappsWrapperArgs+=( + # Fixes blackscreen dialogs + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + ) + ''; + # needed to prevent collisions between the LICENSE.txt files of # bambu-studio and orca-slicer. postInstall = '' @@ -26,7 +45,7 @@ bambu-studio.overrideAttrs ( ''; meta = with lib; { - description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; + description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)"; homepage = "https://github.com/SoftFever/OrcaSlicer"; license = licenses.agpl3Only; maintainers = with maintainers; [ diff --git a/pkgs/applications/misc/bazecor/default.nix b/pkgs/applications/misc/bazecor/default.nix index ed1900836fcc..02d15b506872 100644 --- a/pkgs/applications/misc/bazecor/default.nix +++ b/pkgs/applications/misc/bazecor/default.nix @@ -1,12 +1,12 @@ -{ lib -, appimageTools -, fetchurl +{ + lib, + appimageTools, + fetchurl, + makeWrapper, }: - -appimageTools.wrapAppImage rec { +let pname = "bazecor"; version = "1.3.11"; - src = appimageTools.extract { inherit pname version; src = fetchurl { @@ -18,11 +18,14 @@ appimageTools.wrapAppImage rec { postExtract = '' substituteInPlace \ $out/usr/lib/bazecor/resources/app/.webpack/main/index.js \ - --replace \ + --replace-fail \ 'checkUdev=()=>{try{if(c.default.existsSync(f))return c.default.readFileSync(f,"utf-8").trim()===l.trim()}catch(e){console.error(e)}return!1}' \ 'checkUdev=()=>{return 1}' ''; }; +in +appimageTools.wrapAppImage { + inherit pname version src; # also make sure to update the udev rules in ./10-dygma.rules; most recently # taken from @@ -35,14 +38,18 @@ appimageTools.wrapAppImage rec { # to allow non-root modifications to the keyboards. extraInstallCommands = '' - install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications - substituteInPlace $out/share/applications/Bazecor.desktop \ - --replace 'Exec=Bazecor' 'Exec=bazecor' + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/bazecor \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications install -m 444 -D ${src}/bazecor.png -t $out/share/pixmaps mkdir -p $out/lib/udev/rules.d - ln -s --target-directory=$out/lib/udev/rules.d ${./10-dygma.rules} + install -m 444 -D ${./10-dygma.rules} $out/lib/udev/rules.d/10-dygma.rules + + substituteInPlace $out/share/applications/Bazecor.desktop \ + --replace-fail 'Exec=Bazecor' 'Exec=bazecor' ''; meta = { @@ -51,7 +58,10 @@ appimageTools.wrapAppImage rec { changelog = "https://github.com/Dygmalab/Bazecor/releases/tag/v${version}"; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ amesgen ]; + maintainers = with lib.maintainers; [ + amesgen + gcleroux + ]; platforms = [ "x86_64-linux" ]; mainProgram = "bazecor"; }; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index d017f4306fe7..86ce9c9383df 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bemenu"; - version = "0.6.21"; + version = "0.6.22"; src = fetchFromGitHub { owner = "Cloudef"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-E/5wN7HpdBt//jFe9yAB8fuHKiFJ7D1UAJEvG8KBJ6k="; + hash = "sha256-wdOrVX4AgGXySlwmqFRp9OWoSkEYBIZumBGTrFfyNpg="; }; strictDeps = true; @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Cloudef/bemenu"; description = "Dynamic menu library and client program inspired by dmenu"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; mainProgram = "bemenu"; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 3d044abaad6d..2e1294a4080c 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -19,6 +19,7 @@ darwin, dbus, embree, + fetchpatch, fetchurl, fetchzip, ffmpeg, @@ -71,7 +72,7 @@ pkg-config, potrace, pugixml, - python311Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340 + python3Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340 rocmPackages, # comes with a significantly larger closure size runCommand, spaceNavSupport ? stdenv.isLinux, @@ -86,7 +87,6 @@ }: let - python3Packages = python311Packages; python3 = python3Packages.python; pyPkgsOpenusd = python3Packages.openusd.override { withOsl = false; }; @@ -111,7 +111,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-T7s69k0/hN9ccQN0hFQibBiFwawu1Tc9DOoegOgsCEg="; }; - patches = [ ./draco.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + patches = [ + ./draco.patch + (fetchpatch { + url = "https://projects.blender.org/blender/blender/commit/ae35b5758791bebb21741f9b505b9fca347ae50e.patch"; + hash = "sha256-xUi55+7aiwEjtjqOi8to1YxdPlsBUThCCkCa5T6LIQc="; + }) + ] ++ lib.optional stdenv.isDarwin ./darwin.patch; postPatch = ( @@ -177,7 +183,9 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF" "-DWITH_GHOST_WAYLAND_LIBDECOR=ON" ] - ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ "-DWITH_CYCLES_EMBREE=OFF" ] + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ + "-DWITH_CYCLES_EMBREE=OFF" + ] ++ lib.optionals stdenv.isDarwin [ "-DLIBDIR=/does-not-exist" "-DWITH_CYCLES_OSL=OFF" # causes segfault on aarch64-darwin @@ -320,15 +328,16 @@ stdenv.mkDerivation (finalAttrs: { # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be # found. See the explanation in libglvnd. - postFixup = lib.optionalString cudaSupport '' - for program in $out/bin/blender $out/bin/.blender-wrapped; do - isELF "$program" || continue - addOpenGLRunpath "$program" - done - '' - + lib.optionalString stdenv.isDarwin '' - makeWrapper $out/Applications/Blender.app/Contents/MacOS/Blender $out/bin/blender - ''; + postFixup = + lib.optionalString cudaSupport '' + for program in $out/bin/blender $out/bin/.blender-wrapped; do + isELF "$program" || continue + addOpenGLRunpath "$program" + done + '' + + lib.optionalString stdenv.isDarwin '' + makeWrapper $out/Applications/Blender.app/Contents/MacOS/Blender $out/bin/blender + ''; passthru = { python = python3; @@ -342,10 +351,8 @@ stdenv.mkDerivation (finalAttrs: { }; tests = { - render = runCommand "${finalAttrs.pname}-test" { } '' + render = runCommand "${finalAttrs.pname}-test" { nativeBuildInputs = [ mesa.llvmpipeHook ]; } '' set -euo pipefail - export LIBGL_DRIVERS_PATH=${mesa.drivers}/lib/dri - export __EGL_VENDOR_LIBRARY_FILENAMES=${mesa.drivers}/share/glvnd/egl_vendor.d/50_mesa.json cat <<'PYTHON' > scene-config.py import bpy bpy.context.scene.eevee.taa_render_samples = 32 @@ -396,7 +403,9 @@ stdenv.mkDerivation (finalAttrs: { # They comment two licenses: GPLv2 and Blender License, but they # say: "We've decided to cancel the BL offering for an indefinite period." # OptiX, enabled with cudaSupport, is non-free. - license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport (unfree // { shortName = "NVidia OptiX EULA"; }); + license = + with lib.licenses; + [ gpl2Plus ] ++ lib.optional cudaSupport (unfree // { shortName = "NVidia OptiX EULA"; }); platforms = [ "aarch64-linux" diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0e19d1597365..dcea5ecb52c9 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -21,22 +21,23 @@ , qmake , qtbase , qtwayland -, removeReferencesTo , speechd , sqlite , wrapQtAppsHook , xdg-utils , wrapGAppsHook3 +, popplerSupport ? true +, speechSupport ? true , unrarSupport ? false }: stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "7.12.0"; + version = "7.13.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-XHkORTUx3+O+i2vbTiZAHI/0hY3xPIXvvNAVuXy4wzk="; + hash = "sha256-t0nSLsT3X5MoYHhLjbRpqyKbV6NdAqNurSjbcik/n7Q="; }; patches = [ @@ -69,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config qmake - removeReferencesTo wrapGAppsHook3 wrapQtAppsHook ]; @@ -91,48 +91,48 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtwayland sqlite + (python3Packages.python.withPackages + (ps: with ps; [ + (apsw.overrideAttrs (oldAttrs: { + setupPyBuildFlags = [ "--enable=load_extension" ]; + })) + beautifulsoup4 + css-parser + cssselect + python-dateutil + dnspython + faust-cchardet + feedparser + html2text + html5-parser + lxml + markdown + mechanize + msgpack + netifaces + pillow + pychm + pyqt-builder + pyqt6 + python + regex + sip + setuptools + zeroconf + jeepney + pycryptodome + xxhash + # the following are distributed with calibre, but we use upstream instead + odfpy + ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ + # much of calibre's functionality is usable without a web + # browser, so we enable building on platforms which qtwebengine + # does not support by simply omitting qtwebengine. + pyqt6-webengine + ] ++ lib.optional (unrarSupport) unrardll) + ) xdg-utils - ] ++ ( - with python3Packages; [ - (apsw.overrideAttrs (oldAttrs: { - setupPyBuildFlags = [ "--enable=load_extension" ]; - })) - beautifulsoup4 - css-parser - cssselect - python-dateutil - dnspython - faust-cchardet - feedparser - html2text - html5-parser - lxml - markdown - mechanize - msgpack - netifaces - pillow - pychm - pyqt-builder - pyqt6 - python - regex - sip - setuptools - speechd - zeroconf - jeepney - pycryptodome - xxhash - # the following are distributed with calibre, but we use upstream instead - odfpy - ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ - # much of calibre's functionality is usable without a web - # browser, so we enable building on platforms which qtwebengine - # does not support by simply omitting qtwebengine. - pyqt6-webengine - ] ++ lib.optional (unrarSupport) unrardll - ); + ] ++ lib.optional (speechSupport) speechd; installPhase = '' runHook preInstall @@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" - ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py install --root=$out \ + python setup.py install --root=$out \ --prefix=$out \ --libdir=$out/lib \ --staging-root=$out \ @@ -173,23 +173,18 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; dontWrapGApps = true; - # Remove some references to shrink the closure size. This reference (as of - # 2018-11-06) was a single string like the following: - # /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h - preFixup = '' - remove-references-to -t ${podofo.dev} \ - $out/lib/calibre/calibre/plugins/podofo.so - - for program in $out/bin/*; do - wrapProgram $program \ - ''${qtWrapperArgs[@]} \ - ''${gappsWrapperArgs[@]} \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : ${poppler_utils.out}/bin - done - ''; - - disallowedReferences = [ podofo.dev ]; + preFixup = + let + popplerArgs = "--prefix PATH : ${poppler_utils.out}/bin"; + in + '' + for program in $out/bin/*; do + wrapProgram $program \ + ''${qtWrapperArgs[@]} \ + ''${gappsWrapperArgs[@]} \ + ${if popplerSupport then popplerArgs else ""} + done + ''; meta = { homepage = "https://calibre-ebook.com"; diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix index ce2341125842..8a8bf8ad5812 100644 --- a/pkgs/applications/misc/camunda-modeler/default.nix +++ b/pkgs/applications/misc/camunda-modeler/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.23.0"; + version = "5.25.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-x63UMIl0Wsr4qSEn19Of135PHKlpEVAZzhA2+ZjxNwY="; + hash = "sha256-4YeeeIC37s/cXZ4TjIxn/yvDVKP92f9uSBajLCj7NZw="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index 1fda51767541..f1161efb5802 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cobalt"; - version = "0.19.3"; + version = "0.19.5"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; rev = "v${version}"; - sha256 = "sha256-aAhceExz5SENL+FhPHyx8HmaNOWjNsynv81Rj2cS5M8="; + sha256 = "sha256-a9fo6qSLTVK6vC40nKwrpCvEvw1iIxQFmngkA3ttAdQ="; }; - cargoHash = "sha256-vw7fGsTSEVO8s1LzilKJN5lGzOfQcms1h7rnTOyE4Kw="; + cargoHash = "sha256-vr4G0L74qzsjpPKteV7wrW+pJGmbUVDLyc9MhSB1HfQ="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/applications/misc/collision/default.nix index 2f73d2d8dee4..96f19b47968a 100644 --- a/pkgs/applications/misc/collision/default.nix +++ b/pkgs/applications/misc/collision/default.nix @@ -5,7 +5,7 @@ , wrapGAppsHook4 , desktopToDarwinBundle , gobject-introspection -, gnome +, nautilus-python , python3 , libadwaita , openssl @@ -54,7 +54,7 @@ crystal.buildCrystalPackage rec { libadwaita openssl libxml2 - gnome.nautilus-python + nautilus-python python3.pkgs.pygobject3 ]; diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index 14c8ee0edd4e..53d19c173190 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cotp"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-6FriNAwxo+YnJWmCrScyafUEkJvEJz3O9Zoj9yerpSI="; + hash = "sha256-U+rOwBxT3on1hUlkb93sgdYIpPTOHb42x1cibueGDn0="; }; - cargoHash = "sha256-/CW0CGhPjKd5oU2LYW4lPWKMATn9aJdjIy44yZJyU/E="; + cargoHash = "sha256-mdcQSmTLU2bj+wEyzgqFJpjBEesD7zPDVHziNkTIR+s="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/applications/misc/cum/default.nix b/pkgs/applications/misc/cum/default.nix index b06f77787ac0..5431dab2cf4e 100644 --- a/pkgs/applications/misc/cum/default.nix +++ b/pkgs/applications/misc/cum/default.nix @@ -31,7 +31,7 @@ buildPythonApplication rec { mainProgram = "cum"; homepage = "https://github.com/Hamuko/cum"; license = licenses.asl20; - maintainers = with maintainers; [ tadeokondrak ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index a9d7d2730a72..26ea5f2cad0b 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "dasel"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - hash = "sha256-j9gwE/iLbBM8sdNZgc7hYnKhJEMkLn/g9HVlsKn4moo="; + hash = "sha256-vq4lRCsqD2hmQw0yH84Wji5LeJ/aiMGJJIyCDvATA+I="; }; vendorHash = "sha256-edyFs5oURklkqsTF7JA1in3XteSBx/6YEVu4MjIcGN4="; diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index 9dc19941a072..95fd50b1e241 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -30,7 +30,6 @@ python.pkgs.buildPythonApplication rec { build-system = with python.pkgs; [ setuptools ]; - nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; propagatedBuildInputs = with python.pkgs; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 109befe7594c..089a421ccc15 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null -# update script dependencies -, gitUpdater -}: +{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, writeText +, conf ? null, patches ? null + # update script dependencies +, gitUpdater }: stdenv.mkDerivation rec { pname = "dmenu"; @@ -16,9 +16,15 @@ stdenv.mkDerivation rec { inherit patches; - postPatch = '' + postPatch = let + configFile = if lib.isDerivation conf || builtins.isPath conf then + conf + else + writeText "config.def.h" conf; + in '' sed -ri -e 's!\<(dmenu|dmenu_path|stest)\>!'"$out/bin"'/&!g' dmenu_run sed -ri -e 's!\!'"$out/bin"'/&!g' dmenu_path + ${lib.optionalString (conf != null) "cp ${configFile} config.def.h"} ''; preConfigure = '' @@ -27,15 +33,14 @@ stdenv.mkDerivation rec { makeFlags = [ "CC:=$(CC)" ]; - passthru.updateScript = gitUpdater { - url = "git://git.suckless.org/dmenu"; - }; + passthru.updateScript = gitUpdater { url = "git://git.suckless.org/dmenu"; }; meta = with lib; { - description = "Generic, highly customizable, and efficient menu for the X Window System"; + description = + "Generic, highly customizable, and efficient menu for the X Window System"; homepage = "https://tools.suckless.org/dmenu"; license = licenses.mit; - maintainers = with maintainers; [ pSub globin qusic ]; + maintainers = with maintainers; [ pSub globin qusic _0david0mp ]; platforms = platforms.all; mainProgram = "dmenu"; }; diff --git a/pkgs/applications/misc/ff2mpv/default.nix b/pkgs/applications/misc/ff2mpv/default.nix index 3efadca5f3a8..c21b07181902 100644 --- a/pkgs/applications/misc/ff2mpv/default.nix +++ b/pkgs/applications/misc/ff2mpv/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Native Messaging Host for ff2mpv firefox addon"; homepage = "https://github.com/woodruffw/ff2mpv"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Enzime ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "ff2mpv.py"; }; } diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/applications/misc/fff/default.nix index 351796a036d2..d7bb50f59e43 100644 --- a/pkgs/applications/misc/fff/default.nix +++ b/pkgs/applications/misc/fff/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mainProgram = "fff"; homepage = "https://github.com/dylanaraps/fff"; license = licenses.mit; - maintainers = [ maintainers.tadeokondrak ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/filet/default.nix b/pkgs/applications/misc/filet/default.nix index 2c03c6e76ea2..d9f7bd91ab2e 100644 --- a/pkgs/applications/misc/filet/default.nix +++ b/pkgs/applications/misc/filet/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/buffet/filet"; license = licenses.mpl20; platforms = platforms.all; - maintainers = with maintainers; [ buffet ]; + maintainers = with maintainers; [ ]; mainProgram = "filet"; }; } diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 117257148883..022416c37611 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.27.0"; + version = "1.27.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - hash = "sha256-zMimHjaXgwOSt8HbSec4o0y3e9Xf6tFFiI4KzsrP850="; + hash = "sha256-S1RF0FNJ/oKTwq9SXXIOnqBIViGIYBVuxPjV/6fbeV8="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index a6b98ccccf08..8f345f39b534 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; + mainProgram = "gcal"; }; } diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index daaf92fc72de..a04cf4ec7c77 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -7,7 +7,7 @@ , ninja , vala , pkg-config -, gnome +, adwaita-icon-theme , libchamplain , gdl , wrapGAppsHook3 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdl libchamplain - gnome.adwaita-icon-theme + adwaita-icon-theme libxml2 ]; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index e6b384904b70..d4c199d48939 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE , libXext , freetype, libXrender, fontconfig, libXft, libXinerama , libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3 -, curl, writeShellScript, common-updater-scripts }: +, curl, writeShellScript, common-updater-scripts, xmlstarlet }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.13-269829b4/Hubstaff-1.6.13-269829b4.sh"; - version = "1.6.13-269829b4"; - sha256 = "0i05d8kivm09hqsc1z6vn7w0bbc3l9dawssqpqsm7kqdyaq0l304"; + url = "https://app.hubstaff.com/download/7473-standard-linux-1-6-24-release"; + version = "1.6.24-094b0af9"; + sha256 = "sha256:1jwyl51lljxn6hnkp07bvgw60bqmq3gb0rdgvxmd7r8x3y3xshx1"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft @@ -36,9 +36,9 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' - # TODO: handle 32-bit arch? - rm -r x86 - rm -r x86_64/lib64 + # remove files for 32-bit arch to skip building for this arch + # but add -f flag to not fail if files were not found (new versions dont provide 32-bit arch) + rm -rf x86 x86_64/lib64 opt=$out/opt/hubstaff mkdir -p $out/bin $opt @@ -55,16 +55,25 @@ stdenv.mkDerivation { ln -s $opt/data/resources $opt/x86_64/resources ''; + # to test run: + # nix-shell maintainers/scripts/update.nix --argstr package hubstaff + # nix-build -A pkgs.hubstaff passthru.updateScript = writeShellScript "hubstaff-updater" '' set -eu -o pipefail - installation_script_url=$(curl --fail --head --location --silent --output /dev/null --write-out %{url_effective} https://app.hubstaff.com/download/linux) + # Create a temporary file + temp_file=$(mktemp) - version=$(echo "$installation_script_url" | sed -r 's/^https:\/\/hubstaff\-production\.s3\.amazonaws\.com\/downloads\/HubstaffClient\/Builds\/Release\/([^\/]+)\/Hubstaff.+$/\1/') + # Fetch the appcast.xml and save it to the temporary file + curl --silent --output "$temp_file" https://app.hubstaff.com/appcast.xml + + # Extract the latest release URL for Linux using xmlstarlet + installation_script_url=$(${xmlstarlet}/bin/xmlstarlet sel -t -v '//enclosure[@sparkle:os="linux"]/@url' "$temp_file") + version=$(${xmlstarlet}/bin/xmlstarlet sel -t -v '//enclosure[@sparkle:os="linux"]/@sparkle:version' "$temp_file") sha256=$(nix-prefetch-url "$installation_script_url") - ${common-updater-scripts}/bin/update-source-version hubstaff "$version" "$sha256" "$installation_script_url" + ${common-updater-scripts}/bin/update-source-version hubstaff "$version" "sha256:$sha256" "$installation_script_url" ''; meta = with lib; { diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index 1a079ab8274c..aeeb82ba581f 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM +{ stdenv, lib, fetchzip, libglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM , libXext, glibc, lua, luabind, glfw, libgccjit, dialog, makeWrapper }: let - lpath = lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext glibc lua glfw luabind libgccjit ]; + lpath = lib.makeLibraryPath [ libXmu libXi libX11 libglut libICE libGLU libGL libSM libXext glibc lua glfw luabind libgccjit ]; in stdenv.mkDerivation rec { pname = "iceSL"; diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix index 6666a63ca1ed..769b44204420 100644 --- a/pkgs/applications/misc/inochi2d/generic.nix +++ b/pkgs/applications/misc/inochi2d/generic.nix @@ -13,7 +13,7 @@ dbus, freetype, SDL2, - gnome, + zenity, builderArgs, }: @@ -126,7 +126,7 @@ buildDubPackage ( postFixup = '' # Add support for `open file` dialog makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \ - --prefix PATH : ${lib.makeBinPath [ gnome.zenity ]} + --prefix PATH : ${lib.makeBinPath [ zenity ]} ''; meta = { diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix index b4ea7d829a3e..9a50ac48740b 100644 --- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Only; mainProgram = "j4-dmenu-desktop"; maintainers = with maintainers; [ ericsagnes ]; - platforms = platforms.unix; + platforms = platforms.linux; }; }) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 219f15936fb9..77fcf7512877 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, appimageTools, fetchurl, makeWrapper, undmg }: +{ lib, stdenv, appimageTools, fetchurl, makeWrapper, _7zz }: let pname = "joplin-desktop"; - version = "2.14.17"; + version = "3.0.12"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}"; sha256 = { - x86_64-linux = "sha256-u4wEchyljurmwVZsRnmUBITZUR6SxDxyGczZjXNsJkg="; - x86_64-darwin = "sha256-KjNwAnJZGX/DvHDPw15vGlSbJ47s6YT59EalARt1mx4="; - aarch64-darwin = "sha256-OYpsHPI+7riMVNAp2JpBlmdFdJUSNqNvBmeYHDw6yzY="; + x86_64-linux = "sha256-vMz+ZeBHP+9Ugy8KO8lbp8zqC8VHtf1TWw10YytQFSs="; + x86_64-darwin = "sha256-XZN1jTv/FhJXuFxZ6D6h/vFMdKi84Z9UWfj2CrMgBBA="; + aarch64-darwin = "sha256-lsODOBkZ4+x5D6Er2/paTzAMKZvqIBVkKrWHh5iRvrk="; }.${system} or throwSystem; }; @@ -39,7 +39,7 @@ let homepage = "https://joplinapp.org"; license = licenses.agpl3Plus; maintainers = with maintainers; [ hugoreeves qjoly ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin"]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; linux = appimageTools.wrapType2 rec { @@ -64,7 +64,7 @@ let darwin = stdenv.mkDerivation { inherit pname version src meta; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ _7zz ]; sourceRoot = "Joplin.app"; diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index a7260dc509b7..33ebb9e329f2 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -13,7 +13,7 @@ , nss , udev , xorg -, gnome +, gnome-keyring , mesa , gtk3 , libusb1 @@ -54,7 +54,7 @@ let xorg.libXScrnSaver xorg.libXtst xorg.libxshmfence - gnome.gnome-keyring + gnome-keyring mesa gtk3 libusb1 diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix index 573d0311887a..dda7343d25e1 100644 --- a/pkgs/applications/misc/lunatask/default.nix +++ b/pkgs/applications/misc/lunatask/default.nix @@ -1,12 +1,12 @@ { lib, appimageTools, fetchurl }: let - version = "2.0.0"; + version = "2.0.4"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-rRE7VE6Fugqbbv/fTIZGuWDQmTP1tRDiKrb6VcpsBjk="; + sha256 = "sha256-U+yelFSulAhgsn5xt45mxC7qGpQwmb3m3lt9nEW6MHU="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 299ac3a9e2d4..7a85860cac0d 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -75,13 +75,13 @@ let in buildPythonApplication rec { pname = "lutris-unwrapped"; - version = "0.5.16"; + version = "0.5.17"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - hash = "sha256-Ed1bhugBe97XmY050A5jCPcnLj0Fd7qPX2p/Ab+YbOE="; + hash = "sha256-Tr5k5LU0s75+1B17oK8tlgA6SlS1SHyyLS6UBKadUmw="; }; nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; @@ -121,7 +121,7 @@ buildPythonApplication rec { postPatch = '' substituteInPlace lutris/util/magic.py \ - --replace "'libmagic.so.1'" "'${lib.getLib file}/lib/libmagic.so.1'" + --replace '"libmagic.so.1"' "'${lib.getLib file}/lib/libmagic.so.1'" ''; nativeCheckInputs = [ xvfb-run nose2 flake8 ] ++ requiredTools; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index acdbf8835e31..0f2f1e9c0860 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -7,7 +7,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome-desktop gnome.libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite @@ -62,7 +62,7 @@ in buildFHSEnv { fontconfig SDL2_ttf # Mednafen - freeglut mesa_glu + libglut mesa_glu # MESS expat diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 7fb218266fa1..b91ab51fff51 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "mob"; - version = "4.5.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "remotemobprogramming"; - repo = pname; + repo = "mob"; rev = "v${version}"; - sha256 = "sha256-uFtE7AprM/ye2sBQeszYy07RV7RmmqD9TGcTTuZwOfY="; + hash = "sha256-CUD4gcQrLzYsD6zX6I4C59lHGKOaE5ggjbIVyznBNEg="; }; vendorHash = null; diff --git a/pkgs/applications/misc/moonlight-qt/darwin.diff b/pkgs/applications/misc/moonlight-qt/darwin.diff deleted file mode 100644 index 0c137fa0774c..000000000000 --- a/pkgs/applications/misc/moonlight-qt/darwin.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- a/app/app.pro 2023-06-24 19:10:00.653377668 +0800 -+++ b/app/app.pro 2023-06-24 19:20:06.632188299 +0800 -@@ -49,19 +49,8 @@ - INCLUDEPATH += $$PWD/../libs/windows/include - LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib gdi32.lib user32.lib d3d9.lib dwmapi.lib dbghelp.lib - } --macx { -- INCLUDEPATH += $$PWD/../libs/mac/include -- INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2.framework/Versions/A/Headers -- INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2_ttf.framework/Versions/A/Headers -- LIBS += -L$$PWD/../libs/mac/lib -F$$PWD/../libs/mac/Frameworks -- -- # QMake doesn't handle framework-style includes correctly on its own -- QMAKE_CFLAGS += -F$$PWD/../libs/mac/Frameworks -- QMAKE_CXXFLAGS += -F$$PWD/../libs/mac/Frameworks -- QMAKE_OBJECTIVE_CFLAGS += -F$$PWD/../libs/mac/Frameworks --} - --unix:!macx { -+unix { - CONFIG += link_pkgconfig - PKGCONFIG += openssl sdl2 SDL2_ttf opus - -@@ -120,13 +109,12 @@ - CONFIG += soundio discord-rpc - } - macx { -- LIBS += -lssl -lcrypto -lavcodec.60 -lavutil.58 -lopus -framework SDL2 -framework SDL2_ttf - LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit -framework Metal - - # For libsoundio - LIBS += -framework CoreAudio -framework AudioUnit - -- CONFIG += ffmpeg soundio discord-rpc -+ CONFIG += ffmpeg soundio - } - - SOURCES += \ diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix deleted file mode 100644 index 59c0b6eb8fba..000000000000 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, wrapQtAppsHook -, pkg-config -, qmake -, qtquickcontrols2 -, SDL2 -, SDL2_ttf -, libva -, libvdpau -, libxkbcommon -, alsa-lib -, libpulseaudio -, openssl -, libopus -, ffmpeg -, wayland -, darwin -}: - -let - inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation AppKit AudioUnit VideoToolbox; -in - -stdenv.mkDerivation rec { - pname = "moonlight-qt"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "moonlight-stream"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-0ONjUqpM1tUnyaEnMgVl7ff6pND7kyqouv2mpgteZP0="; - fetchSubmodules = true; - }; - - patches = [ ./darwin.diff ]; - - nativeBuildInputs = [ - wrapQtAppsHook - pkg-config - qmake - ]; - - buildInputs = [ - qtquickcontrols2 - SDL2 - SDL2_ttf - openssl - libopus - ffmpeg - ] ++ lib.optionals stdenv.isLinux [ - libva - libvdpau - libxkbcommon - alsa-lib - libpulseaudio - wayland - ] ++ lib.optionals stdenv.isDarwin [ - AVFoundation - AppKit - AudioUnit - VideoToolbox - ]; - - postInstall = lib.optionalString stdenv.isDarwin '' - mkdir $out/Applications $out/bin - mv app/Moonlight.app $out/Applications - rm -r $out/Applications/Moonlight.app/Contents/Frameworks - ln -s $out/Applications/Moonlight.app/Contents/MacOS/Moonlight $out/bin/moonlight - ''; - - meta = with lib; { - description = "Play your PC games on almost any device"; - homepage = "https://moonlight-stream.org"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ luc65r ]; - platforms = platforms.all; - mainProgram = "moonlight"; - }; -} diff --git a/pkgs/applications/misc/mupdf/1.17/default.nix b/pkgs/applications/misc/mupdf/1.17/default.nix index b8cb75b057fd..a3848ccc078b 100644 --- a/pkgs/applications/misc/mupdf/1.17/default.nix +++ b/pkgs/applications/misc/mupdf/1.17/default.nix @@ -2,7 +2,7 @@ , jbig2dec, libjpeg , darwin , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl -, enableGL ? true, freeglut, libGLU +, enableGL ? true, libglut, libGLU }: let @@ -33,14 +33,14 @@ in stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg libglut libGLU ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( if stdenv.isDarwin then with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] else - [ freeglut libGLU ]) + [ libglut libGLU ]) ; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 492722d33f49..9422b6452cec 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -208,7 +208,7 @@ stdenv.mkDerivation rec { description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ vrthra fpletz lilyinstarlight ]; + maintainers = with maintainers; [ vrthra fpletz ]; platforms = platforms.unix; mainProgram = "mupdf"; }; diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index 49f6cf478fbb..20fe2ad6d82b 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -2,7 +2,7 @@ , dbus-glib , fetchurl , glib -, gnome +, gnome-common , libnotify , libtool , libwnck @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper libtool ]; buildInputs = [ glib libwnck libnotify dbus-glib - gsettings-desktop-schemas gnome.gnome-common + gsettings-desktop-schemas gnome-common ]; configureFlags = [ "--libexecdir=$(out)/bin" ]; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 83dc79a0598a..18369b8827b5 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,273 +1,278 @@ -{ pkgs -, stdenv -, callPackage -, lib -, fetchFromGitHub -, fetchPypi -, python3 -, substituteAll -, nix-update-script -, nixosTests +{ + pkgs, + stdenv, + callPackage, + lib, + fetchFromGitHub, + fetchPypi, + python3, + substituteAll, + nix-update-script, + nixosTests, # To include additional plugins, pass them here as an overlay. -, packageOverrides ? self: super: { } + packageOverrides ? self: super: { }, }: let py = python3.override { self = py; - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ( - [ - ( - # Due to flask > 2.3 the login will not work - self: super: { - werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { - version = "2.2.3"; - format = "setuptools"; - src = fetchPypi { - pname = "Werkzeug"; - inherit version; - hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; - }; - doCheck = false; - }); - flask = super.flask.overridePythonAttrs (oldAttrs: rec { - version = "2.2.5"; - format = "setuptools"; - src = fetchPypi { - pname = "Flask"; - inherit version; - hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; - }; - }); - - netaddr = super.netaddr.overridePythonAttrs (oldAttrs: rec { - version = "0.9.0"; - - src = fetchPypi { - pname = "netaddr"; - inherit version; - hash = "sha256-e0b6mxotcf1d6eSjeE7zOXAKU6CMgEDwi69fEZTaASg="; - }; - }); - } - ) - - # Built-in dependency - ( - self: super: { - octoprint-filecheck = self.buildPythonPackage rec { - pname = "OctoPrint-FileCheck"; - version = "2021.2.23"; - - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-FileCheck"; - rev = version; - sha256 = "sha256-e/QGEBa9+pjOdrZq3Zc6ifbSMClIyeTOi0Tji0YdVmI="; - }; - doCheck = false; + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ + ( + # Due to flask > 2.3 the login will not work + self: super: { + werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.2.3"; + format = "setuptools"; + src = fetchPypi { + pname = "Werkzeug"; + inherit version; + hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; }; - } - ) - - # Built-in dependency - ( - self: super: { - octoprint-firmwarecheck = self.buildPythonPackage rec { - pname = "OctoPrint-FirmwareCheck"; - version = "2021.10.11"; - - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-FirmwareCheck"; - rev = version; - hash = "sha256-wqbD82bhJDrDawJ+X9kZkoA6eqGxqJc1Z5dA0EUwgEI="; - }; - doCheck = false; + doCheck = false; + }); + flask = super.flask.overridePythonAttrs (oldAttrs: rec { + version = "2.2.5"; + format = "setuptools"; + src = fetchPypi { + pname = "Flask"; + inherit version; + hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; }; - } - ) - - ( - self: super: { - octoprint-pisupport = self.buildPythonPackage rec { - pname = "OctoPrint-PiSupport"; - version = "2023.5.24"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-PiSupport"; - rev = version; - hash = "sha256-KfkZXJ2f02G2ee+J1w+YQRKz+LSWwxVIIwmdevDGhew="; - }; - - # requires octoprint itself during tests - doCheck = false; - postPatch = '' - substituteInPlace octoprint_pi_support/__init__.py \ - --replace /usr/bin/vcgencmd ${self.pkgs.libraspberrypi}/bin/vcgencmd - ''; + doCheck = false; + }); + flask-login = super.flask-login.overridePythonAttrs (oldAttrs: rec { + version = "0.6.3"; + src = fetchPypi { + pname = "Flask-Login"; + inherit version; + hash = "sha256-XiPRSmB+8SgGxplZC4nQ8ODWe67sWZ11lHv5wUczAzM="; }; - } - ) + build-system = [ self.setuptools ]; + doCheck = false; # DeprecationWarnings + }); - ( - self: super: { - octoprint = self.buildPythonPackage rec { - pname = "OctoPrint"; - version = "1.10.2"; + netaddr = super.netaddr.overridePythonAttrs (oldAttrs: rec { + version = "0.9.0"; - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint"; - rev = version; - hash = "sha256-vISMps2v18A7MkF24SyIcK5yOQsTxBQLnKybVd8R2FU="; - }; - - propagatedBuildInputs = with self; [ - argon2-cffi - blinker - cachelib - click - colorlog - emoji - feedparser - filetype - flask - flask-babel - flask-assets - flask-login - flask-limiter - frozendict - future - itsdangerous - immutabledict - jinja2 - markdown - markupsafe - netaddr - netifaces - octoprint-filecheck - octoprint-firmwarecheck - passlib - pathvalidate - pkginfo - pip - psutil - pylru - pyserial - pyyaml - regex - requests - rsa - sarge - semantic-version - sentry-sdk - setuptools - tornado - unidecode - watchdog - websocket-client - werkzeug - wrapt - zeroconf - zipstream-ng - class-doc - pydantic_1 - ] ++ lib.optionals stdenv.isDarwin [ - py.pkgs.appdirs - ] ++ lib.optionals (!stdenv.isDarwin) [ - octoprint-pisupport - ]; - - nativeCheckInputs = with self; [ - ddt - mock - pytestCheckHook - ]; - - patches = [ - # substitute pip and let it find out, that it can't write anywhere - (substituteAll { - src = ./pip-path.patch; - pip = "${self.pip}/bin/pip"; - }) - - # hardcore path to ffmpeg and hide related settings - (substituteAll { - src = ./ffmpeg-path.patch; - ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; - }) - ]; - - postPatch = - let - ignoreVersionConstraints = [ - "cachelib" - "colorlog" - "emoji" - "immutabledict" - "PyYAML" - "sarge" - "sentry-sdk" - "watchdog" - "wrapt" - "zeroconf" - "Flask-Login" - "werkzeug" - "flask" - "Flask-Limiter" - "blinker" - ]; - in - '' - sed -r -i \ - ${lib.concatStringsSep "\n" ( - map ( - e: - ''-e 's@${e}[<>=]+.*@${e}",@g' \'' - ) ignoreVersionConstraints - )} - setup.py - ''; - - dontUseSetuptoolsCheck = true; - - preCheck = '' - export HOME=$(mktemp -d) - rm pytest.ini - ''; - - disabledTests = [ - "test_check_setup" # Why should it be able to call pip? - ] ++ lib.optionals stdenv.isDarwin [ - "test_set_external_modification" - ]; - - passthru = { - inherit (self) python; - updateScript = nix-update-script { }; - tests = { - plugins = (callPackage ./plugins.nix { }) super self; - inherit (nixosTests) octoprint; - }; - }; - - meta = with lib; { - homepage = "https://octoprint.org/"; - description = "Snappy web interface for your 3D printer"; - mainProgram = "octoprint"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ abbradar gebner WhittlesJr gador ]; - }; + src = fetchPypi { + pname = "netaddr"; + inherit version; + hash = "sha256-e0b6mxotcf1d6eSjeE7zOXAKU6CMgEDwi69fEZTaASg="; }; - } - ) - (callPackage ./plugins.nix { }) - packageOverrides - ] - ); + }); + }) + + # Built-in dependency + (self: super: { + octoprint-filecheck = self.buildPythonPackage rec { + pname = "OctoPrint-FileCheck"; + version = "2021.2.23"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-FileCheck"; + rev = version; + sha256 = "sha256-e/QGEBa9+pjOdrZq3Zc6ifbSMClIyeTOi0Tji0YdVmI="; + }; + doCheck = false; + }; + }) + + # Built-in dependency + (self: super: { + octoprint-firmwarecheck = self.buildPythonPackage rec { + pname = "OctoPrint-FirmwareCheck"; + version = "2021.10.11"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-FirmwareCheck"; + rev = version; + hash = "sha256-wqbD82bhJDrDawJ+X9kZkoA6eqGxqJc1Z5dA0EUwgEI="; + }; + doCheck = false; + }; + }) + + (self: super: { + octoprint-pisupport = self.buildPythonPackage rec { + pname = "OctoPrint-PiSupport"; + version = "2023.5.24"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-PiSupport"; + rev = version; + hash = "sha256-KfkZXJ2f02G2ee+J1w+YQRKz+LSWwxVIIwmdevDGhew="; + }; + + # requires octoprint itself during tests + doCheck = false; + postPatch = '' + substituteInPlace octoprint_pi_support/__init__.py \ + --replace /usr/bin/vcgencmd ${self.pkgs.libraspberrypi}/bin/vcgencmd + ''; + }; + }) + + (self: super: { + octoprint = self.buildPythonPackage rec { + pname = "OctoPrint"; + version = "1.10.2"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint"; + rev = version; + hash = "sha256-vISMps2v18A7MkF24SyIcK5yOQsTxBQLnKybVd8R2FU="; + }; + + propagatedBuildInputs = + with self; + [ + argon2-cffi + blinker + cachelib + click + colorlog + emoji + feedparser + filetype + flask + flask-babel + flask-assets + flask-login + flask-limiter + frozendict + future + itsdangerous + immutabledict + jinja2 + markdown + markupsafe + netaddr + netifaces + octoprint-filecheck + octoprint-firmwarecheck + passlib + pathvalidate + pkginfo + pip + psutil + pylru + pyserial + pyyaml + regex + requests + rsa + sarge + semantic-version + sentry-sdk + setuptools + tornado + unidecode + watchdog + websocket-client + werkzeug + wrapt + zeroconf + zipstream-ng + class-doc + pydantic_1 + ] + ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ] + ++ lib.optionals (!stdenv.isDarwin) [ octoprint-pisupport ]; + + nativeCheckInputs = with self; [ + ddt + mock + pytestCheckHook + ]; + + patches = [ + # substitute pip and let it find out, that it can't write anywhere + (substituteAll { + src = ./pip-path.patch; + pip = "${self.pip}/bin/pip"; + }) + + # hardcore path to ffmpeg and hide related settings + (substituteAll { + src = ./ffmpeg-path.patch; + ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; + }) + ]; + + postPatch = + let + ignoreVersionConstraints = [ + "cachelib" + "colorlog" + "emoji" + "immutabledict" + "PyYAML" + "sarge" + "sentry-sdk" + "watchdog" + "wrapt" + "zeroconf" + "Flask-Login" + "werkzeug" + "flask" + "Flask-Limiter" + "blinker" + ]; + in + '' + sed -r -i \ + ${ + lib.concatStringsSep "\n" (map (e: ''-e 's@${e}[<>=]+.*@${e}",@g' \'') ignoreVersionConstraints) + } + setup.py + ''; + + dontUseSetuptoolsCheck = true; + + preCheck = '' + export HOME=$(mktemp -d) + rm pytest.ini + ''; + + disabledTests = [ + "test_check_setup" # Why should it be able to call pip? + ] ++ lib.optionals stdenv.isDarwin [ "test_set_external_modification" ]; + disabledTestPaths = [ + "tests/test_octoprint_setuptools.py" # fails due to distutils and python3.12 + ]; + + passthru = { + inherit (self) python; + updateScript = nix-update-script { }; + tests = { + plugins = (callPackage ./plugins.nix { }) super self; + inherit (nixosTests) octoprint; + }; + }; + + meta = with lib; { + homepage = "https://octoprint.org/"; + description = "Snappy web interface for your 3D printer"; + mainProgram = "octoprint"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ + abbradar + gebner + WhittlesJr + gador + ]; + }; + }; + }) + (callPackage ./plugins.nix { }) + packageOverrides + ]); }; in -with py.pkgs; toPythonApplication octoprint +with py.pkgs; +toPythonApplication octoprint diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 6f210791ce9a..d6c7da1ffefb 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -157,8 +157,9 @@ python3.pkgs.buildPythonApplication rec { --replace '"killall",' '"${procps}/bin/pkill", "-x",' ''; + # setuptools to get distutils with python 3.12 installPhase = '' - ${python3.interpreter} setup.py install --prefix="$out" + ${(python3.withPackages (p: [ p.setuptools ])).interpreter} setup.py install --prefix="$out" cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override glib-compile-schemas $out/share/glib-2.0/schemas/ diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 5388b7b7485e..d21e306c8a7a 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -11,6 +11,7 @@ , qtbase , qtpositioning , qtsvg +, qtwayland , libGLU , libGL , zlib @@ -68,6 +69,7 @@ in stdenv.mkDerivation rec { qtbase qtpositioning qtsvg + qtwayland libGLU libGL zlib diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 9265543ff8f5..96e0ffdfad28 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "3.10"; + version = "4.0"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-IDOtwrIKzP/pbwqIespvZtNS1VdR3246uXxgxR3V6VI="; + sha256 = "sha256-UAKEyJFdgwJ4Jz3lTG6vmxEkIVLSikWOEBjYV6o72nQ="; fetchSubmodules = true; }; @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { cmakeFlags = ["-DWITH_LTO=OFF"]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + "-faligned-allocation" + ]); + installPhase = '' runHook preInstall @@ -53,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ ratsclub ]; mainProgram = "p2pool"; + platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index aa0fb08984ed..2da4e5eb7eb1 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -8,7 +8,6 @@ , gzip , nodejs , rustc -, stdenv , wasm-bindgen-cli , wasm-pack }: @@ -121,9 +120,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ pbsds ]; platforms = platforms.unix; - # See comment about wasm32-unknown-unknown in rustc.nix. - broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; mainProgram = "pagefind"; }; } diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix index e6c250afc321..436822aa2b88 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -21,8 +21,7 @@ , libjpeg8 , curl , vulkan-loader -, gnome -, zenity ? gnome.zenity +, zenity }: stdenvNoCC.mkDerivation { diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/applications/misc/pass-secret-service/default.nix index 1ce8511b27c7..c377adc39891 100644 --- a/pkgs/applications/misc/pass-secret-service/default.nix +++ b/pkgs/applications/misc/pass-secret-service/default.nix @@ -72,6 +72,6 @@ python3.pkgs.buildPythonApplication rec { license = lib.licenses.gpl3Only; platforms = lib.platforms.all; mainProgram = "pass_secret_service"; - maintainers = with lib.maintainers; [ jluttine aidalgol ]; + maintainers = with lib.maintainers; [ jluttine ]; }; } diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index 69be975be0ba..cd03f1521abf 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -5,7 +5,7 @@ , cairo , dconf , glib -, gnome +, gnome-common , gtk3 , libwnck , libX11 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext - gnome.gnome-common + gnome-common libxml2 # xmllint pkg-config vala diff --git a/pkgs/applications/misc/pysentation/default.nix b/pkgs/applications/misc/pysentation/default.nix index ad2d9c02e683..41568d0295b3 100644 --- a/pkgs/applications/misc/pysentation/default.nix +++ b/pkgs/applications/misc/pysentation/default.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 57d5ae394381..296a81e075da 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -2,7 +2,7 @@ , python310 , fetchFromGitHub , gdk-pixbuf -, gnome +, adwaita-icon-theme , gpsbabel , glib-networking , glibcLocales @@ -55,7 +55,7 @@ in python.pkgs.buildPythonApplication rec { gtk3 webkitgtk glib-networking - gnome.adwaita-icon-theme + adwaita-icon-theme gdk-pixbuf ]; diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index e6a672040824..a28e8d588693 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/bkueng/qMasterPassword"; license = licenses.gpl3; - maintainers = with lib.maintainers; [ tadeokondrak teutat3s ]; + maintainers = with lib.maintainers; [ teutat3s ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index d4b014ea85ae..b94b8326dca3 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.30.1.1"; + version = "3.30.1.3"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-hZe1rTRkvdKC/row0Li6hsmOcLKkMULo9ScOvvjmWCA="; + hash = "sha256-bGSXFX1LuNZzs981t0GZxnMPzyJ+bddB4m/wkLMsfg0="; }; patches = [ diff --git a/pkgs/applications/misc/rusty-psn/default.nix b/pkgs/applications/misc/rusty-psn/default.nix index 058e4a9c028a..d72905fe094f 100644 --- a/pkgs/applications/misc/rusty-psn/default.nix +++ b/pkgs/applications/misc/rusty-psn/default.nix @@ -56,7 +56,6 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libxcb libGL - libGL.dev ]; buildNoDefaultFeatures = true; diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/applications/misc/shell-genie/default.nix index 728a4aabed38..df4833199d8c 100644 --- a/pkgs/applications/misc/shell-genie/default.nix +++ b/pkgs/applications/misc/shell-genie/default.nix @@ -25,10 +25,6 @@ buildPythonPackage rec { poetry-core ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - dependencies = [ colorama openai diff --git a/pkgs/applications/misc/snagboot/default.nix b/pkgs/applications/misc/snagboot/default.nix index 353712d5ba89..11f49d8506b5 100644 --- a/pkgs/applications/misc/snagboot/default.nix +++ b/pkgs/applications/misc/snagboot/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, pythonRelaxDepsHook , python3 , snagboot , testers @@ -21,7 +20,6 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook ]; pythonRemoveDeps = [ diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix index 8029eee15f89..f4df09504fc2 100644 --- a/pkgs/applications/misc/snapper-gui/default.nix +++ b/pkgs/applications/misc/snapper-gui/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages -, gnome, gtk3, wrapGAppsHook3, gtksourceview3, snapper +, adwaita-icon-theme, gtk3, wrapGAppsHook3, gtksourceview3, snapper , gobject-introspection }: @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 - gnome.adwaita-icon-theme + adwaita-icon-theme ]; doCheck = false; # it doesn't have any tests diff --git a/pkgs/applications/misc/spotify-tray/default.nix b/pkgs/applications/misc/spotify-tray/default.nix index 107424e4e836..7a140a877dfd 100644 --- a/pkgs/applications/misc/spotify-tray/default.nix +++ b/pkgs/applications/misc/spotify-tray/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Adds a tray icon to the Spotify Linux client application"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ Enzime ]; + maintainers = with maintainers; [ ]; mainProgram = "spotify-tray"; }; } diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index 4231adb65b41..520ea84ebd99 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ssocr"; - version = "2.23.1"; + version = "2.24.0"; src = fetchFromGitHub { owner = "auerswal"; repo = "ssocr"; rev = "v${version}"; - sha256 = "sha256-EfZsTrZI6vKM7tB6mKNGEkdfkNFbN5p4TmymOJGZRBk="; + sha256 = "sha256-79AnlO5r3IWSsV7zcI8li63bWTa+jw99cdOFFOGFZ2w="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.kroell ]; mainProgram = "ssocr"; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/stepreduce/default.nix b/pkgs/applications/misc/stepreduce/default.nix index 40e0986c5d01..d6122ec0bbb3 100644 --- a/pkgs/applications/misc/stepreduce/default.nix +++ b/pkgs/applications/misc/stepreduce/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -Dm755 stepreduce $out/bin/stepreduce - runHook prostInstall + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index b5bf0696f764..b66c4f74d724 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -31,6 +31,7 @@ during runtime. Alternatively, one can edit the desktop file themselves after it is generated See: https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ , autostartExecPath ? "syncthingtray" +, versionCheckHook }: stdenv.mkDerivation (finalAttrs: { @@ -85,9 +86,10 @@ stdenv.mkDerivation (finalAttrs: { # Make binary available in PATH like on other platforms ln -s $out/Applications/syncthingtray.app/Contents/MacOS/syncthingtray $out/bin/syncthingtray ''; - installCheckPhase = '' - $out/bin/syncthingtray --help | grep ${finalAttrs.version} - ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; cmakeFlags = [ "-DQT_PACKAGE_PREFIX=Qt${lib.versions.major qtbase.version}" diff --git a/pkgs/applications/misc/tabula-java/default.nix b/pkgs/applications/misc/tabula-java/default.nix index 4c437ea6df5d..011f92362a31 100644 --- a/pkgs/applications/misc/tabula-java/default.nix +++ b/pkgs/applications/misc/tabula-java/default.nix @@ -16,7 +16,7 @@ maven.buildMavenPackage rec { hash = "sha256-lg8/diyGhfkUU0w7PEOlxb1WNpJZVDDllxMMsTIU/Cw="; }; - mvnHash = "sha256-yULCBHgctZZU3Deod+nQujssmUy+kgdFdgE3NUuFhOw="; + mvnHash = "sha256-CXJm9YlYsYViChFcH9e2P9pxK0q/tLWODOzZPXZ8hK0="; mvnParameters = "compile assembly:single -Dmaven.test.skip=true"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index b3292b8ebb5d..d1c4dd88583a 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "24.1.3"; + version = "24.2.1"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-Fq+kDdNR7G0Fbi++OFGxYbgFFOnpdzxy0JVh5t/i8hs="; + sha256 = "sha256-AdjygNnQ3qQB03cGcQ5EB0cY3XXWLrzfCqw/U8tq1Yo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 92d93b5095d1..438277bc98cd 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -4,7 +4,7 @@ , python3Packages , gdk-pixbuf , glib -, gnome +, adwaita-icon-theme , gobject-introspection , gtk3 , wrapGAppsHook3 @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ glib - gnome.adwaita-icon-theme + adwaita-icon-theme gtk3 keybinder3 libappindicator diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/applications/misc/valent/default.nix index 1071f39d43d2..224e105e51e7 100644 --- a/pkgs/applications/misc/valent/default.nix +++ b/pkgs/applications/misc/valent/default.nix @@ -15,20 +15,21 @@ , libadwaita , libpeas2 , libportal-gtk4 +, pipewire , pulseaudio , sqlite }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "valent"; - version = "0-unstable-2024-02-12"; + version = "1.0.0.alpha.45"; src = fetchFromGitHub { owner = "andyholmes"; repo = "valent"; - rev = "70ef1aa42eb2df5e9c3aa4faa014c8d539450018"; + rev = "v${finalAttrs.version}"; + hash = "sha256-hOVWvk4U6VoWAvXNHK1vTm/am69EFqDmSb0NofWVQj8="; fetchSubmodules = true; - hash = "sha256-JdrkAtn21NoX+SI6PNWMdE8HLKhLc3HKFhwKydENkvg="; }; nativeBuildInputs = [ @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { libadwaita libpeas2 libportal-gtk4 + pipewire pulseaudio sqlite ]; @@ -81,9 +83,9 @@ stdenv.mkDerivation rec { ``` ''; homepage = "https://valent.andyholmes.ca"; - changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/andyholmes/valent/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = with lib.licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index 9f27f8e73d7f..2793ffcd0c63 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, libgnomeui, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, libxml2 }: stdenv.mkDerivation rec { pname = "verbiste"; - version = "0.1.47"; + version = "0.1.48"; src = fetchurl { - url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz"; - sha256 = "02kzin3pky2q2jnihrch8y0hy043kqqmzxq8j741x80kl0j1qxkm"; + url = "https://perso.b2b2c.ca/~sarrazip/dev/verbiste-${version}.tar.gz"; + hash = "sha256-qp0OFpH4DInWjzraDI6+CeKh85JkbwVYHlJruIrGnBM="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgnomeui libxml2 ]; + buildInputs = [ gtk2 libxml2 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/wallust/default.nix b/pkgs/applications/misc/wallust/default.nix index e92d5517026f..01d14f72168f 100644 --- a/pkgs/applications/misc/wallust/default.nix +++ b/pkgs/applications/misc/wallust/default.nix @@ -4,9 +4,10 @@ , nix-update-script , imagemagick , makeWrapper +, installShellFiles }: let - version = "2.10.0"; + version = "3.0.0-beta"; in rustPlatform.buildRustPackage { pname = "wallust"; @@ -17,12 +18,20 @@ rustPlatform.buildRustPackage { owner = "explosion-mental"; repo = "wallust"; rev = version; - hash = "sha256-0kPmr7/2uVncpCGVOeIkYlm2M0n9+ypVl7bQ9HnqLb4="; + hash = "sha256-gGyxRdv2I/3TQWrTbUjlJGsaRv4SaNE+4Zo9LMWmxk8"; }; - cargoHash = "sha256-p1NKEppBYLdCsTY7FHPzaGladLv5HqIVNJxSoFJOx50="; + cargoHash = "sha256-dkHS8EOzmn5VLiKP3SMT0ZGAsk2wzvQeioG7NuGGUzA="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + postInstall = '' + installManPage man/wallust* + installShellCompletion --cmd wallust \ + --bash completions/wallust.bash \ + --zsh completions/_wallust \ + --fish completions/wallust.fish + ''; postFixup = '' wrapProgram $out/bin/wallust \ diff --git a/pkgs/applications/misc/wmenu/default.nix b/pkgs/applications/misc/wmenu/default.nix index c44379184862..ada289ad4961 100644 --- a/pkgs/applications/misc/wmenu/default.nix +++ b/pkgs/applications/misc/wmenu/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromSourcehut +, fetchFromGitea , pkg-config , meson , ninja @@ -15,15 +15,16 @@ stdenv.mkDerivation rec { pname = "wmenu"; - version = "0.1.8"; + version = "0.1.9"; strictDeps = true; - src = fetchFromSourcehut { - owner = "~adnano"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "adnano"; repo = "wmenu"; rev = version; - hash = "sha256-gVoqRHQ5bcY58LTgKxpPM1PnZJrLRoSOJUiYYqc/vRI="; + hash = "sha256-TF5BvgThvTOqxyfz5Zt/Z1cqjFJwvla+dgdyvz7Zhrg="; }; nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ]; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Efficient dynamic menu for Sway and wlroots based Wayland compositors"; - homepage = "https://git.sr.ht/~adnano/wmenu"; + homepage = "https://codeberg.org/adnano/wmenu"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ eken ]; diff --git a/pkgs/applications/misc/wthrr/default.nix b/pkgs/applications/misc/wthrr/default.nix index 5b3c6d2cd17a..142d331be9f7 100644 --- a/pkgs/applications/misc/wthrr/default.nix +++ b/pkgs/applications/misc/wthrr/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "wthrr"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { - owner = "tobealive"; + owner = "ttytm"; repo = "wthrr-the-weathercrab"; rev = "v${version}"; - hash = "sha256-djrPBmXnUC8d6lWuiHyYY2so8/5RHLFYDu6xoHn6GRg="; + hash = "sha256-3bWO2Gl8/B2p4k/6QhlT46RvyMJJs7WkVcX35vWN2Fk="; }; - cargoHash = "sha256-PGbkGoWcFlTKpnrvMzrHvjFLIuohqEhVg4DYhAZOpkw="; + cargoHash = "sha256-8Uy+8UpCQyLaLsulpgC1w2XI9aqj2P5ebBlXqpuDIc4="; nativeBuildInputs = [ pkg-config @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; checkFlags = [ @@ -39,8 +40,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Weather companion for the terminal"; - homepage = "https://github.com/tobealive/wthrr-the-weathercrab"; - changelog = "https://github.com/tobealive/wthrr-the-weathercrab/releases/tag/${src.rev}"; + homepage = "https://github.com/ttytm/wthrr-the-weathercrab"; + changelog = "https://github.com/ttytm/wthrr-the-weathercrab/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; mainProgram = "wthrr"; diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix index 34425345f3d4..ed66ebc59313 100644 --- a/pkgs/applications/misc/xscope/default.nix +++ b/pkgs/applications/misc/xscope/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "program to monitor X11/Client conversations"; homepage = "https://cgit.freedesktop.org/xorg/app/xscope/"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; platforms = with platforms; unix; mainProgram = "xscope"; }; diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index da5cb37a978b..c88a65d55d60 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -6,7 +6,7 @@ , libnotify , libappindicator , pkg-config -, gnome +, gnome-screenshot , makeWrapper , removeReferencesTo }: @@ -67,7 +67,7 @@ flutter319.buildFlutterApplication rec { # Needed for QR scanning to work extraWrapProgramArgs = '' - --prefix PATH : ${lib.makeBinPath [ gnome.gnome-screenshot ]} + --prefix PATH : ${lib.makeBinPath [ gnome-screenshot ]} ''; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix index 2fe6bd7904d7..378981ae8410 100644 --- a/pkgs/applications/misc/yubioath-flutter/helper.nix +++ b/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -4,7 +4,6 @@ , zxing-cpp , pillow , poetry-core -, pythonRelaxDepsHook , src , version @@ -21,7 +20,6 @@ buildPythonApplication { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = true; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 59b753192a2a..13e1a71d45e0 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) if stdenv.isAarch64 then { pname = "brave"; - version = "1.67.116"; - url = "https://github.com/brave/brave-browser/releases/download/v1.67.116/brave-browser_1.67.116_arm64.deb"; - hash = "sha256-YOvfXI+bSX3WZRBYXxGYhNme9NZl3ob/JYw6KshXn54="; + version = "1.67.123"; + url = "https://github.com/brave/brave-browser/releases/download/v1.67.123/brave-browser_1.67.123_arm64.deb"; + hash = "sha256-YcTwa1sTKpLn9O4/M11nrjgItD6ktug1GFw0tNcZplg="; platform = "aarch64-linux"; } else if stdenv.isx86_64 then { pname = "brave"; - version = "1.67.116"; - url = "https://github.com/brave/brave-browser/releases/download/v1.67.116/brave-browser_1.67.116_amd64.deb"; - hash = "sha256-J4ap0bEAg5Q40U155AdAyzereBAo8Q/YDedDVqYvaT4="; + version = "1.67.123"; + url = "https://github.com/brave/brave-browser/releases/download/v1.67.123/brave-browser_1.67.123_amd64.deb"; + hash = "sha256-L9Jcug6HQxJ4E2C9p8BdwxkD75F2j+HaEmgjdrU9oEo="; platform = "x86_64-linux"; } else diff --git a/pkgs/applications/networking/browsers/brave/make-brave.nix b/pkgs/applications/networking/browsers/brave/make-brave.nix index f0b9fb6cf0c6..01458f700182 100644 --- a/pkgs/applications/networking/browsers/brave/make-brave.nix +++ b/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -12,7 +12,7 @@ , freetype , gdk-pixbuf , glib -, gnome +, adwaita-icon-theme , gsettings-desktop-schemas , gtk3 , gtk4 @@ -120,7 +120,7 @@ stdenv.mkDerivation { glib gsettings-desktop-schemas gtk3 gtk4 # needed for XDG_ICON_DIRS - gnome.adwaita-icon-theme + adwaita-icon-theme ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3616189374d3..fab1bbdff39e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -199,7 +199,7 @@ let pciutils protobuf speechd libXdamage at-spi2-core pipewire libva - libdrm wayland mesa.drivers libxkbcommon + libdrm wayland libxkbcommon curl libepoxy libffi @@ -227,7 +227,7 @@ let pciutils protobuf speechd libXdamage at-spi2-core pipewire libva - libdrm wayland mesa.drivers libxkbcommon + libdrm wayland libxkbcommon curl libepoxy libffi diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 095fe13f9197..1998972cc217 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,7 +1,7 @@ { newScope, config, stdenv, makeWrapper , buildPackages , ed, gnugrep, coreutils, xdg-utils -, glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit +, glib, gtk3, gtk4, adwaita-icon-theme, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , runCommand , lib, libkrb5 @@ -101,7 +101,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 gtk4 # needed for XDG_ICON_DIRS - gnome.adwaita-icon-theme + adwaita-icon-theme # Needed for kerberos at runtime libkrb5 diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 7aa9e82430b9..16f28882df5b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1025 +1,1035 @@ { - version = "127.0.2"; + version = "128.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ach/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ach/firefox-128.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "4dfae5ad421dd82245663acde11aa82f10fbd073f45729c9c026bb67864f5158"; + sha256 = "fe0fac4d0ff657d57d5c5acce08079f3571a10f7de5a747fbca5ff38a7679317"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/af/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/af/firefox-128.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b3b74ee172d8692d0f6e2a09df097f360c726e66687479b5629e5f3825ec59a2"; + sha256 = "2fd8b8fd43239f766ea7c93b8f090c31b1335a0d45d0ab4344baac02836798b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/an/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/an/firefox-128.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "36f54f2a806593130608a24ad46269045410a64f6b0f03a626c5493d9ef45c5c"; + sha256 = "ddbdc736a1964ac6cc9d4216f8e4d5b72f0bc9cc7d538dd71a9dbeff624d032f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ar/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ar/firefox-128.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "19a33b4b6d2c9628d9f46a3ea54ad265524be6734c5b4941c3b10ee54905bd2c"; + sha256 = "f285788c38d09e26532e12a4821f31cac175b24fdf5d7f48f81ce6cce290538c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ast/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ast/firefox-128.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "4f38bae88ccdf64c6b01006b89a28f59ac4b4cd56a1bf4a9652de96618cbdf7a"; + sha256 = "f20aa2eb7b7804c465283ff73bf38e6c6f8a460acc092487131a03b6b44cad3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/az/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/az/firefox-128.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "dd27539fca8bb7f96bcf3e427d0ce24d4e4c0e85f480ee3d88582edfb9f87e9e"; + sha256 = "970edaa51af137a81de5fac9b594a4ac7971e2f1db5d8d8113a09b3b682dae80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/be/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/be/firefox-128.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "edade0529527a7244d35952cd0a321e55da0df7bd5f0ed9abfe420381a15c60a"; + sha256 = "b91cbd018f5687ea9e196ae1f23440322b1a2f0bebdb3a57a9e8115c0695569c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/bg/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/bg/firefox-128.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2878112dad9743ed79df6412c1504ce2df74815bf6a94f3e3d7e8e82fe5661b9"; + sha256 = "9c91bb7a0a3663baeeee5e40c3172b858fd5dbf869deb05724ce5c87178f635f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/bn/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/bn/firefox-128.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a6ea19219ee6aaf02aa5957a91a9687f5775fbf8b560457bc36bb27e58251e90"; + sha256 = "7e80370f346568431625ab11438e575ce21a393da13b3d736ed940309cabecaa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/br/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/br/firefox-128.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c98bd781a092e33e223322b5f1b758c96cf6ef2560ce6738a14004701266715c"; + sha256 = "0ec0c53b87f34ae4f9ee2166a322106b3245df9e35057f2683da30e50c9c1062"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/bs/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/bs/firefox-128.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "0082d6d4004ab6aaf0a212b2aaab5e71a199296b718f2cd854b019d775505cd0"; + sha256 = "58cb30dad21f3e0eb69f069a819ffbf4f39e060225dbf4afc0351ec579693e86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ca-valencia/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ca-valencia/firefox-128.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "f3344a8ec525b945d2d28f7cca7c85b0259a3c74913ae3fca92b4ac3956e6386"; + sha256 = "8729e10a963d47df5ed6f0de7a5c4c94451b32c6dae2be9dced8e00b075e65cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ca/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ca/firefox-128.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d001c54e02d9ad4f050b0b278a06c21f407f3b2857b5d9857d98effcbc565254"; + sha256 = "95037aec2b9f506d583d62897ad76064a814b028be72dccf34a2a10c51a50507"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/cak/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/cak/firefox-128.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "cd9192d363f75d01e91198e8b3099118551865a09acfce3bf3b3faa3d10271c2"; + sha256 = "cdd48e6731404b52a81d2a4dd121313dfac5fcd84d21908617ccfc64ddaa247d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/cs/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/cs/firefox-128.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d9c1318224e2cff169a91c149d31365e1b4d1281373aa7fa2b580e7c96d416cf"; + sha256 = "ea17169afcf30b7b179032d196f03c6f2cbc3a32c02ac737cbc18d1c1e6e58b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/cy/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/cy/firefox-128.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "88f4f8f626f9506af309b7330e51354de96e0cdae323f140a5ed2585ce0bb64f"; + sha256 = "ba5a288107d74b021f7ae43564de1cf98f7235f2de7cb23441049ae58d60de2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/da/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/da/firefox-128.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8dce8aaa01be56cf2862c3aff05fb36bbff26ef6ac6d879499385df57c0fb1ef"; + sha256 = "a480d6b13ab5c724ca461cc2ca2b2168dfabbf32e3236f136ccc018c994a1b1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/de/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/de/firefox-128.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "ec9a45975a649a2bf851b2e28cb36098a5df28fc4ef6bd78ec576e25b6b56148"; + sha256 = "9eceff958a692aeec627f1d30d6be0aeb993fba259e9c6f7d0fdd3aaf9cfb998"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/dsb/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/dsb/firefox-128.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8a633651937fcd2370d1b92414d92f40e7bc3b24d8b5fe706a1bfcf0dd7ab784"; + sha256 = "f43a2790324711b80fe56ff17525ee3552f3bf2765918eb4087c125c3ff277d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/el/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/el/firefox-128.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ae236ab979107d8872473ace4e0613f348aa6e253d7f9ecc3324151ae8b0d68c"; + sha256 = "2bf7f6aa888eec9737b410e28da2845022e5c68035580de989a6e84648d8e816"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/en-CA/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/en-CA/firefox-128.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "1a0b556ee830faf468424a9ae4f6674ca9d3c7e543a8a96645add085f6cd973a"; + sha256 = "41f802d9fa41f02d516593324c37691d3fe1fb89c4439992da468c868a03e2c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/en-GB/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/en-GB/firefox-128.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "dc0b55ddf32c5ac9dddf252099f76befbd8ca5155e734299187857a5fb18fadc"; + sha256 = "c61adcc64cadaf494f1d8ff4d9e912715b74832fa11409910384a8c532502129"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/en-US/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/en-US/firefox-128.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9e200146236e2403d4be088b49a6c8de3294ff1aa000ebf385d42c593207954b"; + sha256 = "dce89cff7286c1bd4dd906fb9123e6136f1a1ecb7a6d674c53566c319cc85c4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/eo/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/eo/firefox-128.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "c50d34862367350aa694ac8b5ad97873db38f3fb8a2350c7b509cee85d90f417"; + sha256 = "c8893170b623b075a62773d31f12257c015a827a9eb2ab6bf403f55b162ffc4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/es-AR/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/es-AR/firefox-128.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "10f171448d215525df0bfce6032ae1526e1386307c563c672c333421b9a602e7"; + sha256 = "8f2a02d871950415871ed42b624a545d3a407a2e12f764e18958fe86602f7213"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/es-CL/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/es-CL/firefox-128.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "b5d9e56e9b814df519e169bb238d8777a56aa6564b21688f9a6cdeedf1196471"; + sha256 = "a59c7afcdfde5b37a72f88c210fe6dc82e5c93e896d34667f55b3d937a8e2b31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/es-ES/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/es-ES/firefox-128.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "2ce2327cd3fee48bc33b04f142fcf208aa4bf1fe5a3153e5516b28d6a8d09822"; + sha256 = "4f29b661826bbdd09cf8c295eec27bdeadc3a6f584cea565088880c522cc0108"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/es-MX/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/es-MX/firefox-128.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "8c28e006fd14a56c64c56c1582495dfaa50059d339a2ffecc8f026e85cd473ae"; + sha256 = "c10ca40b9589afb1781597d67cf38e102d8bbc35d82cd5add9899f5412cacdb0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/et/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/et/firefox-128.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "1cde2e22e944213cf66f81b339a07bf6b51934597c95839e7b1fe9177c0eaf05"; + sha256 = "bc4bbfb68afd5c028d9796f68a30791d32510151d9063da2d7b2263b07fd2a09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/eu/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/eu/firefox-128.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "a2963d61444576b3ec18af5c0562d1348049e86e0419d046bb9d08ea17e5d463"; + sha256 = "f15a5bc049db89bc8da40a6208a974d3783c676684e04534c5870de795bc73cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fa/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/fa/firefox-128.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "9d3a3d49c64f9c71b504d8ddfb7134dbca5e4be516c4918a93e6fc27b23d0c3c"; + sha256 = "6599bd9a2df5069f0d0b560832d30b6e9960a5ff0beb7e5e7ee30aa18024b525"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ff/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ff/firefox-128.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "63b1e31fc5eb80156ce506069e34c8cb746ef0fd9e862372b70af51f84b96a88"; + sha256 = "c9505babef7835661a4c7f895dc315c42c066d1e4b30f607a19f742c4b9bc58f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fi/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/fi/firefox-128.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "0dc5a2af7f7b5232172f35ab830c50e922f03faeb1d145811d3dcfd929ff207f"; + sha256 = "aab2d3b55552515c04451f802635eb621d0b3b283d5e3757677b1a42ec83fe77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/fr/firefox-128.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "774d6d7377e8681fbf41098d4b97c8b2a6fa5733a16e82fa30281ca910c9158b"; + sha256 = "b86001baff83e05c8254faaf677a3a9e3c2f75d91b93460c0d486dc5c3873d25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fur/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/fur/firefox-128.0.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "cc6f207e654aabbf98b62eb35037b382faef0f20a0579900c294dcd04d8e672c"; + sha256 = "ef74865b59afda235aa6f62cc4886595bd42c2922493f739e5535b952dcd1bd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fy-NL/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/fy-NL/firefox-128.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "bee7bb15e83fcbd301814c6fa5af00e981ff411ce8f5e54d7f7ca1e0ac702b7a"; + sha256 = "8ae9e65a58b86b8c76829b18ab8a3cd095d9c5adfe97f5dc341086f441dde9bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ga-IE/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ga-IE/firefox-128.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "84d2a4286f25871773c77ed74644e88a7a32c03fa65102d583727a9a63442c57"; + sha256 = "3f9b9be803d23c827b824674933fa19f92dc61479554c5b9dd54e4037fe6309a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/gd/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/gd/firefox-128.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "f42aef7cf706b73b0e4f9228513b9d5c6f0e94416facabf16d516e41980fe4ce"; + sha256 = "a820a9caeb36045835a48fae768b54c00fd66eb54ab60b80cc39fc9b433bee6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/gl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/gl/firefox-128.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "9ef6d0ab0f038d61a0eebf6306522705b86657b0e453c3883a3ff282ed0ecdd9"; + sha256 = "c82757c3786e8e3ba655ffad34fc5d344646cc3d85b283e52dd9051738061ddd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/gn/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/gn/firefox-128.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "74a1933f6a3e32aa7bc5ddcf7cf6cb8a6d213f251bd996413db26e30136d0ef2"; + sha256 = "47dfc4571037ea2ff96a42ef206ba66ae90a4ebb7571b7cde24f6cd9c5b4dcaf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/gu-IN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/gu-IN/firefox-128.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "5be06369f5db552e0e74b8533c0d594695d0e9b1beb2a13e882085981c2f734a"; + sha256 = "ea4f1837da7babf8d18614b9d937d23774b177ba62cda3b5e02177cbcfe5ed67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/he/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/he/firefox-128.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6f02e9268fdcc0c328279df1113cd886fb640ac14f883d46500542284beea134"; + sha256 = "7f118259fef9e2033e8062df7505a39c9d30e5e40d15eefef6f2d8f46699fae5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hi-IN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/hi-IN/firefox-128.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "a1530fd469d553ed332f685d5688efac2a5766039f42a889475333b13f05d016"; + sha256 = "f1ca1598d0702c67eac5d4314394f65ccf0e9b415969ee0fdf38a737e9d572b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/hr/firefox-128.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "60ab0be6f32c8c27336eaa1d40e92f750381a527178ae3ca98540b5f1fc39b2b"; + sha256 = "052335fb532356a7a282a3be0f1ca9dc950e84fdc0bae8807c1dd4b9c1ab3643"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hsb/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/hsb/firefox-128.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "5dd37ab66bd3aeb0aa82eb0f92ec82b24f15e3ef418b5b03d5c57846b9657f71"; + sha256 = "b79f47ce945b1f5f1e6d5332f79a34a4830f36706c3ac4772ab3ec293405bee0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hu/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/hu/firefox-128.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "97ff3ab5dd865c4f550bfb710212083df39d82c47a053d603bf75022a9f1ff2b"; + sha256 = "84503c7ef80015d198d08cb8be19ebb1b7fde52006ae415d369c95c68e740779"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hy-AM/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/hy-AM/firefox-128.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c13f704a3231f35ef4944c5140a6ed89b2b88638a61c92a76d6460bf167a38ed"; + sha256 = "f598e99bd23eaea269a84272b2894f5d1e9ce51bb99568419882c5f922c54c84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ia/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ia/firefox-128.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "a70dfaf92b39fc33dffc8f5c95b62c2783ff5c68d10e04c1f37dceb372b9aaf8"; + sha256 = "648aa52eddaf798c68d240bf889ec6c47e1dda476a597d4012b5f727fa9d670e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/id/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/id/firefox-128.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "507c9b6d80def4fa180c666f9da7c7910b954d794a2b8ee56cef160cd1bd1092"; + sha256 = "f9433c4e8f99b32b3f9d7a98bf7a28712520f5c6b19740a8aac77f6077337746"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/is/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/is/firefox-128.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "3c12b24d32d1629dad830575a391be0518e3f44940173760527827328d402059"; + sha256 = "7dcb488fc2a170637f2e44c9edc58a2fe5f330567d130884bbb6695df2c6820f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/it/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/it/firefox-128.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7b3fc208e75079e2f01de115f613db7e96d2e5f4122eeeee63db2f022eed60e9"; + sha256 = "dc224da74848080add80ca37bcdd00051c3a1b16b96dbf6c2d9f99823a013371"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ja/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ja/firefox-128.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "881e83cdf8effeb5e9f27f64c0ceebd522e56041d34ca3786a2801641dbbd3fc"; + sha256 = "0f73fe2afe181ce98ec8bea9e9434c1ec2f518ddd4d3aeb5cf85f1132e2b3067"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ka/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ka/firefox-128.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "edafa57a48cd4b1935e851701c8b197adf601b50d6514edc9e6b41f390bf13f2"; + sha256 = "f1fd00b547ddfec6b1e21701294b2e9e645e7370b2ac8c27cfb91a0e271e01ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/kab/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/kab/firefox-128.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "0735d2b6243f167f61ec272b2cdf4ee0c3bb2b176ed184d54f48233946d2e4e6"; + sha256 = "30e78c78a1b6a06ae1ebadb3a0ad34f6f7b6203f091a6f36c5d67ecf4a1d157c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/kk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/kk/firefox-128.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e54e825997ae813d6fe2cea24ca19513d40e332dc5d8b95b86777caf95ca5d80"; + sha256 = "cf2f0bda716ccaffe0f778878856f9f15fed47822c7b8cc01f34624b27926df4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/km/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/km/firefox-128.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "43f2fa9985241a9b1472804af44c7719166dc122ecc42ea5ba34846a1564bc71"; + sha256 = "266d46816ca36eaf5ffe8dc2837079c58903b8608d1a03fb5466b945439c131f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/kn/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/kn/firefox-128.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "ced0e62b4055403d0b78c36ab01d9a5242b627aa9132f5028d8ca756270dc65f"; + sha256 = "6ef139036f2674101bfdd761586d79c9b61687b4eb8c9bdceeeb169ed9edb2ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ko/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ko/firefox-128.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "c645c840d9a7c1ae65ee52b3639b850ca461acd6cfed6935257a11868572e42e"; + sha256 = "0d259fbd42d4f800e63316b119a0c34d565f4cb5b297b6f2b598cd919c395bc8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/lij/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/lij/firefox-128.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "328ca467ce2bfa6fa8c3d21c4c2c44853cd2def892cdbde309fdc49121868d78"; + sha256 = "b7d67080efb049da964a817005b19e11b799581aa70876ecfb1233b5b0400497"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/lt/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/lt/firefox-128.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "6e7d5279c77f91f4c0cb2e47b74dea071f0f80d7fc23453a1aeeb06e3b2d2990"; + sha256 = "aa30e9c30a31acd549bd5481e2d7e22065319da9cf1bdf746d3039aeabbfb349"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/lv/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/lv/firefox-128.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ff1baf65721034c4f0fbcc85b4de21f30abb696dc4bd42c379183abaf2d7ce8c"; + sha256 = "fa05a0fb7080ac8254d23597e108a5bb8a793eed4f1109ee30ca287ae5271d06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/mk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/mk/firefox-128.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "256dcd6ee20c4b979b62060115d37123da404566a0bd2a2e676fb1e9533358e2"; + sha256 = "3b506f3130dc54e8d7f8d95f62b1bc03ba578706638c99e3470e0916d931a410"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/mr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/mr/firefox-128.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "084480eb31de920f8188a3eb0543322760924128c34b7667ed442bedf0c1b47d"; + sha256 = "597a970ed1b7770e49229e9efeaac7a7a58cef1e8240a1faea25f7c4efa71cc1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ms/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ms/firefox-128.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "4e8aaecd56f83c7d611ebb91f3693f4aae8a8d39ba6bb8b5e096eab1e18b923f"; + sha256 = "4b39e60cb04a3345ee71b38a83e0b0af77b3a18f826cd7c4478922aa49069383"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/my/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/my/firefox-128.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "5d5a9dea125a06fda41111ac750e6e80483ec69d2db035b38bf449a1e8a964ed"; + sha256 = "9ff911791105e834673cd3b6e5f30ca60e91c04669f24a5e4328250dbcb274e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/nb-NO/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/nb-NO/firefox-128.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "6c6c20020c2e7163ba5f164ac5a65ac7a39c636921a5104702e59b228773bd41"; + sha256 = "3c1e8b23dbae15d3818ac3a218f2bcfa7d78c9c5815b10b491f582d7d6093c9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ne-NP/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ne-NP/firefox-128.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "64a0476a467475606d93b01776c5f312203f2c890a1c46e57200db97fd2bade1"; + sha256 = "255ed595f432c97710a415112bac099262b3756033cd349859dc07bccfedd3e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/nl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/nl/firefox-128.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "ac9a3d91a2c990040e9087eb2efc1162bd63f0d75b2932c0db7acf81d059f898"; + sha256 = "fd91041ce8d9d21f435aecae3a5f7f338f2ecc77b942eca3b7da76e74b1e6551"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/nn-NO/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/nn-NO/firefox-128.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "beca6cbf60ef413d5467a6cdd934fd338c510d9d350919acd6b86fe7fdd21df2"; + sha256 = "c6c738ca66b37715e4cc1039c21613559e899fbcaf56388ab157ef19132734e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/oc/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/oc/firefox-128.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "c3b69394a0bf611f95a046f474a0bbd1a31f59bb57f1ffc7752a82e61a856240"; + sha256 = "0fea52b897520fec00aa98b6192bacb0109638973c2372d601da9161a6a868a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/pa-IN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/pa-IN/firefox-128.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ce6a5d86485002aafdde6e8d5b77683b595dce9b20e07bc0525cd3f508e3b516"; + sha256 = "3121e2e5a0e2657677902a120486ef7b3bdc8c1e5b56a6efd22e2cf21d3ec1b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/pl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/pl/firefox-128.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "773b984d1b091ddc839c2f1d123723be38a759e12536f874bbbdc1bb4e54dc2c"; + sha256 = "00c219e73a879b9f59ffebc57b880a1455cb608335c455efa5231f39a7f35bab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/pt-BR/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/pt-BR/firefox-128.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6d84e766c36fe3501a47f862fd7ed74c68ed12b334d42473db2b10ce8cd0bbbe"; + sha256 = "acc4b5e0c285382b9946b1625068db4932fc3398f1e9ee5c5b75a9f323f6f826"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/pt-PT/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/pt-PT/firefox-128.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "7e3e7af33b02149724008270b32c60b96da2b973716918c1dbbf677f93c5abae"; + sha256 = "6d42294e217c65767762833567077c713d86df88fbde2e370e9a2d4e7078db54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/rm/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/rm/firefox-128.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "f8158f3bb19a27cfff9759a541187e764ca5462656f01c007ad4a2f665316f80"; + sha256 = "901d4560e67a4248548b3f852bd28afda1935cb62c7829fd533ebb39a5192f1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ro/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ro/firefox-128.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "b34bc93ea8417c84bc549ac889f06537ab7c14a384fe2de6b11965822daf178c"; + sha256 = "9ce10c9e66f88a6087db2e5123b83955417c81ed40a4c70235ee1bdcc0869a63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ru/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ru/firefox-128.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "3317259104bf35c1063411c61c24012c603dde4639e4cc1738746594ebd541d0"; + sha256 = "96c11c2e8fd57e222a4437b451a374bd7d25c7b23697104c10caa7f3b3832528"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sat/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sat/firefox-128.0.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "8554b21b9f4e47ad8d55bed298fa23ff615358a2f4af9e3e747fd1633f26a535"; + sha256 = "a85406dd18f171b09f14a7756955aa3cd877eb94eae70cc3b484d0b385cce557"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sc/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sc/firefox-128.0.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "c5a430c37a1904d6c12360dd653d215397ac1c37ff3360ca905df0f10fc63eb8"; + sha256 = "7f23eb5fbe67431ebb33c93758fbb7895700cc23b83aaa682ccc06af722a2261"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sco/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sco/firefox-128.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "5eeef923d89ffe4ff1d3c059d9e793c599159e541dd553e5e7be367879faeeaa"; + sha256 = "3a163bff765de291c400de9e58731128db90f072e74b095dccacf97ec495aef2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/si/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/si/firefox-128.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "a4f73e9a5cded4b81678d5da752443428659e64124365243d39397dd53a7a1d6"; + sha256 = "17aa5525a46339ceaf58e33fd15f030b7883cedeffa1c5108abc5ef174a60853"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sk/firefox-128.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "c068e5fb31a5b55ca3c42cfac286275584239349d3210942b66d8cbfaffdc4dd"; + sha256 = "0bd8adc58399f59a6b4b0c0ec3f42fbc85b28bb5b06a090eabedab53a71ef846"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/skr/firefox-128.0.tar.bz2"; + locale = "skr"; + arch = "linux-x86_64"; + sha256 = "5ada1070ca4d134c8fe268eed1c347b5f2eec8b9e2879b147e77fee7a0f17c2d"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sl/firefox-128.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "7f22b8cde10c11aca641f7c14176c59d86b79a654e68bafadeadd4fb7e1ff3ac"; + sha256 = "fd36fcfc3208b37385f574baecc996e453d0d42e558bce8a3091961f3bb5dda2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/son/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/son/firefox-128.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "80523ddb2925d2252b839a0caacaab95770b86835385b7b58cb0b18b522065e3"; + sha256 = "5b928bf3aa8fce5107fe0201eb81c3e7c445ece9b97b38ec856abf2f721f1d50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sq/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sq/firefox-128.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "a8532d02deef7e88bd1a9e5a7a906718994418c231c12109400ddb675f347fa6"; + sha256 = "d4dacbcb9a2c30e614435d7f40f94339b3bdfccebbfcecf968ab28bc30bb7d76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sr/firefox-128.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "462c47d4ebffbc6864be452b3fc00fed2c7cc14c26f28a6d0de3acf7ef817e3b"; + sha256 = "fe2641e4807c9550883987e01c4336972a37a4b6964de934cd4cfd95fad25475"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sv-SE/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sv-SE/firefox-128.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6ed60502aa9c7b976b7c2bd8daa6c7f112afac6391db69b7538e2d8ccd1b084c"; + sha256 = "22482927401c7cfa1a1d99149f3a5fdb0e3abc8411bdf44949948be10f699366"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/szl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/szl/firefox-128.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "dc4caf3f2c931ca69d742afd807c9d1f62fa751bf94a15f2e3c9d06b45ab8878"; + sha256 = "a45e6cbda15c263be7b5ed476c4a3056f3a40677531c4aac94ffe1761f358218"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ta/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ta/firefox-128.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "2d60ac71d827cc6dbcd09432c23af4ce2f6ba1095cb3ec19f0f9d9e4a3cbb6dc"; + sha256 = "01f38f4cbdadea42b27c77f5fff321351491357d3f754e03d10febe77b2a6086"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/te/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/te/firefox-128.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "dff77f564ece7beb32830c7bf7862d80f6b606fdc31a9fd369912b813f139536"; + sha256 = "a61af32a2ac80b91ee63065471271a651c7dbfd3db58b8fb149e2db778416e8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/tg/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/tg/firefox-128.0.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "b9241d728186d4f369e94fecab46d653853eb1408166e56f7cb435ff52ccdaf2"; + sha256 = "49fc5ef871a81f54b6e287f2663b23a4668ebdc75940de6599ca8a3ac90f6a90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/th/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/th/firefox-128.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3e87332bcc8c998758eb9493393e91979c12204787efdc450cf480841e11ef31"; + sha256 = "d056df36c22e3c3d766dc32366ff711cf2ba039afddae4c0cc0dcabe8ef40beb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/tl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/tl/firefox-128.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9aa9ad4d4ff39cc06eb8180521124503238ec809e3c621ab037a0d0953448950"; + sha256 = "6b6daed40ec7433ad91b570bc4f1cacc79b63c9a063dd165dff78db9a9d8ae56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/tr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/tr/firefox-128.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "fea0de874ceb3b1febdf0af171bb8e2a77807b4be968ba843950980f61aa1bf9"; + sha256 = "b361477aecb8a24a755cd1d977f4a78c52f87baeb2a5bd5c2261427a8c74fa07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/trs/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/trs/firefox-128.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "b5e1ab4ee7050b903c99549329dbae45ccda6389c2db850925621e4d3ba9da21"; + sha256 = "9a72632d56d9ef6add3653404e62b3dd7f51e1bf88cf6910712f9aeedefb261c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/uk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/uk/firefox-128.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "61c1ac45be55258e45533aae32b9a95c55fac81820445d0e464768c48509fec1"; + sha256 = "35865189d3d15c39deeeefb6c7361cad6d9a771e0a1176155f4142f9f4ca254b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ur/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ur/firefox-128.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "5dc29c0ba5a0368d09f73675633d7110b64b8ff9233ace5a0769e04b9c7eed7a"; + sha256 = "dc74ea8a0dd1617f298a7d438c71e1d22c081a7ffaeabbcee176dc9c6576db5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/uz/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/uz/firefox-128.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "39698fa62f4361805c5a41f81853d44e082dedf78cfc5aefc58ddf5a00823ecd"; + sha256 = "d34e921bb16cac806c29c268d8f09b6869d914f12677c295ed14e760da344a84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/vi/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/vi/firefox-128.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "5372cc16c0128005f282018185ad725ab65b5c04140a10a014efc2cb1fd59943"; + sha256 = "f0de9044eee46454ced3e6be5c1c0af5252f11d43f740bb1611f2800c814b2df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xh/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/xh/firefox-128.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "5d4ed46c1fccdea8ad2be40aedd0ccb2d3608473cd450005a0dc6da356ae7c43"; + sha256 = "ee401bfcb28279a3b49611ea87fae67970f472a68e893a2cde55b95a8ba949a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/zh-CN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/zh-CN/firefox-128.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "a7762c58e6839f764c10fedd2da38477be15817c00070b234af4f59495ab22f7"; + sha256 = "daf6944d438b9b51762eacf439bc2996c01250ddd0aae7fe2f73f771571662d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/zh-TW/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/zh-TW/firefox-128.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "55f6df7a2cba4b4a317de9285f9c6108267a3624790ebc6eabc0d497ca165d01"; + sha256 = "8e018072ff38386675d826b4be84b88aa05ebbe457022d06e135a87db56ba520"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ach/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ach/firefox-128.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "4262826552bf7012483cfb5a61c4cb3d99cc267ac84dd4eaa3fad4cb144910c0"; + sha256 = "c970c2b9810f2a2cc646714d99a59623c04daea87bb6a32b5c434e6a2a4b3bf9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/af/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/af/firefox-128.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "da855058e17f89360708f658fccbfe1a099b5a82e1071227661c9a7bc1a96b4d"; + sha256 = "1508093fcff587ead35cc726f57e3d399ef96c028da8220c1ff3dad7ab279746"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/an/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/an/firefox-128.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "20a8e588bc34e47582d815772129e6c77dca40d7bfece63493dee9a003c21671"; + sha256 = "23faeb79323393802ecf3768a3369f9670f8400292a03f37455ff419cd647537"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ar/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ar/firefox-128.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "3326c461896dae10a4c2ce300d58f36f38e2a6bb4bb2277579f73923eaa5e14e"; + sha256 = "0d815d6550f11cba2466487cfae3dc5001705133a3842d7c608c0c94eed400b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ast/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ast/firefox-128.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "af90ec9c53be0e0d885f781ea90db3995c7b0e323e91d793aeabfa995733ef91"; + sha256 = "ac1296582914c67751c6bceb606081f0559f9d8d099ac15951acb0a4123e22d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/az/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/az/firefox-128.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "7a9c0ac72f90b44528f88be35bb5c18c7dc02819cb2cc9cc3b42628ce59a54bc"; + sha256 = "bd7c16747987a51f71c52c9ede2902dbdff450b5480d4fc72cf9b7fedda34789"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/be/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/be/firefox-128.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "734fdceff2b722617e1aacd817ce823c076032481a731bf73b9184fca19fd035"; + sha256 = "23a8e9cf0cc7e4ff397dbb1fdd12e7317efc616ed2ac88d3cfdbf063b426e78e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/bg/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/bg/firefox-128.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "eb58480cf5a0291a40e8b95bc3083bbb7d251d9d82cf84ccc400bf3b60665993"; + sha256 = "16008e2c03e35429a248f9986e868b53993504dd5216ae4d6a5bd1df540ecf89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/bn/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/bn/firefox-128.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "678a0603ad497544b1bdc68181fc5ac9e2acae0eebd9946fb44315668ba78ec9"; + sha256 = "5106acec718bcdd33197ebf0780326019050b6fde84255cf08bc86923c4071bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/br/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/br/firefox-128.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "6871ecd32da428ba9c9c8fd6c28401f1c77a79fc617304f330c42a57d866010c"; + sha256 = "c0eb06ac18ca6828b88eb614c861f01e564f8ae7280bc4a040208bb033d8d328"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/bs/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/bs/firefox-128.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "e3fcff0fd7f5354a080c222c8002497255040b19f5294d9e68a08379aa6ffadd"; + sha256 = "b46df9eb8011a55dace77a1607a55341453cbe6ef5939b16409263dcb2f0f7b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ca-valencia/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ca-valencia/firefox-128.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "e50fa7f62356438911b2bb09753891eba70d5339367707cddeb72734f912f0a3"; + sha256 = "d57ebaae949d5ed196dbf9278c3fa4d630c5367b0ee51b56ccc7e3a6fd16e146"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ca/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ca/firefox-128.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "2eaaaa67d02e15ae63e629ee51c0eea1fb305a7a58d0493e08bd780bdc532488"; + sha256 = "32d79c89caedebb8f33f5d4ed11eb01c10a6cf3a3c326f92bfa5b41cb059e93d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/cak/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/cak/firefox-128.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "bbec0e259064cdf9337a160176b336ff27e1b28757cd862e6da92dcf2752d84a"; + sha256 = "3df47932602f02d44829ac053f616f951a14b24752347dcf2a5d069b5934192d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/cs/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/cs/firefox-128.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7b5fa6fb597ab7e2e226258e97480c6426478e774925098719135fcae93caf18"; + sha256 = "db45b6649ef91a6cbf7ec3eca1d606ac24192f78d5eede545f14a8e446ef2e5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/cy/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/cy/firefox-128.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "be3f396e41fd49660dc739da888a472cebbfb2604a73d297d1f0e227a545631c"; + sha256 = "89b3fecab3f8bfb3e1db24d4ce15d2979f96899567f7e242831809066e6eaf77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/da/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/da/firefox-128.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "ce41505935ab911282d2f2e3b94c55b08622dac3c7f0f28d982217f30664c678"; + sha256 = "6232de82522ad288e13feb10c9618c01a1c9d7de7b1ef3033c6d54666b341a47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/de/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/de/firefox-128.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "53d38a12dd1bcd2f9c2be3c705dff59a431eb83b67f99183f62277a03d08ea68"; + sha256 = "ab54c709fb5e9cf469fec9a5dd8deec428cd103cf895440cf35fc9fbb7647a74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/dsb/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/dsb/firefox-128.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "ce1ef936bcf93eb5068d35a6c9bbecab34c6f013319dd81c6197e02dcc4a0a35"; + sha256 = "ebb03a2761e3a89a61f632bd0905a9ba81bd154140a854b0ae210a791a0cbdf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/el/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/el/firefox-128.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "ee2623c0dcd6419bc8e306b4e31d73bc554ac85ac0e71236d390d9c199f996f7"; + sha256 = "ca7839bf59ebc527bffb93c177fd219532d6230f57843403b97361324d65fd0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/en-CA/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/en-CA/firefox-128.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d0b56528926ac55de06f7210dda2af604d0f2b59d632c54cd12b0a061d4660e7"; + sha256 = "d1f933e9822665be2eadb979e4c4a416501cc848e87717fee08822695394f004"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/en-GB/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/en-GB/firefox-128.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "e860d7a7a66e2b8ccc8f8a31b1bd6c9fe80762e1e15c99918100504411fe41df"; + sha256 = "fb25e28aef29d9287e896233f45dcd833cd148cd75f786ae5c28442ea4168b42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/en-US/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/en-US/firefox-128.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "825248c30801f7b8cb271cd9725a699c0b3d68bdc176d58a46af5032ede4dcc5"; + sha256 = "58a080e199dfda2a4ac182f964acba1431f76a02587679e2fee6de45d3cbc12b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/eo/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/eo/firefox-128.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "965369b3eb67330f3a8dbda2e20811f7236a0ffddad2a742235368fa995237e9"; + sha256 = "ac5a1350e5db0d847b702fd655cbbfe057ae79e10faf40bd8d3040a164497662"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/es-AR/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/es-AR/firefox-128.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "0a1d0dfc416b8eeef96b79df5a4b5443763d728cf13eaad8cc3a070149068545"; + sha256 = "4a8ae870c71f751a5ad1e3b5a3b24c75209874cf86bf36c0b52bb31e423e2c79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/es-CL/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/es-CL/firefox-128.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "4cb753e847f4c677faaa6683ec78f2de59ffd14e1ce2a67f2b09ca8710126910"; + sha256 = "ee35dae9628ff82b77bc84a2da49d710aebc8857f8a47cb9ee41d689080a5ea9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/es-ES/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/es-ES/firefox-128.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "affd43cef6f9620220274af159c510d63b0bd86a7aa0bd856c8f4e33a822b0d1"; + sha256 = "d582ebcb09ea0fa3daca4a20263a5165068f83f1da54d7cc079496a917ecd887"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/es-MX/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/es-MX/firefox-128.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "689e02820959797262a7a66044f0af9119c20aafb7373409cbd8846fa79e7a88"; + sha256 = "5804478fead1d2540076b9701953de077f000de411f4adc003a1bf4f8c73b10a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/et/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/et/firefox-128.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "0323c8ecc0c39cf71e1d3e8ef9624ddeb6d8f9d65f1758b7e274309a40d5fd9d"; + sha256 = "1d73da6ce23ce2fe6cd1f5ccd707be1bc0a1b7aae788ac41ed93158286b0c26d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/eu/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/eu/firefox-128.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3838fddba1cf529fe02dc7261194c083112fbc9344c8804611d9e24a7d4172d7"; + sha256 = "01898cc5ede5d5865cf73defd8124d773379066568943040aeef75621989b839"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fa/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/fa/firefox-128.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6e6fa470798f9a048a12624f8ebfda5a174c3bc86f76552965c5bebf22d6b803"; + sha256 = "cbb8ff6da1fe06fdf16a47771153ca91f532cef0c1d749126cb19f6c9a7743f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ff/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ff/firefox-128.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "051b1b02423188025cb916e68c61deefb02b0588e0630784411a9d5c3d36365e"; + sha256 = "423fb86583962168cba54bfc27808e8c829daecd0eaca14fc72a87deb349abd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fi/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/fi/firefox-128.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "087d6b66e48b50c5d13385ce850614324a857cbf2439cf29c4ef9730fc4cf3da"; + sha256 = "93820f6716eb72e082267db5157adc79ba537a24f3683d4bf3ea3c0a29ffcacb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/fr/firefox-128.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "463bd8478a07ec397c678614c3a80a762170a3dd0b5a378a4fab77931b0c0144"; + sha256 = "e143066e9906ae6d84e101d1d67889f02c61a8160403c31c47980c58ed337d2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fur/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/fur/firefox-128.0.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "960dc76265a02dabdf84a660d6fad6486eac1aeaa1f60bcddc97a0e138f462fc"; + sha256 = "5c1d8c5f0ef84dd0ba0d2c4410ee3be326f25f439ca50ac90317d72d4d1fe174"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fy-NL/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/fy-NL/firefox-128.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3aa004f2114f24c435f53231f48a4e294ee43a4211909c0160c377d20d9e0e2c"; + sha256 = "3ea1c108ddd9fc945e754e0a62ac2a65ed4a2bf32fd69eb71da377c5087997e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ga-IE/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ga-IE/firefox-128.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "d8b3829c838ba4374f044b477e7c5f3b569fdd4211266a8530dae2a571496967"; + sha256 = "ab9751bd8305cc2a9cfa4ca6c4c64311268476c6e23d089f1979101b40b31407"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/gd/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/gd/firefox-128.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "290030ddc0271faacf82e9c28a6b39b04f5ec3a1a2f3d6ab9500043760eb1d8d"; + sha256 = "064008aafb9c7ccd0852c2ca225690eed3aea9b3e66adc4d2415923b67b3fd25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/gl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/gl/firefox-128.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "d1b185fdeba1bb8a8001deebd4b1901b8c2bedbe6f83ab7a62afdea0812a73f4"; + sha256 = "937fd58fc7bd3bdda7033dec98819050e1f70ca8ad54b354397daf280c0747e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/gn/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/gn/firefox-128.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "876e0b5a5cf938af23249491cbda56cdda4f41bf9094be6e509805d96b8885d6"; + sha256 = "d7344bac79016767f48ec27c479010208def970ba7be1996a647d0dc3871002c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/gu-IN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/gu-IN/firefox-128.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "034dd128c5d5b1bbb341dcc65b6a575623ee544f5d7319b0b257cd3554ce2cd5"; + sha256 = "0d2b4f98180f539979367a47b61226816294657b61dfdd5b6917699a1b87a2d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/he/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/he/firefox-128.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "68636a8d11c9abc1c24e621a966e4f00a7064e2b9793c9f6ecb09c36781c28da"; + sha256 = "fbe8fde45625054eb5950440f45582aafe254238477426413f4daed6c09092d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hi-IN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/hi-IN/firefox-128.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "8219e7cbeece71af3c87ccc92bfac707d4e97041e3dc0360d816b47b2490b1cc"; + sha256 = "bcf46a993fcb057556fedfdf738b54f88308edffc8801132ec7f947bdb88d871"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/hr/firefox-128.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b7245d5b926be172976d66815676bc44489f45797b3080966690c3eecfde22eb"; + sha256 = "c4ad905887f1ecf94045bcfcc3d746df923e36f3cd87ed5a3e34d78ff0002aa7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hsb/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/hsb/firefox-128.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7e76beca927640092ae2bcd58b7fd6bd0174dc07dcd847335d40a7c5a831b99c"; + sha256 = "064132f106c01a82a43129071d782a5afbcefe5dfc83b784436753eeb6976277"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hu/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/hu/firefox-128.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "077fd0c025277e2fcf64a673e5ef32732f2c1d6c44ab1ffa02e7a542466b8807"; + sha256 = "b9ccbb891e5b277e854f54aa8e62ab2458cec0d5044357d6549a93ee4b333201"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hy-AM/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/hy-AM/firefox-128.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "ae478b9d6cb6cb028f5644d15a95c1b495699e9d1db31c9165f8787c40bdd2a6"; + sha256 = "75ec62c04890541a71371cbbc0a3a7719625ace685dcb8e35ee649bf324e4afb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ia/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ia/firefox-128.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "9b4fb99f9447ba2712edb296f35deaea72371406fa592a8937d14c8cca1c015e"; + sha256 = "d9d64c4d4b2f796d002747f73bc2b3d6a52dddfd2bcf05dcbaaf866ee0b8e65f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/id/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/id/firefox-128.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "849ae2d09de46a7f959af6b98d4de49aabfcc40fa8a672832f15509f8e0c0627"; + sha256 = "2ac87a78ef5ced3cd7581bdfa4c32ac43c15fc06d49504d529170860fe3a5a57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/is/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/is/firefox-128.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "4ab5465ebf5d6eff987ce883146ee40ec8dfb45aebf7a8801cf938335776acf0"; + sha256 = "54e563ade2c758ada7a0efde0056bb8ad246877c0ef50c7c7f503719d670fdb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/it/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/it/firefox-128.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "de70b14a007dbe09888a824f0e71ca3951f557a00a4b377f7ca4bd80558b22f1"; + sha256 = "27c8d5dff9a1fed680e3dda6d765d40af9f3c43ff25a4464b646e36681b29225"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ja/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ja/firefox-128.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c8ff213cc59f0bca39c89d0a8167db48603a86623e6204f288c613acc6aaf71f"; + sha256 = "90b00f0a6cd7d4357c226b53a84d15ffa3aaf9e5f788df27bbe78b93d10f1dbc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ka/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ka/firefox-128.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "f9d04949766ce80414059f7c8dbe0782c77b81e2b37b6ea8d906dce1a41be5b0"; + sha256 = "9e4725f1aea9c231324fefcf4da0133c64188e70f125d144da602f13404788dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/kab/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/kab/firefox-128.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "f393d8df2412edce4713abcc0aab4d43b4d15e146f83956ee2c180757d0843e8"; + sha256 = "3abe9d19eefce955de0eedf8252bf3e9d53700164f9c682e30d2d2644496b4ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/kk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/kk/firefox-128.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "8805bb373f8325479976817ce50431e01371a1ec436d74194d6677d168539656"; + sha256 = "292182a11c2177bfa96ba4430ec9afbcd98ccf85d975c8bce86d8b1f8a27b6e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/km/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/km/firefox-128.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "adf07e405ebe47f7f3d0033ac9660f28331a63b90fc5d909134be53f771e0a4a"; + sha256 = "1d892df863231a20c47f2113be5db27db05f7ca50da2462b4b54e03ef74e1e84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/kn/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/kn/firefox-128.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "2950df4ec7f7aded583b696779313ea94fc0b718c3b10ec4f754adfc0f65471e"; + sha256 = "fb8f5e48c2c154c0fcb2f52edbc32efeb88ad9eddb4396fcae8ec1ee187e3378"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ko/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ko/firefox-128.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6eedea929d7d73dce79c8f79632efce1e0591bd52948bbed468bc5240baef05d"; + sha256 = "2e78eabde3b965d341936afa0ba65350d27b988cbb99527ab251a0a0d475a062"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/lij/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/lij/firefox-128.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "f0f20a048c694f8bdeb70783476fc6f91b4f7d2881093cdc5d0f9f3a12d698e6"; + sha256 = "b48b63d20e4f4b5481f9c9496963f53adbb68f2921213f3641c863b7f43b19e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/lt/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/lt/firefox-128.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6762ac48b93aaf619f3e1c16d1b2e5d75596b3c8fe4d374e563f44d377de4127"; + sha256 = "2974ec879878d9a0e6e732b48e006499061cf2c8bafa3da5d12553d9a2613a5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/lv/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/lv/firefox-128.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "5a3fd3b8afc54c4659194ca479b71bd19371e3fceda827c1d93e4f86f7b69156"; + sha256 = "2d537cb4853a794487da83d9b407df869f28e082580d2291da5ddeae69c828b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/mk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/mk/firefox-128.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "370271f309ab7512ddec0b20e4be5765c5ef664680ef98d89fb2e263ac304f73"; + sha256 = "62b47d144947ee08d1d2164a1d80929272dccecafcc241ef5875cd4d845a41d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/mr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/mr/firefox-128.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "9d0b181157bce40bb76e34ba8c555b1aacdf86e286124a5fbfbfc678bc58cf66"; + sha256 = "a302bd88a32536db9810b927c318ff052ab5fc3590c114733eac14989f98ecdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ms/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ms/firefox-128.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "d9749603debebeaa7df69ad2826df95ed1fc9389fff53f1e362d33b1578e31da"; + sha256 = "1270fdeaac163be327c6378183a597070c78a3366de62d219f272dca85c0db73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/my/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/my/firefox-128.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4a2211461b601c37f3e8ca7babed6ac421cf49604146ed5bc5877cf60e0591bc"; + sha256 = "e192eb3e08ad4a6d07f8cbf0fef7ca6bf0f0e0dcab2088811fa110ea48bd96ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/nb-NO/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/nb-NO/firefox-128.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ae5261b7c1e1075af26077012291a90614c75c56e044e409a10d84c50e145c6c"; + sha256 = "4648bdc7b9f96d1bfea2c00543fe87965b7d9c764215c4cef7f551760aad5d36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ne-NP/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ne-NP/firefox-128.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "ccee7bffdf331b7d35f2f14c18c4652f41f52fdcdb8e5fe1b5650ce65469ddc2"; + sha256 = "4948ab9b122ee48912e051e8257888a56a7aa669e98deb176228932f9870a3cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/nl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/nl/firefox-128.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "04fbe94b04a688d732235cd1dcef1f7e1087d3b85f04699153f80a4c44c8ad9d"; + sha256 = "ab37173f006c344412b49ef07ca273b73300c17b967d7f35966f29cfa2c1d20f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/nn-NO/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/nn-NO/firefox-128.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "59796010366cb0ef66a1a59bdb40383abdd8f921c60f6b998f38db8c86255dfc"; + sha256 = "4a9b9c7dfa6d8fd4a8bd96c6ceffdfd6f0246cff498cce134b53bfaa253fc64b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/oc/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/oc/firefox-128.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "3356edba3d3a324d4dc331bc3bef240d5245fc9a91b6dadda84c365a86b3457f"; + sha256 = "607f3af7cc6c0e6807ef47fb3ef3857a2e70013281efe92416119a51b8c457c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/pa-IN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/pa-IN/firefox-128.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d7bdc84b081f91aee7db9161904d7c6ff0a1a8897d419aac804eb9d3a753ec7e"; + sha256 = "2e1e28747507b654419159f6b72a4db0b5a3fd30d2b4ed58ec92bf0a17e78ccd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/pl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/pl/firefox-128.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "ee0c317681a149912381f8914acef222c643f47f35fd239ef495395622d2f605"; + sha256 = "f87f984b29f2fd5a483b46211f2b2667d1be30b63620b0276cd93f950d638a5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/pt-BR/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/pt-BR/firefox-128.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "18201b51d0f954713e5b2179dd3b934f46a0fb14d5b8decad4c9413814c33eeb"; + sha256 = "2feeaf18469fea0ac8e99cbadd1733966c6b5eff19dbd60db85ba59472ee10ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/pt-PT/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/pt-PT/firefox-128.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "10281f85b6683b87a1a30cd4048929099ae7783755d15748a8fa71dfaa488760"; + sha256 = "efbc81fb9b1be7c4aee863a9ca9afdc7c7b5d16ec582f1dddf5d4b7e136132c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/rm/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/rm/firefox-128.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "af7b78a46c9cd7320a240c78323c1e08c6619c280a4ba607647e357ae764ddb2"; + sha256 = "889e29ce5ceb98bc4a2bb90ac6da4fc49be1b6db8360517bafbce60d49fb6d05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ro/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ro/firefox-128.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "dd1062119e93cdeedd2872165344146960ac7d84bba456edeaf1628bfa75beeb"; + sha256 = "63f0de6f571c83a061860067418d2c69334dbb93893c21323756ce919352d286"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ru/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ru/firefox-128.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "817b50cdec921e3b1f11726bb10ee3e1e53b40b748085fcdf589df76ba95ac5d"; + sha256 = "de242c5a63ccccf379030bf3b97b76ba1f36d84d2cec461d60ae56879b309895"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sat/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sat/firefox-128.0.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "f09b47829fd36bd80f3c4d564a6a4b96d8f8db4a86ba96818d44f432908a96fc"; + sha256 = "af9fcb6a3a8994c9364e9b2ec0b86405e84732a33dd101c6f53a481fce8ec659"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sc/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sc/firefox-128.0.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "6fd2c2c3ba7c28548de56c7cb29737635d16b7f1b8d8f45fd9a7e98bf5f244ba"; + sha256 = "6f800d9a6e80260e902ace24f0265aa0654dd54ea6447739ce8f84514b1c9c06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sco/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sco/firefox-128.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "02cc81f6abc80db0ce09c9010974193786f0199be95e64c6cf510c02934eada8"; + sha256 = "0424affaed867fb548bce355216389d10225ea803adbafb9fb7314db6d90b451"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/si/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/si/firefox-128.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "0c11a867e5aa9092d021b89543bfb0b73dce6253bd9dd3e9db57b924048ae81f"; + sha256 = "a77b2aaf13848d1c3798f0e1e2902b8482adcc7b4a1b492102aefd3f44749464"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sk/firefox-128.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "b4352e3d8ae1782c0ed93118168626d17a7b259d9b6c52010240a651468208bc"; + sha256 = "1c9fc78313c51e257dfc30ec419d250b95de41b00c22969d626216ff50517779"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/skr/firefox-128.0.tar.bz2"; + locale = "skr"; + arch = "linux-i686"; + sha256 = "0be62f8a7fd67345af52ad39bdf44484417cb4d600dd9d8fe382cc1c4306c055"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sl/firefox-128.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b77650ba96f576b2cf3de2477915cf3b5806a75950fc3e5f65265eaf06c6326f"; + sha256 = "ffdb96120be177f8947fba89fafb3cea15087b8c49284f7df8cf5edacaecbe8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/son/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/son/firefox-128.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "5f5c0ec8e746094845fe3fec3577003ca20670a4e0b3fc66cf6b4df81d8b3b21"; + sha256 = "2306bbb23289390ec7a272325807ffed8ff73f964c9fb1006318c06873e7fdcd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sq/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sq/firefox-128.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "cada2c2e6a9b3c7f1042030443bc89ba50a2ca11b20bd2f11ba51c360aa97dc8"; + sha256 = "6ae796cd4c14f95ef7d89459c4ff09da4c243a4bd65660284465222c9cfb2db0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sr/firefox-128.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "fe0d9aa1bcb3533eec8d5b1bf16da65077a5878cdcb9e305436622ee7bf7314b"; + sha256 = "5af85de91871f48270e22a69205ff131ca8ea2bc7eeac787bb2a79d9ff484485"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sv-SE/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sv-SE/firefox-128.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "b485b5d2c7ea7a6447457062defe528aa3ebe719c58449e16e96f7f1d1a08727"; + sha256 = "49c7f58166c021b9e77c0b952e8431b31ed9b192846597bf6b365e95044aed5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/szl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/szl/firefox-128.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "eeae99cd1f2f4f34c90e384697a3853d10c09343d2325f97fd71534a9e0abb70"; + sha256 = "0a9ae0cf543c4a0e48f6aea0569c26de804da3792ac53358f7eb9081d2a466a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ta/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ta/firefox-128.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "b094294592daeeb1f44aed69ce3c3f1eb30bee87448c18f6c7b40d56bf0f817e"; + sha256 = "3141a79e5029308cbb960607a374219d82cfae68719907695fe92ebecc4b5d6f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/te/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/te/firefox-128.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "8900d8ea91871843d5b2af4ec6ce375ef7929e7922cc33dea1c18454f9aa461e"; + sha256 = "49a94d81b44b808bd60501dfdd35143d1cea4a89d07eaaad7e3c3b86822578e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/tg/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/tg/firefox-128.0.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "6e5c773d4153dc4a712fed7ef36b174caef3ff3f11a387da55455b19aa42c85e"; + sha256 = "0c333ab93311327d1ae4dacd769fd67862eb7e44571be0c271dcd2a6e159b20b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/th/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/th/firefox-128.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "c6df131d396ddd81b200720eaf2033f5555089762e9307388c0796ca1904cdc7"; + sha256 = "172a836ee9b84fecf2c9687e6cf8d6e68acfe5aba517ace8fed2abe3332044ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/tl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/tl/firefox-128.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "c48c82424d10ffd93fc39f30b6c286931f5c892fd24fec1b988e7255c2d61192"; + sha256 = "8c7d6ae9604f3cefa6ce23202e9022bf5de596a7527c9b0fcafaaf6d1d911c99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/tr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/tr/firefox-128.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "b1d43c2921a0bc9771e3a202d14b2d6cfef6d3a0617d72a2dc866c4d08c9cc07"; + sha256 = "9be9d78f004a27e1dd3e7872433f5e720182acd1f173de95863fa21e170cc9b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/trs/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/trs/firefox-128.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "9b93f3bae0d3288c46a69adaf24c028e69c819e81f402b3cb3cd119297bcec88"; + sha256 = "d0eb20bfbe50c5dc4afb999189decee91405461da6564cff2cac725d895584b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/uk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/uk/firefox-128.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "2f535154137303050fc6d1f29d61e28d7156c0b41d1feb0b3df3cb4e0ff66cbb"; + sha256 = "e947918e9cc708ae3569546552479b2fcbf5e95f9d06739753cdbe9360e7bd32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ur/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ur/firefox-128.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "2607a196623e8b58e74930bb5f4cd188d105957441078e32a8273d6edc872a19"; + sha256 = "95c6a3abb0227707fed30457b58ae18c979e6f203e772a69ce58b5582925c556"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/uz/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/uz/firefox-128.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a1ee778cd7fc6ed36888252279cd33ef354a9dad725e35a5929ca1a6d457c2e2"; + sha256 = "f9c1931bd98885bb33dfd8b40de211a2d639ecc1259f1e41cd1fdc13c2ea8104"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/vi/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/vi/firefox-128.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "4e587db961e4269a5de47e81603effab87dc5adecfb2b61cb442c520e066d068"; + sha256 = "41c2dffc8985b067c534014fb32322e26cfd0d45ceaa27bea49dbe6ca5093d5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/xh/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/xh/firefox-128.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "5c550ba6a8b7e9b518f3e538d6e9d87cbde3799fd1e8d1d4bcc293f740a9b422"; + sha256 = "9366b220973f588bcd5534999ae2b1ccbf4283d9cd0612a2e6b5cac105e11958"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/zh-CN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/zh-CN/firefox-128.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "30fabea5d68f18b4818bdd5ae2290f4630d95218fbbf34e1799f321e35f978f4"; + sha256 = "126cb0a2582a4b77d63276222a92df3e4fe11df4d95b4d213bbac97a098f4bdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/zh-TW/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/zh-TW/firefox-128.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "77d96850c2cc6fa3ceff3d8b8c01d06969c2b71df4cf3b417e7e5519db78b40b"; + sha256 = "f66c84d07fc17fc403adcc864f546d0ac5c8aa3b87149d5df3af9e1c0ae8694a"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 81ab6cd1fa17..4d28004a0d0d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -62,8 +62,8 @@ in , glib , gnum4 , gtk3 -, icu , icu72 +, icu73 , libGL , libGLU , libevent @@ -487,7 +487,9 @@ buildStdenv.mkDerivation { ] # icu73 changed how it follows symlinks which breaks in the firefox sandbox # https://bugzilla.mozilla.org/show_bug.cgi?id=1839287 - ++ [ (if (lib.versionAtLeast version "115") then icu else icu72) ] + # icu74 fails to build on 127 and older + # https://bugzilla.mozilla.org/show_bug.cgi?id=1862601 + ++ [ (if (lib.versionAtLeast version "115") then icu73 else icu72) ] ++ [ (if (lib.versionAtLeast version "116") then nss_latest else nss_esr/*3.90*/) ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2 diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 1207a7f02404..cd8c2b00fda4 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,12 +1,14 @@ -{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests, buildMozillaMach }: +{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests, buildMozillaMach +, python311 +}: { firefox = buildMozillaMach rec { pname = "firefox"; - version = "127.0.2"; + version = "128.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d5a959a032309b8a42690b7f5afd5110c2e6ca7de426e1529d50f59cf065e67623ed98bf3aab39ce4d345ccfad2a273b24ce4f87c7ba7e6eccf2e9dfe3008d8b"; + sha512 = "309c0e2a0bea5699e6daf4fa02300ad7fd118d2c02c35cb5fa97a5fcc6e250cc7aec34e50fe872b8fd516436bfcfe37ddf33c9d0f9291860388cd6f3f08ea9f1"; }; extraPatches = [ @@ -92,13 +94,42 @@ }; }; - firefox-esr-115 = buildMozillaMach rec { + firefox-esr-128 = buildMozillaMach rec { + pname = "firefox"; + version = "128.0esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "b65f28a530016fd0cf46bc5f55fdec2a0cc66bd9a71b606b8d6dace1f6ce1d8744b08298549cf9c338eca1d9331dd506874ed3244bd3b856c153bd765e6071be"; + }; + + meta = { + changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/"; + description = "Web browser built from Firefox source tree"; + homepage = "http://www.mozilla.com/en-US/firefox/"; + maintainers = with lib.maintainers; [ hexa ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) + license = lib.licenses.mpl20; + mainProgram = "firefox"; + }; + tests = [ nixosTests.firefox ]; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-128-unwrapped"; + versionPrefix = "128"; + versionSuffix = "esr"; + }; + }; + + firefox-esr-115 = (buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.12.0esr"; + version = "115.13.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d98475061d870e0f3aa920b7c0b9b0c1cbdb3f4102f760f1d1c5ea3e45e216c673c8d3662501e7e78af4950a003a519e94b57e9b1eda8d615c159cdf62130e89"; + sha512 = "799cdf2d0494003a5addd0da703f53deb9c9d6bb6f6c95d40026363382803e2d086039c7798940a1f35f4cba111f2e8e21bde8ac2eac29fd9bd6876dd8d3a85f"; }; meta = { @@ -119,5 +150,6 @@ versionPrefix = "115"; versionSuffix = "esr"; }; - }; + }) + .override { python3 = python311; }; } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 15c8ffc3b22d..79df553d3ac2 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -4,7 +4,7 @@ ## various stuff that can be plugged in , ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc -, gnome/*.gnome-shell*/ +, adwaita-icon-theme , browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx-cast-bridge @@ -322,7 +322,7 @@ let --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \ + --suffix XDG_DATA_DIRS : '${adwaita-icon-theme}/share' \ --set-default MOZ_ENABLE_WAYLAND 1 \ "''${oldWrapperArgs[@]}" ############################# diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 85d85ba2476b..954bbf25e08d 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,9 +10,11 @@ , darwin , cmake , ninja +, pkg-config , libxcrypt , python3 , qt6Packages +, woff2 , nixosTests , AppKit , Cocoa @@ -50,19 +52,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-06-04"; + version = "0-unstable-2024-06-08"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "c6e9f0e7b5b050ddbb5d735ca9c65458add9b4a5"; - hash = "sha256-+NDrd0kO9bqXFcCEJFmNwNu5jmf+wT+uUVlmbmCYLw4="; + rev = "2f68e361370040d8cdc75a8ed8af4239134ae481"; + hash = "sha256-EQZTsui4lGThSi+8a6KSyL5lJnO0A8fJ8HWY4jgkpUA="; }; - patches = [ - ./nixos-font-path.patch - ]; - postPatch = '' sed -i '/iconutil/d' Ladybird/CMakeLists.txt @@ -112,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = with qt6Packages; [ cmake ninja + pkg-config python3 wrapQtAppsHook ]; @@ -120,6 +119,9 @@ stdenv.mkDerivation (finalAttrs: { libxcrypt qtbase qtmultimedia + woff2 + ] ++ lib.optional stdenv.isLinux [ + qtwayland ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa @@ -163,5 +165,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ fgaz ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "Ladybird"; + # use of undeclared identifier 'NSBezelStyleAccessoryBarAction' + broken = stdenv.isDarwin; }; }) diff --git a/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch b/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch deleted file mode 100644 index 468eb10b2c31..000000000000 --- a/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Userland/Libraries/LibCore/StandardPaths.cpp b/Userland/Libraries/LibCore/StandardPaths.cpp -index 77ddbeb9..76481497 100644 ---- a/Userland/Libraries/LibCore/StandardPaths.cpp -+++ b/Userland/Libraries/LibCore/StandardPaths.cpp -@@ -205,6 +205,7 @@ ErrorOr> StandardPaths::font_directories() - "/Library/Fonts"_string, - TRY(String::formatted("{}/Library/Fonts"sv, home_directory())), - # else -+ "/run/current-system/sw/share/X11/fonts"_string, - "/usr/share/fonts"_string, - "/usr/local/share/fonts"_string, - TRY(String::formatted("{}/.local/share/fonts"sv, home_directory())), diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 67fed12e1653..4d679853fc5a 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "127.0-1", + "packageVersion": "127.0.2-2", "source": { - "rev": "127.0-1", - "sha256": "0zif9b7ky423bg3cf3njyxl465hrbsha1f1hxpdgccql0id5qr7r" + "rev": "127.0.2-2", + "sha256": "1f4xz496x1nf7lmvk50hakj9p6q0kzxl5f9s2k0b6kczvyc8gw5n" }, "settings": { "rev": "1debc2d30949baff2d1e7df23e87900f1987a8ae", "sha256": "12xgjv40mihbyfsah26vvdyb4yirydc1a884v2chnca4f5q00lc2" }, "firefox": { - "version": "127.0", - "sha512": "5a17bce357e7f445c37540115f2c131ad5a055c0cf04f20bc2eaca18f8d241a99ac76739d172b38f2ad2681633f901a0a15893801082ac5db9e20e31fc8b8291" + "version": "127.0.2", + "sha512": "d5a959a032309b8a42690b7f5afd5110c2e6ca7de426e1529d50f59cf065e67623ed98bf3aab39ce4d345ccfad2a273b24ce4f87c7ba7e6eccf2e9dfe3008d8b" } } diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 2d7fcfecbd09..22b6698da584 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "126.0.2592.68"; + version = "127.0.2651.31"; revision = "1"; - hash = "sha256-ThWtnWF7iL0OEq7+yA7vCowGZrjeiLx+d+Nff4Bwl4s="; + hash = "sha256-SERogsWM4mtIEVAVtwaRu2VOjK012yWBb2FygDfKO80="; }; dev = import ./browser.nix { channel = "dev"; - version = "127.0.2651.2"; + version = "128.0.2677.1"; revision = "1"; - hash = "sha256-eYCxGMIjclqFxOy6AyLKN5DJnplq/Vf3ClYbYWV3HAw="; + hash = "sha256-aKrNs44FZNhC/fGT1UvyE2Fx8Q53ahAu91Bu86E49o8="; }; stable = import ./browser.nix { channel = "stable"; - version = "126.0.2592.68"; + version = "126.0.2592.87"; revision = "1"; - hash = "sha256-btpUMmgZ9SQL4WGKynGA/dL/8Ve9hdjoDNsBNxG531Y="; + hash = "sha256-ntcewiAc/hDUF9wiURCXm8TxqatvEPXaTUn8kblzK0o="; }; } diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index b9a0b49bab2b..edb62c692abe 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -144,6 +144,14 @@ stdenv.mkDerivation rec { genericName = "Web Browser"; comment = meta.description; categories = [ "Network" "WebBrowser" "Security" ]; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; })]; buildPhase = '' diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index d5bd6a3e34b9..c594fa7328ad 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "110.0.5130.49"; + version = "111.0.5168.43"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-ge2ne11BrODlvbu17G6xaLd4w2mIEsErtIaqlLY4os8="; + hash = "sha256-BKtDxKPVu0RUG+DOrfZ1TpJMK/FopfQURTfQGNWE3rc="; }; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index f19da4505789..12b0c63b6afe 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -163,6 +163,14 @@ stdenv.mkDerivation rec { genericName = "Web Browser"; comment = meta.description; categories = [ "Network" "WebBrowser" "Security" ]; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; })]; buildPhase = '' diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index cc9b60558e2c..34a26d5cf946 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "46.0"; + version = "46.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-ZUVMK0Ex77EQKTGM0gBDHt8W9l4rHspihYduMcwMGho="; + hash = "sha256-J1wuhAXPCvLWzPqMU4alVFFpHoCAzX3wVOP3Bw0wW/o="; }; outputs = [ "out" "devdoc" ]; diff --git a/pkgs/applications/networking/cluster/aiac/default.nix b/pkgs/applications/networking/cluster/aiac/default.nix index 32207bcd05b0..3ca193f56c2d 100644 --- a/pkgs/applications/networking/cluster/aiac/default.nix +++ b/pkgs/applications/networking/cluster/aiac/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aiac"; - version = "4.3.0"; + version = "5.0.0"; excludedPackages = [".ci"]; src = fetchFromGitHub { owner = "gofireflyio"; repo = pname; rev = "v${version}"; - hash = "sha256-6u/TVCLFtcNzmchYw8dhedNRm7Lpl9oi8MpYkLYzFdg="; + hash = "sha256-4XjtzfICFCy2mA0FK0yV/hI5PPVpgXt5LlJTAxQAVq8="; }; - vendorHash = "sha256-JWQQUB4/yIDGzWeshtcWnkXQS7jYcDHwG/tef6sBizQ="; + vendorHash = "sha256-uXYin6JITpy3bc7FI/3aJqvCD9cGwGL1qjB8hBUWLQE="; ldflags = [ "-s" "-w" "-X github.com/gofireflyio/aiac/v4/libaiac.Version=v${version}" ]; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 6e860d2318c4..c4698ed9338b 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.11.3"; + version = "2.11.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-qSrMqByhOitRltYaVjIeubuoTR74x/pQ1Ad+uTPdpJU="; + hash = "sha256-G7kJrFyAsaAWXKn2Nya66unkYlU3EU1ZDbdXpC8aR+k="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-atgNLlHoX+KBtJcYZNqNsYBK0cVGI/k2mXvmcr6wWN4="; + vendorHash = "sha256-IDnOB3GxWKeA/N4Mr+qQh9sJgYsWK38F2yw6jDuHY30="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 3e9dbe040c30..cd37da1af650 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.81.0"; + version = "1.83.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-drreGXCYpjF1UD1OUzuGh2rezEhHw7Zq0Y6JujLsMMk="; + sha256 = "sha256-FIl+SWYK8+OLuynhma7IG2fozekhGZKK/t5RgD+eTtA="; }; - vendorHash = "sha256-ojl+dGrj+zmE2lqlclq3jA0K6AXdi9Ofhd4GA6nVrDo="; + vendorHash = "sha256-dklmWu+PHSEeQM2MWBkYMiyw5rX9S8SI3l86nst6v9E="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index 2619e8bd4078..e6f7508cced8 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "helm-git"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "aslafy-z"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/kUKi2BI6LMMUiy6AaYhpPIXU428Or352xYoDYdym8A="; + sha256 = "sha256-vzDSuWaq3ShKz1ckv3BxQtu8tR3QKl0xhcO5IZDbgps="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 7fe23d370920..c3123ce5c460 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jx"; - version = "3.10.150"; + version = "3.10.152"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-Zck06wbe+hLbecFnfY/udi1s712ilt7j0EdoumohOEI="; + sha256 = "sha256-rOpKaVn2D5UMYaVXLRxvwTRzo+nD1H/95FcQSeFgeFo="; }; vendorHash = "sha256-AIaZVkWdNj1Vsrv2k4B5lLE0lOFuiTD7lwS/DikmC14="; diff --git a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix index 1778aa32efa9..b75eb6296138 100644 --- a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix @@ -1,14 +1,14 @@ { - k3sVersion = "1.28.10+k3s1"; - k3sCommit = "a4c5612ea3dd202135e7c691c534c671a7d43690"; - k3sRepoSha256 = "00r06kc98nvbmaai8m2pbqsl0v6y3kbc3rz3l7lb9wy4qhiyxrww"; - k3sVendorHash = "sha256-8PbpjPVX+Yimhwbydu9YOTIMRTf/iLG21Ee/QMowp5Y="; + k3sVersion = "1.28.11+k3s1"; + k3sCommit = "617b0e84f419e37ba995c6dec06ccfbb24bd649c"; + k3sRepoSha256 = "04pmg0qx1sidpkv72vllmnk82v4fg490gvppp79m3jc931v059w9"; + k3sVendorHash = "sha256-6uCzObYCIETT/aswsHR9hOzUPNZe8GJbLWfNqOKWyag="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.15-k3s1"; - containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f"; + containerdVersion = "1.7.17-k3s1.28"; + containerdSha256 = "0nhhx932j551ran3kkvyp4nmsg5c71mq0g6jrcbs2j4nn7yqdkhm"; criCtlVersion = "1.26.0-rc.0-k3s1"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix index 23a302187575..0db569674389 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix @@ -1,14 +1,14 @@ { - k3sVersion = "1.30.1+k3s1"; - k3sCommit = "80978b5b9a97908c5520c5ee51984e544e168859"; - k3sRepoSha256 = "085dmq49iwvlxpj9c528nfrvd67snkgpm5drj8ahfjv1nkjp0yy1"; - k3sVendorHash = "sha256-XtTahFaWnuHzKDI/U4d/j4C4gRxH163MCGEEM4hu/WM="; + k3sVersion = "1.30.2+k3s2"; + k3sCommit = "faeaf1b01b2a708a46cae2a67c1b4d381ee1ba6b"; + k3sRepoSha256 = "0hy0f44hj5n5nscr0p52dbklvj2ki2vs7k0cgh1r8xlg4p6fn1b0"; + k3sVendorHash = "sha256-Mj9Q3TgqZoJluG4/nyuw2WHnB3OJ+/mlV7duzWt1B1A="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.13.0"; k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.15-k3s1"; - containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f"; + containerdVersion = "1.7.17-k3s1"; + containerdSha256 = "1j61mbgx346ydvnjd8b07wf7nmvvplx28wi5jjdzi1k688r2hxpf"; criCtlVersion = "1.29.0-k3s1"; } diff --git a/pkgs/applications/networking/cluster/ktop/default.nix b/pkgs/applications/networking/cluster/ktop/default.nix index 9bc630b9ccc5..8c5c842fac30 100644 --- a/pkgs/applications/networking/cluster/ktop/default.nix +++ b/pkgs/applications/networking/cluster/ktop/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "ktop"; - version = "0.3.5"; + version = "0.3.6"; excludedPackages = [".ci"]; src = fetchFromGitHub { owner = "vladimirvivien"; repo = pname; rev = "v${version}"; - hash = "sha256-nkIRVt2kqsE9QBYvvHmupohnzH+OBcwWwV16rMePw4I="; + hash = "sha256-nVZ1e/GKiJFTwuq5dPIzF4Jrv2DJ2wwWAiOn304hTA4="; }; - vendorHash = "sha256-IiAMmHOq69WMT2B1q9ZV2fGDnLr7AbRm1P7ACSde2FE="; + vendorHash = "sha256-MLIcTHWo7lsqtAqH8naSvpS013t8KBVPRbch+CfeUNk="; ldflags = [ "-s" "-w" "-X github.com/vladimirvivien/ktop/buildinfo.Version=v${version}" ]; postInstall = '' diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index 739413144965..c9bc3537ae3e 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-5lXM7SuQvjQYWWbtRVJrdYBRbHFs1Ha9hQLDweaTKQ4="; + hash = "sha256-cMaOqybXzbAelhSfUal4kgQKwz/dEp/fVQ8SyjaaAZU="; }; - vendorHash = "sha256-Fc3WLeEqH2CK6b4jWqcxCBYl2ST6scjjNA1/Rl3Go1o="; + vendorHash = "sha256-M2nco2qxutpxKv//o+h2LY0x5Tk6DWxFL383cpGVnkI="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/kubectl-ktop/default.nix b/pkgs/applications/networking/cluster/kubectl-ktop/default.nix index 289d5bc77d4b..ab96d337ee96 100644 --- a/pkgs/applications/networking/cluster/kubectl-ktop/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-ktop/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-ktop"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "vladimirvivien"; repo = "ktop"; rev = "v${version}"; - sha256 = "sha256-nkIRVt2kqsE9QBYvvHmupohnzH+OBcwWwV16rMePw4I="; + sha256 = "sha256-nVZ1e/GKiJFTwuq5dPIzF4Jrv2DJ2wwWAiOn304hTA4="; }; - vendorHash = "sha256-IiAMmHOq69WMT2B1q9ZV2fGDnLr7AbRm1P7ACSde2FE="; + vendorHash = "sha256-MLIcTHWo7lsqtAqH8naSvpS013t8KBVPRbch+CfeUNk="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index f3b4a96404a9..d9e25fc9b79b 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5Y+xu84iNVFkrBc1qoTg8vMswvlflF9SobMy/Aw4mCA="; + sha256 = "sha256-DRXvnIOETNlZ50oa8PbLSwmq6VJJcerUe1Ir7s4/7Kw="; }; - vendorHash = "sha256-sVySHSj8vJEarQlhAR3vLdgysJNbmA2IAZ3ET2zRyAM="; + vendorHash = "sha256-K/GfRJ0KbizsVmKa6V3/ZLDKivJttEsqA3Q84S0S4KI="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index d1629de368a4..e9f39806e939 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-BYfnHgTiHMmKdW25XymP2nDYQDOEHSIUOjrtwaoc1JU="; + hash = "sha256-P/x6HigXnAhpUnycm9B8TO33hdPzREiM8kwL+/GedZY="; }; vendorHash = "sha256-tAThtZJ5DRzveJRG58VPxJWrZjB+dnXhX/50lZEHUGc="; diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 66164211131f..f41bef6e88de 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -15,17 +15,17 @@ buildGoModule rec { inherit pname; - version = "2.7.3"; + version = "2.8.0"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-b3qQ3lFaQvkmP3HYPwQi2TxSeKmWzGbp01OCnjULJ4k="; + hash = "sha256-RMgokVN/VTri7LiPwHX/elR2oEal9pzEkzSy0tUJMsU="; }; - vendorHash = "sha256-ne62twZXac5GfQ8JcWElIMqc+Vpvn0Y9XSNgAtF62q0="; + vendorHash = "sha256-FEdDOpz6C89OlzU3Pl4Uu6P0WgM4QsuccQ9vAHnb4xI="; # no test files doCheck = false; diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index c36bab57344f..c6402dbb103b 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.17.0"; + version = "0.18.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-jU/w4SA6gt2xCdJiSNkY2S2RQCuyj84IW1w8DDPvtW0="; + sha256 = "sha256-wTnBMNgwHqK8PdpEa3RAsVJemnGw/ymn6GJciPFsYrU="; }; - vendorHash = "sha256-OXmT7GTnD/TKjCN4po3vLJ0pZgsEEUGnuF5RtOm00hM="; + vendorHash = "sha256-RKQM1JxyZA1HwqRjCULY4X3jZK9SgclW55/qXp395cQ="; subPackages = [ "cmd/kubectl-kuttl" ]; diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index e82cde01ec20..4707fd852847 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.6.3"; - sha256 = "1mlbb8qkx71anwqi027p9lv10kfck811ikfvc5gpnavfaaiwrrd1"; - vendorHash = "sha256-nIDbwUvu1e/1ImVQMj4eOaPeFHM7HCcJMFk/ackdJSE="; + version = "24.7.1"; + sha256 = "0l4ni88xzh5yylb0m9mn32wiqs3fbiqzz4ll54f9zh72ff89bpjb"; + vendorHash = "sha256-q43WqEBQAtcLikqDwxkMPdVDQOCZ5x7SMmIKsmuDWa4="; } diff --git a/pkgs/applications/networking/cluster/nomad-pack/default.nix b/pkgs/applications/networking/cluster/nomad-pack/default.nix index 83b7cae25189..c5c7cdb08efb 100644 --- a/pkgs/applications/networking/cluster/nomad-pack/default.nix +++ b/pkgs/applications/networking/cluster/nomad-pack/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nomad-pack"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b7M2I+R39txtTdk/FOYvKfZxXbGEtDrzgpB64594Gqc="; + sha256 = "sha256-5OTGBO2EMGPJ4J2Eu3pIlZmYGXYxgL/6uGQgdB+8nPk="; }; - vendorHash = "sha256-bhWySn5p1aPbYSCY7GqFteYmm22Jeq/Rf/a2ZTjyZQ4="; + vendorHash = "sha256-8hWiVtya/TlVLUlYVJSjOzZUI8vsPm355ksIRPhB2rA="; # skip running go tests as they require network access doCheck = false; diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index b710fe68b3ec..658423019156 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "roxctl"; - version = "4.4.3"; + version = "4.4.4"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-sQUX2Ou+fL4G2u/Mdnl9SwdwRkogiyq3tkauUeW//dU="; + sha256 = "sha256-1eu7khgs6nzp+d1Gtz2DggD2Gie08auw1XxSZsnRdaM="; }; vendorHash = "sha256-j/ouxh4nMg5hyzT2RuP+hJrAeK7+PleT2W0DWxxjOfA="; diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index ecc353a178ef..ec0783001ace 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { pname = "ssm-session-manager-plugin"; - version = "1.2.633.0"; + version = "1.2.650.0"; goPackagePath = "github.com/aws/session-manager-plugin"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "aws"; repo = "session-manager-plugin"; rev = version; - hash = "sha256-dwNCTJOxpothAcJSfch2jkxdgXg6xDd/fDQCQo2Xd+8="; + hash = "sha256-IcDVt/iE/EYV9Blvl7Gj0UFJcdsUCFdaSQkIto0CKRI="; }; postPatch = '' diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index 4bf6a34f1c0b..e25092409c6f 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -17,16 +17,16 @@ let tctl-next = buildGoModule rec { pname = "tctl-next"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-2zk+B+GomLZwep5LNRpWJj8JjFC0OxAl1XhAv+8b2kc="; + hash = "sha256-bh0UsXA5yHtvP9femOwEzVzmu1VLz2uZwoIHL/kI7kM="; }; - vendorHash = "sha256-NLteuVOswIw2ModdE0Ak4XmApkHLoYDt6SDAZGsgwBk="; + vendorHash = "sha256-ziCJG722c32QAh9QmoC2E7TcLiC2InKwfdC9mkanTsU="; inherit overrideModAttrs; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9b613c6ff4ae..167e52e2a7f2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,21 +1,21 @@ { "aci": { - "hash": "sha256-4EVSO/DCuKSI3CPlaXSDxuy0pqAMBHRDwGJTBdQd61w=", + "hash": "sha256-f4hgHFJgRUG+mhRgD7GMtkXoYkzAbkxxMIzvGLS0ums=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.14.0", + "rev": "v2.15.0", "spdx": "MPL-2.0", "vendorHash": null }, "acme": { - "hash": "sha256-4H3isw9YRWJANez3qcJYnXO9yW2DoGUAoOPGI7mLXlI=", + "hash": "sha256-LlpPc3um4D2nNJFZRoXnw5ss0E0rrJN0wKKmuV0S6NU=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.23.2", + "rev": "v2.24.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-RZmT31fetR46vFQRoLkBjadD6ROqvElI/jOZnf6FWTU=" + "vendorHash": "sha256-ptZ14WWarYeKT8gIcUDi4LmCFkpoTwAhSwMXmLPlWxs=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -27,13 +27,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-PCtWQP2FsYl5OITVCUp6OJub0uXDLJebWP310F4KWU8=", + "hash": "sha256-X3KtT4Thsf7bYeZJEUphRiXAlNamabFE0rjS636dJSY=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.19.1", + "rev": "v4.20.0", "spdx": "MIT", - "vendorHash": "sha256-5Ljj3L7mhtvn5P9xw4W3AlHqRBGohKFGbiAmpN3dT0w=" + "vendorHash": "sha256-QzbtTp78tROVj8kPYzjP5kBRHASlvqK6xpmRnJF6jsw=" }, "akamai": { "hash": "sha256-jDCrNDJ6O9dXE6bG4GAMFytlVbEe/Z8mb6vx4DG355U=", @@ -45,11 +45,11 @@ "vendorHash": "sha256-QQaLUJJs/7hfLTIOIkG9WF7XmkLXsJP9MOQAvQoDQOw=" }, "alicloud": { - "hash": "sha256-x/hq45iqcKurjFeXsdycWqDlJ+O1/4f01+6ay6TDejY=", + "hash": "sha256-WaMvv/NqyblA2rrauZ7p4pHCND6S6/kfBKS/2xIrcjI=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.225.1", + "rev": "v1.226.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -81,13 +81,13 @@ "vendorHash": "sha256-yyTU+D4zMDcJPZ9j7a2ZuPjGBCHvED5R0rvevCEaoAI=" }, "artifactory": { - "hash": "sha256-4gE8+z4GZElmkVK9nVDriAolXJ95arNNKyIq88XAwp8=", + "hash": "sha256-j9TtO8dJltf7SZdlMZaiCWdJbcEPloPbDhYfWcCzgss=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v11.0.0", + "rev": "v11.1.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-5kdyDc3/jBvg6QNBivh8J4SrYgMd0dkiUHUx43wzepQ=" + "vendorHash": "sha256-nPEN1ee0RmNpgKIlz0jHcHkG6oYZn7LV/Gmmdd9krq8=" }, "auth0": { "hash": "sha256-Ay/EPlAxpEehbDsOeOyOViwT3jDsd3FmpHB5sxnAxAs=", @@ -117,29 +117,29 @@ "vendorHash": null }, "aws": { - "hash": "sha256-YykNKCDFPQCtES2vAbCbqbHbkx1EmVM0bTEylr84bqs=", + "hash": "sha256-DJ0mfqcWIs1iLSEfhlYEgHr1PKz8HchlgvHfEwIAnlA=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.43.0", + "rev": "v5.57.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2KQEX1QwPrN32gFMKF7QPnisLdBC/bn74wX1f8uiC+0=" + "vendorHash": "sha256-NlFP7cRE+6PiGMSz2y/SDQas/TNWAJk/EBEqIeG2INY=" }, "azuread": { - "hash": "sha256-8uGSVvYygkR8WuKVGYVGN5dq2LoFQx8tbNYLYVBW4LE=", + "hash": "sha256-UOaEfmhGPrqQBkodNYybYb5rnB3X8wpXKHlpKqZnnXU=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.52.0", + "rev": "v2.53.1", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-ukfUXWT1Q8jziaSMpZl2awaid9GfByl3TniG63JxkuQ=", + "hash": "sha256-3EHm4fpeYJYzwrwaQLMdgFq1dgmV755WwAhKBG3f10M=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.109.0", + "rev": "v3.111.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -189,22 +189,22 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-/vyiQZ4UDe42sIxacgWDf+wktwd8ZXhW++gh+qF4C3c=", + "hash": "sha256-QS+JCFLYPvxwLIVzCS/gKZkBZQhOOxRfn7Vudgiox+E=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.10.0", + "rev": "v1.10.1", "spdx": "MIT", - "vendorHash": "sha256-Vozfdh6LwIS0ISc28OGmEnpS9jjFth1i6bNUGY4mXKc=" + "vendorHash": "sha256-gTJakGr9f9bzR5pbmgAMTJL54e2mS/h92TM4ft3ABdw=" }, "checkly": { - "hash": "sha256-xM3KJiWO1Lsw33talLR6gcalEm9gRffUOikdUQZ6AsM=", + "hash": "sha256-qPlXaw8J2J7DPKJvfiTLalgMIWpttqbdMg2UB3rvt14=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.7.8", + "rev": "v1.8.0", "spdx": null, - "vendorHash": "sha256-TgoTz9kFLhikfQYt654nmoGPzjVLfUMnUrs3mVqrgJo=" + "vendorHash": "sha256-+GirqFNV0eIC9CzpW53UOi9cDUzXs8ozSLX7dKQnOQ8=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -290,13 +290,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-L6GXoyjTd2n2n79gPvmQ0zLhW0iDS8ZcrY1gxPaQ61I=", + "hash": "sha256-sWcVMQiSRFyjwYIHUdKQm9sKX279pnA3FVLwUJ3kBKw=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.39.0", + "rev": "v3.40.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jK6GI44o1FoJw9eZaCbWz1zw3dHqyaS5664h+Z27OXQ=" + "vendorHash": "sha256-GEZmpCyqZCxsS5aFxEznNscs5CcgQiiPvJweA3mKkRY=" }, "dexidp": { "hash": "sha256-XR8OI+Nf3PKNzZzM+jvylF8Itnapb9Xdztxq4OyXPVQ=", @@ -381,13 +381,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-jnV8dg9CJ38YKdEmc0hxDDbl/YUQgPTM6D5YYVjjWFc=", + "hash": "sha256-Ipl+POTZRKe9xKR08x/TPm2S7kv6w54im16pp56rWDE=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.38.1", + "rev": "v2.0.1", "spdx": "MIT", - "vendorHash": "sha256-25kuUGbBCHOL3RzQcLDzzdfQ1j+XvqJSEyIowV0Od8A=" + "vendorHash": "sha256-oxtFq1tejyqsY2uEkMjiub1CwdkFpuSVRb1Z2u3CebQ=" }, "exoscale": { "hash": "sha256-d6vdYtEBD34SPHDAlkpTb/T8D7TaLbVwMYjSefuNdr0=", @@ -408,11 +408,11 @@ "vendorHash": "sha256-qeKXdjrDPJWO4xW8by6djJReeYbCjh8VzQmE5/65zII=" }, "fastly": { - "hash": "sha256-xoxxicu0bXoaISMNwZNM6G8bBz0GKv48ORpcABwSsg8=", + "hash": "sha256-FfdXMrGfz+JFEyWfZytIt1R0M/v7JUmkvu4VohF1vSA=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.10.0", + "rev": "v5.11.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -453,31 +453,31 @@ "vendorHash": null }, "gitlab": { - "hash": "sha256-WquY33Dx5E+OgnAMZ6dhgwrixhHhAYRUa4l6TuzGzmw=", + "hash": "sha256-F73eY0m+KdzfAFCFPOZ0a29OOfgOm87WZvi8+mHwPek=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v16.10.0", + "rev": "v17.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-7hIThIq3uU803aK+paR5KdTdfVmSZu7Spf9UepaVgvc=" + "vendorHash": "sha256-FrmQsuLinm5Z4+GHC1PV19lt1rfxv3TwQiEUxTvlTtk=" }, "google": { - "hash": "sha256-YonRToq/xdUy584hlzG+0/olYPhq3yxBUEahGz1ODkk=", + "hash": "sha256-RJ01+OA3BXMNThRk9aGkYa2jrj3SYgOh9eA5al5wR/Q=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v5.35.0", + "rev": "v5.36.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-cpxk3g3bKG+3s53WBJlX2O722qNeQICqaIqcMrpDJYs=" + "vendorHash": "sha256-0SxftrOjmpYK4ud3RweYaW6qgdKwi43D1ZhN470rvVs=" }, "google-beta": { - "hash": "sha256-71eEmUUwSGM81kNwzvJ1QnkjMskdRx8BoETNSLIjYog=", + "hash": "sha256-r9ndcNxiocRHH++zvEtuIwJ8U2fE5cgndPcYjdhLpEA=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v5.35.0", + "rev": "v5.36.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2sqUzK8yxNKdfvrToCQWK8Eyr2n4ch6/KrrIAYmLwcA=" + "vendorHash": "sha256-XkpLgFB/974WEbZe34uKrLSEWjinrkmpOFOG7uYDHhg=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -570,11 +570,11 @@ "vendorHash": "sha256-3yrcTs0QV2I4CX1TZgY9FimXC2G/p1s+xNsurH0n8e8=" }, "huaweicloud": { - "hash": "sha256-04y0G3555aRnB3Zc9TgeYOMo1QyJ9ns4r85AikXSNE4=", + "hash": "sha256-p5vS7rnoBqE81Dhj35xeAs5ja/ekpeVEaNALtxw0/Tc=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.65.2", + "rev": "v1.66.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -597,13 +597,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-5esd44JgaarCJK38QyYv+fxMz0+zzivMZD8rqyqrdbo=", + "hash": "sha256-91EXK/8Kovq2yqyF5lFgWV/AJMvU6eHCnIBnLpzsQws=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.64.0", + "rev": "v1.67.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-YFxD7hvKTXdaQ/+/Oiws/i6TipbFaAQ0Ah1arGK7JUo=" + "vendorHash": "sha256-ioyfsNgXoQOtzU1eBJkjMw4hgIo5ryFPIFKqOdn4fuk=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -705,13 +705,13 @@ "vendorHash": "sha256-K/PH8DAi6Wj+isPx9xefQcLPKnrimfItZFSPfktTias=" }, "linode": { - "hash": "sha256-6q1x34SWBCDi1jGoyNoxMAtHqxqP3qAVk1MLMLIRbg8=", + "hash": "sha256-X7Uslu8HjJg/Ikz48hg1aIaDNNcr3Xz4gBTPB+y949k=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.23.0", + "rev": "v2.23.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-ZQkFp9UXhY61YgtPVaWOSoQIYNcaTs9V/iwZ+UDRluA=" + "vendorHash": "sha256-lQ1+MVErv0g2Q7PSrO95Qzs0o/0hpL6JKK9E5J1EGic=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -786,13 +786,13 @@ "vendorHash": "sha256-Gn4P4NIksv8S4DmnuYArxdSQDQsyCeayJJAIkmm/I6A=" }, "mongodbatlas": { - "hash": "sha256-TitX99F/jx2q2FOSmJAGLprhFSsG4CBdmKQhzNqxotk=", + "hash": "sha256-8A2csdDMS5W0SzVRy7QATWUEDEZqR7gLRDpVAeROsZk=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.17.2", + "rev": "v1.17.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-Te8Kd+1B3T3Ngo+xKgiqjnm5CZ2QRNXEQxPlaLPXNRY=" + "vendorHash": "sha256-idXan9/OGEKY+VT2dwWwj+P1fFQIrIs2ghkthz53j/g=" }, "namecheap": { "hash": "sha256-g3i7jZBOl2umsyRk1z7Radv8a9Ry6oQ8oorv3YbY7Xo=", @@ -813,13 +813,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-UxSWEejkEH5VzPWXc2RZ5ho8rtvwH6zYUEP+W/r4ny0=", + "hash": "sha256-hJKYz95+i1j1KhDuh5Jcm8cZzBAD3cK5+a5B1vCYBXM=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.38.1", + "rev": "v3.39.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-wsIi0BwwSXiVhYg2h53UzqjbGpPYMHXcmmMXO20gbWw=" + "vendorHash": "sha256-EHO78DEZ92WRDP8ZA0M9zdZ8KsPWMA2ljgFY6dX29YM=" }, "nomad": { "hash": "sha256-42QZfbbugxV6USCz0Urnhfcsf+DZKpOepC44Z37dGkw=", @@ -831,13 +831,13 @@ "vendorHash": "sha256-+4JU2z56W/uT+DW4+LRf1hwK0nLK9WARTY31bqMpHNM=" }, "ns1": { - "hash": "sha256-KbtMwLgwCPHilzQ22oco99q6c5+0B/9OXoc0IZXLLVk=", + "hash": "sha256-96q68P+d7K4UycCZ0Z5w3HWIcKwsC4/UD6WPU6yyC7M=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.3.0", + "rev": "v2.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-kQFlW6G20x1OJNywb+KfJC1A7XSdgHlif7/szUOBuhs=" + "vendorHash": "sha256-0RRZF7/NHo9y7SUKZbq8nNU+gFdCb0u4XJgsobNeWsk=" }, "null": { "hash": "sha256-KOwJXGvMc9Xgq4Kbr72aW6RDwzldUrU1C3aDxpKO3qE=", @@ -859,11 +859,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-EcemPlqHB3Ggra0o1rzjxAGtcpBKpUp3/H8zS56COYA=", + "hash": "sha256-yiHBWcOE2QxyhzKqjSPvgqAFu0hL13idWXbwkhAhNeE=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.46.0", + "rev": "v6.1.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -940,11 +940,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-GB2U+JBMAj+ePay7CYHWv/daLzVm+V+5YoADJ6uQp+E=", + "hash": "sha256-sXFRN05mn5hMIqxhwIvYWlMgkrUGZqi+J29Sq9GRS90=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.14.3", + "rev": "v3.14.5", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1138,13 +1138,13 @@ "vendorHash": "sha256-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8=" }, "spotinst": { - "hash": "sha256-6bdOwmAKxP7EVdRV8vw6b/lewPm35zE9T0Dah6NL5FA=", + "hash": "sha256-SOzaTZIBEC9se942ofYHURH8btw38upJtnlDDWmLcTM=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.178.0", + "rev": "v1.180.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-c6vs7FypPQybAzFAsTnOGVjVLhhmj6v2/O0FU1z6X0A=" + "vendorHash": "sha256-mgDWGimTq7AODC+ojipWUgCDKpC/EP/W8x8kbey05mQ=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", @@ -1174,13 +1174,13 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-ei5BxMyrx4CyVYl81DUDxLdbjGJBiTZWiFylhUFTr0s=", + "hash": "sha256-LPJwJ6j/eZzOliHH7Ci49c5CqDckaqSm7ikLKTVhuew=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.30.1", + "rev": "v2.31.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-ti0zBliq3DXVNWlqE0dO6T5UxN/p1fLMt4FK/0/j9oY=" + "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, "tailscale": { "hash": "sha256-hMcnHTdxxEfAU5cd0nlK2Bc+fxfrERk4wYaRidPM4mA=", @@ -1201,20 +1201,20 @@ "vendorHash": "sha256-939lQsdp0Ixj9FU7IqxbOAM93GwL+X6gC3kY5/0x+AE=" }, "temporalcloud": { - "hash": "sha256-ISx/kc3Mi/EBnzfrMojRTsZEG10iPqKMB8Ac8SzBZmY=", + "hash": "sha256-PIqsCdIaFob/C2b1Rem/JYl7bQVvdRecDQDkcAZutz0=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v0.0.8", + "rev": "v0.0.9", "spdx": "MPL-2.0", - "vendorHash": "sha256-2rYaxDDIPH46gXNILnTcHRsChpEd406r4pzWdnHMLNM=" + "vendorHash": "sha256-/yXPJgwpUCKRs3Sf2BbuHp3pfQiheTAh7Auxk3qkTFg=" }, "tencentcloud": { - "hash": "sha256-RR7F+sZl/btVEsybmKFxG3yrE7PkvdstMuDAJwx4Ggk=", + "hash": "sha256-PZWBVLUfWn13B7saz2XecMv6pWWqPMOfBzqr2pErnvs=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.105", + "rev": "v1.81.107", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1301,13 +1301,13 @@ "vendorHash": "sha256-rS6tigtjTGG2c4FwSjn6dvblwqYtPQS/tl7qQ+P7uVM=" }, "vcd": { - "hash": "sha256-f5uoRyf8uW/hJ9MAbi9KdViWh8CMR/FlQyJtAY5pEvI=", + "hash": "sha256-4+7CblKeop9Uwpl7XxjmR33XE/mcmZfOuFJrJuqzZmw=", "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", "repo": "terraform-provider-vcd", - "rev": "v3.12.1", + "rev": "v3.13.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-vKfHRTmTRxwDijEA1l4IyjBHS5kZx9LcGfprUntVg5w=" + "vendorHash": "sha256-GKI3eXgXA92URJiwafcVchBcW7JQQ7hM14ThA6B6wKg=" }, "venafi": { "hash": "sha256-0ea6ael4NQDHFOrXsMKE/KRRpARKjrxPBFykB8Bk1JA=", @@ -1346,13 +1346,13 @@ "vendorHash": null }, "vsphere": { - "hash": "sha256-BCEUFIw47o7lFmOaQ/SBk2n1bPnvzAwdxeuuMNx4OgA=", + "hash": "sha256-rF7gtZUPse6ewcawmxlIfCmVRKKNJMUwqVVEBaLvLbE=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.8.1", + "rev": "v2.8.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-K7T4ZGz8Us/RRWoAmT5M++m6uJKl6tyPX7T+sS7NuLs=" + "vendorHash": "sha256-TxaYIJtEIgy0Q56Gk1JXqIUuVyVJNVH0gKmdzzDWW/E=" }, "vultr": { "hash": "sha256-gQwLGnYmB9bwpGrLNdbw+zY0MlPPrY/37rJPtindT1Q=", @@ -1373,12 +1373,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-PTlnXq30roG1ueLJM5aGSeuDJ5zukmU33T9Qf7cnxd8=", + "hash": "sha256-FwwjHWwUUtOwZZh0YeUbSnSLFH1Q80ALFHhd0tCAZNQ=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.122.0", + "rev": "v0.123.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Lo847kKBWDFeN3t7T/akaQ8gkU7b+p1BSSi4ddLLDyc=" + "vendorHash": "sha256-K6Khgg9sAG2S/onFUlVG5mZfMtvpvVJeU6YQOyA4Liw=" } } diff --git a/pkgs/applications/networking/cluster/tftui/default.nix b/pkgs/applications/networking/cluster/tftui/default.nix index 9af694c683fd..097476446676 100644 --- a/pkgs/applications/networking/cluster/tftui/default.nix +++ b/pkgs/applications/networking/cluster/tftui/default.nix @@ -24,7 +24,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ makeWrapper poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 482aa416f2d8..58fac193dd2d 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -6,16 +6,16 @@ buildGo122Module rec { pname = "timoni"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-LN2VxXKjEaUgLSVc0G+OlhmaZ4anBmyXbOBOrGIeYG0="; + hash = "sha256-g0B5UbveQ6KYqfXGF5bsGJfUuZ3q1TNEaC1GwtNAig8="; }; - vendorHash = "sha256-Vj7P0o0UM35WTv9s1BAcW6MuzjIinADOFsuCK1bpKP0="; + vendorHash = "sha256-XeqHETKWw74edsWCOKC+bhIt0NZz5mgrTShoQk1hb5Y="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index f475ba4fbd0c..f3a7ccccf5df 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.19.5"; + version = "0.19.6"; src = fetchFromGitHub { owner = "loft-sh"; repo = "vcluster"; rev = "v${version}"; - hash = "sha256-V+Y2LekBYlKZU53BsYCW6ADSMJOxkwSK9hbFGXBaa9o="; + hash = "sha256-yW+GaMEfgkeBEGHG7heo8gZcFQuAXmn3rlBPBrlbyvM="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/weave-gitops/default.nix b/pkgs/applications/networking/cluster/weave-gitops/default.nix index f3bc732b764c..4591b0946d93 100644 --- a/pkgs/applications/networking/cluster/weave-gitops/default.nix +++ b/pkgs/applications/networking/cluster/weave-gitops/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { description = "Weave Gitops CLI"; license = licenses.mpl20; platforms = platforms.linux; - maintainers = with maintainers; [ nullx76 ]; + maintainers = with maintainers; [ ]; mainProgram = "gitops"; }; } diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index e580dd7e6ff2..2f28b3fc9587 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-o3sfvzUCCW7hwNDrWH1IiRyZHkVnxffJdLS8BqzD5Ng="; + hash = "sha256-HxHINy+zwkwLvckQUoDy1KqLhTYSH371+cucQGWJNIw="; }; - vendorHash = "sha256-Co9xKC7J0WGoaYxa+YukrP+6aOuhweZyXaH5wD97ioA="; + vendorHash = "sha256-+3VYBvcA8TzO9uBl0863uATOavPY9cjt8xtgW7N7C4w="; proxyVendor = true; preBuild = '' diff --git a/pkgs/applications/networking/cyberduck/default.nix b/pkgs/applications/networking/cyberduck/default.nix index 2fb966443718..59d3e2770289 100644 --- a/pkgs/applications/networking/cyberduck/default.nix +++ b/pkgs/applications/networking/cyberduck/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://cyberduck.io"; license = licenses.gpl3Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/applications/networking/deck/default.nix b/pkgs/applications/networking/deck/default.nix index fb1b9546363c..3aa7b3106258 100644 --- a/pkgs/applications/networking/deck/default.nix +++ b/pkgs/applications/networking/deck/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "deck"; - version = "1.38.1"; + version = "1.39.2"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "v${version}"; - hash = "sha256-9n8XAeSZn2HD8Vg2B8YmBUQ+VPBglgjN+QjrSOgn65Y="; + hash = "sha256-8Z2JBxVUoJKzxdMvyZg5SxHyIFW9lyA71GU7R6S27Rs="; }; nativeBuildInputs = [ installShellFiles ]; @@ -21,7 +21,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-2lR2/jHOFmKm3s+EPNRFLlgJHIs+33YDt1YeHBWRin0="; + vendorHash = "sha256-SXpY6FokcrxWZu0LybGKN3tw8GwbntV3ZQ+T2dhGDqY="; postInstall = '' installShellCompletion --cmd deck \ diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 832133082f77..8a0f00e73953 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.12.0"; + version = "4.12.2"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-W1X/d2Xf31xQWZH7ShH8Y6axhhyTOqxE/EjxNvR6pBU="; + hash = "sha256-t9cjF5gCRIv5WvGvYTGOFYGRKTJGOvJ3xfhXk+lmAF8="; }; - vendorHash = "sha256-Dz45h33Rv4Pf5Lo0aok37MNrcbT8f/xrPPkGJMNBo8Y="; + vendorHash = "sha256-KqsMD0WbFDZwVqsIvg0LfOhcEO7oZw7v5XJwyDj9wxw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index a922d70cd68f..f66f0262242b 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -6,7 +6,7 @@ , python3 , dropbox , gtk4 -, gnome +, nautilus , gdk-pixbuf , gobject-introspection }: @@ -51,7 +51,7 @@ stdenv.mkDerivation { buildInputs = [ python3 gtk4 - gnome.nautilus + nautilus ]; configureFlags = [ diff --git a/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock b/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock index c7e42c551fe7..208d5e34198b 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock +++ b/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -43,9 +43,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -57,15 +57,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -81,9 +81,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys", @@ -103,7 +103,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -157,6 +157,12 @@ 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" @@ -180,6 +186,7 @@ dependencies = [ "clap", "clap-verbosity-flag", "cloudflare", + "local-ip-address", "log", "pretty_env_logger", "public-ip", @@ -209,9 +216,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.5" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", @@ -229,9 +236,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.5" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -249,7 +256,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -260,21 +267,18 @@ checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "cloudflare" -version = "0.10.1" -source = "git+https://github.com/jcgruenhage/cloudflare-rs.git?branch=make-owner-fields-optional#02397fc4211886548a31a0731b240f2e17309de4" +version = "0.12.0" +source = "git+https://github.com/Wyn-Price/cloudflare-rs.git?branch=wyn/zone-details#a6179f8b3b520b17788f39fcd5f103e81a87a890" dependencies = [ - "anyhow", - "async-trait", - "base64 0.13.1", - "cfg-if", "chrono", "http", "percent-encoding", "reqwest", "serde", "serde_json", - "serde_qs", + "serde_urlencoded", "serde_with", + "thiserror", "url", "uuid", ] @@ -346,7 +350,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -368,7 +372,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -423,6 +427,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + [[package]] name = "encoding_rs" version = "0.8.33" @@ -465,25 +475,14 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "fastrand" version = "2.0.1" @@ -576,7 +575,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -879,9 +878,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "linked-hash-map" @@ -900,9 +899,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] +name = "local-ip-address" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66357e687a569abca487dc399a9c9ac19beb3f13991ed49f00c144e02cbd42ab" +dependencies = [ + "libc", + "neli", + "thiserror", + "windows-sys", +] [[package]] name = "lock_api" @@ -928,9 +939,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "mime" @@ -976,6 +987,31 @@ dependencies = [ "tempfile", ] +[[package]] +name = "neli" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1100229e06604150b3becd61a4965d5c70f3be1759544ea7274166f4be41ef43" +dependencies = [ + "byteorder", + "libc", + "log", + "neli-proc-macros", +] + +[[package]] +name = "neli-proc-macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4" +dependencies = [ + "either", + "proc-macro2", + "quote", + "serde", + "syn 1.0.109", +] + [[package]] name = "nibble_vec" version = "0.1.0" @@ -987,9 +1023,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -1042,7 +1078,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1109,7 +1145,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1148,9 +1184,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -1238,9 +1274,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" dependencies = [ "aho-corasick", "memchr", @@ -1250,9 +1286,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" dependencies = [ "aho-corasick", "memchr", @@ -1261,15 +1297,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64 0.21.4", "bytes", @@ -1292,6 +1328,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tower-service", @@ -1310,9 +1347,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.14" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ "bitflags 2.4.0", "errno", @@ -1382,7 +1419,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1396,17 +1433,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_qs" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -1444,7 +1470,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1507,15 +1533,36 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[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 = "tempfile" version = "3.8.0" @@ -1565,7 +1612,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1613,9 +1660,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -1636,7 +1683,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1707,7 +1754,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1826,7 +1873,6 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ - "getrandom", "serde", ] @@ -1872,7 +1918,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -1906,7 +1952,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index aba0262e3258..9659e9777a2e 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cfdyndns"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "nrdxp"; repo = "cfdyndns"; rev = "v${version}"; - hash = "sha256-iwKMTWLK7pgz8AEmPVBO1bTWrXTokQJ+Z1U4CiiRdho="; + hash = "sha256-OV1YRcZDzYy1FP1Bqp9m+Jxgu6Vc0aWpbAffNcdIW/4="; }; cargoLock.lockFile = ./Cargo.lock; - cargoLock.outputHashes."cloudflare-0.10.1" = "sha256-AJW4AQ34EDhxf7zMhFY2rqq5n4IaSVWJAYi+7jXEUVo="; + cargoLock.outputHashes."cloudflare-0.12.0" = "sha256-8/C5mHN7g/k3q9BzFC9TIKMlgmBsmvC4xWVEoz1Sz9c="; cargoLock.outputHashes."public-ip-0.2.2" = "sha256-DDdh90EAo3Ppsym4AntczFuiAQo4/QQ9TEPJjMB1XzY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 930fc3460319..18e5847e6709 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -24,7 +24,6 @@ python3Packages.buildPythonApplication rec { build-system = with python3Packages; [ setuptools ]; - nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; dependencies = with python3Packages; [ daemonocle diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index c94bbc878018..c635c6fefb2a 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -16,10 +16,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-BmHChLWWnrtg0p4WH8bANwpo+p4RTwjYbXfyPnz6mp8="; }; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - pythonRelaxDeps = true; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index c9c54cfe08cd..ce49d6b15016 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.27"; + version = "0.2.29"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-APRa+wZhls7O2q3zVPEB9Kegd1YspcfC8PSJy6KFlR8="; + sha256 = "sha256-VAbMcON75dTS+1lUqmveN2WruQCCmK3kB86e+vKM64U="; }; - vendorHash = "sha256-OLsJc/AMtD03KA8SN5rsnaq57/cB7bMB/f7FfEjErEU="; + vendorHash = "sha256-JaYJq8lnZHK75Rwif77A9y9jTUoJFyoSZQgaExnY+rM="; doCheck = false; diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 215606c52739..63a13a26923c 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "7.0.5"; + version = "7.0.6"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-H/tWgVjyZcCFVEZL+4VOZWjvaDvwMxKSO1HyjFB5Ck4="; + hash = "sha256-IYJPf/Egh8DJud4gcZmnWpwxsDA2aIx8ucF48KO1f40="; }; nativeBuildInputs = [ @@ -125,7 +125,8 @@ stdenv.mkDerivation rec { sed -i 's|${builtins.storeDir}/\(.\{8\}\)[^-]*-|${builtins.storeDir}/\1...-|g' ./src/build-info.h ''; - hardeningDisable = [ "stackprotector" ]; + # zerocallusedregs interferes during BPF compilation; TODO: perhaps improve + hardeningDisable = [ "stackprotector" "zerocallusedregs" ]; installFlags = [ "e_datadir=\${TMPDIR}" diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index d8c4089eee72..a338bb8d5e3d 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "9.12.0"; + version = "9.13.0"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - hash = "sha256-nzSgJrlTRN4LDcdjvCIBwjBJTRRoch376R4PIbvcajQ="; + hash = "sha256-ENd3ozRi47vszgHZIX63nQu7wZz6Zf4HdmCsNvkcLOo="; }; nativeBuildInputs = [ @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { homepage = "https://alfaview.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ hexchen ]; + maintainers = with maintainers; [ ]; mainProgram = "alfaview"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 4b04be48d11e..94e456867c47 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -10,10 +10,10 @@ }: let pname = "beeper"; - version = "3.106.2"; + version = "3.107.2"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.106.2-build-240604xwl5q01pr-x86_64.AppImage"; - hash = "sha256-WbAWJJzk58UVmRN3RHmU/V6zPiLWAb7m7hns4gmP55M="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.107.2-build-240624c0qmp116e-x86_64.AppImage"; + hash = "sha256-DFzPPVw8OCM7K6COQcC68ZntEZiqBW58IpiD4rpgguc="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index f3ae1665fe3d..6b3f5904e975 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -60,7 +60,7 @@ buildNpmPackage rec { meta = with lib; { description = "Yet another Matrix client for the web"; homepage = "https://cinny.in/"; - maintainers = with maintainers; [ abbe ashkitten ]; + maintainers = with maintainers; [ abbe ]; license = licenses.agpl3Only; platforms = platforms.all; }; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 428715b6f1b7..b818baa89930 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -23,23 +23,17 @@ , webrtc-audio-processing }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dino"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "v${version}"; - sha256 = "sha256-smy/t6wTCnG0kuRFKwyeLENKqOQDhL0fZTtj3BHo6kw="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-I0ASeEjdXyxhz52QisU0q8mIBTKMfjaspJbxRIyOhD4="; }; - patches = [ - # fixes build failure https://github.com/dino/dino/issues/1576 - # backport of https://github.com/dino/dino/commit/657502955567dd538e56f300e075c7db52e25d74 - ./fix-compile-new-vala-c.diff - ]; - postPatch = '' # don't overwrite manually set version information substituteInPlace CMakeLists.txt \ @@ -92,7 +86,7 @@ stdenv.mkDerivation rec { "-DRTP_ENABLE_VP9=true" "-DVERSION_FOUND=true" "-DVERSION_IS_RELEASE=true" - "-DVERSION_FULL=${version}" + "-DVERSION_FULL=${finalAttrs.version}" "-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext" "-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt" "-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" @@ -133,4 +127,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ qyliss tomfitzhenry ]; }; -} +}) diff --git a/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff b/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff deleted file mode 100644 index b8277f32afc9..000000000000 --- a/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/plugins/gpgme-vala/vapi/gpgme_public.vapi b/plugins/gpgme-vala/vapi/gpgme_public.vapi -index bcf12569..b32efd03 100644 ---- a/plugins/gpgme-vala/vapi/gpgme_public.vapi -+++ b/plugins/gpgme-vala/vapi/gpgme_public.vapi -@@ -22,9 +22,9 @@ public class Key { - public string issuer_name; - public string chain_id; - public Validity owner_trust; -- [CCode(array_null_terminated = true)] -+ [CCode(array_length = false, array_null_terminated = true)] - public SubKey[] subkeys; -- [CCode(array_null_terminated = true)] -+ [CCode(array_length = false, array_null_terminated = true)] - public UserID[] uids; - public KeylistMode keylist_mode; - // public string fpr; // requires gpgme >= 1.7.0 diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 66d7abc0822d..5d4978783785 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -7,7 +7,7 @@ , flutter319 , pulseaudio , makeDesktopItem -, gnome +, zenity , targetFlutterPlatform ? "linux" }: @@ -50,7 +50,7 @@ flutter319.buildFlutterApplication (rec { runtimeDependencies = [ pulseaudio ]; - extraWrapProgramArgs = "--prefix PATH : ${gnome.zenity}/bin"; + extraWrapProgramArgs = "--prefix PATH : ${zenity}/bin"; env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}"; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 7f273359de4e..7e4b468c301d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, gettext, wrapGAppsHook3 # Native dependencies -, python3, gtk3, gobject-introspection, gnome +, python3, gtk3, gobject-introspection, adwaita-icon-theme , gtksourceview4 , glib-networking @@ -21,17 +21,18 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - hash = "sha256-eiRLQZr60BvjqqnoYEY+LswgW6e+S9mTLvBKVCXrCzI="; + hash = "sha256-VvXzGo8GLtkAJ/ZVOpYOboJeRqZkDbZDu9DMjaHqWus="; }; format = "pyproject"; buildInputs = [ - gtk3 gnome.adwaita-icon-theme + gtk3 + adwaita-icon-theme gtksourceview4 glib-networking ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 8a1052d04df4..8390d7793458 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -8,17 +8,17 @@ let pname = "mattermost-desktop"; - version = "5.7.0"; + version = "5.8.1"; srcs = { "x86_64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - hash = "sha256-1xfU9+VzjhSVWsP1AYizphhQ2010GbQBgQ4dxvY3TBU="; + hash = "sha256-VuYHF5ALdbsKxBI7w5UhcqKYLV8BHZncWSDeuCy/SW0="; }; "aarch64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz"; - hash = "sha256-RrH+R9IuokKK+zfmCmOt38hD1HvWJbKqmxTFhQ3RcqQ="; + hash = "sha256-b+sVzMX/NDavshR+WsQyVgYyLkIPSuUlZGqK6/ZjLFs="; }; }; diff --git a/pkgs/applications/networking/instant-messengers/neosay/default.nix b/pkgs/applications/networking/instant-messengers/neosay/default.nix index 46ea22da5db8..b6fbbd68401f 100644 --- a/pkgs/applications/networking/instant-messengers/neosay/default.nix +++ b/pkgs/applications/networking/instant-messengers/neosay/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { mainProgram = "neosay"; homepage = "https://github.com/donuts-are-good/neosay"; license = licenses.mit; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index f12a51d75191..f5118bb96863 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -24,7 +24,6 @@ python3Packages.buildPythonApplication rec { installShellFiles ] ++ (with python3Packages; [ setuptools - pythonRelaxDepsHook ]); pythonRelaxDeps = [ diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index cbb23559ae61..0167146e5785 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -1,4 +1,5 @@ { alsa-lib +, libuuid , cups , dpkg , fetchurl @@ -86,7 +87,7 @@ stdenv.mkDerivation { makeShellWrapper $out/opt/QQ/qq $out/bin/qq \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL libuuid]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ "''${gappsWrapperArgs[@]}" @@ -115,6 +116,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" ]; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ fee1-dead ]; + maintainers = with lib.maintainers; [ fee1-dead bot-wxt1221 ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/qq/sources.nix b/pkgs/applications/networking/instant-messengers/qq/sources.nix index 4fa23026a957..a63a416a8bf0 100644 --- a/pkgs/applications/networking/instant-messengers/qq/sources.nix +++ b/pkgs/applications/networking/instant-messengers/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-06-07 +# Last updated: 2024-06-17 { - version = "3.2.9"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.9_240606_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.9_240606_arm64_01.deb"; - arm64_hash = "sha256-wZyaIkJdGDvIw8PrRlOiKpo3rdeELlxYBPyS6llbL4w="; - amd64_hash = "sha256-DcQWwep4p4aWUAoBNQ9Ge1QBiCxk6BhcziTDSHmRpgY="; + version = "3.2.10"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/944f8942/linuxqq_3.2.10-25234_amd64.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/944f8942/linuxqq_3.2.10-25234_arm64.deb"; + arm64_hash = "sha256-UY9UFbwQjXBd0+52iron1LZQWP/ncUZwylrtDzm5lW8="; + amd64_hash = "sha256-CHVX5tBV/w//At2wBjLqgTzayi4NI5i06IDgyW++ha4="; } diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 93fb435f3909..6db3418789b2 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.9.15"; + version = "4.0.0"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-fMnr7RCNoYVyV+CzKOIqaGd6T6+3fJxMuPjNdFAZdX0="; + hash = "sha256-ryfYaePwL4W6x8sKlxACadLUvXEqyqJ0enlSnmVmpUo="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { atk pango freetype - libgnome-keyring3 + libgnome-keyring fontconfig gdk-pixbuf cairo diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index fcd1e22cf40c..c3ab93f1b7a5 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.14.0"; + version = "7.15.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-nRvGpAKRIPgXStrVu4qSMoW01SACV/wW/c05lLncCW8="; + hash = "sha256-UgWVxLOqul/XsM++1Cai7+skjByQfGDO8gBVDJNv/tw="; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 05803ede0953..39f05b615e36 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240627"; + version = "20240702-2"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-Kvz2Ft7gcvyQr8CxTZ7bHVn7q0yItGsK6/rChz0eras="; + hash = "sha256-nPNhN4ODCZMii5VATcvh8qvdrQQ0r94X6vlaYgtQFac="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix deleted file mode 100644 index 99ff0b412e2c..000000000000 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ lib, stdenv, fetchurl, dpkg -, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome -, gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook3, xorg -, at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon, libxshmfence }: - -let - - # Please keep the version x.y.0.z and do not update to x.y.76.z because the - # source of the latter disappears much faster. - version = "8.110.76.107"; - - rpath = lib.makeLibraryPath [ - alsa-lib - atk - at-spi2-atk - at-spi2-core - cairo - cups - curl - dbus - expat - fontconfig - freetype - glib - glibc - libsecret - libuuid - - gdk-pixbuf - gtk3 - libappindicator-gtk3 - - gnome.gnome-keyring - - libnotify - libpulseaudio - nspr - nss - pango - stdenv.cc.cc - systemd - - libv4l - libdrm - mesa - libxkbcommon - libxshmfence - xorg.libxkbfile - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libXScrnSaver - xorg.libxcb - ] + ":${stdenv.cc.cc.lib}/lib64"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - urls = [ - "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" - "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" - "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" - ]; - sha256 = "sha256-ocXhISwEtwzPd1dOPjgIj5UQ/8sqq2gUtmZ8KZBAxKM="; - } - else - throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; - -in stdenv.mkDerivation { - pname = "skypeforlinux"; - inherit version; - - system = "x86_64-linux"; - - inherit src; - - nativeBuildInputs = [ - wrapGAppsHook3 - glib # For setup hook populating GSETTINGS_SCHEMA_PATH - ]; - - buildInputs = [ dpkg ]; - - dontUnpack = true; - installPhase = '' - mkdir -p $out - dpkg -x $src $out - cp -av $out/usr/* $out - rm -rf $out/opt $out/usr - rm $out/bin/skypeforlinux - - ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" - - # Otherwise it looks "suspicious" - chmod -R g-w $out - ''; - - postFixup = '' - for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* -or -name \*.node\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true - done - - # Fix the desktop link - substituteInPlace $out/share/applications/skypeforlinux.desktop \ - --replace /usr/bin/ "" - substituteInPlace $out/share/applications/skypeforlinux-share.desktop \ - --replace /usr/bin/ "" - substituteInPlace $out/share/kservices5/ServiceMenus/skypeforlinux.desktop \ - --replace /usr/bin/ "" - ''; - - meta = with lib; { - description = "Linux client for skype"; - homepage = "https://www.skype.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ panaeon jraygauthier ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "skypeforlinux"; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index f59b9c3774bc..b5ac402921d2 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "teams-for-linux"; homepage = "https://github.com/IsmaelMartinez/teams-for-linux"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ muscaln lilyinstarlight qjoly chvp ]; + maintainers = with lib.maintainers; [ muscaln qjoly chvp ]; platforms = lib.platforms.unix; broken = stdenv.isDarwin; }; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix index 86136dbb36d6..e577aa110fc9 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { libnotify libpulseaudio libxkbcommon - mesa.drivers nss xorg.libX11 xorg.libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index f0732ec03920..aaabf518b959 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -6,17 +6,18 @@ , cmake , ninja , clang +, lld , python3 , wrapQtAppsHook , removeReferencesTo -, extra-cmake-modules , qtbase , qtimageformats , qtsvg -, kwayland +, qtwayland +, kcoreaddons , lz4 , xxHash -, ffmpeg_4 +, ffmpeg , openalSoft , minizip , libopus @@ -25,94 +26,59 @@ , range-v3 , tl-expected , hunspell -, glibmm +, gobject-introspection +, glibmm_2_68 , jemalloc , rnnoise , abseil-cpp , microsoft-gsl +, boost +, fmt , wayland , libicns -, Cocoa -, CoreFoundation -, CoreServices -, CoreText -, CoreGraphics -, CoreMedia -, OpenGL -, AudioUnit -, ApplicationServices -, Foundation -, AGL -, Security -, SystemConfiguration -, Carbon -, AudioToolbox -, VideoToolbox -, VideoDecodeAcceleration -, AVFoundation -, CoreAudio -, CoreVideo -, CoreMediaIO -, QuartzCore -, AppKit -, CoreWLAN -, WebKit -, IOKit -, GSS -, MediaPlayer -, IOSurface -, Metal -, MetalKit +, darwin }: let tg_owt = callPackage ./tg_owt.nix { - abseil-cpp = abseil-cpp.override { - # abseil-cpp should use the same compiler - inherit stdenv; - cxxStandard = "20"; - }; - # tg_owt should use the same compiler inherit stdenv; - - inherit Cocoa AppKit IOKit IOSurface Foundation AVFoundation CoreMedia VideoToolbox - CoreGraphics CoreVideo OpenGL Metal MetalKit CoreFoundation ApplicationServices; }; + + mainProgram = if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"; in stdenv.mkDerivation rec { pname = "kotatogram-desktop"; - version = "1.4.9"; + version = "0-unstable-2024-07-01"; src = fetchFromGitHub { owner = "kotatogram"; repo = "kotatogram-desktop"; - rev = "k${version}"; - sha256 = "sha256-6bF/6fr8mJyyVg53qUykysL7chuewtJB8E22kVyxjHw="; + rev = "fbb22ebd3e39dfa4a036fa79a7a3f78b86b1cea2"; + sha256 = "sha256-ccfmaqapk9ct+5kvBI02xHJ7YCGmm1CcqwM+3hC1bk0="; fetchSubmodules = true; }; patches = [ - ./kf594.patch - ./shortcuts-binary-path.patch + ./macos.patch + ./macos-opengl.patch ]; postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ - --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' + --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ - --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' + --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ - --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' + --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' '' + lib.optionalString stdenv.isDarwin '' - sed -i "13i#import " Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm - substituteInPlace Telegram/CMakeLists.txt \ - --replace 'COMMAND iconutil' 'COMMAND png2icns' \ - --replace '--convert icns' "" \ - --replace '--output AppIcon.icns' 'AppIcon.icns' \ - --replace "\''${appicon_path}" "\''${appicon_path}/icon_16x16.png \''${appicon_path}/icon_32x32.png \''${appicon_path}/icon_128x128.png \''${appicon_path}/icon_256x256.png \''${appicon_path}/icon_512x512.png" + substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \ + --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster ''; + # Wrapping the inside of the app bundles, avoiding double-wrapping + dontWrapQtApps = stdenv.isDarwin; + nativeBuildInputs = [ pkg-config cmake @@ -123,7 +89,9 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ # to build bundled libdispatch clang - extra-cmake-modules + gobject-introspection + ] ++ lib.optionals stdenv.isDarwin [ + lld ]; buildInputs = [ @@ -132,7 +100,7 @@ stdenv.mkDerivation rec { qtsvg lz4 xxHash - ffmpeg_4 + ffmpeg openalSoft minizip libopus @@ -141,15 +109,18 @@ stdenv.mkDerivation rec { rnnoise tg_owt microsoft-gsl + boost ] ++ lib.optionals stdenv.isLinux [ - kwayland + qtwayland + kcoreaddons alsa-lib libpulseaudio hunspell - glibmm + glibmm_2_68 jemalloc + fmt wayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa CoreFoundation CoreServices @@ -180,27 +151,34 @@ stdenv.mkDerivation rec { MediaPlayer IOSurface Metal + NaturalLanguage libicns - ]; + ]); enableParallelBuilding = true; + env = lib.optionalAttrs stdenv.isDarwin { + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + cmakeFlags = [ "-DTDESKTOP_API_TEST=ON" - "-DDESKTOP_APP_QT6=OFF" ]; installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications - cp -r Kotatogram.app $out/Applications - ln -s $out/Applications/Kotatogram.app/Contents/MacOS $out/bin + cp -r ${mainProgram}.app $out/Applications + ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin} ''; preFixup = '' - binName=${if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"} - remove-references-to -t ${stdenv.cc.cc} $out/bin/$binName - remove-references-to -t ${microsoft-gsl} $out/bin/$binName - remove-references-to -t ${tg_owt.dev} $out/bin/$binName + remove-references-to -t ${stdenv.cc.cc} $out/bin/${mainProgram} + remove-references-to -t ${microsoft-gsl} $out/bin/${mainProgram} + remove-references-to -t ${tg_owt.dev} $out/bin/${mainProgram} + ''; + + postFixup = lib.optionalString stdenv.isDarwin '' + wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} ''; passthru = { @@ -208,8 +186,8 @@ stdenv.mkDerivation rec { }; meta = with lib; { + inherit mainProgram; description = "Kotatogram – experimental Telegram Desktop fork"; - mainProgram = "kotatogram-desktop"; longDescription = '' Unofficial desktop client for the Telegram messenger, based on Telegram Desktop. @@ -220,7 +198,5 @@ stdenv.mkDerivation rec { homepage = "https://kotatogram.github.io"; changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; maintainers = with maintainers; [ ilya-fedin ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch deleted file mode 100644 index 0fa2d8bc8f6e..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp -index 7641579aa..3c195e397 100644 ---- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp -+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp -@@ -9,10 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #include "base/platform/base_platform_info.h" - --#include --#include --#include --#include -+#include -+#include -+#include -+#include - - using namespace KWayland::Client; - -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp -index 32f0de6..30a087f 100644 ---- a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp -+++ b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp -@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include - #include - --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include - - using namespace KWayland::Client; - -Submodule Telegram/lib_ui contains modified content -diff --git a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp -index 01f1e80..163cb6a 100644 ---- a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp -+++ b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp -@@ -24,8 +24,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include - #include - --#include --#include -+#include -+#include - - Q_DECLARE_METATYPE(QMargins); - diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch new file mode 100644 index 000000000000..e81bd53b440c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch @@ -0,0 +1,66 @@ +diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp +index 655e7cf410..c356acbffe 100644 +--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp ++++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp +@@ -1333,7 +1333,7 @@ void Pip::setupStreaming() { + Ui::GL::ChosenRenderer Pip::chooseRenderer( + Ui::GL::Capabilities capabilities) { + const auto use = Platform::IsMac() +- ? true ++ ? false + : capabilities.transparency; + LOG(("OpenGL: %1 (PipPanel)").arg(Logs::b(use))); + if (use) { +Submodule Telegram/lib_ui contains modified content +diff --git a/Telegram/lib_ui/ui/gl/gl_detection.cpp b/Telegram/lib_ui/ui/gl/gl_detection.cpp +index 150eb8b..c7ce9f9 100644 +--- a/Telegram/lib_ui/ui/gl/gl_detection.cpp ++++ b/Telegram/lib_ui/ui/gl/gl_detection.cpp +@@ -236,7 +236,7 @@ Capabilities CheckCapabilities(QWidget *widget, bool avoidWidgetCreation) { + + Backend ChooseBackendDefault(Capabilities capabilities) { + const auto use = ::Platform::IsMac() +- ? true ++ ? false + : ::Platform::IsWindows() + ? capabilities.supported + : capabilities.transparency; +diff --git a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm +index 7b29363..22c4fb3 100644 +--- a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm ++++ b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm +@@ -16,7 +16,6 @@ + #include + #include + #include +-#include + #include + + @interface WindowObserver : NSObject { +@@ -138,7 +137,6 @@ public: + + private: + void init(); +- void initOpenGL(); + void resolveWeakPointers(); + void revalidateWeakPointers() const; + void initCustomTitle(); +@@ -272,10 +270,6 @@ void WindowHelper::Private::enforceStyle() { + } + } + +-void WindowHelper::Private::initOpenGL() { +- auto forceOpenGL = std::make_unique(_owner->window()); +-} +- + void WindowHelper::Private::resolveWeakPointers() { + if (!_owner->window()->winId()) { + _owner->window()->createWinId(); +@@ -338,7 +332,6 @@ void WindowHelper::Private::initCustomTitle() { + } + + void WindowHelper::Private::init() { +- initOpenGL(); + resolveWeakPointers(); + initCustomTitle(); + } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch new file mode 100644 index 000000000000..8082f0964605 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch @@ -0,0 +1,52 @@ +Submodule Telegram/lib_base contains modified content +diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm +index 7ce90d3..dac3c2c 100644 +--- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm ++++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm +@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { + _observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)]; + + NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; ++#if 0 + if (@available(macOS 12.0, *)) { + [center + addObserver: _observer +@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { + name: NSProcessInfoPowerStateDidChangeNotification + object: nil]; + } ++#endif + [center + addObserver: _observer + selector: @selector(powerStateChanged:) +@@ -178,11 +180,13 @@ std::optional BatterySaving::enabled() const { + return std::nullopt; + } + NSProcessInfo *info = [NSProcessInfo processInfo]; ++#if 0 + if (@available(macOS 12.0, *)) { + if ([info isLowPowerModeEnabled]) { + return true; + } + } ++#endif + const auto state = DetectBatteryState(); + if (!state.has || !state.draining) { + return false; +Submodule Telegram/lib_webview contains modified content +diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm +index 657c5a4..4bfc097 100644 +--- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm ++++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm +@@ -317,9 +317,11 @@ Instance::Instance(Config config) { + _dataRequestHandler = std::move(config.dataRequestHandler); + [configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)]; + _webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]; ++#if 0 + if (@available(macOS 13.3, *)) { + _webview.inspectable = config.debug ? YES : NO; + } ++#endif + [_manager addScriptMessageHandler:_handler name:@"external"]; + [_webview setNavigationDelegate:_handler]; + [_webview setUIDelegate:_handler]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch deleted file mode 100644 index f173a64f141a..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp -index 2a092c6ea..de46dd269 100644 ---- a/Telegram/SourceFiles/core/application.cpp -+++ b/Telegram/SourceFiles/core/application.cpp -@@ -1173,7 +1173,7 @@ void Application::startShortcuts() { - - void Application::RegisterUrlScheme() { - base::Platform::RegisterUrlScheme(base::Platform::UrlSchemeDescriptor{ -- .executable = cExeDir() + cExeName(), -+ .executable = qsl("kotatogram-desktop"), - .arguments = qsl("-workdir \"%1\"").arg(cWorkingDir()), - .protocol = qsl("tg"), - .protocolName = qsl("Telegram Link"), -diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -index 26168baa7..00d2525a0 100644 ---- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp -+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -@@ -303,19 +303,11 @@ bool GenerateDesktopFile( - - QFile target(targetFile); - if (target.open(QIODevice::WriteOnly)) { -- fileText = fileText.replace( -- QRegularExpression( -- qsl("^TryExec=.*$"), -- QRegularExpression::MultilineOption), -- qsl("TryExec=%1").arg( -- QString(cExeDir() + cExeName()).replace('\\', "\\\\"))); -- - fileText = fileText.replace( - QRegularExpression( - qsl("^Exec=kotatogram-desktop(.*)$"), - QRegularExpression::MultilineOption), -- qsl("Exec=%1 -workdir %2\\1").arg( -- EscapeShellInLauncher(cExeDir() + cExeName()), -+ qsl("Exec=kotatogram-desktop -workdir %1\\1").arg( - EscapeShellInLauncher(cWorkingDir()))); - - fileText = fileText.replace( diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index 694021d0f7fe..e2f3c4ba884e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , pkg-config , cmake , ninja @@ -9,10 +8,10 @@ , libjpeg , openssl , libopus -, ffmpeg_4 +, ffmpeg , protobuf , openh264 -, usrsctp +, crc32c , libvpx , libX11 , libXtst @@ -28,65 +27,23 @@ , mesa , libdrm , libGL -, Cocoa -, AppKit -, IOKit -, IOSurface -, Foundation -, AVFoundation -, CoreMedia -, VideoToolbox -, CoreGraphics -, CoreVideo -, OpenGL -, Metal -, MetalKit -, CoreFoundation -, ApplicationServices +, darwin }: -let - libsrtp = fetchFromGitHub { - owner = "cisco"; - repo = "libsrtp"; - - # https://github.com/desktop-app/tg_owt/commit/6894e86eef8809d42b66eb85e376006f2a816a56 - rev = "a566a9cfcd619e8327784aa7cff4a1276dc1e895"; - sha256 = "sha256-OvCw7oF1OuamP3qO2BsimeBSHq1rcXFLfK8KnbbgkMU="; - }; -in - stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2022-04-13"; + version = "0-unstable-2024-06-15"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "63a934db1ed212ebf8aaaa20f0010dd7b0d7b396"; - sha256 = "sha256-WddSsQ9KW1zYyYckzdUOvfFZArYAbyvXmABQNMtK6cM="; + rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; + sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; fetchSubmodules = true; }; - patches = [ - ./tg_owt.patch - - (fetchpatch { - url = "https://github.com/desktop-app/tg_owt/commit/0614aac699b1a53242ffe2664e3724533bf64f97.patch"; - hash = "sha256-iCdX518CB/RboDFhl3opnwcAgtqpNWZzYtV75Q+WB6Y="; - }) - - (fetchpatch { - url = "https://github.com/desktop-app/tg_owt/commit/9d120195334db4f232c925529aa7601656dc59d7.patch"; - hash = "sha256-k99OBCdE2eQVyXEyvreEqVtzC8Xfdolbgd1Z7lV2ceE="; - }) - ]; - - postPatch = '' - rm -r src/third_party/libsrtp - cp -r --no-preserve=mode ${libsrtp} src/third_party/libsrtp - '' + lib.optionalString stdenv.isLinux '' - substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \ + postPatch = lib.optionalString stdenv.isLinux '' + substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \ --replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \ @@ -101,10 +58,10 @@ stdenv.mkDerivation { libjpeg openssl libopus - ffmpeg_4 + ffmpeg protobuf openh264 - usrsctp + crc32c libvpx abseil-cpp ] ++ lib.optionals stdenv.isLinux [ @@ -121,7 +78,7 @@ stdenv.mkDerivation { mesa libdrm libGL - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa AppKit IOKit @@ -137,7 +94,7 @@ stdenv.mkDerivation { MetalKit CoreFoundation ApplicationServices - ]; + ]); enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch deleted file mode 100644 index be7d696fc84d..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/src/modules/include/module_common_types_public.h -+++ b/src/modules/include/module_common_types_public.h -@@ -11,6 +11,7 @@ - #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ - #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ - -+#include - #include - - #include "absl/types/optional.h" -diff --git a/src/common_video/h265/h265_pps_parser.h b/src/common_video/h265/h265_pps_parser.h -index 28c95ea9..790b0b73 100644 ---- a/src/common_video/h265/h265_pps_parser.h -+++ b/src/common_video/h265/h265_pps_parser.h -@@ -13,6 +13,8 @@ - - #include "absl/types/optional.h" - -+#include -+ - namespace rtc { - class BitBuffer; - } ---- a/src/rtc_base/third_party/base64/base64.h -+++ b/src/rtc_base/third_party/base64/base64.h -@@ -11,6 +11,7 @@ - #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ - #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ - -+#include - #include - #include - ---- a/src/modules/audio_processing/transient/file_utils.h -+++ b/src/modules/audio_processing/transient/file_utils.h -@@ -11,6 +11,7 @@ - #ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_ - #define MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_ - -+#include - #include - - #include "rtc_base/system/file_wrapper.h" diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix index 73c71d294c84..f41713389679 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk, makeWrapper }: +{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_6_0, makeWrapper }: stdenv.mkDerivation { pname = "${kotatogram-desktop.pname}-with-webkit"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { mkdir -p $out/bin makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \ --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_6_0 ]} ''; meta = kotatogram-desktop.meta // { platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 27617f930fae..26a9813441b7 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , callPackage , pkg-config , cmake @@ -60,18 +59,17 @@ let cxxStandard = "20"; }; }; - mainProgram = if stdenv.isLinux then "telegram-desktop" else "Telegram"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.1.8"; + version = "5.2.2"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-YTCvniC8THoz0BUM/gkr97rhbbSVQ+SCE1H3qS68lIM="; + hash = "sha256-rvd4Ei4MpWiilHCV291UrJkHaUcwth9AWc3PSqjj+EI="; }; patches = [ @@ -79,10 +77,7 @@ stdenv.mkDerivation rec { # the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling # and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary # see https://github.com/NixOS/nixpkgs/issues/218370 - (fetchpatch { - url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch"; - hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y="; - }) + ./scheme.patch ]; postPatch = lib.optionalString stdenv.isLinux '' @@ -179,6 +174,7 @@ stdenv.mkDerivation rec { IOSurface Metal NaturalLanguage + LocalAuthentication libicns ]); @@ -203,19 +199,19 @@ stdenv.mkDerivation rec { installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications - cp -r ${mainProgram}.app $out/Applications - ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin} + cp -r ${finalAttrs.meta.mainProgram}.app $out/Applications + ln -s $out/{Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS,bin} ''; postFixup = lib.optionalString stdenv.isLinux '' # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. - wrapProgram $out/bin/${mainProgram} \ + wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} '' + lib.optionalString stdenv.isDarwin '' - wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} + wrapQtApp $out/Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS/${finalAttrs.meta.mainProgram} ''; passthru = { @@ -234,6 +230,6 @@ stdenv.mkDerivation rec { homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ nickcao ]; - inherit mainProgram; + mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram"; }; -} +}) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch new file mode 100644 index 000000000000..58aaa8a7fcb5 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch @@ -0,0 +1,12 @@ +diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp +index e3e0de6c6..d5851bd6e 100644 +--- a/Telegram/SourceFiles/core/application.cpp ++++ b/Telegram/SourceFiles/core/application.cpp +@@ -421,7 +421,6 @@ void Application::run() { + + void Application::autoRegisterUrlScheme() { + if (!OptionSkipUrlSchemeRegister.value()) { +- InvokeQueued(this, [] { RegisterUrlScheme(); }); + } + } + diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 74f70b71c498..e9cb879169e1 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.1.0.35886"; - versions.x86_64-darwin = "6.1.0.35886"; - versions.x86_64-linux = "6.1.0.198"; + versions.aarch64-darwin = "6.1.1.36333"; + versions.x86_64-darwin = "6.1.1.36333"; + versions.x86_64-linux = "6.1.1.443"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-jAH/3r2AM8WAzfHE8CvKBrr53sM/9DH624C+EiJIdXs="; + hash = "sha256-CBBJAa7hnz0I2ctEn7DMdzeXEs4x+aEmEr+L42ddqXE="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-nKJPZQbyVG+P974hP4+4eAtupEQOf5Kl64Zp+jV/Ka0="; + hash = "sha256-CHtyL/BdyBVCQOGWjP0H/5GJiq67hPNQxELlvzzUuts="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-R4f0dnwqkODFeo8mPBecAI/AGQLwYkcNtJq6UVXCPfI="; + hash = "sha256-2FOAZ3MKusouuWvhxFEcqX+2e+PCF4N5zaz7mc9Mnq4="; }; }; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index b31ae22fd33b..a71595bad952 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.3.3"; + version = "4.3.4"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-VYfbbOoziVvaEBxGptCen8COD8p2/4rDsUTasysQXtg="; + hash = "sha256-ytRYAi9GmRILfXLgYrNGxNDng1nMl4X6LhaG/XS6f2c="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index 263d5e3342e8..9187e935ad7c 100644 --- a/pkgs/applications/networking/iroh/default.nix +++ b/pkgs/applications/networking/iroh/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.17.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-CemVlw0S4UmKFopWSh1Hv2znMRN3guIBx303esK/gLw="; + hash = "sha256-mTa+vdYSBcXTYlcDGJWktGVRC6NPBGcjb+syr/A1QIQ="; }; - cargoHash = "sha256-LgA6gdBRLsow98nv9A5rYb/v/FGzu/LPQwftyeuKHk4="; + cargoHash = "sha256-xTPx4P9SbOyC3YjZNxNFh65pSfiPjMKV+wgZtT00Me0="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index cc3273dcdca9..878ecbf4ee5d 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -1,5 +1,5 @@ { lib -, python3 +, python311 , fetchFromGitHub , file , gnupg @@ -9,7 +9,7 @@ , withManpage ? false }: -with python3.pkgs; buildPythonApplication rec { +with python311.pkgs; buildPythonApplication rec { pname = "alot"; version = "0.10"; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index e56697be4f99..a1e6177f7278 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, gnome, gmime3, webkitgtk, ronn +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, webkitgtk, ronn , libsass, notmuch, boost, wrapGAppsHook3, glib-networking, protobuf , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtkmm3 gmime3 webkitgtk libsass libpeas python3 - notmuch boost gsettings-desktop-schemas gnome.adwaita-icon-theme + notmuch boost gsettings-desktop-schemas adwaita-icon-theme glib-networking protobuf vim ]; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index aa38ee7cb8d3..5cd6608cbb6d 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.52.2"; + version = "3.52.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-qVUPG1PUdANt0jmWJ7MRjrO4QxhBztwO3yFFewlhkUE="; + hash = "sha256-H9Y4L9X9MAQ4Rc/F3Ew0/gErzINRK2AwFUJQvGGAaMA="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 0fe2e4796efc..dbebc978d209 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -23,6 +23,7 @@ , libical , db , sqlite +, adwaita-icon-theme , gnome , gnome-desktop , librsvg @@ -44,11 +45,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.52.2"; + version = "3.52.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-pIt0EtE+2sdPbAms+mdmVuahLt8AMM3cJgKawE2j5VE="; + hash = "sha256-HCL1O1VU4mCkjpF/PWaYNNJOTTrVoSTL4EKipKzkQcU="; }; nativeBuildInputs = [ @@ -62,7 +63,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme bogofilter db evolution-data-server diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix index 6b65211d0b4b..bae0bdb2fd45 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix @@ -1,8 +1,8 @@ -{ lib, makeWrapper, symlinkJoin, gnome, plugins }: +{ lib, makeWrapper, symlinkJoin, evolution-data-server, plugins }: symlinkJoin { name = "evolution-with-plugins"; - paths = [ gnome.evolution-data-server ] ++ plugins; + paths = [ evolution-data-server ] ++ plugins; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index e4da05046a9a..817860120b55 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu, fetchpatch2, config }: +{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu73, fetchpatch2, config }: rec { thunderbird = thunderbird-115; @@ -40,7 +40,7 @@ rec { pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" - icu = icu.overrideAttrs (attrs: { + icu73 = icu73.overrideAttrs (attrs: { # standardize vtzone output # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132 # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 3e09dbc9b878..bf0b709abdcf 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -5,11 +5,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "230.240603.0"; + version = "232.240626.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-pgRqlaUbEDEAd4frooSloeiNEX02VESPhqIzRIuQshI="; + hash = "sha256-LsLhsWrH+hRcx7hjx2GbtDMEf1oAygSwtsCxpmnZOfE="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 58e48e69fc4f..e1392d00f4ad 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-Me1hux+Y3EiT9vlP4+4019JPcDEW0d5byFO6YIfKbbw="; + hash = "sha256-UR5hUV7HTDaEbltQikgKfQypPXVee46PLP5bBEDFSsg="; }; - vendorHash = "sha256-BlZYXLvB05BTI2gMke8I2ob4jYSrixfpBUqKzNcHisI="; + vendorHash = "sha256-roEw8A7TFLoUR7BY4r53HNB1b7IbKwgg7x0e63UGpu8="; inherit subPackages; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 7e78fb5e6587..e43622914395 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.13.0"; + version = "3.13.2"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - hash = "sha256-i4vQGH9NSxIrLaPdCEh+WN6i6NQilH6uO4dSk/mhLi8="; + hash = "sha256-z4yxWClbs05ZCT8CPJpPY2BWMSXxfJ09Lq3Oottx7dQ="; }; patches = [ diff --git a/pkgs/applications/networking/novnc/default.nix b/pkgs/applications/networking/novnc/default.nix index c0fa9afdb243..5a8866e26be4 100644 --- a/pkgs/applications/networking/novnc/default.nix +++ b/pkgs/applications/networking/novnc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "novnc"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "novnc"; repo = "noVNC"; rev = "v${version}"; - sha256 = "sha256-G7Rtv7pQFR9UrzhYXDyBf+FRqtjo5NAXU7m/HeXhI1k="; + sha256 = "sha256-3Q87bYsC824/8A85Kxdqlm+InuuR/D/HjVrYTJZfE9Y="; }; patches = with python3.pkgs; [ diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index c08f6ae4b64b..795f6969ff48 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pyrosimple"; - version = "2.13.0"; + version = "2.14.0"; format = "pyproject"; src = fetchFromGitHub { owner = "kannibalox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-e69e1Aa10/pew1UZBCIPIH3BK7I8C3HiW59fRuSZlkc="; + hash = "sha256-lEtyt7i8MyL2VffxNFQkL9RkmGeo6Nof0AOQwf6BUSE="; }; pythonRelaxDeps = [ @@ -27,7 +27,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 741cca91543a..e4e44f79aea5 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -2,7 +2,7 @@ , fetchpatch , qmake, cmake, pkg-config, miniupnpc, bzip2 , speex, libmicrohttpd, libxml2, libxslt, sqlcipher, rapidjson, libXScrnSaver -, qtbase, qtx11extras, qtmultimedia, libgnome-keyring3 +, qtbase, qtx11extras, qtmultimedia, libgnome-keyring }: mkDerivation rec { @@ -33,7 +33,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake cmake ]; buildInputs = [ - speex miniupnpc qtmultimedia qtx11extras qtbase libgnome-keyring3 + speex miniupnpc qtmultimedia qtx11extras qtbase libgnome-keyring bzip2 libXScrnSaver libxml2 libxslt sqlcipher libmicrohttpd rapidjson ]; diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 2b27eef11c32..edb42aa79e9b 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.11.1"; + version = "3.12.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-PM162vj1Q336fM5z6KoBgtujz9UgESIxUW3Lw8AEYTw="; + hash = "sha256-3nEf9maHDd2LmRpgRqvFOub2DQNvjP3iEBRUlpvo8yg="; }; - vendorHash = "sha256-qi6ME74pJH/wgDh0xp/Rsc9hPd3v3L/M8pBQJzNieK8="; + vendorHash = "sha256-c8KNdENF0wRQ0Ssv6mgnZkY4BOcEoY7r80/hd7XJ5yo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/remote/freerdp/3.nix b/pkgs/applications/networking/remote/freerdp/3.nix index b25e090bf8b4..fed6b6b3052b 100644 --- a/pkgs/applications/networking/remote/freerdp/3.nix +++ b/pkgs/applications/networking/remote/freerdp/3.nix @@ -68,13 +68,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freerdp"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = finalAttrs.version; - hash = "sha256-8yWMnwJbvyUiEuX+2bEim1IeqPx20u9yvNIVe7MC/ZQ="; + hash = "sha256-wGfktzy8vrhTZE0ZG+gtsXsCmarXFs/yHcnZFeoFHGY="; }; postPatch = '' diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index d80850edd446..7096c6265b65 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -9,7 +9,7 @@ , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, harfbuzz , wayland # The themes here are soft dependencies; only icons are missing without them. -, gnome +, adwaita-icon-theme , withKf5Wallet ? stdenv.isLinux, libsForQt5 , withLibsecret ? stdenv.isLinux , withVte ? true @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { libsoup_3 spice-protocol spice-gtk libepoxy at-spi2-core - openssl gnome.adwaita-icon-theme json-glib libsodium + openssl adwaita-icon-theme json-glib libsodium harfbuzz python3 wayland ] ++ lib.optionals stdenv.isLinux [ fuse3 libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ] diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 5bf146995f12..796959139d48 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar thoughtpolice cwoac jwoudenberg ]; + maintainers = with maintainers; [ domenkozar thoughtpolice cwoac ]; mainProgram = "rslsync"; }; } diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 3913c98fea88..4110db3022eb 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.68"; + version = "3.69"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-ncA6YXa/focfmPMdEQWbeUxrLhwCqQiPqjP0SovLB2c="; + hash = "sha256-stbp4SqBXTZv5QXDwslsg/Y4lhkPGbwcslWZTR3c2v0="; }; - vendorHash = "sha256-YgrDzfcp1Lh8bOI1FF7bTBquaShhgE9nZ/+7mvFiQCc="; + vendorHash = "sha256-OfLC7a2+YM95F/anrwvhTw4mc72ogBZfLEPDUKMn9IE="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/sniffers/qtwirediff/default.nix b/pkgs/applications/networking/sniffers/qtwirediff/default.nix index 8ed53ec0771f..655626d07e26 100644 --- a/pkgs/applications/networking/sniffers/qtwirediff/default.nix +++ b/pkgs/applications/networking/sniffers/qtwirediff/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation { mainProgram = "qtwirediff"; homepage = "https://github.com/aaptel/qtwirediff"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 2c2c47e92efb..f1661582549e 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EbB5Ok/8RUoNzkgoWIhHTRvlq9Vv2KVx6Hu8ejrLkMc="; + sha256 = "sha256-nvuT//FWJAa6DzmjBsBW9s2p1M+6Zs4cVmpK4dVemnE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/applications/networking/sync/celeste/default.nix index 7eef4f451005..fe2d7b07acc8 100644 --- a/pkgs/applications/networking/sync/celeste/default.nix +++ b/pkgs/applications/networking/sync/celeste/default.nix @@ -2,7 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub -, substituteAll +, darwin , just , pkg-config , wrapGAppsHook4 @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "celeste"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "hwittenborn"; repo = "celeste"; rev = "v${version}"; - hash = "sha256-fJK3UTa5NS+dSsjnqZtRN3HmHQ1bYU2jepkJ5tchYD4="; + hash = "sha256-Yj2PvAlAkwLaSE27KnzEmiRAD5K/YVGbF4+N3uhDVT8="; }; - cargoHash = "sha256-/0w52bh9CsBoMTJsnWuEAQNgQzf92mbzh53H4iQYswc="; + cargoHash = "sha256-nlYkFgm5r6nAbJvtrXW2VxzVYq1GrSs8bzHYWOglL1c="; postPatch = '' pushd $cargoDepsCopy/librclone-sys @@ -66,8 +66,15 @@ rustPlatform.buildRustPackage rec { libadwaita librclone pango + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.Security ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + "-Wno-error=incompatible-function-pointer-types" + ]); + preFixup = '' gappsWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ rclone ]}" diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index b816da9e4b5c..956dd598d4c3 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -46,6 +46,6 @@ buildPythonApplication rec { description = "Free software that synchronises media players"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ assistant Enzime ]; + maintainers = with maintainers; [ assistant ]; }; } diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix index d6f2f2ef0447..e6a474abd72d 100644 --- a/pkgs/applications/networking/trayscale/default.nix +++ b/pkgs/applications/networking/trayscale/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.12.4"; + version = "0.12.6"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-quy1maeC1ebVzMvN+JzKf8AmMbipju9vvdTU03SyNnc="; + hash = "sha256-4zjT5GrGOYaKD61EWG7gxAMwf2ZQivWlzaKH0h4jLGU="; }; - vendorHash = "sha256-lGjJLqEGBFd2aYm82xrDfLK90Mcrhb7bMtXSNZpp/bM="; + vendorHash = "sha256-h5FdXlDvvorP9iOsKXxc6q3HwyB44faZGvw/Ew3LkkQ="; subPackages = [ "cmd/trayscale" ]; @@ -46,11 +46,11 @@ buildGoModule rec { ''; meta = with lib; { - changelog = "https://github.com/DeedleFake/trayscale/releases/tag/${version}"; + changelog = "https://github.com/DeedleFake/trayscale/releases/tag/${src.rev}"; description = "Unofficial GUI wrapper around the Tailscale CLI client"; homepage = "https://github.com/DeedleFake/trayscale"; license = licenses.mit; - maintainers = with maintainers; [ patka ]; + maintainers = with maintainers; [ ]; mainProgram = "trayscale"; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix index b5d181dc73a4..5d25215aee6b 100644 --- a/pkgs/applications/networking/xpipe/default.nix +++ b/pkgs/applications/networking/xpipe/default.nix @@ -33,14 +33,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-nZg0Ha457zrBgYpKIHgGkDxTVQSRthQCCxtT2xWtAlQ="; + x86_64-linux = "sha256-u5vVM8qLm9m6VMmCV2Q3VrsqorIyOPrFCPXNh1s5mgY="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "9.4.1"; + version = "10.0.4"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/applications/networking/zerobin/default.nix b/pkgs/applications/networking/zerobin/default.nix index e75f121d5fee..62201ba6ca08 100644 --- a/pkgs/applications/networking/zerobin/default.nix +++ b/pkgs/applications/networking/zerobin/default.nix @@ -1,7 +1,7 @@ { lib , python3Packages , fetchFromGitHub -, nodePackages +, uglify-js }: python3Packages.buildPythonApplication rec { @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.doit python3Packages.pyscss - nodePackages.uglify-js + uglify-js ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 667533871993..60fdf00a2b3e 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, pkg-config +{ lib, stdenv, fetchurl, fetchpatch2, openssl, pkg-config , withPerl ? false, perl , withPython ? false, python3 , withTcl ? false, tcl @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "03fyi0j44zcanj1rsdx93hkdskwfvhbywjiwd17f9q1a7yp8l8zz"; }; + patches = [ + (fetchpatch2 { + name = "CVE-2024-39844.patch"; + url = "https://github.com/znc/znc/commit/8cbf8d628174ddf23da680f3f117dc54da0eb06e.patch"; + hash = "sha256-JeKirXReiCiNDUS9XodI0oHASg2mPDvQYtV6P4L0mHM="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 62315b6c2ae5..e9b543a4e300 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.6.1"; + version = "0.6.2"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-a8oupvBtT3sKhboSeS/GbVSauKXx54J4WZd+PyIbuzU="; + hash = "sha256-vwhFFSdKlt2Ddikhdr3uyILjTVdgCjMtAW9HeLmT5qU="; stripRoot = false; }; diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix index d05c83cb1999..91700299400a 100644 --- a/pkgs/applications/office/autokey/default.nix +++ b/pkgs/applications/office/autokey/default.nix @@ -6,7 +6,7 @@ , gtksourceview3 , libappindicator-gtk3 , libnotify -, gnome +, zenity , wmctrl }: @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { ]; runtimeDeps = [ - gnome.zenity + zenity wmctrl ]; diff --git a/pkgs/applications/office/endeavour/default.nix b/pkgs/applications/office/endeavour/default.nix index 851eab538818..806e02498577 100644 --- a/pkgs/applications/office/endeavour/default.nix +++ b/pkgs/applications/office/endeavour/default.nix @@ -6,7 +6,7 @@ , pkg-config , wrapGAppsHook4 , gettext -, gnome +, adwaita-icon-theme , glib , gtk4 , wayland @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libpeas gnome-online-accounts gsettings-desktop-schemas - gnome.adwaita-icon-theme + adwaita-icon-theme # Plug-ins evolution-data-server-gtk4 # eds diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index d9b376a1962e..74c9e571375f 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, intltool, perlPackages -, goffice, gnome, wrapGAppsHook3, gtk3, bison, python3Packages +, goffice, gnome, adwaita-icon-theme, wrapGAppsHook3, gtk3, bison, python3Packages , itstool }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { # ToDo: optional libgda, introspection? buildInputs = [ - goffice gtk3 gnome.adwaita-icon-theme + goffice gtk3 adwaita-icon-theme python pygobject3 ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 846b4180625a..911ed9715320 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -7,7 +7,7 @@ , intltool , wrapGAppsHook3 , libsoup -, gnome +, adwaita-icon-theme }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libgsf libofx libsoup - gnome.adwaita-icon-theme + adwaita-icon-theme ]; meta = with lib; { diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 000942ff68bd..5c21eeb72140 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook3 -, libsoup_3, gnome }: +, libsoup_3, adwaita-icon-theme }: stdenv.mkDerivation rec { pname = "homebank"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; - buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme]; + buildInputs = [ gtk libofx libsoup_3 adwaita-icon-theme]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index c81d08d31d98..9043d575fa06 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation { cp -R . $out/Applications/${appName} cat > $out/bin/${scriptName} << EOF #!${stdenvNoCC.shell} - open -na $out/Applications/${appName} --args "$@" + open -na $out/Applications/${appName} --args "\$@" EOF chmod +x $out/bin/${scriptName} runHook postInstall diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index d679b168e24f..b48bd3347ead 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,8 +1,9 @@ { stdenv , fetchurl +, fetchpatch2 , lib , pam -, python3 +, python311 , libxslt , perl , perlPackages @@ -86,7 +87,7 @@ , glm , gst_all_1 , gdb -, gnome +, adwaita-icon-theme , glib , ncurses , libepoxy @@ -244,6 +245,11 @@ in stdenv.mkDerivation (finalAttrs: { # - the remaining tests have notes in the patch # FIXME: get rid of this ASAP ./skip-broken-tests.patch + (fetchpatch2 { + name = "icu74-compat.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch"; + hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y="; + }) ] ++ lib.optionals (variant == "still") [ # Remove build config to reduce the amount of `-dev` outputs in the # runtime closure. This behavior was introduced by upstream in commit @@ -268,6 +274,9 @@ in stdenv.mkDerivation (finalAttrs: { substituteInPlace configure.ac --replace-fail \ 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \ 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' + + # Fix for Python 3.12 + substituteInPlace configure.ac --replace-fail distutils.sysconfig sysconfig ''; nativeBuildInputs = [ @@ -311,7 +320,7 @@ in stdenv.mkDerivation (finalAttrs: { gettext glib glm - gnome.adwaita-icon-theme + adwaita-icon-theme gperf gpgme graphite2 @@ -372,7 +381,7 @@ in stdenv.mkDerivation (finalAttrs: { perl poppler postgresql - python3 + python311 sane-backends unixODBC unzip diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index a639c97b9677..089e7ca057e5 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -7,13 +7,13 @@ let pname = "mendeley"; - version = "2.117.0"; + version = "2.118.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-1Gwgb0oUtIjZX0f/HJmA5ihwurq9RlpMMLrTaDav0SM="; + hash = "sha256-JzA6JmjxqZC2K51NozlYeTmZkzT5OTRF3WVGY4Wrfgo="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 433b8855a9a2..9ad86d99c4b7 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.5"; + version = "3.5.1"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-5oBIw9PVbEGF1e47GeYNF6gJFm5z3M9KeJ1711cAg2s="; + hash = "sha256-YvgVCviqAuGlT61ANktztzqRYBtROsVrScGMxY6IeEs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 2393ac0ece55..c9b9efeba890 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -2,7 +2,7 @@ , python3Packages , gtk3 , cairo -, gnome +, adwaita-icon-theme , librsvg , xvfb-run , dbus @@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec { ln -s $i $site/icon/out; done - export XDG_DATA_DIRS=$XDG_DATA_DIRS:${gnome.adwaita-icon-theme}/share + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${adwaita-icon-theme}/share # build the user manual PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_docs} make data for i in src/paperwork_gtk/model/help/out/*.pdf; do @@ -89,7 +89,7 @@ python3Packages.buildPythonApplication rec { ] ++ documentation_deps; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme libnotify librsvg gtk3 diff --git a/pkgs/applications/office/pdfmm/default.nix b/pkgs/applications/office/pdfmm/default.nix index 5be76fa51685..9f4f17f893c9 100644 --- a/pkgs/applications/office/pdfmm/default.nix +++ b/pkgs/applications/office/pdfmm/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , ghostscript , locale -, gnome +, zenity , gnused , lib , resholve @@ -35,7 +35,7 @@ resholve.mkDerivation rec { coreutils ghostscript locale - gnome.zenity + zenity gnused ]; fake = { @@ -43,7 +43,7 @@ resholve.mkDerivation rec { external = [ "xmessage" ]; }; execer = [ - "cannot:${gnome.zenity}/bin/zenity" + "cannot:${zenity}/bin/zenity" ]; keep."$toutLu" = true; }; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 53563d72d658..8003317fc2fb 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -21,14 +21,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.6.3"; + version = "24.7.0"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-UdWyS5DalnGDoNEOx8d9MglKpJeqOXY1mTgLl3r/9gY="; + hash = "sha256-yDWm6d3kZwBEo0i7CSni4EOA4H+lAuYSzmANi/q7HxU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/ticktick/default.nix b/pkgs/applications/office/ticktick/default.nix index 2510d42b9a82..4ea53cde2ed0 100644 --- a/pkgs/applications/office/ticktick/default.nix +++ b/pkgs/applications/office/ticktick/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ticktick"; - version = "2.0.20"; + version = "2.0.30"; src = fetchurl { url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/${finalAttrs.pname}-${finalAttrs.version}-amd64.deb"; - hash = "sha256-5w50QMSMmkpuhSOqv3LjrcQQDwaD7pIdKUo+8YUgvpk="; + hash = "sha256-oo1ssIU6nYMBoEc888xAiTS7PHuEkoaC7KsPRTwL0ZA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 2b9f66dd661c..3667414e9296 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2024-06-23"; + version = "0-unstable-2024-06-29"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "91dea2ba714e9b1fb6ab660ddd295653218bdebc"; - hash = "sha256-pn+Ki60lBL+2sKXnhYEly8/Yi94mhiMDxTnWZi4ZFOk="; + rev = "0d3eff693f23929e8b53317b08df9da2d610994f"; + hash = "sha256-c5HMxFxDD439kKguW8Mwkjmnavh2MSSiODTgrnZcbjo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 27d50caedde0..d2db214a4ef8 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -7,7 +7,7 @@ , atk , gtk3 , gtkspell3 -, gnome +, adwaita-icon-theme , glib , goocanvas2 , gdk-pixbuf @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec { atk gdk-pixbuf glib - gnome.adwaita-icon-theme + adwaita-icon-theme goocanvas2 fontconfig freetype diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 98d83f53f2d3..0f4017dbbc07 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook3, gnome }: +{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook3, adwaita-icon-theme }: # TODO: Declare configuration options for the following optional dependencies: # - File stores: hg, git, bzr @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-QIkNsFsWeNHEcXhGHHZyJDMMW2lNvdwMJLGxeCZaLdI="; }; - buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { preFixup = '' makeWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share) - makeWrapperArgs+=(--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share) + makeWrapperArgs+=(--prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share) makeWrapperArgs+=(--argv0 $out/bin/.zim-wrapped) makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index b31ce7f8c2de..78a335a1b907 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -30,7 +30,7 @@ , libXrender , libXt , libnotify -, gnome +, adwaita-icon-theme , libGLU , libGL , nspr @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = - [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; + [ gsettings-desktop-schemas glib gtk3 adwaita-icon-theme dconf ]; dontConfigure = true; dontBuild = true; diff --git a/pkgs/applications/radio/anytone-emu/default.nix b/pkgs/applications/radio/anytone-emu/default.nix index eee3375294db..337038fd32c2 100644 --- a/pkgs/applications/radio/anytone-emu/default.nix +++ b/pkgs/applications/radio/anytone-emu/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { description = "Tiny emulator for AnyTone radios"; homepage = "https://github.com/hmatuschek/anytone-emu"; license = licenses.gpl3Only; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "anytone-emu"; }; diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index 9c131e34bc25..00aa166d41b0 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.6.14"; + version = "2.6.15"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-nsn/pvlFRDGUnm/X5pyzlKWgP6OlfVn3Mdj6vOJZMWQ="; + hash = "sha256-G+PnzyOG/HZ8I66BHdtK0GOUF7ATrTYpzM9sVaSjMDQ="; }; postPatch = '' diff --git a/pkgs/applications/radio/flex-ncat/default.nix b/pkgs/applications/radio/flex-ncat/default.nix index 96912b95d183..61663376a02d 100644 --- a/pkgs/applications/radio/flex-ncat/default.nix +++ b/pkgs/applications/radio/flex-ncat/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flex-ncat"; - version = "0.4-20231210.1"; + version = "0.4-20240702"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nCAT"; rev = "v${version}"; - hash = "sha256-oC7TPq+Xsl960B7qJP81cWF+GGc28Miv4L8+1vWo7jA="; + hash = "sha256-ggSQnQfUzceucF2ZtNx6cHy4DW+gu91AdEHrvFciARE="; }; vendorHash = "sha256-1i9v8Ej7TMIO+aMYFPFxdfD4b5j84/zkegaYb67WokU="; diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix index ed3fa1715f75..6217a169ef25 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/applications/radio/qdmr/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { description = "GUI application and command line tool for programming DMR radios"; homepage = "https://dm3mat.darc.de/qdmr/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ janik _0x4A6F ]; + maintainers = with lib.maintainers; [ _0x4A6F ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index 7ec6756f20aa..da8f44a7d32f 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-YbjtN08zEj8rlRDC5tS/JsBOH70DV98wmL6pFQTehgg="; + hash = "sha256-OXE+8e8Wr2EETEfdDaI/fb+SSsRhippqPzTXTlwLP4c="; fetchSubmodules = true; }; diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 4f68ea70b345..864fce4d1eeb 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.21.3"; + version = "7.21.4"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-TeQteQ+RAnG1J0m4BEYJCrALkfplz3gO5IBi0GxTWmI="; + hash = "sha256-GINgI4u87Ns4/5aUWpeJaokb+3Liwjjibr02NGcF10c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 8b40196fdbff..3347fa5356b5 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, freeglut, gtk2, gtkglext +{ lib, stdenv, fetchFromGitHub, pkg-config, libglut, gtk2, gtkglext , libjpeg_turbo, libtheora, libXmu, lua, libGLU, libGL, perl, autoreconfHook }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ - freeglut gtk2 gtkglext lua perl + libglut gtk2 gtkglext lua perl libjpeg_turbo libtheora libXmu libGLU libGL ]; diff --git a/pkgs/applications/science/biology/gatk/default.nix b/pkgs/applications/science/biology/gatk/default.nix index 41623bf640dd..50dc0613c743 100644 --- a/pkgs/applications/science/biology/gatk/default.nix +++ b/pkgs/applications/science/biology/gatk/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gatk"; - version = "4.5.0.0"; + version = "4.6.0.0"; src = fetchzip { url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; - sha256 = "sha256-c3YZsSCjZY75jooiqtc8x/xsWTvYm9labUcOydDlSRQ="; + sha256 = "sha256-AwGRkgVbG2gA4K1JG0WPr4v18JHG5YzYUKdJ2EJZX+Y="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/iqtree/default.nix b/pkgs/applications/science/biology/iqtree/default.nix index 4dfbaa25b36a..60827b8e3a68 100644 --- a/pkgs/applications/science/biology/iqtree/default.nix +++ b/pkgs/applications/science/biology/iqtree/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "iqtree"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "iqtree"; repo = "iqtree2"; rev = "v${version}"; - hash = "sha256-dnUFllqcABB3JDYoCwPGtIYD/h5lzX2XKOroDpijPpU="; + hash = "sha256-ld+9vPJRVHMEe5/igqRr6RkISY2ipfGkJFHDOSZuAmg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/biology/jbrowse/default.nix b/pkgs/applications/science/biology/jbrowse/default.nix index 3a7e009cc156..90d71df72147 100644 --- a/pkgs/applications/science/biology/jbrowse/default.nix +++ b/pkgs/applications/science/biology/jbrowse/default.nix @@ -2,11 +2,11 @@ let pname = "jbrowse"; - version = "2.12.2"; + version = "2.12.3"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-dnvs+niNo8VPuOk9uODezLxdghwutLuhgG5Jyxi8mW0="; + sha256 = "sha256-REJYJzjPPsRebRKdNKGIbRICe4tw7V8PxO/q53DXo3Y="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/science/biology/macs2/default.nix b/pkgs/applications/science/biology/macs2/default.nix index 26ec138048f7..153f85535f94 100644 --- a/pkgs/applications/science/biology/macs2/default.nix +++ b/pkgs/applications/science/biology/macs2/default.nix @@ -1,9 +1,11 @@ -{ lib, python3, fetchpatch, fetchPypi }: +{ lib, python311, fetchpatch, fetchPypi }: -python3.pkgs.buildPythonPackage rec { +# pin python311 because macs2 does not support python 3.12 +# https://github.com/macs3-project/MACS/issues/598#issuecomment-1812622572 +python311.pkgs.buildPythonPackage rec { pname = "macs2"; version = "2.2.9.1"; - format = "pyproject"; + pyproject = true; src = fetchPypi { pname = lib.toUpper pname; @@ -20,20 +22,19 @@ python3.pkgs.buildPythonPackage rec { }) ]; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python311.pkgs; [ cython_0 numpy setuptools - wheel ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python311.pkgs; [ numpy ]; __darwinAllowLocalNetworking = true; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python311.pkgs; [ unittestCheckHook ]; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 880ea77e9d24..e8786fe4b9c0 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-FcefUf0KwAEEn53XubrB2991ncsCMKicf20fJG6LurQ="; + sha256 = "sha256-4lj6Lj9fphzWeZ7I4HP0mpX73OrxY9imCXGyYZuG+kE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/trimal/default.nix b/pkgs/applications/science/biology/trimal/default.nix index b2ef121caa9a..f822fe50b164 100644 --- a/pkgs/applications/science/biology/trimal/default.nix +++ b/pkgs/applications/science/biology/trimal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trimal"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { repo = pname; owner = "scapella"; rev = "v${version}"; - sha256 = "0isc7s3514di4z953xq53ncjkbi650sh4q9yyw5aag1n9hqnh7k0"; + sha256 = "sha256-6GXirih7nY0eD2XS8aplLcYf53EeLuae+ewdUgBiKQQ="; }; postUnpack = '' diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 1cec011fae33..4dd8fa743121 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -7,7 +7,7 @@ , callPackage , callPackages -, gnome +, adwaita-icon-theme , dconf , gtk3 , wxGTK32 @@ -197,7 +197,7 @@ stdenv.mkDerivation rec { makeWrapperArgs = with passthru.libraries; [ "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" - "--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share" + "--prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}" "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" # wrapGAppsHook3 did these two as well, no idea if it matters... diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 0be742f76e3c..28b1b91ae1a2 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.483"; + version = "8.3.486"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-JyawlH/zUTJ7fGf63zHvZ3q8AYRwFELwh+63RN9IkBA="; + sha256 = "sha256-RLAA97roY41imjxehEFzF+peLmrS+rTQkVua+8dxKDY="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/applications/science/electronics/systemc/default.nix b/pkgs/applications/science/electronics/systemc/default.nix index 8e47ef960656..089ccd85c033 100644 --- a/pkgs/applications/science/electronics/systemc/default.nix +++ b/pkgs/applications/science/electronics/systemc/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://systemc.org/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ victormignot amiloradovsky ]; + maintainers = with maintainers; [ amiloradovsky ]; }; } diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/applications/science/geometry/antiprism/default.nix index 62ffc099dc6c..9d4c6fc6a409 100644 --- a/pkgs/applications/science/geometry/antiprism/default.nix +++ b/pkgs/applications/science/geometry/antiprism/default.nix @@ -4,7 +4,7 @@ , libX11 , libGL , libGLU -, freeglut }: +, libglut }: stdenv.mkDerivation rec { pname = "antiprism"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libX11 libGLU libGL.dev freeglut.dev ]; + buildInputs = [ libX11 libGLU libGL libglut ]; meta = with lib; { homepage = "https://www.antiprism.com"; diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index 12b01dea1a3d..6d49ef0ab3f6 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cadical"; - version = "1.9.5"; + version = "2.0.0"; src = fetchFromGitHub { owner = "arminbiere"; repo = "cadical"; rev = "rel-${version}"; - sha256 = "sha256-mAKuz8WjX+ywQ7Sw5hRMPftsbbilTlmQ9qZVowXxs28="; + sha256 = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 0a81b2a09ef1..c980e84f9d9f 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-mPRkkKN7Hz9Qi6a3fEwVFh7a9OaBFcksNw9qwNOarao="; + sha256 = "sha256-7syRpCNL7TRZoJaNrmAdahNy7IyovyniYyOwD/lzhuw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 8f0f88461e65..d07ebd90ec7d 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -11,7 +11,7 @@ , ocamlPackages_4_14 , ncurses , buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14 -, glib, gnome, wrapGAppsHook3, makeDesktopItem, copyDesktopItems +, glib, adwaita-icon-theme, wrapGAppsHook3, makeDesktopItem, copyDesktopItems , csdp ? null , version, coq-version ? null }@args: @@ -154,7 +154,7 @@ self = stdenv.mkDerivation { buildInputs = [ ncurses ] ++ optionals buildIde (if coqAtLeast "8.10" - then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ] + then [ ocamlPackages.lablgtk3-sourceview3 glib adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) ; diff --git a/pkgs/applications/science/logic/dafny/default.nix b/pkgs/applications/science/logic/dafny/default.nix index f85e6cf22879..93ae5c92b32f 100644 --- a/pkgs/applications/science/logic/dafny/default.nix +++ b/pkgs/applications/science/logic/dafny/default.nix @@ -8,32 +8,37 @@ buildDotnetModule rec { pname = "Dafny"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; rev = "v${version}"; - hash = "sha256-3t0drxM7PZzrLbxBKYa6Gja2u6GK6Pc+ejoswag3P3k="; + hash = "sha256-XoSk08TVv17YyuTsRJ25e6bwSwKIF2+HjF5nFaul8+M="; }; - postPatch = '' - cp ${ - writeScript "fake-gradlew-for-dafny" '' - mkdir -p build/libs/ - javac $(find -name "*.java" | grep "^./src/main") -d classes - jar cf build/libs/DafnyRuntime-${version}.jar -C classes dafny - ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew + postPatch = + let + # This file wasn't updated between 4.6.0 and 4.7.0. + runtimeJarVersion = "4.6.0"; + in + '' + cp ${ + writeScript "fake-gradlew-for-dafny" '' + mkdir -p build/libs/ + javac $(find -name "*.java" | grep "^./src/main") -d classes + jar cf build/libs/DafnyRuntime-${runtimeJarVersion}.jar -C classes dafny + ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew - # Needed to fix - # "error NETSDK1129: The 'Publish' target is not supported without - # specifying a target framework. The current project targets multiple - # frameworks, you must specify the framework for the published - # application." - substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \ - --replace TargetFrameworks TargetFramework \ - --replace "netstandard2.0;net452" net6.0 - ''; + # Needed to fix + # "error NETSDK1129: The 'Publish' target is not supported without + # specifying a target framework. The current project targets multiple + # frameworks, you must specify the framework for the published + # application." + substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \ + --replace-warn TargetFrameworks TargetFramework \ + --replace-warn "netstandard2.0;net452" net6.0 + ''; buildInputs = [ jdk11 ]; nugetDeps = ./deps.nix; diff --git a/pkgs/applications/science/logic/dafny/deps.nix b/pkgs/applications/science/logic/dafny/deps.nix index 91fe5624ac7f..0c96fca4ec53 100644 --- a/pkgs/applications/science/logic/dafny/deps.nix +++ b/pkgs/applications/science/logic/dafny/deps.nix @@ -3,18 +3,19 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Boogie"; version = "3.1.3"; sha256 = "0xzc7s0rjb8dhdkdf71g6pdsnyhbl534xpwd8gbx6g16a87iqx6i"; }) - (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "3.1.3"; sha256 = "0a7v2jkkbh59pyc5nz4avszm3dbmp4amkmr6lvn0gyc3hxgn8d3k"; }) - (fetchNuGet { pname = "Boogie.BaseTypes"; version = "3.1.3"; sha256 = "1h94yl4ymhd2g14i5w8lnnh2zw7gx65qydzvv8cm8d5yn64gch63"; }) - (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "3.1.3"; sha256 = "0b1h1lz997lgyq34bx3ngnhgcrw8j4qvsa6iygb6bydxz7rirrf4"; }) - (fetchNuGet { pname = "Boogie.Concurrency"; version = "3.1.3"; sha256 = "1aq0gdz1xkmp82c67vrmyvkncfbbj5zxrsg78lsmmi22h9qbkzm3"; }) - (fetchNuGet { pname = "Boogie.Core"; version = "3.1.3"; sha256 = "0yhl272lv9lncjval2z7zl9wavlxx8bivj467zl2zzbrxw2k5wz8"; }) - (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "3.1.3"; sha256 = "0p0zp329h6mddbswm3pdcyvy03y69vyznv11ph6bkpya21lsxqy7"; }) - (fetchNuGet { pname = "Boogie.Graph"; version = "3.1.3"; sha256 = "1p8vb4x4iy7f0ycwb8f71j9a2ci8irwg3rvad2hg3rgbihbwp1qj"; }) - (fetchNuGet { pname = "Boogie.Houdini"; version = "3.1.3"; sha256 = "06qlgi9f70r2w7w6h9qw3lx9dd4pbddpdplqjxi090rpry6dhrbz"; }) - (fetchNuGet { pname = "Boogie.Model"; version = "3.1.3"; sha256 = "0fbvnrghaq17fdpjx12axxrrjp1mh99skaznmvxd1ylsqqnn4cbk"; }) - (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "3.1.3"; sha256 = "0x7gpc7m04in2gzdn4jgjphd2xjqrdfmh84wzwnwpvi5wyn869jc"; }) - (fetchNuGet { pname = "Boogie.VCExpr"; version = "3.1.3"; sha256 = "0dyndhqz1yf9qnq9mw73g53rnz0xfbdbi3yk6pg7fdm1m3363h5p"; }) - (fetchNuGet { pname = "Boogie.VCGeneration"; version = "3.1.3"; sha256 = "1bl83727zc1rhskx548p5pa27804n3f5i9n233jvcz6n6bfjn74k"; }) + (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "3.1.6"; sha256 = "1c6z13dz0sbkmk4ay64aihy7s7xlfdvhpcknxhw1m1b0yly5qj6b"; }) + (fetchNuGet { pname = "Boogie.BaseTypes"; version = "3.1.6"; sha256 = "1hxcpc45f32g3jpaw7mg6k9qsppcb3p20wxv4d4dc3nz0r52lrmr"; }) + (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "3.1.6"; sha256 = "1qk7w7c40fpkvvarbgi1bkdcxpn12r0lqngpwwjw8i7nk84ni5gl"; }) + (fetchNuGet { pname = "Boogie.Concurrency"; version = "3.1.6"; sha256 = "11981gfa0n4s214yilnxqhh1clr4l78iqlws6gv01z1n6rxgbyla"; }) + (fetchNuGet { pname = "Boogie.Core"; version = "3.1.6"; sha256 = "0sgj6i1hvp90g2zfqs1aly500xnv3fq9d4cfgii5kpza8vgm7w4g"; }) + (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "3.1.6"; sha256 = "08vxxwcnkykcngihkp0bvfwkgwxb3nnqjp5f1vz4bnw708xs0ydg"; }) + (fetchNuGet { pname = "Boogie.Graph"; version = "3.1.6"; sha256 = "0fzj65pnky8i83jj2h9nszij25a46z68fy2sm3pxwlg678nmx2jz"; }) + (fetchNuGet { pname = "Boogie.Houdini"; version = "3.1.6"; sha256 = "0lfljb9brnr79hp1f0ff6fcy51ml66pjj102jk4pqpmsjwvcjx43"; }) + (fetchNuGet { pname = "Boogie.Model"; version = "3.1.6"; sha256 = "0546b27mxv97v7qilb1carbwip0q7sz9zz7sxizpww6yc3j8w8if"; }) + (fetchNuGet { pname = "Boogie.Provers.LeanAuto"; version = "3.1.6"; sha256 = "1x1f35g0kxzhxvw4icmbvkik16py47j6h04gj0ckwbny9qmglaby"; }) + (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "3.1.6"; sha256 = "0mqlpwfxgv9dd773254rrbgbjb5mpa3xkvlq32ml752h36j8m2r9"; }) + (fetchNuGet { pname = "Boogie.VCExpr"; version = "3.1.6"; sha256 = "0p7axpjn4qg191bs7b33zf9l336bdznvxp3305z2ssnkakjx247h"; }) + (fetchNuGet { pname = "Boogie.VCGeneration"; version = "3.1.6"; sha256 = "05z2lr92hbllikv65gh7m3i879fnn6pjn2acf133sijx9b1jixdb"; }) (fetchNuGet { pname = "CocoR"; version = "2014.12.24"; sha256 = "0ps8h7aawkcc1910qnh13llzb01pvgsjmg862pxp0p4wca2dn7a2"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.1.0"; sha256 = "07pnhxxlgx8spmwmakz37nmbvgyb6yjrbrhad5rrn6y767z5r1gb"; }) (fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; }) diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index 2ec05098f407..2c63edc1e7d4 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${finalAttrs.version}"; - hash = "sha256-R75RrAQb/tRTtMvy/ddLl1KQaA7V71nocvjIS9geMrg="; + hash = "sha256-wi7outnKpz60to6Z7MSGAKK6COxmpJo6iu6Re86jqlo="; }; postPatch = '' diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/applications/science/logic/surelog/default.nix index 7b4c85fe9b21..6bca5acb796f 100644 --- a/pkgs/applications/science/logic/surelog/default.nix +++ b/pkgs/applications/science/logic/surelog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "surelog"; - version = "1.82"; + version = "1.83"; src = fetchFromGitHub { owner = "chipsalliance"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-iW2mQPmKfbAWaiEURyVly5IjJ3YpXjVBkm/UbUuwb6k="; + hash = "sha256-V4LmW4ca6KfugOu0XnGwutRqWR/9K6ESokHOB2yAVag="; fetchSubmodules = false; # we use all dependencies from nix }; diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix index 182f6eb81eeb..50850d4dbf82 100644 --- a/pkgs/applications/science/logic/uhdm/default.nix +++ b/pkgs/applications/science/logic/uhdm/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "UHDM"; # When updating this package, also consider updating science/logic/surelog - version = "1.82"; + version = "1.83"; src = fetchFromGitHub { owner = "chipsalliance"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-sl83l6nLN/bluED5bnFShviD1Vv8hmRazxIcLUg/ego="; + hash = "sha256-va8qAzsg589C6rLmG1uIMDr4X30qpBgRO1ZVKdEs5ok="; fetchSubmodules = false; # we use all dependencies from nix }; diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index cc512acad793..ba95bc2239ab 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.4.2"; + version = "3.5.0"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "sha256-+O6fl/+D89L5xrrTaAnBTfw0tFz/CoKLaBa+OHtdnaA="; + sha256 = "sha256-ZOmc83OZVHIt/Sq6KQWuG4/xyeaETL8qJmmSjGcqL60="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index de80cd725653..f29a5e1f3f51 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -2,20 +2,15 @@ stdenv.mkDerivation rec { pname = "yices"; - # We never want X.Y.${odd} versions as they are moving development tags. - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "yices2"; rev = "Yices-${version}"; - sha256 = "sha256-qdxh86CkKdm65oHcRgaafTG9GUOoIgTDjeWmRofIpNE="; + hash = "sha256-/sKyHkFW5I5kojNIRPEKojzTvfRZiyVIN5VlBIbAV7k="; }; - patches = [ - # musl has no ldconfig, create symlinks explicitly - ./linux-no-ldconfig.patch - ]; postPatch = "patchShebangs tests/regress/check.sh"; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/science/logic/yices/linux-no-ldconfig.patch b/pkgs/applications/science/logic/yices/linux-no-ldconfig.patch deleted file mode 100644 index bad3da6ad4a2..000000000000 --- a/pkgs/applications/science/logic/yices/linux-no-ldconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile.build -+++ b/Makefile.build -@@ -474,8 +474,9 @@ install-darwin: install-default - install-solaris: install-default - $(LDCONFIG) -n $(DESTDIR)$(libdir) && (cd $(DESTDIR)$(libdir) && $(LN_S) -f libyices.so.$(YICES_VERSION) libyices.so) - -+# avoid ldconfig as it's not present on musl - install-linux install-unix: install-default -- $(LDCONFIG) -n $(DESTDIR)$(libdir) && (cd $(DESTDIR)$(libdir) && $(LN_S) -f libyices.so.$(YICES_VERSION) libyices.so) -+ (cd $(DESTDIR)$(libdir) && $(LN_S) -f libyices.so.$(YICES_VERSION) libyices.so.$(MAJOR).$(MINOR) && $(LN_S) -f libyices.so.$(MAJOR).$(MINOR) libyices.so) - - # on FreeBSD: the library file is libyices.so.X.Y and ldconfig does not take -n - # TODO: fix this. We must also create a symbolic link: libyices.so.X in libdir diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 38b668804ad1..40169a72e4a6 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }: +{ + lib, + stdenv, + unzip, + fetchurl, + electron, + makeWrapper, + geogebra, +}: let pname = "geogebra"; version = "6-0-794-0"; @@ -14,14 +22,17 @@ let calculus in one easy-to-use package. ''; homepage = "https://www.geogebra.org/"; - maintainers = with maintainers; [ voidless sikmir ]; + maintainers = with maintainers; [ + voidless + sikmir + ]; license = licenses.geogebra; sourceProvenance = with sourceTypes; [ binaryBytecode - binaryNativeCode # some jars include native binaries + binaryNativeCode # some jars include native binaries ]; platforms = with platforms; linux ++ darwin; - hydraPlatforms = []; + hydraPlatforms = [ ]; }; linuxPkg = stdenv.mkDerivation { @@ -50,7 +61,9 @@ let installPhase = '' mkdir -p $out/libexec/geogebra/ $out/bin cp -r GeoGebra-linux-x64/{resources,locales} "$out/" - makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" + makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra \ + --add-flags "$out/resources/app" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ @@ -84,6 +97,4 @@ let }; }; in -if stdenv.isDarwin -then darwinPkg -else linuxPkg +if stdenv.isDarwin then darwinPkg else linuxPkg diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 38caee5805b4..0edaa32babd7 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -5,7 +5,7 @@ , makeWrapper , libGLU , libGL -, freeglut +, libglut , mpfr , gmp , pkgsHostTarget @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]); buildInputs = [ - freeglut + libglut libGL libGLU mpfr diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index bda3e5b3a040..a5af9e844eca 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "msieve"; - version = "r1050"; + version = "1056"; src = fetchsvn { url = "svn://svn.code.sf.net/p/msieve/code/trunk"; - rev = "1050"; - hash = "sha256-cn6OhE4zhrpB7BFrRdOnucjATbfo5mLkK7O0Usx1quE="; + rev = version; + hash = "sha256-6ErVn4pYPMG5VFjOQURLsHNpN0pGdp55+rjY8988onU="; }; buildInputs = [ zlib gmp ecm ]; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index e4fc506516fd..a27d7c1ffdb6 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${finalAttrs.version}"; - hash = "sha256-yI+8TrNZJt4eJnDX5mk6RozBe2ZeP7sTyAjsgiYQPck="; + hash = "sha256-vH4GZaeQ6Ji9aWh8R5B6PE2fBBW7KTyCsFkpgHu6yg8="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index 3c4e19d56ebd..b1db5ce31a79 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "5.1.0"; + version = "5.2.0.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-gJfIC5HdA10gb/Dh/yhJbkCZfhUnN0zihqyfDjPv6ow="; + hash = "sha256-kzOxOCZmu4mYYgegRBU8SMAkTiE4p1AugVAeZa8yDDE="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; diff --git a/pkgs/applications/science/math/sage/patches/gap-element-crash.patch b/pkgs/applications/science/math/sage/patches/gap-element-crash.patch new file mode 100644 index 000000000000..b5396e2b7854 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/gap-element-crash.patch @@ -0,0 +1,18 @@ +diff --git a/src/sage/libs/gap/element.pyx b/src/sage/libs/gap/element.pyx +index b2b0681c052..b2e5807392c 100644 +--- a/src/sage/libs/gap/element.pyx ++++ b/src/sage/libs/gap/element.pyx +@@ -35,6 +35,13 @@ from sage.structure.coerce cimport coercion_model as cm + ### helper functions to construct lists and records ######################## + ############################################################################ + ++ ++cdef extern from *: ++ """ ++ #pragma GCC optimize("O1") ++ """ ++ ++ + cdef Obj make_gap_list(sage_list) except NULL: + """ + Convert Sage lists into Gap lists diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index f95e08c51ff4..e886f6645468 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -5,6 +5,7 @@ , sage-docbuild , env-locations , gfortran +, ninja , bash , coreutils , gnused @@ -63,6 +64,7 @@ let "@sage-local@/build" pythonEnv gfortran # for inline fortran + ninja # for inline fortran via numpy.f2py stdenv.cc # for cython bash coreutils diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index de0c2e3b1e20..b21bb07e6a64 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -61,19 +61,9 @@ stdenv.mkDerivation rec { hash = "sha256-uCXchYx26DdxTjR1k2748KCEHPnekKS2fAM7SpyhNvM="; }) - # https://github.com/sagemath/sage/pull/37763, landed in 10.4.beta2 - (fetchpatch { - name = "scipy-fault-tolerance.patch"; - url = "https://github.com/sagemath/sage/commit/551139c09f26a5da96b1187c3f0dd17b8d80ef84.diff"; - hash = "sha256-PR4przrZ3ieHaW2nSY7l7VhNfrUupu9yCIrXpeyoAgg="; - }) - - # first two commits from https://github.com/sagemath/sage/pull/38100 - (fetchpatch { - name = "sphinx-7.3-update.patch"; - url = "https://github.com/sagemath/sage/compare/10.4.beta7...d2932e142991b442a3eee5dc4f8949e3f7e6fe5c.patch"; - hash = "sha256-g6w0ImE0d2ocKnbGMQikcz9eI9r3/gESlA1NrQfGimk="; - }) + # compile libs/gap/element.pyx with -O1 + # a more conservative version of https://github.com/sagemath/sage/pull/37951 + ./patches/gap-element-crash.patch ]; # Patches needed because of package updates. We could just pin the versions of @@ -83,12 +73,40 @@ stdenv.mkDerivation rec { # should come from or be proposed to upstream. This list will probably never # be empty since dependencies update all the time. packageUpgradePatches = [ - # https://github.com/sagemath/sage/pull/37492 + # https://github.com/sagemath/sage/pull/37763, landed in 10.4.beta2 + (fetchpatch { + name = "scipy-fault-tolerance.patch"; + url = "https://github.com/sagemath/sage/commit/551139c09f26a5da96b1187c3f0dd17b8d80ef84.diff"; + hash = "sha256-PR4przrZ3ieHaW2nSY7l7VhNfrUupu9yCIrXpeyoAgg="; + }) + + # https://github.com/sagemath/sage/pull/37492, landed in 10.4.beta5 (fetchpatch { name = "singular-4.3.2p14-upgrade.patch"; url = "https://github.com/sagemath/sage/commit/a0c56816b051e97da44ac0a4e4d4f6915cf7fa0f.diff"; sha256 = "sha256-WGMmPeBoj2LUC+2qxWuaJL89QUuGt6axGvxWkpM9LYg="; }) + + # https://github.com/sagemath/sage/pull/37949, landed in 10.4.beta6 + (fetchpatch { + name = "conway-polynomials-new-len.patch"; + url = "https://github.com/sagemath/sage/commit/c9f5b45179e92ea0de1e0dbe0f47464010902851.diff"; + hash = "sha256-DwN2UIX8dxfxjIiqVvMdGbIxJ7CR/Ag2XUmS5vUKFTs="; + }) + + # https://github.com/sagemath/sage/pull/37967, landed in 10.4.beta6 + (fetchpatch { + name = "conway-polynomials-ell-point.patch"; + url = "https://github.com/sagemath/sage/commit/4e0bbaf90262a42f8ea14d5bcfed65f9d1787f54.diff"; + hash = "sha256-9gXydi1A+n7+K8YpH0PB8l/OMexhgO2F5NccU0cK+ls="; + }) + + # https://github.com/sagemath/sage/pull/38100, landed in 10.4.beta8 + (fetchpatch { + name = "sphinx-7.3-update.patch"; + url = "https://github.com/sagemath/sage/commit/e1b22690db42885423be5049246eb71ff52bdfef.diff"; + hash = "sha256-04KAyz8+0pJbRV8Ld0bNX1OoEx/35gIh3Nff+6n8QUU="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 1552de773d01..1a138eea81d9 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -6,7 +6,7 @@ , perl , pkg-config , sage-setup -, pythonRelaxDepsHook +, setuptools , gd , iml , libpng @@ -63,6 +63,7 @@ , lrcalc-python , matplotlib , memory-allocator +, meson-python , mpmath , networkx , numpy @@ -79,7 +80,6 @@ , sphinx , sympy , typing-extensions -, nbclassic }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -103,7 +103,7 @@ buildPythonPackage rec { pip # needed to query installed packages pkg-config sage-setup - pythonRelaxDepsHook + setuptools ]; pythonRelaxDeps = [ @@ -173,6 +173,7 @@ buildPythonPackage rec { lrcalc-python matplotlib memory-allocator + meson-python mpmath networkx numpy @@ -189,8 +190,6 @@ buildPythonPackage rec { sphinx sympy typing-extensions - - nbclassic ]; preBuild = '' diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index db2ff0c4a844..2a6225eab765 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -6,7 +6,7 @@ , gettext , maxima , wxGTK -, gnome +, adwaita-icon-theme , glib }: @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs:{ wxGTK maxima # So it won't embed svg files into headers. - gnome.adwaita-icon-theme + adwaita-icon-theme # So it won't crash under Sway. glib ]; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 0c559a530e08..cd0ebefe067d 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -10,7 +10,7 @@ , libGL , libXmu , libXi -, freeglut +, libglut , libjpeg , libtool , wxGTK32 @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libGL libXmu libXi - freeglut + libglut libjpeg wxGTK32 gtk3 diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index d071c90562cd..59e58351c0f6 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,43 +1,62 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, +{ lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, + flann, + cgal, + gmp, + mpfr, autoAddDriverRunpath, config, - cudaSupport ? config.cudaSupport, cudaPackages + stdenv, + qt5, + xorg, + cudaSupport ? config.cudaSupport, + cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities, + cudaPackages }: assert cudaSupport -> cudaPackages != { }; let boost_static = boost179.override { enableStatic = true; }; + stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv; # TODO: migrate to redist packages inherit (cudaPackages) cudatoolkit; in -mkDerivation rec { - version = "3.7"; +stdenv'.mkDerivation rec { + version = "3.9.1"; pname = "colmap"; src = fetchFromGitHub { owner = "colmap"; repo = "colmap"; rev = version; - hash = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I="; + hash = "sha256-Xb4JOttCMERwPYs5DyGKHw+f9Wik1/rdJQKbgVuygH8="; }; - # TODO: rm once the gcc11 issue is closed, https://github.com/colmap/colmap/issues/1418#issuecomment-1049305256 cmakeFlags = lib.optionals cudaSupport [ - "-DCUDA_ENABLED=ON" - "-DCUDA_NVCC_FLAGS=--std=c++14" + (lib.cmakeBool "CUDA_ENABLED" true) + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" + (lib.strings.concatStringsSep ";" + (map cudaPackages.cudaFlags.dropDot + cudaCapabilities))) ]; buildInputs = [ boost_static ceres-solver eigen freeimage glog libGLU glew qtbase + flann + cgal + gmp + mpfr + xorg.libSM ] ++ lib.optionals cudaSupport [ cudatoolkit + cudaPackages.cuda_cudart.static ]; nativeBuildInputs = [ cmake + qt5.wrapQtAppsHook ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ]; diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index 7f28c8d1b146..bb2c3c0abe30 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -2,7 +2,7 @@ , autoPatchelfHook , dpkg , fetchurl -, freeglut +, libglut , gcc-unwrapped , libGL , libGLU @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - freeglut + libglut gcc-unwrapped.lib libGL libGLU diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index b94f23671024..4f928e727da1 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -56,7 +56,7 @@ in maven'.buildMavenPackage { cp -r ${npmPkg} main/webapp/modules/core/3rdparty ''; mvnParameters = "-pl !packaging"; - mvnHash = "sha256-0qsKUMV9M0ZaddR5ust8VikSrsutdxVNNezKqR+F/6M="; + mvnHash = "sha256-FD4g0Mshz39N1h8MDAk907PhF5TguWTZ7AXKECHuhzQ="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 25b1f4e5d5ce..a999a719e2e4 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "qgroundcontrol"; - version = "4.3.0"; + version = "4.4.0"; propagatedBuildInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a0+cpT413qi88PvaWQPxKABHfK7vbPE7B42n84n/SAk="; + sha256 = "sha256-LKERjHoIgJ4cF1MjB5nVW3FB/DrmKP4Xj58avsDobhc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index fbe5ee56b319..928548e7e718 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doodle"; - version = "0.7.2"; + version = "0.7.3"; buildInputs = [ libextractor gettext ]; src = fetchurl { url = "https://grothoff.org/christian/doodle/download/doodle-${version}.tar.gz"; - sha256 = "sha256-dtRPfUjhBNgN+5zHMYmszISmBv1+K6yjKsbQBiAXWRA="; + sha256 = "sha256-qodp2epYyolg38MNhBV+/NMLmfXjhsn2X9uKTUniv2s="; }; meta = { diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index 6b68e6bdc0f5..178677af6011 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -26,12 +26,16 @@ , withWayland ? !stdenv.isDarwin , wayland + +, testers +, rio }: let rlinkLibs = if stdenv.isDarwin then [ darwin.libobjc darwin.apple_sdk_11_0.frameworks.AppKit darwin.apple_sdk_11_0.frameworks.AVFoundation + darwin.apple_sdk_11_0.frameworks.MetalKit darwin.apple_sdk_11_0.frameworks.Vision ] else [ (lib.getLib gcc-unwrapped) @@ -51,16 +55,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.39"; + version = "0.1.1"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; - rev = "v${version}"; - hash = "sha256-pnU2wxgopHMWgJ7JGdO2P/MCfxqCY7MTEE39qtD0XKw="; + rev = "refs/tags/v${version}"; + hash = "sha256-Hll9QpCN0/NDJ3tgJFnmNjfIotppGg5/BrHMxGmxOTo="; }; - cargoHash = "sha256-GwI2zHX1YcR4pC+qtkDoxx2U+zipbqqxsCI8/XNg2BU="; + cargoHash = "sha256-yyxJi0kK2d2I+9GncYHcRKbdngYSltDjsTuChqaDG/U="; nativeBuildInputs = [ ncurses @@ -107,7 +111,10 @@ rustPlatform.buildRustPackage rec { extraArgs = [ "--version-regex" "v([0-9.]+)" ]; }; - tests.test = nixosTests.terminal-emulators.rio; + tests = { + test = nixosTests.terminal-emulators.rio; + version = testers.testVersion { package = rio; }; + }; }; meta = { @@ -118,5 +125,11 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.unix; changelog = "https://github.com/raphamorim/rio/blob/v${version}/CHANGELOG.md"; mainProgram = "rio"; + # ---- corcovado/src/sys/unix/eventedfd.rs - sys::unix::eventedfd::EventedFd (line 31) stdout ---- + # Test executable failed (exit status: 101). + # stderr: + # thread 'main' panicked at corcovado/src/sys/unix/eventedfd.rs:24:16: + # called `Result::unwrap()` on an `Err` value: Os { code: 1, kind: PermissionDenied, message: "Operation not permitted" } + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 303c6d1b77da..8fd39b2f6e7f 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,19 +1,21 @@ -{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig +{ lib, stdenv, fetchurl, xorg, ncurses, freetype, fontconfig , pkg-config, makeWrapper, nixosTests, gitUpdater , nix, gnused, coreutils, enableDecLocator ? true }: stdenv.mkDerivation rec { pname = "xterm"; - version = "390"; + version = "392"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-dRF8PMUXSgnEJe8QbmlATXL17wXgOl2gCq8VeS1vnA8="; + hash = "sha256-TVc3LvCOr6n7doLbjQe+D+BRPljoR4wuyOm2JIbn/l4="; }; + patches = [ ./sixel-256.support.patch ]; + strictDeps = true; nativeBuildInputs = [ makeWrapper pkg-config fontconfig ]; @@ -32,14 +34,6 @@ stdenv.mkDerivation rec { xorg.luit ]; - patches = [ ./sixel-256.support.patch ] - ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - name = "posix-ptys.patch"; - url = - "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; - sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr"; - }); - configureFlags = [ "--enable-wide-chars" "--enable-256-color" diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index f0cfc626c4fa..10a2ad2adcbe 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -24,12 +24,12 @@ python3.pkgs.buildPythonApplication rec { }; pythonRelaxDeps = [ + "argcomplete" "decli" ]; nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook installShellFiles ]; diff --git a/pkgs/applications/version-management/deepgit/default.nix b/pkgs/applications/version-management/deepgit/default.nix index feffc31b759b..acaf26b2c5c8 100644 --- a/pkgs/applications/version-management/deepgit/default.nix +++ b/pkgs/applications/version-management/deepgit/default.nix @@ -1,7 +1,7 @@ { copyDesktopItems , fetchurl , glib -, gnome +, adwaita-icon-theme , gtk3 , jre , lib @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gtk3 jre ]; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 15d6bc84caa5..49829a2fd4bc 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,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fossil"; - version = "2.23"; + version = "2.24"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz"; - hash = "sha256-dfgI6BNRAYqXFnRtnvGh/huxkEcz6LQYZDiB04GYhZM="; + hash = "sha256-lc08F2g1vrm4lwdvpYFx/jCwspH2OHu1R0nvvfqWL0w="; }; # required for build time tool `./tools/translate.c` @@ -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/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index 8446d4dec155..aecc19f0aa16 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.13"; + version = "0.6.15"; src = fetchFromGitHub { owner = "tummychow"; repo = "git-absorb"; rev = "refs/tags/${version}"; - hash = "sha256-k0smjIpy/+y6M5p24Ju4CVJkThzWOgp5kBJuVnCrXiE="; + hash = "sha256-7Y/gEym+29lTwJ7FbuvOqzbiMSzrY9f5IPhtvIJUKbU="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-bRPdtiC9Dwi21g4WtjawQ2AUdizUEX2zPHAnG08D3ac="; + cargoHash = "sha256-Y/0In33y4mVTaE9yoBZ/3tRWcsSKgGjTCSHdjScNEj0="; postInstall = '' installManPage Documentation/git-absorb.1 diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix index 870479f11f82..2bad97d7286c 100644 --- a/pkgs/applications/version-management/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -64,5 +64,6 @@ python3Packages.buildPythonApplication rec { description = "Sleek and powerful Git GUI"; license = licenses.gpl2; maintainers = [ maintainers.bobvanderlinden ]; + mainProgram = "git-cola"; }; } diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix index b749ce8c6e31..e7594eee2f21 100644 --- a/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/pkgs/applications/version-management/git-credential-manager/default.nix @@ -20,20 +20,20 @@ assert withLibsecretSupport -> withGuiSupport; buildDotnetModule rec { pname = "git-credential-manager"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "git-ecosystem"; repo = "git-credential-manager"; rev = "v${version}"; - hash = "sha256-Uf0EXaGM4k9Aanz16B9xA2EcseXTI9lLCws/ZVNb3e8="; + hash = "sha256-eRSTF9Ldj00cQbUzHzdMihte0+W4nZ9T/qg/L/yes/w="; }; projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.runtime_7_0; - dotnetInstallFlags = [ "--framework" "net7.0" ]; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnetInstallFlags = [ "--framework" "net8.0" ]; executables = [ "git-credential-manager" ]; runtimeDeps = [ fontconfig ] diff --git a/pkgs/applications/version-management/git-credential-manager/deps.nix b/pkgs/applications/version-management/git-credential-manager/deps.nix index 053da15bd50c..431c2326cf75 100644 --- a/pkgs/applications/version-management/git-credential-manager/deps.nix +++ b/pkgs/applications/version-management/git-credential-manager/deps.nix @@ -2,26 +2,26 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.10"; sha256 = "0mvsc6fg8qbvdqkdkia61jkprb3yhvvgvq6s8hgd09v6lzjsbq8n"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.4"; sha256 = "03zdixi6m9g4mcxmp24z8dzamzqqy9i0wg069m4gl5p3wcvfbqla"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.10"; sha256 = "0s2wn7sf0dsa861gh6ghfgf881p6bvyahfpl583rcnsi6ci2hjhv"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.10"; sha256 = "13g5sac0ba8dy1pn21j2g4fin57x1vs1pl07gzgv53bl8nz1xznj"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.10"; sha256 = "0s27ajknbrymnchv66rybrs3snzh825iy0nqby72yk726znp52vw"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.10"; sha256 = "1c7hv9ypvn1ncg6cmzn2cs0nkax0y0pnbx1h1asjzn8rnbwcvnca"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.10"; sha256 = "18f9vpsxfaak4qpqvcz9rdygx3k8dhzb64iqlhva88nhahwlwlxr"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.10"; sha256 = "06pihfddbvdw1s3rs6v183ljch1bsxym80fclfqrh3npa3ag9n1z"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.10"; sha256 = "0p75z6k4ivzhdn9y9gwqsqmja7x03d4mxaicbccjbnz06irybnxa"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.10"; sha256 = "0w45j4ypqnwmsh3byzaghn43ycfkfnn8415i5lw2q5ip7vp3a9fm"; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.10"; sha256 = "1jqkwhpvnnbbjwr6992ahlkwgwj7l0k1141317qy1wprirn4mpv1"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.10"; sha256 = "0vssdz6rng0k85qsv2xn6x0dldaalnnx718n7plwxg3j1pddr1z7"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.10"; sha256 = "1gh3fad9ya56qwzhk7590bdzkky76yx1jjj60rqr013b97qbd3gs"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.10"; sha256 = "1x09mp8q3mrj5fijqk7qp5qivrysqnbc2bkj2ssvawb9rjy6497w"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; sha256 = "1rqcmdyzxz9kc0k8594hbpksjc23mkakmjybi4b8702qycxx0lrf"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; sha256 = "0i9gaiyjgmcpnfn1fixbxq8shqlh4ahng7j4dxlf38zlln1f6h80"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; sha256 = "1b5ng37bwk75cifw7p1hzn8z6sswi8h7h510qgwlbvgmlrs5r0ga"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; sha256 = "0dcmclnyryb82wzsky1dn0gbjsvx84mfx46v984f5fmg4v238lpm"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; sha256 = "1hyvmz7rfbrxbcpnwyvb64gdk1hifcpz3rln58yyb7g1pnbpnw2s"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) @@ -29,14 +29,12 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.54.0"; sha256 = "0p4msajlfbc536qpfnhz2w81rmwgwivfbhdyfk3d198vbadv8zlq"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "2.28.0"; sha256 = "1z2irqbjqxawyxq2778bcjbj0x8m63dh3lj5m04knq48wl4wh40x"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.22.0"; sha256 = "06495i2i9cabys4s0dkaz0rby8k47gy627v9ivp7aa3k6xmypviz"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.60.3"; sha256 = "065iifhffri8wc5i4nfbnkzjrvflav9v5bfkwvmax8f35rks1mnn"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.60.3"; sha256 = "19l92ynvrhb76r0zpj8qhyymxgz45knyhdqr6za4s7rzbssibi08"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; sha256 = "0i6kdvqdbzynzrr4g5idx4ph4ckggsbsy0869lwa10fhmyxrh73g"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) @@ -64,21 +62,20 @@ (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; sha256 = "0f6wbk9dnjiffb9ycjachy1m9zw3pai2m503nym07qgb0izxm792"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; sha256 = "0p0z6nxkkmabv46wmxhs3yr0xy24i6jzn54gk0hsm3h1a8vi3m21"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; sha256 = "05xwa1izzvqz4gznvx2x31qnpvl1lc65hm5p9sscjg5afisya0ss"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; sha256 = "1k2hfasgbv01navc55zzwdwzfxcw4186jni35c00zykgwhbwb250"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; sha256 = "119mlbh5hmlis7vb111s95dwg5p1anm2hmv7cm6fz7gy18473d7v"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) @@ -97,12 +94,11 @@ (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) diff --git a/pkgs/applications/version-management/git-extras/default.nix b/pkgs/applications/version-management/git-extras/default.nix index adb36257188c..2e10c633b02a 100644 --- a/pkgs/applications/version-management/git-extras/default.nix +++ b/pkgs/applications/version-management/git-extras/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ cko SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index e8efa81e217b..033b1c1416a1 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.26.0"; + version = "3.26.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-6q0XunfzURfcvce/BLtJhDeI1fPusN+07S1SegLDkwY="; + hash = "sha256-QcsBe1v2qiPR7svl5mQ/aro/X2PbpkJHNHnNAnQE9yA="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-my/default.nix b/pkgs/applications/version-management/git-my/default.nix deleted file mode 100644 index 2683af402287..000000000000 --- a/pkgs/applications/version-management/git-my/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "git-my"; - version = "1.1.2"; - - src = fetchFromGitHub { - owner = "davidosomething"; - repo = "git-my"; - rev = version; - sha256 = "0jji5zw25jygj7g4f6f3k0p0s9g37r8iad8pa0s67cxbq2v4sc0v"; - }; - - dontBuild = true; - - installPhase = '' - install -Dm755 -t "$out"/bin ./git-my - ''; - - meta = with lib; { - description = - "List remote branches if they're merged and/or available locally"; - homepage = "https://github.com/davidosomething/git-my"; - license = licenses.free; - maintainers = with maintainers; [ bb010g ]; - platforms = platforms.all; - mainProgram = "git-my"; - }; -} - diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index d7e008d656fd..f6c10a7a34db 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, buildPackages +{ fetchurl, fetchpatch, lib, stdenv, buildPackages , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , openssh, pcre2, bash @@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.45.1"; + version = "2.45.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-5k00Co5ieuIs+4vMZRzKC0l88en99SNzVUT/SnMvEr8="; + hash = "sha256-Ub/ofrHAL+0UhAUYdTZe6rIpgx0w0M7F2JoU+eQOmts="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -59,6 +59,15 @@ stdenv.mkDerivation (finalAttrs: { ./installCheck-path.patch ] ++ lib.optionals withSsh [ ./ssh-path.patch + ] ++ lib.optionals (guiSupport && stdenv.isDarwin) [ + # Needed to workaround an issue in macOS where gitk shows a empty window + # https://github.com/Homebrew/homebrew-core/issues/68798 + # https://github.com/git/git/pull/944 + (fetchpatch { + name = "gitk_check_main_window_visibility_before_waiting_for_it_to_show.patch"; + url = "https://github.com/git/git/commit/1db62e44b7ec93b6654271ef34065b31496cd02e.patch"; + hash = "sha256-ntvnrYFFsJ1Ebzc6vM9/AMFLHMS1THts73PIOG5DkQo="; + }) ]; postPatch = '' diff --git a/pkgs/applications/version-management/git/update.sh b/pkgs/applications/version-management/git/update.sh index 1f70dcff4294..7aa1e90d53b3 100755 --- a/pkgs/applications/version-management/git/update.sh +++ b/pkgs/applications/version-management/git/update.sh @@ -4,7 +4,7 @@ set -eu -o pipefail oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion git" | tr -d '"')" -latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" +latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/git/git.git | grep -v '{}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" targetVersion="${1:-$latestTag}" if [ ! "${oldVersion}" = "${targetVersion}" ]; then diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c1373346b6af..70bd9ab46c4f 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curlWithGnuTls, alsa-lib -, libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig +, libXfixes, atk, gtk3, libXrender, pango, adwaita-icon-theme, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , makeDesktopItem, openssl, wrapGAppsHook3, makeShellWrapper, at-spi2-atk, at-spi2-core, libuuid @@ -107,7 +107,7 @@ let }) ]; nativeBuildInputs = [ copyDesktopItems (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) ]; - buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 adwaita-icon-theme ]; # avoid double-wrapping dontWrapGApps = true; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 41fe2756ff47..e46f414f83d6 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.11.5", - "repo_hash": "1bhg6glb644m55m50q2kp0azf3c4if11vymjn823rhs68jw3jqcp", - "yarn_hash": "03q7h8dyssvsr91klr1jk65f5jz1ac71lx0114zq9c7awxrgp6kq", + "version": "17.1.1", + "repo_hash": "1ivaicgz4lgl6l06fnr9wfpn71b88yd22ryi3qn2r40rg3vjl1vf", + "yarn_hash": "1xyc3c3hhfp5lgrpacj4gsfbql3wn0brdp16ivnqg4n0csjlizq7", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.11.5-ee", + "rev": "v17.1.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.11.5", - "GITLAB_PAGES_VERSION": "16.11.5", - "GITLAB_SHELL_VERSION": "14.35.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0", - "GITLAB_WORKHORSE_VERSION": "16.11.5" + "GITALY_SERVER_VERSION": "17.1.1", + "GITLAB_PAGES_VERSION": "17.1.1", + "GITLAB_SHELL_VERSION": "14.36.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.0.0", + "GITLAB_WORKHORSE_VERSION": "17.1.1" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 144fd40edd9c..f43ade4af22a 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,10 +1,37 @@ -{ stdenv, lib, fetchFromGitLab, bundlerEnv -, ruby_3_1, tzdata, git, nettools, nixosTests, nodejs, openssl -, defaultGemConfig, buildRubyGem -, gitlabEnterprise ? false, callPackage, yarn -, fixup-yarn-lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config -, cargo, rustc, rustPlatform -, icu, zlib, which +{ bundlerEnv +, cacert +, defaultGemConfig +, fetchFromGitLab +, fetchYarnDeps +, fixup-yarn-lock +, git +, gitlabEnterprise ? false +, lib +, makeWrapper +, nettools +, nixosTests +, nodejs +, replace +, ruby_3_2 +, stdenv +, tzdata +, yarn + +# gem dependencies: +# gitlab-glfm-markdown +, buildRubyGem, cargo, rustc, rustPlatform + +# gpgme +, pkg-config + +# openssl +, openssl + +# ruby-magic +, file + +# static-holmes +, icu, which, zlib }: let @@ -20,7 +47,7 @@ let rubyEnv = bundlerEnv rec { name = "gitlab-env-${version}"; - ruby = ruby_3_1; + ruby = ruby_3_2; gemdir = ./rubyEnv; gemset = import (gemdir + "/gemset.nix") src; gemConfig = defaultGemConfig // { @@ -50,7 +77,7 @@ let cp Cargo.lock $out ''; }; - hash = "sha256-SncgYYnoSaWA4kQWonoXXbSMu1mnwTyhdLXFagqgH+o="; + hash = "sha256-VYjCYUikORuXx27OYWyumBxeHw9aj/S1wcr9vLIsXeo="; }; dontBuild = false; @@ -75,12 +102,17 @@ let find $out -type f -name .rustc_info.json -delete ''; }; + static_holmes = attrs: { - buildInputs = [ which icu zlib ]; + nativeBuildInputs = [ + icu + which + zlib.dev + ]; }; }; groups = [ - "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" + "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" "opentelemetry" ]; # N.B. omniauth_oauth2_generic and apollo_upload_server both provide a # `console` executable. diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c978c1884577..eb7499058674 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -5,7 +5,7 @@ }: let - version = "16.11.5"; + version = "17.1.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -17,10 +17,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-iBLRhkFPsopy6m3y+9Qc+v3FCbV5nOWMs+DMwW+JiSk="; + hash = "sha256-c9gLVVRNSkl4RI7LN0UZc6CAzcLIbWGIvsjoiaPdUKY="; }; - vendorHash = "sha256-WCZF7XVW6J1zyPx8e/Mcn+HmHElAUGcEICxiF5HLzBg="; + vendorHash = "sha256-yOm0cPC8v6L3gkekUMpf5U86XzpnmeoLTgZSFBb02BA="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix index 6bbd3c555f53..b2b29cf15a35 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "4.8.0"; + version = "5.0.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - sha256 = "sha256-JHUDZmGlZGyvsB4wgAnNyIEtosZG4ajZ4eBGumH97ZI="; + sha256 = "sha256-856lRCW4+FIiXjOzMkfoYws6SMIKXWVtvr+867QEjCk="; }; - vendorHash = "sha256-ztRKXoXncY66XJVwlPn4ShLWTD4Cr0yYHoUdquJItDM="; + vendorHash = "sha256-2XdbTqNGt97jQUJmE06D6M/VxF9+vJAwMM/fF8MP2oo="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 3cb270e2cae0..655bfe02ca0e 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.11.5"; + version = "17.1.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-mJKzaFICE7f4aIFGeV/4PbbQkaxwmRd9QO2pRXpM2ag="; + hash = "sha256-cwFqzKXDWuIESdDjuPYos73Ly+zd+J20aJJi0RiRdus="; }; - vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M="; + vendorHash = "sha256-uVpkCl5rSAtg6gDnL3d11AaOlGNpS2xaPtJrthUNbfE="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index e5c669ba3e64..698be436be8f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,24 +2,23 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.35.0"; + version = "14.36.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-WyIUdDKPKQE1Ddz40WaMA5lDs37OyDuZl/6/nKDYY/8="; + sha256 = "sha256-SclRIIUZm1D5fYDrTH1L8opQpxxIoi+SrG2GO7wtScU="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch - ./go-mod-tidy.patch ]; - vendorHash = "sha256-7TUHD14/aCs3lkpTy5CH9WYUc1Ud6rDFCx+JgsINvxU="; + vendorHash = "sha256-Ebs9HnHhK4y6+vwLRvVwQnG8I7Gk6leBBezjkc+bhJo="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/go-mod-tidy.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/go-mod-tidy.patch deleted file mode 100644 index f7ce8cf0575e..000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/go-mod-tidy.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/go.mod b/go.mod -index 513ccc40..30ba0f6e 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,6 @@ - module gitlab.com/gitlab-org/gitlab-shell/v14 - --go 1.20 -+go 1.21 - - require ( - github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20240402115927-f0b226fa61cc diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch index 8bbfd97e00ef..8fdc546cbf36 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -28,8 +28,8 @@ index c6f2422..fb0426b 100644 } func (k *KeyLine) ToString() string { -- command := fmt.Sprintf("%s %s-%s", path.Join(k.Config.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id) -+ command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.Id) +- command := fmt.Sprintf("%s %s-%s", path.Join(k.Config.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.ID) ++ command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.ID) return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value) } diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 682376e40a11..2b1677e1b8dc 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.11.5"; + version = "17.1.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -17,7 +17,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-44EtpjYsxYqDH035/ruPfshfejiO011HybKD2inp8bU="; + vendorHash = "sha256-7iit/YJHxvrFYfnppwPox+gEAHea7/eq83vMPojWUWU="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index dacf2473597c..d8f93f9280b1 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -24,7 +24,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 # # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails -gem 'rails', '~> 7.0.8.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rails', '~> 7.0.8.4' # rubocop:todo Gemfile/MissingFeatureCategory gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory @@ -49,12 +49,12 @@ gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'view_component', '~> 3.11.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'view_component', '~> 3.12.1' # rubocop:todo Gemfile/MissingFeatureCategory # Supported DBs -gem 'pg', '~> 1.5.6' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'pg', '~> 1.5.6', feature_category: :database -gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'neighbor', '~> 0.3.2', feature_category: :duo_chat gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory @@ -64,6 +64,9 @@ gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory # Authorization gem 'declarative_policy', '~> 1.1.0' # rubocop:todo Gemfile/MissingFeatureCategory +# For source code paths mapping +gem 'coverband', '6.1.2', require: false, feature_category: :shared + # Authentication libraries gem 'devise', '~> 4.9.3', feature_category: :system_access gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' # rubocop:todo Gemfile/MissingFeatureCategory @@ -75,17 +78,13 @@ gem 'ruby-saml', '~> 1.15.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-auth0', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-dingtalk-oauth2', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-facebook', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-saml', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-twitter', '~> 1.4' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem. @@ -134,17 +133,17 @@ gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory # API gem 'grape', '~> 2.0.0', feature_category: :api -gem 'grape-entity', '~> 0.10.2', feature_category: :api -gem 'grape-swagger', '~> 2.0.2', group: [:development, :test], feature_category: :api +gem 'grape-entity', '~> 1.0.1', feature_category: :api +gem 'grape-swagger', '~> 2.1.0', group: [:development, :test], feature_category: :api gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory # GraphQL API -gem 'graphql', '~> 2.2.5', feature_category: :api +gem 'graphql', '~> 2.3.4', feature_category: :api gem 'graphql-docs', '~> 4.0.0', group: [:development, :test], feature_category: :api gem 'graphiql-rails', '~> 1.8.0', feature_category: :api -gem 'apollo_upload_server', '~> 2.1.5', feature_category: :api +gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api gem 'graphlient', '~> 0.6.0', feature_category: :importers # Used by BulkImport feature (group::import) # Generate Fake data @@ -167,7 +166,7 @@ gem 'fog-aws', '~> 3.18' # rubocop:todo Gemfile/MissingFeatureCategory # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'fog-google', '~> 1.19', require: 'fog/google' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'fog-google', '~> 1.24.1', require: 'fog/google' # rubocop:todo Gemfile/MissingFeatureCategory gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory # NOTE: # the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches @@ -207,9 +206,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-core', '~> 3.191.6' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.197.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-s3', '~> 1.146.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.151.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory @@ -230,7 +229,7 @@ gem 'asciidoctor-kroki', '~> 0.8.0', require: false # rubocop:todo Gemfile/Missi gem 'rouge', '~> 4.2.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory gem 'nokogiri', '~> 1.16' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-glfm-markdown', '~> 0.0.14', feature_category: :team_planning +gem 'gitlab-glfm-markdown', '~> 0.0.17', feature_category: :team_planning # Calendar rendering gem 'icalendar' # rubocop:todo Gemfile/MissingFeatureCategory @@ -256,9 +255,12 @@ gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeat gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory # Background jobs -gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'sidekiq-cron', '~> 1.12.0', feature_category: :shared -gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq', feature_category: :scalability +gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability +gem 'gitlab-sidekiq-fetcher', + path: 'vendor/gems/sidekiq-reliable-fetch', + require: 'sidekiq-reliable-fetch', + feature_category: :scalability # Cron Parser gem 'fugit', '~> 1.8.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -277,7 +279,7 @@ gem 're2', '2.7.0' # rubocop:todo Gemfile/MissingFeatureCategory # Misc -gem 'semver_dialects', '~> 2.0', '>= 2.0.2', feature_category: :static_application_security_testing +gem 'semver_dialects', '~> 3.0', feature_category: :software_composition_analysis gem 'version_sorter', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'csv_builder', path: 'gems/csv_builder' # rubocop:todo Gemfile/MissingFeatureCategory @@ -288,13 +290,13 @@ gem 'js_regex', '~> 3.8' # rubocop:todo Gemfile/MissingFeatureCategory gem 'device_detector' # rubocop:todo Gemfile/MissingFeatureCategory # Redis -gem 'redis-namespace', '~> 1.10.0', feature_category: :redis -gem 'redis', '~> 5.0.0', feature_category: :redis -gem 'redis-clustering', '~> 5.0.0', feature_category: :redis +gem 'redis-namespace', '~> 1.11.0', feature_category: :redis +gem 'redis', '~> 5.2.0', feature_category: :redis +gem 'redis-clustering', '~> 5.2.0', feature_category: :redis gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory # Redis session store -gem 'redis-actionpack', '~> 5.4.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'redis-actionpack', '~> 5.4.0', feature_category: :redis # Discord integration gem 'discordrb-webhooks', '~> 3.5', require: false, feature_category: :integrations @@ -353,16 +355,15 @@ gem 'gon', '~> 6.4.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'request_store', '~> 1.5.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'base32', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-license', '~> 2.4', feature_category: :shared +gem 'gitlab-license', '~> 2.5', feature_category: :shared # Protect against bruteforcing gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory # Sentry integration -gem 'sentry-raven', '~> 3.1', feature_category: :error_tracking -gem 'sentry-ruby', '~> 5.10.0', feature_category: :error_tracking -gem 'sentry-rails', '~> 5.10.0', feature_category: :error_tracking -gem 'sentry-sidekiq', '~> 5.10.0', feature_category: :error_tracking +gem 'sentry-ruby', '~> 5.17.3', feature_category: :error_tracking +gem 'sentry-rails', '~> 5.17.3', feature_category: :error_tracking +gem 'sentry-sidekiq', '~> 5.17.3', feature_category: :error_tracking # PostgreSQL query parsing # @@ -372,19 +373,18 @@ gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' # rubocop: gem 'gitlab-http', path: 'gems/gitlab-http' # rubocop:todo Gemfile/MissingFeatureCategory gem 'premailer-rails', '~> 1.10.3' # rubocop:todo Gemfile/MissingFeatureCategory - -gem 'gitlab-labkit', '~> 0.35.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-labkit', '~> 0.36.0', feature_category: :shared gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory # I18n -gem 'rails-i18n', '~> 7.0', feature_category: :internationalization +gem 'rails-i18n', '~> 7.0', '>= 7.0.9', feature_category: :internationalization gem 'gettext_i18n_rails', '~> 1.12.0', feature_category: :internationalization gem 'gettext', '~> 3.4', '>= 3.4.9', require: false, group: [:development, :test], feature_category: :internationalization -gem 'batch-loader', '~> 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'batch-loader', '~> 2.0.5' # rubocop:todo Gemfile/MissingFeatureCategory # Perf bar gem 'peek', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -399,6 +399,36 @@ gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory +# OpenTelemetry +group :opentelemetry do + # Core OpenTelemetry gems + gem 'opentelemetry-sdk', feature_category: :tooling + gem 'opentelemetry-exporter-otlp', feature_category: :tooling + + # OpenTelemetry gems selected from full set in `opentelemetry-instrumentation-all` metagem + gem 'opentelemetry-instrumentation-active_support', feature_category: :tooling + gem 'opentelemetry-instrumentation-action_pack', feature_category: :tooling + gem 'opentelemetry-instrumentation-active_job', feature_category: :tooling + gem 'opentelemetry-instrumentation-active_record', feature_category: :tooling + gem 'opentelemetry-instrumentation-action_view', feature_category: :tooling + gem 'opentelemetry-instrumentation-aws_sdk', feature_category: :tooling + gem 'opentelemetry-instrumentation-http', feature_category: :tooling + gem 'opentelemetry-instrumentation-concurrent_ruby', feature_category: :tooling + gem 'opentelemetry-instrumentation-ethon', feature_category: :tooling + gem 'opentelemetry-instrumentation-excon', feature_category: :tooling + gem 'opentelemetry-instrumentation-faraday', feature_category: :tooling + gem 'opentelemetry-instrumentation-grape', feature_category: :tooling + gem 'opentelemetry-instrumentation-graphql', feature_category: :tooling + gem 'opentelemetry-instrumentation-http_client', feature_category: :tooling + gem 'opentelemetry-instrumentation-net_http', feature_category: :tooling + gem 'opentelemetry-instrumentation-pg', feature_category: :tooling + gem 'opentelemetry-instrumentation-rack', feature_category: :tooling + gem 'opentelemetry-instrumentation-rails', feature_category: :tooling + gem 'opentelemetry-instrumentation-rake', feature_category: :tooling + gem 'opentelemetry-instrumentation-redis', feature_category: :tooling + gem 'opentelemetry-instrumentation-sidekiq', feature_category: :tooling +end + gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory group :development do @@ -407,7 +437,7 @@ group :development do gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'letter_opener_web', '~> 2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'lookbook', '~> 2.2', '>= 2.2.2' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'lookbook', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory # Better errors handler gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -416,19 +446,20 @@ group :development do gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'ruby-lsp', "~> 0.14.6", require: false, feature_category: :tooling + gem 'ruby-lsp', "~> 0.16.7", require: false, feature_category: :tooling - gem 'ruby-lsp-rails', "~> 0.3.3", feature_category: :tooling + gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling - gem 'gdk-toogle', '~> 0.9', require: 'toogle', feature_category: :tooling + gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling end group :development, :test do gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'parser', '~> 3.3', '>= 3.3.0.5' # rubocop:todo Gemfile/MissingFeatureCategory + # Locked on 3.3.0.5 until inspec-core is updated in Omnibus: https://github.com/inspec/inspec/pull/7030 + gem 'parser', '= 3.3.0.5', feature_category: :shared gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory @@ -436,8 +467,8 @@ group :development, :test do gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database - gem 'factory_bot_rails', '~> 6.4.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rspec-rails', '~> 6.1.1', feature_category: :shared + gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -445,8 +476,8 @@ group :development, :test do gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab-styles', '~> 11.0.0', feature_category: :tooling - gem 'haml_lint', '~> 0.53', feature_category: :tooling + gem 'gitlab-styles', '~> 12.0.1', feature_category: :tooling + gem 'haml_lint', '~> 0.58', feature_category: :tooling gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory @@ -455,7 +486,7 @@ group :development, :test do gem 'benchmark-memory', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory # Profiling data from CI/CD pipelines - gem 'influxdb-client', '~> 2.9', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling gem 'knapsack', '~> 1.22.0', feature_category: :tooling gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling @@ -506,12 +537,12 @@ group :test do gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling - gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling + gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling gem 'capybara', '~> 3.40' # rubocop:todo Gemfile/MissingFeatureCategory gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'selenium-webdriver', '~> 4.19' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -520,7 +551,7 @@ group :test do gem 'webmock', '~> 3.23.0', feature_category: :shared gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'test-prof', '~> 1.3.2', feature_category: :tooling + gem 'test-prof', '~> 1.3.3', feature_category: :tooling gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling @@ -528,7 +559,7 @@ group :test do # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab_quality-test_tooling', '~> 1.21.1', require: false, feature_category: :tooling + gem 'gitlab_quality-test_tooling', '~> 1.28.0', require: false, feature_category: :tooling end gem 'octokit', '~> 8.1', feature_category: :importers @@ -563,12 +594,12 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 16.11.0.pre.rc1', feature_category: :gitaly +gem 'gitaly', '~> 17.0.1', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management +gem 'kas-grpc', '~> 0.5.0', feature_category: :deployment_management -gem 'grpc', '~> 1.60.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'grpc', '~> 1.63', feature_category: :shared gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory @@ -657,9 +688,10 @@ gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory # BufferedIO patch # Updating this version will require updating scripts/allowed_warnings.txt gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory -# Lock this until we make DNS rebinding work with the updated net-http: -# https://gitlab.com/gitlab-org/gitlab/-/issues/413528 -gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory + +# This is locked to 0.4.1 because we patch Net::HTTP#connect in +# gems/gitlab-http/lib/net_http/connect_patch.rb. +gem 'net-http', '= 0.4.1', feature_category: :shared gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index bb661693ff49..aa9a829983a8 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -48,6 +48,7 @@ PATH concurrent-ruby (~> 1.2) httparty (~> 0.21.0) ipaddress (~> 0.8.3) + net-http (= 0.4.1) railties (~> 7) PATH @@ -99,7 +100,7 @@ PATH PATH remote: gems/ipynbdiff specs: - ipynbdiff (0.4.7) + ipynbdiff (0.4.8) diffy (~> 3.4) oj (~> 3.13.16) @@ -150,14 +151,6 @@ PATH mail (~> 2.7) oauth2 (>= 1.4.4, < 3) -PATH - remote: vendor/gems/omniauth-azure-oauth2 - specs: - omniauth-azure-oauth2 (0.0.10) - jwt (>= 1.0, < 3.0) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.4) - PATH remote: vendor/gems/omniauth-gitlab specs: @@ -205,70 +198,70 @@ GEM acme-client (2.0.11) faraday (>= 1.0, < 3.0.0) faraday-retry (~> 1.0) - actioncable (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + actioncable (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.1) - actionpack (= 7.0.8.1) - activejob (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionmailbox (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.1) - actionpack (= 7.0.8.1) - actionview (= 7.0.8.1) - activejob (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionmailer (7.0.8.4) + actionpack (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8.1) - actionview (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionpack (7.0.8.4) + actionview (= 7.0.8.4) + activesupport (= 7.0.8.4) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.1) - actionpack (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + actiontext (7.0.8.4) + actionpack (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.1) - activesupport (= 7.0.8.1) + actionview (7.0.8.4) + activesupport (= 7.0.8.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.1) - activesupport (= 7.0.8.1) + activejob (7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.3.6) - activemodel (7.0.8.1) - activesupport (= 7.0.8.1) - activerecord (7.0.8.1) - activemodel (= 7.0.8.1) - activesupport (= 7.0.8.1) + activemodel (7.0.8.4) + activesupport (= 7.0.8.4) + activerecord (7.0.8.4) + activemodel (= 7.0.8.4) + activesupport (= 7.0.8.4) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (7.0.8.1) - actionpack (= 7.0.8.1) - activejob (= 7.0.8.1) - activerecord (= 7.0.8.1) - activesupport (= 7.0.8.1) + activestorage (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activesupport (= 7.0.8.4) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8.1) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -286,7 +279,7 @@ GEM mize tins (~> 1.0) android_key_attestation (0.3.0) - apollo_upload_server (2.1.5) + apollo_upload_server (2.1.6) actionpack (>= 6.1.6) graphql (>= 1.8) app_store_connect (0.29.0) @@ -311,7 +304,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.191.6) + aws-sdk-core (3.197.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -319,8 +312,8 @@ GEM aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.146.1) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-s3 (1.151.0) + aws-sdk-core (~> 3, >= 3.194.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) @@ -348,7 +341,7 @@ GEM backport (1.2.0) base32 (0.3.2) base64 (0.2.0) - batch-loader (2.0.1) + batch-loader (2.0.5) bcrypt (3.1.18) benchmark (0.2.0) benchmark-ips (2.11.0) @@ -361,6 +354,7 @@ GEM erubi (>= 1.0.0) rack (>= 0.9.0) rouge (>= 1.0.0) + bigdecimal (3.1.7) bindata (2.4.11) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) @@ -426,6 +420,8 @@ GEM countries (4.0.1) i18n_data (~> 0.13.0) sixarm_ruby_unaccent (~> 1.1) + coverband (6.1.2) + redis (>= 3.0) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.6) @@ -553,7 +549,7 @@ GEM encryptor (3.0.0) erubi (1.12.0) escape_utils (1.3.0) - et-orbi (1.2.7) + et-orbi (1.2.11) tzinfo ethon (0.16.0) ffi (>= 1.15.0) @@ -633,18 +629,19 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.19.0) - fog-core (< 2.3) + fog-google (1.24.1) + addressable (>= 2.7.0) + fog-core (< 2.5) fog-json (~> 1.2) fog-xml (~> 0.1.0) - google-apis-compute_v1 (~> 0.14) - google-apis-dns_v1 (~> 0.12) - google-apis-iamcredentials_v1 (~> 0.6) - google-apis-monitoring_v3 (~> 0.12) - google-apis-pubsub_v1 (~> 0.7) - google-apis-sqladmin_v1beta4 (~> 0.13) - google-apis-storage_v1 (~> 0.6) - google-cloud-env (~> 1.2) + google-apis-compute_v1 (~> 0.53) + google-apis-dns_v1 (~> 0.28) + google-apis-iamcredentials_v1 (~> 0.15) + google-apis-monitoring_v3 (~> 0.37) + google-apis-pubsub_v1 (~> 0.30) + google-apis-sqladmin_v1beta4 (~> 0.38) + google-apis-storage_v1 (>= 0.19, < 1) + google-cloud-env (>= 1.2, < 3.0) fog-json (1.2.0) fog-core multi_json (~> 1.10) @@ -670,7 +667,7 @@ GEM googleapis-common-protos-types (>= 1.3.1, < 2.a) googleauth (~> 1.0) grpc (~> 1.36) - gdk-toogle (0.9.3) + gdk-toogle (0.9.5) haml rails (>= 7.0.4.2) gemoji (3.0.1) @@ -687,7 +684,7 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (16.11.0.pre.rc1) + gitaly (17.0.2) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) @@ -707,22 +704,22 @@ GEM fog-core (~> 2.1) fog-json (~> 1.2) mime-types - gitlab-glfm-markdown (0.0.14) - rb_sys (~> 0.9.86) - gitlab-labkit (0.35.1) + gitlab-glfm-markdown (0.0.17) + rb_sys (= 0.9.94) + gitlab-labkit (0.36.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) - grpc (>= 1.37) + grpc (>= 1.62) jaeger-client (~> 1.1.0) opentracing (~> 0.4) pg_query (>= 4.2.3, < 6.0) redis (> 3.0.0, < 6.0.0) - gitlab-license (2.4.0) - gitlab-mail_room (0.0.24) + gitlab-license (2.5.0) + gitlab-mail_room (0.0.25) jwt (>= 2.0) net-imap (>= 0.2.1) oauth2 (>= 1.4.4, < 3) - redis (>= 4, < 6) + redis (>= 5, < 6) redis-namespace (>= 1.8.2) gitlab-markup (1.9.0) gitlab-net-dns (0.9.2) @@ -730,12 +727,13 @@ GEM activesupport (>= 5.2.0) rake (~> 13.0) snowplow-tracker (~> 0.8.0) - gitlab-styles (11.0.0) - rubocop (~> 1.57.1) - rubocop-graphql (~> 0.18) - rubocop-performance (~> 1.15) - rubocop-rails (~> 2.17) - rubocop-rspec (~> 2.22) + gitlab-styles (12.0.1) + rubocop (~> 1.62.1) + rubocop-factory_bot (~> 2.25.1) + rubocop-graphql (~> 1.5.0) + rubocop-performance (~> 1.20.2) + rubocop-rails (~> 2.24.0) + rubocop-rspec (~> 2.27.1) gitlab_chronic_duration (0.12.0) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) @@ -743,11 +741,12 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (1.21.1) - activesupport (>= 6.1, < 7.2) + gitlab_quality-test_tooling (1.28.0) + activesupport (>= 7.0, < 7.2) amatch (~> 0.4.1) gitlab (~> 4.19) http (~> 5.0) + influxdb-client (~> 3.1) nokogiri (~> 1.10) parallel (>= 1, < 2) rainbow (>= 3, < 4) @@ -782,16 +781,16 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-dns_v1 (0.28.0) - google-apis-core (>= 0.9.0, < 2.a) + google-apis-dns_v1 (0.36.0) + google-apis-core (>= 0.11.0, < 2.a) google-apis-iam_v1 (0.36.0) google-apis-core (>= 0.9.1, < 2.a) google-apis-iamcredentials_v1 (0.15.0) google-apis-core (>= 0.9.0, < 2.a) - google-apis-monitoring_v3 (0.37.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-pubsub_v1 (0.30.0) - google-apis-core (>= 0.9.1, < 2.a) + google-apis-monitoring_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-pubsub_v1 (0.45.0) + google-apis-core (>= 0.11.0, < 2.a) google-apis-serviceusage_v1 (0.28.0) google-apis-core (>= 0.9.1, < 2.a) google-apis-sqladmin_v1beta4 (0.41.0) @@ -852,7 +851,7 @@ GEM mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept - grape-entity (0.10.2) + grape-entity (1.0.1) activesupport (>= 3.0.0) multi_json (>= 1.3.2) grape-path-helpers (2.0.1) @@ -860,7 +859,7 @@ GEM grape (~> 2.0) rake (> 12) ruby2_keywords (~> 0.0.2) - grape-swagger (2.0.2) + grape-swagger (2.1.0) grape (>= 1.7, < 3.0) rack-test (~> 2) grape-swagger-entity (0.5.1) @@ -877,8 +876,8 @@ GEM faraday_middleware graphql-client graphlyte (1.0.0) - graphql (2.2.5) - racc (~> 1.4) + graphql (2.3.4) + base64 graphql-client (0.19.0) activesupport (>= 3.0) graphql @@ -890,7 +889,7 @@ GEM gemoji (~> 3.0) graphql (~> 2.0) html-pipeline (~> 2.14, >= 2.14.3) - grpc (1.60.0) + grpc (1.63.0) google-protobuf (~> 3.25) googleapis-common-protos-types (~> 1.0) grpc-google-iam-v1 (1.5.0) @@ -916,7 +915,7 @@ GEM haml (5.2.2) temple (>= 0.8.0) tilt - haml_lint (0.53.0) + haml_lint (0.58.0) haml (>= 5.0) parallel (~> 1.10) rainbow @@ -962,7 +961,7 @@ GEM ice_nine (0.11.2) imagen (0.1.8) parser (>= 2.5, != 2.5.1.1) - influxdb-client (2.9.0) + influxdb-client (3.1.0) invisible_captcha (2.1.0) rails (>= 5.2) ipaddr (1.2.5) @@ -1011,7 +1010,7 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kas-grpc (0.4.0) + kas-grpc (0.5.0) grpc (~> 1.0) knapsack (1.22.0) rake @@ -1027,7 +1026,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.6.8) + lefthook (1.6.14) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -1036,7 +1035,7 @@ GEM railties (>= 5.2) rexml libyajl2 (2.1.0) - license_finder (7.0.1) + license_finder (7.1.0) bundler rubyzip (>= 1, < 3) thor (~> 1.2) @@ -1065,7 +1064,7 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - lookbook (2.2.2) + lookbook (2.3.1) activemodel css_parser htmlbeautifier (~> 1.3) @@ -1117,11 +1116,10 @@ GEM mustermann-grape (1.0.2) mustermann (>= 1.0.0) nap (1.1.0) - neighbor (0.2.3) - activerecord (>= 5.2) + neighbor (0.3.2) + activerecord (>= 6.1) nenv (0.3.0) - net-http (0.1.1) - net-protocol + net-http (0.4.1) uri net-http-persistent (4.0.1) connection_pool (~> 2.2) @@ -1191,10 +1189,6 @@ GEM omniauth-oauth2 (~> 1) omniauth-azure-activedirectory-v2 (2.0.0) omniauth-oauth2 (~> 1.8) - omniauth-dingtalk-oauth2 (1.0.1) - omniauth-oauth2 (~> 1.7) - omniauth-facebook (4.0.0) - omniauth-oauth2 (~> 1.2) omniauth-github (2.0.1) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8) @@ -1203,9 +1197,6 @@ GEM oauth2 (~> 2.0.6) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8.0) - omniauth-oauth (1.2.0) - oauth - omniauth (>= 1.0, < 3) omniauth-oauth2 (1.8.0) oauth2 (>= 1.4, < 3) omniauth (~> 2.0) @@ -1217,9 +1208,6 @@ GEM ruby-saml (~> 1.12) omniauth-shibboleth-redux (2.0.0) omniauth (>= 2.0.0) - omniauth-twitter (1.4.0) - omniauth-oauth (~> 1.1) - rack omniauth_openid_connect (0.6.1) omniauth (>= 1.9, < 3) openid_connect (~> 1.1) @@ -1237,6 +1225,110 @@ GEM openssl (3.1.0) openssl-signature_algorithm (1.3.0) openssl (> 2.0) + opentelemetry-api (1.2.5) + opentelemetry-common (0.21.0) + opentelemetry-api (~> 1.0) + opentelemetry-exporter-otlp (0.27.0) + google-protobuf (~> 3.14) + googleapis-common-protos-types (~> 1.3) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.20) + opentelemetry-sdk (~> 1.2) + opentelemetry-semantic_conventions + opentelemetry-helpers-sql-obfuscation (0.1.0) + opentelemetry-common (~> 0.20) + opentelemetry-instrumentation-action_pack (0.9.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (~> 0.21) + opentelemetry-instrumentation-action_view (0.7.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-active_support (~> 0.1) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_job (0.7.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_record (0.7.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_support (0.5.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-aws_sdk (0.5.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-base (0.22.3) + opentelemetry-api (~> 1.0) + opentelemetry-registry (~> 0.1) + opentelemetry-instrumentation-concurrent_ruby (0.21.3) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-ethon (0.21.5) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-excon (0.22.2) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-faraday (0.24.3) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-grape (0.1.8) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (~> 0.21) + opentelemetry-instrumentation-graphql (0.28.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http (0.23.3) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http_client (0.22.5) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-net_http (0.22.5) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-pg (0.27.3) + opentelemetry-api (~> 1.0) + opentelemetry-helpers-sql-obfuscation + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (0.24.4) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rails (0.30.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-action_pack (~> 0.9.0) + opentelemetry-instrumentation-action_view (~> 0.7.0) + opentelemetry-instrumentation-active_job (~> 0.7.0) + opentelemetry-instrumentation-active_record (~> 0.7.0) + opentelemetry-instrumentation-active_support (~> 0.5.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rake (0.2.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-redis (0.25.5) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-sidekiq (0.25.4) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-registry (0.3.0) + opentelemetry-api (~> 1.1) + opentelemetry-sdk (1.4.1) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.20) + opentelemetry-registry (~> 0.2) + opentelemetry-semantic_conventions + opentelemetry-semantic_conventions (1.10.0) + opentelemetry-api (~> 1.0) opentracing (0.5.0) optimist (3.0.1) org-ruby (0.9.12) @@ -1264,7 +1356,7 @@ GEM diff-lcs (~> 1.5) expgen (~> 0.1) rainbow (~> 3.1.1) - parallel (1.22.1) + parallel (1.24.0) parser (3.3.0.5) ast (~> 2.4.1) racc @@ -1288,7 +1380,7 @@ GEM prime (0.1.2) forwardable singleton - prism (0.24.0) + prism (0.29.0) proc_to_ast (0.1.0) coderay parser @@ -1337,20 +1429,20 @@ GEM rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) - rails (7.0.8.1) - actioncable (= 7.0.8.1) - actionmailbox (= 7.0.8.1) - actionmailer (= 7.0.8.1) - actionpack (= 7.0.8.1) - actiontext (= 7.0.8.1) - actionview (= 7.0.8.1) - activejob (= 7.0.8.1) - activemodel (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + rails (7.0.8.4) + actioncable (= 7.0.8.4) + actionmailbox (= 7.0.8.4) + actionmailer (= 7.0.8.4) + actionpack (= 7.0.8.4) + actiontext (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activemodel (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) bundler (>= 1.15.0) - railties (= 7.0.8.1) + railties (= 7.0.8.4) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -1361,12 +1453,12 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails-i18n (7.0.3) + rails-i18n (7.0.9) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + railties (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) method_source rake (>= 12.2) thor (~> 1.0) @@ -1376,7 +1468,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rb_sys (0.9.86) + rb_sys (0.9.94) rbtrace (0.5.1) ffi (>= 1.0.6) msgpack (>= 0.4.3) @@ -1388,20 +1480,20 @@ GEM json recursive-open-struct (1.1.3) redcarpet (3.6.0) - redis (5.0.8) - redis-client (>= 0.17.0) + redis (5.2.0) + redis-client (>= 0.22.0) redis-actionpack (5.4.0) actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 4) redis-store (>= 1.1.0, < 2) - redis-client (0.21.1) + redis-client (0.22.2) connection_pool - redis-cluster-client (0.7.5) - redis-client (~> 0.12) - redis-clustering (5.0.8) - redis (= 5.0.8) - redis-cluster-client (>= 0.7.0) - redis-namespace (1.10.0) + redis-cluster-client (0.8.2) + redis-client (~> 0.22) + redis-clustering (5.2.0) + redis (= 5.2.0) + redis-cluster-client (>= 0.7.11) + redis-namespace (1.11.0) redis (>= 4) redis-rack (3.0.0) rack-session (>= 0.2.0) @@ -1452,7 +1544,7 @@ GEM rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-parameterized (1.0.0) + rspec-parameterized (1.0.2) rspec-parameterized-core (< 2) rspec-parameterized-table_syntax (< 2) rspec-parameterized-core (1.0.0) @@ -1480,51 +1572,49 @@ GEM activerecord get_process_mem rails - rubocop (1.57.2) + rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-ast (1.31.2) + parser (>= 3.3.0.4) + rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) - rubocop (~> 1.33) - rubocop-graphql (0.19.0) - rubocop (>= 0.87, < 2) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.22.1) + rubocop-factory_bot (2.25.1) + rubocop (~> 1.41) + rubocop-graphql (1.5.1) + rubocop (>= 0.90, < 2) + rubocop-performance (1.20.2) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.24.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.25.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rspec (2.27.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.14.6) + ruby-lsp (0.16.7) language_server-protocol (~> 3.17.0) - prism (>= 0.22.0, < 0.25) + prism (>= 0.29.0, < 0.30) sorbet-runtime (>= 0.5.10782) - ruby-lsp-rails (0.3.3) - actionpack (>= 6.0) - activerecord (>= 6.0) - railties (>= 6.0) - ruby-lsp (>= 0.14.2, < 0.15.0) + ruby-lsp-rails (0.3.6) + ruby-lsp (>= 0.16.5, < 0.17.0) sorbet-runtime (>= 0.5.9897) - ruby-lsp-rspec (0.1.10) - ruby-lsp (~> 0.14.0) + ruby-lsp-rspec (0.1.11) + ruby-lsp (~> 0.16.0) ruby-magic (0.6.0) mini_portile2 (~> 2.8) ruby-openai (3.7.0) @@ -1555,25 +1645,24 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (4.19.0) + selenium-webdriver (4.21.1) base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semver_dialects (2.0.2) + semver_dialects (3.0.1) deb_version (~> 1.0.1) pastel (~> 0.8.0) thor (~> 1.3) tty-command (~> 0.10.1) - sentry-rails (5.10.0) + sentry-rails (5.17.3) railties (>= 5.0) - sentry-ruby (~> 5.10.0) - sentry-raven (3.1.2) - faraday (>= 1.0) - sentry-ruby (5.10.0) + sentry-ruby (~> 5.17.3) + sentry-ruby (5.17.3) + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - sentry-sidekiq (5.10.0) - sentry-ruby (~> 5.10.0) + sentry-sidekiq (5.17.3) + sentry-ruby (~> 5.17.3) sidekiq (>= 3.0) sexp_processor (4.17.1) shellany (0.0.1) @@ -1673,7 +1762,7 @@ GEM unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) - test-prof (1.3.2) + test-prof (1.3.3) test_file_finder (0.3.1) faraday (>= 1.0, < 3.0, != 2.0.0) text (1.3.1) @@ -1758,7 +1847,7 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.11.0) + view_component (3.12.1) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1789,7 +1878,7 @@ GEM webfinger (1.2.0) activesupport httpclient (>= 2.4) - webmock (3.23.0) + webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -1825,7 +1914,7 @@ DEPENDENCIES acts-as-taggable-on (~> 10.0) addressable (~> 2.8) akismet (~> 3.0) - apollo_upload_server (~> 2.1.5) + apollo_upload_server (~> 2.1.6) app_store_connect arr-pm (~> 0.0.12) asciidoctor (~> 2.0.18) @@ -1836,12 +1925,12 @@ DEPENDENCIES attr_encrypted (~> 3.2.4)! awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.191.6) - aws-sdk-s3 (~> 1.146.1) + aws-sdk-core (~> 3.197.0) + aws-sdk-s3 (~> 1.151.0) axe-core-rspec (~> 4.9.0) babosa (~> 2.0) base32 (~> 0.3.0) - batch-loader (~> 2.0.1) + batch-loader (~> 2.0.5) bcrypt (~> 3.1, >= 3.1.14) benchmark-ips (~> 2.11.0) benchmark-memory (~> 0.1) @@ -1861,6 +1950,7 @@ DEPENDENCIES concurrent-ruby (~> 1.1) connection_pool (~> 2.4) countries (~> 4.0.0) + coverband (= 6.1.2) creole (~> 0.5.0) crystalball (~> 0.7.0) cssbundling-rails (= 1.4.0) @@ -1900,24 +1990,24 @@ DEPENDENCIES fog-aliyun (~> 0.4) fog-aws (~> 3.18) fog-core (= 2.1.0) - fog-google (~> 1.19) + fog-google (~> 1.24.1) fog-local (~> 0.8) fugit (~> 1.8.1) fuubar (~> 2.2.0) - gdk-toogle (~> 0.9) + gdk-toogle (~> 0.9, >= 0.9.5) gettext (~> 3.4, >= 3.4.9) gettext_i18n_rails (~> 1.12.0) - gitaly (~> 16.11.0.pre.rc1) + gitaly (~> 17.0.1) gitlab-backup-cli! gitlab-chronic (~> 0.10.5) gitlab-dangerfiles (~> 4.7.0) gitlab-experiment (~> 0.9.1) gitlab-fog-azure-rm (~> 1.9.1) - gitlab-glfm-markdown (~> 0.0.14) + gitlab-glfm-markdown (~> 0.0.17) gitlab-housekeeper! gitlab-http! - gitlab-labkit (~> 0.35.1) - gitlab-license (~> 2.4) + gitlab-labkit (~> 0.36.0) + gitlab-license (~> 2.5) gitlab-mail_room (~> 0.0.24) gitlab-markup (~> 1.9.0) gitlab-net-dns (~> 0.9.2) @@ -1928,11 +2018,11 @@ DEPENDENCIES gitlab-sdk (~> 0.3.0) gitlab-secret_detection! gitlab-sidekiq-fetcher! - gitlab-styles (~> 11.0.0) + gitlab-styles (~> 12.0.1) gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 1.21.1) + gitlab_quality-test_tooling (~> 1.28.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -1952,20 +2042,20 @@ DEPENDENCIES googleauth (~> 1.8.1) gpgme (~> 2.0.23) grape (~> 2.0.0) - grape-entity (~> 0.10.2) + grape-entity (~> 1.0.1) grape-path-helpers (~> 2.0.1) - grape-swagger (~> 2.0.2) + grape-swagger (~> 2.1.0) grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8, >= 1.8.4) graphiql-rails (~> 1.8.0) graphlient (~> 0.6.0) graphlyte (~> 1.0.0) - graphql (~> 2.2.5) + graphql (~> 2.3.4) graphql-docs (~> 4.0.0) - grpc (~> 1.60.0) + grpc (~> 1.63) gssapi (~> 1.3.1) guard-rspec - haml_lint (~> 0.53) + haml_lint (~> 0.58) hamlit (~> 2.15.0) hashie (~> 5.0.0) health_check (~> 3.0) @@ -1973,7 +2063,7 @@ DEPENDENCIES html2text httparty (~> 0.21.0) icalendar - influxdb-client (~> 2.9) + influxdb-client (~> 3.1) invisible_captcha (~> 2.1.0) ipaddr (~> 1.2.5) ipaddress (~> 0.8.3) @@ -1985,7 +2075,7 @@ DEPENDENCIES jsonb_accessor (~> 1.3.10) jwt (~> 2.5) kaminari (~> 1.2.2) - kas-grpc (~> 0.4.0) + kas-grpc (~> 0.5.0) knapsack (~> 1.22.0) kramdown (~> 2.3.1) kubeclient (~> 4.11.0) @@ -1997,7 +2087,7 @@ DEPENDENCIES lockbox (~> 1.3.0) lograge (~> 0.5) loofah (~> 2.22.0) - lookbook (~> 2.2, >= 2.2.2) + lookbook (~> 2.3) lru_redux mail (= 2.8.1) mail-smtp_pool (~> 0.1.0)! @@ -2007,8 +2097,8 @@ DEPENDENCIES mini_magick (~> 4.12) minitest (~> 5.11.0) multi_json (~> 1.14.1) - neighbor (~> 0.2.3) - net-http (= 0.1.1) + neighbor (~> 0.3.2) + net-http (= 0.4.1) net-ldap (~> 0.17.1) net-ntp net-protocol (~> 0.1.3) @@ -2023,9 +2113,6 @@ DEPENDENCIES omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 3.1) omniauth-azure-activedirectory-v2 (~> 2.0) - omniauth-azure-oauth2 (~> 0.0.9)! - omniauth-dingtalk-oauth2 (~> 1.0) - omniauth-facebook (~> 4.0.0) omniauth-github (= 2.0.1) omniauth-gitlab (~> 4.0.0)! omniauth-google-oauth2 (~> 1.1) @@ -2033,16 +2120,38 @@ DEPENDENCIES omniauth-salesforce (~> 1.0.5)! omniauth-saml (~> 2.1.0) omniauth-shibboleth-redux (~> 2.0) - omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0)! omniauth_openid_connect (~> 0.6.1) openid_connect (= 1.3.0) openssl (~> 3.0) + opentelemetry-exporter-otlp + opentelemetry-instrumentation-action_pack + opentelemetry-instrumentation-action_view + opentelemetry-instrumentation-active_job + opentelemetry-instrumentation-active_record + opentelemetry-instrumentation-active_support + opentelemetry-instrumentation-aws_sdk + opentelemetry-instrumentation-concurrent_ruby + opentelemetry-instrumentation-ethon + opentelemetry-instrumentation-excon + opentelemetry-instrumentation-faraday + opentelemetry-instrumentation-grape + opentelemetry-instrumentation-graphql + opentelemetry-instrumentation-http + opentelemetry-instrumentation-http_client + opentelemetry-instrumentation-net_http + opentelemetry-instrumentation-pg + opentelemetry-instrumentation-rack + opentelemetry-instrumentation-rails + opentelemetry-instrumentation-rake + opentelemetry-instrumentation-redis + opentelemetry-instrumentation-sidekiq + opentelemetry-sdk org-ruby (~> 0.9.12) os (~> 1.1, >= 1.1.4) pact (~> 1.64) parallel (~> 1.19) - parser (~> 3.3, >= 3.3.0.5) + parser (= 3.3.0.5) parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.6) @@ -2060,17 +2169,17 @@ DEPENDENCIES rack-oauth2 (~> 1.21.3) rack-proxy (~> 0.7.7) rack-timeout (~> 0.6.3) - rails (~> 7.0.8.1) + rails (~> 7.0.8.4) rails-controller-testing - rails-i18n (~> 7.0) + rails-i18n (~> 7.0, >= 7.0.9) rainbow (~> 3.0) rbtrace (~> 0.4) re2 (= 2.7.0) recaptcha (~> 5.12) - redis (~> 5.0.0) + redis (~> 5.2.0) redis-actionpack (~> 5.4.0) - redis-clustering (~> 5.0.0) - redis-namespace (~> 1.10.0) + redis-clustering (~> 5.2.0) + redis-namespace (~> 1.11.0) request_store (~> 1.5.1) responders (~> 3.0) retriable (~> 3.1.2) @@ -2078,15 +2187,15 @@ DEPENDENCIES rouge (~> 4.2.0) rqrcode (~> 2.2) rspec-benchmark (~> 0.6.0) - rspec-parameterized (~> 1.0) + rspec-parameterized (~> 1.0, >= 1.0.2) rspec-rails (~> 6.1.1) rspec-retry (~> 0.6.2) rspec_junit_formatter rspec_profiling (~> 0.0.9) rubocop ruby-fogbugz (~> 0.3.0) - ruby-lsp (~> 0.14.6) - ruby-lsp-rails (~> 0.3.3) + ruby-lsp (~> 0.16.7) + ruby-lsp-rails (~> 0.3.6) ruby-lsp-rspec (~> 0.1.10) ruby-magic (~> 0.6) ruby-openai (~> 3.7) @@ -2097,12 +2206,11 @@ DEPENDENCIES sanitize (~> 6.0.2) sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) - selenium-webdriver (~> 4.19) - semver_dialects (~> 2.0, >= 2.0.2) - sentry-rails (~> 5.10.0) - sentry-raven (~> 3.1) - sentry-ruby (~> 5.10.0) - sentry-sidekiq (~> 5.10.0) + selenium-webdriver (~> 4.21, >= 4.21.1) + semver_dialects (~> 3.0) + sentry-rails (~> 5.17.3) + sentry-ruby (~> 5.17.3) + sentry-sidekiq (~> 5.17.3) shoulda-matchers (~> 5.1.0) sidekiq! sidekiq-cron (~> 1.12.0) @@ -2127,7 +2235,7 @@ DEPENDENCIES tanuki_emoji (~> 0.9) telesignenterprise (~> 2.2) terser (= 1.0.2) - test-prof (~> 1.3.2) + test-prof (~> 1.3.3) test_file_finder (~> 0.3.1) thrift (>= 0.16.0) timfel-krb5-auth (~> 0.8) @@ -2139,7 +2247,7 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.13) version_sorter (~> 2.3) - view_component (~> 3.11.0) + view_component (~> 3.12.1) vite_rails (~> 3.0.17) vite_ruby (~> 3.5.0) vmstat (~> 2.3.0) @@ -2151,4 +2259,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.5.8 + 2.5.11 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index dff2917092d8..f64d8b7daba9 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -13,25 +13,25 @@ src: }; actioncable = { dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j86qjs1zw34p0p7d5napa1vvwqlvm9nmv7ckxxhcba1qv4dspmw"; + sha256 = "1c46q4ykf8cqcpzad7zhkrxjhvf92sil0185zvxwzhj95p1zp5vr"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f68h8cl6dqbz7mq3x43s0s82291nani3bz1hrxkk2qpgda23mw9"; + sha256 = "0x100vq4rf2c5ndz8ai00hb5gsb9ax2xqc89dsfzzhxbpa9gs9ik"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -39,10 +39,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "077j47jsg0wqwx5b13n4h0g3g409b6kfrlazpzgjpa3pal74f7sc"; + sha256 = "1hds7b6n7vsa64fmma7wl7x9mxscr89myfb13vxni5fcns1agwzr"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -50,21 +50,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax"; + sha256 = "18k05a55i0xgyv60lx0m1psnyncn935j76ivbp9hssqpij00jj1f"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "044qi3zhzxlfq7slc2pb9ky9mdivp1m1sjyhjvnsi64ggq7cvr22"; + sha256 = "1g54g1kjyrwv9g592gxfz7z6ksmj916l1cgkxk54zhywxf6gpn0y"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -72,10 +72,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa"; + sha256 = "03rfynhj40270dqhkm4cyaphzb37b4fdiaqh9grvcfq760vx7ha5"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -83,10 +83,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yql9v4cd1xbqgnzlf3cv4a6sm26v2y4gsgcbbfgvfc0hhlfjklg"; + sha256 = "1b54didwsg5p8wn30qjwspzh97w7g07hrsdzr7wdrdly4zii7sr1"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activemodel = { dependencies = ["activesupport"]; @@ -94,10 +94,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1"; + sha256 = "1mi5cppdmkzgr2z135ibs0bq71qndbnip0vfflz1n4j4hqnhjkpg"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -105,10 +105,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf"; + sha256 = "1pkv0jvvjc3grr0rvxni9b3j3hb22jaj0h70g476h9w54p0aljcb"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -133,14 +133,14 @@ src: }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f4g3589i5ii4gdfazv6d9rjinr16aarh6g12v8378ck7jll3mhz"; + sha256 = "1qdqx20dqkg7iwzb8q5148x5sl9mr2063hxzy4i7i94af2d2vz6b"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -148,10 +148,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh"; + sha256 = "15z11983ws5svibg6rky9k2mgd4d4chnvddyxfpgn81b81q70139"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -233,10 +233,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "198k6ikkz6wdnl9i4m569s384sx2r2pyn4l74yvyhz6zdflvwrhg"; + sha256 = "1cnddcnrb0gwhi0w2hrmh53fkpdxxy2v80rfp2q1hrcf4mr41v6w"; type = "gem"; }; - version = "2.1.5"; + version = "2.1.6"; }; app_store_connect = { dependencies = ["activesupport" "jwt"]; @@ -400,10 +400,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08h9apxdn2aflkg751j4i56ks4750znfbj56w4zlxf4jk7jxkbyk"; + sha256 = "146v6mhf8gma5vmzhz643sddwzhv3acapv7nhaisv4fcsf1lii1l"; type = "gem"; }; - version = "3.191.6"; + version = "3.197.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -422,10 +422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1al80phz4x9wwfnr07q1l8h5f0qxgfrrycbg8jvznhxm3zhrakrq"; + sha256 = "023h9xx65dd91z1sk9znhfwp4wr48imnnhdhvczv64m17r7ych4y"; type = "gem"; }; - version = "1.146.1"; + version = "1.151.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -538,10 +538,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17d8wwj880zar5h8zxdmw878shgmljmmv957802fw5nkg3gi3xwk"; + sha256 = "04zjpzb2m1qjxk0lzdi5m812wyq5kkwcdbxs1asbm67lp0wgcjwn"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.5"; }; bcrypt = { groups = ["default"]; @@ -625,6 +625,16 @@ src: }; version = "2.10.1"; }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + type = "gem"; + }; + version = "3.1.7"; + }; bindata = { groups = ["default"]; platforms = []; @@ -978,6 +988,17 @@ src: }; version = "4.0.1"; }; + coverband = { + dependencies = ["redis"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cms6ppz367fqfynyzjdsy1lqrxkrh6vvfzznrw3mxhz1xmkb7wp"; + type = "gem"; + }; + version = "6.1.2"; + }; crack = { dependencies = ["safe_yaml"]; groups = ["default" "test"]; @@ -1599,10 +1620,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v"; + sha256 = "0r6zylqjfv0xhdxvldr0kgmnglm57nm506pcm6085f0xqa68cvnj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.11"; }; ethon = { dependencies = ["ffi"]; @@ -1973,15 +1994,15 @@ src: version = "2.1.0"; }; fog-google = { - dependencies = ["fog-core" "fog-json" "fog-xml" "google-apis-compute_v1" "google-apis-dns_v1" "google-apis-iamcredentials_v1" "google-apis-monitoring_v3" "google-apis-pubsub_v1" "google-apis-sqladmin_v1beta4" "google-apis-storage_v1" "google-cloud-env"]; + dependencies = ["addressable" "fog-core" "fog-json" "fog-xml" "google-apis-compute_v1" "google-apis-dns_v1" "google-apis-iamcredentials_v1" "google-apis-monitoring_v3" "google-apis-pubsub_v1" "google-apis-sqladmin_v1beta4" "google-apis-storage_v1" "google-cloud-env"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "127l22c7lhg166sylfhxys41p0i3nlkxkpzzgw8q9zip10irm41w"; + sha256 = "1q2qhdkz7axp1f853d3jxx852gj5idrqhypxk8k3zm9fs72lxmnw"; type = "gem"; }; - version = "1.19.0"; + version = "1.24.1"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -2085,10 +2106,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gzf4b6y5v0d5pbc0lq33383m3c8y8kq5yy57124lb9bblymszw9"; + sha256 = "0jfjp87f4zi5jp8ydwabvfz3dv115ickaaasbs8c096kfqjrgf1q"; type = "gem"; }; - version = "0.9.3"; + version = "0.9.5"; }; gemoji = { groups = ["default" "development" "test"]; @@ -2150,10 +2171,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bp7lsqhcmb1fi1wsij1gbl0ip9jcwmzxagfg39c7dnm7xglycr4"; + sha256 = "10ms9zz9j1zvabgdldpsn0s8g7v8q7vn3dkyvzh551iijzqcvlgc"; type = "gem"; }; - version = "16.11.0.pre.rc1"; + version = "17.0.2"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2226,10 +2247,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0finxlax2pgxw85qnyz3p4pmi8dz6qj8bsjkrkrnkd93k41lyfcn"; + sha256 = "0sdaq9av30761h9x7kjwmwri22265x1dnpq24law6w9sqmgm8ygk"; type = "gem"; }; - version = "0.0.14"; + version = "0.0.17"; }; gitlab-housekeeper = { dependencies = ["activesupport" "awesome_print" "httparty" "rubocop"]; @@ -2242,7 +2263,7 @@ src: version = "0.1.0"; }; gitlab-http = { - dependencies = ["activesupport" "concurrent-ruby" "httparty" "ipaddress" "railties"]; + dependencies = ["activesupport" "concurrent-ruby" "httparty" "ipaddress" "net-http" "railties"]; groups = ["default"]; platforms = []; source = { @@ -2257,20 +2278,20 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m41by1hly50yq9vsz5pbrb51yryf46n9pm7wnrinaisccrinl79"; + sha256 = "10gr7886pphgxg8ja1axba022l0b1c5mvqi1hfdhrvbh70f1vwim"; type = "gem"; }; - version = "0.35.1"; + version = "0.36.0"; }; gitlab-license = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "082ycgvq7j0kyqrbx8shipqk3lgz6i279caf1ljvk9h5wsqqy8zx"; + sha256 = "0k9zaybfzp7q8w07ghf44q3yngxyrr68l623r9v7il9aki36q5jc"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; gitlab-mail_room = { dependencies = ["jwt" "net-imap" "oauth2" "redis" "redis-namespace"]; @@ -2278,10 +2299,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1crw7k0mdzkrc94xw901dlmzzhhaa8a2bxyvk2y29h5w7pvkvgy7"; + sha256 = "06ivc4cbr5lc6lja947flzlppp3d9s44fwd3x8an0yvrq31yfg12"; type = "gem"; }; - version = "0.0.24"; + version = "0.0.25"; }; gitlab-markup = { groups = ["default"]; @@ -2375,15 +2396,15 @@ src: version = "0.11.0"; }; gitlab-styles = { - dependencies = ["rubocop" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; + dependencies = ["rubocop" "rubocop-factory_bot" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ss0p7al6vyf5qwzyfbgaaxpa3ykvszwc5in3p2mm5g9dh3frn0d"; + sha256 = "0cyi9sccg1h7ia12i9jwbq5ygic53c7pc08ms7i1h7qfmfq058yq"; type = "gem"; }; - version = "11.0.0"; + version = "12.0.1"; }; gitlab-utils = { dependencies = ["actionview" "activesupport" "addressable" "rake"]; @@ -2418,15 +2439,15 @@ src: version = "2.2.0"; }; gitlab_quality-test_tooling = { - dependencies = ["activesupport" "amatch" "gitlab" "http" "nokogiri" "parallel" "rainbow" "rspec-parameterized" "table_print" "zeitwerk"]; + dependencies = ["activesupport" "amatch" "gitlab" "http" "influxdb-client" "nokogiri" "parallel" "rainbow" "rspec-parameterized" "table_print" "zeitwerk"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g4fsldxs63ds31sni422xk0g3yrr9jpga0bah5ip4hys8as3wl3"; + sha256 = "1wsizq4hxcwkd8si14q7hb8rxh9hygpm3s7s0f8cyz2b62ycdcnh"; type = "gem"; }; - version = "1.21.1"; + version = "1.28.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2533,10 +2554,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7k1nanm4wqyx19m5x9xzzm3nvf89gg5vr1dq4nfyvkl8g668zm"; + sha256 = "0ivx6km85mlycb11x2rbkyg3kl4syy3730q7pk8h6zdkibbp7ljx"; type = "gem"; }; - version = "0.28.0"; + version = "0.36.0"; }; google-apis-iam_v1 = { dependencies = ["google-apis-core"]; @@ -2566,10 +2587,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skk42y2y81jlj0qfk790wqz3sdaxrykrc4mp1ysr0zsinp654id"; + sha256 = "0a31sid7p4qn4m1gcq8z1bsqdyzzc84h4frh2dw97k5lwpff2zv7"; type = "gem"; }; - version = "0.37.0"; + version = "0.54.0"; }; google-apis-pubsub_v1 = { dependencies = ["google-apis-core"]; @@ -2577,10 +2598,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gg1br0pj16iag3xax942g101zk4rk48isdpz5abyhc070amk45q"; + sha256 = "01dj7jx6dfyl4wz88nn7ml45qvck6khl7gli8h6hl9c1qwa4dzhx"; type = "gem"; }; - version = "0.30.0"; + version = "0.45.0"; }; google-apis-serviceusage_v1 = { dependencies = ["google-apis-core"]; @@ -2784,10 +2805,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wdm44s7l6jxqszybf58ar7699vlq7vj2zfsi8f9sh9mh5a89dcy"; + sha256 = "0d16s18k34crhyc44ycj062y81sdahgp8pcll9xggbq7wja9w3z0"; type = "gem"; }; - version = "0.10.2"; + version = "1.0.1"; }; grape-path-helpers = { dependencies = ["activesupport" "grape" "rake" "ruby2_keywords"]; @@ -2806,10 +2827,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "018843mknkjs1ybazs7b8k7k0g67m1ldc42z8vlb5yinp9b9l4x7"; + sha256 = "07i1rl07ra81j4zhz7i8f34ja4dgaksdp5rjgmznk332040k2jxn"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; grape-swagger-entity = { dependencies = ["grape-entity" "grape-swagger"]; @@ -2866,15 +2887,15 @@ src: version = "1.0.0"; }; graphql = { - dependencies = ["racc"]; + dependencies = ["base64"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zmw8gslwqaydxvmvan0m2rpbgxplm77kwp64bg051cvnasb9vhm"; + sha256 = "0df94lkqsis1kqgjch12mkm8fh55d6s1lqp2fvjj6xr310v323q2"; type = "gem"; }; - version = "2.2.5"; + version = "2.3.4"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2904,10 +2925,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bzkhy5yy4a8nlp89wwfw9bv4h358gsa9rvzn6i2y0z2ha5vmgqn"; + sha256 = "11ink0ayf14qgs3msn5a7dpg49vm3ck2415r64nfk1i8xv286hsz"; type = "gem"; }; - version = "1.60.0"; + version = "1.63.0"; }; grpc-google-iam-v1 = { dependencies = ["google-protobuf" "googleapis-common-protos" "grpc"]; @@ -2980,10 +3001,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "060vz5dx0ag3ggpwhwfcadfim0g8aabl0b1dvnzagizymfsw2g92"; + sha256 = "1mf24djxk6968n0ypwbib790nzijcf03m4kw0dnks8csfxj6hy9g"; type = "gem"; }; - version = "0.53.0"; + version = "0.58.0"; }; hamlit = { dependencies = ["temple" "thor" "tilt"]; @@ -3221,10 +3242,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00lzkgzr6zmnlbqcfsb38b4d3762wslx0v32nsy6052jksvas7xm"; + sha256 = "1j01r3rhai3h0bgq7npi49xz6ahm5sj6zag8b0l3amdxp82wb7ay"; type = "gem"; }; - version = "2.9.0"; + version = "3.1.0"; }; invisible_captcha = { dependencies = ["rails"]; @@ -3265,7 +3286,7 @@ src: path = "${src}/gems/ipynbdiff"; type = "path"; }; - version = "0.4.7"; + version = "0.4.8"; }; jaeger-client = { dependencies = ["opentracing" "thrift"]; @@ -3433,10 +3454,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13bkqrdz1rdn23nn0zni7vdvwnm34apgi3xy42djhhxl698888dv"; + sha256 = "0dffbnw10hld4vpack6xw14n590b9fgqv5cxgap3f7qzzdd6yybc"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.0"; }; knapsack = { dependencies = ["rake"]; @@ -3508,10 +3529,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08y6f6f4nhg4dc96rbawhjjalxn0chzvvza5d8qfzsac6zl83094"; + sha256 = "1rbw6vr1chabkd0p3sqxcpva77vxgk3a1pzrv7h4m73jx4bixdbq"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.14"; }; letter_opener = { dependencies = ["launchy"]; @@ -3551,10 +3572,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sig4ifxzvcz3fwjnz93dpv61v6sxpmlknj5f8n112ragrbcj8hb"; + sha256 = "0v66fb85majc816qip42kbwcn41lr6rm5w6zim4a2kgp74v0n0kd"; type = "gem"; }; - version = "7.0.1"; + version = "7.1.0"; }; licensee = { dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"]; @@ -3637,10 +3658,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kxnshqv3xv3hprnn4rsqq0djrqpmfcr7x8qmwy6p91g7yqhkhx5"; + sha256 = "0ffwg0lnvzfaxp9z7gynll1d4hlxm4ma2c05qcwqrznj7d7jkfnn"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.1"; }; lru_redux = { groups = ["default"]; @@ -3960,10 +3981,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r9k34xz7x7fpd18bix0cd5bk2wv6mj8z67f8fr7l30d2717m23h"; + sha256 = "1a7bwycd8svpxp5plnm84iyn1cxhc4s7msgpv61axfdi4k6bp5dp"; type = "gem"; }; - version = "0.2.3"; + version = "0.3.2"; }; nenv = { groups = ["default" "test"]; @@ -3976,15 +3997,15 @@ src: version = "0.3.0"; }; net-http = { - dependencies = ["net-protocol" "uri"]; + dependencies = ["uri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11mymfxpsgpwr1qbv8vwj8av9kksqj0632p9s3x35bzrnq4y393m"; + sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; type = "gem"; }; - version = "0.1.1"; + version = "0.4.1"; }; net-http-persistent = { dependencies = ["connection_pool"]; @@ -4263,38 +4284,6 @@ src: }; version = "2.0.0"; }; - omniauth-azure-oauth2 = { - dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; - groups = ["default"]; - platforms = []; - source = { - path = "${src}/vendor/gems/omniauth-azure-oauth2"; - type = "path"; - }; - version = "0.0.10"; - }; - omniauth-dingtalk-oauth2 = { - dependencies = ["omniauth-oauth2"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16qkd51f1ab1hw4az27qj3vk958aal67by8djsplwd1q3h7nfib5"; - type = "gem"; - }; - version = "1.0.1"; - }; - omniauth-facebook = { - dependencies = ["omniauth-oauth2"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03zjla9i446fk1jkw7arh67c39jfhp5bhkmhvbw8vczxr1jkbbh5"; - type = "gem"; - }; - version = "4.0.0"; - }; omniauth-github = { dependencies = ["omniauth" "omniauth-oauth2"]; groups = ["default"]; @@ -4327,17 +4316,6 @@ src: }; version = "1.1.1"; }; - omniauth-oauth = { - dependencies = ["oauth" "omniauth"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yw2vzx633p9wpdkd4jxsih6mw604mj7f6myyfikmj4d95c8d9z7"; - type = "gem"; - }; - version = "1.2.0"; - }; omniauth-oauth2 = { dependencies = ["oauth2" "omniauth"]; groups = ["default"]; @@ -4392,17 +4370,6 @@ src: }; version = "2.0.0"; }; - omniauth-twitter = { - dependencies = ["omniauth-oauth" "rack"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65"; - type = "gem"; - }; - version = "1.4.0"; - }; omniauth_crowd = { dependencies = ["activesupport" "nokogiri" "omniauth"]; groups = ["default"]; @@ -4466,6 +4433,324 @@ src: }; version = "1.3.0"; }; + opentelemetry-api = { + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j9c2a4wgw0jaw63qscfasw3lf3kr45q83p4mmlf0bndcq2rlgdb"; + type = "gem"; + }; + version = "1.2.5"; + }; + opentelemetry-common = { + dependencies = ["opentelemetry-api"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "160ws06d8mzx3hwjss2i954h8r86dp3sw95k2wrbq81sb121m2gy"; + type = "gem"; + }; + version = "0.21.0"; + }; + opentelemetry-exporter-otlp = { + dependencies = ["google-protobuf" "googleapis-common-protos-types" "opentelemetry-api" "opentelemetry-common" "opentelemetry-sdk" "opentelemetry-semantic_conventions"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k4y30x7l29kgkydn966qcwvf35phx0c9n3c2zinw64pvrmcyl00"; + type = "gem"; + }; + version = "0.27.0"; + }; + opentelemetry-helpers-sql-obfuscation = { + dependencies = ["opentelemetry-common"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cnlr3gqmd2q9wcaxhvlkxkbjvvvkp4vzcwif1j7kydw7lvz2vmw"; + type = "gem"; + }; + version = "0.1.0"; + }; + opentelemetry-instrumentation-action_pack = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base" "opentelemetry-instrumentation-rack"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16nbkayp8jb2zkqj2rmqd4d1mz4wdf0zg6jx8b0vzkf9mxr89py5"; + type = "gem"; + }; + version = "0.9.0"; + }; + opentelemetry-instrumentation-action_view = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xfbqgw497k2f56f68k7zsvmrrk5jk69xhl56227dfxlw15p2z5w"; + type = "gem"; + }; + version = "0.7.0"; + }; + opentelemetry-instrumentation-active_job = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12c0qr980zr4si2ps55aj3zj84zycg3zcf16nh6mizljkmn8096s"; + type = "gem"; + }; + version = "0.7.1"; + }; + opentelemetry-instrumentation-active_record = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wjfd1dmfzcnvss2jsnc2s3g6p0wfq5ay3vfnidkmisgyw7fphfk"; + type = "gem"; + }; + version = "0.7.2"; + }; + opentelemetry-instrumentation-active_support = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rjajgb7sj3mrw5d79xm7q3f4mns1fc3ngasjfw10i18x0kq7283"; + type = "gem"; + }; + version = "0.5.1"; + }; + opentelemetry-instrumentation-aws_sdk = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "191p0d0yvlwakppzhfq7nkakbz4psby0h0bgx8p5apdc7vz2mmmr"; + type = "gem"; + }; + version = "0.5.2"; + }; + opentelemetry-instrumentation-base = { + dependencies = ["opentelemetry-api" "opentelemetry-registry"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pv064ksiynin8hzvljkwm5vlkgr8kk6g3qqpiwcik860i7l677n"; + type = "gem"; + }; + version = "0.22.3"; + }; + opentelemetry-instrumentation-concurrent_ruby = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xmx1rxdvf835kvad352rcavwkk3x758q0rznx2npay3mm8bbcbg"; + type = "gem"; + }; + version = "0.21.3"; + }; + opentelemetry-instrumentation-ethon = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h5sa5in4b5yh8xgsgpk2spzhvkakinyi81mccgfy39zvz1p1i1i"; + type = "gem"; + }; + version = "0.21.5"; + }; + opentelemetry-instrumentation-excon = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0im1ljdz4xd2498ss919gsqmv8r4ipk4rkwhf8ai0diw58qwa78p"; + type = "gem"; + }; + version = "0.22.2"; + }; + opentelemetry-instrumentation-faraday = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a3hx6linkdwmy5pax0khm64w68d2c7536yzc3svppivhxnfank9"; + type = "gem"; + }; + version = "0.24.3"; + }; + opentelemetry-instrumentation-grape = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base" "opentelemetry-instrumentation-rack"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c33cg6a2ykpc5215v1a1pqhvad5wld6pz0m32zxhai5psxj3110"; + type = "gem"; + }; + version = "0.1.8"; + }; + opentelemetry-instrumentation-graphql = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13lbvcbszr20b7li8mm007rnm59np5y7zz5a36jchbz8503dhfai"; + type = "gem"; + }; + version = "0.28.2"; + }; + opentelemetry-instrumentation-http = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yncpv6i2cagjyq1srdqddf6mh0q9s04kfi9q1rh9qbsxqbp5cff"; + type = "gem"; + }; + version = "0.23.3"; + }; + opentelemetry-instrumentation-http_client = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "038bpsg4bfix3ap7l9f8jqkb1acl3v0p7c2jd7bj1116v4ycdcvc"; + type = "gem"; + }; + version = "0.22.5"; + }; + opentelemetry-instrumentation-net_http = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gppqpy2c48xj2jlcd1lkmr3wh3qhwf14337wjk2w0qq77h11gcr"; + type = "gem"; + }; + version = "0.22.5"; + }; + opentelemetry-instrumentation-pg = { + dependencies = ["opentelemetry-api" "opentelemetry-helpers-sql-obfuscation" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k9m9v4i42y53s85b8y7vz4dj4y00v1gg8392rkrswl5f72fk2dn"; + type = "gem"; + }; + version = "0.27.3"; + }; + opentelemetry-instrumentation-rack = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dc2ds4vaqybfpzp98p79z9kgpdagljsgbjbhpi0i9jrlh2xnddy"; + type = "gem"; + }; + version = "0.24.4"; + }; + opentelemetry-instrumentation-rails = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-action_pack" "opentelemetry-instrumentation-action_view" "opentelemetry-instrumentation-active_job" "opentelemetry-instrumentation-active_record" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hiihby0lndwvny1alba1mvvag48z55vjjrwbjppb700prv0q1kk"; + type = "gem"; + }; + version = "0.30.1"; + }; + opentelemetry-instrumentation-rake = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0840gnlr90nbl430yc72czn26bngdp94v4adz7q9ph3pmdm8mppv"; + type = "gem"; + }; + version = "0.2.2"; + }; + opentelemetry-instrumentation-redis = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mrkcd8mdvfgrqalnav4dh3hvd1f91yq718n1mdb56jkd607kknp"; + type = "gem"; + }; + version = "0.25.5"; + }; + opentelemetry-instrumentation-sidekiq = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18x3x06dfydaqqab4k6yykqhy2axppyf9q63sh2da893jphb5qac"; + type = "gem"; + }; + version = "0.25.4"; + }; + opentelemetry-registry = { + dependencies = ["opentelemetry-api"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08k8zqrg47v1jxcvxz9wxyqm03kjdw98qa8q0y840qvh988vcshi"; + type = "gem"; + }; + version = "0.3.0"; + }; + opentelemetry-sdk = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-registry" "opentelemetry-semantic_conventions"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ajf9igx63r6r2ds0f3hxd18iragvr88k2k9kzvamp1jkdna6gsi"; + type = "gem"; + }; + version = "1.4.1"; + }; + opentelemetry-semantic_conventions = { + dependencies = ["opentelemetry-api"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xhv5fwwgjj2k8ksprpg1nm5v8k3w6gyw4wiq2k08q3kf484rlhk"; + type = "gem"; + }; + version = "1.10.0"; + }; opentracing = { groups = ["default"]; platforms = []; @@ -4555,10 +4840,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; + sha256 = "15wkxrg1sj3n1h2g8jcrn7gcapwcgxr659ypjf75z1ipkgxqxwsv"; type = "gem"; }; - version = "1.22.1"; + version = "1.24.0"; }; parser = { dependencies = ["ast" "racc"]; @@ -4682,10 +4967,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pgxgng905jbhp0pr54w4w2pr4nqcq80ijj48204bj4x4nigj8ji"; + sha256 = "0ps7lydh1jsqv02vmb1lgky80hi8wcvbv6lfybxgb9q80cx88b55"; type = "gem"; }; - version = "0.24.0"; + version = "0.29.0"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -4925,14 +5210,14 @@ src: }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v9dp9sgh8kk32r23mj66zjni7w1dv2h7mbaxgmazsf59a43gsvx"; + sha256 = "1sv5jzd3varqzcqm8zxllwiqzgbgcymszw12ci3f9zbzlliq8hby"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4973,10 +5258,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lrbrx88ic42adcj36wip3dk1svmqld1f7qksngi4b9kqnc8w5g3"; + sha256 = "0s8kvic2ia34ngssz6h15wqj0k3wwblhyh0f9v0j3gy7ly0dp161"; type = "gem"; }; - version = "7.0.3"; + version = "7.0.9"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; @@ -4984,10 +5269,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62"; + sha256 = "02z7lqx0y60bzpkd4v67i9sbdh7djs0mm89h343kidx0gmq0kbh0"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; rainbow = { groups = ["coverage" "default" "development" "test"]; @@ -5035,10 +5320,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "131sa2jvc7b1yld3nzc0xq7lvwvql7b8c09i0xv2brzjybammlv5"; + sha256 = "1jjcxfwwr70l46wylv68mjnazi4zfwn7fn5yb2wnfs4hwzcbwdca"; type = "gem"; }; - version = "0.9.86"; + version = "0.9.94"; }; rbtrace = { dependencies = ["ffi" "msgpack" "optimist"]; @@ -5119,10 +5404,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n7k4sgx5vzsigp8c15flz4fclqy4j2a33vim7b2c2w5jyjhwxrv"; + sha256 = "1d1ng78dwbzgfg1sljf9bnx2km5y3p3jc42a9npwcrmiard9fsrk"; type = "gem"; }; - version = "5.0.8"; + version = "5.2.0"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; @@ -5141,10 +5426,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irk5j73aqhyv54q3vs88y5rp9a5fkvbdif7zn5q7m5d51h2375w"; + sha256 = "1h5cgdv40zk0ph1nl64ayhn6anzwy6mbxyi7fci9n404ryvy9zii"; type = "gem"; }; - version = "0.21.1"; + version = "0.22.2"; }; redis-cluster-client = { dependencies = ["redis-client"]; @@ -5152,10 +5437,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12p7wi39zaldk8lr484j4j6w49502fxayinfs9f7l58pvag1rz8j"; + sha256 = "107ban04brh3f6xwy4rcy83a6kgq0r71jdfyjz95ggg2hs51pv8w"; type = "gem"; }; - version = "0.7.5"; + version = "0.8.2"; }; redis-clustering = { dependencies = ["redis" "redis-cluster-client"]; @@ -5163,10 +5448,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rp1yrqpvi29ar6mlqsyk36nxgh1drijb4f5xa76c057n7iksbwf"; + sha256 = "13h3w100848y272vykm1bwyj29z749pa9sfcjqd0k0fx1f73hpv8"; type = "gem"; }; - version = "5.0.8"; + version = "5.2.0"; }; redis-namespace = { dependencies = ["redis"]; @@ -5174,10 +5459,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "154dfnrjpbv7fhwhfrcnp6jn9qv5qaj3mvlvbgkl7qy5qsknw71c"; + sha256 = "0f92i9cwlp6xj6fyn7qn4qsaqvxfw4wqvayll7gbd26qnai1l6p9"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; redis-rack = { dependencies = ["rack-session" "redis-store"]; @@ -5408,10 +5693,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11mk52x34j957rqccxfqlsqjzg26dz04ipd1v4yx5yraqx1v01ww"; + sha256 = "1hplygik9p5d92lhb9412lzap8msrmry2qrrq5d1f90r170dwmml"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.2"; }; rspec-parameterized-core = { dependencies = ["parser" "proc_to_ast" "rspec" "unparser"]; @@ -5495,10 +5780,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06qnp5zs233j4f59yyqrg8al6hr9n4a7vcdg3p31v0np8bz9srwg"; + sha256 = "0daamn13fbm77rdwwa4w6j6221iq6091asivgdhk6n7g398frcdf"; type = "gem"; }; - version = "1.57.2"; + version = "1.62.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -5506,10 +5791,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni"; + sha256 = "1v3q8n48w8h809rqbgzihkikr4g3xk72m1na7s97jdsmjjq6y83w"; type = "gem"; }; - version = "1.29.0"; + version = "1.31.2"; }; rubocop-capybara = { dependencies = ["rubocop"]; @@ -5517,10 +5802,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jwwi5a05947q9zsk6i599zxn657hdphbmmbbpx17qsv307rwcps"; + sha256 = "0f5r9di123hc4x2h453a143986plfzz9935bwc7267wj8awl8s1a"; type = "gem"; }; - version = "2.19.0"; + version = "2.20.0"; }; rubocop-factory_bot = { dependencies = ["rubocop"]; @@ -5528,10 +5813,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y79flwjwlaslyhfpg84di9n756ir6bm52n964620xsj658d661h"; + sha256 = "0d012phc7z5h1j1d2aisnbkmqlb95sld5jriia5qg2gpgbg1nxb2"; type = "gem"; }; - version = "2.24.0"; + version = "2.25.1"; }; rubocop-graphql = { dependencies = ["rubocop"]; @@ -5539,10 +5824,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hryrjmcl04br06ibjzzrbb2am8ybbhnl2l7w13xl3wz3k4jyjxs"; + sha256 = "1sw242bz2al9c1arprim9pd0kks8wbla77kkjvwp7kp1m01dc0lm"; type = "gem"; }; - version = "0.19.0"; + version = "1.5.1"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -5550,21 +5835,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pzsrnjmrachdjxzl9jpw47cydicn3408vgdg3a4bss4v5r42rjj"; + sha256 = "0cf7fn4dwf45r3nhnda0dhnwn8qghswyqbfxr2ippb3z8a6gmc8v"; type = "gem"; }; - version = "1.19.1"; + version = "1.20.2"; }; rubocop-rails = { - dependencies = ["activesupport" "rack" "rubocop"]; + dependencies = ["activesupport" "rack" "rubocop" "rubocop-ast"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0imxmki4qc5pji31wn491smaq531ncngnv6d4xvbpn11cgdkqryv"; + sha256 = "06dcxrr71sn0kkw8fwh0w884zbig2ilxpkl66s7lcis9jmkggv83"; type = "gem"; }; - version = "2.22.1"; + version = "2.24.1"; }; rubocop-rspec = { dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"]; @@ -5572,10 +5857,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wwrgcigdrrlgg4nwbl18qfyjks519kqbbly5adrdffvh428lgq8"; + sha256 = "17ksg89i1k5kyhi241pc0zyzmq1n7acxg0zybav5vrqbf02cw9rg"; type = "gem"; }; - version = "2.25.0"; + version = "2.27.1"; }; ruby-fogbugz = { dependencies = ["crack" "multipart-post"]; @@ -5594,21 +5879,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ja3ag2q0w8xsbf25sf2x98gvdia534ld2m8hn1bfwzhwb5ysfsl"; + sha256 = "0730631afd1iadx51izm2adygwqd7aii95gdmy405d847x35bmf3"; type = "gem"; }; - version = "0.14.6"; + version = "0.16.7"; }; ruby-lsp-rails = { - dependencies = ["actionpack" "activerecord" "railties" "ruby-lsp" "sorbet-runtime"]; + dependencies = ["ruby-lsp" "sorbet-runtime"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hrb39svnd8v6vnd3vyzsby6qr0z28cj0v9r02hcjvadm2p67g03"; + sha256 = "1pdr6ir97af633lg0dkdasjflfmrlf50ad4x4jq7a712x4p1fxag"; type = "gem"; }; - version = "0.3.3"; + version = "0.3.6"; }; ruby-lsp-rspec = { dependencies = ["ruby-lsp"]; @@ -5616,10 +5901,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0npxb9146yqfwpyx3bw375q8vx60ph2zgbvpai1dmgq8dfs3idki"; + sha256 = "11nc5ysf3rq47v7h9v17ivmca62bj7lm6x80fy5fpj45vxh7pz1l"; type = "gem"; }; - version = "0.1.10"; + version = "0.1.11"; }; ruby-magic = { dependencies = ["mini_portile2"]; @@ -5805,10 +6090,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjh9s5x7jqaxjfcz2m3hphhlajk9nxs6wdsnia62iba07bd32sc"; + sha256 = "0qrjr30qs01b27km6ipzc2zasdlzhdgri5q7qrb53z1j8l0n82y3"; type = "gem"; }; - version = "4.19.0"; + version = "4.21.1"; }; semver_dialects = { dependencies = ["deb_version" "pastel" "thor" "tty-command"]; @@ -5816,10 +6101,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zhnq4wkcy8vv6qazfg0p3zrlswxhz9glqnq2991p4vg86grq1b0"; + sha256 = "0d9q502kp1az64lk0psblgdi50s5mr8x8g8k19avivkna0v5z6fs"; type = "gem"; }; - version = "2.0.2"; + version = "3.0.1"; }; sentry-rails = { dependencies = ["railties" "sentry-ruby"]; @@ -5827,32 +6112,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gby2dx2h487y8ziisy57ba8mj6scpg6az49n4p989kc2fn2zalr"; + sha256 = "0ncl8br0k6fas4n6c4xw4wr59kq5s2liqn1s4790m73k5p272xq1"; type = "gem"; }; - version = "5.10.0"; - }; - sentry-raven = { - dependencies = ["faraday"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jin9x4f43lplglhr9smv2wxsjgmph2ygqlci4s0v0aq5493ng8h"; - type = "gem"; - }; - version = "3.1.2"; + version = "5.17.3"; }; sentry-ruby = { - dependencies = ["concurrent-ruby"]; + dependencies = ["bigdecimal" "concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "069n32qqhhv91slyvzh92vqw3gp232qqz652yc894c71mv028p0i"; + sha256 = "1z5v5zzasy04hbgxbj9n8bb39ayllvps3snfgbc5rydh1d5ilyb1"; type = "gem"; }; - version = "5.10.0"; + version = "5.17.3"; }; sentry-sidekiq = { dependencies = ["sentry-ruby" "sidekiq"]; @@ -5860,10 +6134,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06pagbphvmwp8yk3rcnhl7mbnc0hnvhcjhanzgiipyrk0y6h30fc"; + sha256 = "0n1cr9g15hp08jsqabprd6q34ap61r71f33x28w1xr4ri4hllwfh"; type = "gem"; }; - version = "5.10.0"; + version = "5.17.3"; }; sexp_processor = { groups = ["default" "test"]; @@ -6361,10 +6635,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09zw1y52yhzw2z01za87dglpfpdrm1dma00629wpq6462nxq9574"; + sha256 = "0rwnq67qm2ngz066sncvg0dv65bsk29qz3xarbv8qan2hi7yw0qg"; type = "gem"; }; - version = "1.3.2"; + version = "1.3.3"; }; test_file_finder = { dependencies = ["faraday"]; @@ -6802,10 +7076,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zy51z0whkm3fdpsbi8v4j8h5h3ia1zkc2j28amiznpqqvfc7539"; + sha256 = "12xi88jvx49p15nx2168wm0r00g90mb4cxzzsjxz92akjk92mkpj"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.1"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; @@ -6899,10 +7173,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07zk8ljq5kyd1mm9qw3452fcnf7frg3irh9ql8ln2m8zbi1qf1qh"; + sha256 = "158d2ikjfzw43kgm095klp43ihphk0cv5xjprk44w73xfv03i9qg"; type = "gem"; }; - version = "3.23.0"; + version = "3.23.1"; }; webrick = { groups = ["default" "development" "test"]; diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix index 8bbb0eee971d..93014402a2eb 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/gitless/default.nix @@ -15,7 +15,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-XDB1i2b1reMCM6i1uK3IzTnsoLXO7jldYtNlYUo1AoQ="; }; - nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ pygit2 diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index 2cdf24160c51..98d1a8f8e144 100644 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - hash = "sha256-5KKF85RNCPPaXMxBb7m2XC3EaEo+UcEhBdfMEzNPsAg="; + hash = "sha256-coASwU7nMalqvtqukhuRWz52My4e2Zl/7tqHNEvS1Nk="; }; - cargoHash = "sha256-MiJuen3Lo7nPaAK30cENw3ACAdoYbHDoiGS05dk5m6U="; + cargoHash = "sha256-9SYjC3xL8OGGT56Q/yhH1oWeRT0Z956Yms6DGvCzlUY="; cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors useNextest = false; # nextest is the upstream integration framework, but is problematic for test skipping diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index f5e66083553c..681da8792f39 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -13,6 +13,7 @@ , gtk3 , gtksourceview4 , gnome +, adwaita-icon-theme , gsettings-desktop-schemas }: @@ -44,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 gtksourceview4 gsettings-desktop-schemas - gnome.adwaita-icon-theme + adwaita-icon-theme ]; pythonPath = with python3.pkgs; [ diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 25c2df1ad71b..5057e725010e 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -23,11 +23,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.6.3"; + version = "6.7.4"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - hash = "sha256-911qSnWCOht9cTpJZ+yi9Zb0ZuWPxrwG1yZCky/X4wc="; + hash = "sha256-dHCPhzQFwSJy/sEWxt1Shi6O0RwQARx+V19eqBJj6l4="; }; format = "other"; @@ -37,7 +37,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-G5tzwoIGOgpVI35rYXDeelnBgTbAiq7BDcXCHQzqSrs="; + hash = "sha256-FRa7frX2z9jQGFBXS2TpOUANs0+xwegNETUAQIU0S4o="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/pkgs/applications/video/animdl/default.nix b/pkgs/applications/video/animdl/default.nix index c8ba0264e36a..ebe13e8b12e2 100644 --- a/pkgs/applications/video/animdl/default.nix +++ b/pkgs/applications/video/animdl/default.nix @@ -2,7 +2,6 @@ buildPythonApplication, fetchFromGitHub, poetry-core, - pythonRelaxDepsHook, anchor-kr, anitopy, click, @@ -47,7 +46,6 @@ buildPythonApplication { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ anchor-kr diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index bc88c2481467..a19f03727023 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -3,7 +3,7 @@ , wrapGAppsHook3 , cairo , glib -, gnome +, gnome-common , gst_all_1 , gtk3 , intltool @@ -37,7 +37,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ which - gnome.gnome-common + gnome-common glib libtool cairo diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 78bfaa2b4637..12a66c90e8d5 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clapper"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Rafostar"; repo = "clapper"; rev = finalAttrs.version; - hash = "sha256-5fD1OnVcY3ZC+QfoFqe2jV43/J36r85SpLUYF2ti7dY="; + hash = "sha256-IQJTnLB6FzYYPONOqBkvi89iF0U6fx/aWYvNOOJpBvc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix deleted file mode 100644 index 80892b96c94b..000000000000 --- a/pkgs/applications/video/coriander/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, glib -, gtk2 -, libgnomeui -, libXv -, libraw1394 -, libdc1394 -, SDL -, automake -, GConf -}: - -stdenv.mkDerivation rec { - pname = "coriander"; - version = "2.0.1"; - - src = fetchurl { - url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-${version}.tar.gz"; - sha256 = "0l6hpfgy5r4yardilmdrggsnn1fbfww516sk5a90g1740cd435x5"; - }; - - # Workaround build failure on -fno-common toolchains: - # ld: subtitles.o:src/coriander.h:110: multiple definition of - # `main_window'; main.o:src/coriander.h:110: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preConfigure = '' - cp ${automake}/share/automake-*/mkinstalldirs . - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; - - meta = { - homepage = "https://damien.douxchamps.net/ieee1394/coriander/"; - description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ viric ]; - platforms = with lib.platforms; linux; - mainProgram = "coriander"; - }; -} diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index db3f6e7f9a54..ec15a47090fd 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -24,7 +24,6 @@ , zip , dvdisasterSupport ? true, dvdisaster ? null -, thumbnailSupport ? true, libgnomeui ? null , udevSupport ? true, udev ? null , dbusSupport ? true, dbus ? null }: @@ -72,8 +71,7 @@ in stdenv.mkDerivation rec { ] ++ optionals dvdisasterSupport [ dvdisaster ] ++ optionals udevSupport [ udev ] - ++ optionals dbusSupport [ dbus ] - ++ optionals thumbnailSupport [ libgnomeui ]; + ++ optionals dbusSupport [ dbus ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/frigate/default.nix b/pkgs/applications/video/frigate/default.nix index cf381a5f4265..060046f59f03 100644 --- a/pkgs/applications/video/frigate/default.nix +++ b/pkgs/applications/video/frigate/default.nix @@ -1,6 +1,6 @@ { lib , callPackage -, python3 +, python311 , fetchFromGitHub , fetchurl , fetchpatch2 @@ -23,7 +23,7 @@ let inherit version src; }; - python = python3.override { + python = python311.override { packageOverrides = self: super: { pydantic = super.pydantic_1; @@ -71,6 +71,14 @@ python.pkgs.buildPythonApplication rec { url = "https://github.com/blakeblackshear/frigate/commit/b65656fa8733c1c2f3d944f716d2e9493ae7c99f.patch"; hash = "sha256-taPWFV4PldBGUKAwFMKag4W/3TLMSGdKLYG8bj1Y5mU="; }) + (fetchpatch2 { + # https://github.com/blakeblackshear/frigate/pull/10097 + name = "frigate-secrets-permissionerror.patch"; + url = "https://github.com/blakeblackshear/frigate/commit/a1424bad6c0163e790129ade7a9784514d0bf89d.patch"; + hash = "sha256-/kIy4aW9o5AKHJQfCDVY46si+DKaUb+CsZsCGIbXvUQ="; + }) + # https://github.com/blakeblackshear/frigate/pull/12324 + ./mpl-3.9.0.patch ]; postPatch = '' diff --git a/pkgs/applications/video/frigate/mpl-3.9.0.patch b/pkgs/applications/video/frigate/mpl-3.9.0.patch new file mode 100644 index 000000000000..84fe7867438d --- /dev/null +++ b/pkgs/applications/video/frigate/mpl-3.9.0.patch @@ -0,0 +1,42 @@ +From fba8cff13186bd80ceaa06806392957598139deb Mon Sep 17 00:00:00 2001 +From: Martin Weinelt +Date: Sun, 7 Jul 2024 14:23:29 +0200 +Subject: [PATCH] Fix colormap usage with matplotlib 3.9.0 + +The mpl.cm toplevel registration has been removed. + +https://matplotlib.org/stable/api/prev_api_changes/api_changes_3.9.0.html#top-level-cmap-registration-and-access-functions-in-mpl-cm +--- + frigate/config.py | 2 +- + frigate/detectors/detector_config.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/frigate/config.py b/frigate/config.py +index 2e8b2570..af4f3263 100644 +--- a/frigate/config.py ++++ b/frigate/config.py +@@ -807,7 +807,7 @@ class CameraConfig(FrigateBaseModel): + def __init__(self, **config): + # Set zone colors + if "zones" in config: +- colors = plt.cm.get_cmap("tab10", len(config["zones"])) ++ colors = plt.colormaps["tab10"].resampled(len(config["zones"])) + config["zones"] = { + name: {**z, "color": tuple(round(255 * c) for c in colors(idx)[:3])} + for idx, (name, z) in enumerate(config["zones"].items()) +diff --git a/frigate/detectors/detector_config.py b/frigate/detectors/detector_config.py +index 7fc958a3..b65631eb 100644 +--- a/frigate/detectors/detector_config.py ++++ b/frigate/detectors/detector_config.py +@@ -125,7 +125,7 @@ class ModelConfig(BaseModel): + + def create_colormap(self, enabled_labels: set[str]) -> None: + """Get a list of colors for enabled labels.""" +- cmap = plt.cm.get_cmap("tab10", len(enabled_labels)) ++ cmap = plt.colormaps["tab10"].resampled(len(enabled_labels)) + + for key, val in enumerate(enabled_labels): + self._colormap[val] = tuple(int(round(255 * c)) for c in cmap(key)[:3]) +-- +2.45.1 + diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 7b8113e906e4..3aa8d879ff3d 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,39 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib }: stdenv.mkDerivation rec { - version = "2.2.1"; pname = "gpac"; + version = "2.4.0"; src = fetchFromGitHub { owner = "gpac"; repo = "gpac"; rev = "v${version}"; - hash = "sha256-VjA1VFMsYUJ8uJqhYgjXYtqlGWSJHr16Ck3b5stuZWw="; + hash = "sha256-RADDqc5RxNV2EfRTzJP/yz66p0riyn81zvwU3r9xncM="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-2837.patch"; - url = "https://github.com/gpac/gpac/commit/6f28c4cd607d83ce381f9b4a9f8101ca1e79c611.patch"; - hash = "sha256-HA6qMungIoh1fz1R3zUvV1Ahoa2pp861JRzYY/NNDQI="; - }) - (fetchpatch { - name = "CVE-2023-2838.patch"; - url = "https://github.com/gpac/gpac/commit/c88df2e202efad214c25b4e586f243b2038779ba.patch"; - hash = "sha256-gIISG7pz01iVoWqlho2BL27ki87i3pGkug2Z+KKn+xs="; - }) - (fetchpatch { - name = "CVE-2023-2839.patch"; - url = "https://github.com/gpac/gpac/commit/047f96fb39e6bf70cb9f344093f5886e51dce0ac.patch"; - hash = "sha256-i+/iFrWJ+Djc8xYtIOYvlZ98fYUdJooqUz9y/uhusL4="; - }) - (fetchpatch { - name = "CVE-2023-2840.patch"; - url = "https://github.com/gpac/gpac/commit/ba59206b3225f0e8e95a27eff41cb1c49ddf9a37.patch"; - hash = "sha256-mwO9Qeeufq0wa57lO+LgWGjrN3CHMYK+xr2ZBalKBQo="; - }) - ]; - # this is the bare minimum configuration, as I'm only interested in MP4Box # For most other functionality, this should probably be extended nativeBuildInputs = [ pkg-config ]; @@ -60,61 +37,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = with maintainers; [ bluescreen303 mgdelacroix ]; platforms = platforms.linux; - knownVulnerabilities = [ - "CVE-2023-48958" - "CVE-2023-48090" - "CVE-2023-48039" - "CVE-2023-48014" - "CVE-2023-48013" - "CVE-2023-48011" - "CVE-2023-47465" - "CVE-2023-47384" - "CVE-2023-46932" - "CVE-2023-46931" - "CVE-2023-46930" - "CVE-2023-46928" - "CVE-2023-46927" - "CVE-2023-46871" - "CVE-2023-46001" - "CVE-2023-42298" - "CVE-2023-41000" - "CVE-2023-39562" - "CVE-2023-37767" - "CVE-2023-37766" - "CVE-2023-37765" - "CVE-2023-37174" - "CVE-2023-23143" - "CVE-2023-5998" - "CVE-2023-5595" - "CVE-2023-5586" - "CVE-2023-5520" - "CVE-2023-5377" - "CVE-2023-4778" - "CVE-2023-4758" - "CVE-2023-4756" - "CVE-2023-4755" - "CVE-2023-4754" - "CVE-2023-4722" - "CVE-2023-4721" - "CVE-2023-4720" - "CVE-2023-4683" - "CVE-2023-4682" - "CVE-2023-4681" - "CVE-2023-4678" - "CVE-2023-3523" - "CVE-2023-3291" - "CVE-2023-3013" - "CVE-2023-3012" - "CVE-2023-1655" - "CVE-2023-1654" - "CVE-2023-1452" - "CVE-2023-1449" - "CVE-2023-1448" - "CVE-2023-0866" - "CVE-2023-0841" - "CVE-2023-0819" - "CVE-2023-0818" - "CVE-2023-0817" - ]; }; } diff --git a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix index 9b20235e8ea1..e384345135fe 100644 --- a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hts"; namespace = "pvr.hts"; - version = "21.2.3"; + version = "21.2.4"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "sha256-4jHcUjGarLHsn5CjBLWB1wQNjBBw4ftMuDY5uFAHAzY="; + sha256 = "sha256-3q78rJ+LGRD/pqeWfcP2Z469HAu1T0LoidvD6mjNkwg="; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi/no-python-lib.patch b/pkgs/applications/video/kodi/no-python-lib.patch new file mode 100644 index 000000000000..d45e02dd1846 --- /dev/null +++ b/pkgs/applications/video/kodi/no-python-lib.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake +index 9c45c91774..763d6acab4 100644 +--- a/cmake/scripts/linux/Install.cmake ++++ b/cmake/scripts/linux/Install.cmake +@@ -199,8 +199,6 @@ install(FILES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/${APP_NAME}Config.cm + + if(ENABLE_EVENTCLIENTS) + find_package(PythonInterpreter REQUIRED) +- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix=''))" +- OUTPUT_VARIABLE PYTHON_LIB_PATH OUTPUT_STRIP_TRAILING_WHITESPACE) + # Install kodi-eventclients-common BT python files + install(PROGRAMS ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/bt/__init__.py + ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/bt/bt.py diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index e8e5b5844f1f..b3fd8d87881a 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchzip +{ stdenv, lib, fetchFromGitHub, fetchzip, fetchpatch , autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring @@ -97,6 +97,10 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-xrFWqgwTkurEwt3/+/e4SCM6Uk9nxuW62SrCFWWqZO0="; }; + patches = [ + ./no-python-lib.patch + ]; + # make derivations declared in the let binding available here, so # they can be overridden inherit libdvdcss libdvdnav libdvdread groovy @@ -189,6 +193,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc" "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python" + "-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}" # When wrapped KODI_HOME will likely contain symlinks to static assets # that Kodi's built in webserver will cautiously refuse to serve up # (because their realpaths are outside of KODI_HOME and the other diff --git a/pkgs/applications/video/memento/default.nix b/pkgs/applications/video/memento/default.nix index 0c993de2fcab..1f6981215d39 100644 --- a/pkgs/applications/video/memento/default.nix +++ b/pkgs/applications/video/memento/default.nix @@ -16,13 +16,13 @@ , makeWrapper}: stdenv.mkDerivation (finalAttrs: { pname = "memento"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "ripose-jp"; repo = "Memento"; rev = "v${finalAttrs.version}"; - hash = "sha256-/lgjzR2KwlIUMHSz3afBQEy+8kdKAI37kqTuq3r3qMk="; + hash = "sha256-3WOtf7cgYxAMlNPSBmTzaQF1HN9mU61giLp2woBAidY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index 9bb23b548e3f..c9219fdf6359 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mpc-qt"; - version = "23.12"; + version = "24.06"; src = fetchFromGitHub { owner = "mpc-qt"; repo = "mpc-qt"; rev = "v${version}"; - hash = "sha256-v22o5QtCY9Z8bPoIkwypG0oTBEPqPFeKZ8cWO+pKCD0="; + hash = "sha256-kEG7B99io3BGjN94nEX1pN10Bcjj21rb46Vcn2OtpN8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 0f9cec9c409b..965baf2abb96 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -377,7 +377,6 @@ stdenv'.mkDerivation (finalAttrs: { fpletz globin ma27 - tadeokondrak ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/applications/video/mpv/scripts/manga-reader.nix b/pkgs/applications/video/mpv/scripts/manga-reader.nix index 4d8007d98d8d..149e7c513778 100644 --- a/pkgs/applications/video/mpv/scripts/manga-reader.nix +++ b/pkgs/applications/video/mpv/scripts/manga-reader.nix @@ -8,12 +8,12 @@ buildLua rec { pname = "manga-reader"; - version = "0-unstable-2024-03-17"; + version = "0-unstable-2024-07-05"; src = fetchFromGitHub { owner = "Dudemanguy"; repo = "mpv-manga-reader"; - rev = "6b65d98be7d20c8e272a4caa6c5018ed3a8bb2b3"; - hash = "sha256-54n513lpn1KCErXJHqL+GKdDE1P52LolS6xDott/epY="; + rev = "fb06931eed4092fa74a98266cd04fa507ea63e13"; + hash = "sha256-xtzDHv+zW/9LsLWo4Km7OQ05BVJlwqu9461i9ee94lM="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/mpv/scripts/memo.nix b/pkgs/applications/video/mpv/scripts/memo.nix index 5d9e2b50fae2..7795d1e7b992 100644 --- a/pkgs/applications/video/mpv/scripts/memo.nix +++ b/pkgs/applications/video/mpv/scripts/memo.nix @@ -7,13 +7,13 @@ buildLua { pname = "memo"; - version = "0-unstable-2023-10-31"; + version = "0-unstable-2024-07-02"; src = fetchFromGitHub { owner = "po5"; repo = "memo"; - rev = "6f2b036ef860e130ea584657389e0a7ceb4d954f"; - hash = "sha256-m8ikXuw7PM4Btg8w7ufLneKA4fnYjMyfVJYueZILMw8="; + rev = "43ad5bc37d4ac63a00dd2a8f15b9028789467da7"; + hash = "sha256-nHJ1x5R4Rw2YjB3Li3ZFbI3ZdLSqddJFzJlni4NjpH0="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 34776679aa25..1f5d948362db 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -10,13 +10,13 @@ buildLua rec { pname = "mpvacious"; - version = "0.35"; + version = "0.36"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-LcO17zkGkXWqSjWPTA3cVwRnmSrhTlS3W4RhhYaKgY4="; + sha256 = "sha256-j8K9coa8kyA7AgRQaBXJJmeTpNtfDKkOGnAP9Up7biA="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 418d9adf8263..82b557d449e1 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -48,8 +48,6 @@ , nlohmann_json , websocketpp , asio -, decklinkSupport ? false -, blackmagic-desktop-video , libdatachannel , libvpl , qrcodegencpp @@ -167,8 +165,6 @@ stdenv.mkDerivation (finalAttrs: { xorg.libX11 libvlc libGL - ] ++ optionals decklinkSupport [ - blackmagic-desktop-video ]; in '' # Remove libcef before patchelf, otherwise it will fail diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index c43b823dd7f8..5f47c666078c 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-RBsdYG73SoX+dB4sUq641SL0ETUFE+PVAmr/DaqMuLI="; + sha256 = "sha256-4BmTp/PrR01H9IrKNX9ZpK4kLaiNG/G9rTMf9dsoV0s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index 3b457530fbf2..a720e672c783 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "Real-Time Appearance-Based 3D Mapping"; homepage = "https://introlab.github.io/rtabmap/"; license = licenses.bsd3; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 710ca4395e08..61c6684a2f82 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "shotcut"; - version = "24.06.02"; + version = "24.06.26"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${finalAttrs.version}"; - hash = "sha256-zqP3xGaNx6z3DdEyKZTauXGTY16dZPL/2+gKtgdx4Y8="; + hash = "sha256-9eQF3s4BAUK81/94z7cMkd2NWdNLVMraP08qsDmuAI8="; }; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 65b8406e8ee3..18edace4843f 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.8.1"; + version = "6.8.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-TEN++sKCtN8CZRnyBp4niRFlb+LPSNcyMCu9Rm+GOZ0="; + hash = "sha256-nBtm8CRyeicPrwAm1xp+Y6vdiPEClXyhUsDSYgcXvJg="; }; patches = [ diff --git a/pkgs/applications/video/timelens/default.nix b/pkgs/applications/video/timelens/default.nix index b80d1c3c447b..2124813f417f 100644 --- a/pkgs/applications/video/timelens/default.nix +++ b/pkgs/applications/video/timelens/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://timelens.blinry.org"; changelog = "https://github.com/timelens/timelens/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "timelens"; }; } diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index e04af11dfe0d..43953398ae11 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -14,12 +14,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-PvSo5qiDMVrL6ylts5leR/3YAqIpIZcmnAqnGopPG94="; + sha256 = "sha256-pwA0LBQZ0jYXgBHhboAhyPM/kM7sboGw0O+3OIg5Nz4="; rev = "v${version}"; }; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index acb652e33cb7..ed68dbc376e9 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.18"; + version = "1.7.19"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ="; + hash = "sha256-+tYv80y//C67F0QUjCkZYcahiHO4rZtlcr+33foN/M8="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 00f17d75d6e5..b52c91e4e1ed 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.30.2"; + version = "1.30.3"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-4v7Pt3WS68h+Un4QNATyQ/o/+8b8nVoNsy6VgwB9Brc="; + hash = "sha256-Cv76S2Ylsjzjc6rjCcRJyFjrIrm76I5pqDa1FI+Oq9s="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index d2fda361660e..cc6b7f269c69 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchgit, fetchpatch +{ lib, rustPlatform, fetchgit , pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols , pkgsCross @@ -6,27 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "125.0"; + version = "126.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "6a7ff1ecb7fad6820d3bbfe8b11e65854059aba5"; - hash = "sha256-y/vHU8i9YNbzSHla853z/2w914mVMFOryyaHE1uxlvM="; + rev = "5533201f3ff3230d121e06100557d369c055e6dc"; + hash = "sha256-Ufi8dIhNgXvD53PWLG2uj7CD37UZIegrqAQz3wTKTvE="; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - name = "musl.patch"; - url = "https://chromium.googlesource.com/chromiumos/platform/crosvm/+/128e591037c0be0362ed814d0b5583aa65ff09e1%5E%21/?format=TEXT"; - decode = "base64 -d"; - hash = "sha256-p5VzHRb0l0vCJNe48cRl/uBYHwTQMEykMcBOMzL3yaY="; - }) - ]; - separateDebugInfo = true; - cargoHash = "sha256-1AUfd9dhIZvVVUsVbnGoLKc0lBfccwM4wqWgU4yZWOE="; + cargoHash = "sha256-E2lyBgptQs+/5JS2WJc4ietguXdK16DFEVzqylmX+Pk="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix index 549022d9908c..738271bf952e 100644 --- a/pkgs/applications/virtualization/ddev/default.nix +++ b/pkgs/applications/virtualization/ddev/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddev"; - version = "1.23.2"; + version = "1.23.3"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-pzBSyCIA2r/4zYIYEmKF6c0gryudSKZebSXSpmJUbsQ="; + hash = "sha256-+DQEXJcW0nKBvw+pWZnFJfO/7R9IjbhAl9WZvorO9Io="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 609b0e97deb0..3b5f5669d7f7 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.14.1"; + version = "0.15.1"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-IseiGF+tQWv7Z2jlCINuWH2Gzcdow2qazvYVFBGyQPU="; + hash = "sha256-JaUCj9HY0MhHLkPTRd72NaGlBdPCPc+y2XjhVQ/3+NA="; }; doCheck = false; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 3d096c3389f9..a48eda041fef 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -314,4 +314,18 @@ rec { tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; + docker_27 = callPackage dockerGen rec { + version = "27.0.3"; + cliRev = "v${version}"; + cliHash = "sha256-fpjSnUq3T6WZO/FLeT377FWxwevbULob9dPiSBxZdHI="; + mobyRev = "v${version}"; + mobyHash = "sha256-v5uhFQPbBIpfnKtAkmbq4w+TbaG01tqTSWNBE3NvPKU="; + runcRev = "v1.1.13"; + runcHash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8="; + containerdRev = "v1.7.18"; + containerdHash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ="; + tiniRev = "v0.19.0"; + tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + }; + } diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index e5fe625cdf9f..ea5857768077 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.82.4"; + version = "1.84.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-bM/K3fxkeDwsXKsgZaEkurgYdSHnOgIQ2oUKc5atvZk="; + hash = "sha256-6Les4qio+ad10b172Xw5bwU2OZiLOjZZhaoNW0MYFzk="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index b32e60703275..77eeb1b56dfb 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.24.1"; + version = "1.24.4"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-niKz+F1RJtZrE8+BaJwy5bjGS3miJf5C9LttTnC+iuk="; + sha256 = "sha256-Jc8JU2tUc411AIeu6/ovN22s0ZR+vmn/I1yWhUEglrY="; }; - cargoHash = "sha256-fzG53DqZKgW6Gen+0ZO9lxgPXkxw7S6OdZWNNI+y9hU="; + cargoHash = "sha256-+bBQ3y66np7P5+FmsRTULX0VrtKrmNgGbyCFK+4vlIs="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index e5dde1e021c7..63abcad60a5d 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "open-vm-tools"; - version = "12.4.0"; + version = "12.4.5"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${finalAttrs.version}"; - hash = "sha256-RcjNY02aLOU4X6znfZ37+ICB19WYp+HxHRvvpfW3Ub8="; + hash = "sha256-VMnxWKGBgwnkP9eSVm///d6THzzWgUe5kNj/lGVBVlc="; }; sourceRoot = "${finalAttrs.src.name}/open-vm-tools"; diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/applications/virtualization/podman-compose/default.nix index bdd585e9c8bc..44d9caf26057 100644 --- a/pkgs/applications/virtualization/podman-compose/default.nix +++ b/pkgs/applications/virtualization/podman-compose/default.nix @@ -1,7 +1,7 @@ -{ lib, buildPythonApplication, fetchFromGitHub, python-dotenv, pyyaml, setuptools, pipBuildHook, pypaBuildHook }: +{ lib, buildPythonApplication, fetchFromGitHub, python-dotenv, pyyaml, setuptools, pypaBuildHook }: buildPythonApplication rec { - version = "1.1.0"; + version = "1.2.0"; pname = "podman-compose"; pyproject = true; @@ -9,10 +9,9 @@ buildPythonApplication rec { repo = "podman-compose"; owner = "containers"; rev = "v${version}"; - sha256 = "sha256-uNgzdLrnDIABtt0L2pvsil14esRzl0XcWohgf7Oksr8="; + hash = "sha256-40RatexY/6eRfCodaiBeJpyt1sDUj2STSPL0gBECdRs="; }; - build-system = [ setuptools ]; diff --git a/pkgs/applications/virtualization/quickgui/default.nix b/pkgs/applications/virtualization/quickgui/default.nix index 244e438626e0..cb3c79f36aa9 100644 --- a/pkgs/applications/virtualization/quickgui/default.nix +++ b/pkgs/applications/virtualization/quickgui/default.nix @@ -5,7 +5,7 @@ , dpkg , wrapGAppsHook3 , quickemu -, gnome +, zenity }: stdenvNoCC.mkDerivation rec { @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { buildInputs = [ quickemu - gnome.zenity + zenity ]; strictDeps = true; @@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ quickemu gnome.zenity ]} + --prefix PATH : ${lib.makeBinPath [ quickemu zenity ]} ) ''; diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index f27f58fda487..1cac1d4f16c6 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -70,11 +70,19 @@ in # Whether to compile with SUID support enableSuid ? false, starterSuidPath ? null, - # newuidmapPath and newgidmapPath are to support --fakeroot - # where those SUID-ed executables are unavailable from the FHS system PATH. + # Extra system-wide /**/bin paths to prefix, + # useful to specify directories containing binaries with SUID bit set. + # The paths take higher precedence over the FHS system PATH specified + # inside the upstream source code. + # Include "/run/wrappers/bin" by default for the convenience of NixOS users. + systemBinPaths ? [ "/run/wrappers/bin" ], # Path to SUID-ed newuidmap executable + # Deprecated in favour of systemBinPaths + # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off newuidmapPath ? null, # Path to SUID-ed newgidmap executable + # Deprecated in favour of systemBinPaths + # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off newgidmapPath ? null, # External LOCALSTATEDIR externalLocalStateDir ? null, @@ -99,18 +107,30 @@ in vendorHash ? _defaultGoVendorArgs.vendorHash, deleteVendor ? _defaultGoVendorArgs.deleteVendor, proxyVendor ? _defaultGoVendorArgs.proxyVendor, -}: +}@args: let + # Backward compatibility for privileged-un-utils. + # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off. privileged-un-utils = if ((newuidmapPath == null) && (newgidmapPath == null)) then null else - (runCommandLocal "privileged-un-utils" { } '' - mkdir -p "$out/bin" - ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap" - ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap" - ''); + lib.warn + "${pname}: arguments newuidmapPath and newgidmapPath is deprecated in favour of systemBinPaths." + ( + runCommandLocal "privileged-un-utils" { } '' + mkdir -p "$out/bin" + ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap" + ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap" + '' + ); + + # Backward compatibility for privileged-un-utils. + # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off. + systemBinPaths = + lib.optional (privileged-un-utils != null) (lib.makeBinPath [ privileged-un-utils ]) + ++ args.systemBinPaths or [ "/run/wrappers/bin" ]; concatMapStringAttrsSep = sep: f: attrs: @@ -196,8 +216,9 @@ in # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; - # Packages to prefix to the Apptainer/Singularity container runtime default PATH - # Use overrideAttrs to override + # Packages to provide fallback bin paths + # to the Apptainer/Singularity container runtime default PATHs. + # Override with `.overrideAttrs`. defaultPathInputs = [ bash coreutils @@ -206,7 +227,6 @@ in fuse2fs # Mount ext3 filesystems go mount # mount - privileged-un-utils squashfsTools # mksquashfs unsquashfs # Make / unpack squashfs image squashfuse # squashfuse_ll squashfuse # Mount (without unpacking) a squashfs image without privileges ] ++ lib.optional enableNvidiaContainerCli nvidia-docker; @@ -228,7 +248,7 @@ in lib.concatStringsSep " " [ "--replace-fail" (addShellDoubleQuotes (lib.escapeShellArg originalDefaultPath)) - (addShellDoubleQuotes ''$inputsDefaultPath''${inputsDefaultPath:+:}${lib.escapeShellArg originalDefaultPath}'') + (addShellDoubleQuotes ''$systemDefaultPath''${systemDefaultPath:+:}${lib.escapeShellArg originalDefaultPath}''${inputsDefaultPath:+:}$inputsDefaultPath'') ] ) originalDefaultPaths } @@ -267,8 +287,11 @@ in postFixup = '' substituteInPlace "$out/bin/run-singularity" \ --replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}" + # Respect PATH from the environment/the user. + # Fallback to bin paths provided by Nixpkgs packages. wrapProgram "$out/bin/${projectName}" \ - --prefix PATH : "$inputsDefaultPath" + --suffix PATH : "$systemDefaultPath" \ + --suffix PATH : "$inputsDefaultPath" # Make changes in the config file ${lib.optionalString forceNvcCli '' substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ @@ -326,6 +349,7 @@ in }).overrideAttrs ( finalAttrs: prevAttrs: { + systemDefaultPath = lib.concatStringsSep ":" systemBinPaths; inputsDefaultPath = lib.makeBinPath finalAttrs.defaultPathInputs; passthru = prevAttrs.passthru or { } // { inherit sourceFilesWithDefaultPaths; diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index 5b985bb80551..6237db9cd699 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -9,14 +9,14 @@ let callPackage (import ./generic.nix rec { pname = "apptainer"; - version = "1.3.2"; + version = "1.3.3"; projectName = "apptainer"; src = fetchFromGitHub { owner = "apptainer"; repo = "apptainer"; rev = "refs/tags/v${version}"; - hash = "sha256-NseigaPmRKDsBk8v7RpYf+uoEGvQHVnqOMO49kP0mQ8="; + hash = "sha256-xQZCQa9z1aJ2tVtxMlwcNhlm0EV/nn8OnbfaVZRm4JI="; }; # Update by running diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index d0f2f3a0127e..f30c7393a751 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "macOS VMs on Apple Silicon to use in CI and other automations"; homepage = "https://tart.run"; license = licenses.fairsource09; - maintainers = with maintainers; [ emilytrau Enzime aduh95 ]; + maintainers = with maintainers; [ emilytrau aduh95 ]; mainProgram = finalAttrs.pname; platforms = [ "aarch64-darwin" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 281f451fddbd..228c2ed6cb9f 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook3, gtk-vnc , vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, gst_all_1, libosinfo, gnome, gtksourceview4, docutils, cpio +, gsettings-desktop-schemas, gst_all_1, libosinfo, adwaita-icon-theme, gtksourceview4, docutils, cpio , e2fsprogs, findutils, gzip, cdrtools, xorriso, fetchpatch , desktopToDarwinBundle, stdenv , spiceSupport ? true, spice-gtk ? null @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi + libvirt-glib vte dconf gtk-vnc adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 ] ++ lib.optional spiceSupport spice-gtk; diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/applications/virtualization/virt-what/default.nix index e11b265a9e3c..3d553acd48ff 100644 --- a/pkgs/applications/virtualization/virt-what/default.nix +++ b/pkgs/applications/virtualization/virt-what/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "virt-what"; - version = "1.25"; + version = "1.26"; src = fetchurl { url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-1Py0I2Irr75eK7zYS32SrU1YP0d4siW3LEqBrp/Dxz0="; + sha256 = "sha256-qoap0xO1yQSK+a2aA4fkr/I4uw6kLzuDARTotQzTFTU="; }; meta = with lib; { diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 825ae0de85e4..a67588fea1fd 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, libXdmcp, libXfixes, freetype, asciidoc -, xdotool, xorgserver, xsetroot, xterm, runtimeShell +, xdotool, xorg, xsetroot, xterm, runtimeShell , fetchpatch , nixosTests }: @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ (python3.withPackages (ps: with ps; [ ewmh pytest xlib ])) xdotool - xorgserver + xorg.xvfb xsetroot xterm python3.pkgs.pytestCheckHook diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix index f994b1917520..a41927484062 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix @@ -26,6 +26,10 @@ let plugins = lib.mergeAttrsList [ { hy3 = import ./hy3.nix; } + { hypr-dynamic-cursors = import ./hypr-dynamic-cursors.nix; } + { hyprfocus = import ./hyprfocus.nix; } + { hyprscroller = import ./hyprscroller.nix; } + { hyprspace = import ./hyprspace.nix; } (import ./hyprland-plugins.nix) ]; in diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix new file mode 100644 index 000000000000..a13cd43c58a7 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix @@ -0,0 +1,37 @@ +{ + lib, + mkHyprlandPlugin, + fetchFromGitHub, + hyprland, +}: + +mkHyprlandPlugin hyprland { + pluginName = "hypr-dynamic-cursors"; + version = "0-unstable-2024-07-06"; + + src = fetchFromGitHub { + owner = "VirtCode"; + repo = "hypr-dynamic-cursors"; + rev = "85423b074e112f28e84f6276d31d1548906a625e"; + hash = "sha256-lCAZ/7xtOE6P7uPIX2uQgC0nDOBZefWYO3O3izRx19E="; + }; + + dontUseCmakeConfigure = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + mv out/dynamic-cursors.so $out/lib/libdynamic-cursors.so + + runHook postInstall + ''; + + meta = { + description = "Plugin to make your Hyprland cursor more realistic"; + homepage = "https://github.com/VirtCode/hypr-dynamic-cursors"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ donovanglover ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix new file mode 100644 index 000000000000..f58cc54a8eb5 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix @@ -0,0 +1,35 @@ +{ + lib, + mkHyprlandPlugin, + hyprland, + fetchFromGitHub, +}: + +mkHyprlandPlugin hyprland { + pluginName = "hyprfocus"; + version = "0-unstable-2024-05-30"; + + src = fetchFromGitHub { + owner = "pyt0xic"; + repo = "hyprfocus"; + rev = "aa7262d3a4564062f97b9cfdad47fd914cfb80f2"; + hash = "sha256-R1ZgNhQkoS6ZHRRKB+j5vYgRANfYO//sHbrD7moUTx0="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + mv hyprfocus.so $out/lib/libhyprfocus.so + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/pyt0xic/hyprfocus"; + description = "Focus animation plugin for Hyprland inspired by Flashfocus"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ donovanglover ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix new file mode 100644 index 000000000000..f94da804d370 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix @@ -0,0 +1,41 @@ +{ + lib, + mkHyprlandPlugin, + hyprland, + cmake, + fetchFromGitHub, + unstableGitUpdater, +}: + +mkHyprlandPlugin hyprland { + pluginName = "hyprscroller"; + version = "0-unstable-2024-07-04"; + + src = fetchFromGitHub { + owner = "dawsers"; + repo = "hyprscroller"; + rev = "bef840b3f0fd3d37b5c1c9f2704b2efb60173184"; + hash = "sha256-vkpGSseA7n0/Y+83snbEe7Z++2akdDbvv7eZzM9V3wI="; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + mv hyprscroller.so $out/lib/libhyprscroller.so + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/dawsers/hyprscroller"; + description = "Hyprland layout plugin providing a scrolling layout like PaperWM"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ donovanglover ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix new file mode 100644 index 000000000000..66d6fcd7506e --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + fetchpatch, + hyprland, + mkHyprlandPlugin, +}: + +mkHyprlandPlugin hyprland { + pluginName = "hyprspace"; + version = "0-unstable-2024-06-17"; + + src = fetchFromGitHub { + owner = "KZDKM"; + repo = "hyprspace"; + rev = "2f3edb68f47a8f5d99d10b322e9a85a285f53cc7"; + hash = "sha256-iyj4D6c77uROAH9QdZjPd9SKnS/DuACMESqaEKnBgI8="; + }; + + # Fix build for Hyprland v0.41.2+ + patches = fetchpatch { + url = "https://github.com/KZDKM/Hyprspace/commit/edad6cf735097b7cb4406d3fc8daddd09dfa458a.patch"; + hash = "sha256-EVabjPymGAMPtC3Uf6lMJOInvccJhu4t09NXhXhq4RY="; + }; + + dontUseCmakeConfigure = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + mv Hyprspace.so $out/lib/libhyprspace.so + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/KZDKM/Hyprspace"; + description = "Workspace overview plugin for Hyprland"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ donovanglover ]; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 609da8871566..1ade5bd2b428 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , wayland-scanner @@ -33,6 +34,15 @@ stdenv.mkDerivation (self: { hash = "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8="; }; + patches = [ + # TODO: remove on next upgrade + (fetchpatch { + name = "fix-compilation-pipewire-1.2.0.patch"; + url = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/c5b30938710d6c599f3f5cd99a3ffac35381fb0f.patch"; + hash = "sha256-f9OgW9tLuGuHXYH6bR1Y+CEuBPHOhRiHfEPebJzlwK8="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix index 6a1dda584207..5810070d2ff4 100644 --- a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix +++ b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix @@ -28,7 +28,7 @@ in brightness.propagatedBuildInputs = [ ]; caffeine.propagatedBuildInputs = [ pkgs.xdg-utils pkgs.xdotool pkgs.xorg.xprop pkgs.libnotify ]; cmus.propagatedBuildInputs = [ pkgs.cmus ]; - cpu.propagatedBuildInputs = [ py.psutil pkgs.gnome.gnome-system-monitor ]; + cpu.propagatedBuildInputs = [ py.psutil pkgs.gnome-system-monitor ]; cpu2.propagatedBuildInputs = [ py.psutil pkgs.lm_sensors ]; cpu3.propagatedBuildInputs = [ py.psutil pkgs.lm_sensors ]; currency.propagatedBuildInputs = [ py.requests ]; @@ -85,8 +85,8 @@ in # NOTE: Yes, there is also a plugin named `layout-xkbswitch` with a dash. layout_xkbswitch.propagatedBuildInputs = [ pkgs.xkb-switch ]; libvirtvms.propagatedBuildInputs = [ py.libvirt ]; - load.propagatedBuildInputs = [ pkgs.gnome.gnome-system-monitor ]; - memory.propagatedBuildInputs = [ pkgs.gnome.gnome-system-monitor ]; + load.propagatedBuildInputs = [ pkgs.gnome-system-monitor ]; + memory.propagatedBuildInputs = [ pkgs.gnome-system-monitor ]; messagereceiver = { }; mocp.propagatedBuildInputs = [ pkgs.moc ]; mpd.propagatedBuildInputs = [ pkgs.mpc-cli ]; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 16dd2e6485e7..8ced173b2223 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre2, libev , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb-run +, xvfb-run , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libstartup_notification libX11 pcre2 libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.InlineC - xorgserver xvfb-run + xvfb-run ]; configureFlags = [ "--disable-builddir" ]; diff --git a/pkgs/applications/window-managers/i3/kitti3.nix b/pkgs/applications/window-managers/i3/kitti3.nix index 3068baee5d99..1c430649102c 100644 --- a/pkgs/applications/window-managers/i3/kitti3.nix +++ b/pkgs/applications/window-managers/i3/kitti3.nix @@ -36,6 +36,6 @@ buildPythonApplication rec { description = "Kitty drop-down service for sway & i3wm"; mainProgram = "kitti3"; license = licenses.bsd3; - maintainers = with maintainers; [ Enzime ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index a51f3838aa3a..6bbbf6100949 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "0-unstable-2024-05-17"; + version = "0-unstable-2024-06-13"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "5be8f60326181b22e111f02918ae5778cf1a89b0"; - hash = "sha256-dHY0bfVfRpiBY5rPnhmu3aHXx1l9jQhXBtcBbej2JFk="; + rev = "2e88df729fb4961fa81dc9848291fe73c5657c03"; + hash = "sha256-a5c48U+FaHns52/wQQxYQMSXjjqGzaMh1gs3HTOM7Ys="; }; strictDeps = true; diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 26211ca2f89c..3a563f9e1723 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { pname = "phosh-mobile-settings"; - version = "0.38.0"; + version = "0.39.0"; src = fetchurl { # This tarball includes the meson wrapped subproject 'gmobile'. url = "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-WDqgVsJx5y6IlWII9fRBsAeWn/tB8BaXRtlPvA0wmMk="; + hash = "sha256-9vN4IqGoRHDJQYohycrrSj4ITJHHaSNgPjpEjRCCvUw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/applications/window-managers/sommelier/default.nix index a5b0398d4442..99c6892ba3da 100644 --- a/pkgs/applications/window-managers/sommelier/default.nix +++ b/pkgs/applications/window-managers/sommelier/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "sommelier"; - version = "125.0"; + version = "126.0"; src = fetchzip rec { url = "https://chromium.googlesource.com/chromiumos/platform2/+archive/${passthru.rev}/vm_tools/sommelier.tar.gz"; - passthru.rev = "4445ac169a9e043fd260a835384aaa49c457c358"; + passthru.rev = "fd3798efe23f2edbc48f86f2fbd82ba5059fd875"; stripRoot = false; - sha256 = "1PofODGZDknZpzXI1d3JcoNYz3IGfw32nm+SmUpeqb8="; + sha256 = "BmWZnMcK7IGaEAkVPulyb3hngsmuI0D1YtQEbqMjV5c="; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 0d44a5ab23e9..6451feeabe3c 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -74,7 +74,7 @@ rec { targetPkgs = pkgs: with pkgs; [ gtk3 bashInteractive - gnome.zenity + zenity xorg.xrandr which perl @@ -162,7 +162,7 @@ rec { vulkan-loader flac - freeglut + libglut libjpeg libpng12 libpulseaudio diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 952bd85d4b01..b7561f1aab55 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -45,6 +45,7 @@ "relro" "stackprotector" "strictoverflow" + "zerocallusedregs" ] ++ lib.optional (with stdenvNoCC; lib.any (x: x) [ # OpenBSD static linking requires PIE (with targetPlatform; isOpenBSD && isStatic) diff --git a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh index a1d06b9c6b0a..51bfeb18f58a 100644 --- a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh +++ b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh @@ -7,5 +7,5 @@ for p in "${params[@]}"; do done if $needsTarget; then - extraBefore+=(-target @defaultTarget@ @march@) + extraBefore+=(-target @defaultTarget@ @machineFlags@) fi diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index ef166e2f50c5..0dca3b3347e5 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -32,7 +32,7 @@ if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then fi if (( "${NIX_DEBUG:-0}" >= 1 )); then - declare -a allHardeningFlags=(fortify fortify3 stackprotector pie pic strictoverflow format trivialautovarinit zerocallusedregs) + declare -a allHardeningFlags=(fortify fortify3 stackprotector stackclashprotection pie pic strictoverflow format trivialautovarinit zerocallusedregs) declare -A hardeningDisableMap=() # Determine which flags were effectively disabled so we can report below. @@ -79,6 +79,10 @@ for flag in "${!hardeningEnableMap[@]}"; do if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi hardeningCFlagsBefore+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4') ;; + stackclashprotection) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stack-clash-protection >&2; fi + hardeningCFlagsBefore+=('-fstack-clash-protection') + ;; pie) # NB: we do not use `+=` here, because PIE flags must occur before any PIC flags if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 4adc1dcb1f8d..d842f3fc7090 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -67,6 +67,7 @@ let concatMapStrings concatStringsSep escapeShellArg + escapeShellArgs getBin getDev getLib @@ -234,6 +235,32 @@ let then guess else null; + thumb = if targetPlatform.gcc.thumb then "thumb" else "arm"; + tune = if targetPlatform ? gcc.tune + then findBestTuneApproximation targetPlatform.gcc.tune + else null; + + # Machine flags. These are necessary to support + + # TODO: We should make a way to support miscellaneous machine + # flags and other gcc flags as well. + + machineFlags = + # Always add -march based on cpu in triple. Sometimes there is a + # discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in + # that case. + optional (targetPlatform ? gcc.arch && !(targetPlatform.isDarwin && targetPlatform.isAarch64) && isGccArchSupported targetPlatform.gcc.arch) "-march=${targetPlatform.gcc.arch}" ++ + # TODO: aarch64-darwin has mcpu incompatible with gcc + optional (targetPlatform ? gcc.cpu && !(targetPlatform.isDarwin && targetPlatform.isAarch64)) "-mcpu=${targetPlatform.gcc.cpu}" ++ + # -mfloat-abi only matters on arm32 but we set it here + # unconditionally just in case. If the abi specifically sets hard + # vs. soft floats we use it here. + optional (targetPlatform ? gcc.float-abi) "-mfloat-abi=${targetPlatform.gcc.float-abi}" ++ + optional (targetPlatform ? gcc.fpu) "-mfpu=${targetPlatform.gcc.fpu}" ++ + optional (targetPlatform ? gcc.mode) "-mmode=${targetPlatform.gcc.mode}" ++ + optional (targetPlatform ? gcc.thumb) "-m${thumb}" ++ + optional (tune != null) "-mtune=${tune}"; + defaultHardeningFlags = bintools.defaultHardeningFlags or []; # if cc.hardeningUnsupportedFlagsByTargetPlatform exists, this is @@ -610,53 +637,11 @@ stdenvNoCC.mkDerivation { export hardening_unsupported_flags="${concatStringsSep " " ccHardeningUnsupportedFlags}" '' - # Machine flags. These are necessary to support - - # TODO: We should make a way to support miscellaneous machine - # flags and other gcc flags as well. - - # Always add -march based on cpu in triple. Sometimes there is a - # discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in - # that case. - # # For clang, this is handled in add-clang-cc-cflags-before.sh - - # TODO: aarch64-darwin has mcpu incompatible with gcc - + optionalString ((targetPlatform ? gcc.arch) && !isClang && !(targetPlatform.isDarwin && targetPlatform.isAarch64) && - isGccArchSupported targetPlatform.gcc.arch) '' - echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before + + lib.optionalString (!isClang && machineFlags != []) '' + printf "%s\n" ${lib.escapeShellArgs machineFlags} >> $out/nix-support/cc-cflags-before '' - # -mcpu is not very useful, except on PowerPC where it is used - # instead of march. On all other platforms you should use mtune - # and march instead. - # TODO: aarch64-darwin has mcpu incompatible with gcc - + optionalString ((targetPlatform ? gcc.cpu) && (isClang || !(targetPlatform.isDarwin && targetPlatform.isAarch64))) '' - echo "-mcpu=${targetPlatform.gcc.cpu}" >> $out/nix-support/cc-cflags-before - '' - - # -mfloat-abi only matters on arm32 but we set it here - # unconditionally just in case. If the abi specifically sets hard - # vs. soft floats we use it here. - + optionalString (targetPlatform ? gcc.float-abi) '' - echo "-mfloat-abi=${targetPlatform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before - '' - + optionalString (targetPlatform ? gcc.fpu) '' - echo "-mfpu=${targetPlatform.gcc.fpu}" >> $out/nix-support/cc-cflags-before - '' - + optionalString (targetPlatform ? gcc.mode) '' - echo "-mmode=${targetPlatform.gcc.mode}" >> $out/nix-support/cc-cflags-before - '' - + optionalString (targetPlatform ? gcc.thumb) '' - echo "-m${if targetPlatform.gcc.thumb then "thumb" else "arm"}" >> $out/nix-support/cc-cflags-before - '' - + (let tune = if targetPlatform ? gcc.tune - then findBestTuneApproximation targetPlatform.gcc.tune - else null; - in optionalString (tune != null) '' - echo "-mtune=${tune}" >> $out/nix-support/cc-cflags-before - '') - # TODO: categorize these and figure out a better place for them + optionalString targetPlatform.isWindows '' hardening_unsupported_flags+=" pic" @@ -718,9 +703,7 @@ stdenvNoCC.mkDerivation { ## + optionalString isClang '' # Escape twice: once for this script, once for the one it gets substituted into. - export march=${escapeShellArg - (optionalString (targetPlatform ? gcc.arch) - (escapeShellArg "-march=${targetPlatform.gcc.arch}"))} + export machineFlags=${escapeShellArg (escapeShellArgs machineFlags)} export defaultTarget=${targetPlatform.config} substituteAll ${./add-clang-cc-cflags-before.sh} $out/nix-support/add-local-cc-cflags-before.sh '' diff --git a/pkgs/build-support/dev-shell-tools/README.md b/pkgs/build-support/dev-shell-tools/README.md new file mode 100644 index 000000000000..d6d9a8c8ad0d --- /dev/null +++ b/pkgs/build-support/dev-shell-tools/README.md @@ -0,0 +1,13 @@ + +# `devShellTools` + +This directory implements the `pkgs.devShellTools` library. + +# Contributing to `devShellTools` + +- Documentation should be contributed to the Nixpkgs manual, not here. + +- Tests are available in the `tests` directory. + You may run them with `nix-build -A tests.devShellTools`. + +- See [../../README.md](../../README.md) for more information on contributing to Nixpkgs. diff --git a/pkgs/build-support/dev-shell-tools/default.nix b/pkgs/build-support/dev-shell-tools/default.nix new file mode 100644 index 000000000000..cd5fa5f5937e --- /dev/null +++ b/pkgs/build-support/dev-shell-tools/default.nix @@ -0,0 +1,16 @@ +{ lib }: +let + inherit (builtins) typeOf; +in +rec { + # This function closely mirrors what this Nix code does: + # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/primops.cc#L1102 + # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/eval.cc#L1981-L2036 + valueToString = value: + # We can't just use `toString` on all derivation attributes because that + # would not put path literals in the closure. So we explicitly copy + # those into the store here + if typeOf value == "path" then "${value}" + else if typeOf value == "list" then toString (map valueToString value) + else toString value; +} diff --git a/pkgs/build-support/dev-shell-tools/tests/default.nix b/pkgs/build-support/dev-shell-tools/tests/default.nix new file mode 100644 index 000000000000..bfedc04409a9 --- /dev/null +++ b/pkgs/build-support/dev-shell-tools/tests/default.nix @@ -0,0 +1,45 @@ +{ + devShellTools, + emptyFile, + lib, + stdenv, + hello, +}: +let + inherit (lib) escapeShellArg; +in +{ + # nix-build -A tests.devShellTools.valueToString + valueToString = + let inherit (devShellTools) valueToString; in + + stdenv.mkDerivation { + name = "devShellTools-valueToString-built-tests"; + + # Test inputs + inherit emptyFile hello; + one = 1; + boolTrue = true; + boolFalse = false; + foo = "foo"; + list = [ 1 2 3 ]; + pathDefaultNix = ./default.nix; + packages = [ hello emptyFile ]; + # TODO: nested lists + + buildCommand = '' + touch $out + ( set -x + [[ "$one" = ${escapeShellArg (valueToString 1)} ]] + [[ "$boolTrue" = ${escapeShellArg (valueToString true)} ]] + [[ "$boolFalse" = ${escapeShellArg (valueToString false)} ]] + [[ "$foo" = ${escapeShellArg (valueToString "foo")} ]] + [[ "$hello" = ${escapeShellArg (valueToString hello)} ]] + [[ "$list" = ${escapeShellArg (valueToString [ 1 2 3 ])} ]] + [[ "$packages" = ${escapeShellArg (valueToString [ hello emptyFile ])} ]] + [[ "$pathDefaultNix" = ${escapeShellArg (valueToString ./default.nix)} ]] + [[ "$emptyFile" = ${escapeShellArg (valueToString emptyFile)} ]] + ) >log 2>&1 || { cat log; exit 1; } + ''; + }; +} diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 1d1989d27fbb..ea461ccffa07 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -4,6 +4,7 @@ , callPackage , closureInfo , coreutils +, devShellTools , e2fsprogs , proot , fakeNss @@ -49,6 +50,10 @@ let toList ; + inherit (devShellTools) + valueToString + ; + mkDbExtraCommand = contents: let contentsList = if builtins.isList contents then contents else [ contents ]; @@ -1141,7 +1146,7 @@ rec { # A binary that calls the command to build the derivation builder = writeShellScriptBin "buildDerivation" '' - exec ${lib.escapeShellArg (stringValue drv.drvAttrs.builder)} ${lib.escapeShellArgs (map stringValue drv.drvAttrs.args)} + exec ${lib.escapeShellArg (valueToString drv.drvAttrs.builder)} ${lib.escapeShellArgs (map valueToString drv.drvAttrs.args)} ''; staticPath = "${dirOf shell}:${lib.makeBinPath [ builder ]}"; @@ -1173,20 +1178,9 @@ rec { # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/globals.hh#L464-L465 sandboxBuildDir = "/build"; - # This function closely mirrors what this Nix code does: - # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/primops.cc#L1102 - # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/eval.cc#L1981-L2036 - stringValue = value: - # We can't just use `toString` on all derivation attributes because that - # would not put path literals in the closure. So we explicitly copy - # those into the store here - if builtins.typeOf value == "path" then "${value}" - else if builtins.typeOf value == "list" then toString (map stringValue value) - else toString value; - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L992-L1004 drvEnv = lib.mapAttrs' (name: value: - let str = stringValue value; + let str = valueToString value; in if lib.elem name (drv.drvAttrs.passAsFile or []) then lib.nameValuePair "${name}Path" (writeText "pass-as-text-${name}" str) else lib.nameValuePair name str diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 52706ef6b21f..4949d6b8a888 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -619,10 +619,14 @@ rec { fakeRootCommands = '' mkdir -p ./home/alice chown 1000 ./home/alice - ln -s ${pkgs.hello.overrideAttrs (o: { + ln -s ${pkgs.hello.overrideAttrs (finalAttrs: prevAttrs: { # A unique `hello` to make sure that it isn't included via another mechanism by accident. - configureFlags = o.configureFlags or [] ++ [ " --program-prefix=layeredImageWithFakeRootCommands-" ]; + configureFlags = prevAttrs.configureFlags or [] ++ [ " --program-prefix=layeredImageWithFakeRootCommands-" ]; doCheck = false; + versionCheckProgram = "${builtins.placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; + meta = prevAttrs.meta // { + mainProgram = "layeredImageWithFakeRootCommands-hello"; + }; })} ./hello ''; }; diff --git a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix index 7ae9cfc9f661..48e6e8ea470a 100644 --- a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix @@ -5,6 +5,8 @@ # Name of the nuget package to install, if different from pname , nugetName ? pname # Hash of the nuget package to install, will be given on first build + # nugetHash uses SRI hash and should be preferred +, nugetHash ? "" , nugetSha256 ? "" # Additional nuget deps needed by the tool package , nugetDeps ? (_: []) @@ -24,7 +26,7 @@ buildDotnetModule (args // { nugetDeps = mkNugetDeps { name = pname; nugetDeps = { fetchNuGet }: [ - (fetchNuGet { pname = nugetName; inherit version; sha256 = nugetSha256; }) + (fetchNuGet { pname = nugetName; inherit version; sha256 = nugetSha256; hash = nugetHash; }) ] ++ (nugetDeps fetchNuGet); }; diff --git a/pkgs/build-support/dotnet/fetchnuget/default.nix b/pkgs/build-support/dotnet/fetchnuget/default.nix index 061da746cead..a8e85270e73f 100644 --- a/pkgs/build-support/dotnet/fetchnuget/default.nix +++ b/pkgs/build-support/dotnet/fetchnuget/default.nix @@ -5,15 +5,19 @@ attrs @ , version , url ? "https://www.nuget.org/api/v2/package/${pname}/${version}" , sha256 ? "" +, hash ? "" , md5 ? "" , ... }: if md5 != "" then - throw "fetchnuget does not support md5 anymore, please use sha256" + throw "fetchnuget does not support md5 anymore, please use 'hash' attribute with SRI hash" +# This is also detected in fetchurl, but we just throw here to avoid confusion +else if (sha256 != "" && hash != "") then + throw "multiple hashes passed to fetchNuGet" else buildDotnetPackage ({ src = fetchurl { - inherit url sha256; + inherit url sha256 hash; name = "${pname}.${version}.zip"; }; diff --git a/pkgs/build-support/dotnet/make-nuget-deps/default.nix b/pkgs/build-support/dotnet/make-nuget-deps/default.nix index fcd3f9f076b2..cd048bcc30e5 100644 --- a/pkgs/build-support/dotnet/make-nuget-deps/default.nix +++ b/pkgs/build-support/dotnet/make-nuget-deps/default.nix @@ -1,11 +1,14 @@ { linkFarmFromDrvs, fetchurl }: { name, nugetDeps ? import sourceFile, sourceFile ? null }: linkFarmFromDrvs "${name}-nuget-deps" (nugetDeps { - fetchNuGet = { pname, version, sha256 + fetchNuGet = { pname, version, sha256 ? "", hash ? "" , url ? "https://www.nuget.org/api/v2/package/${pname}/${version}" }: fetchurl { name = "${pname}.${version}.nupkg"; - inherit url sha256; + # There is no need to verify whether both sha256 and hash are + # valid here, because nuget-to-nix does not generate a deps.nix + # containing both. + inherit url sha256 hash; }; }) // { inherit sourceFile; diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh index 2754bfc32d7b..92b0200ec034 100755 --- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh +++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh @@ -65,11 +65,12 @@ for package in *; do for source in "${remote_sources[@]}"; do url="${base_addresses[$source]}$package/$version/$package.$version.nupkg" if [[ "$source" == "$used_source" ]]; then - sha256="$(nix-hash --type sha256 --flat --base32 "$version/$package.$version".nupkg)" + hash="$(nix-hash --type sha256 --flat --sri "$version/$package.$version".nupkg)" found=true break else - if sha256=$(nix-prefetch-url "$url" 2>"$tmp"/error); then + if hash=$(nix-prefetch-url "$url" 2>"$tmp"/error); then + hash="$(nix-hash --to-sri --type sha256 "$hash")" # If multiple remote sources are enabled, nuget will try them all # concurrently and use the one that responds first. We always use the # first source that has the package. @@ -91,9 +92,9 @@ for package in *; do fi if [[ "$source" != https://api.nuget.org/v3/index.json ]]; then - echo " (fetchNuGet { pname = \"$id\"; version = \"$version\"; sha256 = \"$sha256\"; url = \"$url\"; })" + echo " (fetchNuGet { pname = \"$id\"; version = \"$version\"; hash = \"$hash\"; url = \"$url\"; })" else - echo " (fetchNuGet { pname = \"$id\"; version = \"$version\"; sha256 = \"$sha256\"; })" + echo " (fetchNuGet { pname = \"$id\"; version = \"$version\"; hash = \"$hash\"; })" fi done cd .. diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index a3ca6685147d..97b3661bb2d4 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -14,6 +14,7 @@ , includes ? [] , revert ? false , postFetch ? "" +, nativeBuildInputs ? [] , ... }@args: let @@ -29,6 +30,7 @@ in lib.throwIfNot (excludes == [] || includes == []) "fetchpatch: cannot use excludes and includes simultaneously" fetchurl ({ + nativeBuildInputs = [ patchutils ] ++ nativeBuildInputs; postFetch = '' tmpfile="$TMPDIR/patch" @@ -48,12 +50,12 @@ fetchurl ({ set -e mv "$tmpfile" "$out" - "${patchutils}/bin/lsdiff" \ + lsdiff \ ${lib.optionalString (relative != null) "-p1 -i ${lib.escapeShellArg relative}/'*'"} \ "$out" \ | sort -u | sed -e 's/[*?]/\\&/g' \ | xargs -I{} \ - "${patchutils}/bin/filterdiff" \ + filterdiff \ --include={} \ --strip=${toString stripLen} \ ${lib.optionalString (extraPrefix != null) '' @@ -70,7 +72,7 @@ fetchurl ({ exit 1 fi - ${patchutils}/bin/filterdiff \ + filterdiff \ -p1 \ ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \ ${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \ @@ -84,10 +86,10 @@ fetchurl ({ exit 1 fi '' + lib.optionalString revert '' - ${patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile" + interdiff "$out" /dev/null > "$tmpfile" mv "$tmpfile" "$out" '' + postFetch; } // builtins.removeAttrs args [ "relative" "stripLen" "decode" "extraPrefix" "excludes" "includes" "revert" - "postFetch" + "postFetch" "nativeBuildInputs" ]) diff --git a/pkgs/build-support/fetchpatch/tests.nix b/pkgs/build-support/fetchpatch/tests.nix index 0a27f1bc70e7..b7352fff7f92 100644 --- a/pkgs/build-support/fetchpatch/tests.nix +++ b/pkgs/build-support/fetchpatch/tests.nix @@ -7,7 +7,7 @@ in { simple = testers.invalidateFetcherByDrvHash fetchpatch { url = "https://github.com/facebook/zstd/pull/2724/commits/e1f85dbca3a0ed5ef06c8396912a0914db8dea6a.patch"; - sha256 = if isFetchpatch2 then "sha256-01BrkHLye4KOdqCw3tv7AJzIF6578pl2fl270TJFTmw=" else "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg="; + sha256 = if isFetchpatch2 then "sha256-w4yU0wt64d0WkuBQPeGf8vn5TH6qSBJvNIgka9QK+/Q=" else "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg="; }; relative = testers.invalidateFetcherByDrvHash fetchpatch { diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index bc28fbf6fc42..a5e722b0ac08 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -218,8 +218,7 @@ let buildGoDir() { local cmd="$1" dir="$2" - . $TMPDIR/buildFlagsArray - + declare -ga buildFlagsArray declare -a flags flags+=($buildFlags "''${buildFlagsArray[@]}") flags+=(''${tags:+-tags=''${tags// /,}}) @@ -258,11 +257,6 @@ let buildFlagsArray+=(-x) fi - if [ ''${#buildFlagsArray[@]} -ne 0 ]; then - declare -p buildFlagsArray > $TMPDIR/buildFlagsArray - else - touch $TMPDIR/buildFlagsArray - fi if [ -z "$enableParallelBuilding" ]; then export NIX_BUILD_CORES=1 fi diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 9c27a142f4b6..5f8d1eee8ce4 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -56,7 +56,7 @@ in , prepend ? [] # Whether to wrap the initramfs in a u-boot image. -, makeUInitrd ? stdenvNoCC.hostPlatform.linux-kernel.target == "uImage" +, makeUInitrd ? stdenvNoCC.hostPlatform.linux-kernel.target or "dummy" == "uImage" # If generating a u-boot image, the architecture to use. The default # guess may not align with u-boot's nomenclature correctly, so it can @@ -75,11 +75,9 @@ let toValidStoreName = x: with builtins; lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x)); -in stdenvNoCC.mkDerivation rec { +in stdenvNoCC.mkDerivation (rec { inherit name makeUInitrd extension uInitrdArch prepend; - ${if makeUInitrd then "uInitrdCompression" else null} = uInitrdCompression; - builder = ./make-initrd.sh; nativeBuildInputs = [ perl libarchive ] @@ -110,4 +108,6 @@ in stdenvNoCC.mkDerivation rec { contents (lib.range 0 (lib.length contents - 1)); pathsFromGraph = ./paths-from-graph.pl; -} +} // lib.optionalAttrs makeUInitrd { + uInitrdCompression = uInitrdCompression; +}) diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index ccceb23256b6..9cae8204c6a8 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -108,11 +108,12 @@ let renderAction = name: attrs: renderSection "Desktop Action ${name}" (preprocessAction attrs); actionsRendered = lib.mapAttrsToList renderAction actions; + extension = if type == "Directory" then "directory" else "desktop"; content = [ mainSectionRendered ] ++ actionsRendered; in writeTextFile { - name = "${name}.desktop"; - destination = "/share/applications/${name}.desktop"; + name = "${name}.${extension}"; + destination = "/share/applications/${name}.${extension}"; text = builtins.concatStringsSep "\n" content; checkPhase = ''${buildPackages.desktop-file-utils}/bin/desktop-file-validate "$target"''; }) diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index d86fc90c6c7d..a001f80b113c 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -142,7 +142,7 @@ meta = with lib; { description = "Prefetch dependencies from npm (for use with `fetchNpmDeps`)"; mainProgram = "prefetch-npm-deps"; - maintainers = with maintainers; [ lilyinstarlight winter ]; + maintainers = with maintainers; [ winter ]; license = licenses.mit; }; }; diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index ab872bac854f..c348885e44ca 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -14,6 +14,7 @@ , crateLicenseFile , crateLinks , crateName +, crateType , crateReadme , crateRenames , crateRepository @@ -194,7 +195,7 @@ in '' export CARGO_FEATURE_$feature=1 done - target/build/${crateName}/build_script_build > target/build/${crateName}.opt + target/build/${crateName}/build_script_build | tee target/build/${crateName}.opt ) set +e @@ -209,6 +210,11 @@ in '' EXTRA_LINK_LIBS=$(sed -n "s/^cargo::\{0,1\}rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') EXTRA_LINK_SEARCH=$(sed -n "s/^cargo::\{0,1\}rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) + ${lib.optionalString (lib.elem "cdylib" crateType) '' + CRATE_TYPE_IS_CDYLIB="true" + EXTRA_CDYLIB_LINK_ARGS=$(sed -n "s/^cargo::\{0,1\}rustc-cdylib-link-arg=\(.*\)/-C link-arg=\1/p" target/build/${crateName}.opt | tr '\n' ' ') +''} + # We want to read part of every line that has cargo:rustc-env= prefix and # export it as environment variables. This turns out tricky if the lines # have spaces: we can't wrap the command in double quotes as that captures diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index d6369055cc53..841e8e86cbfb 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -357,7 +357,7 @@ crate_: lib.makeOverridable configurePhase = configureCrate { - inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription + inherit crateName crateType buildDependencies completeDeps completeBuildDeps crateDescription crateFeatures crateRenames libName build workspace_member release libPath crateVersion crateLinks extraLinkFlags extraRustcOptsForBuildRs crateLicense crateLicenseFile crateReadme crateRepository crateRustVersion diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh index 0181ae432c85..36ddc9ac23c4 100644 --- a/pkgs/build-support/rust/build-rust-crate/lib.sh +++ b/pkgs/build-support/rust/build-rust-crate/lib.sh @@ -114,6 +114,12 @@ setup_link_paths() { tr '\n' ' ' < target/link > target/link_ LINK=$(cat target/link_) fi + + # Add "rustc-cdylib-link-arg" as linker arguments + # https://doc.rust-lang.org/cargo/reference/build-scripts.html#rustc-cdylib-link-arg + if [[ -n "$CRATE_TYPE_IS_CDYLIB" ]]; then + EXTRA_BUILD+=" $EXTRA_CDYLIB_LINK_ARGS" + fi } search_for_bin_path() { diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index d8f1bfaf4447..f974ff3adc33 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,46 +1,48 @@ { lib , stdenv -, atk -, pkg-config -, curl -, darwin -, libgit2 -, gtk3 -, libssh2 -, openssl -, sqlite -, zlib -, dbus -, dbus-glib -, gdk-pixbuf -, cairo -, python3 -, libsodium -, postgresql -, gmp -, gobject-introspection -, foundationdb -, capnproto -, nettle -, gtk4 -, clang -, llvmPackages -, linux-pam -, pango -, cmake -, glib -, freetype -, fontconfig -, rdkafka -, udev -, libevdev , alsa-lib -, graphene -, protobuf +, atk , autoconf , automake +, cairo +, capnproto +, clang +, cmake +, curl +, darwin +, dbus +, dbus-glib +, fontconfig +, foundationdb +, freetype +, gdk-pixbuf +, glib +, gmp +, gobject-introspection +, graphene +, gtk3 +, gtk4 +, libevdev +, libgit2 +, libsodium +, libsoup_3 +, libssh2 , libtool +, linux-pam +, llvmPackages +, nettle +, openssl +, pango +, pkg-config +, postgresql +, protobuf +, python3 +, rdkafka , seatd # =libseat +, sqlite +, udev +, webkitgtk_4_1 +, zlib , ... }: @@ -93,7 +95,10 @@ in nativeBuildInputs = [ pkg-config ] ++ lib.optionals (stdenv.buildPlatform.config != stdenv.hostPlatform.config) [ - python3 autoconf automake libtool + python3 + autoconf + automake + libtool ]; buildInputs = [ libevdev ]; @@ -132,21 +137,34 @@ in }; gobject-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus-glib ]; }; gio-sys = attrs: { - buildInputs = [ dbus-glib ]; - }; - - gdk-pixbuf-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus-glib ]; }; gdk-pixbuf = attrs: { + buildInputs = [ dbus-glib gdk-pixbuf ]; + }; + + gdk-pixbuf-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gdk-pixbuf ]; }; + gdk-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 ]; # libgdk-3 + }; + + gdkx11-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 ]; + }; + gtk-sys = attrs: { buildInputs = [ gtk3 ]; nativeBuildInputs = [ pkg-config ]; @@ -203,6 +221,11 @@ in buildInputs = [ graphene ]; }; + javascriptcore-rs-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ webkitgtk_4_1 ]; + }; + nettle-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle clang ]; @@ -302,6 +325,11 @@ in buildInputs = [ freetype fontconfig ]; }; + soup3-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libsoup_3 ]; + }; + thrussh-libsodium = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsodium ]; @@ -311,6 +339,11 @@ in nativeBuildInputs = [ protobuf ]; }; + webkit2gtk-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ webkitgtk_4_1 ]; + }; + xcb = attrs: { buildInputs = [ python3 ]; }; diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index b3cc1ced7964..c1e701425f00 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -3,6 +3,9 @@ maturinBuildHook() { runHook preBuild + # Put the wheel to dist/ so that regular Python tooling can find it. + local dist="$PWD/dist" + if [ ! -z "${buildAndTestSubdir-}" ]; then pushd "${buildAndTestSubdir}" fi @@ -16,6 +19,7 @@ maturinBuildHook() { --manylinux off \ --strip \ --release \ + --out "$dist" \ ${maturinBuildFlags-} ) @@ -23,10 +27,6 @@ maturinBuildHook() { popd fi - # Move the wheel to dist/ so that regular Python tooling can find it. - mkdir -p dist - mv ${cargoRoot:+$cargoRoot/}target/wheels/*.whl dist/ - # These are python build hooks and may depend on ./dist runHook postBuild diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh index e103fe77d9be..0b03460eacb6 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh @@ -23,10 +23,13 @@ fixDarwinDylibNames() { for fn in "$@"; do if [ -L "$fn" ]; then continue; fi echo "$fn: fixing dylib" + set +e int_out=$(@targetPrefix@install_name_tool -id "$fn" "${flags[@]}" "$fn" 2>&1) result=$? + set -e if [ "$result" -ne 0 ] && - ! grep "shared library stub file and can't be changed" <<< "$out" + ! grep -q -e "shared library stub file and can't be changed" \ + -e "is not a Mach-O file" <<< "$int_out" then echo "$int_out" >&2 exit "$result" diff --git a/pkgs/build-support/setup-hooks/install-shell-files.sh b/pkgs/build-support/setup-hooks/install-shell-files.sh index 194b408b1050..4f4e215da4df 100644 --- a/pkgs/build-support/setup-hooks/install-shell-files.sh +++ b/pkgs/build-support/setup-hooks/install-shell-files.sh @@ -219,6 +219,11 @@ installShellCompletion() { else install -Dm644 -T "$arg" "$outPath" fi || return + + if [ ! -s "$outPath" ]; then + echo "installShellCompletion: error: installed shell completion file \`$outPath' does not exist or has zero size" >&2 + return 1 + fi # Clear the per-path flags name= done diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index 93fac09c07ba..bceac1b0c959 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -485,7 +485,7 @@ rec { # returns an executable # # Example: - # writeJS "example" { libraries = [ pkgs.nodePackages.uglify-js ]; } '' + # writeJS "example" { libraries = [ pkgs.uglify-js ]; } '' # var UglifyJS = require("uglify-js"); # var code = "function add(first, second) { return first + second; }"; # var result = UglifyJS.minify(code); diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix index 0be042d174f2..c0c9ee4a7fa8 100644 --- a/pkgs/by-name/_2/_2ship2harkinian/package.nix +++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix @@ -15,7 +15,7 @@ libpulseaudio, libpng, imagemagick, - gnome, + zenity, makeWrapper, imgui, stormlib, @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 libpulseaudio libpng - gnome.zenity + zenity imgui' stormlib' libzip @@ -183,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { ''; fixupPhase = '' - wrapProgram $out/2s2h/2s2h.elf --prefix PATH ":" ${lib.makeBinPath [ gnome.zenity ]} + wrapProgram $out/2s2h/2s2h.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]} ''; desktopItems = [ diff --git a/pkgs/by-name/_4/_4d-minesweeper/package.nix b/pkgs/by-name/_4/_4d-minesweeper/package.nix index 371aae75fab3..7372545eb56d 100644 --- a/pkgs/by-name/_4/_4d-minesweeper/package.nix +++ b/pkgs/by-name/_4/_4d-minesweeper/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { description = "4D Minesweeper game written in Godot"; license = licenses.mpl20; platforms = platforms.linux; - maintainers = with maintainers; [ nayala ]; + maintainers = with maintainers; []; mainProgram = "4d-minesweeper"; }; } diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index da1357c71e8f..d46fde773154 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -7,7 +7,7 @@ telegram-desktop.overrideAttrs (old: rec { pname = "64gram"; - version = "1.1.29"; + version = "1.1.30"; src = fetchFromGitHub { owner = "TDesktop-x64"; @@ -15,7 +15,7 @@ telegram-desktop.overrideAttrs (old: rec { rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-OJiVmmDIsijK/IHGEdsCoAwvc9JlSth+76r9O1aJbd0="; + hash = "sha256-TcgQcIv88oBViTyk47r9jstNTYWnql+oXHfZePKgMHU="; }; passthru.updateScript = nix-update-script {}; diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index 51780029d143..58bdfc6204d5 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ab-av1"; - version = "0.7.14"; + version = "0.7.15"; src = fetchFromGitHub { owner = "alexheretic"; repo = "ab-av1"; rev = "v${version}"; - hash = "sha256-cDabGXNzusVnp4exINqUitEL1HnzSgpcRtYXU5pSRhY="; + hash = "sha256-s1hE+/fj73xxHqBQ7Q295vYBGzdCeHj0odn+EPFrS6E="; }; - cargoHash = "sha256-sW/673orvK+mIUqTijpNh4YGd9ZrgSveGT6F1O5OYfI="; + cargoHash = "sha256-0Fi9b5TQeVHw8MfLdIhLybb4ppRVcPqRQz1oR+AIGY0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/desktops/gnome/apps/accerciser/default.nix b/pkgs/by-name/ac/accerciser/package.nix similarity index 97% rename from pkgs/desktops/gnome/apps/accerciser/default.nix rename to pkgs/by-name/ac/accerciser/package.nix index b8f5d153467e..7493c6a0bfa4 100644 --- a/pkgs/desktops/gnome/apps/accerciser/default.nix +++ b/pkgs/by-name/ac/accerciser/package.nix @@ -62,7 +62,6 @@ python3.pkgs.buildPythonApplication rec { passthru = { updateScript = gnome.updateScript { packageName = "accerciser"; - attrPath = "gnome.accerciser"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix index d5d224957a94..b77ecb7256bc 100644 --- a/pkgs/by-name/ad/ad-miner/package.nix +++ b/pkgs/by-name/ad/ad-miner/package.nix @@ -22,10 +22,6 @@ python3.pkgs.buildPythonApplication rec { poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - dependencies = with python3.pkgs; [ neo4j numpy diff --git a/pkgs/by-name/ad/adif-multitool/package.nix b/pkgs/by-name/ad/adif-multitool/package.nix new file mode 100644 index 000000000000..4bce50660d57 --- /dev/null +++ b/pkgs/by-name/ad/adif-multitool/package.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +buildGoModule rec { + pname = "adif-multitool"; + version = "0.1.12-rc1"; + + vendorHash = "sha256-h7Gr8qRz6K0xCvR8tGWTeEkwgMQOTZnbEEsda4aJpbc="; + + src = fetchFromGitHub { + owner = "flwyd"; + repo = "adif-multitool"; + rev = "v${version}"; + hash = "sha256-R0Hu/yWiLUpH9qkVQuJw4bRvDeISjg67rZJLeUBPBbM="; + }; + + meta = with lib; { + description = "Command-line program for working with ham logfiles."; + homepage = "https://github.com/flwyd/adif-multitool"; + license = licenses.asl20; + maintainers = with maintainers; [ mafo ]; + mainProgram = "adifmt"; + }; +} diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix similarity index 95% rename from pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix rename to pkgs/by-name/ad/adwaita-icon-theme/package.nix index 324d439d7589..ac39b2f70359 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "adwaita-icon-theme"; - attrPath = "gnome.adwaita-icon-theme"; }; }; diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/by-name/ae/aerc/package.nix similarity index 80% rename from pkgs/applications/networking/mailreaders/aerc/default.nix rename to pkgs/by-name/ae/aerc/package.nix index 11dfe033248a..8392c7590cf4 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -4,7 +4,7 @@ , ncurses , notmuch , scdoc -, python3 +, python3Packages , w3m , dante , gawk @@ -12,21 +12,21 @@ buildGoModule rec { pname = "aerc"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromSourcehut { owner = "~rjarry"; repo = "aerc"; rev = version; - hash = "sha256-XpVUUAtm6o4DXIouTKRX/8mLERb/4nA+VUGeB21mfjE="; + hash = "sha256-azIgf9kv4Pg8BW1j56D2Ta1DIQNHC9Mql3tebp+MLSY="; }; proxyVendor = true; - vendorHash = "sha256-AHEhIWa6PP8f+hhIdY+0brLF2HYhvTal7qXfCwG9iyo="; + vendorHash = "sha256-BQ36LJFo9bQNQdwb/vygksk3ih/tVaMwfWT1f31bsbY="; nativeBuildInputs = [ scdoc - python3.pkgs.wrapPython + python3Packages.wrapPython ]; patches = [ @@ -45,10 +45,10 @@ buildGoModule rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; pythonPath = [ - python3.pkgs.vobject + python3Packages.vobject ]; - buildInputs = [ python3 notmuch gawk ]; + buildInputs = [ python3Packages.python notmuch gawk ]; installPhase = '' runHook preInstall @@ -71,7 +71,7 @@ buildGoModule rec { meta = with lib; { description = "Email client for your terminal"; homepage = "https://aerc-mail.org/"; - maintainers = with maintainers; [ tadeokondrak ]; + maintainers = with maintainers; [ ]; mainProgram = "aerc"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/networking/mailreaders/aerc/runtime-libexec.patch b/pkgs/by-name/ae/aerc/runtime-libexec.patch similarity index 100% rename from pkgs/applications/networking/mailreaders/aerc/runtime-libexec.patch rename to pkgs/by-name/ae/aerc/runtime-libexec.patch diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 0ca723e85af3..1717de9bc934 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -18,10 +18,10 @@ stdenvNoCC.mkDerivation (finalAttrs: let }; in { pname = "affine"; - version = "0.14.9"; + version = "0.15.2"; src = fetchurl { url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip"; - hash = "sha256-JGWkmvcdgkvWDAffInzf2lUFHVjkU/a4m25f8BtQqZc="; + hash = "sha256-Nu5s/0sP4exRtfjd058tD5jzDezPHnHjm5CJxOLJvVE="; }; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/ai/airlift/package.nix b/pkgs/by-name/ai/airlift/package.nix index afcd1545aa66..1293a70cdb95 100644 --- a/pkgs/by-name/ai/airlift/package.nix +++ b/pkgs/by-name/ai/airlift/package.nix @@ -27,7 +27,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ python3.pkgs.poetry-core - python3.pkgs.pythonRelaxDepsHook ]; buildInputs = [ diff --git a/pkgs/by-name/al/alsa-plugins/package.nix b/pkgs/by-name/al/alsa-plugins/package.nix index ababb767955b..bba1944f109e 100644 --- a/pkgs/by-name/al/alsa-plugins/package.nix +++ b/pkgs/by-name/al/alsa-plugins/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-plugins"; - version = "1.2.7.1"; + version = "1.2.12"; src = fetchurl { url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2"; - hash = "sha256-jDN4FJVLt8FnRWczpgRhQqKTHxLsy6PsKkrmGKNDJRE="; + hash = "sha256-e9ioPTBOji2GoliV2Nyw7wJFqN8y4nGVnNvcavObZvI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix index 0654ea53b897..c32e3b712c10 100644 --- a/pkgs/by-name/al/alt-tab-macos/package.nix +++ b/pkgs/by-name/al/alt-tab-macos/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alt-tab-macos"; - version = "6.70.1"; + version = "6.71.0"; src = fetchurl { url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; - hash = "sha256-4LdlLoc6hMF1jIlHeC89m1unStCsID6/nWJuuYUX96o="; + hash = "sha256-46K9ePNqZyaV5Da6VRCT6PvG+Ad0vsuvs7sfNRUbKB4="; }; sourceRoot = "."; @@ -34,11 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Windows alt-tab on macOS"; homepage = "https://alt-tab-macos.netlify.app"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - donteatoreo - emilytrau - Enzime - ]; + maintainers = with lib.maintainers; [ donteatoreo emilytrau ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 379cb80f6f49..3935884c5273 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2024-06-22"; + version = "0-unstable-2024-07-03"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "049badd3263ed2af20c9e98b062f8c31cf74cec6"; - hash = "sha256-KEFXCaLZL3D7ue4W+MqODg/F633sU8JzDMKM2ebUoD8="; + rev = "3f76b3f497e590c4b6a4f9316b212c627631399b"; + hash = "sha256-qwyqOgv4djIrJn9MlHO/I8zC741b4ORxDMgYZ+Da2eM="; }; dontConfigure = true; diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index 5645e92aa1ba..68364f7bf529 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -77,13 +77,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2024-02-23"; + version = "0-unstable-2024-06-29"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "61eb388760d130476415a51e19f94b199a1088fe"; - hash = "sha256-68EX5rnOlBHXZnMlXjQk+ZXFIwR5ZFc1Wyg8EzCKaUg="; + rev = "3799e7893d6b5221706f64a00a6d139fb9717380"; + hash = "sha256-TyoLVZpKQ68/yjiUsJaXW1z0qr8krIAxRuFG7RtsToI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/an/ansible-cmdb/package.nix b/pkgs/by-name/an/ansible-cmdb/package.nix new file mode 100644 index 000000000000..f23da79053c6 --- /dev/null +++ b/pkgs/by-name/an/ansible-cmdb/package.nix @@ -0,0 +1,60 @@ +{ + lib, + fetchFromGitHub, + substituteAll, + python3Packages, + testers, + ansible-cmdb, +}: +let + inherit (python3Packages) + setuptools + mako + pyyaml + jsonxs + buildPythonApplication + ; + + pname = "ansible-cmdb"; + version = "1.31"; +in +buildPythonApplication { + inherit pname version; + + pyproject = true; + + src = fetchFromGitHub { + owner = "fboender"; + repo = "ansible-cmdb"; + rev = version; + hash = "sha256-HOFLX8fiid+xJOVYNyVbz5FunrhteAUPlvS3ctclVHo="; + }; + + patches = [ + (substituteAll { + src = ./setup.patch; + inherit version; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ + mako + pyyaml + jsonxs + ]; + + passthru.tests.version = testers.testVersion { + package = ansible-cmdb; + version = "v${version}"; + }; + + meta = { + description = "Generate host overview from ansible fact gathering output"; + homepage = "https://github.com/fboender/ansible-cmdb"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.tie ]; + mainProgram = "ansible-cmdb"; + }; +} diff --git a/pkgs/by-name/an/ansible-cmdb/setup.patch b/pkgs/by-name/an/ansible-cmdb/setup.patch new file mode 100644 index 000000000000..b951122000aa --- /dev/null +++ b/pkgs/by-name/an/ansible-cmdb/setup.patch @@ -0,0 +1,41 @@ +diff --git a/src/ansible-cmdb.py b/bin/ansible-cmdb +similarity index 100% +rename from src/ansible-cmdb.py +rename to bin/ansible-cmdb +diff --git a/setup.py b/setup.py +index a8db25d..c1670f1 100755 +--- a/setup.py ++++ b/setup.py +@@ -42,17 +42,16 @@ setup( + package_dir={'': 'src'}, + packages=find_packages('src'), + include_package_data=True, +- data_files=\ +- get_data_files( +- 'src/ansiblecmdb/data', +- strip='src', +- prefix='lib' +- ) + +- [['lib/ansiblecmdb/', ['src/ansible-cmdb.py']]], ++ data_files=get_data_files( ++ 'src/ansiblecmdb/data', ++ strip='src', ++ prefix='lib', ++ ), + zip_safe=False, +- install_requires=['mako', 'pyyaml', 'ushlex', 'jsonxs'], ++ install_requires=['mako', 'pyyaml'], ++ extras_require={'jsonxs_templates': ['jsonxs']}, + scripts=[ +- 'src/ansible-cmdb', ++ 'bin/ansible-cmdb', + ], + + classifiers=[ +diff --git a/src/ansiblecmdb/data/VERSION b/src/ansiblecmdb/data/VERSION +index 79d94e6..14d2ff6 100644 +--- a/src/ansiblecmdb/data/VERSION ++++ b/src/ansiblecmdb/data/VERSION +@@ -1 +1 @@ +-MASTER ++@version@ diff --git a/pkgs/by-name/an/antimatter-dimensions/package.nix b/pkgs/by-name/an/antimatter-dimensions/package.nix index 388faf9d41cc..d12c701d355d 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-05-11"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "IvarK"; repo = "AntimatterDimensionsSourceCode"; - rev = "b3a254af60207a03d04473bb81726e921f5b2c61"; - hash = "sha256-+G9mNilt5Ewja5P+Bt312EcCJknMu7FOMn5b4FseAyQ="; + rev = "aeaa7a358f605073172ec9eaa28ff6544edca5a5"; + hash = "sha256-rXFXoSOtYeLIBQzJ/J+FMSp9CKHOCzq3HxQMd2Bpm3E="; }; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix index 687c396d350e..2537f8cfed81 100644 --- a/pkgs/by-name/ap/apostrophe/package.nix +++ b/pkgs/by-name/ap/apostrophe/package.nix @@ -18,14 +18,14 @@ }: let - version = "3.0"; + version = "3.1"; src = fetchFromGitLab { owner = "World"; repo = "apostrophe"; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "sha256-wKxRCU00nSk7F8IZNWoLRtGs3m6ol3UBnArtppUOz/g="; + sha256 = "sha256-rXaz0EtLuKOBJLF81K/4qoTZtG6B8Wn+KwSiqYvxAVc="; }; # Patches are required by upstream. Without the patches diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix index 57de40bcf25f..e603beb56331 100644 --- a/pkgs/by-name/ap/application-title-bar/package.nix +++ b/pkgs/by-name/ap/application-title-bar/package.nix @@ -4,15 +4,15 @@ , kdePackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "application-title-bar"; - version = "0.6.3"; + version = "0.6.5"; src = fetchFromGitHub { owner = "antroids"; repo = "application-title-bar"; - rev = "v${version}"; - hash = "sha256-r15wZCioWrTr5mA0WARFd4j8zwWIWU4wEv899RSURa4="; + rev = "v${finalAttrs.version}"; + hash = "sha256-hA8aK2rd53VyYQnR0SG4KfwycCqT1EYB7iAJvkDGvYs="; }; propagatedUserEnvPkgs = with kdePackages; [ kconfig ]; @@ -22,15 +22,15 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall mkdir -p $out/share/plasma/plasmoids/com.github.antroids.application-title-bar - cp -r $src/package/* $out/share/plasma/plasmoids/com.github.antroids.application-title-bar + cp -r package/* $out/share/plasma/plasmoids/com.github.antroids.application-title-bar runHook postInstall ''; - meta = with lib; { + meta = { description = "KDE Plasma6 widget with window controls"; homepage = "https://github.com/antroids/application-title-bar"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ HeitorAugustoLN ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + inherit (kdePackages.kwindowsystem.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index 7c41e4edd441..9d3883ef4923 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "apt"; - version = "2.9.5"; + version = "2.9.6"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz"; - hash = "sha256-bSstTP+9gxOhHnO8PIb4/5W8Xg3vc1nvrDAz9WMFGJQ="; + hash = "sha256-eapV5XBc/WmpMSsf8j17WOUyMu4itk0WozPzrmJmDdc="; }; # cycle detection; lib can't be split diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 84683435f4ee..dfa2ff46745f 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.48.2-51225"; + version = "1.49.1-51495"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-8VukOTt94nstaGRuTQg32HNPEaGBQtJGqRYgKLSD/TY="; + hash = "sha256-9wuZQgf8uta0ynMRe3GKqORZsCuwhvxjSpGLajCp7N8="; }; nativeBuildInputs = [ undmg ]; @@ -29,6 +29,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + dontFixup = true; + passthru.updateScript = lib.getExe (writeShellApplication { name = "arc-browser-update-script"; runtimeInputs = [ curl common-updater-scripts ]; diff --git a/pkgs/by-name/as/asak/package.nix b/pkgs/by-name/as/asak/package.nix new file mode 100644 index 000000000000..cd6fd83de9d8 --- /dev/null +++ b/pkgs/by-name/as/asak/package.nix @@ -0,0 +1,38 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, alsa-lib +, libjack2 +}: + +rustPlatform.buildRustPackage rec { + pname = "asak"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "chaosprint"; + repo = "asak"; + rev = "v${version}"; + hash = "sha256-yhR8xLCFSmTG2yqsbiP3w8vcvLz4dsn4cbMPFedzUFI="; + }; + + cargoHash = "sha256-ssHYQhx5rNkTH6KJuJh2wPcptIcIxP8BcDNriGj3btk="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ alsa-lib libjack2 ]; + + # There is no tests + doCheck = false; + + meta = { + description = "A cross-platform audio recording/playback CLI tool with TUI, written in Rust"; + homepage = "https://github.com/chaosprint/asak"; + changelog = "https://github.com/chaosprint/asak/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "asak"; + maintainers = with lib.maintainers; [ anas ]; + platforms = with lib.platforms; unix ++ windows; + }; +} diff --git a/pkgs/by-name/as/asc-key-to-qr-code-gif/package.nix b/pkgs/by-name/as/asc-key-to-qr-code-gif/package.nix new file mode 100644 index 000000000000..e3f879d293af --- /dev/null +++ b/pkgs/by-name/as/asc-key-to-qr-code-gif/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + imagemagick, + qrencode, + testQR ? false, + zbar ? null, +}: +assert testQR -> zbar != false; +stdenvNoCC.mkDerivation { + pname = "asc-key-to-qr-code-gif"; + version = "0-unstable-2019-01-27"; + + src = fetchFromGitHub { + owner = "yishilin14"; + repo = "asc-key-to-qr-code-gif"; + rev = "5d36a1bada8646ae0f61b04356e62ba5ef10a1aa"; + sha256 = "sha256-DwxYgBsioL86WM6KBFJ+DuSJo3/1pwD1Fl156XD98RY="; + }; + + dontBuild = true; + + postPatch = + let + substitutions = + [ + ''--replace-fail "convert" "${lib.getExe imagemagick}"'' + ''--replace-fail "qrencode" "${lib.getExe qrencode}"'' + ] + ++ lib.optionals testQR [ + ''--replace-fail "hash zbarimg" "true"'' # hash does not work on NixOS + ''--replace-fail "$(zbarimg --raw" "$(${zbar}/bin/zbarimg --raw"'' + ]; + in + '' + substituteInPlace asc-to-gif.sh ${lib.concatStringsSep " " substitutions} + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp asc-to-gif.sh $out/bin/asc-to-gif + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/yishilin14/asc-key-to-qr-code-gif"; + description = "Convert ASCII-armored PGP keys to animated QR code"; + license = lib.licenses.unfree; # program does not have a license + mainProgram = "asc-to-gif"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + asymmetric + NotAShelf + ]; + }; +} diff --git a/pkgs/by-name/as/aseprite/package.nix b/pkgs/by-name/as/aseprite/package.nix index 13cd6e6bb0dd..6aae1d237f64 100644 --- a/pkgs/by-name/as/aseprite/package.nix +++ b/pkgs/by-name/as/aseprite/package.nix @@ -164,7 +164,6 @@ clangStdenv.mkDerivation (finalAttrs: { ''; maintainers = with lib.maintainers; [ orivej - vigress8 ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/as/asfa/package.nix b/pkgs/by-name/as/asfa/package.nix new file mode 100644 index 000000000000..846ce5ef176a --- /dev/null +++ b/pkgs/by-name/as/asfa/package.nix @@ -0,0 +1,72 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, + help2man, + openssl, + pkg-config, + installShellFiles, +}: +let + version = "0.10.0"; + src = fetchFromGitHub { + owner = "obreitwi"; + repo = "asfa"; + rev = "v${version}"; + hash = "sha256-MnhnwtZmPFhOuiqNiaxJnPu88JOdlpvyVy0YGphblBc="; + }; +in +rustPlatform.buildRustPackage { + pname = "asfa"; + inherit version src; + + cargoHash = "sha256-/bRBP/NzcNOXl/nANeOYouUAo3NNbtbV9fxIJrNajYQ="; + + outputs = [ + "out" + "man" + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + + nativeBuildInputs = [ + help2man + installShellFiles + pkg-config + ]; + + # checks disabled because tests need to be run against (docker-based) ephemeral ssh-server + doCheck = false; + + postInstall = '' + mkdir -p "man/man1" + help2man -o "man/man1/asfa.1" "$out/bin/asfa" + + # Generate info about all subcommands except for 'help' (which leads to error) + "$out/bin/asfa" --help | awk 'enabled && $1 != "help" { print $1 } /^SUBCOMMANDS:$/ { enabled=1 }' \ + | while read -r cmd; do + help2man \ + "--version-string=${version}" \ + -o "man/man1/asfa-$cmd.1" \ + "$out/bin/asfa $cmd" + done + + installManPage man/man1/*.1 + ''; + + meta = { + description = "Avoid sending file attachments by uploading them via SSH to a remote site and sharing a publicly-accessible URL with non-guessable (hash-based) prefix instead"; + homepage = "https://github.com/obreitwi/asfa"; + changelog = "https://github.com/obreitwi/asfa/blob/${src.rev}/CHANGELOG.md"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ obreitwi ]; + mainProgram = "asfa"; + }; +} diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index e5ffcc27b2ce..644ef2e284ca 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.23.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-QW3ZwALvfSTcvXuH/ploqUD1UJ5fGySIAc3N/TMlB4g="; + hash = "sha256-kNPmtaUb5rMbdTlNKD3PrInuxGQt/JamMDx8BwBxVd8="; }; - cargoHash = "sha256-MUdHDP+1KQBXy2itOhW6pDuOTwIwXHy4oDfifDRdM94="; + cargoHash = "sha256-iV2GXH7opNIyWsgi0EnRIXDhJd3s66qFhnZWawBPb6g="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 9142c0dad9d1..a4223aa3a096 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -4,10 +4,10 @@ , lib , makeDesktopItem , makeWrapper -, stdenv +, stdenvNoCC -, gamemodeSupport ? stdenv.isLinux -, textToSpeechSupport ? stdenv.isLinux +, gamemodeSupport ? stdenvNoCC.isLinux +, textToSpeechSupport ? stdenvNoCC.isLinux , additionalLibs ? [ ] , # dependencies @@ -19,7 +19,7 @@ , xorg }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "atlauncher"; version = "3.4.36.9"; diff --git a/pkgs/by-name/au/audible-cli/package.nix b/pkgs/by-name/au/audible-cli/package.nix index e9ee1bda75cd..b0026fef4641 100644 --- a/pkgs/by-name/au/audible-cli/package.nix +++ b/pkgs/by-name/au/audible-cli/package.nix @@ -13,7 +13,6 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = with python3Packages; [ - pythonRelaxDepsHook setuptools ] ++ [ installShellFiles diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix index f1f64afb3140..8ad9d6397341 100644 --- a/pkgs/by-name/au/audiness/package.nix +++ b/pkgs/by-name/au/audiness/package.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; diff --git a/pkgs/by-name/au/authentik/ldap.nix b/pkgs/by-name/au/authentik/ldap.nix index 2d74c3911aa2..d2e40497ce9b 100644 --- a/pkgs/by-name/au/authentik/ldap.nix +++ b/pkgs/by-name/au/authentik/ldap.nix @@ -4,14 +4,14 @@ buildGoModule { pname = "authentik-ldap-outpost"; inherit (authentik) version src; - vendorHash = "sha256-UIJBCTq7AJGUDIlZtJaWCovyxlMPzj2BCJQqthybEz4="; + vendorHash = "sha256-hxtyXyCfVemsjYQeo//gd68x4QO/4Vcww8i2ocsUVW8="; CGO_ENABLED = 0; subPackages = [ "cmd/ldap" ]; meta = authentik.meta // { - description = "Authentik ldap outpost. Needed for the extendal ldap API"; + description = "The authentik ldap outpost. Needed for the external ldap API."; homepage = "https://goauthentik.io/docs/providers/ldap/"; mainProgram = "ldap"; }; diff --git a/pkgs/by-name/au/authentik/outposts.nix b/pkgs/by-name/au/authentik/outposts.nix index 05649628b3e8..c10ace799611 100644 --- a/pkgs/by-name/au/authentik/outposts.nix +++ b/pkgs/by-name/au/authentik/outposts.nix @@ -1,5 +1,4 @@ -{ callPackage }: - -{ +{ callPackage }: { ldap = callPackage ./ldap.nix { }; + radius = callPackage ./radius.nix { }; } diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 3b0132ee0a5b..bb7f88d8d078 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -1,23 +1,25 @@ { lib , stdenvNoCC +, callPackages , fetchFromGitHub +, fetchzip , buildNpmPackage , buildGoModule , runCommand , openapi-generator-cli , nodejs -, python3 +, python312 , codespell , makeWrapper }: let - version = "2024.2.2"; + version = "2024.6.0"; src = fetchFromGitHub { owner = "goauthentik"; repo = "authentik"; rev = "version/${version}"; - hash = "sha256-2B1RgKY5tpDBdzguEyWqzg15w5x/dLS2ffjbnxbpINs="; + hash = "sha256-eYxabUUQVeURrVAaF/Ecohzw9LJj0LZyCSM43gNvajY="; }; meta = with lib; { @@ -32,7 +34,7 @@ let website = buildNpmPackage { pname = "authentik-website"; inherit version src meta; - npmDepsHash = "sha256-paACBXG7hEQSLekxCvxNns2Tg9rN3DUgz6o3A/lAhA8="; + npmDepsHash = "sha256-JM+ae+zDsMdvovd2p4IJIH89KlMeDU7HOZjFbDCyehw="; NODE_ENV = "production"; NODE_OPTIONS = "--openssl-legacy-provider"; @@ -42,11 +44,12 @@ let ''; installPhase = '' - cp -r help $out + mkdir $out + cp -r build $out/help ''; - npmInstallFlags = [ "--include=dev" ]; - npmBuildScript = "build-docs-only"; + npmBuildScript = "build-bundled"; + npmFlags = [ "--ignore-scripts" ]; }; clientapi = stdenvNoCC.mkDerivation { @@ -79,10 +82,11 @@ let src = runCommand "authentik-webui-source" {} '' mkdir -p $out/web/node_modules/@goauthentik/ cp -r ${src}/web $out/ + ln -s ${src}/package.json $out/ ln -s ${src}/website $out/ ln -s ${clientapi} $out/web/node_modules/@goauthentik/api ''; - npmDepsHash = "sha256-Xtzs91m+qu7jTwr0tMeS74gjlZs4vufGGlplPVf9yew="; + npmDepsHash = "sha256-LAy2o/gs9lwbZT4NqD2GSsx7PCipnkthwnX9ICVpAWU="; postPatch = '' cd web @@ -102,7 +106,7 @@ let npmInstallFlags = [ "--include=dev" ]; }; - python = python3.override { + python = python312.override { self = python; packageOverrides = final: prev: { django-tenants = prev.buildPythonPackage rec { @@ -117,32 +121,105 @@ let format = "setuptools"; doCheck = false; # Tests require postgres - propagatedBuildInputs = with prev; [ + propagatedBuildInputs = with final; [ django psycopg gunicorn ]; }; + django-cte = prev.buildPythonPackage rec { + pname = "django-cte"; + version = "1.3.3"; + src = fetchFromGitHub { + owner = "dimagi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-OCENg94xHBeeE4A2838Cu3q2am2im2X4SkFSjc6DuhE="; + }; + doCheck = false; # Tests require postgres + format = "setuptools"; + }; + + django-pgactivity = prev.buildPythonPackage rec { + pname = "django-pgactivity"; + version = "1.4.1"; + src = fetchFromGitHub { + owner = "Opus10"; + repo = pname; + rev = version; + hash = "sha256-VwH7fwLcoH2Z9D/OY9iieM0cRhyDKOpAzqQ+4YVE3vU="; + }; + nativeBuildInputs = with prev; [ + poetry-core + ]; + propagatedBuildInputs = with final; [ + django + ]; + pyproject = true; + }; + + django-pglock = prev.buildPythonPackage rec { + pname = "django-pglock"; + version = "1.5.1"; + src = fetchFromGitHub { + owner = "Opus10"; + repo = pname; + rev = version; + hash = "sha256-ZoEHDkGmrcNiMe/rbwXsEPZo3LD93cZp6zjftMKjLeg="; + }; + nativeBuildInputs = with prev; [ + poetry-core + ]; + propagatedBuildInputs = with final; [ + django + django-pgactivity + ]; + pyproject = true; + }; + tenant-schemas-celery = prev.buildPythonPackage rec { pname = "tenant-schemas-celery"; - version = "2.2.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "maciej-gol"; repo = pname; rev = version; - hash = "sha256-OpIJobjWZE5GQGnHADioeoJo3A6DAKh0HdO10k4rsX4="; + hash = "sha256-3ZUXSAOBMtj72sk/VwPV24ysQK+E4l1HdwKa78xrDtg="; }; format = "setuptools"; doCheck = false; - propagatedBuildInputs = with prev; [ + propagatedBuildInputs = with final; [ freezegun more-itertools psycopg2 ]; }; + scim2-filter-parser = prev.buildPythonPackage rec { + pname = "scim2-filter-parser"; + version = "0.5.1"; + # For some reason the normal fetchPypi does not work + src = fetchzip { + url = "https://files.pythonhosted.org/packages/54/df/ad9718acce76e81a93c57327356eecd23701625f240fbe03d305250399e6/scim2_filter_parser-0.5.1.tar.gz"; + hash = "sha256-DZAdRj6qyySggsvJZC47vdvXbHrB1ra3qiYBEUiceJ4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'poetry>=0.12' 'poetry-core>=1.0.0' \ + --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api' + ''; + + nativeBuildInputs = [ prev.poetry-core ]; + pyproject = true; + + propagatedBuildInputs = with final; [ + sly + ]; + }; + authentik-django = prev.buildPythonPackage { pname = "authentik-django"; inherit version src meta; @@ -157,9 +234,8 @@ let --replace-fail './media' '/var/lib/authentik/media' substituteInPlace pyproject.toml \ --replace-fail 'dumb-init = "*"' "" \ - --replace-fail 'djangorestframework-guardian' 'djangorestframework-guardian2' \ - --replace-fail 'version = "4.9.4"' 'version = "*"' \ - --replace-fail 'version = "<2"' 'version = "*"' + --replace-fail 'djangorestframework = "3.14.0"' 'djangorestframework = "*"' \ + --replace-fail 'djangorestframework-guardian' 'djangorestframework-guardian2' substituteInPlace authentik/stages/email/utils.py \ --replace-fail 'web/' '${webui}/' ''; @@ -177,9 +253,11 @@ let deepmerge defusedxml django + django-cte django-filter django-guardian django-model-utils + django-pglock django-prometheus django-redis django-storages @@ -190,14 +268,16 @@ let drf-spectacular duo-client facebook-sdk + fido2 flower geoip2 + google-api-python-client gunicorn - httptools + jsonpatch kubernetes ldap3 lxml - jsonpatch + msgraph-sdk opencontainers packaging paramiko @@ -208,8 +288,10 @@ let pyjwt pyyaml requests-oauthlib + scim2-filter-parser sentry-sdk service-identity + setproctitle structlog swagger-spec-validator tenant-schemas-celery @@ -218,7 +300,6 @@ let ua-parser urllib3 uvicorn - uvloop watchdog webauthn websockets @@ -258,7 +339,7 @@ let CGO_ENABLED = 0; - vendorHash = "sha256-UIJBCTq7AJGUDIlZtJaWCovyxlMPzj2BCJQqthybEz4="; + vendorHash = "sha256-hxtyXyCfVemsjYQeo//gd68x4QO/4Vcww8i2ocsUVW8="; postInstall = '' mv $out/bin/server $out/bin/authentik @@ -294,6 +375,8 @@ in stdenvNoCC.mkDerivation { runHook postInstall ''; + passthru.outposts = callPackages ./outposts.nix { }; + nativeBuildInputs = [ makeWrapper ]; meta = meta // { diff --git a/pkgs/by-name/au/authentik/radius.nix b/pkgs/by-name/au/authentik/radius.nix new file mode 100644 index 000000000000..957fd3702b77 --- /dev/null +++ b/pkgs/by-name/au/authentik/radius.nix @@ -0,0 +1,18 @@ +{ lib, buildGoModule, authentik }: + +buildGoModule { + pname = "authentik-radius-outpost"; + inherit (authentik) version src; + + vendorHash = "sha256-hxtyXyCfVemsjYQeo//gd68x4QO/4Vcww8i2ocsUVW8="; + + CGO_ENABLED = 0; + + subPackages = [ "cmd/radius" ]; + + meta = authentik.meta // { + description = "Authentik radius outpost which is used for the external radius API"; + homepage = "https://goauthentik.io/docs/providers/radius/"; + mainProgram = "radius"; + }; +} diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix index 4121096359c8..bfc4d2963236 100644 --- a/pkgs/by-name/au/auto-cpufreq/package.nix +++ b/pkgs/by-name/au/auto-cpufreq/package.nix @@ -95,6 +95,6 @@ python3Packages.buildPythonPackage rec { description = "Automatic CPU speed & power optimizer for Linux"; license = lib.licenses.lgpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ Technical27 ]; + maintainers = with lib.maintainers; [ sarcasticadmin ]; }; } diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix new file mode 100644 index 000000000000..816b37a36b67 --- /dev/null +++ b/pkgs/by-name/au/autoprefixer/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + nodejs, + pnpm_9, + fetchFromGitHub, + callPackage, + nix-update-script +}: stdenv.mkDerivation (finalAttrs: { + pname = "autoprefixer"; + version = "10.4.19"; + + src = fetchFromGitHub { + owner = "postcss"; + repo = "autoprefixer"; + rev = finalAttrs.version; + hash = "sha256-Br0z573QghkYHLgF9/OFp8FL0bIW2frW92ohJnHhgHE="; + }; + + nativeBuildInputs = [ + nodejs + pnpm_9.configHook + ]; + + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-sGcqM87xR9XTL/MUO7fGpI1cPK7EgJNpeYwBmqVNB6I="; + }; + + installPhase = '' + runHook preInstall + + mkdir $out + mv bin/ $out + mv lib/ $out + mv node_modules/ $out + mv data/ $out + mv package.json $out + + runHook postInstall + ''; + + postFixup = '' + patchShebangs $out/bin/autoprefixer + ''; + + passthru = { + tests = { + simple-execution = callPackage ./tests/simple-execution.nix { }; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Parse CSS and add vendor prefixes to CSS rules using values from the Can I Use website"; + homepage = "https://github.com/postcss/autoprefixer"; + changelog = "https://github.com/postcss/autoprefixer/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "autoprefixer"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/package-tests/autoprefixer.nix b/pkgs/by-name/au/autoprefixer/tests/simple-execution.nix similarity index 100% rename from pkgs/development/node-packages/package-tests/autoprefixer.nix rename to pkgs/by-name/au/autoprefixer/tests/simple-execution.nix diff --git a/pkgs/by-name/aw/aws-gate/package.nix b/pkgs/by-name/aw/aws-gate/package.nix index cafe14c611bd..1561d1c17a92 100644 --- a/pkgs/by-name/aw/aws-gate/package.nix +++ b/pkgs/by-name/aw/aws-gate/package.nix @@ -27,7 +27,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles - python3Packages.pythonRelaxDepsHook python3Packages.setuptools python3Packages.wheel ]; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/by-name/aw/awscli2/package.nix similarity index 97% rename from pkgs/tools/admin/awscli2/default.nix rename to pkgs/by-name/aw/awscli2/package.nix index 676fabd30d89..ff441ea316c6 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -59,14 +59,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli2"; - version = "2.17.0"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.17.5"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-7XBdS33aoU3utAkKR0WSD2PXpx+2awd4hnFZhzRVdh8="; + hash = "sha256-Y8qXAKEDW82dZSNx88X2PSPY88VkBgwK67Ya0hHk3tU="; }; postPatch = '' diff --git a/pkgs/by-name/ax/axmldec/package.nix b/pkgs/by-name/ax/axmldec/package.nix index c11a33904c18..f65801b78387 100644 --- a/pkgs/by-name/ax/axmldec/package.nix +++ b/pkgs/by-name/ax/axmldec/package.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { extract the decoded AndroidManifest.xml directly from an APK file. ''; homepage = "https://github.com/ytsutano/axmldec"; + changelog = "https://github.com/ytsutano/axmldec/releases/tag/${src.rev}"; license = licenses.isc; mainProgram = "axmldec"; maintainers = with maintainers; [ franciscod ]; diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix index 67c2f2eaa6a8..3ee27b692393 100644 --- a/pkgs/by-name/ba/backgroundremover/package.nix +++ b/pkgs/by-name/ba/backgroundremover/package.nix @@ -32,7 +32,7 @@ let --replace 'os.path.expanduser(os.path.join("~", ".u2net", model_name + ".pth"))' "os.path.join(\"$models\", model_name + \".pth\")" ''; - nativeBuildInputs = [ p.setuptools p.wheel p.pythonRelaxDepsHook ]; + nativeBuildInputs = [ p.setuptools p.wheel ]; pythonRelaxDeps = [ "pillow" "torchvision" ]; diff --git a/pkgs/by-name/ba/backlight-auto/package.nix b/pkgs/by-name/ba/backlight-auto/package.nix index 26869b5a20dd..9fa2d1245d10 100644 --- a/pkgs/by-name/ba/backlight-auto/package.nix +++ b/pkgs/by-name/ba/backlight-auto/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "backlight-auto"; homepage = "https://len.falken.directory/backlight-auto.html"; license = licenses.mit; - maintainers = [ maintainers.lf- ]; + maintainers = [ ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix new file mode 100644 index 000000000000..669e4ae1719b --- /dev/null +++ b/pkgs/by-name/ba/bant/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + buildBazelPackage, + fetchFromGitHub, + bazel_6, + jdk, + git, +}: + +let + system = stdenv.hostPlatform.system; + registry = fetchFromGitHub { + owner = "bazelbuild"; + repo = "bazel-central-registry"; + rev = "1c729c2775715fd98f0f948a512eb173213250da"; + hash = "sha256-1iaDDM8/v8KCOUjPgLUtZVta7rMzwlIK//cCoLUrb/s="; + }; +in buildBazelPackage rec { + pname = "bant"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "hzeller"; + repo = "bant"; + rev = "v${version}"; + hash = "sha256-3xGAznR/IHQHY1ISqmU8NxI90Pl57cdYeRDeLVh9L08="; + }; + + bazelFlags = ["--registry" "file://${registry}"]; + + postPatch = '' + patchShebangs scripts/create-workspace-status.sh + ''; + + fetchAttrs = { + sha256 = { + aarch64-linux = "sha256-jtItWNfl+ebQqU8VWmvLsgNYNARGxN8+CTBz2nZcBEY="; + x86_64-linux = "sha256-ACJqybpHoMSg2ApGWkIyhdAQjIhb8gxUdo8SuWJvTNE="; + }.${system} or (throw "No hash for system: ${system}"); + }; + + nativeBuildInputs = [ + jdk + git + ]; + bazel = bazel_6; + + bazelBuildFlags = [ "-c opt" ]; + bazelTestTargets = [ "//..." ]; + bazelTargets = [ "//bant:bant" ]; + + buildAttrs = { + installPhase = '' + install -D --strip bazel-bin/bant/bant "$out/bin/bant" + ''; + }; + + meta = with lib; { + description = "Bazel/Build Analysis and Navigation Tool"; + homepage = "http://bant.build/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ hzeller lromor ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/by-name/ba/baobab/package.nix similarity index 100% rename from pkgs/desktops/gnome/core/baobab/default.nix rename to pkgs/by-name/ba/baobab/package.nix diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index d591250ba2eb..053ab265301b 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -1,19 +1,23 @@ { lib, - buildNpmPackage, fetchFromGitHub, runCommand, jq, + buildNpmPackage, + python3, + stdenvNoCC, + testers, + basedpyright, }: let - version = "1.12.6"; + version = "1.13.2"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; rev = "refs/tags/v${version}"; - hash = "sha256-1F3T+BGamFJEDAIMz684oIn4xEDbNadEh8TTG5l8fPo="; + hash = "sha256-Qi5MYyNrEH56hNa2HHeSrnZQvJTkLXVIpCHUJCzOM+c="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -43,7 +47,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-8nXW5Z5xTr8EXxyBylxCr7C88zmRxppe8EaspFy7b6o="; + npmDepsHash = "sha256-eEBlX2F3B/njTb2sONXzDqe+a2TVddam7NDXt5s8QFs="; dontNpmBuild = true; # FIXME: Remove this flag when TypeScript 5.5 is released npmFlags = [ "--legacy-peer-deps" ]; @@ -53,16 +57,49 @@ let runHook postInstall ''; }; + + docify = python3.pkgs.buildPythonApplication { + pname = "docify"; + version = "unstable"; + format = "pyproject"; + src = fetchFromGitHub { + owner = "AThePeanut4"; + repo = "docify"; + rev = "7380a6faa6d1e8a3dc790a00254e6d77f84cbd91"; + hash = "sha256-BPR1rc/JzdBweiWmdHxgardDDrJZVWkUIF3ZEmEYf/A="; + }; + buildInputs = [ python3.pkgs.setuptools ]; + propagatedBuildInputs = [ + python3.pkgs.libcst + python3.pkgs.tqdm + ]; + }; + + docstubs = stdenvNoCC.mkDerivation { + name = "docstubs"; + inherit src; + buildInputs = [ docify ]; + + installPhase = '' + runHook preInstall + cp -r packages/pyright-internal/typeshed-fallback docstubs + ${docify}/bin/docify docstubs/stdlib --builtins-only --in-place + cp -rv docstubs "$out" + runHook postInstall + ''; + }; in buildNpmPackage rec { pname = "basedpyright"; inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-ZFuCY2gveimFK5Hztj6k6PkeTpbR7XiyQyS5wPaNNts="; + npmDepsHash = "sha256-JIpbef6ADktKILifRra4jrfdLHY1o/eFsdVkwQupMZw="; postPatch = '' chmod +w ../../ + mkdir ../../docstubs + ln -s ${docstubs}/stubs ../../docstubs ln -s ${pyright-root}/node_modules ../../node_modules chmod +w ../pyright-internal ln -s ${pyright-internal}/node_modules ../pyright-internal/node_modules @@ -75,7 +112,10 @@ buildNpmPackage rec { dontNpmBuild = true; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { package = basedpyright; }; + }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases/tag/${version}"; diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix index 5476fc55f662..9e4132bc0b46 100644 --- a/pkgs/by-name/ba/bat/package.nix +++ b/pkgs/by-name/ba/bat/package.nix @@ -75,6 +75,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/sharkdp/bat/raw/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; mainProgram = "bat"; - maintainers = with maintainers; [ dywedir lilyball zowoq SuperSandro2000 ]; + maintainers = with maintainers; [ dywedir zowoq SuperSandro2000 ]; }; } diff --git a/pkgs/by-name/ba/batik/package.nix b/pkgs/by-name/ba/batik/package.nix new file mode 100644 index 000000000000..18bdb7c37e19 --- /dev/null +++ b/pkgs/by-name/ba/batik/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenvNoCC, + fetchurl, + jre, + rhino, + stripJavaArchivesHook, + makeWrapper, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "batik"; + version = "1.17"; + + src = fetchurl { + url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${finalAttrs.version}.tar.gz"; + hash = "sha256-sEJphF3grlwZCEt3gHHm4JF8RpvKKBLLvKXf2lu/dhA="; + }; + + nativeBuildInputs = [ + stripJavaArchivesHook + makeWrapper + ]; + + buildInputs = [ + jre + rhino + ]; + + patchPhase = '' + # Vendored dependencies + rm lib/rhino-*.jar + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/java + cp *.jar lib/*.jar $out/share/java + chmod +x $out/share/java/*.jar + classpath="$(find $out/share/java -name '*.jar' -printf '${rhino}/share/java/js.jar:%h/%f')" + for appName in rasterizer slideshow squiggle svgpp ttf2svg; do + makeWrapper ${lib.getExe jre} $out/bin/batik-$appName \ + --add-flags "-jar $out/share/java/batik-all-${finalAttrs.version}.jar" \ + --add-flags "-classpath $classpath" \ + --add-flags "org.apache.batik.apps.$appName.Main" + done + ''; + + meta = with lib; { + description = "Java based toolkit for handling SVG"; + homepage = "https://xmlgraphics.apache.org/batik"; + license = licenses.asl20; + platforms = platforms.unix; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + }; +}) diff --git a/pkgs/by-name/bc/bcachefs-tools/fix-encrypted-boot.patch b/pkgs/by-name/bc/bcachefs-tools/fix-encrypted-boot.patch deleted file mode 100644 index 5e14d09547f4..000000000000 --- a/pkgs/by-name/bc/bcachefs-tools/fix-encrypted-boot.patch +++ /dev/null @@ -1,92 +0,0 @@ -From f76ad4da12e6a65550d564bb626a1429ae75433a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= -Date: Thu, 9 May 2024 23:52:47 +0200 -Subject: [PATCH 1/2] `check_for_key` before `ask_for_passphrase` -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -let's always first check if there is already a key in the keyring -available before we try to get the key from some more involved means. - -Fixes: #261 -Signed-off-by: Thomas Mühlbacher ---- - src/commands/mount.rs | 13 +++++++++++-- - src/key.rs | 4 +++- - 2 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/src/commands/mount.rs b/src/commands/mount.rs -index 9414c77f..34a741cb 100644 ---- a/src/commands/mount.rs -+++ b/src/commands/mount.rs -@@ -344,8 +344,17 @@ fn cmd_mount_inner(opt: Cli) -> anyhow::Result<()> { - if block_devices_to_mount.len() == 0 { - Err(anyhow::anyhow!("No device found from specified parameters"))?; - } -- // Check if the filesystem's master key is encrypted -- if unsafe { bcachefs::bch2_sb_is_encrypted_and_locked(block_devices_to_mount[0].sb) } { -+ -+ let key_name = CString::new(format!( -+ "bcachefs:{}", -+ block_devices_to_mount[0].sb().uuid() -+ )) -+ .unwrap(); -+ -+ // Check if the filesystem's master key is encrypted and we don't have a key -+ if unsafe { bcachefs::bch2_sb_is_encrypted_and_locked(block_devices_to_mount[0].sb) } -+ && !key::check_for_key(&key_name)? -+ { - // First by password_file, if available - let fallback_to_unlock_policy = if let Some(passphrase_file) = &opt.passphrase_file { - match key::read_from_passphrase_file(&block_devices_to_mount[0], passphrase_file.as_path()) { -diff --git a/src/key.rs b/src/key.rs -index d0018805..568b3cdb 100644 ---- a/src/key.rs -+++ b/src/key.rs -@@ -58,7 +58,7 @@ impl fmt::Display for UnlockPolicy { - } - } - --fn check_for_key(key_name: &std::ffi::CStr) -> anyhow::Result { -+pub fn check_for_key(key_name: &std::ffi::CStr) -> anyhow::Result { - use bch_bindgen::keyutils::{self, keyctl_search}; - let key_name = key_name.to_bytes_with_nul().as_ptr() as *const _; - let key_type = c_str!("user"); -@@ -86,10 +86,12 @@ fn wait_for_unlock(uuid: &uuid::Uuid) -> anyhow::Result<()> { - } - } - -+// blocks indefinitely if no input is available on stdin - fn ask_for_passphrase(sb: &bch_sb_handle) -> anyhow::Result<()> { - let passphrase = if stdin().is_terminal() { - rpassword::prompt_password("Enter passphrase: ")? - } else { -+ info!("Trying to read passphrase from stdin..."); - let mut line = String::new(); - stdin().read_line(&mut line)?; - line - -From 734ccc58f42c3cccb0960bdd84808839e2b62ca9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= -Date: Sun, 12 May 2024 19:39:19 +0200 -Subject: [PATCH 2/2] fix unfortunate typo - -causes mounting encrypted devices to become stuck in a busy loop. ---- - include/crypto/skcipher.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h -index 70905a5a..833729dc 100644 ---- a/include/crypto/skcipher.h -+++ b/include/crypto/skcipher.h -@@ -112,7 +112,7 @@ static inline void skcipher_request_set_sync_tfm(struct skcipher_request *req, - skcipher_request_set_tfm(req, &tfm->base); - } - --#define skcipher_request_set_callback(...) do {} while (9) -+#define skcipher_request_set_callback(...) do {} while (0) - - static inline void skcipher_request_set_crypt( - struct skcipher_request *req, diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index f6f06296ac92..ee753b3f158d 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -27,15 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.7.0-unstable-2024-05-09"; + version = "1.9.2"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - # FIXME: switch to a tagged release once available > 1.7.0 - # Fix for https://github.com/NixOS/nixpkgs/issues/313350 - rev = "3ac510f6a41feb1b695381fa30869d557c00b822"; - hash = "sha256-ZmkeYPiCy7vkXnMFbtUF4761K+I+Ef7UbmSY7dJG09U="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-1GsRBAVAfD0SAM1gk8W+bX7MtxunGKOLtXweL4rrf9Q="; }; nativeBuildInputs = [ @@ -63,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { src = finalAttrs.src; - hash = "sha256-RsRz/nb8L+pL1U4l6RnvqeDFddPvcBFH4wdV7G60pxA="; + hash = "sha256-rabiNqw4hg0Js8VadxfkhNLIsrKfMuoKa5lFIfSMNPY="; }; makeFlags = [ @@ -80,18 +78,6 @@ stdenv.mkDerivation (finalAttrs: { # FIXME: Try enabling this once the default linux kernel is at least 6.7 doCheck = false; # needs bcachefs module loaded on builder - patches = [ - # code refactoring of bcachefs-tools broke reading passphrases from stdin (vs. terminal) - # upstream issue https://github.com/koverstreet/bcachefs-tools/issues/261 - ./fix-encrypted-boot.patch - # https://github.com/koverstreet/bcachefs-tools/pull/305 - (fetchpatch { - name = "use-ar-var-in-makefile.patch"; - url = "https://github.com/koverstreet/bcachefs-tools/commit/91e67ab2bd48fa135a1f5109b23899a4f1019a03.patch"; - sha256 = "sha256-nB4Tgcwa8eeasIDQ4rrYORie/X8LMuCSRi+WJNw+R/U="; - }) - ]; - postPatch = '' substituteInPlace Makefile \ --replace-fail "target/release/bcachefs" "target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/bcachefs" diff --git a/pkgs/tools/misc/betterdiscordctl/default.nix b/pkgs/by-name/be/betterdiscordctl/package.nix similarity index 58% rename from pkgs/tools/misc/betterdiscordctl/default.nix rename to pkgs/by-name/be/betterdiscordctl/package.nix index aee7cd442535..4c1eae439215 100644 --- a/pkgs/tools/misc/betterdiscordctl/default.nix +++ b/pkgs/by-name/be/betterdiscordctl/package.nix @@ -1,13 +1,17 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ + fetchFromGitHub, + lib, + stdenvNoCC, +}: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "betterdiscordctl"; version = "2.0.1"; src = fetchFromGitHub { owner = "bb010g"; repo = "betterdiscordctl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0p321rfcihz2779sdd6qfgpxgk5yd53d33vq5pvb50dbdgxww0bc"; }; @@ -19,9 +23,8 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p "$out/bin" "$out/share/doc/betterdiscordctl" - install -Dm744 betterdiscordctl $out/bin/betterdiscordctl - install -Dm644 README.md $out/share/doc/betterdiscordctl/README.md + install -Dm 755 -t "$out/bin" -- betterdiscordctl + install -Dm 644 -t "$out/share/doc/betterdiscordctl" -- README.md runHook postInstall ''; @@ -29,15 +32,19 @@ stdenvNoCC.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' - $out/bin/betterdiscordctl --version + runHook preInstallCheck + + "$out/bin/betterdiscordctl" --version + + runHook postInstallCheck ''; - meta = with lib; { + meta = { homepage = "https://github.com/bb010g/betterdiscordctl"; description = "Utility for managing BetterDiscord on Linux"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "betterdiscordctl"; - maintainers = with maintainers; [ bb010g ]; - platforms = platforms.linux; + maintainers = [ ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bi/bitmagnet/package.nix b/pkgs/by-name/bi/bitmagnet/package.nix index 71d887be2859..15d9d7c012cc 100644 --- a/pkgs/by-name/bi/bitmagnet/package.nix +++ b/pkgs/by-name/bi/bitmagnet/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "bitmagnet"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "bitmagnet-io"; repo = "bitmagnet"; rev = "v${version}"; - hash = "sha256-PdDXQC702mmK8wpYmi3N5iFv7Y3wbzpyF4Yq3utqX2c="; + hash = "sha256-IUWt6CBW2SXE6lc52ArKrmW+7uR1vczfbx4SOeE30IA="; }; vendorHash = "sha256-aauXgHPZbSiTW9utuHXzJr7GsWs/2aFiGuukA/B9BRc="; diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 14a076c96078..0fd2e1dae4ef 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -6,27 +6,29 @@ , python3 , darwin , nixosTests +, xcbuild }: buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2024.6.0"; + version = "2024.6.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-qiUUrs23WHE3+KFsWDknuDSA6M3Zwjz9Jdjq6mn5XkE="; + hash = "sha256-LKeJKA4/Vd80y48RdZTUh10bY38AoQ5G5oK6S77fSJI="; }; nodejs = nodejs_20; - npmDepsHash = "sha256-Mgd15eFJtWoBqFFCsjmsnlNbcg5NDs1U7DlMkE0hIb8="; + npmDepsHash = "sha256-rwzyKaCW3LAOqw6BEu8DLS0Ad5hB6cH1OnjWzbSEgVI="; nativeBuildInputs = [ python3 ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools + xcbuild.xcrun ]; makeCacheWritable = true; diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index ca6c93cac7b5..1e237c32aa63 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -6,7 +6,7 @@ , electron_29 , fetchFromGitHub , glib -, gnome +, gnome-keyring , gtk3 , jq , libsecret @@ -29,13 +29,13 @@ let electron = electron_29; in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.6.0"; + version = "2024.6.4"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-qiUUrs23WHE3+KFsWDknuDSA6M3Zwjz9Jdjq6mn5XkE="; + hash = "sha256-oQ2VZoxePdYUC+xMKlRMpvPubSPULvt31XSh/OBw3Ec="; }; patches = [ @@ -60,7 +60,7 @@ in buildNpmPackage rec { makeCacheWritable = true; npmFlags = [ "--engine-strict" "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-Mgd15eFJtWoBqFFCsjmsnlNbcg5NDs1U7DlMkE0hIb8="; + npmDepsHash = "sha256-9d9pWrFYelAx/PPDHY3m92Frp8RSQuBqpiOjmWtm/1g="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; @@ -76,7 +76,7 @@ in buildNpmPackage rec { patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-BL+j2hMwb3QGgS29Y6LjqnKscH+tEXMCOyivilHHwVI="; + hash = "sha256-ZmblY1APVa8moAR1waVBZPhrf5Wt1Gi6dvAxkhizckQ="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -127,7 +127,7 @@ in buildNpmPackage rec { nativeCheckInputs = [ dbus - (gnome.gnome-keyring.override { useWrappedDaemon = false; }) + (gnome-keyring.override { useWrappedDaemon = false; }) ]; checkFlags = [ @@ -139,7 +139,7 @@ in buildNpmPackage rec { pushd ${cargoRoot} export HOME=$(mktemp -d) - export -f cargoCheckHook runHook _eval _callImplicitHook + export -f cargoCheckHook runHook _eval _callImplicitHook _logHook export cargoCheckType=release dbus-run-session \ --config-file=${dbus}/share/dbus-1/session.conf \ diff --git a/pkgs/by-name/bl/blastem/package.nix b/pkgs/by-name/bl/blastem/package.nix new file mode 100644 index 000000000000..6cc7e97c7c8b --- /dev/null +++ b/pkgs/by-name/bl/blastem/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + fetchhg, + pkg-config, + makeBinaryWrapper, + SDL2, + glew, + gtk3, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "blastem"; + version = "0.6.2-unstable-2024-03-31"; + + src = fetchhg { + url = "https://www.retrodev.com/repos/blastem"; + rev = "48ab1e3e5df5"; + hash = "sha256-UZl5fIE7LJqxwS8kFJ3xr8BJyHF60dnRNeA5k7lAuxg="; + }; + + # will probably be fixed in https://github.com/NixOS/nixpkgs/pull/302481 + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace-fail "-flto" "" + ''; + + nativeBuildInputs = [ + pkg-config + makeBinaryWrapper + ]; + + buildInputs = [ + gtk3 + SDL2 + glew + ]; + + # Note: menu.bin cannot be generated yet, because it would + # need the `vasmm68k_mot` executable (part of vbcc for amigaos68k + # Luckily, menu.bin doesn't need to be present for the emulator to function + + makeFlags = [ "HOST_ZLIB=1" ]; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2"; + + installPhase = '' + runHook preInstall + + # not sure if any executable other than blastem is really needed here + install -Dm755 blastem dis zdis termhelper -t $out/share/blastem + install -Dm644 gamecontrollerdb.txt default.cfg rom.db -t $out/share/blastem + cp -r shaders $out/share/blastem/shaders + + # wrapping instead of sym-linking makes sure argv0 stays at the original location + makeWrapper $out/share/blastem/blastem $out/bin/blastem + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "blastem -v"; + version = "0.6.3-pre"; # remove line when moving to a stable version + }; + + meta = { + description = "The fast and accurate Genesis emulator"; + homepage = "https://www.retrodev.com/blastem/"; + license = lib.licenses.gpl3Plus; + mainProgram = "blastem"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = [ + "i686-linux" + "x86_64-linux" + "x86_64-darwin" + ]; + }; +}) diff --git a/pkgs/by-name/bl/blend2d/package.nix b/pkgs/by-name/bl/blend2d/package.nix new file mode 100644 index 000000000000..dd5867950e9c --- /dev/null +++ b/pkgs/by-name/bl/blend2d/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + asmjit, +}: + +stdenv.mkDerivation { + pname = "blend2d"; + # Note: this is an outdated version for pdf4qt, but vcpkg also uses it + # See 'Commit Hashes' in https://blend2d.com/download.html for newest + # If the newest version is needed, we can rename this package. + version = "0.10"; + + src = fetchFromGitHub { + owner = "blend2d"; + repo = "blend2d"; + rev = "452d549751188b04367b5af46c040cb737f5f76c"; + hash = "sha256-LDhnXsp/V1A3YqVyjBVaL7/V6Nhts/1E9hRhl2P293o="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ (lib.cmakeFeature "ASMJIT_DIR" (toString asmjit.src)) ]; + + meta = { + description = "2D Vector Graphics Engine Powered by a JIT Compiler"; + homepage = "https://blend2d.com"; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index 5f5f7da0f31d..2f72c033f10e 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -7,7 +7,7 @@ imagemagick, copyDesktopItems, makeDesktopItem, - electron + electron, }: let @@ -15,13 +15,13 @@ let in buildNpmPackage rec { pname = "blockbench"; - version = "4.10.2"; + version = "4.10.4"; src = fetchFromGitHub { owner = "JannisX11"; repo = "blockbench"; rev = "v${version}"; - hash = "sha256-Ch+vPSvdqfJF2gNgZN2x5KSY1S1CYfHCyMyUf4W+Vn8="; + hash = "sha256-TjT93nx52PxuHuW4NONTfI3G7+Dl0NFX2aKpZDEF8+8="; }; nativeBuildInputs = @@ -31,7 +31,7 @@ buildNpmPackage rec { copyDesktopItems ]; - npmDepsHash = "sha256-au6GzBTxPcYcqrPEnQ+yEhVRdAbiUa/Ocq7UCPdiox4="; + npmDepsHash = "sha256-WkOn1bLJ9xmJdQcY6ak+hs/YW+crIXhTWA6tjMSVq9I="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; @@ -69,7 +69,7 @@ buildNpmPackage rec { for size in 16 32 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -resize "$size"x"$size" icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png + magick convert -resize "$size"x"$size" icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png done makeWrapper ${lib.getExe electron} $out/bin/blockbench \ @@ -101,9 +101,6 @@ buildNpmPackage rec { homepage = "https://blockbench.net/"; license = lib.licenses.gpl3Only; mainProgram = "blockbench"; - maintainers = with lib.maintainers; [ - ckie - tomasajt - ]; + maintainers = with lib.maintainers; [ tomasajt ]; }; } diff --git a/pkgs/by-name/bl/bluetility/package.nix b/pkgs/by-name/bl/bluetility/package.nix index 1188ffd2b40d..8aadf48b026c 100644 --- a/pkgs/by-name/bl/bluetility/package.nix +++ b/pkgs/by-name/bl/bluetility/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/jnross/Bluetility"; license = licenses.mit; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index e0514450ab83..ce5d84983294 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "Boogie"; - version = "3.1.6"; + version = "3.2.0"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; rev = "v${version}"; - sha256 = "sha256-Bli/vEzzVQTWicQJskK9cQC2XsFRwMxX9cAePXN511c="; + sha256 = "sha256-3+9zOoKk8IdqkxoMzjZofizyx+294mer3t6illXUr2M="; }; projectFile = [ "Source/Boogie.sln" ]; diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 83fab6d81e8f..9648a86e01ba 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -28,20 +28,20 @@ let in buildNpmPackage' rec { pname = "bruno"; - version = "1.19.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-XprUu4Dp7ER8YC1uO4kkzTZLsJtoOFH15elnkxUn7/c="; + hash = "sha256-WUGdXPG/v8vmgI3a/X+J1EQUlbJdNaNAUx5whezMcAs="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-BVCyZKhSBNJDmhnO68ULj5aMINFQIIlwlGqwjGkOoEI="; + npmDepsHash = "sha256-aw4jOvlfZHCRrgoXT69XrMYe40YXULrfbVG1pQAFGr4="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/butler/package.nix b/pkgs/by-name/bu/butler/package.nix deleted file mode 100644 index 62d215dc5af0..000000000000 --- a/pkgs/by-name/bu/butler/package.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, stdenv -, Cocoa -, fetchpatch -}: - -buildGoModule rec { - pname = "butler"; - version = "15.21.0"; - - src = fetchFromGitHub { - owner = "itchio"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-vciSmXR3wI3KcnC+Uz36AgI/WUfztA05MJv1InuOjJM="; - }; - - buildInputs = lib.optionals stdenv.isDarwin [ - Cocoa - ]; - - patches = [ - # update x/sys dependency for darwin build https://github.com/itchio/butler/pull/245 - (fetchpatch { - url = "https://github.com/itchio/butler/pull/245/commits/ef651d373e3061fda9692dd44ae0f7ce215e9655.patch"; - hash = "sha256-rZZn/OGiv3mRyy89uORyJ99zWN21kZCCQAlFvSKxlPU="; - }) - ]; - - proxyVendor = true; - - vendorHash = "sha256-GvUUCQ2BPW0HlXZljBWJ2Wyys9OEIM55dEWAa6J19Zg="; - - doCheck = false; - - meta = with lib; { - # butler cannot be build with Go >=1.21 - # See https://github.com/itchio/butler/issues/256 - # and https://github.com/itchio/dmcunrar-go/issues/1 - # The dependency causing the issue is marked as 'no maintainence intended'. - # Last butler release is from 05/2021. - broken = true; - description = "Command-line itch.io helper"; - homepage = "https://github.com/itchio/butler"; - license = licenses.mit; - maintainers = with maintainers; [ martfont ]; - }; -} diff --git a/pkgs/by-name/c-/c-for-go/package.nix b/pkgs/by-name/c-/c-for-go/package.nix index 96fc36804df2..56db75d76848 100644 --- a/pkgs/by-name/c-/c-for-go/package.nix +++ b/pkgs/by-name/c-/c-for-go/package.nix @@ -16,6 +16,7 @@ buildGoModule { meta = with lib; { homepage = "https://github.com/xlab/c-for-go"; + changelog = "https://github.com/xlab/c-for-go/releases/"; description = "Automatic C-Go Bindings Generator for the Go Programming Language"; license = licenses.mit; maintainers = with maintainers; [ msanft ]; diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix index 1ac91956bd26..81172b56ad6f 100644 --- a/pkgs/by-name/c2/c2fmzq/package.nix +++ b/pkgs/by-name/c2/c2fmzq/package.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "c2FmZQ"; - version = "0.4.20"; + version = "0.4.21"; src = fetchFromGitHub { owner = "c2FmZQ"; repo = "c2FmZQ"; rev = "v${version}"; - hash = "sha256-ur1zZdDAGl97RDhs0ucc9UAvufI/DG49cn8HaXx3gxs="; + hash = "sha256-i2IO+07Ne3Q5/aBWuAYmkDcDrp5S/yc1eY1vkQI4kgA="; }; ldflags = [ "-s" "-w" ]; sourceRoot = "${src.name}/c2FmZQ"; - vendorHash = "sha256-wZ8+w1UFx55whodAXKhQ4EbtMXkbztYLjpqEVvdrAF8="; + vendorHash = "sha256-cGFI9HSpszi7nXbUCx1MBoj7QOzYseha7+udAbGL+P8="; subPackages = [ "c2FmZQ-client" "c2FmZQ-server" ]; diff --git a/pkgs/by-name/ca/cached-nix-shell/package.nix b/pkgs/by-name/ca/cached-nix-shell/package.nix new file mode 100644 index 000000000000..71256c2b1b5c --- /dev/null +++ b/pkgs/by-name/ca/cached-nix-shell/package.nix @@ -0,0 +1,61 @@ +{ + fetchFromGitHub, + lib, + nix, + ronn, + rustPlatform, +}: + +let + blake3-src = fetchFromGitHub { + owner = "BLAKE3-team"; + repo = "BLAKE3"; + rev = "refs/tags/1.5.1"; + hash = "sha256-STWAnJjKrtb2Xyj6i1ACwxX/gTkQo5jUHilcqcgJYxc="; + }; +in +rustPlatform.buildRustPackage rec { + pname = "cached-nix-shell"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "xzfc"; + repo = "cached-nix-shell"; + rev = "refs/tags/v${version}"; + hash = "sha256-LI/hecqeRg3eCzU2bASJA8VoG4nvrSeHSeaGYn7M/UI="; + }; + + cargoHash = "sha256-Jf0VRTGwdKxCwyb9hVKDQcdZsHHWaedrDbwq9MK1tn4="; + + nativeBuildInputs = [ + nix + ronn + ]; + + # The BLAKE3 C library is intended to be built by the project depending on it + # rather than as a standalone library. + # https://github.com/BLAKE3-team/BLAKE3/blob/0.3.1/c/README.md#building + env.BLAKE3_CSRC = "${blake3-src}/c"; + + postBuild = '' + make -f nix/Makefile post-build + ''; + + postInstall = '' + make -f nix/Makefile post-install + ''; + + meta = { + description = "Instant startup time for nix-shell"; + mainProgram = "cached-nix-shell"; + homepage = "https://github.com/xzfc/cached-nix-shell"; + changelog = "https://github.com/xzfc/cached-nix-shell/releases/tag/v${version}"; + license = with lib.licenses; [ + unlicense + # or + mit + ]; + maintainers = with lib.maintainers; [ xzfc ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/servers/calibre-web/db-migrations.patch b/pkgs/by-name/ca/calibre-web/db-migrations.patch similarity index 100% rename from pkgs/servers/calibre-web/db-migrations.patch rename to pkgs/by-name/ca/calibre-web/db-migrations.patch diff --git a/pkgs/servers/calibre-web/default-logger.patch b/pkgs/by-name/ca/calibre-web/default-logger.patch similarity index 100% rename from pkgs/servers/calibre-web/default-logger.patch rename to pkgs/by-name/ca/calibre-web/default-logger.patch diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/by-name/ca/calibre-web/package.nix similarity index 59% rename from pkgs/servers/calibre-web/default.nix rename to pkgs/by-name/ca/calibre-web/package.nix index 0d0afd185f41..b2045d0570a3 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/by-name/ca/calibre-web/package.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , nixosTests +, nix-update-script , python3 }: @@ -13,28 +14,33 @@ let in python.pkgs.buildPythonApplication rec { pname = "calibre-web"; - version = "0.6.21"; + version = "0.6.22"; src = fetchFromGitHub { owner = "janeczku"; repo = "calibre-web"; rev = version; - hash = "sha256-tRrOquetn3P2NmrXq7DQHRGP1sWnLR7bV2Lw0W/lUPQ="; + hash = "sha256-nWZmDasBH+DW/+Cvw510mOv11CXorRnoBwNFpoKPErY="; }; propagatedBuildInputs = with python.pkgs; [ - apscheduler advocate + apscheduler + babel + bleach chardet + flask flask-babel + flask-limiter flask-login flask-principal flask-wtf - flask-limiter iso-639 - jsonschema lxml pypdf + python-magic + pytz + regex requests sqlalchemy tornado @@ -54,36 +60,23 @@ python.pkgs.buildPythonApplication rec { ./db-migrations.patch ]; - # calibre-web doesn't follow setuptools directory structure. The following is taken from the script - # that calibre-web's maintainer is using to package it: - # https://github.com/OzzieIsaacs/calibre-web-test/blob/master/build/make_release.py + # calibre-web doesn't follow setuptools directory structure. postPatch = '' mkdir -p src/calibreweb mv cps.py src/calibreweb/__init__.py mv cps src/calibreweb - sed -i "/backports_abc/d" setup.cfg - substituteInPlace setup.cfg \ - --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \ - --replace "APScheduler>=3.6.3,<3.10.0" "APScheduler>=3.6.3" \ - --replace "chardet>=3.0.0,<4.1.0" "chardet>=3.0.0,<6" \ - --replace "Flask>=1.0.2,<2.1.0" "Flask>=1.0.2" \ - --replace "Flask-Babel>=0.11.1,<3.1.0" "Flask-Babel>=0.11.1" \ - --replace "Flask-Login>=0.3.2,<0.6.2" "Flask-Login>=0.3.2" \ - --replace "flask-wtf>=0.14.2,<1.1.0" "flask-wtf>=0.14.2" \ - --replace "lxml>=3.8.0,<4.9.0" "lxml>=3.8.0" \ - --replace "tornado>=4.1,<6.2" "tornado>=4.1,<7" \ - --replace "PyPDF>=3.0.0,<3.6.0" "PyPDF>=3.0.0" \ - --replace "requests>=2.11.1,<2.29.0" "requests" \ - --replace "unidecode>=0.04.19,<1.4.0" "unidecode>=0.04.19" \ - --replace "werkzeug<2.1.0" "" + --replace-fail "cps = calibreweb:main" "calibre-web = calibreweb:main" ''; # Upstream repo doesn't provide any tests. doCheck = false; - passthru.tests.calibre-web = nixosTests.calibre-web; + passthru = { + tests.calibre-web = nixosTests.calibre-web; + updateScript = nix-update-script { }; + }; meta = with lib; { description = "Web app for browsing, reading and downloading eBooks stored in a Calibre database"; diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix index 882d33b63f39..cfb10cd3e6a3 100644 --- a/pkgs/by-name/ca/cargo-make/package.nix +++ b/pkgs/by-name/ca/cargo-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.37.12"; + version = "0.37.13"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-hnjhc4ZIabHml0HMuIanwXkx+QGnal7RlvZjcZUx8pQ="; + hash = "sha256-5A0J3NtxXlhIhr0+GZoctCA5EwTnBt+9aL4I8HUiJqY="; }; - cargoHash = "sha256-5Z8ywbaWVgLx6PH/w9QV0LJpeqY7zpkCqnAb4BAww0o="; + cargoHash = "sha256-7UA9EOUF/A1FhWBErZdPrzL+rDukjbtC2KIK10cLDXI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 075a76db846a..f5d7c2cf3d5e 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "0.0.26"; + version = "1.0.0"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-c3gicJWMiMZ0Suo30XcQoWhHRE3aXdQmSD0K5y2Quec="; + hash = "sha256-onTVA/VH5GrDYBDGKbWOSFeW1RCzDooh3PJxCD39e1o="; }; - cargoHash = "sha256-Clhd8ifbT+it0EGcysJvI9O89qzee9T6EGWlcMO8osE="; + cargoHash = "sha256-63792ztjnGcAiFpHTcaI03PV4dQxhOP2eRNda8MWiqc="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index d31879bad091..5b0a8c82beb2 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xwin"; - version = "0.17.0"; + version = "0.17.2"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${version}"; - hash = "sha256-3vQ7pM7Ui0H6qWFWOCW4LzDLJq8bcoFEJrpoa4Tzk9g="; + hash = "sha256-lz1IykhdJy3540g6A5EpxGM2czM5psi/zZdKkgJd7BA="; }; - cargoHash = "sha256-4uWPbwntcD4YKdjTlWfMGqM+rddKzaXH1YTX9qLrWrY="; + cargoHash = "sha256-qKLHrHQhjWysvOwVvlCjaQOoidUz42wEyJPyo/nz5Ro="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ca/castxml/package.nix b/pkgs/by-name/ca/castxml/package.nix index ba76cb9a445d..c4ce27fa9247 100644 --- a/pkgs/by-name/ca/castxml/package.nix +++ b/pkgs/by-name/ca/castxml/package.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "castxml"; - version = "0.6.6"; + version = "0.6.8"; src = fetchFromGitHub { owner = "CastXML"; repo = "CastXML"; rev = "v${finalAttrs.version}"; - hash = "sha256-icTos9HboZXvojQPX+pRkpBYiZ5SXSMb9XtvRnXNHuo="; + hash = "sha256-J4Z/NjCVOq4QS7ncCi87P5YPgqRwFyDAc14uS5T7s6M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/catppuccin-gtk/fix-inconsistent-theme-name.patch b/pkgs/by-name/ca/catppuccin-gtk/fix-inconsistent-theme-name.patch new file mode 100644 index 000000000000..2a64a449d754 --- /dev/null +++ b/pkgs/by-name/ca/catppuccin-gtk/fix-inconsistent-theme-name.patch @@ -0,0 +1,32 @@ +The theme name uses `default` as fallback for tweaks when they aren't +set, which not only is not a valid tweak name, but can lead to confusion +and inconsistencies (See: https://github.com/catppuccin/nix/pull/261). +--- + sources/build/context.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/sources/build/context.py b/sources/build/context.py +index 3d43c01..6167f14 100644 +--- a/sources/build/context.py ++++ b/sources/build/context.py +@@ -45,7 +45,8 @@ class BuildContext: + return f"{self.output_root}/{self.build_id()}" + + def build_id(self) -> str: +- return f"{self.theme_name}-{self.flavor.identifier}-{self.accent.identifier}-{self.size}+{self.tweaks.id() or 'default'}" ++ tweaks = f"+{self.tweaks.id()}" if self.tweaks.id() != "" else "" ++ return f"{self.theme_name}-{self.flavor.identifier}-{self.accent.identifier}-{self.size}" + tweaks + + def apply_suffix(self, suffix: Suffix) -> str: + if suffix.test(self): +@@ -59,6 +60,7 @@ class BuildContext: + Subsitution(find=f"\\${key}: {default}", replace=f"${key}: {value}"), + ) + ++ + IS_DARK = Suffix(true_value="-Dark", test=lambda ctx: ctx.flavor.dark) + IS_LIGHT = Suffix(true_value="-Light", test=lambda ctx: not ctx.flavor.dark) + IS_WINDOW_NORMAL = Suffix( +-- +2.45.1 + diff --git a/pkgs/by-name/ca/catppuccin-gtk/package.nix b/pkgs/by-name/ca/catppuccin-gtk/package.nix index db7a3295903b..964e631c9cad 100644 --- a/pkgs/by-name/ca/catppuccin-gtk/package.nix +++ b/pkgs/by-name/ca/catppuccin-gtk/package.nix @@ -37,6 +37,8 @@ stdenvNoCC.mkDerivation { hash = "sha256-q5/VcFsm3vNEw55zq/vcM11eo456SYE5TQA3g2VQjGc="; }; + patches = [ ./fix-inconsistent-theme-name.patch ]; + nativeBuildInputs = [ gtk3 sassc diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index f4e2bceeaefe..f685076d6727 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ccache"; - version = "4.10"; + version = "4.10.1"; src = fetchFromGitHub { owner = "ccache"; @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { exit 1 fi ''; - hash = "sha256-YHSr2pnk17QEdrIHInXX2eBFN9OGjdleaB41VLaqlnA="; + hash = "sha256-CUQ16VthGl2vtixOv8UGI9gCsb6iEVD9XHKAYivWMrw="; }; outputs = [ @@ -177,11 +177,11 @@ stdenv.mkDerivation (finalAttrs: { builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }"; license = licenses.gpl3Plus; - mainProgram = "ccache"; maintainers = with maintainers; [ kira-bruneau r-burns ]; platforms = platforms.unix; + mainProgram = "ccache"; }; }) diff --git a/pkgs/by-name/cd/cdecl/package.nix b/pkgs/by-name/cd/cdecl/package.nix index 1535dc0bfd0d..b816288429db 100644 --- a/pkgs/by-name/cd/cdecl/package.nix +++ b/pkgs/by-name/cd/cdecl/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdecl"; - version = "17.0.1"; + version = "18.0"; src = fetchFromGitHub { owner = "paul-j-lucas"; repo = "cdecl"; rev = "refs/tags/cdecl-${finalAttrs.version}"; - hash = "sha256-hzsTtUlxyG5dKmKZKR9lxPHczI0jd06d1RGvb9crbyE="; + hash = "sha256-w/x1cAldQh/aVZ9pjt5Vg8jDwCVtqTiKanXcDA6cpPU="; }; strictDeps = true; @@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Composing and deciphering C (or C++) declarations or casts, aka ''gibberish.''"; homepage = "https://github.com/paul-j-lucas/cdecl"; + changelog = "https://github.com/paul-j-lucas/cdecl/blob/cdecl-${finalAttrs.version}/ChangeLog"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index 3a009ea0cb3b..259e2fe18967 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -48,13 +48,13 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "cemu"; - version = "2.0-86"; + version = "2.0-88"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${finalAttrs.version}"; - hash = "sha256-AS5Qo4J0U1MeTYWl4jiJMi879bhBuioU1BikxGKtUrE="; + hash = "sha256-ZXJrxfTgwDmHUk3UqA4H4MSEvNNq9lXHXxf9rgWqkro="; }; patches = [ diff --git a/pkgs/by-name/ce/centerpiece/package.nix b/pkgs/by-name/ce/centerpiece/package.nix index f6d3f1a9a2f2..9fd6d7df7da7 100644 --- a/pkgs/by-name/ce/centerpiece/package.nix +++ b/pkgs/by-name/ce/centerpiece/package.nix @@ -8,6 +8,7 @@ , rustPlatform , libxkbcommon , wayland +, enableX11 ? true, xorg }: rustPlatform.buildRustPackage rec { @@ -30,7 +31,12 @@ rustPlatform.buildRustPackage rec { libxkbcommon vulkan-loader wayland - ]; + ] ++ lib.optionals enableX11 (with xorg; [ + libX11 + libXcursor + libXi + libXrandr + ]); postFixup = lib.optional stdenv.isLinux '' rpath=$(patchelf --print-rpath $out/bin/centerpiece) diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index a78fb1c3557f..6c340102a502 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -45,7 +45,6 @@ python3Packages.buildPythonApplication rec { ]; nativeBuildInputs = with python3Packages; [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix new file mode 100644 index 000000000000..692e7d752971 --- /dev/null +++ b/pkgs/by-name/ch/chatd/package.nix @@ -0,0 +1,95 @@ +{ + buildNpmPackage, + lib, + autoPatchelfHook, + electron, + fetchFromGitHub, + gitUpdater, + makeWrapper, + ollama, + pkg-config, + stdenv, + vips, +}: + +buildNpmPackage rec { + pname = "chatd"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "BruceMacD"; + repo = "chatd"; + rev = "v${version}"; + hash = "sha256-6z5QoJk81NEP115uW+2ah7vxpDz8XQUmMLESPsZT9uU="; + }; + + makeCacheWritable = true; # sharp tries to build stuff in node_modules + ELECTRON_SKIP_BINARY_DOWNLOAD = true; + + npmDepsHash = "sha256-jvGvhgNhY+wz/DFS7NDtmzKXbhHbNF3i0qVQoFFeB0M="; + + dontNpmBuild = true; # missing script: build + + nativeBuildInputs = [ + makeWrapper + electron + autoPatchelfHook # for onnx libs + pkg-config + ]; + + buildInputs = [ + stdenv.cc.cc.lib # for libstdc++.so, required by onnxruntime + vips # or it will try to download from the Internet + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share} + cp -r . $out/share/chatd + + for bin in ollama-darwin ollama-linux; do + makeWrapper ${lib.getExe ollama} $out/share/chatd/src/service/ollama/runners/$bin + done + + makeWrapper ${lib.getExe electron} $out/bin/chatd \ + --add-flags $out/share/chatd/src/index.js \ + --chdir $out/share/chatd \ + --set-default ELECTRON_FORCE_IS_PACKAGED 1 + runHook postInstall + ''; + + postInstall = '' + substituteInPlace $out/share/chatd/node_modules/@xenova/transformers/src/env.js \ + --replace-fail "import fs from 'fs';" "import fs from 'fs';import os from 'os';" \ + --replace-fail 'path.dirname(path.dirname(url.fileURLToPath(import.meta.url)))' 'path.join(os.homedir(), ".cache", "chatd")' + + rm -rf $out/share/electron{,-winstaller} $(find $out -name 'win32') + find $out/share/chatd/node_modules -name '*.exe' -or -name '*.dll' -or -name '*.pdb' -delete + rm -rf ${ + lib.concatStringsSep " " ( + (lib.optional (!stdenv.isx86_64) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/*/x64") + ++ (lib.optional ( + !stdenv.isAarch64 + ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/*/arm64") + ++ (lib.optional ( + !stdenv.isDarwin + ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/darwin") + ++ (lib.optional ( + !stdenv.isLinux + ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/linux") + ) + } + ''; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "Chat with your documents using local AI"; + homepage = "https://github.com/BruceMacD/chatd"; + changelog = "https://github.com/BruceMacD/chatd/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lucasew ]; + mainProgram = "chatd"; + platforms = electron.meta.platforms; + }; +} diff --git a/pkgs/desktops/gnome/apps/cheese/default.nix b/pkgs/by-name/ch/cheese/package.nix similarity index 96% rename from pkgs/desktops/gnome/apps/cheese/default.nix rename to pkgs/by-name/ch/cheese/package.nix index 9dd578438c50..9ac53092c114 100644 --- a/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/pkgs/by-name/ch/cheese/package.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "cheese"; - attrPath = "gnome.cheese"; }; }; @@ -101,7 +100,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/cheese"; description = "Take photos and videos with your webcam, with fun graphical effects"; mainProgram = "cheese"; - maintainers = teams.gnome.members; + maintainers = [ ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 46035e0f5b40..b336587cd871 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.49.1"; + version = "2.50.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-DrilLcV6wyUVPPiDs5KiC8kztNCH4Fug5h35+xerLZU="; + hash = "sha256-l1c55vItMIfPbcwVWnpx3mlzT75KRlbd8V8DzQoQB2w="; }; - vendorHash = "sha256-3nufF280WuDNvhKn9xP9dnxNX2VC59nifuJp+ebUSvk="; + vendorHash = "sha256-5jc7i+vX6aGq//Zl924FIdjAVyqlusZfWRbc8aj3iLw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ch/choose-gui/package.nix b/pkgs/by-name/ch/choose-gui/package.nix new file mode 100644 index 000000000000..bbf1ff2a8578 --- /dev/null +++ b/pkgs/by-name/ch/choose-gui/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + xcbuild, + darwin, +}: + +stdenv.mkDerivation rec { + pname = "choose-gui"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "chipsenkbeil"; + repo = "choose"; + rev = version; + hash = "sha256-oR0GgMinKcBHaZWdE7O+mdbiLKKjkweECKbi80bjW+c="; + }; + + nativeBuildInputs = [ xcbuild ]; + + buildInputs = [ darwin.apple_sdk.frameworks.Cocoa ]; + + buildPhase = '' + runHook preBuild + xcodebuild -arch ${stdenv.hostPlatform.darwinArch} -configuration Release SYMROOT="./output" build + cp ./output/Release/choose choose + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp choose $out/bin/choose + chmod +x $out/bin/choose + runHook postInstall + ''; + + meta = { + description = "Fuzzy matcher for OS X that uses both std{in,out} and a native GUI"; + homepage = "https://github.com/chipsenkbeil/choose"; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; + changelog = "https://github.com/chipsenkbeil/choose/blob/${version}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ heywoodlh ]; + mainProgram = "choose"; + }; +} diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix index b9dec059d1f1..990422f0ef4b 100644 --- a/pkgs/by-name/ch/chow-kick/package.nix +++ b/pkgs/by-name/ch/chow-kick/package.nix @@ -6,7 +6,7 @@ , dbus , libepoxy , fetchFromGitHub -, freeglut +, libglut , freetype , gtk2-x11 , lib @@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "chow-kick"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Chowdhury-DSP"; repo = "ChowKick"; rev = "v${finalAttrs.version}"; - sha256 = "0amnp0p7ckbbr9dcbdnld1ryv46kvza2dj8m6hzmi7c1s4df8x5q"; + sha256 = "sha256-YYcNiJGGw21aVY03tyQLu3wHCJhxYiDNJZ+LWNbQdj4="; fetchSubmodules = true; }; @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus libepoxy - freeglut + libglut freetype gtk2-x11 libGL diff --git a/pkgs/by-name/ch/chow-phaser/package.nix b/pkgs/by-name/ch/chow-phaser/package.nix index 23cfe684d81f..fd329070d0aa 100644 --- a/pkgs/by-name/ch/chow-phaser/package.nix +++ b/pkgs/by-name/ch/chow-phaser/package.nix @@ -1,4 +1,4 @@ -{ alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, freeglut +{ alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, libglut , freetype, gcc-unwrapped, gtk3, lib, libGL, libXcursor, libXdmcp, libXext , libXinerama, libXrandr, libXtst, libdatrie, libjack2, libpsl, libselinux , libsepol, libsysprof-capture, libthai, libxkbcommon, pcre, pkg-config @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus libepoxy - freeglut + libglut freetype gtk3 libGL diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix index 44fc35073d36..89c58fcaf4b1 100644 --- a/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -5,7 +5,7 @@ , dbus , libepoxy , fetchFromGitHub -, freeglut +, libglut , freetype , gtk3 , lib @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus libepoxy - freeglut + libglut freetype gtk3 libGL diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix index 1314c3723466..1d45df4f632e 100644 --- a/pkgs/by-name/ci/cimg/package.nix +++ b/pkgs/by-name/ci/cimg/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.cecill-c; maintainers = [ lib.maintainers.AndersonTorres - lib.maintainers.lilyinstarlight ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/cl/clangbuildanalyzer/package.nix b/pkgs/by-name/cl/clangbuildanalyzer/package.nix index 21b67fcf44c4..c5dc4f1b4064 100644 --- a/pkgs/by-name/cl/clangbuildanalyzer/package.nix +++ b/pkgs/by-name/cl/clangbuildanalyzer/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Tool for analyzing Clang's -ftime-trace files"; homepage = "https://github.com/aras-p/ClangBuildAnalyzer"; - maintainers = with lib.maintainers; [ lf- ]; + maintainers = [ ]; license = lib.licenses.unlicense; platforms = lib.platforms.unix; mainProgram = "ClangBuildAnalyzer"; diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index 056bf1b59482..f70e84523d44 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -8,7 +8,7 @@ buildNpmPackage rec { pname = "clever-tools"; - version = "3.7.0"; + version = "3.8.1"; nodejs = nodejs_18; @@ -16,10 +16,10 @@ buildNpmPackage rec { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-Ce7lk+zTbyj3HmtIFui9ZA1FThZEytovrPCrmjMyX38="; + hash = "sha256-8dxV57uivjcXz6JHttFNvivcIbNRAwZKSvGv/SST81E="; }; - npmDepsHash = "sha256-VQXljlIHAE2o10cXQlsyhTvBSp3/ycQOJydQGNMiWuk="; + npmDepsHash = "sha256-2lROdsq3tR4SYxMoTJYY6EyHxudS7p7wOJq+RxE2btk="; dontNpmBuild = true; diff --git a/pkgs/by-name/cl/clipse/package.nix b/pkgs/by-name/cl/clipse/package.nix index e1cef9cfae54..417ae4ea44f6 100644 --- a/pkgs/by-name/cl/clipse/package.nix +++ b/pkgs/by-name/cl/clipse/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "clipse"; - version = "0.0.71"; + version = "1.0.3"; src = fetchFromGitHub { owner = "savedra1"; repo = "clipse"; rev = "v${version}"; - hash = "sha256-88GuYGJO5AgWae6LyMO/TpGqtk2yS7pDPS0MkgmJUQ4="; + hash = "sha256-EnT4gnP145FoUysL3L87vY1LrlJoPT1VqDEoH2Fqh2g="; }; - vendorHash = "sha256-GIUEx4h3xvLySjBAQKajby2cdH8ioHkv8aPskHN0V+w="; + vendorHash = "sha256-QEBRlwNS8K44chB3fMOJZxYnIaWMnuDySIhKfF7XtxM="; meta = { description = "Useful clipboard manager TUI for Unix"; diff --git a/pkgs/by-name/cl/cloudflare-utils/package.nix b/pkgs/by-name/cl/cloudflare-utils/package.nix new file mode 100644 index 000000000000..40e98dcedf79 --- /dev/null +++ b/pkgs/by-name/cl/cloudflare-utils/package.nix @@ -0,0 +1,25 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "cloudflare-utils"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "Cyb3r-Jak3"; + repo = "cloudflare-utils"; + rev = "v${version}"; + sha256 = "sha256-41TQ+St6U4exLSl4dwc1E6K8P+oqQ4m5RSI7L2/dWwI="; + }; + + vendorHash = "sha256-HE6x4KSe9b9ZzcYz7sP25aTeDGU4zXgkYm/1RwYYBt4="; + + meta = { + description = "Helpful Cloudflare utility program"; + homepage = "https://github.com/Cyb3r-Jak3/cloudflare-utils"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [yelite]; + }; +} diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 5c2a9983d627..c03c1055f724 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.29.3"; + version = "3.29.6"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-JSruFEjUnKoElU/V4n0YndUVcFVzE+eygWNnFqI4vMs="; + hash = "sha256-E5ExMAO4PUjiqxFai1JaVX942MFURhi0jR2QGEoQ8K8="; }; patches = [ @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { --subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \ --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc} # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake - configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags" + configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags $cmakeFlags" ''; # The configuration script is not autoconf-based, although being similar; diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index f6d440e557ea..fce36f682c3d 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitea { domain = "codeberg.org"; - owner = "RobWalt"; + owner = "Aviac"; repo = "codeberg-cli"; rev = "v${version}"; hash = "sha256-SUKV7tH7tvSPtlMcRlOgjvAEqPoBi4J41Ak5k4h4Qj0="; @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "CLI Tool for Codeberg similar to gh and glab"; - homepage = "https://codeberg.org/RobWalt/codeberg-cli"; + homepage = "https://codeberg.org/Aviac/codeberg-cli"; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ robwalt ]; mainProgram = "berg"; diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 651791803e94..80cbee9e371b 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-uihbLR6JEhj99jz4++7E5z1INBtCskGmZjsTucGznlQ="; - aarch64-linux = "sha256-N/YklwW8T2+Go9kQDZPdGYmgiHHEs4yoOmdPEoH8iqU="; - x86_64-darwin = "sha256-NLv4lZCQ5jFvQdS9c37/bXcCANzXrIsobhZEWxeK4XY="; - aarch64-darwin = "sha256-mLcvgVe9VF9eta7m/jrGgDQx56uDDsOKPTi5Pp6nS3g="; + x86_64-linux = "sha256-ULHO7NrbW0DDlOYiSHGXwJ+NOa68Ma+HMHgq2WyAKBA="; + aarch64-linux = "sha256-WVqPV/D9jPADkxt5XmydqXjSG8461URPsk1+W/kyZV0="; + x86_64-darwin = "sha256-0P/eYZp0Wieza0btOA+yxqKtoIYlUN6MhN0dI6R8GEg="; + aarch64-darwin = "sha256-2Cv22+Ii+otKLDQ404l9R/x42PkKTEzPB72/gc9wfig="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.8.69"; + version = "1.8.80"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix index 369a5801ff48..61cad3e9682e 100644 --- a/pkgs/by-name/co/commafeed/package.nix +++ b/pkgs/by-name/co/commafeed/package.nix @@ -49,7 +49,7 @@ maven.buildMavenPackage { pname = "commafeed"; - mvnHash = "sha256-YnEDJf4GeyiXxOh8tZZTZdLOJrisG6lmShXU97ueGNE="; + mvnHash = "sha256-LDZv3CBc/FpVMKmZ+kqfBdkTbqZcJMRqeXN35t4rwJI="; mvnParameters = lib.escapeShellArgs [ "-Dskip.installnodenpm" diff --git a/pkgs/by-name/co/commit/command-from-path.patch b/pkgs/by-name/co/commit/command-from-path.patch new file mode 100644 index 000000000000..214c83d99545 --- /dev/null +++ b/pkgs/by-name/co/commit/command-from-path.patch @@ -0,0 +1,30 @@ +diff --git a/src/welcome.js b/src/welcome.js +index 27cc7dc..c6772c3 100644 +--- a/src/welcome.js ++++ b/src/welcome.js +@@ -55,24 +55,7 @@ export default function Welcome({ application }) { + } + + function getCommand() { +- const FLATPAK_ID = GLib.getenv("FLATPAK_ID"); +- +- if (FLATPAK_ID) { +- return `flatpak run ${FLATPAK_ID}`; +- } +- +- const { programInvocationName } = system; +- // re.sonny.Commit +- if (programInvocationName === GLib.path_get_basename(programInvocationName)) { +- return programInvocationName; +- } +- +- // ./re.sonny.commit +- // /home/sonny/re.sonny.Commit +- return GLib.canonicalize_filename( +- programInvocationName, +- GLib.get_current_dir(), +- ); ++ return "re.sonny.Commit"; + } + + function getRange(key) { diff --git a/pkgs/by-name/co/commit/package.nix b/pkgs/by-name/co/commit/package.nix new file mode 100644 index 000000000000..c213ef37962d --- /dev/null +++ b/pkgs/by-name/co/commit/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + appstream-glib, + blueprint-compiler, + desktop-file-utils, + gjs, + gtksourceview5, + libadwaita, + libspelling, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + nix-update-script, +}: +stdenv.mkDerivation rec { + pname = "commit"; + version = "4.1"; + + src = fetchFromGitHub { + owner = "sonnyp"; + repo = "Commit"; + rev = "v${version}"; + hash = "sha256-HhyoQ4wrc8dHvVU+MylJgaKu9HwSw+/f6UDTIM2YRNk="; + fetchSubmodules = true; + }; + + patches = [ + # Instead of using the absolute path in command snippets, + # assume `re.sonny.Commit` is already in PATH. This prevents + # configurations from breaking when our store path changes + ./command-from-path.patch + ]; + + # gjs uses the invocation name to add gresource files + # to get around this, we set the entry point name manually + # + # `/usr/bin/env` is also used quite a bit + postPatch = '' + sed -i "1 a imports.package._findEffectiveEntryPointName = () => 're.sonny.Commit';" src/bin.js + patchShebangs {,.}* + ''; + + nativeBuildInputs = [ + appstream-glib + blueprint-compiler + desktop-file-utils + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + libspelling + gtksourceview5 + gjs + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Commit message editor"; + homepage = "https://github.com/sonnyp/Commit"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "re.sonny.Commit"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/co/container-structure-test/package.nix b/pkgs/by-name/co/container-structure-test/package.nix new file mode 100644 index 000000000000..f8ef4728b2d9 --- /dev/null +++ b/pkgs/by-name/co/container-structure-test/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchurl, +}: +let + version = "v1.18.1"; + + sources = { + x86_64-linux = { + url = "https://github.com/GoogleContainerTools/container-structure-test/releases/download/${version}/container-structure-test-linux-amd64"; + hash = "sha256-vnZsdjRix3P7DpDz00WUTbNBLQIFPKzfUbVbxn+1ygM="; + }; + aarch64-linux = { + url = "https://github.com/GoogleContainerTools/container-structure-test/releases/download/${version}/container-structure-test-linux-arm64"; + hash = "sha256-/YPAeh/Ad2YVdZ/irpgikQST0uWITWYQOB4qI54aPlY="; + }; + x86_64-darwin = { + url = "https://github.com/GoogleContainerTools/container-structure-test/releases/download/${version}/container-structure-test-darwin-amd64"; + hash = "sha256-tJ1gMnQ7d6du65fnw5GV425kWl/3jLwcqj3gIHHuOyU="; + }; + aarch64-darwin = { + url = "https://github.com/GoogleContainerTools/container-structure-test/releases/download/${version}/container-structure-test-darwin-arm64"; + hash = "sha256-cNSb3nhSGU9q/PJDNdEeV/hlCXAdXkaV6SROdXnXjp0="; + }; + }; +in +stdenv.mkDerivation { + inherit version; + pname = "container-structure-test"; + src = fetchurl { inherit (sources.${stdenv.system}) url hash; }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + install -Dm755 $src $out/bin/container-structure-test + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/GoogleContainerTools/container-structure-test"; + description = "The Container Structure Tests provide a powerful framework to validate the structure of a container image."; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ rubenhoenle ]; + platforms = builtins.attrNames sources; + mainProgram = "container-structure-test"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/by-name/co/contrast/package.nix similarity index 67% rename from pkgs/applications/accessibility/contrast/default.nix rename to pkgs/by-name/co/contrast/package.nix index cc8e21b92456..12dbc1c637a8 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/by-name/co/contrast/package.nix @@ -1,20 +1,22 @@ -{ stdenv -, lib -, fetchFromGitLab -, cairo -, cargo -, desktop-file-utils -, gettext -, glib -, gtk4 -, libadwaita -, meson -, ninja -, pango -, pkg-config -, rustPlatform -, rustc -, wrapGAppsHook4 +{ + stdenv, + lib, + fetchFromGitLab, + cairo, + cargo, + desktop-file-utils, + gettext, + glib, + gtk4, + libadwaita, + meson, + ninja, + nix-update-script, + pango, + pkg-config, + rustPlatform, + rustc, + wrapGAppsHook4, }: stdenv.mkDerivation rec { @@ -56,14 +58,16 @@ stdenv.mkDerivation rec { pango ]; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Checks whether the contrast between two colors meet the WCAG requirements"; homepage = "https://gitlab.gnome.org/World/design/contrast"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "contrast"; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/co/corrscope/package.nix b/pkgs/by-name/co/corrscope/package.nix index 8b8607d723a6..0148ab90eb07 100644 --- a/pkgs/by-name/co/corrscope/package.nix +++ b/pkgs/by-name/co/corrscope/package.nix @@ -26,7 +26,6 @@ python3Packages.buildPythonApplication rec { wrapQtAppsHook ]) ++ (with python3Packages; [ poetry-core - pythonRelaxDepsHook ]); buildInputs = [ diff --git a/pkgs/by-name/co/corrupter/package.nix b/pkgs/by-name/co/corrupter/package.nix index 9e6f33902356..bd70ddaf44bb 100644 --- a/pkgs/by-name/co/corrupter/package.nix +++ b/pkgs/by-name/co/corrupter/package.nix @@ -1,7 +1,7 @@ { lib , buildGoModule , fetchFromGitHub -, nix-update-script +, unstableGitUpdater }: buildGoModule { @@ -21,7 +21,9 @@ buildGoModule { # There are no tests available for this package. doCheck = false; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "Simple image glitcher suitable for producing lockscreens"; diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 8120fcc61e16..2fc1f95082d9 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -97,7 +97,7 @@ rustPlatform.buildRustPackage rec { wrapProgram "$out/bin/${pname}" \ --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr vulkan-loader libxkbcommon mesa.drivers wayland + xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr vulkan-loader libxkbcommon wayland ]} ''; diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index 1a89a00a2301..fb4eb787cb70 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -86,7 +86,6 @@ rustPlatform.buildRustPackage rec { xorg.libXrandr libxkbcommon vulkan-loader - mesa.drivers ] } ''; diff --git a/pkgs/by-name/co/cosmic-tasks/package.nix b/pkgs/by-name/co/cosmic-tasks/package.nix deleted file mode 100644 index 8c6cac946bb5..000000000000 --- a/pkgs/by-name/co/cosmic-tasks/package.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, wrapGAppsHook3 -, atk -, cairo -, gdk-pixbuf -, glib -, gtk3 -, libsecret -, libxkbcommon -, openssl -, pango -, sqlite -, vulkan-loader -, stdenv -, darwin -, wayland -}: - -let - commitDate = "2024-04-30"; -in rustPlatform.buildRustPackage rec { - pname = "cosmic-tasks"; - version = "0-unstable-${commitDate}"; - - src = fetchFromGitHub { - owner = "edfloreshz"; - repo = "cosmic-tasks"; - rev = "020ae8633b23091f113b19f4b6f992e36404f2e2"; - hash = "sha256-ZPEzvscLYH4vJ+5Nh5J9m8ZX2jXXDMOLswSnHaCdSdA="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "accesskit-0.12.2" = "sha256-ksaYMGT/oug7isQY8/1WD97XDUsX2ShBdabUzxWffYw="; - "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; - "clipboard_macos-0.1.0" = "sha256-KVcKQ4DtoZCgFBnejIaQfQxJJJxd/mFzHBI+4PbGBio="; - "cosmic-config-0.1.0" = "sha256-VEE/1XQZaojz9gxTV/Zz++eVplsCfiDPgf/cAr2Rih8="; - "cosmic-text-0.11.2" = "sha256-gUIQFHPaFTmtUfgpVvsGTnw2UKIBx9gl0K67KPuynWs="; - "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; - "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; - "smithay-client-toolkit-0.18.0" = "sha256-/7twYMt5/LpzxLXAQKTGNnWcfspUkkZsN5hJu7KaANc="; - "smithay-clipboard-0.8.0" = "sha256-LDd56TJ175qsj2/EV/dbBRV9HMU7RzgrG5JP7H2PmhE="; - "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; - "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; - "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; - }; - }; - - # COSMIC applications now uses vergen for the About page - # Update the COMMIT_DATE to match when the commit was made - env.VERGEN_GIT_COMMIT_DATE = commitDate; - env.VERGEN_GIT_SHA = src.rev; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = [ - atk - cairo - gdk-pixbuf - glib - gtk3 - libsecret - libxkbcommon - openssl - pango - sqlite - vulkan-loader - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.Metal - darwin.apple_sdk.frameworks.QuartzCore - darwin.apple_sdk.frameworks.Security - ] ++ lib.optionals stdenv.isLinux [ - wayland - ]; - - postFixup = lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/cosmic-tasks \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libxkbcommon wayland ]}" - ''; - - meta = with lib; { - description = "Simple task management application for the COSMIC desktop"; - homepage = "https://github.com/edfloreshz/cosmic-tasks"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ GaetanLepage ]; - platforms = platforms.linux; - mainProgram = "cosmic-tasks"; - }; -} diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index 9a0453e0ee2e..b2bcf3ebccbc 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -99,7 +99,6 @@ rustPlatform.buildRustPackage rec { --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libxkbcommon - mesa.drivers vulkan-loader xorg.libX11 xorg.libXcursor diff --git a/pkgs/by-name/co/coyim/package.nix b/pkgs/by-name/co/coyim/package.nix index 2906d324c2ae..9e8991b5fbe0 100644 --- a/pkgs/by-name/co/coyim/package.nix +++ b/pkgs/by-name/co/coyim/package.nix @@ -6,7 +6,7 @@ , cairo , gdk-pixbuf , glib -, gnome +, adwaita-icon-theme , wrapGAppsHook3 , gtk3 }: @@ -26,7 +26,7 @@ buildGoModule { nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome.adwaita-icon-theme ]; + buildInputs = [ glib cairo gdk-pixbuf gtk3 adwaita-icon-theme ]; meta = { description = "Safe and secure chat client"; diff --git a/pkgs/by-name/cq/cq/package.nix b/pkgs/by-name/cq/cq/package.nix new file mode 100644 index 000000000000..82fc31a7bbdd --- /dev/null +++ b/pkgs/by-name/cq/cq/package.nix @@ -0,0 +1,46 @@ +{ lib +, fetchFromGitHub +, fetchurl +, buildGraalvmNativeImage +, graalvmCEPackages +}: + +buildGraalvmNativeImage rec { + pname = "cq"; + version = "2024.06.24-12.10"; + + # we need both src (the prebuild jar) + src = fetchurl { + url = "https://github.com/markus-wa/cq/releases/download/${version}/cq.jar"; + hash = "sha256-iULV+j/AuGVYPYhbOTQTKd3n+VZhWQYBRE6cRiaa1/M="; + }; + + # and build-src (for the native-image build process) + build-src = fetchFromGitHub { + owner = "markus-wa"; + repo = "cq"; + rev = version; + hash = "sha256-yjAC2obipdmh+JlHzVUTMtTXN2VKe4WKkyJyu2Q93c8="; + }; + + graalvmDrv = graalvmCEPackages.graalvm-ce; + + executable = "cq"; + + # copied verbatim from the upstream build script https://github.com/markus-wa/cq/blob/main/package/build-native.sh#L5 + extraNativeImageBuildArgs = [ + "--report-unsupported-elements-at-runtime" + "--initialize-at-build-time" + "--no-server" + "-H:ReflectionConfigurationFiles=${build-src}/package/reflection-config.json" + ]; + + meta = with lib; { + description = "Clojure Query: A Command-line Data Processor for JSON, YAML, EDN, XML and more"; + homepage = "https://github.com/markus-wa/cq"; + changelog = "https://github.com/markus-wa/cq/releases/releases/tag/${version}"; + license = licenses.epl20; + maintainers = with maintainers; [ farcaller ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/cr/crabfit-frontend/package.nix b/pkgs/by-name/cr/crabfit-frontend/package.nix index 9a694807abb4..99d7be0fdeae 100644 --- a/pkgs/by-name/cr/crabfit-frontend/package.nix +++ b/pkgs/by-name/cr/crabfit-frontend/package.nix @@ -7,7 +7,7 @@ fetchpatch, nodejs, yarn, - fixup_yarn_lock, + fixup-yarn-lock, google-fonts, api_url ? "http://127.0.0.1:3000", frontend_url ? "crab.fit", @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs yarn - fixup_yarn_lock + fixup-yarn-lock ]; postPatch = '' @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { echo 'NEXT_PUBLIC_API_URL="${api_url}"' > .env.local - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror ${finalAttrs.offlineCache} yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules diff --git a/pkgs/by-name/cr/crate2nix/package.nix b/pkgs/by-name/cr/crate2nix/package.nix new file mode 100644 index 000000000000..12ce3f76edeb --- /dev/null +++ b/pkgs/by-name/cr/crate2nix/package.nix @@ -0,0 +1,68 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, makeWrapper +, cargo +, nix +, nix-prefetch-git +, installShellFiles +, +}: + +rustPlatform.buildRustPackage rec { + pname = "crate2nix"; + version = "0.14.1"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = pname; + rev = version; + hash = "sha256-esWhRnt7FhiYq0CcIxw9pvH+ybOQmWBfHYMtleaMhBE="; + }; + + sourceRoot = "${src.name}/${pname}"; + + cargoHash = "sha256-nQ1VUCFMmpWZWvKFbyJFIZUJ24N9ZPY8JCHWju385NE="; + + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; + + # Tests use nix(1), which tries (and fails) to set up /nix/var inside the sandbox. + doCheck = false; + + postInstall = '' + wrapProgram $out/bin/${pname} \ + --prefix PATH ":" ${ + lib.makeBinPath [ + cargo + nix + nix-prefetch-git + ] + } + + for shell in bash zsh fish + do + $out/bin/${pname} completions -s $shell + installShellCompletion ${pname}.$shell || installShellCompletion --$shell _${pname} + done + ''; + + meta = with lib; { + description = "Nix build file generator for Rust crates"; + mainProgram = "crate2nix"; + longDescription = '' + Crate2nix generates Nix files from Cargo.toml/lock files + so that you can build every crate individually in a Nix sandbox. + ''; + homepage = "https://github.com/nix-community/crate2nix"; + changelog = "https://nix-community.github.io/crate2nix/90_reference/90_changelog"; + license = licenses.asl20; + maintainers = with maintainers; [ + kolloch + cole-h + kranzes + ]; + }; +} diff --git a/pkgs/by-name/cs/csharpier/package.nix b/pkgs/by-name/cs/csharpier/package.nix index e0d48a38c818..69ac2ade35b1 100644 --- a/pkgs/by-name/cs/csharpier/package.nix +++ b/pkgs/by-name/cs/csharpier/package.nix @@ -5,7 +5,7 @@ buildDotnetGlobalTool { version = "0.28.2"; executables = "dotnet-csharpier"; - nugetSha256 = "sha256-fXyE25niM80pPXCLC80Hm9XEHGUMx0XZOMxdVoA0h18="; + nugetHash = "sha256-fXyE25niM80pPXCLC80Hm9XEHGUMx0XZOMxdVoA0h18="; meta = with lib; { description = "Opinionated code formatter for C#"; diff --git a/pkgs/by-name/cs/csharprepl/package.nix b/pkgs/by-name/cs/csharprepl/package.nix index d6fccd57ea61..5b7e8f2d7c93 100644 --- a/pkgs/by-name/cs/csharprepl/package.nix +++ b/pkgs/by-name/cs/csharprepl/package.nix @@ -8,7 +8,7 @@ buildDotnetGlobalTool { dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; - nugetSha256 = "sha256-VkZGnfD8p6oAJ7i9tlfwJfmKfZBHJU7Wdq+K4YjPoRs="; + nugetHash = "sha256-VkZGnfD8p6oAJ7i9tlfwJfmKfZBHJU7Wdq+K4YjPoRs="; meta = with lib; { description = "C# REPL with syntax highlighting"; diff --git a/pkgs/by-name/cu/cups-printers/package.nix b/pkgs/by-name/cu/cups-printers/package.nix index 50af156ff668..b6e124fef07d 100644 --- a/pkgs/by-name/cu/cups-printers/package.nix +++ b/pkgs/by-name/cu/cups-printers/package.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; diff --git a/pkgs/by-name/cy/cyanrip/package.nix b/pkgs/by-name/cy/cyanrip/package.nix index d3266c1dc311..149d370ba495 100644 --- a/pkgs/by-name/cy/cyanrip/package.nix +++ b/pkgs/by-name/cy/cyanrip/package.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/cyanreg/cyanrip"; + changelog = "https://github.com/cyanreg/cyanrip/releases/tag/${finalAttrs.src.rev}"; description = "Bule-ish CD ripper"; mainProgram = "cyanrip"; license = licenses.lgpl21Plus; diff --git a/pkgs/by-name/cy/cyme/Cargo.lock b/pkgs/by-name/cy/cyme/Cargo.lock deleted file mode 100644 index c645e23d1563..000000000000 --- a/pkgs/by-name/cy/cyme/Cargo.lock +++ /dev/null @@ -1,1141 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "assert-json-diff" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[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 = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "serde", - "windows-targets", -] - -[[package]] -name = "clap" -version = "4.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", - "terminal_size 0.3.0", -] - -[[package]] -name = "clap_complete" -version = "4.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "clap_mangen" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3be86020147691e1d2ef58f75346a3d4d94807bfc473e377d52f09f0f7d77f7" -dependencies = [ - "clap", - "roff", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "colored" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" -dependencies = [ - "is-terminal", - "lazy_static", - "windows-sys", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cyme" -version = "1.6.0" -dependencies = [ - "assert-json-diff", - "clap", - "clap_complete", - "clap_mangen", - "colored", - "diff", - "dirs", - "heck", - "itertools", - "lazy_static", - "log", - "rand", - "rusb", - "serde", - "serde_json", - "serde_with", - "simple_logger", - "strum", - "strum_macros", - "terminal_size 0.2.6", - "udev", - "usb-ids", -] - -[[package]] -name = "darling" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.39", -] - -[[package]] -name = "darling_macro" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[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 = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "errno" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "getrandom" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "iana-time-zone" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" -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 = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown", - "serde", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix 0.38.25", - "windows-sys", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "js-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" -dependencies = [ - "wasm-bindgen", -] - -[[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.150" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.1", - "libc", - "redox_syscall", -] - -[[package]] -name = "libudev-sys" -version = "0.1.4" -source = "git+https://github.com/Emilgardis/libudev-sys/?branch=fix-cross-compilation#808a604d27d0afc1305bbcc5d27c6c083c99dfa4" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "libusb1-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da050ade7ac4ff1ba5379af847a10a10a8e284181e060105bf8d86960ce9ce0f" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[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 = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[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 = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -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 = "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 = "roff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" - -[[package]] -name = "rusb" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4" -dependencies = [ - "libc", - "libusb1-sys", -] - -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys 0.4.11", - "windows-sys", -] - -[[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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "serde" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "serde_json" -version = "1.0.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" -dependencies = [ - "base64", - "chrono", - "hex", - "indexmap", - "serde", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "simple_logger" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0ca6504625ee1aa5fda33913d2005eab98c7a42dd85f116ecce3ff54c9d3ef" -dependencies = [ - "colored", - "log", - "time", - "windows-sys", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[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.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "terminal_size" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" -dependencies = [ - "rustix 0.37.27", - "windows-sys", -] - -[[package]] -name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix 0.38.25", - "windows-sys", -] - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "time" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" -dependencies = [ - "deranged", - "itoa", - "libc", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" -dependencies = [ - "time-core", -] - -[[package]] -name = "udev" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1" -dependencies = [ - "io-lifetimes", - "libc", - "libudev-sys", - "pkg-config", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "usb-ids" -version = "1.2023.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba8af4170a2e6ebc0e18ce6024c8c844bc07f3101ab5d1ad7dedfd1c6fb116cb" -dependencies = [ - "nom", - "phf", - "phf_codegen", - "proc-macro2", - "quote", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[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.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" - -[[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.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[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_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[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_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[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_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index 5c854b55893f..5bdeaf1c9c18 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -6,7 +6,6 @@ , stdenv , darwin , libusb1 -, udev , nix-update-script , testers , cyme @@ -14,21 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cyme"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tuna-f1sh"; repo = "cyme"; rev = "v${version}"; - hash = "sha256-HIOrdVChTfYX8AKqytWU+EudFDiqoVELb+yL3jsPQwM="; + hash = "sha256-iDwH4gSpt1XkwMBj0Ut26c9PpsHcxFrRE6VuBNhpIHk="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "libudev-sys-0.1.4" = "sha256-7dUqPH8bQ/QSBIppxQbymwQ44Bvi1b6N2AMUylbyKK8="; - }; - }; + cargoHash = "sha256-bzOqk0nXhqq4WX9razPo1q6BkEl4VZ5QMPiNEwHO/eM="; nativeBuildInputs = [ pkg-config @@ -38,11 +32,12 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libusb1 - ] ++ lib.optionals stdenv.isLinux [ - udev ]; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = [ + # doctest that requires access outside sandbox + "--skip=udev::hwdb::get" + ] ++ lib.optionals stdenv.isDarwin [ # system_profiler is not available in the sandbox "--skip=test_run" ]; @@ -56,6 +51,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://github.com/tuna-f1sh/cyme"; + changelog = "https://github.com/tuna-f1sh/cyme/releases/tag/${src.rev}"; description = "Modern cross-platform lsusb"; license = licenses.gpl3Plus; maintainers = with maintainers; [ h7x4 ]; diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index fdf03e459291..ca21fc82c875 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -10,6 +10,7 @@ , gobject-introspection , gtk4 , pango +, overrideSDK , pkg-config , rustPlatform , testers @@ -28,8 +29,12 @@ let hash = "sha256-SOWtLmehh1F8SoDQ+9d7Fyosgzya5ZztCv8IcJZ4J94="; }; cargoHash = "sha256-GOX7V6NLEMP06nMeRZINwcWCaHwK6T3nkRKl4e25DPg="; + + buildRustPackage' = rustPlatform.buildRustPackage.override { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; in -rustPlatform.buildRustPackage { +buildRustPackage' { inherit pname version src cargoHash; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/by-name/da/dart-sass/package.nix similarity index 65% rename from pkgs/development/tools/misc/dart-sass/default.nix rename to pkgs/by-name/da/dart-sass/package.nix index f3e30557ae9b..579f96ce9b0f 100644 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ b/pkgs/by-name/da/dart-sass/package.nix @@ -1,12 +1,13 @@ -{ lib -, fetchFromGitHub -, buildDartApplication -, buf -, protoc-gen-dart -, testers -, dart-sass -, runCommand -, writeText +{ + lib, + fetchFromGitHub, + buildDartApplication, + buf, + protoc-gen-dart, + testers, + dart-sass, + runCommand, + writeText, }: let @@ -21,13 +22,13 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.77.4"; + version = "1.77.6"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-xHOZDeK6xYnfrb6yih6jzRDZLRvyp0EeKZynEq3A4aI="; + hash = "sha256-GiZbx60HtyFTsargh0UVhjzOwlw3VWkhUEaX0s2ehos="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -45,14 +46,6 @@ buildDartApplication rec { dartCompileFlags = [ "--define=version=${version}" ]; - meta = with lib; { - homepage = "https://github.com/sass/dart-sass"; - description = "Reference implementation of Sass, written in Dart"; - mainProgram = "sass"; - license = licenses.mit; - maintainers = with maintainers; [ lelgenio ]; - }; - passthru = { inherit embedded-protocol-version embedded-protocol; updateScript = ./update.sh; @@ -67,21 +60,31 @@ buildDartApplication rec { expected = writeText "expected" '' body h1{color:#123} ''; - actual = runCommand "actual" - { - nativeBuildInputs = [ dart-sass ]; - base = writeText "base" '' - body { - $color: #123; - h1 { - color: $color; + actual = + runCommand "actual" + { + nativeBuildInputs = [ dart-sass ]; + base = writeText "base" '' + body { + $color: #123; + h1 { + color: $color; + } } - } + ''; + } + '' + dart-sass --style=compressed $base > $out ''; - } '' - dart-sass --style=compressed $base > $out - ''; }; }; }; + + meta = { + homepage = "https://github.com/sass/dart-sass"; + description = "Reference implementation of Sass, written in Dart"; + mainProgram = "sass"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lelgenio ]; + }; } diff --git a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json similarity index 98% rename from pkgs/development/tools/misc/dart-sass/pubspec.lock.json rename to pkgs/by-name/da/dart-sass/pubspec.lock.json index da5e7ea435f1..8c3f3c83dce3 100644 --- a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json +++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json @@ -674,31 +674,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "d11b55850c68c1f6c0cf00eabded4e66c4043feaf6c0d7ce4a36785137df6331", + "sha256": "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.5" + "version": "1.25.7" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.7.2" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "4d070a6bc36c1c4e89f20d353bfd71dc30cdf2bd0e14349090af360a029ab292", + "sha256": "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.2" + "version": "0.6.4" }, "test_descriptor": { "dependency": "direct dev", @@ -754,11 +754,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "360c4271613beb44db559547d02f8b0dc044741d0eeb9aa6ccdb47e8ec54c63a", + "sha256": "f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.3" + "version": "14.2.4" }, "watcher": { "dependency": "direct main", diff --git a/pkgs/development/tools/misc/dart-sass/update.sh b/pkgs/by-name/da/dart-sass/update.sh similarity index 100% rename from pkgs/development/tools/misc/dart-sass/update.sh rename to pkgs/by-name/da/dart-sass/update.sh diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index fff4e336b523..b43eb1c3e30d 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "24.1.1"; + version = "24.1.2"; src = let @@ -25,10 +25,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-33W7uDxzfAQ5gH10sI4IbzmHl8SxQLYj88C/BGOoRks="; - aarch64-linux = "sha256-ZAr9vymCdLFAYiXEXtT+97x1tY5mrbr2N6INj4Bp4Nk="; - x86_64-darwin = "sha256-dgOtufARRVmwtXl+csmr2sMBzDvq+5XRotOQrTz8jys="; - aarch64-darwin = "sha256-R5TQJq+sRUFHH8EuaXgeSJUOnhepbCJLTUmO0FMOgzE="; + x86_64-linux = "sha256-TQZl5TEAAEeC+/dK4F7nbyPOU3YuXheLwrFY/8eGtoA="; + aarch64-linux = "sha256-fnIRQsqg6WxD4ptxJT04jvaqDe7jPJ/zVnBL7k9ph38="; + x86_64-darwin = "sha256-gwkCsVdSiWCCd0B3FiSvVnZiPJfWtnAgrAVPZh+nko0="; + aarch64-darwin = "sha256-QXG/5AfEQNFDcQhV+oK117bKZnSZ32P4NB4p+qUKQIM="; }; in fetchurl { diff --git a/pkgs/desktops/gnome/core/dconf-editor/default.nix b/pkgs/by-name/dc/dconf-editor/package.nix similarity index 97% rename from pkgs/desktops/gnome/core/dconf-editor/default.nix rename to pkgs/by-name/dc/dconf-editor/package.nix index 2b1b747a74a2..44fca17bec32 100644 --- a/pkgs/desktops/gnome/core/dconf-editor/default.nix +++ b/pkgs/by-name/dc/dconf-editor/package.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patch b/pkgs/by-name/dc/dconf-editor/schema-override-variable.patch similarity index 100% rename from pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patch rename to pkgs/by-name/dc/dconf-editor/schema-override-variable.patch diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix index c4e968902cba..785c67aba69b 100644 --- a/pkgs/by-name/de/debianutils/package.nix +++ b/pkgs/by-name/de/debianutils/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "debianutils"; - version = "5.19"; + version = "5.20"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debianutils"; rev = "debian/${finalAttrs.version}"; - hash = "sha256-2YJgHwjD1JyqzdYaicrgKHA/a5KdkdPJnhGQxoq/KpU="; + hash = "sha256-SBpB821LPyJhfWqhzQxMI50rTXlShU3ku85oRDla4cw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/decibels/package.nix b/pkgs/by-name/de/decibels/package.nix new file mode 100644 index 000000000000..2921c1897356 --- /dev/null +++ b/pkgs/by-name/de/decibels/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + fetchFromGitLab, + appstream, + blueprint-compiler, + desktop-file-utils, + gjs, + gst_all_1, + libadwaita, + meson, + ninja, + pkg-config, + typescript, + wrapGAppsHook4, + nix-update-script, +}: +stdenv.mkDerivation rec { + pname = "decibels"; + version = "46.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "GNOME"; + owner = "Incubator"; + repo = "decibels"; + rev = version; + hash = "sha256-3LQQcrpmWrTfk8A8GR+KnxJEB1HGozgEsM+j5ECK8kc="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + appstream + blueprint-compiler + desktop-file-utils + meson + ninja + pkg-config + typescript + wrapGAppsHook4 + ]; + + buildInputs = [ + gjs + gst_all_1.gstreamer + gst_all_1.gst-plugins-base # for GstVideo + gst_all_1.gst-plugins-bad # for GstPlay + gst_all_1.gst-plugins-good # for scaletempo + libadwaita + ]; + + # NOTE: this is applied after install to ensure `tsc` doesn't + # mess with us + # + # gjs uses the invocation name to add gresource files + # to get around this, we set the entry point name manually + preFixup = '' + sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'org.gnome.Decibels';" $out/bin/org.gnome.Decibels + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Play audio files"; + homepage = "https://gitlab.gnome.org/GNOME/Incubator/decibels"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "org.gnome.Decibels"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix index 0d079c9ae2d0..6e19cc03a660 100644 --- a/pkgs/by-name/de/decker/package.nix +++ b/pkgs/by-name/de/decker/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "decker"; - version = "1.44"; + version = "1.45"; src = fetchFromGitHub { owner = "JohnEarnest"; repo = "Decker"; rev = "v${version}"; - hash = "sha256-C3CWzrKhZWEud0N2p56U+zhGjwTJ5xCfZsz+NlkdQG4="; + hash = "sha256-AMqe7u/R2ykuRcQcAPyj1oNBSAKHCiTBaJ5VrhE7REg="; }; buildInputs = [ diff --git a/pkgs/by-name/de/dep-tree/package.nix b/pkgs/by-name/de/dep-tree/package.nix new file mode 100644 index 000000000000..27745d340e21 --- /dev/null +++ b/pkgs/by-name/de/dep-tree/package.nix @@ -0,0 +1,66 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + linkFarm, +}: +let + testDeps = { + react-stl-viewer = fetchFromGitHub { + owner = "gabotechs"; + repo = "react-stl-viewer"; + rev = "2.2.4"; + sha256 = "sha256-0u9q0UgOn43PE1Y6BUhl1l6RnVjpPraFqZWB+HhQ0s8="; + }; + react-gcode-viewer = fetchFromGitHub { + owner = "gabotechs"; + repo = "react-gcode-viewer"; + rev = "2.2.4"; + sha256 = "sha256-FHBICLdy0k4j3pPKStg+nkIktMpKS1ADa4m1vYHJ+AQ="; + }; + graphql-js = fetchFromGitHub { + owner = "graphql"; + repo = "graphql-js"; + rev = "v17.0.0-alpha.2"; + sha256 = "sha256-y55SNiMivL7bRsjLEIpsKKyaluI4sXhREpiB6A5jfDU="; + }; + warp = fetchFromGitHub { + owner = "seanmonstar"; + repo = "warp"; + rev = "v0.3.3"; + sha256 = "sha256-76ib8KMjTS2iUOwkQYCsoeL3GwBaA/MRQU2eGjJEpOo="; + }; + }; + pname = "dep-tree"; + version = "0.20.3"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "gabotechs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-w0t6SF0Kqr+XAKPNJpDJGDTm2Tc6J9OzbXtRUNkqp2k="; + }; + + vendorHash = "sha256-ZDADo1takCemPGYySLwPAODUF+mEJXsaxZn4WWmaUR8="; + + preCheck = '' + substituteInPlace internal/tui/tui_test.go \ + --replace-fail /tmp/dep-tree-tests ${linkFarm "dep-tree_testDeps-farm" testDeps} + ''; + + meta = { + description = "Tool for visualizing interconnectedness of codebases in multiple languages"; + longDescription = '' + dep-tree is a tool for interactively visualizing the complexity of a code base. + It helps analyze the interconnectedness of the codebase and create goals to improve maintainability. + ''; + homepage = "https://github.com/gabotechs/dep-tree"; + changelog = "https://github.com/gabotechs/dep-tree/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ birdee ]; + mainProgram = "dep-tree"; + }; +} diff --git a/pkgs/desktops/gnome/devtools/devhelp/default.nix b/pkgs/by-name/de/devhelp/package.nix similarity index 96% rename from pkgs/desktops/gnome/devtools/devhelp/default.nix rename to pkgs/by-name/de/devhelp/package.nix index 4a6577adbe25..97795c1d9f7a 100644 --- a/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/pkgs/by-name/de/devhelp/package.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , gnome +, adwaita-icon-theme , gtk3 , wrapGAppsHook3 , glib @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { glib gtk3 webkitgtk_4_1 - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas ]; @@ -72,7 +73,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "devhelp"; - attrPath = "gnome.devhelp"; }; }; diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index 27e7403c81d0..8a83cf6583cc 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { description = "Photo Management Program"; license = licenses.gpl2; homepage = "https://www.digikam.org"; - maintainers = with maintainers; [ spacefault ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "digikam"; }; diff --git a/pkgs/by-name/di/discordchatexporter-cli/deps.nix b/pkgs/by-name/di/discordchatexporter-cli/deps.nix index db36b866f050..bd03e52a0d0c 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/deps.nix +++ b/pkgs/by-name/di/discordchatexporter-cli/deps.nix @@ -16,6 +16,8 @@ (fetchNuGet { pname = "Spectre.Console"; version = "0.49.1"; sha256 = "0fhl96p3xjd5k1wwvhs80cp35rrlgnza6mw9vy0knhmf7ji9b95n"; }) (fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.3"; sha256 = "0jkl986gnh2a39v5wbab47qyh1g9a64dgh5s67vppcay8hd42c4n"; }) (fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.16.0"; sha256 = "0cbkgrrkam76bhygrjzd4nj4mpzpgbnsddfzwry1933rcvjlqh6m"; }) - (fetchNuGet { pname = "YoutubeExplode"; version = "6.3.14"; sha256 = "12w9zz6y7cdw6p2gvr34r4qcl35hh19zn9fm0risrrcs8577msxs"; }) + (fetchNuGet { pname = "YoutubeExplode"; version = "6.3.16"; sha256 = "1f6d47g1qmmahx6pn2sp0fff7hsmdqwm7z09j47hs6r1yn9a7kyj"; }) ] diff --git a/pkgs/by-name/di/discordchatexporter-cli/package.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix index a1b5574ca9a3..157571269688 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/package.nix +++ b/pkgs/by-name/di/discordchatexporter-cli/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.43.1"; + version = "2.43.3"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - hash = "sha256-MLOWZJehajB002SqBW2HJTjr00eU9RV+Weu3rmgoEew="; + hash = "sha256-r9bvTgqKQY605BoUlysSz4WJMxn2ibNh3EhoMYCfV3c="; }; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix index 9bfd2c5ffc9f..9a1368973db0 100644 --- a/pkgs/by-name/dm/dmd/generic.nix +++ b/pkgs/by-name/dm/dmd/generic.nix @@ -208,9 +208,14 @@ stdenv.mkDerivation (finalAttrs: { disallowedReferences = [ dmdBootstrap ]; + passthru = { + inherit dmdBootstrap; + }; + meta = with lib; { description = "Official reference compiler for the D language"; homepage = "https://dlang.org/"; + changelog = "https://dlang.org/changelog/${finalAttrs.version}.html"; # Everything is now Boost licensed, even the backend. # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; diff --git a/pkgs/by-name/dm/dmd/package.nix b/pkgs/by-name/dm/dmd/package.nix index 9f3f5a26e7e5..b5268b7db8e6 100644 --- a/pkgs/by-name/dm/dmd/package.nix +++ b/pkgs/by-name/dm/dmd/package.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "2.108.0"; - dmdHash = "sha256-tlWcFgKtXzfqMMkOq4ezhZHdYCXFckjN5+m6jO4VH0U="; - phobosHash = "sha256-uU8S4rABOfhpKh+MvSbclkbdf0hrsuKF8SIpWMnPpfU="; + version = "2.109.1"; + dmdHash = "sha256-3nCDPZnb4eQZmhYYxcH6qOmsP8or0KYuzAa5g/C9xdU="; + phobosHash = "sha256-73I0k7tCBwe5tl4K6uMs3/nT2JTZ2SppFYzmokS4W5Y="; } diff --git a/pkgs/by-name/do/doggo/package.nix b/pkgs/by-name/do/doggo/package.nix index 2fe817010bf3..cf8c3ae36228 100644 --- a/pkgs/by-name/do/doggo/package.nix +++ b/pkgs/by-name/do/doggo/package.nix @@ -1,35 +1,39 @@ { buildGoModule , fetchFromGitHub , installShellFiles +, nix-update-script , lib }: buildGoModule rec { pname = "doggo"; - version = "0.5.7"; + version = "1.0.4"; src = fetchFromGitHub { owner = "mr-karan"; - repo = pname; + repo = "doggo"; rev = "v${version}"; - hash = "sha256-hzl7BE3vsE2G9O2nwN/gkqQTJ+9aDfNIjmpmgN1AYq8="; + hash = "sha256-SD/BcJxoc5Oi8+nAs+CWBEcbgtaohykNlZ14jJvEWew="; }; - vendorHash = "sha256-uonybBLABPj9CPtc+y82ajvQI7kubK+lKi4eLcZIUqA="; + vendorHash = "sha256-JIc6/G1hMf8+oIe4OMc+b0th5MCgi5Mwp3AxW4OD1lg="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/doggo" ]; ldflags = [ - "-w -s" + "-s" "-X main.buildVersion=v${version}" ]; postInstall = '' installShellCompletion --cmd doggo \ - --fish --name doggo.fish completions/doggo.fish \ - --zsh --name _doggo completions/doggo.zsh + --bash <($out/bin/doggo completions bash) \ + --fish <($out/bin/doggo completions fish) \ + --zsh <($out/bin/doggo completions zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/mr-karan/doggo"; description = "Command-line DNS Client for Humans. Written in Golang"; diff --git a/pkgs/by-name/do/donpapi/package.nix b/pkgs/by-name/do/donpapi/package.nix index 1271d67d398f..c2a777b3dc43 100644 --- a/pkgs/by-name/do/donpapi/package.nix +++ b/pkgs/by-name/do/donpapi/package.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix index b8fae74dd85e..ea549fff7196 100644 --- a/pkgs/by-name/do/dooit/package.nix +++ b/pkgs/by-name/do/dooit/package.nix @@ -20,7 +20,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix new file mode 100644 index 000000000000..37f61c723d63 --- /dev/null +++ b/pkgs/by-name/do/dopamine/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchurl, + appimageTools, + nix-update-script, +}: +appimageTools.wrapType2 rec { + pname = "dopamine"; + version = "3.0.0-preview.26"; + + src = fetchurl { + url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage"; + hash = "sha256-wINHglhP4t5wNyHzIircW4Z5qC21ZbHBQD2AVp33/KQ="; + }; + + extraInstallCommands = + let + contents = appimageTools.extract { inherit pname version src; }; + in + '' + install -Dm644 ${contents}/dopamine.desktop $out/share/applications/dopamine.desktop + substituteInPlace $out/share/applications/dopamine.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=dopamine' + cp -r ${contents}/usr/share/icons $out/share + ''; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; }; + + meta = { + changelog = "https://github.com/digimezzo/dopamine/blob/${version}/CHANGELOG.md"; + description = "Audio player that keeps it simple"; + homepage = "https://github.com/digimezzo/dopamine"; + license = lib.licenses.gpl3Only; + mainProgram = "dopamine"; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index f31256ad8581..bff13f92f422 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "dorion"; - version = "4.3.0"; + version = "5.0.1"; src = fetchurl { url = "https://github.com/SpikeHD/Dorion/releases/download/v${finalAttrs.version }/Dorion_${finalAttrs.version}_amd64.deb"; - hash = "sha256-bVanhJqHQxe3imP07EsRuDu0Isj9rf4VoIjmoAPfaQk="; + hash = "sha256-cCZikTZ+IU3mq/FkJfeggXLyWIsWG+a2qu1GbgW93WQ="; }; unpackCmd = '' diff --git a/pkgs/by-name/dp/dps8m/package.nix b/pkgs/by-name/dp/dps8m/package.nix index 939bb17c8506..a31c95eb4165 100644 --- a/pkgs/by-name/dp/dps8m/package.nix +++ b/pkgs/by-name/dp/dps8m/package.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "DPS8M: GE / Honeywell / Bull DPS‑8/M mainframe simulator"; homepage = "https://gitlab.com/dps8m/dps8m"; + changelog = "https://gitlab.com/dps8m/dps8m/-/wikis/DPS8M-${src.rev}-Release-Notes"; license = licenses.icu; maintainers = with maintainers; [ matthewcroughan sarcasticadmin ]; mainProgram = "dps8m"; diff --git a/pkgs/by-name/ds/dssat/package.nix b/pkgs/by-name/ds/dssat/package.nix new file mode 100644 index 000000000000..95653e2ebb7c --- /dev/null +++ b/pkgs/by-name/ds/dssat/package.nix @@ -0,0 +1,74 @@ +{ + stdenv, + lib, + cmake, + glibc, + gfortran, + makeWrapper, + fetchFromGitHub, + fetchpatch, + dos2unix, + dataRepo ? fetchFromGitHub { + owner = "DSSAT"; + repo = "dssat-csm-data"; + rev = "v4.8.2.8"; + hash = "sha256-hbSBKEvdSd1lfbemfp4Lk4/JcGMXGVjm1x7P7lmmuA0="; + }, +}: +let + # Temporary patch to fix 80 chars limit on paths + # https://github.com/DSSAT/dssat-csm-os/pull/417/ + charLimitPatch = fetchpatch { + url = "https://github.com/DSSAT/dssat-csm-os/pull/417/commits/9215012a297c074f392b5e7eb90b8c20495f13f7.patch"; + hash = "sha256-WwJR5lnWtR3aYWZmk8pBC0/qaRqY0UrWHIaYp2ajImE="; + }; +in +stdenv.mkDerivation (final: { + pname = "dssat"; + version = "4.8.2.12"; + + src = fetchFromGitHub { + owner = "DSSAT"; + repo = "dssat-csm-os"; + rev = "refs/tags/v${final.version}"; + sha256 = "sha256-8OaTM7IXFZjlelx5O4O+bVNQj4dIhGzIk2iCfpqI8uA="; + }; + + # maintainers are on windows and have CRLF endings in their files + # And github returns a patch file in unix format only. + patchPhase = '' + runHook prePatch + cp ${charLimitPatch} ./limit-path.patch + unix2dos ./limit-path.patch + patch --binary -p1 < ./limit-path.patch + runHook postPatch + ''; + + nativeBuildInputs = [ + cmake + dos2unix + gfortran + makeWrapper + ]; + + buildInputs = lib.optionals stdenv.isLinux [ glibc.static ]; + + cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/share/dssat/" ]; + + postInstall = '' + mkdir -p $out/share/dssat/Data + cp -r $src/Data/* $out/share/dssat/Data/ + cp -r ${dataRepo}/* $out/share/dssat/Data/ + makeWrapper $out/share/dssat/dscsm048 $out/bin/dscsm048 + ''; + + meta = { + homepage = "https://github.com/DSSAT/dssat-csm-os"; + description = "Cropping System Model"; + mainProgram = "dscsm048"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ pcboy ]; + platforms = lib.platforms.unix; + broken = stdenv.isAarch64 && stdenv.isLinux; + }; +}) diff --git a/pkgs/by-name/dt/dtools/package.nix b/pkgs/by-name/dt/dtools/package.nix index 8db3a14cf617..9d5812ec9fd2 100644 --- a/pkgs/by-name/dt/dtools/package.nix +++ b/pkgs/by-name/dt/dtools/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtools"; - version = "2.109.0"; + version = "2.109.1"; src = fetchFromGitHub { owner = "dlang"; repo = "tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-C4hSs4zsFC8hWkhmDmNzVfK7Ctfnd1IQUphibUPiVzE="; + hash = "sha256-Pfj8Kwf5AlcrHhLs5A/0vIFWLZaNR3ro+esbs7oWN9I="; name = "dtools"; }; diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index 897f5cfc5b79..599abeaa122a 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "dumbpipe"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-Pv7GySqKD3G1eryq6YwVL159XuuWB8DmQ0d1fPuFcmc="; + hash = "sha256-T/EFy89CZyBthfxGlCJtovDmcR1ntYFkgAOA/sg3GWs="; }; - cargoHash = "sha256-MKJCpSdf9MzpBmgWImYO5+uSVN9uTLaLl4khizVGoig="; + cargoHash = "sha256-nF8govoQILX6ft5iJWHAMQA/UgeNrkdUNulO+sX2jXo="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/by-name/ea/ear2ctl/package.nix b/pkgs/by-name/ea/ear2ctl/package.nix new file mode 100644 index 000000000000..4d4e038f85f0 --- /dev/null +++ b/pkgs/by-name/ea/ear2ctl/package.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitLab, pkg-config, dbus }: + +rustPlatform.buildRustPackage rec { + pname = "ear2ctl"; + version = "0.1.0"; + + src = fetchFromGitLab { + owner = "bharadwaj-raju"; + repo = "ear2ctl"; + rev = version; + hash = "sha256-xaxl4opLMw9KEDpmNcgR1fBGUqO4BP5a/U52Kz+GAvc="; + }; + + cargoHash = "sha256-ax+/lvdEOjLnwE3Gvji7aaeF9KXjoOXdlTvxYDo8wGI="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ dbus ]; + + meta = { + description = "Linux controller for the Nothing Ear (2)"; + homepage = "https://gitlab.com/bharadwaj-raju/ear2ctl"; + maintainers = with lib.maintainers; [ jaredmontoya ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + mainProgram = "ear2ctl"; + }; +} diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/by-name/ed/edk2/package.nix similarity index 84% rename from pkgs/development/compilers/edk2/default.nix rename to pkgs/by-name/ed/edk2/package.nix index cd15f29e370c..56b6aac253f5 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -1,13 +1,13 @@ { stdenv -, clangStdenv , fetchFromGitHub , fetchpatch -, runCommand , libuuid -, python3 , bc , lib , buildPackages +, nixosTests +, runCommand +, writeScript }: let @@ -103,11 +103,29 @@ edk2 = stdenv.mkDerivation rec { meta = with lib; { description = "Intel EFI development kit"; homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/"; + changelog = "https://github.com/tianocore/edk2/releases/tag/edk2-stable${edk2.version}"; license = licenses.bsd2; platforms = with platforms; aarch64 ++ arm ++ i686 ++ x86_64 ++ riscv64; }; passthru = { + # exercise a channel blocker + tests.uefiUsb = nixosTests.boot.uefiCdrom; + + updateScript = writeScript "update-edk2" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts coreutils gnused + set -eu -o pipefail + version="$(list-git-tags --url="${edk2.srcWithVendoring.url}" | + sed -E --quiet 's/^edk2-stable([0-9]{6})$/\1/p' | + sort --reverse --numeric-sort | + head -n 1)" + if [[ "x$UPDATE_NIX_OLD_VERSION" != "x$version" ]]; then + update-source-version --source-key=srcWithVendoring \ + "$UPDATE_NIX_ATTR_PATH" "$version" + fi + ''; + mkDerivation = projectDscPath: attrsOrFun: stdenv.mkDerivation (finalAttrs: let attrs = lib.toFunction attrsOrFun finalAttrs; diff --git a/pkgs/by-name/ei/eintopf/frontend.nix b/pkgs/by-name/ei/eintopf/frontend.nix new file mode 100644 index 000000000000..0a7bdd15dee9 --- /dev/null +++ b/pkgs/by-name/ei/eintopf/frontend.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchYarnDeps +, fixup-yarn-lock +, yarn +, fetchFromGitea +, src +, version +, nodejs +, eintopf +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "eintopf"; + inherit version src; + + sourceRoot = "${finalAttrs.src.name}/backstage"; + + offlineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-Z/Pkk/qCWwr99g11DjEgnisPfxOhfD8+OCn6otxJtfI="; + }; + + nativeBuildInputs = [ + fixup-yarn-lock + nodejs + yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror $offlineCache + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p "$out" + cp -r . $out/ + + runHook postInstall + ''; + + meta = { + inherit (eintopf.meta) homepage description license maintainers; + }; +}) diff --git a/pkgs/by-name/ei/eintopf/package.nix b/pkgs/by-name/ei/eintopf/package.nix new file mode 100644 index 000000000000..7a2a08c453f0 --- /dev/null +++ b/pkgs/by-name/ei/eintopf/package.nix @@ -0,0 +1,57 @@ +{ lib +, buildGoModule +, fetchFromGitea +, callPackage +, nixosTests +}: + +let + version = "0.13.16"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "Klasse-Methode"; + repo = "eintopf"; + rev = "v${version}"; + hash = "sha256-ex5bpO60ousJcgZGdviqWrCyihycW+JT+EYFvdooUDw="; + }; + frontend = callPackage ./frontend.nix { inherit src version; }; +in + +buildGoModule rec { + pname = "eintopf"; + inherit version src; + + vendorHash = "sha256-dBxI6cUGc16lg89x8b+hSLcv5y/MLf6vDIvqdMBUz3I="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.revision=${src.rev}" + ]; + + preConfigure = '' + cp -R ${frontend}/. backstage/ + ''; + + preCheck = '' + # Disable test, requires running Docker daemon + rm cmd/eintopf/main_test.go + rm service/email/email_test.go + ''; + + passthru.tests = { + inherit (nixosTests) eintopf; + }; + + meta = with lib; { + description = "A calendar for Stuttgart, showing events, groups and places"; + homepage = "https://codeberg.org/Klasse-Methode/eintopf"; + # License is going to change back to AGPL in the next release + # https://codeberg.org/Klasse-Methode/eintopf/issues/351#issuecomment-2076870 + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 726de6c84069..9f040972eb3e 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.183.0"; + version = "0.184.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-u2k5Icrqy71HNif/hOElsJoRsLk7CL3uE197ehWenhE="; + hash = "sha256-+PXD5QA18PCSxKMPub13dsIzfE6sKNjlBREvzRH6lE0="; }; - vendorHash = "sha256-eaEAC1jDmApcyn0RC5pvonYVWblRCB2PFTr/K5rZvtU="; + vendorHash = "sha256-aOLZQKhBy5uBmOhJPfk3ZDHp/YbZw9oN4DaAu1NFcvA="; doCheck = false; @@ -42,6 +42,7 @@ buildGoModule rec { meta = with lib; { description = "CLI for Amazon EKS"; homepage = "https://github.com/weaveworks/eksctl"; + changelog = "https://github.com/eksctl-io/eksctl/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ xrelkd Chili-Man ]; mainProgram = "eksctl"; diff --git a/pkgs/by-name/em/ember-cli/package.json b/pkgs/by-name/em/ember-cli/package.json new file mode 100644 index 000000000000..48cd3aa8543b --- /dev/null +++ b/pkgs/by-name/em/ember-cli/package.json @@ -0,0 +1,182 @@ +{ + "name": "ember-cli", + "version": "5.3.0", + "description": "Command line tool for developing ambitious ember.js apps", + "keywords": [ + "app", + "app-kit", + "blockchain", + "cli", + "ember", + "ember-app-kit", + "ember.js", + "kit" + ], + "homepage": "https://cli.emberjs.com/release/", + "bugs": { + "url": "https://github.com/ember-cli/ember-cli/issues" + }, + "repository": { + "type": "git", + "url": "https://github.com/ember-cli/ember-cli.git" + }, + "license": "MIT", + "author": "Stefan Penner, Robert Jackson and ember-cli contributors", + "main": "lib/cli/index.js", + "bin": { + "ember": "./bin/ember" + }, + "scripts": { + "docs": "yuidoc", + "lint": "eslint . --cache", + "prepack": "yarn docs", + "test": "node --unhandled-rejections=strict tests/runner", + "test:all": "node --unhandled-rejections=strict tests/runner all", + "test:cover": "nyc --all --reporter=text --reporter=lcov node tests/runner all", + "test:debug": "node --unhandled-rejections=strict debug tests/runner", + "test:slow": "node --unhandled-rejections=strict tests/runner slow" + }, + "dependencies": { + "@babel/core": "^7.22.10", + "@pnpm/find-workspace-dir": "^6.0.2", + "broccoli": "^3.5.2", + "broccoli-builder": "^0.18.14", + "broccoli-concat": "^4.2.5", + "broccoli-config-loader": "^1.0.1", + "broccoli-config-replace": "^1.1.2", + "broccoli-debug": "^0.6.5", + "broccoli-funnel": "^3.0.8", + "broccoli-funnel-reducer": "^1.0.0", + "broccoli-merge-trees": "^4.2.0", + "broccoli-middleware": "^2.1.1", + "broccoli-slow-trees": "^3.1.0", + "broccoli-source": "^3.0.1", + "broccoli-stew": "^3.0.0", + "calculate-cache-key-for-tree": "^2.0.0", + "capture-exit": "^2.0.0", + "chalk": "^4.1.2", + "ci-info": "^3.8.0", + "clean-base-url": "^1.0.0", + "compression": "^1.7.4", + "configstore": "^5.0.1", + "console-ui": "^3.1.2", + "core-object": "^3.1.5", + "dag-map": "^2.0.2", + "diff": "^5.1.0", + "ember-cli-is-package-missing": "^1.0.0", + "ember-cli-lodash-subset": "^2.0.1", + "ember-cli-normalize-entity-name": "^1.0.0", + "ember-cli-preprocess-registry": "^5.0.1", + "ember-cli-string-utils": "^1.1.0", + "ensure-posix-path": "^1.1.1", + "execa": "^5.1.1", + "exit": "^0.1.2", + "express": "^4.18.1", + "filesize": "^10.0.8", + "find-up": "^5.0.0", + "find-yarn-workspace-root": "^2.0.0", + "fixturify-project": "^2.1.1", + "fs-extra": "^11.1.1", + "fs-tree-diff": "^2.0.1", + "get-caller-file": "^2.0.5", + "git-repo-info": "^2.1.1", + "glob": "^8.1.0", + "heimdalljs": "^0.2.6", + "heimdalljs-fs-monitor": "^1.1.1", + "heimdalljs-graph": "^1.0.0", + "heimdalljs-logger": "^0.1.10", + "http-proxy": "^1.18.1", + "inflection": "^2.0.1", + "inquirer": "^9.1.5", + "is-git-url": "^1.0.0", + "is-language-code": "^3.1.0", + "isbinaryfile": "^5.0.0", + "leek": "0.0.24", + "lodash.template": "^4.5.0", + "markdown-it": "^13.0.1", + "markdown-it-terminal": "^0.4.0", + "minimatch": "^7.4.3", + "morgan": "^1.10.0", + "nopt": "^3.0.6", + "npm-package-arg": "^10.1.0", + "os-locale": "^5.0.0", + "p-defer": "^3.0.0", + "portfinder": "^1.0.32", + "promise-map-series": "^0.3.0", + "promise.hash.helper": "^1.0.8", + "quick-temp": "^0.1.8", + "remove-types": "^1.0.0", + "resolve": "^1.22.1", + "resolve-package-path": "^4.0.3", + "safe-stable-stringify": "^2.4.3", + "sane": "^5.0.1", + "semver": "^7.3.5", + "silent-error": "^1.1.1", + "sort-package-json": "^1.57.0", + "symlink-or-copy": "^1.3.1", + "temp": "0.9.4", + "testem": "^3.10.1", + "tiny-lr": "^2.0.0", + "tree-sync": "^2.1.0", + "uuid": "^9.0.0", + "walk-sync": "^3.0.0", + "watch-detector": "^1.0.2", + "workerpool": "^6.4.0", + "yam": "^1.0.0" + }, + "devDependencies": { + "@octokit/rest": "^19.0.7", + "broccoli-plugin": "^4.0.3", + "broccoli-test-helper": "^2.0.0", + "chai": "^4.3.7", + "chai-as-promised": "^7.1.1", + "chai-files": "^1.4.0", + "chai-jest-snapshot": "^2.0.0", + "ember-cli-blueprint-test-helpers": "^0.19.2", + "ember-cli-internal-test-helpers": "^0.9.1", + "eslint": "^8.44.0", + "eslint-config-prettier": "^8.9.0", + "eslint-plugin-chai-expect": "^3.0.0", + "eslint-plugin-mocha": "^10.1.0", + "eslint-plugin-n": "^16.0.1", + "eslint-plugin-prettier": "^4.2.1", + "fixturify": "^3.0.0", + "jsdom": "^21.1.1", + "latest-version": "^5.1.0", + "mocha": "^10.0.0", + "nock": "^13.3.0", + "nyc": "^15.1.0", + "prettier": "2.8.7", + "release-it": "^15.10.0", + "rimraf": "^3.0.2", + "strip-ansi": "^6.0.0", + "supertest": "^6.3.1", + "testdouble": "^3.18.0", + "tmp": "^0.2.1", + "websocket": "^1.0.32", + "which": "3.0.1", + "yuidoc-ember-cli-theme": "^1.0.4", + "yuidocjs": "0.10.2" + }, + "engines": { + "node": ">= 16" + }, + "publishConfig": { + "registry": "https://registry.npmjs.org" + }, + "release-it": { + "git": { + "tagName": "v${version}" + }, + "github": { + "draft": true, + "release": true, + "tokenRef": "GITHUB_AUTH" + } + }, + "trackingCode": "UA-49225444-1", + "volta": { + "node": "16.19.1", + "yarn": "1.22.19" + } +} diff --git a/pkgs/by-name/em/ember-cli/package.nix b/pkgs/by-name/em/ember-cli/package.nix new file mode 100644 index 000000000000..86f627be950e --- /dev/null +++ b/pkgs/by-name/em/ember-cli/package.nix @@ -0,0 +1,35 @@ +{ lib +, mkYarnPackage +, fetchFromGitHub +, fetchYarnDeps +}: + +let + pname = "ember-cli"; + version = "5.3.0"; + src = fetchFromGitHub { + owner = "ember-cli"; + repo = "ember-cli"; + rev = "v${version}"; + hash = "sha256-xkMsPE+iweIV14m4kE4ytEp4uHMJW6gr+n9oJblr4VQ="; + }; +in +mkYarnPackage { + inherit pname version src; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-QgT2JFvMupJo+pJc13n2lmHMZkROJRJWoozCho3E6+c="; + }; + + packageJSON = ./package.json; + + meta = with lib; { + homepage = "https://github.com/ember-cli/ember-cli"; + description = "The Ember.js command line utility"; + license = licenses.mit; + maintainers = with maintainers; [ jfvillablanca ]; + platforms = platforms.all; + mainProgram = "ember"; + }; +} diff --git a/pkgs/by-name/en/envision-unwrapped/Cargo.lock b/pkgs/by-name/en/envision-unwrapped/Cargo.lock new file mode 100644 index 000000000000..38d9964de6ff --- /dev/null +++ b/pkgs/by-name/en/envision-unwrapped/Cargo.lock @@ -0,0 +1,2530 @@ +# 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 = "aho-corasick" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[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.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.4.0", + "cexpr", + "clang-sys", + "itertools", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cairo-rs" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" +dependencies = [ + "bitflags 2.4.0", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-expr" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[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.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "dlopen2" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6" +dependencies = [ + "dlopen2_derive", + "libc", + "once_cell", + "winapi", +] + +[[package]] +name = "dlopen2_derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[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 = "envision" +version = "0.1.0" +dependencies = [ + "anyhow", + "gettext-rs", + "git2", + "gtk4", + "lazy_static", + "libadwaita", + "libmonado-rs", + "nix", + "phf", + "phf_macros", + "relm4", + "relm4-components", + "reqwest", + "rusb", + "serde", + "serde_json", + "tracker", + "uuid", + "vte4", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "flagset" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779" + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" + +[[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", +] + +[[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-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 = "gdk-pixbuf" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk4-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk4-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gettext-rs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "gio" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "windows-sys 0.52.0", +] + +[[package]] +name = "git2" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" +dependencies = [ + "bitflags 2.4.0", + "libc", + "libgit2-sys", + "log", + "openssl-probe", + "openssl-sys", + "url", +] + +[[package]] +name = "glib" +version = "0.19.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e52355166df21c7ed16b6a01f615669c7911ed74e27ef60eba339c0d2da12490" +dependencies = [ + "bitflags 2.4.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.19.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70025dbfa1275cf7d0531c3317ba6270dae15d87e63342229d638246ff45202e" +dependencies = [ + "heck 0.5.0", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glib-sys" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gobject-sys" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "graphene-rs" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" +dependencies = [ + "glib", + "graphene-sys", + "libc", +] + +[[package]] +name = "graphene-sys" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d" +dependencies = [ + "glib-sys", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gsk4" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" +dependencies = [ + "cairo-rs", + "gdk4", + "glib", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gsk4-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk4" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" +dependencies = [ + "cairo-rs", + "field-offset", + "futures-channel", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gtk4-macros" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "gtk4-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "gsk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + +[[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 = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "hyper" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "io-lifetimes" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" + +[[package]] +name = "ipnet" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libadwaita" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" +dependencies = [ + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libadwaita-sys", + "libc", + "pango", +] + +[[package]] +name = "libadwaita-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" +dependencies = [ + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libgit2-sys" +version = "0.16.2+1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +dependencies = [ + "cc", + "libc", + "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libmonado-rs" +version = "0.1.0" +source = "git+https://github.com/technobaboo/libmonado-rs?rev=e32e78c79ce9ec4a5a5de9eff30661c6c4307347#e32e78c79ce9ec4a5a5de9eff30661c6c4307347" +dependencies = [ + "bindgen", + "cmake", + "convert_case", + "dlopen2", + "flagset", + "semver", +] + +[[package]] +name = "libssh2-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libusb1-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da050ade7ac4ff1ba5379af847a10a10a8e284181e060105bf8d86960ce9ce0f" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.4.0", + "cfg-if", + "cfg_aliases", + "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 = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl" +version = "0.10.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +dependencies = [ + "bitflags 2.4.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "pango" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" +dependencies = [ + "gio", + "glib", + "libc", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[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_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn", +] + +[[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" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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 = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "prettyplease" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +dependencies = [ + "proc-macro2", + "syn", +] + +[[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.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +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 = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "relm4" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e0e187b58db367305e8486d3228158251da1c8ba1e18baa9de61894e822649" +dependencies = [ + "flume", + "fragile", + "futures", + "gtk4", + "libadwaita", + "once_cell", + "relm4-macros", + "tokio", + "tracing", +] + +[[package]] +name = "relm4-components" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffcb6431605810fca4430b3da5d496fcf67d39f32db6a2799bcaac27469154b9" +dependencies = [ + "once_cell", + "relm4", + "tracker", +] + +[[package]] +name = "relm4-macros" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0774e846889823aa5766f5b62cface3189a5b36280e65b2faaa6df0319da1726" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rusb" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4" +dependencies = [ + "libc", + "libusb1-sys", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" + +[[package]] +name = "serde" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +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 = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "syn" +version = "2.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +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 = "system-deps" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +dependencies = [ + "cfg-expr", + "heck 0.4.1", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" + +[[package]] +name = "temp-dir" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" + +[[package]] +name = "tempfile" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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", + "pin-project-lite", + "socket2", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[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 = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[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", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tracker" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff9636d15e370187f6bf55b79ce62ebf4221998bc0ba1774d7fa208b007f6bf8" +dependencies = [ + "tracker-macros", +] + +[[package]] +name = "tracker-macros" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca029746fbe0efda3298205de77bf759d7fef23ac97902641e0b49a623b0455f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[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.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "uuid" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +dependencies = [ + "getrandom", + "rand", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "vte4" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "666a15c7ac6316a3c1bf8c5bc30d687e7405a8cba120c50569a7adeeabbbd1c6" +dependencies = [ + "cairo-rs", + "gdk4", + "gio", + "glib", + "gtk4", + "io-lifetimes", + "libc", + "pango", + "vte4-sys", +] + +[[package]] +name = "vte4-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d893a06a0907d5b843f34400ff0a7990332011e53faa7435635f0b12aacc3f88" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[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.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[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-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.5", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix new file mode 100644 index 000000000000..1f57987aa3bc --- /dev/null +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -0,0 +1,100 @@ +{ + lib, + stdenv, + fetchFromGitLab, + writeScript, + appstream-glib, + cargo, + meson, + ninja, + pkg-config, + rustPlatform, + rustc, + wrapGAppsHook4, + cairo, + desktop-file-utils, + gdb, + gdk-pixbuf, + glib, + gtk4, + gtksourceview5, + libadwaita, + libgit2, + libusb1, + openssl, + pango, + vte-gtk4, + zlib, + unstableGitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "envision-unwrapped"; + version = "0-unstable-2024-06-25"; + + src = fetchFromGitLab { + owner = "gabmus"; + repo = "envision"; + rev = "b594f75778961c281daca398011914e9ac14b753"; + hash = "sha256-felt9KdgVrXSgoufw/+gDlluqdv8vySDqwskQ0t2JOM="; + }; + + strictDeps = true; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "libmonado-rs-0.1.0" = "sha256-PsNgfpgso3HhIMXKky/u6Xw8phk1isRpNXKLhvN1wIE="; + }; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + cargo + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook4 + ]; + + buildInputs = [ + cairo + gdk-pixbuf + glib + gtk4 + gtksourceview5 + libadwaita + libgit2 + libusb1 + openssl + pango + vte-gtk4 + zlib + ]; + + postInstall = '' + wrapProgram $out/bin/envision \ + --prefix PATH : "${lib.makeBinPath [ gdb ]}" + ''; + + passthru.updateScript = writeScript "envision-update" '' + source ${builtins.head (unstableGitUpdater { })} + + cp $tmpdir/Cargo.lock ./pkgs/by-name/en/envision-unwrapped/Cargo.lock + ''; + + meta = { + description = "UI for building, configuring and running Monado, the open source OpenXR runtime"; + homepage = "https://gitlab.com/gabmus/envision"; + license = lib.licenses.agpl3Only; + mainProgram = "envision"; + maintainers = with lib.maintainers; [ + pandapip1 + Scrumplex + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix new file mode 100644 index 000000000000..1136b959d794 --- /dev/null +++ b/pkgs/by-name/en/envision/package.nix @@ -0,0 +1,93 @@ +{ buildFHSEnv, envision-unwrapped }: + +buildFHSEnv { + name = "envision"; + + extraOutputsToInstall = [ "dev" ]; + + strictDeps = true; + + targetPkgs = + pkgs: + [ pkgs.envision-unwrapped ] + ++ (with pkgs; [ + glibc + gcc + ]) + ++ ( + # OpenHMD dependencies + pkgs.openhmd.buildInputs ++ pkgs.openhmd.nativeBuildInputs + ) + ++ ( + # OpenComposite dependencies + pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs ++ [ pkgs.boost ] + ) + ++ ( + # Monado dependencies + ( + pkgs.monado.buildInputs + ++ pkgs.monado.nativeBuildInputs + ++ (with pkgs; [ + # Additional dependencies required by Monado when built using Envision + mesa + shaderc + xorg.libX11 + xorg.libxcb + xorg.libXrandr + xorg.libXrender + xorg.xorgproto + ]) + ) + ) + ++ ( + # SteamVR driver dependencies + [ pkgs.zlib ]) + ++ ( + # WiVRn dependencies + # TODO: Replace with https://github.com/NixOS/nixpkgs/pull/316975 once merged + (with pkgs; [ + avahi + cmake + cli11 + ffmpeg + git + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libmd + libdrm + libpulseaudio + libva + ninja + nlohmann_json + openxr-loader + pipewire + systemdLibs # udev + vulkan-loader + vulkan-headers + x264 + ]) + ++ (with pkgs; [ + android-tools # For adb installing WiVRn APKs + ]) + ); + + profile = '' + export CMAKE_LIBRARY_PATH=/usr/lib + export CMAKE_INCLUDE_PATH=/usr/include + export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig + ''; + + extraInstallCommands = '' + mkdir -p $out/share/applications $out/share/metainfo + ln -s ${envision-unwrapped}/share/envision $out/share + ln -s ${envision-unwrapped}/share/icons $out/share + ln -s ${envision-unwrapped}/share/applications/org.gabmus.envision.desktop $out/share/applications + ln -s ${envision-unwrapped}/share/metainfo/org.gabmus.envision.appdata.xml $out/share/metainfo + ''; + + runScript = "envision"; + + meta = envision-unwrapped.meta // { + description = "${envision-unwrapped.meta.description} (with build environment)"; + }; +} diff --git a/pkgs/desktops/gnome/core/eog/fix-gir-lib-path.patch b/pkgs/by-name/eo/eog/fix-gir-lib-path.patch similarity index 100% rename from pkgs/desktops/gnome/core/eog/fix-gir-lib-path.patch rename to pkgs/by-name/eo/eog/fix-gir-lib-path.patch diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/by-name/eo/eog/package.nix similarity index 98% rename from pkgs/desktops/gnome/core/eog/default.nix rename to pkgs/by-name/eo/eog/package.nix index b59eb108c014..ec1e7f61ee51 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/by-name/eo/eog/package.nix @@ -112,7 +112,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/by-name/ep/epiphany/package.nix similarity index 95% rename from pkgs/desktops/gnome/core/epiphany/default.nix rename to pkgs/by-name/ep/epiphany/package.nix index c4edd298aff7..7485d3dd62ee 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/by-name/ep/epiphany/package.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "epiphany"; - version = "46.1"; + version = "46.2"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz"; - hash = "sha256-Jg+BRp7WR0bCsRQ/Lzi+3NloR3hlZ7CX2fcv072dsUI="; + hash = "sha256-+5Mtp6JOh/HtuQC1uUJRtCs3CAdThkZRwFncbJPLUEk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ev/evil-helix/package.nix b/pkgs/by-name/ev/evil-helix/package.nix new file mode 100644 index 000000000000..c03d58f192c1 --- /dev/null +++ b/pkgs/by-name/ev/evil-helix/package.nix @@ -0,0 +1,48 @@ +{ lib +, fetchFromGitHub +, helix +, installShellFiles +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "evil-helix"; + version = "20240618"; + + src = fetchFromGitHub { + owner = "usagi-flow"; + repo = "evil-helix"; + rev = "release-${version}"; + hash = "sha256-lzae2ypoTyHDpAkL3L7t8FhZ1XXSSkD5958dBEcsTOc="; + }; + + cargoHash = "sha256-803maQB+QYuLlZnvDGfE4jRjLnwkufPcfU7Lq9SX9uM="; + + nativeBuildInputs = [ installShellFiles ]; + + env = { + # disable fetching and building of tree-sitter grammars in the helix-term build.rs + HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1"; + HELIX_DEFAULT_RUNTIME = "${placeholder "out"}/lib/runtime"; + }; + + postInstall = '' + mkdir -p $out/lib + cp -r runtime $out/lib + # copy tree-sitter grammars from helix package + # TODO: build it from source instead + cp -r ${helix}/lib/runtime/grammars/* $out/lib/runtime/grammars/ + installShellCompletion contrib/completion/hx.{bash,fish,zsh} + mkdir -p $out/share/{applications,icons/hicolor/256x256/apps} + cp contrib/Helix.desktop $out/share/applications + cp contrib/helix.png $out/share/icons/hicolor/256x256/apps + ''; + + meta = { + description = "Post-modern modal text editor, with vim keybindings"; + homepage = "https://github.com/usagi-flow/evil-helix"; + license = lib.licenses.mpl20; + mainProgram = "hx"; + maintainers = with lib.maintainers; [ thiagokokada ]; + }; +} diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/by-name/ev/evince/package.nix similarity index 100% rename from pkgs/desktops/gnome/core/evince/default.nix rename to pkgs/by-name/ev/evince/package.nix diff --git a/pkgs/desktops/gnome/core/evolution-data-server/drop-tentative-settings-constructor.patch b/pkgs/by-name/ev/evolution-data-server/drop-tentative-settings-constructor.patch similarity index 100% rename from pkgs/desktops/gnome/core/evolution-data-server/drop-tentative-settings-constructor.patch rename to pkgs/by-name/ev/evolution-data-server/drop-tentative-settings-constructor.patch diff --git a/pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch b/pkgs/by-name/ev/evolution-data-server/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch rename to pkgs/by-name/ev/evolution-data-server/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch similarity index 99% rename from pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch rename to pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch index 140e124fe4bb..dad575c05bbf 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch @@ -481,7 +481,7 @@ index 734f194..5b05077 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-yahoo.c b/src/libedataserver/e-oauth2-service-yahoo.c -index c8bbd3a..e71e36a 100644 +index 3a9ce9c..f96b840 100644 --- a/src/libedataserver/e-oauth2-service-yahoo.c +++ b/src/libedataserver/e-oauth2-service-yahoo.c @@ -67,7 +67,18 @@ eos_yahoo_read_settings (EOAuth2Service *service, diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/by-name/ev/evolution-data-server/package.nix similarity index 97% rename from pkgs/desktops/gnome/core/evolution-data-server/default.nix rename to pkgs/by-name/ev/evolution-data-server/package.nix index d774ea2f2685..4fb4c39bad6f 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.52.2"; + version = "3.52.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-oAakTtyzjSb/scYuHV0KMdHy5ZB1Vl4mx5ou4BxFp+U="; + hash = "sha256-6fbIDBQgM7GAG8yqYiHEU9406tTqCJsghrGQhvmpwuQ="; }; patches = [ @@ -129,7 +129,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DENABLE_UOA=OFF" "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON" "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" diff --git a/pkgs/by-name/ex/exe2hex/package.nix b/pkgs/by-name/ex/exe2hex/package.nix new file mode 100644 index 000000000000..4213a6905d8f --- /dev/null +++ b/pkgs/by-name/ex/exe2hex/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3Packages +, expect +}: + +python3Packages.buildPythonApplication rec { + pname = "exe2hex"; + version = "1.5.2-unstable-2020-04-27"; + pyproject = false; + + src = fetchFromGitHub { + owner = "g0tmi1k"; + repo = "exe2hex"; + rev = "e563b353306a0f34d96150b8992f543931f907ea"; + hash = "sha256-wriB1k45QWNCIsSb30Z3IilTGZqnc+X1+qkRrxgDxzU="; + }; + + propagatedBuildInputs = [ + expect + ]; + + postPatch = '' + substituteInPlace exe2hex.py \ + --replace-fail "/usr/bin/expect" "${lib.getExe expect}" + ''; + + postInstall = '' + install -Dm 555 exe2hex.py $out/bin/exe2hex + ''; + + meta = with lib; { + description = "Inline file transfer using in-built Windows tools"; + homepage = "https://github.com/g0tmi1k/exe2hex"; + mainProgram = "exe2hex"; + license = licenses.mit; + maintainers = with maintainers; [ d3vil0p3r ]; + }; +} diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index a100139b00c3..788a47db81a9 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.18.20"; + version = "0.18.21"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-yhrzjm6agMshdjCkK88aGXd0aM9Uurs1GeAA3w/umqI="; + hash = "sha256-d1xY0yu28a+TfIMUlQN/v3UgfhVVmQL9jGLJVc8o/Xc="; }; - cargoHash = "sha256-AJH+fZFaSSgRLIsDu5GVe4d9MI2e4N2DvWZ2JOZx+pM="; + cargoHash = "sha256-w8xAk4eBXAOD93IIjD5MIDerPMSvw2IN9QTOKc04DK4="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch b/pkgs/by-name/f2/f2fs-tools/f2fs-tools-cross-fix.patch similarity index 100% rename from pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch rename to pkgs/by-name/f2/f2fs-tools/f2fs-tools-cross-fix.patch diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/by-name/f2/f2fs-tools/package.nix similarity index 65% rename from pkgs/tools/filesystems/f2fs-tools/default.nix rename to pkgs/by-name/f2/f2fs-tools/package.nix index 2a913be9fa80..0c91e41da45f 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/by-name/f2/f2fs-tools/package.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchzip, fetchpatch -, autoreconfHook, libselinux, libuuid, pkg-config +{ + lib, + stdenv, + fetchzip, + fetchpatch, + autoreconfHook, + libselinux, + libuuid, + pkg-config, + lz4, + lzo, }: stdenv.mkDerivation rec { @@ -11,8 +20,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-zNG1F//+BTBzlEc6qNVixyuCB6PMZD5Kf8pVK0ePYiA="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libselinux libuuid ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + libselinux + libuuid + lz4 + lzo + ]; patches = [ ./f2fs-tools-cross-fix.patch @@ -24,11 +41,14 @@ stdenv.mkDerivation rec { }) ]; - meta = with lib; { + meta = { homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/"; description = "Userland tools for the f2fs filesystem"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ ehmry jagajaga ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + ehmry + jagajaga + ]; }; } diff --git a/pkgs/by-name/fa/fairywren/package.nix b/pkgs/by-name/fa/fairywren/package.nix new file mode 100644 index 000000000000..f28ec94a3719 --- /dev/null +++ b/pkgs/by-name/fa/fairywren/package.nix @@ -0,0 +1,44 @@ +{ lib +, stdenvNoCC +, fetchFromGitLab +, colorVariants ? [] # default: install all icons +}: + +let + pname = "fairywren"; + colorVariantList = [ + "FairyWren_Dark" + "FairyWren_Light" + ]; + +in +lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants + +stdenvNoCC.mkDerivation { + inherit pname; + version = "0-unstable-2024-06-10"; + + src = fetchFromGitLab{ + owner = "aiyahm"; + repo = "FairyWren-Icons"; + rev = "a86736cc9ff50af0ca59ef31c464da2f9e9da103"; + hash = "sha256-IzTq45lMdlAt+mEb7gpp1hWKBUSeLWINK53Sv4RithI="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons + cp -r ${lib.concatStringsSep " " (if colorVariants != [] then colorVariants else colorVariantList)} $out/share/icons/ + runHook postInstall + ''; + + dontFixup = true; + + meta = with lib; { + description = "FairyWren Icon Set"; + homepage = "https://gitlab.com/aiyahm/FairyWren-Icons"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.all; + license = with licenses; [ gpl3Plus ]; + }; +} diff --git a/pkgs/by-name/fa/fanbox-dl/package.nix b/pkgs/by-name/fa/fanbox-dl/package.nix index 1ed77441237f..9de1203a4897 100644 --- a/pkgs/by-name/fa/fanbox-dl/package.nix +++ b/pkgs/by-name/fa/fanbox-dl/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fanbox-dl"; - version = "0.20.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "hareku"; repo = "fanbox-dl"; rev = "v${version}"; - hash = "sha256-OC0buWQlb9sb4SXokOpeUHcQKMLeYN3ZVQGXtoiIMVM="; + hash = "sha256-ncxL0qTEsAgfA6jJoat1WnOylg91PaG/fhcy3NrFxhA="; }; - vendorHash = "sha256-qsdFfAgA72T3iOZRJdteo6T92lGi3yzcKcxj837YnG4="; + vendorHash = "sha256-GD5uxa5XWhlHHBztTpDKCTSym2pdkr/or6aGl9qF29U="; # pings websites during testing doCheck = false; diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix index 804e93aa5806..8533af46bbae 100644 --- a/pkgs/by-name/fa/fantomas/package.nix +++ b/pkgs/by-name/fa/fantomas/package.nix @@ -4,7 +4,7 @@ buildDotnetGlobalTool { pname = "fantomas"; version = "6.3.9"; - nugetSha256 = "sha256-XRPC5cXMoTJLLHe3f5A3+uXakbL+D7DlX0sA52KMZKw="; + nugetHash = "sha256-XRPC5cXMoTJLLHe3f5A3+uXakbL+D7DlX0sA52KMZKw="; meta = with lib; { description = "F# source code formatter"; diff --git a/pkgs/by-name/fa/fastapi-cli/package.nix b/pkgs/by-name/fa/fastapi-cli/package.nix new file mode 100644 index 000000000000..f940531aa46c --- /dev/null +++ b/pkgs/by-name/fa/fastapi-cli/package.nix @@ -0,0 +1,42 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "fastapi-cli"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tiangolo"; + repo = "fastapi-cli"; + rev = "refs/tags/${version}"; + hash = "sha256-eWvZn7ZeLnQZAvGOzY77o6oO5y+QV2cx+peBov9YpJE="; + }; + + build-system = [ python3.pkgs.pdm-backend ]; + + dependencies = with python3.pkgs; [ + rich + typer + ]; + + optional-dependencies = with python3.pkgs; { + standard = [ + fastapi + uvicorn + ]; + }; + + pythonImportsCheck = [ "fastapi_cli" ]; + + meta = { + description = "Run and manage FastAPI apps from the command line with FastAPI CLI"; + homepage = "https://github.com/tiangolo/fastapi-cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "fastapi-cli"; + }; +} diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 47904df25d61..d4a64e36ff74 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -47,13 +47,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.17.0"; + version = "2.17.2"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-QK3AlB6tT1pl2qNX/DWPQzpjs9+EhJO9gHtNTNOE41E="; + hash = "sha256-XQ0A1eeajiExrD440FVj5STjyMTYdIK0SyysFo/tF3o="; }; outputs = [ "out" "man" ]; @@ -139,6 +139,10 @@ stdenv'.mkDerivation (finalAttrs: { (lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids") ]; + postPatch = '' + substituteInPlace completions/fastfetch.fish --replace-fail python3 '${python3.interpreter}' + ''; + postInstall = '' wrapProgram $out/bin/fastfetch \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/by-name/fc/fcgi/package.nix similarity index 61% rename from pkgs/development/libraries/fcgi/default.nix rename to pkgs/by-name/fc/fcgi/package.nix index d59fac5ff4dc..62c463b2d2f5 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/by-name/fc/fcgi/package.nix @@ -1,25 +1,26 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fcgi"; version = "2.4.2"; src = fetchFromGitHub { owner = "FastCGI-Archives"; repo = "fcgi2"; - rev = version; - sha256 = "1jhz6jfwv5kawa8kajvg18nfwc1b30f38zc0lggszd1vcmrwqkz1"; + rev = finalAttrs.version; + hash = "sha256-4U/Mc2U7tK/fo4B9NBwYKzDuLApvSzWR4mqWzZ00H8o="; }; nativeBuildInputs = [ autoreconfHook ]; postInstall = "ln -s . $out/include/fastcgi"; - meta = with lib; { - description = "Language independent, scalable, open extension to CG"; + meta = { + description = "Language independent, scalable, open extension to CGI"; homepage = "https://fastcgi-archives.github.io/"; # Formerly http://www.fastcgi.com/ - license = "FastCGI see LICENSE.TERMS"; + license = "FastCGI, see LICENSE.TERMS"; mainProgram = "cgi-fcgi"; - platforms = platforms.all; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ jtbx ]; }; -} +}) diff --git a/pkgs/by-name/fc/fcitx5-pinyin-minecraft/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-minecraft/package.nix new file mode 100644 index 000000000000..dba53dbe887f --- /dev/null +++ b/pkgs/by-name/fc/fcitx5-pinyin-minecraft/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchurl, + nix-update-script, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fcitx5-pinyin-minecraft"; + version = "0.1.20240629"; + + src = fetchurl { + url = "https://github.com/oldherl/fcitx5-pinyin-minecraft/releases/download/${finalAttrs.version}/minecraft-cn.dict"; + hash = "sha256-uD/ADL+JGdSYiNz6XIqJB0Y0IU6Jf56q5g7xG2o3a+E="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fcitx5/pinyin/dictionaries/minecraft.dict + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fcitx 5 pinyin dictionary from zh.minecraft.wiki"; + homepage = "https://github.com/oldherl/fcitx5-pinyin-minecraft"; + license = with lib.licenses; [ unlicense cc-by-nc-sa-30 ]; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix new file mode 100644 index 000000000000..624e00913428 --- /dev/null +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchurl, + nix-update-script, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fcitx5-pinyin-moegirl"; + version = "20240609"; + + src = fetchurl { + url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; + hash = "sha256-dXFV0kVr8hgT17Jmr28PiYTiELm8kS/KM71igHXA6hs="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fcitx5/pinyin/dictionaries/moegirl.dict + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fcitx 5 pinyin dictionary from zh.moegirl.org.cn"; + homepage = "https://github.com/outloudvi/mw2fcitx"; + license = with lib.licenses; [ unlicense cc-by-nc-sa-30 ]; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix new file mode 100644 index 000000000000..c28c18ae63c5 --- /dev/null +++ b/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchurl, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fcitx5-pinyin-zhwiki"; + version = "0.2.5"; + date = "20240509"; + + src = fetchurl { + url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/${finalAttrs.version}/zhwiki-${finalAttrs.date}.dict"; + hash = "sha256-uRpKPq+/xJ8akKB8ol/JRF79VfDIQ8L4SxLDXzpfPxg="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fcitx5/pinyin/dictionaries/zhwiki.dict + + runHook postInstall + ''; + + meta = { + description = "Fcitx 5 pinyin dictionary from zh.wikipedia.org"; + homepage = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki"; + license = with lib.licenses; [ unlicense cc-by-sa-40 ]; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index 73ec95ab3bf9..d8bacf16658d 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.5.16"; + version = "8.5.25"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-eUXri4aVMnZtXzCDL3NZTdCR7y0VD5kG4D9YfXQVuzo="; + hash = "sha256-GrN19ONZ4a400d3BM7bdpR/+v0F4Q13+zcGqvDBcEPU="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix index 759de944a6e3..6ecbeb9dd5dd 100644 --- a/pkgs/by-name/ff/ffsubsync/package.nix +++ b/pkgs/by-name/ff/ffsubsync/package.nix @@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/smacke/ffsubsync"; description = "Automagically synchronize subtitles with video"; license = licenses.mit; - maintainers = with maintainers; [ Benjamin-L ]; + maintainers = with maintainers; [ ]; mainProgram = "ffsubsync"; }; } diff --git a/pkgs/by-name/fg/fgqcanvas/package.nix b/pkgs/by-name/fg/fgqcanvas/package.nix index 3eaba03af56b..f64c4881d823 100644 --- a/pkgs/by-name/fg/fgqcanvas/package.nix +++ b/pkgs/by-name/fg/fgqcanvas/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { description = "Qt-based remote canvas application for FlightGear"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nayala ]; + maintainers = with maintainers; []; mainProgram = "fgqcanvas"; }; } diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/by-name/fi/file-roller/package.nix similarity index 97% rename from pkgs/desktops/gnome/apps/file-roller/default.nix rename to pkgs/by-name/fi/file-roller/package.nix index d1af3b91db88..497bfe4920c9 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/by-name/fi/file-roller/package.nix @@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "file-roller"; - attrPath = "gnome.file-roller"; }; }; diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 3d78e105cecf..1058756179de 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.72"; + version = "2.13.85"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-u5hAUGGaMpUub4WL8CGEzbnfXPRouaGbb8SQ6ep3X3Q="; + hash = "sha256-rsEromVixVLtBLvhLWQ5ykjHq3/FScPSpuL9FqIOjZ8="; }; - vendorHash = "sha256-y4XZeugjqy6ydAq6KQ8iIgMgE6iHAEqzzi2A+N1LB3M="; + vendorHash = "sha256-pobAFcmFsE340+Jboqnd88L3UHEquZ63eWwSXzgOWyc="; ldflags = [ "-s" diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix new file mode 100644 index 000000000000..9d6d222e77b4 --- /dev/null +++ b/pkgs/by-name/fi/finamp/package.nix @@ -0,0 +1,71 @@ +{ lib +, flutter322 +, mpv-unwrapped +, xdg-user-dirs +, patchelf +, fetchFromGitHub +, copyDesktopItems +, makeDesktopItem +}: +let + version = "0.9.8-beta"; +in +flutter322.buildFlutterApplication { + inherit version; + pname = "finamp"; + src = fetchFromGitHub { + owner = "jmshrv"; + repo = "finamp"; + rev = version; + hash = "sha256-lvjhA+hdCXgDsrNhNw4Tiq6ZgkYlPuMeHha8OJNF1TI="; + }; + pubspecLock = lib.importJSON ./pubspec.lock.json; + + nativeBuildInputs = [ patchelf copyDesktopItems ]; + buildInputs = [ mpv-unwrapped ]; + + gitHashes = { + balanced_text = "sha256-lSDR5dDjZ4garRbBPI+wSxC5iScg8wVSD5kymmLbYbk="; + isar_generator = "sha256-lWnHmZmYx7qDG6mzyDqYt+Xude2xVOH1VW+BoDCas60="; + media_kit_libs_windows_audio = "sha256-p3hRq79whLFJLNUgL9atXyTGvOIqCbTRKVk1ie0Euqs="; + palette_generator = "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0="; + split_view = "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k="; + }; + + postFixup = '' + patchelf $out/app/finamp --add-needed libisar.so --add-needed libmpv.so --add-rpath ${lib.makeLibraryPath [ mpv-unwrapped ]} + ''; + + postInstall = '' + install -Dm644 $src/assets/icon/icon_foreground.svg $out/share/icons/hicolor/scalable/apps/finamp.svg + ''; + + extraWrapProgramArgs = '' + --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]} + ''; + + desktopItems = [(makeDesktopItem { + name = "Finamp"; + desktopName = "Finamp"; + genericName = "Music Player"; + exec = "finamp"; + icon = "finamp"; + startupWMClass = "finamp"; + comment = "An open source Jellyfin music player"; + categories = [ + "AudioVideo" + "Audio" + "Player" + "Music" + ]; + })]; + + meta = { + description = "Open source Jellyfin music player"; + homepage = "https://github.com/jmshrv/finamp"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ dseelp ]; + mainProgram = "finamp"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json new file mode 100644 index 000000000000..7610d2aeb04b --- /dev/null +++ b/pkgs/by-name/fi/finamp/pubspec.lock.json @@ -0,0 +1,2093 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "67.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.4.1" + }, + "analyzer_plugin": { + "dependency": "transitive", + "description": { + "name": "analyzer_plugin", + "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.3" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "6bd38d335f0954f5fad9c79e614604fbf03a0e5b975923dd001b6ea965ef5b4b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.0" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "audio_service": { + "dependency": "direct main", + "description": { + "name": "audio_service", + "sha256": "4547c312a94f9cb2c48b60823fb190767cbd63454a83c73049384d5d3cba4650", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.18.13" + }, + "audio_service_mpris": { + "dependency": "direct main", + "description": { + "name": "audio_service_mpris", + "sha256": "a8d1583f9143d17b2facc994a99bd1ea257cec43adcb8d7349458555c62b570f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "audio_service_platform_interface": { + "dependency": "direct main", + "description": { + "name": "audio_service_platform_interface", + "sha256": "8431a455dac9916cc9ee6f7da5620a666436345c906ad2ebb7fa41d18b3c1bf4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "audio_service_web": { + "dependency": "transitive", + "description": { + "name": "audio_service_web", + "sha256": "9d7d5ae5f98a5727f2580fad73062f2484f400eef6cef42919413268e62a363e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "audio_session": { + "dependency": "direct main", + "description": { + "name": "audio_session", + "sha256": "a49af9981eec5d7cd73b37bacb6ee73f8143a6a9f9bd5b6021e6c346b9b6cf4e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.19" + }, + "auto_size_text": { + "dependency": "direct main", + "description": { + "name": "auto_size_text", + "sha256": "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "background_downloader": { + "dependency": "direct main", + "description": { + "name": "background_downloader", + "sha256": "9504093db43da6095c44dd14fc816f3ee8961633ace12340f5d3c4fbfd346e2d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.5.2" + }, + "balanced_text": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "e387fcaef4fabf7a24e8c7d9dbb9c967ab1582f4", + "resolved-ref": "e387fcaef4fabf7a24e8c7d9dbb9c967ab1582f4", + "url": "https://github.com/Komodo5197/flutter-balanced-text.git" + }, + "source": "git", + "version": "0.0.3" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "build_cli_annotations": { + "dependency": "transitive", + "description": { + "name": "build_cli_annotations", + "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "1414d6d733a85d8ad2f1dfcb3ea7945759e35a123cb99ccfac75d0758f75edfa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.10" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.0" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "chopper": { + "dependency": "direct main", + "description": { + "name": "chopper", + "sha256": "779a7bc5c7af2e45bd35c49698f2b6fabc23ac053b622294369bbb079eeb8920", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.0" + }, + "chopper_generator": { + "dependency": "direct dev", + "description": { + "name": "chopper_generator", + "sha256": "f7f4913d14bbec24b5cc3c5270f47a3a218bd1c764d7ed3eb0bf4574913208f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.0" + }, + "ci": { + "dependency": "transitive", + "description": { + "name": "ci", + "sha256": "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "clipboard": { + "dependency": "direct main", + "description": { + "name": "clipboard", + "sha256": "2ec38f0e59878008ceca0ab122e4bfde98847f88ef0f83331362ba4521f565a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.0" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "color": { + "dependency": "transitive", + "description": { + "name": "color", + "sha256": "ddcdf1b3badd7008233f5acffaf20ca9f5dc2cd0172b75f68f24526a5f5725cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "console": { + "dependency": "transitive", + "description": { + "name": "console", + "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+1" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "custom_lint": { + "dependency": "direct dev", + "description": { + "name": "custom_lint", + "sha256": "7c0aec12df22f9082146c354692056677f1e70bc43471644d1fdb36c6fdda799", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.4" + }, + "custom_lint_builder": { + "dependency": "transitive", + "description": { + "name": "custom_lint_builder", + "sha256": "d7dc41e709dde223806660268678be7993559e523eb3164e2a1425fd6f7615a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.4" + }, + "custom_lint_core": { + "dependency": "transitive", + "description": { + "name": "custom_lint_core", + "sha256": "a85e8f78f4c52f6c63cdaf8c872eb573db0231dcdf3c3a5906d493c1f8bc20e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.3" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.6" + }, + "dartx": { + "dependency": "transitive", + "description": { + "name": "dartx", + "sha256": "8b25435617027257d43e6508b5fe061012880ddfdaa75a71d607c3de2a13d244", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "device_info_plus": { + "dependency": "direct main", + "description": { + "name": "device_info_plus", + "sha256": "eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.0" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "fading_edge_scrollview": { + "dependency": "transitive", + "description": { + "name": "fading_edge_scrollview", + "sha256": "c25c2231652ce774cc31824d0112f11f653881f43d7f5302c05af11942052031", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "29c90806ac5f5fb896547720b73b17ee9aed9bba540dc5d91fe29f8c5745b10a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.3" + }, + "file_sizes": { + "dependency": "direct main", + "description": { + "name": "file_sizes", + "sha256": "d24964a4b194b6116d490005428d07cb3e83834ad1f7ec6a1012dedc2f6d2a19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_blurhash": { + "dependency": "direct main", + "description": { + "name": "flutter_blurhash", + "sha256": "5e67678e479ac639069d7af1e133f4a4702311491188ff3e0227486430db0c06", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.2" + }, + "flutter_cache_manager": { + "dependency": "direct main", + "description": { + "name": "flutter_cache_manager", + "sha256": "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.1" + }, + "flutter_gen_core": { + "dependency": "transitive", + "description": { + "name": "flutter_gen_core", + "sha256": "b9894396b2a790cc2d6eb3ed86e5e113aaed993765b21d4b981c9da4476e0f52", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.0+1" + }, + "flutter_gen_runner": { + "dependency": "direct dev", + "description": { + "name": "flutter_gen_runner", + "sha256": "b4c4c54e4dd89022f5e405fe96f16781be2dfbeabe8a70ccdf73b7af1302c655", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.0+1" + }, + "flutter_launcher_icons": { + "dependency": "direct dev", + "description": { + "name": "flutter_launcher_icons", + "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.1" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.19" + }, + "flutter_riverpod": { + "dependency": "direct main", + "description": { + "name": "flutter_riverpod", + "sha256": "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.1" + }, + "flutter_rust_bridge": { + "dependency": "transitive", + "description": { + "name": "flutter_rust_bridge", + "sha256": "e12415c3bce49bcbc3fed383f0ea41ad7d828f6cf0eccba0588ffa5a812fe522", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.82.1" + }, + "flutter_staggered_grid_view": { + "dependency": "transitive", + "description": { + "name": "flutter_staggered_grid_view", + "sha256": "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "flutter_sticky_header": { + "dependency": "direct main", + "description": { + "name": "flutter_sticky_header", + "sha256": "017f398fbb45a589e01491861ca20eb6570a763fd9f3888165a978e11248c709", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.5" + }, + "flutter_tabler_icons": { + "dependency": "direct main", + "description": { + "name": "flutter_tabler_icons", + "sha256": "5c27597ed7e3a7f8ae5a3d6aa2c27223fdd3da165c08a4879083c394acfa3678", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.29.0" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_to_airplay": { + "dependency": "direct main", + "description": { + "name": "flutter_to_airplay", + "sha256": "9ed02327954d2bdb28d529198bedb1b6ab993be08125fdff46af2c5e5f245983", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "flutter_vibrate": { + "dependency": "direct main", + "description": { + "name": "flutter_vibrate", + "sha256": "9cc9b32cf52c90dd34c1cf396ed40010b2c74e69adbb0ff16005afa900971ad8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "freezed_annotation": { + "dependency": "transitive", + "description": { + "name": "freezed_annotation", + "sha256": "c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "get_it": { + "dependency": "direct main", + "description": { + "name": "get_it", + "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.7.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "hashcodes": { + "dependency": "transitive", + "description": { + "name": "hashcodes", + "sha256": "80f9410a5b3c8e110c4b7604546034749259f5d6dcca63e0d3c17c9258f1a651", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "hive": { + "dependency": "direct main", + "description": { + "name": "hive", + "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "hive_flutter": { + "dependency": "direct main", + "description": { + "name": "hive_flutter", + "sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "hive_generator": { + "dependency": "direct dev", + "description": { + "name": "hive_generator", + "sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "hotreloader": { + "dependency": "transitive", + "description": { + "name": "hotreloader", + "sha256": "ed56fdc1f3a8ac924e717257621d09e9ec20e308ab6352a73a50a1d7a4d9158e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "image_size_getter": { + "dependency": "transitive", + "description": { + "name": "image_size_getter", + "sha256": "f98c4246144e9b968899d2dfde69091e22a539bb64bc9b0bea51505fbb490e57", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "infinite_scroll_pagination": { + "dependency": "direct main", + "description": { + "name": "infinite_scroll_pagination", + "sha256": "b68bce20752fcf36c7739e60de4175494f74e99e9a69b4dd2fe3a1dd07a7f16a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "isar": { + "dependency": "direct main", + "description": { + "name": "isar", + "sha256": "99165dadb2cf2329d3140198363a7e7bff9bbd441871898a87e26914d25cf1ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0+1" + }, + "isar_flutter_libs": { + "dependency": "direct main", + "description": { + "name": "isar_flutter_libs", + "sha256": "bc6768cc4b9c61aabff77152e7f33b4b17d2fc93134f7af1c3dd51500fe8d5e8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0+1" + }, + "isar_generator": { + "dependency": "direct dev", + "description": { + "path": "packages/isar_generator", + "ref": "70a5abd2b36d265a2eef0141f98f312a8710e60c", + "resolved-ref": "70a5abd2b36d265a2eef0141f98f312a8710e60c", + "url": "https://github.com/ndelanou/isar.git" + }, + "source": "git", + "version": "3.1.0+1" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.7" + }, + "json_annotation": { + "dependency": "direct main", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_serializable": { + "dependency": "direct dev", + "description": { + "name": "json_serializable", + "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.8.0" + }, + "just_audio": { + "dependency": "direct main", + "description": { + "name": "just_audio", + "sha256": "5abfab1d199e01ab5beffa61b3e782350df5dad036cb8c83b79fa45fc656614e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.38" + }, + "just_audio_media_kit": { + "dependency": "direct main", + "description": { + "name": "just_audio_media_kit", + "sha256": "bbecbd43959c230d9f9610df0e0165855e711b4c960ce730c08f31107cc3bd26", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "just_audio_platform_interface": { + "dependency": "transitive", + "description": { + "name": "just_audio_platform_interface", + "sha256": "0243828cce503c8366cc2090cefb2b3c871aa8ed2f520670d76fd47aa1ab2790", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "just_audio_web": { + "dependency": "transitive", + "description": { + "name": "just_audio_web", + "sha256": "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.11" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.4" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "locale_names": { + "dependency": "direct main", + "description": { + "name": "locale_names", + "sha256": "7a89ca54072f4f13d0f5df5a9ba69337554bf2fd057d1dd2a238898f3f159374", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "marquee": { + "dependency": "direct main", + "description": { + "name": "marquee", + "sha256": "4b5243d2804373bdc25fc93d42c3b402d6ec1f4ee8d0bb72276edd04ae7addb8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.0" + }, + "media_kit": { + "dependency": "transitive", + "description": { + "name": "media_kit", + "sha256": "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.10+1" + }, + "media_kit_libs_linux": { + "dependency": "direct main", + "description": { + "name": "media_kit_libs_linux", + "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "media_kit_libs_windows_audio": { + "dependency": "direct main", + "description": { + "path": "libs/windows/media_kit_libs_windows_audio", + "ref": "475a08cc97b94702f774bc906e1472b5bddc932b", + "resolved-ref": "475a08cc97b94702f774bc906e1472b5bddc932b", + "url": "https://github.com/Komodo5197/media-kit.git" + }, + "source": "git", + "version": "1.0.9" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "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": { + "name": "msix", + "sha256": "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.16.7" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "octo_image": { + "dependency": "direct main", + "description": { + "name": "octo_image", + "sha256": "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "palette_generator": { + "dependency": "direct main", + "description": { + "path": "packages/palette_generator", + "ref": "4992c3b", + "resolved-ref": "4992c3b987d5d3b04c57f5ed3589e02f7988ff4c", + "url": "https://github.com/jmshrv/packages.git" + }, + "source": "git", + "version": "0.3.4" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.4" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "permission_handler": { + "dependency": "direct main", + "description": { + "name": "permission_handler", + "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.3.1" + }, + "permission_handler_android": { + "dependency": "transitive", + "description": { + "name": "permission_handler_android", + "sha256": "8bb852cd759488893805c3161d0b2b5db55db52f773dbb014420b304055ba2c5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.6" + }, + "permission_handler_apple": { + "dependency": "transitive", + "description": { + "name": "permission_handler_apple", + "sha256": "e9ad66020b89ff1b63908f247c2c6f931c6e62699b756ef8b3c4569350cd8662", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.4.4" + }, + "permission_handler_html": { + "dependency": "transitive", + "description": { + "name": "permission_handler_html", + "sha256": "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "permission_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "permission_handler_platform_interface", + "sha256": "48d4fcf201a1dad93ee869ab0d4101d084f49136ec82a8a06ed9cfeacab9fd20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.1" + }, + "permission_handler_windows": { + "dependency": "transitive", + "description": { + "name": "permission_handler_windows", + "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.4" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "provider": { + "dependency": "direct main", + "description": { + "name": "provider", + "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.2" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.3" + }, + "puppeteer": { + "dependency": "transitive", + "description": { + "name": "puppeteer", + "sha256": "c45c51b4ad8d70acdffeb1cfb9d16b60a7eaab7bfef314dd5b02c3607269b556", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.11.0" + }, + "qs_dart": { + "dependency": "transitive", + "description": { + "name": "qs_dart", + "sha256": "5f1827ccdfa061582c121e7a8fe4a83319fa455bcd1fd6e46ff5b17b57aed680", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "recursive_regex": { + "dependency": "transitive", + "description": { + "name": "recursive_regex", + "sha256": "f7252e3d3dfd1665e594d9fe035eca6bc54139b1f2fee38256fa427ea41adc60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "riverpod": { + "dependency": "transitive", + "description": { + "name": "riverpod", + "sha256": "f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.1" + }, + "riverpod_analyzer_utils": { + "dependency": "transitive", + "description": { + "name": "riverpod_analyzer_utils", + "sha256": "8b71f03fc47ae27d13769496a1746332df4cec43918aeba9aff1e232783a780f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "riverpod_annotation": { + "dependency": "direct main", + "description": { + "name": "riverpod_annotation", + "sha256": "e5e796c0eba4030c704e9dae1b834a6541814963292839dcf9638d53eba84f5c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.5" + }, + "riverpod_generator": { + "dependency": "direct dev", + "description": { + "name": "riverpod_generator", + "sha256": "d451608bf17a372025fc36058863737636625dfdb7e3cbf6142e0dfeb366ab22", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "riverpod_lint": { + "dependency": "direct dev", + "description": { + "name": "riverpod_lint", + "sha256": "3c67c14ccd16f0c9d53e35ef70d06cd9d072e2fb14557326886bbde903b230a5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.10" + }, + "rxdart": { + "dependency": "direct main", + "description": { + "name": "rxdart", + "sha256": "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.27.7" + }, + "safe_local_storage": { + "dependency": "transitive", + "description": { + "name": "safe_local_storage", + "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.9" + }, + "scroll_to_index": { + "dependency": "direct main", + "description": { + "name": "scroll_to_index", + "sha256": "b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "share_plus": { + "dependency": "direct main", + "description": { + "name": "share_plus", + "sha256": "ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.0" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "simple_gesture_detector": { + "dependency": "direct main", + "description": { + "name": "simple_gesture_detector", + "sha256": "ba2cd5af24ff20a0b8d609cec3f40e5b0744d2a71804a2616ae086b9c19d19a3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "sliver_tools": { + "dependency": "transitive", + "description": { + "name": "sliver_tools", + "sha256": "eae28220badfb9d0559207badcbbc9ad5331aac829a88cb0964d330d2a4636a6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.12" + }, + "smtc_windows": { + "dependency": "direct main", + "description": { + "name": "smtc_windows", + "sha256": "799bbe0f8e4436da852c5dcc0be482c97b8ae0f504f65c6b750cd239b4835aa0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.4" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "split_view": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "8b2b0f0e1c8470183cb2df40815a05bfdb3fe219", + "resolved-ref": "8b2b0f0e1c8470183cb2df40815a05bfdb3fe219", + "url": "https://github.com/odriverobotics/split_view.git" + }, + "source": "git", + "version": "3.2.1" + }, + "sqflite": { + "dependency": "transitive", + "description": { + "name": "sqflite", + "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3+1" + }, + "sqflite_common": { + "dependency": "transitive", + "description": { + "name": "sqflite_common", + "sha256": "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "state_notifier": { + "dependency": "transitive", + "description": { + "name": "state_notifier", + "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0+1" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "time": { + "dependency": "transitive", + "description": { + "name": "time", + "sha256": "ad8e018a6c9db36cb917a031853a1aae49467a93e0d464683e029537d848c221", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "url": "https://pub.dev" + }, + "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": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "universal_platform": { + "dependency": "transitive", + "description": { + "name": "universal_platform", + "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "uri_parser": { + "dependency": "transitive", + "description": { + "name": "uri_parser", + "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.2.6" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "value_layout_builder": { + "dependency": "transitive", + "description": { + "name": "value_layout_builder", + "sha256": "98202ec1807e94ac72725b7f0d15027afde513c55c69ff3f41bcfccb950831bc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "vector_graphics_codec": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_codec", + "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_graphics_compiler": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_compiler", + "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.1" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "weak_map": { + "dependency": "transitive", + "description": { + "name": "weak_map", + "sha256": "95ca338f0cdf5f0022cc283dfa4d97f6f6b03752f67eca85ebe6d7a679ffe3ed", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.5" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.1" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.9" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "xxh3": { + "dependency": "transitive", + "description": { + "name": "xxh3", + "sha256": "a92b30944a9aeb4e3d4f3c3d4ddb3c7816ca73475cd603682c4f8149690f56d7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + } + }, + "sdks": { + "dart": ">=3.4.0 <4.0.0", + "flutter": ">=3.19.0" + } +} diff --git a/pkgs/by-name/fi/fixjson/package.nix b/pkgs/by-name/fi/fixjson/package.nix new file mode 100644 index 000000000000..52ed03c690f5 --- /dev/null +++ b/pkgs/by-name/fi/fixjson/package.nix @@ -0,0 +1,28 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub +}: + +buildNpmPackage { + pname = "fixjson"; + version = "1.1.2-unstable-2021-01-05"; + + src = fetchFromGitHub { + owner = "rhysd"; + repo = "fixjson"; + # Upstream has no tagged releases, but this commit bumps version + rev = "d0483f9cc59896ea59bb16f906f770562d332000"; + hash = "sha256-Mu7ho0t5GzFYuBK6FEXhpsaRxn9HF3lnvMxRpg0aqYI="; + }; + + npmDepsHash = "sha256-tnsgNtMdnrKYxcYy9+4tgp1BX+o8e5/HUDeSP5BOvUQ="; + + meta = { + description = "JSON Fixer for Humans using (relaxed) JSON5"; + homepage = "https://github.com/rhysd/fixjson"; + license = lib.licenses.mit; + mainProgram = "fixjson"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix index 09c3215527f8..8594591ae1b8 100644 --- a/pkgs/by-name/fl/flake-checker/package.nix +++ b/pkgs/by-name/fl/flake-checker/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "flake-checker"; - version = "0.1.19"; + version = "0.1.20"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "flake-checker"; rev = "v${version}"; - hash = "sha256-KJTObuHJQjIgg/5A25Ee+7s2SrmtyYFnvcnklYhSCNE="; + hash = "sha256-Oq+HZzB0mWhixLl8jGcBRWrlOETLhath75ndeJdcN1g="; }; - cargoHash = "sha256-ADqc7H2MClXyYEw/lc9F4HAfpHrDc/lqL/BIL/PTZro="; + cargoHash = "sha256-/Y3ihHwOHHmLnS1TcG1SCtUU4LORkCtGp1+t5Ow5j6E="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix index be3cc19a1fdf..bb194bc1ca9e 100644 --- a/pkgs/by-name/fl/flarectl/package.nix +++ b/pkgs/by-name/fl/flarectl/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "flarectl"; - version = "0.98.0"; + version = "0.99.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflare-go"; rev = "v${version}"; - hash = "sha256-h6NLX++cf9pn8plZUKyiE3qcsiXGYHngRio34Mp341g="; + hash = "sha256-Mv9LuNW5qnWuFYEbvv7cuPFM4PFixhgyFO90SBUS5Fg="; }; vendorHash = "sha256-k1JZGkJy5oGI3pEcrStNrsQTh8diNoe4DARqRX4PGS8="; diff --git a/pkgs/by-name/fl/flashgbx/package.nix b/pkgs/by-name/fl/flashgbx/package.nix index c816f7d00528..ccbceacf0ed9 100644 --- a/pkgs/by-name/fl/flashgbx/package.nix +++ b/pkgs/by-name/fl/flashgbx/package.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "flashgbx"; - version = "3.37"; + version = "4.0.1"; src = fetchFromGitHub { repo = "FlashGBX"; owner = "lesserkuma"; rev = version; - hash = "sha256-3527QmSSpGotFHKTg0yb6MgHKSze+9BECQWqZM3qKsw="; + hash = "sha256-TDrt0dtMX+SHnIUWnWqIhiL4AKqfQdrdwrKRsoBDrpQ="; }; desktopItems = [ diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix index cb39bc06b9ce..b841b46d604f 100644 --- a/pkgs/by-name/fl/flashmq/package.nix +++ b/pkgs/by-name/fl/flashmq/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.15.2"; + version = "1.15.3"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-4ZK8aHDhI0yslx1VoO+cgqj4YQ6AgE0Jy5C4WJ4k4OQ="; + hash = "sha256-uTTk+7K9vHPTRYT1BxiXdp5+8n9zDdQJXQziQvI5YGU="; }; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/pkgs/by-name/fl/flite/package.nix b/pkgs/by-name/fl/flite/package.nix new file mode 100644 index 000000000000..f39e1257185a --- /dev/null +++ b/pkgs/by-name/fl/flite/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + alsa-lib, + libpulseaudio, + testers, + audioBackend ? "pulseaudio", +}: +assert lib.assertOneOf "audioBackend" audioBackend [ + "alsa" + "pulseaudio" +]; +stdenv.mkDerivation (finalAttrs: { + pname = "flite"; + version = "2.2"; + + outputs = [ + "bin" + "dev" + "lib" + "out" + ]; + + src = fetchFromGitHub { + owner = "festvox"; + repo = "flite"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Tq5pyg3TiQt8CPqGXTyLOaGgaeLTmPp+Duw3+2VAF9g="; + }; + + # https://github.com/festvox/flite/pull/60. + # Replaces `ar` with `$(AR)` in config/common_make_rules. + # Improves cross-compilation compatibility. + patches = [ + (fetchpatch { + url = "https://github.com/festvox/flite/commit/54c65164840777326bbb83517568e38a128122ef.patch"; + hash = "sha256-hvKzdX7adiqd9D+9DbnfNdqEULg1Hhqe1xElYxNM1B8="; + }) + ]; + + buildInputs = lib.optional stdenv.isLinux ( + { + alsa = alsa-lib; + pulseaudio = libpulseaudio; + } + .${audioBackend} or (throw "${audioBackend} is not a supported backend!") + ); + + configureFlags = [ + "--enable-shared" + ] ++ lib.optionals stdenv.isLinux [ "--with-audio=${audioBackend}" ]; + + # main/Makefile creates and removes 'flite_voice_list.c' from multiple targets: + # make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop + enableParallelBuilding = false; + + passthru = { + tests.version = testers.testVersion { + # `flite` does have a `--version` command, but it returns 1 + command = "flite --help"; + package = finalAttrs.finalPackage; + }; + }; + + meta = { + description = "Small, fast run-time speech synthesis engine"; + homepage = "http://www.festvox.org/flite/"; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "flite"; + }; +}) diff --git a/pkgs/by-name/fl/flye/aarch64-fix.patch b/pkgs/by-name/fl/flye/aarch64-fix.patch deleted file mode 100644 index 02588fc63e21..000000000000 --- a/pkgs/by-name/fl/flye/aarch64-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile b/Makefile -index 75f62aed..91b9571b 100644 ---- a/Makefile -+++ b/Makefile -@@ -16,6 +16,10 @@ ifeq ($(shell uname -m),arm64) - export aarch64=1 - endif - -+ifeq ($(shell uname -m),aarch64) -+ export aarch64=1 -+endif -+ - .PHONY: clean all profile debug minimap2 samtools - - .DEFAULT_GOAL := all diff --git a/pkgs/by-name/fl/flye/package.nix b/pkgs/by-name/fl/flye/package.nix index 76ea84a1c9a0..41e098609597 100644 --- a/pkgs/by-name/fl/flye/package.nix +++ b/pkgs/by-name/fl/flye/package.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , python3Packages , zlib , curl @@ -11,6 +12,7 @@ python3Packages.buildPythonApplication rec { pname = "flye"; version = "2.9.4"; + pyproject = true; src = fetchFromGitHub { owner = "fenderglass"; @@ -19,7 +21,33 @@ python3Packages.buildPythonApplication rec { hash = "sha256-lwiY0VTEsLMMXt1VowsS3jj44v30Z766xNRwQtQKr10="; }; - nativeCheckInputs = [ python3Packages.pytestCheckHook ]; + patches = [ + (fetchpatch { + # https://github.com/mikolmogorov/Flye/pull/691 + name = "aarch64-fix.patch"; + url = "https://github.com/mikolmogorov/Flye/commit/e4dcc3fdf0fa1430a974fcd7da31b03ea642df9b.patch"; + hash = "sha256-Ny2daPt8eYOKnwZ6bdBoCcFWhe9eiIHF4vJU/occwU0="; + }) + (fetchpatch { + # https://github.com/mikolmogorov/Flye/pull/711 + name = "remove-distutils.patch"; + url = "https://github.com/mikolmogorov/Flye/commit/fb34f1ccfdf569d186a4ce822ee18eced736636b.patch"; + hash = "sha256-52bnZ8XyP0HsY2OpNYMU3xJgotNVdQc/O2w3XIReUdQ="; + }) + (fetchpatch { + # https://github.com/mikolmogorov/Flye/pull/670 + name = "remove-find_module.patch"; + url = "https://github.com/mikolmogorov/Flye/commit/441b1c6eb0f60b7c4fb1a40d659c7dabb7ad41b6.patch"; + hash = "sha256-RytFIN1STK33/nvXpck6woQcwV/e1fmA8AgmptiIiDU="; + }) + ]; + + postPatch = '' + substituteInPlace flye/polishing/alignment.py \ + --replace-fail "/bin/bash" "${lib.getExe bash}" + ''; + + build-system = [ python3Packages.setuptools ]; propagatedBuildInputs = [ coreutils ]; @@ -29,22 +57,18 @@ python3Packages.buildPythonApplication rec { libdeflate ]; - patches = [ ./aarch64-fix.patch ]; + pythonImportsCheck = [ "flye" ]; - postPatch = '' - substituteInPlace flye/polishing/alignment.py \ - --replace-fail "/bin/bash" "${lib.getExe bash}" + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; - substituteInPlace flye/tests/test_toy.py \ - --replace-fail "find_executable(\"flye" "find_executable(\"$out/bin/flye" \ - --replace-fail "[\"flye" "[\"$out/bin/flye" + preCheck = '' + export PATH=$out/bin:$PATH ''; meta = with lib; { description = "De novo assembler for single molecule sequencing reads using repeat graphs"; homepage = "https://github.com/fenderglass/Flye"; license = licenses.bsd3; - platforms = platforms.unix; mainProgram = "flye"; maintainers = with maintainers; [ assistant ]; }; diff --git a/pkgs/by-name/fn/fnott/package.nix b/pkgs/by-name/fn/fnott/package.nix index ad66d3874826..1c4b535d92d8 100644 --- a/pkgs/by-name/fn/fnott/package.nix +++ b/pkgs/by-name/fn/fnott/package.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://codeberg.org/dnkl/fnott"; + changelog = "https://codeberg.org/dnkl/fnott/src/tag/${src.rev}/CHANGELOG.md"; description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors"; license = with lib.licenses; [ mit zlib ]; maintainers = with lib.maintainers; [ polykernel ]; diff --git a/pkgs/by-name/fo/folio/package.nix b/pkgs/by-name/fo/folio/package.nix index 1372cbd6d780..5da5b3a1c3bb 100644 --- a/pkgs/by-name/fo/folio/package.nix +++ b/pkgs/by-name/fo/folio/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "folio"; - version = "24.10"; + version = "24.11"; src = fetchFromGitHub { owner = "toolstack"; repo = "Folio"; rev = version; - hash = "sha256-v9YtMFVjRtsf+dijAM5mULx15sOn0u3b/fmRiOAtawc="; + hash = "sha256-55zNxZbta12T/N6ruzY+/FVlinVMYcE02C48nTQUeO4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/font-manager/package.nix b/pkgs/by-name/fo/font-manager/package.nix index 0cfc68aa4fd2..83fba770c113 100644 --- a/pkgs/by-name/fo/font-manager/package.nix +++ b/pkgs/by-name/fo/font-manager/package.nix @@ -14,7 +14,7 @@ , vala , gsettings-desktop-schemas , gtk3 -, gnome +, adwaita-icon-theme , desktop-file-utils , nix-update-script , wrapGAppsHook3 @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { sqlite gsettings-desktop-schemas # for font settings gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme ] ++ lib.optionals withWebkit [ glib-networking # for SSL so that Google Fonts can load libsoup diff --git a/pkgs/by-name/fo/fooyin/package.nix b/pkgs/by-name/fo/fooyin/package.nix index cd8853b95f0d..8c03c4f5fe7c 100644 --- a/pkgs/by-name/fo/fooyin/package.nix +++ b/pkgs/by-name/fo/fooyin/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fooyin"; - version = "0.4.5"; + version = "0.5.1"; src = fetchFromGitHub { owner = "ludouzi"; repo = "fooyin"; rev = "v" + finalAttrs.version; - hash = "sha256-hrPbJnN4Ooq5unA9VbX0UjRZQjPz93X/IQdBSfTUIGk="; + hash = "sha256-X546vdHSfED2LBztPj+3eK86pjD97I8H+PfhzXV2R3E="; }; buildInputs = [ diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index d084deca1f44..c98957268aa0 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -40,17 +40,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "7.0.4"; + version = "7.0.5"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-WtJJdqPbx5k9U+u3ZpI3q/dm3eidxdkFgc8IskaJg88="; + hash = "sha256-Y/Ita5dr3COACffAIAjcqHHcdKiUWWEb/f/MPzMG200="; }; - vendorHash = "sha256-TYVWou9fIVL4od2o1uOb/MRBpf2lIg/9Tem9w+ihYzU="; + vendorHash = "sha256-hfbNyCQMQzDzJxFc2MPAR4+v/qNcnORiQNbwbbIA4Nw="; subPackages = [ "." "contrib/environment-to-ini" ]; @@ -65,12 +65,6 @@ buildGoModule rec { patches = [ ./static-root-path.patch - # Fix TestAddRecursiveExclude go test. - # This will be part of the upcoming v7.0.5 release at which point this needs to be removed again. - (fetchpatch { - url = "https://codeberg.org/forgejo/forgejo/commit/f01dc4b271f54201e60a7c795d784813eac3f7ce.patch"; - sha256 = "sha256-1lPLVHBad+Fmk+6EFXKuMnmDUl5BkEYJuMkTPfdrCgU="; - }) ]; postPatch = '' diff --git a/pkgs/by-name/fr/freecell-solver/package.nix b/pkgs/by-name/fr/freecell-solver/package.nix index 1cb06e59636f..c7a1dc5f2a4a 100644 --- a/pkgs/by-name/fr/freecell-solver/package.nix +++ b/pkgs/by-name/fr/freecell-solver/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "freecell-solver"; - version = "6.10.0"; + version = "6.12.0"; src = fetchurl { url = "https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-${finalAttrs.version}.tar.xz"; - hash = "sha256-RDuineCL51GmD6ykKoF7ZbNCzqkxiP12UXQbdQSDebQ="; + hash = "sha256-oriegEzkuRjvdJAxZ2IQ8glf6jqMsSmAVgKEPHxIhKA="; }; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix index c19efa63a4af..300752f6e467 100644 --- a/pkgs/by-name/fr/freefilesync/package.nix +++ b/pkgs/by-name/fr/freefilesync/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "freefilesync"; - version = "13.6"; + version = "13.7"; src = fetchurl { url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip"; @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { rm -f $out tryDownload "$url" ''; - hash = "sha256-lJ4LiisUy8w6OPd44wJufH+ol1YwjOfFQfqzj3HWb2w="; + hash = "sha256-bS3J0uevtZH/yjoOtqSMYVHRaNegW6NMOZv7ctW5oRc="; }; sourceRoot = "."; diff --git a/pkgs/by-name/fr/fritz-exporter/package.nix b/pkgs/by-name/fr/fritz-exporter/package.nix index d79b74eb9a2b..ee4099d207fc 100644 --- a/pkgs/by-name/fr/fritz-exporter/package.nix +++ b/pkgs/by-name/fr/fritz-exporter/package.nix @@ -20,6 +20,10 @@ python3.pkgs.buildPythonApplication rec { sed -i "/^addopts/d" pyproject.toml ''; + pythonRelaxDeps = [ + "defusedxml" + ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix index 10d55b9871ae..b121a091de5d 100644 --- a/pkgs/by-name/fu/furnace/package.nix +++ b/pkgs/by-name/fu/furnace/package.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "furnace"; - version = "0.6.3"; + version = "0.6.5"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-z0WvJvkry/9T4Fgp2fX83CxPpDBoOPNVtyX2OUk26FI="; + hash = "sha256-szDRaujlstRHbvuddi8HdYb00uHNyvAz+/Ex1mKfMXY="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' @@ -88,7 +88,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_GLES" (withGL && preferGLES)) (lib.cmakeBool "WITH_RENDER_METAL" false) # fails to build (lib.cmakeBool "WITH_RENDER_OPENGL1" (withGL && !preferGLES)) - (lib.cmakeBool "WARNINGS_ARE_ERRORS" true) + # New l10n code still has some fortify bugs + (lib.cmakeBool "WARNINGS_ARE_ERRORS" false) (lib.cmakeBool "FORCE_APPLE_BIN" true) ]; diff --git a/pkgs/by-name/fv/fvwm2/package.nix b/pkgs/by-name/fv/fvwm2/package.nix index 7134959b9c65..5a645c835c01 100644 --- a/pkgs/by-name/fv/fvwm2/package.nix +++ b/pkgs/by-name/fv/fvwm2/package.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://fvwm.org"; + changelog = "https://github.com/fvwmorg/fvwm/releases/tag/${src.rev}"; description = "Multiple large virtual desktop window manager"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/by-name/g3/g3kb-switch/package.nix b/pkgs/by-name/g3/g3kb-switch/package.nix index f3a2650a5bc5..75e8e010503c 100644 --- a/pkgs/by-name/g3/g3kb-switch/package.nix +++ b/pkgs/by-name/g3/g3kb-switch/package.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/lyokha/g3kb-switch"; + changelog = "https://github.com/lyokha/g3kb-switch/releases/tag/${src.rev}"; description = "CLI keyboard layout switcher for GNOME Shell"; mainProgram = "g3kb-switch"; license = licenses.bsd2; diff --git a/pkgs/by-name/ga/gabutdm/package.nix b/pkgs/by-name/ga/gabutdm/package.nix index 4458efcce5f4..32da32be0361 100644 --- a/pkgs/by-name/ga/gabutdm/package.nix +++ b/pkgs/by-name/ga/gabutdm/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "gabutdm"; - version = "2.2.8"; + version = "2.5.0"; src = fetchFromGitHub { owner = "gabutakut"; repo = "gabutdm"; rev = version; - hash = "sha256-HF+zBDkA9fYauLUYsvJJxcRggHu+5qH4rm0IM/tL9Hc="; + hash = "sha256-0PBNKacgKT5xcd0mnn0y9ltmxEAbP+S7MLtt/Zau8vs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 78c491827f94..2efea57c6d74 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -44,14 +44,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.14.22"; + version = "3.14.23"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; rev = "refs/tags/${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-/muitEE3LCU6Xnjbpczb/zy2JRvUbBPT5L13T/v3MvE="; + hash = "sha256-qXwCzNGlkGmO3BkQ74tJxufmjh4dUWzIgjHzDCEShU8="; }; patches = [ diff --git a/pkgs/by-name/ga/garnet/deps.nix b/pkgs/by-name/ga/garnet/deps.nix index 1e063a21ea59..00cd91b35d61 100644 --- a/pkgs/by-name/ga/garnet/deps.nix +++ b/pkgs/by-name/ga/garnet/deps.nix @@ -6,55 +6,56 @@ (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.14.1"; sha256 = "1k7jsin7p7zzqbfxvfz5xrzb46vqbbn569m3hd498mvf2f664yz4"; }) (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.13.0"; sha256 = "06ngbyrqabnmbwac7p0yhayjvva7nj6cb3n9agmhd5mvrwhanbvf"; }) (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.31"; sha256 = "0hki4z9x60vzcg53s8cxnig4g1xnpqcj629r2cg5q1xw0sknfp5d"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.31"; sha256 = "0blf8hl2irl9r9x6f7cih87ps21rcs3b8r09z5wp7jcb5j1cv8fg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "050dzfy49c4jwcm8dfrz2lqbbyhmgnq485zdhpcnc3w08z0ppbs6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.31"; sha256 = "0w4sab66rjjyar9z139ls6rx29gvgj3rp3cbrsc8z00y9mw2sl22"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.31"; sha256 = "13kww7x35926wik32z8cnvzhpqp3dwhazkzb569v87x8yww56n3k"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; sha256 = "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "7.0.0"; sha256 = "0n1grglxql9llmrsbbnlz5chx8mxrb5cpvjngm0hfyrkgzcwz90d"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; sha256 = "1as8cygz0pagg17w22nsf6mb49lr2mcl1x8i3ad1wi8lyzygy1a3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "7.0.0"; sha256 = "1qifb1pv7s76lih8wnjk418wdk4qwn87q2n6dx54knfvxai410bl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "7.0.0"; sha256 = "1f5fhpvzwyrwxh3g1ry027s4skmklf6mbm2w0p13h0x6fbmxcb24"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "7.0.0"; sha256 = "1m8ri2m3vlv9vzk0068jkrx0vkk4sqmk1kxmn8pc3wys38d38qaf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "7.0.0"; sha256 = "1liyprh0zha2vgmqh92n8kkjz61zwhr7g16f0gmr297z2rg1j5pj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.28.1"; sha256 = "0g5a5w34263psh90mp1403m9bh3pcfw6z29vlzdpllzbifk0licr"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.34.0"; sha256 = "0dgn51k142f73l6fk4bsqrpwqhcw6s8y98548kczbzy7qxcnyp82"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.34.0"; sha256 = "0c01dqya958z9ypf0155aqdkvkz9j4j5mgnygxzkisri2cs2w7gs"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.28.1"; sha256 = "15bq83wi4h8f1lqinijdqd7vg6n2v77hyza20mjqcp1h3hl2vj43"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.34.0"; sha256 = "0fm4nrihhqn4wrcj2q06rzfrfzgzilb7ch3izkv89c4q74x0yhkb"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "6.28.1"; sha256 = "03zmp6bsxg4chm89pl5sh506jc19aljxbfsvbqazcci5wqyacnr8"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "6.28.1"; sha256 = "0p1ib8559h2i290v7qyz8rq2aybdknplx1p36ylik695l7b3rqvm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.28.1"; sha256 = "0ckpjjdy2rv1z7ivqrkc7z16rcqygxzs0la80g8df68p4xxfa0c5"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.34.0"; sha256 = "1vkjwryz4wdsaawfq3r80qrmfiyv2zp9y6fzkf2014sqw4nf1vwl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.1"; sha256 = "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.1"; sha256 = "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "8.0.0"; sha256 = "0055f69q3hbagqp8gl3nk0vfn4qyqyxsxyy7pd0g7wm3z28byzmx"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; sha256 = "1d9b734vnll935661wqkgl7ry60rlh5p876l2bsa930mvfsaqfcv"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; sha256 = "1mvp3ipw7k33v2qw2yrvc4vl5yzgpk3yxa94gg0gz7wmcmhzvmkd"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.5.1"; sha256 = "0kdxb47rafvk6mx0xkf2pik7b638b2d847jlhzi3fvj6swg3v15b"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.5.1"; sha256 = "1ny97mhld7vzn5xwxvcy1jhfq4mw15wrk9c77z6cg2fydkgawyzx"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.5.1"; sha256 = "1zharnx3vhrfdn761w16ygxyj9ig5zn71346aqkk0nmzlll3gfjf"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "7.5.1"; sha256 = "02vqadkw25y2xij3vhdkbpv245dnmvkqfb8l4xd81dnikhk1haav"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "7.5.1"; sha256 = "18rq0cmb06fg86c27ymh7jcvnqpip42anp9hjdy105x063jbjcym"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.5.1"; sha256 = "14fjr679hwal35mdwdv4w40mnxzfnnx65yc16807zzkyri011zc1"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Validators"; version = "7.5.1"; sha256 = "1hpihwb58zbzs6000v7d33nyfs0y3k1i1isl9v3a8ak07l0p2n53"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.31"; sha256 = "05s1c6bd4592xhy0y3w0cjckg11hb4pci729v59k3i3hl0hbad4s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.31"; sha256 = "10s0p30qzfn9zibp1ldnqar87hqs47ni3rwqpvwx4jn3589cl9sn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.31"; sha256 = "0sah1gf2lccc93n3lmkgiahlz4jwr02cw20bvcwqyikpldy2awds"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.31"; sha256 = "0k16h1fwnvhw1gcx8ib01bidhrls5m56fiy6wldk3ajgs5dif8i6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.31"; sha256 = "19a4ainxj8jxij7ckglbmlnvrjxp72xfgx0r6lbglzh9dhsakwm7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.31"; sha256 = "1wmlwzy9bc1fs38r0vpn3ragp8pkimcq6sicj978yhk7brn52z1p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "0pw2n3j6vbmbghda1cvkhi3c39a49xk0a4w059mfya017adl6kac"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.31"; sha256 = "115c220p0mbk30biaw0sfqprnaghks7lcvvz6n5rsg0kn4fvy7qs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.31"; sha256 = "1cl561dgdk4mj48zw5xwg7a0cafkx8j2wjd4nlv0x3di300k75k5"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "8.0.0"; sha256 = "0xrr8yd34ij7dqnyddkp2awfmf9qn3c89xmw2f3npaa4wnajmx81"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "8.0.0"; sha256 = "1gdx7n45wwia3yvang3ls92sk3wrymqcx9p349j8wba2lyjf9m44"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.6.0"; sha256 = "07pff0y96hj0k0izgmqlxydnx8cpsvfymicwi4m3dix979sdly09"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.34.0"; sha256 = "150ybq4ba9sm3c37d758ngja6wz72f0840d8vfs6bhy6pw0svzwy"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.5.1"; sha256 = "0priwzi8w2rnspppldl2mhi4fh835dpyyy8f7ri6qbqs7n8l746n"; }) (fetchNuGet { pname = "System.Interactive.Async"; version = "6.0.1"; sha256 = "17zzdxx7ibfwnxspxxi197a0gfgcqdzgrcza8dlwj13yi9vf8b73"; }) (fetchNuGet { pname = "System.IO.Hashing"; version = "6.0.0"; sha256 = "0lga30s3cllg2jkwldgabwrb0jg3dzj859bwj95xhnm3zcklnb41"; }) (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; sha256 = "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; }) (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; sha256 = "0scb0lp7wbgcinaa4kqiqs7b8i5nx4ppfad81138jiwd1sl37pyp"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) ] diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index f12a0bc86261..bffb16671ffb 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -2,30 +2,37 @@ lib, buildDotnetModule, fetchFromGitHub, - garnet, dotnetCorePackages, + nix-update-script, }: -buildDotnetModule { +buildDotnetModule rec { pname = "garnet"; - version = "1.0.6"; + version = "1.0.15"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; - rev = "v${garnet.version}"; - hash = "sha256-GBXRRLP4bBvKHr7tqvrOFFkTpUiiSYxj3DBrrehIl84="; + rev = "v${version}"; + hash = "sha256-SpkhOztUh28N853+6BBQnVRBgphxJARLJXQzmXJwPyY="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_7_0 sdk_8_0 ]; + dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; - dotnetInstallFlags = ["-f" "net8.0"]; + dotnetBuildFlags = [ + "-f" + "net8.0" + ]; + dotnetInstallFlags = dotnetBuildFlags; - meta = with lib; { - mainProgram = "GarnetServer"; + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Remote cache-store from Microsoft Research"; longDescription = '' A remote cache-store that offers strong performance, scalability, @@ -33,8 +40,9 @@ buildDotnetModule { and compatibility with existing Redis clients ''; homepage = "https://microsoft.github.io/garnet/"; - changelog = "https://github.com/microsoft/garnet/releases/tag/v${garnet.version}"; - license = licenses.mit; - maintainers = with maintainers; [getchoo]; + changelog = "https://github.com/microsoft/garnet/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "GarnetServer"; }; } diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index bfa31daee5f3..577a1ea1ca3d 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gat"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; rev = "refs/tags/v${version}"; - hash = "sha256-aQ7EEB+yJ78vT/LskYsnUya6rIID1AvdaUWzr1oWV3k="; + hash = "sha256-QIC3SvuCu8HIwxieNnSsbBa8nTL5aL46eUDpti2gmJU="; }; - vendorHash = "sha256-q6g3pXWKIWanGPxOxsKUEuP8Hcc31GCm64RbOAhQTfE="; + vendorHash = "sha256-xLoLLn9lsEZ+SjIbVRzhwM9mXkltfA0Zoiz1T7hpTEc="; CGO_ENABLED = 0; diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix index 48aaa97f8b7e..2498dc45b5ee 100644 --- a/pkgs/by-name/ga/gate/package.nix +++ b/pkgs/by-name/ga/gate/package.nix @@ -5,7 +5,7 @@ let pname = "gate"; - version = "0.37.1"; + version = "0.38.0"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "minekube"; repo = "gate"; rev = "refs/tags/v${version}"; - hash = "sha256-2oWC6l6SFrulk0EPLVtFfMKfVPHZFOngKjvOLprg/Yk="; + hash = "sha256-kiVyrmAXRDreGIBq9bJhscULjbPgoDVv8kw9APJ5TQk="; }; vendorHash = "sha256-JaBcGcqFqp9Il3FyU/QwThuggzPg8HWScvFHEAgtgBU="; diff --git a/pkgs/by-name/gc/gcp-scanner/package.nix b/pkgs/by-name/gc/gcp-scanner/package.nix index a577790d16a6..0e16965f63f0 100644 --- a/pkgs/by-name/gc/gcp-scanner/package.nix +++ b/pkgs/by-name/gc/gcp-scanner/package.nix @@ -20,7 +20,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools setuptools-git-versioning - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/by-name/ge/geary/package.nix similarity index 98% rename from pkgs/desktops/gnome/misc/geary/default.nix rename to pkgs/by-name/ge/geary/package.nix index 461402dda8b3..565ed9ae2d23 100644 --- a/pkgs/desktops/gnome/misc/geary/default.nix +++ b/pkgs/by-name/ge/geary/package.nix @@ -143,7 +143,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix new file mode 100644 index 000000000000..f574f30a9c85 --- /dev/null +++ b/pkgs/by-name/ge/gemmi/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + zlib, + enablePython ? true, + python3Packages, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gemmi"; + version = "0.6.6"; + + src = fetchFromGitHub { + owner = "project-gemmi"; + repo = "gemmi"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-S31oCp6kLSYgmRaW7Q9/dMhjJ5Y0sK3WPpg2/ZMPyMg="; + }; + + nativeBuildInputs = + [ cmake ] + ++ lib.optionals enablePython ( + with python3Packages; + [ + pybind11 + python + pythonImportsCheckHook + ] + ); + + buildInputs = [ zlib ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_PYTHON" enablePython) + (lib.cmakeFeature "PYTHON_INSTALL_DIR" "${python3Packages.python.sitePackages}") + ]; + + doCheck = true; + + pythonImportsCheck = [ "gemmi" ]; + + doInstallCheck = enablePython; + + nativeInstallCheckInputs = [ python3Packages.pytestCheckHook ]; + + pytestFlagsArray = [ "../tests" ]; + + passthru.tests = { + version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; + + meta = { + description = "Macromolecular crystallography library and utilities"; + homepage = "https://github.com/project-gemmi/gemmi"; + changelog = "https://github.com/project-gemmi/gemmi/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "gemmi"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ge/geopard/package.nix b/pkgs/by-name/ge/geopard/package.nix index 4966ee60aa43..4562b95d442a 100644 --- a/pkgs/by-name/ge/geopard/package.nix +++ b/pkgs/by-name/ge/geopard/package.nix @@ -14,20 +14,20 @@ , glib-networking }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geopard"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ranfdev"; repo = "geopard"; - rev = "v${version}"; - hash = "sha256-QHqhjoiKiwTBDMDhb7Agqe0/o2LyLDs2kl/HC4UfayY="; + rev = "v${finalAttrs.version}"; + hash = "sha256-etx8YPEFGSNyiSLpTNIXTZZiLSgAntQsM93On7dPGI0="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit pname version src; - hash = "sha256-AmGwsSRrZK+oSnkn9Xzmia/Kbkw19v0nb1kFJtymqOs="; + inherit (finalAttrs) pname version src; + hash = "sha256-YVbaXGGwQaqjUkA47ryW1VgJpZTx5ApRGdCcB5aA71M="; }; nativeBuildInputs = [ @@ -47,12 +47,12 @@ stdenv.mkDerivation rec { glib-networking ]; - meta = with lib; { + meta = { homepage = "https://github.com/ranfdev/Geopard"; description = "Colorful, adaptive gemini browser"; - maintainers = with maintainers; [ jfvillablanca aleksana ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ jfvillablanca aleksana ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; mainProgram = "geopard"; }; -} +}) diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix index 2ce40c377234..963f578dfe51 100644 --- a/pkgs/by-name/ge/gerbolyze/package.nix +++ b/pkgs/by-name/ge/gerbolyze/package.nix @@ -2,16 +2,17 @@ , stdenv , python3Packages , fetchFromGitHub +, gitUpdater , resvg }: let - version = "3.1.7"; + version = "3.1.9"; src = fetchFromGitHub { owner = "jaseg"; repo = "gerbolyze"; rev = "v${version}"; - hash = "sha256-0iTelSlUJUafclRowwsUAoO44nc/AXaOKXnZKfKOIaE="; + hash = "sha256-bisLln3Y239HuJt0MkrCU+6vLLbEDxfTjEJMkcbE/wE="; fetchSubmodules = true; }; @@ -43,22 +44,6 @@ let platforms = platforms.linux; }; }; - - # FIXME: check if this downgrade is still required when bumping gerbolyze - # https://github.com/jaseg/gerbolyze/issues/47 - resvg' = resvg.overrideAttrs (old: rec { - version = "0.41.0"; - src = old.src.override { - rev = "v${version}"; - hash = "sha256-plZiyEiBWeV2mwTsNK5Je8Axs/hcHH8aV2VpOix6QCY="; - }; - cargoDeps = old.cargoDeps.overrideAttrs (lib.const { - name = "${old.pname}-${version}-vendor.tar.gz"; - inherit src; - outputHash = "sha256-U7xzb9e9wh9XbLvlYQ0ofIjH8FuSzVcrXnrehQmZgww="; - }); - }); - in python3Packages.buildPythonApplication rec { inherit version src; pname = "gerbolyze"; @@ -77,7 +62,7 @@ in python3Packages.buildPythonApplication rec { python3Packages.python-slugify python3Packages.lxml python3Packages.gerbonara - resvg' + resvg svg-flatten ]; @@ -95,7 +80,11 @@ in python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "gerbolyze" ]; - nativeCheckInputs = [ python3Packages.pytestCheckHook resvg' svg-flatten ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook resvg svg-flatten ]; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; meta = with lib; { description = "Directly render SVG overlays into Gerber and Excellon files"; diff --git a/pkgs/by-name/ge/getmail6/package.nix b/pkgs/by-name/ge/getmail6/package.nix index d6e5c5dc23a1..a2dde5754a4f 100644 --- a/pkgs/by-name/ge/getmail6/package.nix +++ b/pkgs/by-name/ge/getmail6/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.19.01"; + version = "6.19.02"; pyproject = true; src = fetchFromGitHub { owner = "getmail6"; repo = "getmail6"; rev = "refs/tags/v${version}"; - hash = "sha256-Q3FQmliWQ8BB/U4RWw1z5I721jw8LGRLPjI9eKELd0g="; + hash = "sha256-ThyK30IT7ew5zQ3QAoxdr6ElQEWp2yJcmkLT5NmMfY0="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/gg/gg/package.nix b/pkgs/by-name/gg/gg/package.nix index c07dd9bc99d5..91d0b04da065 100644 --- a/pkgs/by-name/gg/gg/package.nix +++ b/pkgs/by-name/gg/gg/package.nix @@ -32,6 +32,7 @@ buildGoModule rec{ meta = with lib; { homepage = "https://github.com/mzz2017/gg"; + changelog = "https://github.com/mzz2017/gg/releases/tag/${src.rev}"; description = "Command-line tool for one-click proxy in your research and development"; license = licenses.agpl3Only; mainProgram = "gg"; diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index bf0ac23a7b0f..0160d117a12e 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -5,13 +5,13 @@ buildDotnetModule rec { pname = "gh-gei"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cz301JzGZTAu0DcxmFpEmBemEij1+OIw4dB2PpwyYS0="; + sha256 = "sha256-F1sxT9wh/K6VP7n1SlmmvmHlcgxDJw6Rht2hPIiRFjE="; }; projectFile = "src/gei/gei.csproj"; diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/by-name/gh/ghex/package.nix similarity index 97% rename from pkgs/desktops/gnome/apps/ghex/default.nix rename to pkgs/by-name/gh/ghex/package.nix index f58ca108e905..0f3aefaa56be 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/by-name/gh/ghex/package.nix @@ -72,7 +72,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "ghex"; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/by-name/gh/ghunt/package.nix b/pkgs/by-name/gh/ghunt/package.nix index 8f26785bda8f..580f3a5e2847 100644 --- a/pkgs/by-name/gh/ghunt/package.nix +++ b/pkgs/by-name/gh/ghunt/package.nix @@ -18,7 +18,6 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/by-name/gi/git-fixup/package.nix b/pkgs/by-name/gi/git-fixup/package.nix new file mode 100644 index 000000000000..af975e6e54ae --- /dev/null +++ b/pkgs/by-name/gi/git-fixup/package.nix @@ -0,0 +1,42 @@ +{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, git, coreutils, gnused, gnugrep }: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "git-fixup"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "keis"; + repo = "git-fixup"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-Mue2xgYxJSEu0VoDmB7rnoSuzyT038xzETUO1fwptrs="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=" + ]; + + installFlags = [ + "install" + "install-fish" + "install-zsh" + ]; + + postInstall = '' + wrapProgram $out/bin/git-fixup \ + --prefix PATH : "${lib.makeBinPath [ git coreutils gnused gnugrep ]}" + ''; + + meta = { + description = "Fighting the copy-paste element of your rebase workflow"; + homepage = "https://github.com/keis/git-fixup"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ michaeladler ]; + platforms = lib.platforms.all; + mainProgram = "git-fixup"; + }; +}) diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix index 11835f68a4aa..8d9fcafe8ebe 100644 --- a/pkgs/by-name/gi/git-gr/package.nix +++ b/pkgs/by-name/gi/git-gr/package.nix @@ -60,6 +60,7 @@ rustPlatform.buildRustPackage { meta = with lib; { homepage = "https://github.com/9999years/git-gr"; + changelog = "https://github.com/9999years/git-gr/releases/tag/v${version}"; description = "Gerrit CLI client"; license = [ licenses.mit ]; maintainers = [ maintainers._9999years ]; diff --git a/pkgs/by-name/gi/git-instafix/package.nix b/pkgs/by-name/gi/git-instafix/package.nix index 84f1709f304a..74355827f2b4 100644 --- a/pkgs/by-name/gi/git-instafix/package.nix +++ b/pkgs/by-name/gi/git-instafix/package.nix @@ -13,7 +13,7 @@ let maintainers ; - version = "0.2.5"; + version = "0.2.7"; in rustPlatform.buildRustPackage { pname = "git-instafix"; @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage { owner = "quodlibetor"; repo = "git-instafix"; rev = "v${version}"; - hash = "sha256-tizA5BLZZ/9gfHv2X8is7EJD1reMvfA7c6JETUoUgvI="; + hash = "sha256-Uz+KQ8cQT3v97EtmbAv2II30dUrFD0hMo/GhnqcdBOs="; }; - cargoHash = "sha256-kIIwswj8mfpY382O0bdMoSk6+T+614l2QCeRgz3ZxEY="; + cargoHash = "sha256-12UkZyyu4KH3dcCadr8UhK8DTtVjcsjYzt7kiNLpUqU="; buildInputs = [ libgit2 ]; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/gi/git-my/package.nix b/pkgs/by-name/gi/git-my/package.nix new file mode 100644 index 000000000000..9af49a536b4f --- /dev/null +++ b/pkgs/by-name/gi/git-my/package.nix @@ -0,0 +1,39 @@ +{ + bash, + fetchFromGitHub, + lib, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "git-my"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "davidosomething"; + repo = "git-my"; + rev = finalAttrs.version; + sha256 = "0jji5zw25jygj7g4f6f3k0p0s9g37r8iad8pa0s67cxbq2v4sc0v"; + }; + + buildInputs = [ bash ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -Dm 755 -t "$out/bin" -- git-my + + runHook postInstall + ''; + + meta = { + description = "List remote branches if they're merged and/or available locally"; + homepage = "https://github.com/davidosomething/git-my"; + license = lib.licenses.free; + maintainers = [ ]; + platforms = lib.platforms.all; + mainProgram = "git-my"; + }; +}) diff --git a/pkgs/by-name/gi/git-standup/package.nix b/pkgs/by-name/gi/git-standup/package.nix index d40d100869ee..ba8af35849f4 100644 --- a/pkgs/by-name/gi/git-standup/package.nix +++ b/pkgs/by-name/gi/git-standup/package.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Recall what you did on the last working day"; homepage = "https://github.com/kamranahmedse/git-standup"; + changelog = "https://github.com/kamranahmedse/git-standup/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/gi/git-together/package.nix b/pkgs/by-name/gi/git-together/package.nix index 1fd062760de0..e71668a83a73 100644 --- a/pkgs/by-name/gi/git-together/package.nix +++ b/pkgs/by-name/gi/git-together/package.nix @@ -26,6 +26,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-mIkhXVuSgcsQf4be7NT0R8rkN9tdgim41gqjbq3ndPA="; meta = with lib; { + changelog = "https://github.com/kejadlen/git-together/releases/tag/${src.rev}"; description = "Better commit attribution while pairing without messing with your git workflow"; homepage = "https://github.com/kejadlen/git-together"; license = licenses.mit; diff --git a/pkgs/by-name/gi/git-toolbelt/package.nix b/pkgs/by-name/gi/git-toolbelt/package.nix index df67de9946a2..647bde81c5ee 100644 --- a/pkgs/by-name/gi/git-toolbelt/package.nix +++ b/pkgs/by-name/gi/git-toolbelt/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "git-toolbelt"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "nvie"; repo = "git-toolbelt"; rev = "v${finalAttrs.version}"; - hash = "sha256-0abO3AYpN6TKYFtrK9lP5k57qWI7ByumaO/5dgKDqQc="; + hash = "sha256-ANqv/iIDUyy2G4pKSw+2sutMEA0WhPN3OKfPTm5lwDU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix index d050436c513b..f038db5a9dac 100644 --- a/pkgs/by-name/gi/git-upstream/package.nix +++ b/pkgs/by-name/gi/git-upstream/package.nix @@ -21,6 +21,7 @@ in meta = with lib; { homepage = "https://github.com/9999years/git-upstream"; + changelog = "https://github.com/9999years/git-upstream/releases/tag/v${version}"; description = "Shortcut for `git push --set-upstream`"; license = [licenses.mit]; maintainers = [maintainers._9999years]; diff --git a/pkgs/by-name/gi/gitbutler/Cargo.lock b/pkgs/by-name/gi/gitbutler/Cargo.lock index 73cea1430a8f..2eae3dd699bb 100644 --- a/pkgs/by-name/gi/gitbutler/Cargo.lock +++ b/pkgs/by-name/gi/gitbutler/Cargo.lock @@ -1131,16 +1131,15 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.2" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest", "fiat-crypto", - "platforms", "rustc_version", "subtle", ] @@ -1582,18 +1581,6 @@ dependencies = [ "zune-inflate", ] -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - [[package]] name = "faster-hex" version = "0.9.0" @@ -2142,7 +2129,6 @@ dependencies = [ "regex", "reqwest 0.12.4", "resolve-path", - "rusqlite", "serde", "serde_json", "sha2", @@ -2166,6 +2152,7 @@ name = "gitbutler-git" version = "0.0.0" dependencies = [ "futures", + "gix-path", "nix 0.29.0", "rand 0.8.5", "serde", @@ -2177,6 +2164,24 @@ dependencies = [ "windows-named-pipe", ] +[[package]] +name = "gitbutler-notify-debouncer" +version = "0.0.0" +dependencies = [ + "crossbeam-channel", + "deser-hjson", + "file-id", + "gitbutler-notify-debouncer", + "mock_instant", + "notify", + "parking_lot 0.12.3", + "pretty_assertions", + "rstest", + "serde", + "tracing", + "walkdir", +] + [[package]] name = "gitbutler-tauri" version = "0.0.0" @@ -2232,26 +2237,15 @@ version = "0.0.0" dependencies = [ "anyhow", "backoff", - "crossbeam-channel", - "deser-hjson", - "file-id", "futures", "gitbutler-core", - "gitbutler-watcher", + "gitbutler-notify-debouncer", "gix", - "itertools 0.13.0", - "mock_instant", "notify", - "parking_lot 0.12.3", - "pretty_assertions", - "rand 0.8.5", - "rstest", - "serde", "thiserror", "tokio", "tokio-util", "tracing", - "walkdir", ] [[package]] @@ -2692,9 +2686,9 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23623cf0f475691a6d943f898c4d0b89f5c1a2a64d0f92bce0e0322ee6528783" +checksum = "ca987128ffb056d732bd545db5db3d8b103d252fbf083c2567bb0796876619a4" dependencies = [ "bstr", "gix-trace", @@ -3121,15 +3115,6 @@ dependencies = [ "allocator-api2", ] -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.3", -] - [[package]] name = "hdrhistogram" version = "7.5.4" @@ -3803,17 +3788,6 @@ dependencies = [ "redox_syscall 0.4.1", ] -[[package]] -name = "libsqlite3-sys" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - [[package]] name = "libssh2-sys" version = "0.3.0" @@ -4788,12 +4762,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - [[package]] name = "plist" version = "1.6.1" @@ -5440,20 +5408,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "rusqlite" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" -dependencies = [ - "bitflags 2.5.0", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - [[package]] name = "rust_decimal" version = "1.35.0" @@ -6293,9 +6247,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri" -version = "1.6.2" +version = "1.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "047aefcc7721bfb8024a9bc39d4719112262610502de7a224fa62c4570cd78d4" +checksum = "77567d2b3b74de4588d544147142d02297f3eaa171a25a065252141d8597a516" dependencies = [ "anyhow", "bytes", @@ -6306,6 +6260,7 @@ dependencies = [ "encoding_rs", "flate2", "futures-util", + "getrandom 0.2.12", "glib", "glob", "gtk", @@ -6366,9 +6321,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1554c5857f65dbc377cefb6b97c8ac77b1cb2a90d30d3448114d5d6b48a77fc" +checksum = "c3a1d90db526a8cdfd54444ad3f34d8d4d58fa5c536463915942393743bd06f8" dependencies = [ "base64 0.21.7", "brotli", @@ -6392,11 +6347,11 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "1.4.3" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277abf361a3a6993ec16bcbb179de0d6518009b851090a01adfea12ac89fa875" +checksum = "6a582d75414250122e4a597b9dd7d3c910a2c77906648fc2ac9353845ff0feec" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "syn 1.0.109", @@ -6481,9 +6436,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2d0652aa2891ff3e9caa2401405257ea29ab8372cce01f186a5825f1bd0e76" +checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4" dependencies = [ "gtk", "http 0.2.12", @@ -6502,9 +6457,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.14.5" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "067c56fc153b3caf406d7cd6de4486c80d1d66c0f414f39e94cb2f5543f6445f" +checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655" dependencies = [ "cocoa", "gtk", @@ -7812,9 +7767,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.24.7" +version = "0.24.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ad85d0e067359e409fcb88903c3eac817c392e5d638258abfb3da5ad8ba6fc4" +checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45" dependencies = [ "base64 0.13.1", "block", diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index a986af79763d..adfcf8dc4fc8 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -23,13 +23,13 @@ }: rustPlatform.buildRustPackage rec { pname = "gitbutler"; - version = "0.12.2"; + version = "0.12.7"; src = fetchFromGitHub { owner = "gitbutlerapp"; repo = "gitbutler"; rev = "release/${version}"; - hash = "sha256-m2hvcnY2h4DYtM4ME+dxmwnmUh768CHSoAq5VsKl6Sk="; + hash = "sha256-TNaWLcdPECK1y04aYW4bFk7YKlW+z5kny4uyG0TA5ps="; }; # deactivate the upstream updater in tauri configuration @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-+4SPDvhpvR1bjwTcyLO3HeBuZGL3P03OaEnOvcX9t9c="; + hash = "sha256-HKsb+96YklgPoqc7bA6fMuRQzWFGmKSBOcF5I0BO3oQ="; }; nativeBuildInputs = [ @@ -105,12 +105,12 @@ rustPlatform.buildRustPackage rec { buildGoModule ( args // rec { - version = "0.18.20"; + version = "0.20.2"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI="; + hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index 68cd69d380b0..cbafff78bc39 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -38,16 +38,16 @@ let }; in buildGoModule rec { pname = "gitea"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${gitea.version}"; - hash = "sha256-LdNEiPch2BZNYMOjE9yWsq78g6DolMjM5wUci3jXj30="; + hash = "sha256-s7su3gMdXv2sT1uYYtx29n7QDvmPU9QB3QR6ctOlE58="; }; - vendorHash = "sha256-8VoJR4p2WnhG6nTFMzBlcrd/B6UwaOU3Q/rnDx9MtWc="; + vendorHash = "sha256-nzhjIfQMzSf1nuBMTIe0xn+NMDFbDZ9jRHu8Nwzmp4w="; outputs = [ "out" "data" ]; @@ -93,8 +93,10 @@ in buildGoModule rec { data-compressed = runCommand "gitea-data-compressed" { nativeBuildInputs = [ brotli xorg.lndir ]; } '' - mkdir $out - lndir ${gitea.data}/ $out/ + mkdir -p $out/{options,public,templates} + lndir ${frontend}/public $out/public + lndir ${gitea.data}/options $out/options + lndir ${gitea.data}/templates $out/templates # Create static gzip and brotli files find -L $out -type f -regextype posix-extended -iregex '.*\.(css|html|js|svg|ttf|txt)' \ diff --git a/pkgs/desktops/gnome/misc/gitg/default.nix b/pkgs/by-name/gi/gitg/package.nix similarity index 100% rename from pkgs/desktops/gnome/misc/gitg/default.nix rename to pkgs/by-name/gi/gitg/package.nix diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix index ae882fdfddaf..606a7770dc2f 100644 --- a/pkgs/by-name/gi/github-desktop/package.nix +++ b/pkgs/by-name/gi/github-desktop/package.nix @@ -4,7 +4,7 @@ , autoPatchelfHook , wrapGAppsHook3 , makeWrapper -, gnome +, gnome-keyring , libsecret , git , curl @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; buildInputs = [ - gnome.gnome-keyring + gnome-keyring xorg.libXdamage xorg.libX11 libsecret diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix index 027036915a5b..0be8da2880ab 100644 --- a/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "gitlab-ci-local"; - version = "4.51.0"; + version = "4.52.0"; src = fetchFromGitHub { owner = "firecow"; repo = "gitlab-ci-local"; rev = version; - hash = "sha256-D1zviTj7isAuEyzRYEyjq4sx+jo/U3ZQZLFr35/1ZNo="; + hash = "sha256-qNrZInSLb7IA8YTRPKlTWJ42uavrNTV5A62twwjuOag="; }; - npmDepsHash = "sha256-ocrSOPLbWkU0LBpWAdl54hWr+7gE3z2sy8lJilGsExo="; + npmDepsHash = "sha256-3Teow+CyUB6LrkSuOs1YYsdrxsorgJnU2g6k3XBL9S0="; postPatch = '' # remove cleanup which runs git commands diff --git a/pkgs/by-name/gi/gitlab-release-cli/package.nix b/pkgs/by-name/gi/gitlab-release-cli/package.nix new file mode 100644 index 000000000000..64f1f24e744b --- /dev/null +++ b/pkgs/by-name/gi/gitlab-release-cli/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitLab, + buildGoModule, + stdenv, +}: + +buildGoModule rec { + pname = "gitlab-release-cli"; + version = "0.18.0"; + + src = fetchFromGitLab { + owner = "gitlab-org"; + repo = "release-cli"; + rev = "v${version}"; + hash = "sha256-CCSice/uMf2OfFNEpwwhX6A0wrSsC1v9XWEhAAwQRso="; + }; + + vendorHash = "sha256-UwDMRsWbk8rEv2d5FssIzCLby68YZULoxd3/JGLsCQU="; + + checkFlags = lib.optionals stdenv.isDarwin [ + # Skip failing test + "-skip TestHTTPSCustomCA" + ]; + + meta = { + description = "Toolset to create, retrieve and update releases on GitLab"; + homepage = "https://gitlab.com/gitlab-org/release-cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kilimnik ]; + mainProgram = "release-cli"; + }; +} diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index 3a7689c925c4..21d2f989e68f 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.21.1"; + version = "0.22.1"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-cbH2gXMBD/D+dqdYLcFZxvhuSZklw2hi2+9mrqu+pjc="; + hash = "sha256-bvIks6MpKkTr5CdfzstNu+8yPaiWd6zhUdIZWrn1V78="; }; - cargoHash = "sha256-UB4z0jh0AQAareRbS7l/402u0yZxEV748xzE/fQcQfY="; + cargoHash = "sha256-+B/omGci09CjrQkeKav5SVGTF5gIiBQIO/8VbSjsaj0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/gitversion/package.nix b/pkgs/by-name/gi/gitversion/package.nix index 16c3d586dc8a..3c59f26860e7 100644 --- a/pkgs/by-name/gi/gitversion/package.nix +++ b/pkgs/by-name/gi/gitversion/package.nix @@ -2,16 +2,17 @@ , buildDotnetGlobalTool }: -buildDotnetGlobalTool { +buildDotnetGlobalTool rec { pname = "dotnet-gitversion"; nugetName = "GitVersion.Tool"; version = "5.12.0"; - nugetSha256 = "sha256-dclYG2D0uSYqf++y33JCefkYLwbuRCuKd3qLMnx3BDI="; + nugetHash = "sha256-dclYG2D0uSYqf++y33JCefkYLwbuRCuKd3qLMnx3BDI="; meta = with lib; { description = "From git log to SemVer in no time"; homepage = "https://gitversion.net/"; + changelog = "https://github.com/GitTools/GitVersion/releases/tag/${version}"; downloadPage = "https://github.com/GitTools/GitVersion"; license = licenses.mit; platforms = platforms.linux ++ platforms.windows ++ platforms.darwin; diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index 2b4787811775..95b428e0be67 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -1,7 +1,9 @@ -{ lib, -buildGoModule, -fetchFromGitHub, -nix-update-script +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + nixosTests, }: buildGoModule rec { @@ -10,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "glanceapp"; - repo = pname; + repo = "glance"; rev = "v${version}"; hash = "sha256-37DmLZ8ESJwB2R8o5WjeypKsCQwarF3x8UYz1OQT/tM="; }; @@ -19,14 +21,19 @@ buildGoModule rec { excludedPackages = [ "scripts/build-and-ship" ]; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests = { + service = nixosTests.glance; + }; + }; - meta = with lib; { + meta = { homepage = "https://github.com/glanceapp/glance"; changelog = "https://github.com/glanceapp/glance/releases/tag/v${version}"; description = "Self-hosted dashboard that puts all your feeds in one place"; mainProgram = "glance"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ dvn0 ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ dvn0 ]; }; } diff --git a/pkgs/by-name/gl/glrnvim/package.nix b/pkgs/by-name/gl/glrnvim/package.nix new file mode 100644 index 000000000000..076eeb295d99 --- /dev/null +++ b/pkgs/by-name/gl/glrnvim/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "glrnvim"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "beeender"; + repo = "glrnvim"; + rev = "v${version}"; + sha256 = "sha256-n3t3s3fzmBGXRDydYxNJ13itKul8dyLNW6HP8Di4hY0="; + }; + + cargoHash = "sha256-cHEse+pXwgPTL8GJyY4s1mhWXGTY8Fnn2rFpA5SNerY="; + + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + DiskArbitration + Foundation + ]); + + postInstall = '' + install -Dm644 glrnvim.desktop -t $out/share/applications + install -Dm644 glrnvim.svg $out/share/icons/hicolor/scalable/apps/glrnvim.svg + ''; + + meta = { + description = "Really fast & stable neovim GUI which could be accelerated by GPU"; + homepage = "https://github.com/beeender/glrnvim"; + mainProgram = "glrnvim"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aacebedo ]; + }; +} diff --git a/pkgs/by-name/gm/gmetronome/package.nix b/pkgs/by-name/gm/gmetronome/package.nix index 8c358abbd451..ff501861b895 100644 --- a/pkgs/by-name/gm/gmetronome/package.nix +++ b/pkgs/by-name/gm/gmetronome/package.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Free software metronome and tempo measurement tool"; homepage = "https://gitlab.gnome.org/dqpb/gmetronome"; + changelog = "https://gitlab.gnome.org/dqpb/gmetronome/-/blob/${src.rev}/NEWS"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ aleksana ]; diff --git a/pkgs/by-name/gm/gmic-qt/package.nix b/pkgs/by-name/gm/gmic-qt/package.nix index 9c3d74cbe566..5d097f13f5c6 100644 --- a/pkgs/by-name/gm/gmic-qt/package.nix +++ b/pkgs/by-name/gm/gmic-qt/package.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (variants.${variant}) description; license = lib.licenses.gpl3Plus; mainProgram = "gmic_qt"; - maintainers = with lib.maintainers; [ AndersonTorres lilyinstarlight ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 1ed7224ac5d6..824db435e249 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -111,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.cecill21; maintainers = [ lib.maintainers.AndersonTorres - lib.maintainers.lilyinstarlight ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/gm/gmid/package.nix b/pkgs/by-name/gm/gmid/package.nix index f6f9996b7383..40670bd5fbd5 100644 --- a/pkgs/by-name/gm/gmid/package.nix +++ b/pkgs/by-name/gm/gmid/package.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple and secure Gemini server"; homepage = "https://gmid.omarpolo.com/"; + changelog = "https://gmid.omarpolo.com/changelog.html"; license = licenses.isc; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix b/pkgs/by-name/gn/gnome-autoar/package.nix similarity index 96% rename from pkgs/desktops/gnome/misc/gnome-autoar/default.nix rename to pkgs/by-name/gn/gnome-autoar/package.nix index 8d1adac088e8..dfbcc24898b5 100644 --- a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix +++ b/pkgs/by-name/gn/gnome-autoar/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-autoar"; - attrPath = "gnome.gnome-autoar"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/by-name/gn/gnome-calculator/package.nix similarity index 97% rename from pkgs/desktops/gnome/core/gnome-calculator/default.nix rename to pkgs/by-name/gn/gnome-calculator/package.nix index 3b666976681e..577a8245426a 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/by-name/gn/gnome-calculator/package.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-calculator"; - attrPath = "gnome.gnome-calculator"; }; }; diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/by-name/gn/gnome-calendar/package.nix similarity index 97% rename from pkgs/desktops/gnome/apps/gnome-calendar/default.nix rename to pkgs/by-name/gn/gnome-calendar/package.nix index d56c8114bd04..a751ee382271 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/by-name/gn/gnome-calendar/package.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-common/default.nix b/pkgs/by-name/gn/gnome-common/package.nix similarity index 93% rename from pkgs/desktops/gnome/core/gnome-common/default.nix rename to pkgs/by-name/gn/gnome-common/package.nix index a9d28fcd4cfc..0f9a1269b6ba 100644 --- a/pkgs/desktops/gnome/core/gnome-common/default.nix +++ b/pkgs/by-name/gn/gnome-common/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome.updateScript { packageName = "gnome-common"; attrPath = "gnome.gnome-common"; }; + updateScript = gnome.updateScript { packageName = "gnome-common"; }; }; propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which diff --git a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix b/pkgs/by-name/gn/gnome-dictionary/package.nix similarity index 94% rename from pkgs/desktops/gnome/core/gnome-dictionary/default.nix rename to pkgs/by-name/gn/gnome-dictionary/package.nix index 0fed6638f97e..9db61b591eb7 100644 --- a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix +++ b/pkgs/by-name/gn/gnome-dictionary/package.nix @@ -15,6 +15,7 @@ , docbook_xsl , docbook_xml_dtd_43 , gnome +, adwaita-icon-theme , gtk3 , glib , gsettings-desktop-schemas @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { gtk3 glib gsettings-desktop-schemas - gnome.adwaita-icon-theme + adwaita-icon-theme ]; doCheck = true; @@ -71,7 +72,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-dictionary"; - attrPath = "gnome.gnome-dictionary"; }; }; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/Archive/gnome-dictionary"; description = "Dictionary is the GNOME application to look up definitions"; mainProgram = "gnome-dictionary"; - maintainers = teams.gnome.members; + maintainers = [ ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix similarity index 94% rename from pkgs/desktops/gnome/core/gnome-disk-utility/default.nix rename to pkgs/by-name/gn/gnome-disk-utility/package.nix index 536e71f630ee..4ca25e2cf822 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -15,6 +15,7 @@ , libnotify , itstool , gnome +, adwaita-icon-theme , libxml2 , gsettings-desktop-schemas , libcanberra-gtk3 @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { libdvdread libcanberra-gtk3 udisks2 - gnome.adwaita-icon-theme + adwaita-icon-theme systemd gnome.gnome-settings-daemon gsettings-desktop-schemas @@ -66,7 +67,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-disk-utility"; - attrPath = "gnome.gnome-disk-utility"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix similarity index 96% rename from pkgs/desktops/gnome/core/gnome-font-viewer/default.nix rename to pkgs/by-name/gn/gnome-font-viewer/package.nix index 5a0f8d82cb53..ddb98b787099 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-font-viewer"; - attrPath = "gnome.gnome-font-viewer"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/by-name/gn/gnome-keyring/package.nix similarity index 98% rename from pkgs/desktops/gnome/core/gnome-keyring/default.nix rename to pkgs/by-name/gn/gnome-keyring/package.nix index d8a455b0b9fa..01be1e7aa900 100644 --- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/pkgs/by-name/gn/gnome-keyring/package.nix @@ -95,7 +95,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-keyring"; - attrPath = "gnome.gnome-keyring"; }; }; diff --git a/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix b/pkgs/by-name/gn/gnome-packagekit/package.nix similarity index 96% rename from pkgs/desktops/gnome/misc/gnome-packagekit/default.nix rename to pkgs/by-name/gn/gnome-packagekit/package.nix index 6e2f9168e54f..699e24fba18e 100644 --- a/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix +++ b/pkgs/by-name/gn/gnome-packagekit/package.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-packagekit"; - attrPath = "gnome.gnome-packagekit"; }; }; diff --git a/pkgs/desktops/gnome/misc/pomodoro/fix-schema-path.patch b/pkgs/by-name/gn/gnome-pomodoro/fix-schema-path.patch similarity index 100% rename from pkgs/desktops/gnome/misc/pomodoro/fix-schema-path.patch rename to pkgs/by-name/gn/gnome-pomodoro/fix-schema-path.patch diff --git a/pkgs/desktops/gnome/misc/pomodoro/default.nix b/pkgs/by-name/gn/gnome-pomodoro/package.nix similarity index 100% rename from pkgs/desktops/gnome/misc/pomodoro/default.nix rename to pkgs/by-name/gn/gnome-pomodoro/package.nix diff --git a/pkgs/desktops/gnome/core/gnome-screenshot/default.nix b/pkgs/by-name/gn/gnome-screenshot/package.nix similarity index 96% rename from pkgs/desktops/gnome/core/gnome-screenshot/default.nix rename to pkgs/by-name/gn/gnome-screenshot/package.nix index b8fa9a9f0c29..e282277469f0 100644 --- a/pkgs/desktops/gnome/core/gnome-screenshot/default.nix +++ b/pkgs/by-name/gn/gnome-screenshot/package.nix @@ -16,6 +16,7 @@ , appstream-glib , desktop-file-utils , gnome +, adwaita-icon-theme , gsettings-desktop-schemas }: @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { glib libcanberra-gtk3 libhandy - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas ]; @@ -68,7 +69,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch b/pkgs/by-name/gn/gnome-system-monitor/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch rename to pkgs/by-name/gn/gnome-system-monitor/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix similarity index 94% rename from pkgs/desktops/gnome/core/gnome-system-monitor/default.nix rename to pkgs/by-name/gn/gnome-system-monitor/package.nix index bc7caa3ad27b..27c4576e0170 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix @@ -15,6 +15,7 @@ , gsettings-desktop-schemas , itstool , gnome +, adwaita-icon-theme , librsvg , gdk-pixbuf , libgtop @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { gtkmm4 libgtop gdk-pixbuf - gnome.adwaita-icon-theme + adwaita-icon-theme librsvg gsettings-desktop-schemas systemd @@ -65,7 +66,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-system-monitor"; - attrPath = "gnome.gnome-system-monitor"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/by-name/gn/gnome-terminal/package.nix similarity index 100% rename from pkgs/desktops/gnome/core/gnome-terminal/default.nix rename to pkgs/by-name/gn/gnome-terminal/package.nix diff --git a/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix b/pkgs/by-name/gn/gnome-themes-extra/package.nix similarity index 81% rename from pkgs/desktops/gnome/core/gnome-themes-extra/default.nix rename to pkgs/by-name/gn/gnome-themes-extra/package.nix index 52aededca0fe..c40c81b8245f 100644 --- a/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix +++ b/pkgs/by-name/gn/gnome-themes-extra/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, gtk3, gnome, librsvg, pkg-config, pango, atk, gtk2 +{ lib, stdenv, fetchurl, intltool, gtk3, gnome, adwaita-icon-theme, librsvg, pkg-config, pango, atk, gtk2 , gdk-pixbuf, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool gtk3 ]; buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; - propagatedBuildInputs = [ gnome.adwaita-icon-theme hicolor-icon-theme ]; + propagatedBuildInputs = [ adwaita-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix similarity index 98% rename from pkgs/desktops/gnome/misc/gnome-tweaks/default.nix rename to pkgs/by-name/gn/gnome-tweaks/package.nix index a145e9e2d8e3..3bbe91007b6d 100644 --- a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/pkgs/by-name/gn/gnome-tweaks/package.nix @@ -80,7 +80,6 @@ python3Packages.buildPythonApplication rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-user-share/default.nix b/pkgs/by-name/gn/gnome-user-share/package.nix similarity index 97% rename from pkgs/desktops/gnome/core/gnome-user-share/default.nix rename to pkgs/by-name/gn/gnome-user-share/package.nix index a9f14ba0437b..1d2368478bb1 100644 --- a/pkgs/desktops/gnome/core/gnome-user-share/default.nix +++ b/pkgs/by-name/gn/gnome-user-share/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "gnome-user-share"; - attrPath = "gnome.gnome-user-share"; }; }; diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix index 204fa79b1f3c..65f845a4dd4d 100644 --- a/pkgs/by-name/go/go-camo/package.nix +++ b/pkgs/by-name/go/go-camo/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-camo"; - version = "2.4.13"; + version = "2.5.1"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nrkc+uYgPES3CfRjmfH/9eM6NL8Vo3kUBX9JHEw/1C4="; + sha256 = "sha256-xNdikp3Kd/VAzn7QjqIrNvifFI0mMTJ5U+zk+QbJAk0="; }; - vendorHash = "sha256-iyZNOooPH1jvT+S9/ETRoXsTwXUIUi1UKmDzhB7NRuE="; + vendorHash = "sha256-xN0FJntfQ2V2IsxD8dEi0vR+psnjGR7G6+ssxNTuzc4="; ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ]; diff --git a/pkgs/by-name/go/goatcounter/package.nix b/pkgs/by-name/go/goatcounter/package.nix new file mode 100644 index 000000000000..208581708837 --- /dev/null +++ b/pkgs/by-name/go/goatcounter/package.nix @@ -0,0 +1,54 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, goatcounter +}: + +buildGoModule rec { + pname = "goatcounter"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "arp242"; + repo = "goatcounter"; + rev = "v${version}"; + sha256 = "sha256-lwiLk/YYxX4QwSDjpU/mAikumGXYMzleRzmPjZGruZU="; + }; + + vendorHash = "sha256-YAb3uBWQc6hWzF1Z5cAg8RzJQSJV+6dkppfczKS832s="; + subPackages = [ "cmd/goatcounter" ]; + modRoot = "."; + + # Derived from the upstream build scripts: + # + # `-trimpath` is used, which `allowGoReference` sets + allowGoReference = true; + # Flags set in the upstream build. + ldflags = [ + "-s" + "-w" + "-X zgo.at/goatcounter/v2.Version=${src.rev}" + ]; + + passthru.tests.version = testers.testVersion { + package = goatcounter; + command = "goatcounter version"; + version = "v${version}"; + }; + + meta = { + description = "Easy web analytics. No tracking of personal data"; + changelog = "https://github.com/arp242/goatcounter/releases/tag/${src.rev}"; + longDescription = '' + GoatCounter is an open source web analytics platform available as a hosted + service (free for non-commercial use) or self-hosted app. It aims to offer easy + to use and meaningful privacy-friendly web analytics as an alternative to + Google Analytics or Matomo. + ''; + homepage = "https://github.com/arp242/goatcounter"; + license = lib.licenses.eupl12; + maintainers = with lib.maintainers; [ tylerjl ]; + mainProgram = "goatcounter"; + }; +} diff --git a/pkgs/by-name/go/gol/package.nix b/pkgs/by-name/go/gol/package.nix index 050fee242f6c..7096d7b854b4 100644 --- a/pkgs/by-name/go/gol/package.nix +++ b/pkgs/by-name/go/gol/package.nix @@ -11,7 +11,7 @@ maven.buildMavenPackage rec { hash = "sha256-F/tMRD+nWn/fRPX7cTan371zlOTxh7oR98wREmokULo="; }; - mvnHash = "sha256-b0nkp23gv4kejac/xrvm3xWo3Z8if7zveNUHBg7ZBm4="; + mvnHash = "sha256-6EX+y7/lGdB5LgW9MIER+KgvtPjvMCDjgq89f1g2GlY="; mvnParameters = "compile assembly:single -Dmaven.test.skip=true"; nativeBuildInputs = [ makeWrapper ]; @@ -20,7 +20,7 @@ maven.buildMavenPackage rec { runHook preInstall mkdir -p $out/{bin,lib} - cp /build/source/target/gol-tool-${version}-jar-with-dependencies.jar $out/lib/gol-tool.jar + cp target/gol-tool-${version}-jar-with-dependencies.jar $out/lib/gol-tool.jar makeWrapper ${jre}/bin/java $out/bin/gol \ --add-flags "-cp $out/lib/gol-tool.jar" \ diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 519b64051224..9f7a1d8281a8 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -32,7 +32,7 @@ , pulseSupport ? true, libpulseaudio , gsettings-desktop-schemas -, gnome +, adwaita-icon-theme # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder) , libvaSupport ? true, libva @@ -77,7 +77,7 @@ in stdenv.mkDerivation (finalAttrs: { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome.adwaita-icon-theme + adwaita-icon-theme ]; unpackPhase = '' diff --git a/pkgs/by-name/go/gorm-gentool/package.nix b/pkgs/by-name/go/gorm-gentool/package.nix new file mode 100644 index 000000000000..b4982427c900 --- /dev/null +++ b/pkgs/by-name/go/gorm-gentool/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "gorm-gentool"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "go-gorm"; + repo = "gen"; + rev = "tools/gentool/v${version}"; + hash = "sha256-JOecNYEIL8vbc7znkKbaSrTkGyAva3ZzKzxducDtTx0="; + }; + + modRoot = "tools/gentool"; + + proxyVendor = true; + vendorHash = "sha256-8xUJcsZuZ1KpFDM1AMTRggl7A7C/YaXYDzRKNFKE+ww="; + + meta = with lib; { + homepage = "https://github.com/go-gorm/gen"; + description = "Gen: Friendly & Safer GORM powered by Code Generation"; + license = licenses.mit; + mainProgram = "gentool"; + maintainers = with maintainers; [tembleking]; + }; +} diff --git a/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch b/pkgs/by-name/gp/gpaste/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/misc/gpaste/fix-paths.patch rename to pkgs/by-name/gp/gpaste/fix-paths.patch diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/by-name/gp/gpaste/package.nix similarity index 100% rename from pkgs/desktops/gnome/misc/gpaste/default.nix rename to pkgs/by-name/gp/gpaste/package.nix diff --git a/pkgs/desktops/gnome/misc/gpaste/wrapper.js b/pkgs/by-name/gp/gpaste/wrapper.js similarity index 100% rename from pkgs/desktops/gnome/misc/gpaste/wrapper.js rename to pkgs/by-name/gp/gpaste/wrapper.js diff --git a/pkgs/by-name/gp/gpscorrelate/package.nix b/pkgs/by-name/gp/gpscorrelate/package.nix index 2bbd2a9850e4..130ca82d7bc5 100644 --- a/pkgs/by-name/gp/gpscorrelate/package.nix +++ b/pkgs/by-name/gp/gpscorrelate/package.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = "https://dfandrich.github.io/gpscorrelate/"; + changelog = "https://github.com/dfandrich/gpscorrelate/releases/tag/${src.rev}"; platforms = platforms.unix; maintainers = with maintainers; [ sikmir ]; }; diff --git a/pkgs/by-name/gp/gpsprune/package.nix b/pkgs/by-name/gp/gpsprune/package.nix index 20b5dc15d6ce..90cb23f7740c 100644 --- a/pkgs/by-name/gp/gpsprune/package.nix +++ b/pkgs/by-name/gp/gpsprune/package.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Application for viewing, editing and converting GPS coordinate data"; homepage = "https://activityworkshop.net/software/gpsprune/"; + changelog = "https://activityworkshop.net/software/gpsprune/whats_new.html"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Plus; maintainers = with maintainers; [ rycee ]; diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index fbf652297a25..60a6e05de211 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -47,12 +47,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl.dev - cuda_cudart.dev - cuda_cudart.lib - cuda_cudart.static - libcublas.dev - libcublas.lib + cuda_cccl + cuda_cudart + libcublas ]); cmakeFlags = [ diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix index 8d4928891b37..135b33e7c56f 100644 --- a/pkgs/by-name/gp/gptscript/package.nix +++ b/pkgs/by-name/gp/gptscript/package.nix @@ -32,7 +32,7 @@ buildGo122Module rec { meta = with lib; { homepage = "https://github.com/gptscript-ai/gptscript"; - changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v{version}"; + changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v${version}"; description = "Build AI assistants that interact with your systems"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ jamiemagee ]; diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix index 3c22d8c76a51..01c30175360e 100644 --- a/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -120,7 +120,8 @@ buildGoModule rec { mainProgram = "alloy"; license = licenses.asl20; homepage = "https://grafana.com/oss/alloy"; + changelog = "https://github.com/grafana/alloy/blob/${src.rev}/CHANGELOG.md"; maintainers = with maintainers; [ azahi flokli emilylange hbjydev ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/gr/grafana-kiosk/package.nix b/pkgs/by-name/gr/grafana-kiosk/package.nix index 452ec1977a9f..3f81fe7ca501 100644 --- a/pkgs/by-name/gr/grafana-kiosk/package.nix +++ b/pkgs/by-name/gr/grafana-kiosk/package.nix @@ -21,6 +21,7 @@ buildGoModule rec { meta = with lib; { description = "Kiosk Utility for Grafana"; homepage = "https://github.com/grafana/grafana-kiosk"; + changelog = "https://github.com/grafana/grafana-kiosk/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ marcusramberg ]; mainProgram = "grafana-kiosk"; diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json index c90f63c8c10b..2e3602b23b06 100644 --- a/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.3.9", + "version": "1.3.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.3.9", + "version": "1.3.10", "hasInstallScript": true, "license": "None", "dependencies": { @@ -197,9 +197,9 @@ } }, "node_modules/ws": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", - "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", "engines": { "node": ">=10.0.0" }, diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index 3c81f17f0183..df92025a4887 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -7,14 +7,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.3.9"; + version = "1.3.10"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-HbS1hHnlyptXEGy6Qs2Iq/bUUEXYJPc55FEYBjyBvVs="; + hash = "sha256-pGUIF6X7xmhoccjDRGYMPB004Uh1X3lSSyRG2xHk4oc="; }; - npmDepsHash = "sha256-iVDa8Y/32J7qFWp/jlKwNiepmpfUZV56xNwxILUayMo="; + npmDepsHash = "sha256-E0L/akAEy24edwuiQ3TT5yxG6h5kJcQdkzPPp1HAgOI="; postPatch = '' ln -s ${./package-lock.json} package-lock.json @@ -37,6 +37,7 @@ buildNpmPackage rec { passthru.updateScript = ./update.sh; meta = { + changelog = "https://graphite.dev/docs/cli-changelog"; description = "CLI that makes creating stacked git changes fast & intuitive"; downloadPage = "https://www.npmjs.com/package/@withgraphite/graphite-cli"; homepage = "https://graphite.dev/docs/graphite-cli"; diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index cba18f06de6d..2b43ec63d358 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -2,41 +2,62 @@ lib, stdenvNoCC, fetchFromGitHub, + gnome, + sassc, gnome-themes-extra, gtk-engine-murrine, + colorVariants ? [] # default: install all icons }: -stdenvNoCC.mkDerivation { + +let pname = "gruvbox-gtk-theme"; - version = "0-unstable-2024-06-12"; + colorVariantList = [ + "dark" + "light" + ]; + +in +lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants + +stdenvNoCC.mkDerivation { + inherit pname; + version = "0-unstable-2024-06-27"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; - rev = "1a0f6672283e1846ec307addd4647f2daad29402"; - hash = "sha256-bbL4bHAdkmReogUQML9sMpSallZ7wrgbK3R64xiAYRo="; + rev = "f568ccd7bf7570d8a27feb62e318b07b88e24b94"; + hash = "sha256-4vGwPggHdNjtQ03UFgN4OH5+ZEkdIlivCdYuZ0Dsd5Q="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + nativeBuildInputs = [ gnome.gnome-shell sassc ]; buildInputs = [ gnome-themes-extra ]; dontBuild = true; + postPatch = '' + patchShebangs themes/install.sh + ''; + installPhase = '' runHook preInstall mkdir -p $out/share/themes - cp -a themes/* $out/share/themes + cd themes + ./install.sh -n Gruvbox -c ${lib.concatStringsSep " " (if colorVariants != [] then colorVariants else colorVariantList)} --tweaks macos -d "$out/share/themes" runHook postInstall ''; meta = { - description = "Gtk theme based on the Gruvbox colour pallete"; - homepage = "https://www.pling.com/p/1681313/"; - license = lib.licenses.gpl3Only; + description = "GTK theme based on the Gruvbox colour palette"; + homepage = "https://github.com/Fausto-Korpsvart/Gruvbox-GTK-Theme"; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ luftmensch-luftmensch math-42 + d3vil0p3r ]; }; } diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 588e0e45d911..c31195ff2331 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.79.1"; + version = "0.79.2"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-Ih1xja20e3wCZ68kRA9bK8jh+pw/5KtlgeE3dDjqeE0="; + hash = "sha256-8GO5vMUl6b1qjQ9+FdieLkSvkMQuJBwrfhJJies/37U="; # 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; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-iSpSJwAHB/HJ3Ut1VgUBd1yCwOaM4f3ihR0J4YjMVxM="; + vendorHash = "sha256-nws+/haDtyVC80f3S0wM7zI8ZB7c7KalqV96mp2D4C8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gt/gtksheet/package.nix b/pkgs/by-name/gt/gtksheet/package.nix index 2e799ea4a636..25f5a370693d 100644 --- a/pkgs/by-name/gt/gtksheet/package.nix +++ b/pkgs/by-name/gt/gtksheet/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtksheet"; - version = "4.3.13"; + version = "4.3.14"; src = fetchFromGitHub { owner = "fpaquet"; repo = "gtksheet"; rev = "V${finalAttrs.version}"; - hash = "sha256-2JwkyT6OBApfgyfNSksbrusF8WcZ4v3tlbblDJJtN2k="; + hash = "sha256-dpo4e/68PLbqUFoKiwlDUUIEFPRqT/5TBZzl7pfY+1Y="; }; strictDeps = true; diff --git a/pkgs/by-name/gt/gtrash/package.nix b/pkgs/by-name/gt/gtrash/package.nix index b23e99e4e52f..bb93daaaad58 100644 --- a/pkgs/by-name/gt/gtrash/package.nix +++ b/pkgs/by-name/gt/gtrash/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gtrash"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "umlx5h"; repo = "gtrash"; rev = "v${version}"; - hash = "sha256-5+wcrU2mx/ZawMCSCU4xddMlMVpoIW/Duv7XqUVIDoo="; + hash = "sha256-odvj0YY18aishVWz5jWcLDvkYJLQ97ZSGpumxvxui4Y="; }; - vendorHash = "sha256-iWNuPxetYH9xJpf3WMoA5c50kII9DUpWvhTVSE1kSk0="; + vendorHash = "sha256-JJA9kxNCtvfs51TzO7hEaS4UngBOEJuIIRIfHKSUMls="; subPackages = [ "." ]; diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/by-name/gu/gucharmap/package.nix similarity index 100% rename from pkgs/desktops/gnome/core/gucharmap/default.nix rename to pkgs/by-name/gu/gucharmap/package.nix diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix index b3f2528ce2a2..d9ea3eeb4787 100644 --- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix +++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix @@ -20,7 +20,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ ha-mqtt-discoverable ]; diff --git a/pkgs/by-name/ha/halloy/Cargo.lock b/pkgs/by-name/ha/halloy/Cargo.lock index 74e5fa582d6c..b8f19e644339 100644 --- a/pkgs/by-name/ha/halloy/Cargo.lock +++ b/pkgs/by-name/ha/halloy/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.23" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" +checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -74,15 +74,15 @@ checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", "bitflags 2.5.0", @@ -94,7 +94,7 @@ dependencies = [ "log", "ndk", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "thiserror", ] @@ -122,9 +122,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "approx" @@ -176,79 +176,55 @@ dependencies = [ "serde_repr", "tokio", "url", - "zbus 4.1.2", + "zbus", ] [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-broadcast" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" -dependencies = [ - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.2", - "futures-lite 2.3.0", + "fastrand", + "futures-lite", "slab", ] [[package]] name = "async-fs" -version = "1.6.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 2.8.0", - "autocfg", + "async-lock", "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-fs" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" -dependencies = [ - "async-lock 3.3.0", - "blocking", - "futures-lite 2.3.0", + "futures-lite", ] [[package]] @@ -265,38 +241,18 @@ dependencies = [ [[package]] name = "async-io" -version = "1.13.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" -dependencies = [ - "async-lock 3.3.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "parking", - "polling 3.6.0", - "rustix 0.38.32", + "polling", + "rustix", "slab", "tracing", "windows-sys 0.52.0", @@ -304,103 +260,79 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.8.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener", + "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" -dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", - "async-signal", - "blocking", - "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.32", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-process" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" dependencies = [ "async-channel", - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 5.2.0", - "futures-lite 2.3.0", - "rustix 0.38.32", + "event-listener", + "futures-lite", + "rustix", + "tracing", "windows-sys 0.52.0", ] [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ - "async-io 2.3.2", - "async-lock 2.8.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.32", + "rustix", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -411,15 +343,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -442,6 +374,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bit-set" version = "0.5.3" @@ -490,65 +428,58 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - [[package]] name = "block2" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "block-sys", "objc2", ] [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", - "fastrand 2.0.2", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "piper", - "tracing", ] [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "by_address" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -577,8 +508,8 @@ checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ "bitflags 2.5.0", "log", - "polling 3.6.0", - "rustix 0.38.32", + "polling", + "rustix", "slab", "thiserror", ] @@ -590,19 +521,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ "calloop", - "rustix 0.38.32", + "rustix", "wayland-backend", "wayland-client", ] [[package]] name = "cc" -version = "1.0.90" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -625,15 +557,15 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "cfg_aliases" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -641,14 +573,14 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] name = "clipboard-win" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" +checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" dependencies = [ "error-code", ] @@ -683,36 +615,6 @@ dependencies = [ "x11rb", ] -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "libc", - "objc", -] - [[package]] name = "codespan-reporting" version = "0.11.1" @@ -762,9 +664,9 @@ dependencies = [ [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -772,9 +674,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -797,9 +699,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -851,9 +753,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -879,9 +781,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -900,14 +802,10 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.2.7" +name = "ctor-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" -dependencies = [ - "quote", - "syn 2.0.55", -] +checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b" [[package]] name = "cursor-icon" @@ -928,9 +826,9 @@ dependencies = [ [[package]] name = "dark-light" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb02ff40e6d65b7fcda0089104559e5a32f67c04d00ba4c392ce2d77ec9752c7" +checksum = "2a76fa97167fa740dcdbfe18e8895601e1bc36525f09b044e00916e717c03a3c" dependencies = [ "dconf_rs", "detect-desktop-environment", @@ -939,8 +837,7 @@ dependencies = [ "rust-ini", "web-sys", "winreg 0.10.1", - "zbus 4.1.2", - "zvariant 3.15.1", + "zbus", ] [[package]] @@ -961,6 +858,7 @@ dependencies = [ "palette", "rand", "rand_chacha", + "regex", "reqwest", "seahash", "serde", @@ -971,6 +869,7 @@ dependencies = [ "tokio", "tokio-stream", "toml", + "url", "xdg", ] @@ -989,17 +888,6 @@ dependencies = [ "powerfmt", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "detect-desktop-environment" version = "0.2.0" @@ -1080,31 +968,36 @@ checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dpi" +version = "0.1.1" +source = "git+https://github.com/iced-rs/winit.git?rev=254d6b3420ce4e674f516f7a2bd440665e05484d#254d6b3420ce4e674f516f7a2bd440665e05484d" [[package]] name = "drm" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" +checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1" dependencies = [ "bitflags 2.5.0", "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.32", + "rustix", ] [[package]] name = "drm-ffi" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" +checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53" dependencies = [ "drm-sys", - "rustix 0.38.32", + "rustix", ] [[package]] @@ -1115,9 +1008,9 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" [[package]] name = "drm-sys" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" +checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986" dependencies = [ "libc", "linux-raw-sys 0.6.4", @@ -1125,9 +1018,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "embed-resource" @@ -1145,9 +1038,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1160,9 +1053,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -1170,13 +1063,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -1187,9 +1080,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1203,9 +1096,9 @@ checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "etagere" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e" +checksum = "0e2f1e3be19fb10f549be8c1bf013e8675b4066c445e36eb76d2ebb2f54ee495" dependencies = [ "euclid", "svg_fmt", @@ -1213,46 +1106,18 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.9" +version = "0.22.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" dependencies = [ "num-traits", ] [[package]] name = "event-listener" -version = "2.5.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1261,21 +1126,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" -dependencies = [ - "event-listener 5.2.0", + "event-listener", "pin-project-lite", ] @@ -1317,18 +1172,9 @@ checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" [[package]] name = "fastrand" -version = "1.9.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1350,9 +1196,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1375,9 +1221,12 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.4.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7f6040d337bd44434ab21fc6509154edf2cece88b23758d9d64654c4e7730b" +checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29" +dependencies = [ + "bytemuck", +] [[package]] name = "fontconfig-parser" @@ -1429,7 +1278,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -1502,28 +1351,13 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - [[package]] name = "futures-lite" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.2", + "fastrand", "futures-core", "futures-io", "parking", @@ -1538,7 +1372,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -1593,9 +1427,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -1614,9 +1448,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gl_generator" @@ -1659,7 +1493,7 @@ dependencies = [ [[package]] name = "glyphon" version = "0.5.0" -source = "git+https://github.com/hecrj/glyphon.git?rev=ceed55403ce53e120ce9d1fae17dcfe388726118#ceed55403ce53e120ce9d1fae17dcfe388726118" +source = "git+https://github.com/hecrj/glyphon.git?rev=f07e7bab705e69d39a5e6e52c73039a93c4552f8#f07e7bab705e69d39a5e6e52c73039a93c4552f8" dependencies = [ "cosmic-text", "etagere", @@ -1708,7 +1542,7 @@ checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ "bitflags 2.5.0", "gpu-descriptor-types", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1732,15 +1566,15 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http", "indexmap", "slab", @@ -1751,9 +1585,9 @@ dependencies = [ [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1768,8 +1602,10 @@ dependencies = [ "data", "embed-resource", "fern", + "futures", "iced", "image", + "ipc", "log", "notify-rust", "once_cell", @@ -1794,9 +1630,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", @@ -1829,6 +1665,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -1864,12 +1706,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http", "http-body", "pin-project-lite", @@ -1877,15 +1719,15 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "hyper" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", @@ -1901,6 +1743,23 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.6.0" @@ -1919,9 +1778,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" dependencies = [ "bytes", "futures-channel", @@ -1930,7 +1789,7 @@ dependencies = [ "http-body", "hyper", "pin-project-lite", - "socket2 0.5.6", + "socket2", "tokio", "tower", "tower-service", @@ -1963,7 +1822,7 @@ dependencies = [ [[package]] name = "iced" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" +source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" dependencies = [ "iced_core", "iced_futures", @@ -1977,16 +1836,16 @@ dependencies = [ [[package]] name = "iced_core" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" +source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" dependencies = [ "bitflags 2.5.0", + "bytes", "dark-light", "glam", "log", "num-traits", "once_cell", "palette", - "raw-window-handle", "rustc-hash", "smol_str", "thiserror", @@ -1996,7 +1855,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" +source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" dependencies = [ "futures", "iced_core", @@ -2010,7 +1869,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" +source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2031,7 +1890,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" +source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2043,8 +1902,9 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" +source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" dependencies = [ + "bytes", "iced_core", "iced_futures", "raw-window-handle", @@ -2054,7 +1914,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" +source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" dependencies = [ "bytemuck", "cosmic-text", @@ -2069,7 +1929,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" +source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2088,7 +1948,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" +source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" dependencies = [ "iced_renderer", "iced_runtime", @@ -2102,31 +1962,22 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" +source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" dependencies = [ + "iced_futures", "iced_graphics", "iced_runtime", "log", "rustc-hash", "thiserror", "tracing", + "wasm-bindgen-futures", "web-sys", "winapi", "window_clipboard", "winit", ] -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2", - "dispatch", - "objc2", -] - [[package]] name = "idna" version = "0.5.0" @@ -2162,27 +2013,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "interprocess" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb" dependencies = [ - "hermit-abi", + "blocking", + "cfg-if", + "futures-core", + "futures-io", + "intmap", "libc", - "windows-sys 0.48.0", + "once_cell", + "rustc_version", + "spinning", + "thiserror", + "to_method", + "tokio", + "winapi", +] + +[[package]] +name = "intmap" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" + +[[package]] +name = "ipc" +version = "0.1.0" +dependencies = [ + "data", + "futures", + "interprocess", + "rand", + "rand_chacha", + "thiserror", + "tokio", + "url", ] [[package]] @@ -2201,7 +2082,7 @@ dependencies = [ "futures", "irc_proto", "rustls-native-certs", - "rustls-pemfile 2.1.1", + "rustls-pemfile", "thiserror", "tokio", "tokio-rustls", @@ -2256,9 +2137,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -2284,9 +2165,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2345,12 +2226,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - [[package]] name = "lebe" version = "0.5.2" @@ -2359,9 +2234,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -2380,7 +2255,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2389,17 +2264,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.5.0", - "libc", - "redox_syscall 0.4.1", -] - [[package]] name = "libredox" version = "0.0.2" @@ -2412,16 +2276,20 @@ dependencies = [ ] [[package]] -name = "linux-raw-sys" -version = "0.3.8" +name = "libredox" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" @@ -2431,9 +2299,9 @@ checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2475,9 +2343,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2499,18 +2367,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -2544,9 +2403,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -2591,11 +2450,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -2609,14 +2467,14 @@ dependencies = [ [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ "bitflags 2.5.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "raw-window-handle", "thiserror", @@ -2638,15 +2496,12 @@ dependencies = [ ] [[package]] -name = "nix" -version = "0.26.4" +name = "ndk-sys" +version = "0.6.0+11769913" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", + "jni-sys", ] [[package]] @@ -2659,7 +2514,7 @@ dependencies = [ "cfg-if", "cfg_aliases 0.1.1", "libc", - "memoffset 0.9.0", + "memoffset", ] [[package]] @@ -2674,15 +2529,15 @@ dependencies = [ [[package]] name = "notify-rust" -version = "4.10.0" +version = "4.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226" +checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" dependencies = [ "log", "mac-notification-sys", "serde", "tauri-winrt-notification", - "zbus 3.15.1", + "zbus", ] [[package]] @@ -2693,9 +2548,9 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -2706,7 +2561,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] @@ -2725,10 +2580,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -2754,25 +2609,206 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", "objc2-encode", ] [[package]] -name = "objc2-encode" -version = "3.0.0" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.5.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2", + "objc2", + "objc2-contacts", + "objc2-foundation", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.5.0", + "block2", + "dispatch", + "libc", + "objc2", +] + +[[package]] +name = "objc2-link-presentation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +dependencies = [ + "block2", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] [[package]] name = "objc_exception" @@ -2794,9 +2830,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -2809,9 +2845,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.1.2" +version = "5.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" +checksum = "b5ca541f22b1c46d4bb9801014f234758ab4297e7870b904b6a8415b980a7388" dependencies = [ "is-wsl", "libc", @@ -2841,7 +2877,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -2852,9 +2888,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.101" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -2893,9 +2929,9 @@ dependencies = [ [[package]] name = "ouroboros" -version = "0.18.3" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b7be5a8a3462b752f4be3ff2b2bf2f7f1d00834902e46be2a4d68b87b0573c" +checksum = "944fa20996a25aded6b4795c6d63f10014a7a83f8be9828a11860b08c5fc4a67" dependencies = [ "aliasable", "ouroboros_macro", @@ -2904,32 +2940,32 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.18.3" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645dcde5f119c2c454a92d0dfa271a2a3b205da92e4292a68ead4bdbfde1f33" +checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd" dependencies = [ "heck", "itertools", "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] name = "owned_ttf_parser" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" dependencies = [ - "ttf-parser 0.20.0", + "ttf-parser 0.21.1", ] [[package]] name = "palette" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" +checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" dependencies = [ "approx", "fast-srgb8", @@ -2939,13 +2975,14 @@ dependencies = [ [[package]] name = "palette_derive" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" +checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" dependencies = [ + "by_address", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -2967,12 +3004,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -2991,22 +3028,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" @@ -3050,7 +3087,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -3079,14 +3116,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -3096,12 +3133,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", - "fastrand 2.0.2", + "fastrand", "futures-io", ] @@ -3126,31 +3163,15 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.32", + "rustix", "tracing", "windows-sys 0.52.0", ] @@ -3179,16 +3200,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -3200,9 +3211,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -3215,7 +3226,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", "version_check", "yansi", ] @@ -3235,15 +3246,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "memchr", -] - [[package]] name = "quick-xml" version = "0.31.0" @@ -3255,9 +3257,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3306,9 +3308,9 @@ checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" [[package]] name = "raw-window-handle" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "rayon" @@ -3332,10 +3334,11 @@ dependencies = [ [[package]] name = "read-fonts" -version = "0.16.0" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81c524658d3b77930a391f559756d91dbe829ab6cf4687083f615d395df99722" +checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" dependencies = [ + "bytemuck", "font-types", ] @@ -3348,15 +3351,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -3367,21 +3361,30 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.4" +name = "redox_syscall" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", - "libredox 0.0.1", + "libredox 0.1.3", "thiserror", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -3391,9 +3394,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -3402,9 +3405,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "renderdoc-sys" @@ -3414,11 +3417,11 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "reqwest" -version = "0.12.2" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d66674f2b6fb864665eea7a3c1ac4e3dfacd2fda83cf6f935a612e01b0e3338" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bytes", "encoding_rs", "futures-core", @@ -3428,6 +3431,7 @@ dependencies = [ "http-body", "http-body-util", "hyper", + "hyper-rustls", "hyper-tls", "hyper-util", "ipnet", @@ -3438,7 +3442,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile 1.0.4", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", @@ -3451,7 +3455,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg 0.50.0", + "winreg 0.52.0", ] [[package]] @@ -3510,9 +3514,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -3531,36 +3535,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.23.4" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4d6d8ad9f2492485e13453acbb291dd08f64441b6609c491f1c2cd2c6b4fe1" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "once_cell", "ring", @@ -3577,7 +3567,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.1", + "rustls-pemfile", "rustls-pki-types", "schannel", "security-framework", @@ -3585,34 +3575,25 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" -dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", "rustls-pki-types", @@ -3638,9 +3619,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3674,9 +3655,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +checksum = "7de61fa7334ee8ee1f5c3c58dcc414fb9361e7e8f5bff9d45f4d69eeb89a7169" dependencies = [ "ab_glyph", "log", @@ -3693,11 +3674,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -3706,9 +3687,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -3716,41 +3697,41 @@ dependencies = [ [[package]] name = "self_cell" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -3759,20 +3740,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -3813,9 +3794,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3832,6 +3813,16 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "skrifa" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +dependencies = [ + "bytemuck", + "read-fonts", +] + [[package]] name = "slab" version = "0.4.9" @@ -3869,7 +3860,7 @@ dependencies = [ "libc", "log", "memmap2 0.9.4", - "rustix 0.38.32", + "rustix", "thiserror", "wayland-backend", "wayland-client", @@ -3894,28 +3885,18 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" dependencies = [ "serde", ] [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3923,25 +3904,27 @@ dependencies = [ [[package]] name = "softbuffer" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071916a85d1db274b4ed57af3a14afb66bd836ae7f82ebb6f1fd3455107830d9" +checksum = "2ae0d2e93c874cca74fe830bccbd1132299318932d273d2a3c77ad77476a3d7e" dependencies = [ "as-raw-xcb-connection", "bytemuck", - "cfg_aliases 0.2.0", - "cocoa", + "cfg_aliases 0.2.1", "core-graphics", "drm", - "fastrand 2.0.2", + "fastrand", "foreign-types 0.5.0", "js-sys", "log", "memmap2 0.9.4", - "objc", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-quartz-core", "raw-window-handle", - "redox_syscall 0.4.1", - "rustix 0.38.32", + "redox_syscall 0.5.2", + "rustix", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -3961,6 +3944,15 @@ dependencies = [ "lock_api", ] +[[package]] +name = "spinning" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b" +dependencies = [ + "lock_api", +] + [[package]] name = "spirv" version = "0.3.0+sdk-1.3.268.0" @@ -3990,17 +3982,17 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "svg_fmt" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499" +checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" [[package]] name = "swash" -version = "0.1.13" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9af636fb90d39858650cae1088a37e2862dab4e874a0bb49d6dfb5b2dacf0e24" +checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" dependencies = [ - "read-fonts", + "skrifa", "yazi", "zeno", ] @@ -4018,9 +4010,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.55" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -4029,9 +4021,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "sys-locale" @@ -4065,12 +4057,13 @@ dependencies = [ [[package]] name = "tauri-winrt-notification" -version = "0.1.3" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" +checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" dependencies = [ - "quick-xml 0.30.0", - "windows 0.51.1", + "quick-xml", + "windows 0.56.0", + "windows-version", ] [[package]] @@ -4080,8 +4073,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.2", - "rustix 0.38.32", + "fastrand", + "rustix", "windows-sys 0.52.0", ] @@ -4096,22 +4089,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -4127,9 +4120,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "num-conv", @@ -4182,13 +4175,14 @@ dependencies = [ [[package]] name = "tiny-xlib" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" +checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" dependencies = [ "as-raw-xcb-connection", - "ctor", + "ctor-lite", "libloading 0.8.3", + "pkg-config", "tracing", ] @@ -4208,20 +4202,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] -name = "tokio" -version = "1.36.0" +name = "to_method" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" + +[[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 0.12.1", + "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2", "tokio-macros", "tracing", "windows-sys 0.48.0", @@ -4229,13 +4229,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -4272,50 +4272,38 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.14", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.21.1" @@ -4329,15 +4317,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.13", ] [[package]] @@ -4353,7 +4341,6 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -4374,7 +4361,6 @@ 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", @@ -4388,7 +4374,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -4418,6 +4404,12 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" +[[package]] +name = "ttf-parser" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" + [[package]] name = "typenum" version = "1.17.0" @@ -4430,7 +4422,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset", "tempfile", "winapi", ] @@ -4494,9 +4486,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -4512,9 +4504,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -4569,12 +4561,6 @@ dependencies = [ "libc", ] -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - [[package]] name = "walkdir" version = "2.5.0" @@ -4621,7 +4607,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -4655,7 +4641,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4683,13 +4669,13 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.32", + "rustix", "scoped-tls", "smallvec", "wayland-sys", @@ -4697,12 +4683,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.2" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" dependencies = [ "bitflags 2.5.0", - "rustix 0.38.32", + "rustix", "wayland-backend", "wayland-scanner", ] @@ -4720,11 +4706,11 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.1" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" dependencies = [ - "rustix 0.38.32", + "rustix", "wayland-client", "xcursor", ] @@ -4769,20 +4755,20 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565" dependencies = [ "proc-macro2", - "quick-xml 0.31.0", + "quick-xml", "quote", ] [[package]] name = "wayland-sys" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12" dependencies = [ "dlib", "log", @@ -4802,9 +4788,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -4818,9 +4804,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.19.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1213b52478a7631d6e387543ed8f642bc02c578ef4e3b49aca2a29a7df0cb" +checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01" dependencies = [ "arrayvec", "cfg-if", @@ -4828,7 +4814,7 @@ dependencies = [ "js-sys", "log", "naga", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "profiling", "raw-window-handle", "smallvec", @@ -4843,9 +4829,9 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f6b033c2f00ae0bc8ea872c5989777c60bc241aac4e58b24774faa8b391f78" +checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a" dependencies = [ "arrayvec", "bit-vec", @@ -4856,7 +4842,7 @@ dependencies = [ "log", "naga", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "profiling", "raw-window-handle", "rustc-hash", @@ -4869,9 +4855,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.19.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f972c280505ab52ffe17e94a7413d9d54b58af0114ab226b9fc4999a47082e" +checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3" dependencies = [ "android_system_properties", "arrayvec", @@ -4895,10 +4881,10 @@ dependencies = [ "log", "metal", "naga", - "ndk-sys", + "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "profiling", "range-alloc", "raw-window-handle", @@ -4925,9 +4911,9 @@ dependencies = [ [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -4947,11 +4933,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4974,16 +4960,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "windows" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.52.0" @@ -4991,16 +4967,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] -name = "windows-core" -version = "0.51.1" +name = "windows" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ - "windows-targets 0.48.5", + "windows-core 0.56.0", + "windows-targets 0.52.5", ] [[package]] @@ -5009,7 +4986,50 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.5", ] [[package]] @@ -5036,7 +5056,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5071,17 +5091,27 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows-version" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +dependencies = [ + "windows-targets 0.52.5", ] [[package]] @@ -5098,9 +5128,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -5116,9 +5146,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -5134,9 +5164,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -5152,9 +5188,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -5170,9 +5206,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -5188,9 +5224,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -5206,42 +5242,46 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winit" -version = "0.29.15" -source = "git+https://github.com/iced-rs/winit.git?rev=592bd152f6d5786fae7d918532d7db752c0d164f#592bd152f6d5786fae7d918532d7db752c0d164f" +version = "0.30.1" +source = "git+https://github.com/iced-rs/winit.git?rev=254d6b3420ce4e674f516f7a2bd440665e05484d#254d6b3420ce4e674f516f7a2bd440665e05484d" dependencies = [ "ahash 0.8.11", "android-activity", "atomic-waker", "bitflags 2.5.0", + "block2", "bytemuck", "calloop", - "cfg_aliases 0.1.1", + "cfg_aliases 0.2.1", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate", + "dpi", "js-sys", "libc", - "log", "memmap2 0.9.4", "ndk", - "ndk-sys", "objc2", - "once_cell", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", + "pin-project", "raw-window-handle", - "redox_syscall 0.3.5", - "rustix 0.38.32", + "redox_syscall 0.4.1", + "rustix", "sctk-adwaita", "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", @@ -5251,7 +5291,7 @@ dependencies = [ "wayland-protocols-plasma", "web-sys", "web-time", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -5268,9 +5308,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -5284,16 +5324,6 @@ dependencies = [ "winapi", ] -[[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 = "winreg" version = "0.52.0" @@ -5317,24 +5347,24 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", "libloading 0.8.3", "once_cell", - "rustix 0.38.32", + "rustix", "x11rb-protocol", ] [[package]] name = "x11rb-protocol" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" @@ -5350,12 +5380,12 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -5373,15 +5403,15 @@ dependencies = [ [[package]] name = "xkeysym" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "yansi" @@ -5397,69 +5427,27 @@ checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" [[package]] name = "zbus" -version = "3.15.1" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acecd3f8422f198b1a2f954bcc812fe89f3fa4281646f3da1da7925db80085d" +checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" dependencies = [ - "async-broadcast 0.5.1", + "async-broadcast", "async-executor", - "async-fs 1.6.0", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-process 1.8.1", + "async-fs", + "async-io", + "async-lock", + "async-process", "async-recursion", "async-task", "async-trait", "blocking", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.4", - "once_cell", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "winapi", - "xdg-home", - "zbus_macros 3.15.1", - "zbus_names 2.6.1", - "zvariant 3.15.1", -] - -[[package]] -name = "zbus" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" -dependencies = [ - "async-broadcast 0.7.0", - "async-executor", - "async-fs 2.1.1", - "async-io 2.3.2", - "async-lock 3.3.0", - "async-process 2.1.0", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "derivative", - "enumflags2", - "event-listener 5.2.0", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.28.0", + "nix", "ordered-stream", "rand", "serde", @@ -5471,50 +5459,24 @@ dependencies = [ "uds_windows", "windows-sys 0.52.0", "xdg-home", - "zbus_macros 4.1.2", - "zbus_names 3.0.0", - "zvariant 4.0.2", + "zbus_macros", + "zbus_names", + "zvariant", ] [[package]] name = "zbus_macros" -version = "3.15.1" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2207eb71efebda17221a579ca78b45c4c5f116f074eb745c3a172e688ccf89f5" +checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.66", "zvariant_utils", ] -[[package]] -name = "zbus_macros" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zbus_names" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" -dependencies = [ - "serde", - "static_assertions", - "zvariant 3.15.1", -] - [[package]] name = "zbus_names" version = "3.0.0" @@ -5523,7 +5485,7 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", - "zvariant 4.0.2", + "zvariant", ] [[package]] @@ -5534,29 +5496,29 @@ checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zune-inflate" @@ -5569,65 +5531,38 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.1" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b4fcf3660d30fc33ae5cd97e2017b23a96e85afd7a1dd014534cd0bf34ba67" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive 3.15.1", -] - -[[package]] -name = "zvariant" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" dependencies = [ "endi", "enumflags2", "serde", "static_assertions", "url", - "zvariant_derive 4.0.2", + "zvariant_derive", ] [[package]] name = "zvariant_derive" -version = "3.15.1" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0277758a8a0afc0e573e80ed5bfd9d9c2b48bd3108ffe09384f9f738c83f4a55" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zvariant_derive" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 1.0.109", + "syn 2.0.66", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index 7075d2a4a9a5..44fd206c5749 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/pkgs/by-name/ha/halloy/package.nix @@ -6,6 +6,7 @@ copyDesktopItems, makeDesktopItem, libxkbcommon, + makeWrapper, openssl, pkg-config, rustPlatform, @@ -16,26 +17,27 @@ rustPlatform.buildRustPackage rec { pname = "halloy"; - version = "2024.7"; + version = "2024.8"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; rev = "refs/tags/${version}"; - hash = "sha256-CXuodMndUvltwjIiEdJuIazCYKqD/azROgSBTM6g87A="; + hash = "sha256-OxxXjenZjP+3KrkxyXYxOXRFmrYm3deeiCuGrhpnF2I="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "glyphon-0.5.0" = "sha256-e1jTuaWh9eFdk2pDE4Ov/l3b/Q7GA3hqx6dPoOde1hM="; - "iced-0.13.0-dev" = "sha256-K1B9rVkShxQC97kwebHPsqJsJmxjEsFCKpg+p2lt09U="; - "winit-0.29.15" = "sha256-9i2i4KcEv7vIImJtcw2NALQ3uDb4EAZXjShG6tfmhkc="; + "dpi-0.1.1" = "sha256-25sOvEBhlIaekTeWvy3UhjPI1xrJbOQvw/OkTg12kQY="; + "glyphon-0.5.0" = "sha256-+z2my51aUeK9txLZKVAyQcWJ6f2YDY1mjxfc8Xsqi8E="; + "iced-0.13.0-dev" = "sha256-eHlauEZibbuqK5mdkNP6gsy1z9qxqEDn/xfFw7W5TcY="; }; }; nativeBuildInputs = [ copyDesktopItems + makeWrapper pkg-config ]; @@ -102,6 +104,17 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -Dm644 assets/linux/icons/hicolor/128x128/apps/org.squidowl.halloy.png \ $out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png + '' + lib.optionalString stdenv.isDarwin '' + APP_DIR="$out/Applications/Halloy.app/Contents" + + mkdir -p "$APP_DIR/MacOS" + cp -r ${src}/assets/macos/Halloy.app/Contents/* "$APP_DIR" + + substituteInPlace "$APP_DIR/Info.plist" \ + --replace-fail "{{ VERSION }}" "${version}" \ + --replace-fail "{{ BUILD }}" "${version}-nixpkgs" + + makeWrapper "$out/bin/halloy" "$APP_DIR/MacOS/halloy" ''; meta = with lib; { @@ -109,7 +122,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/squidowl/halloy"; changelog = "https://github.com/squidowl/halloy/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab iivusly ]; mainProgram = "halloy"; }; } diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index e66027b8dc7f..d27e2bbe1a78 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -7,10 +7,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.16.3"; + version = "2.17.0"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar"; - hash = "sha256-sl2b9zKugnCEMHyvEqBWZPidoANth5gRfh34NAaqg7A="; + hash = "sha256-dSNYFifFITNnUxUOLmiO8LbHyjlCmVU9LlpZp/ThD/Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index 06f2911faafb..c3c760abafec 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -4,26 +4,23 @@ , python3 , cargo , git +, uv }: python3.pkgs.buildPythonApplication rec { pname = "hatch"; - version = "1.9.7"; + version = "1.12.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Gae4IXn5Tyrd2612qn5lq5DK1VqxA9U4J2N5NcnmYkw="; + hash = "sha256-roBHjRAxLfK0TWWck7wu1NM67N3OS3Y3gjG9+ByL9q0="; }; - postPatch = '' - # Loosen hatchling runtime version dependency - sed -i 's/hatchling<1.22/hatchling/' pyproject.toml - ''; - nativeBuildInputs = with python3.pkgs; [ hatchling hatch-vcs + uv ]; propagatedBuildInputs = with python3.pkgs; [ @@ -62,25 +59,15 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # AssertionError: assert (1980, 1, 2, 0, 0, 0) == (2020, 2, 2, 0, 0, 0) "test_default" - "test_explicit_path" - "test_default_auto_detection" - "test_editable_default" - "test_editable_default_extra_dependencies" - "test_editable_default_force_include" - "test_editable_default_force_include_option" - "test_editable_exact" - "test_editable_exact_extra_dependencies" - "test_editable_exact_force_include" - "test_editable_exact_force_include_option" - "test_editable_exact_force_include_build_data_precedence" - "test_editable_pth" - # expects sh, finds bash - "test_all" - "test_already_installed_update_flag" - "test_already_installed_update_prompt" # Loosen hatchling runtime version dependency "test_core" - "test_correct" + # New failing + "test_guess_variant" + "test_open" + "test_no_open" + "test_uv_env" + "test_pyenv" + "test_pypirc" ] ++ lib.optionals stdenv.isDarwin [ # https://github.com/NixOS/nixpkgs/issues/209358 "test_scripts_no_environment" diff --git a/pkgs/by-name/ha/hatsu/package.nix b/pkgs/by-name/ha/hatsu/package.nix index 65759ec9ec3f..a5f5131d78ec 100644 --- a/pkgs/by-name/ha/hatsu/package.nix +++ b/pkgs/by-name/ha/hatsu/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "hatsu"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "importantimport"; repo = "hatsu"; rev = "v${version}"; - hash = "sha256-4x41Ez2Rq4Bs39LN4qRluDieHx+9bS+GCjvS/cQK84Y="; + hash = "sha256-iQrwqv5q002rJMcvUhlsLVN3O7mHyL5zmLGjegZDVG0="; }; - cargoHash = "sha256-hOQ8/m4TY18ZFmLFxxnXUX1yr52tKNmebx6H0uIIGUo="; + cargoHash = "sha256-LkGkifmHy7cEGrPg0WCf1nCGfcW60AGWQSB0Zb01mk0="; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/he/hekatomb/package.nix b/pkgs/by-name/he/hekatomb/package.nix index 1d9df3a03215..0b6e708f65b2 100644 --- a/pkgs/by-name/he/hekatomb/package.nix +++ b/pkgs/by-name/he/hekatomb/package.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/he/helix-gpt/package.nix b/pkgs/by-name/he/helix-gpt/package.nix index 291cca1bb67b..6b6f7a8955bb 100644 --- a/pkgs/by-name/he/helix-gpt/package.nix +++ b/pkgs/by-name/he/helix-gpt/package.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/leona/helix-gpt"; + changelog = "https://github.com/leona/helix-gpt/releases/tag/${src.rev}"; description = "Code completion LSP for Helix with support for Copilot + OpenAI"; mainProgram = "helix-gpt"; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/by-name/he/hello/package.nix b/pkgs/by-name/he/hello/package.nix index ca585ce03bed..7b8db4c7c3c2 100644 --- a/pkgs/by-name/he/hello/package.nix +++ b/pkgs/by-name/he/hello/package.nix @@ -4,6 +4,7 @@ , fetchurl , nixos , testers +, versionCheckHook , hello }: @@ -19,6 +20,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; # Give hello some install checks for testing purpose. postInstallCheck = '' diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/by-name/he/hexchat/package.nix similarity index 56% rename from pkgs/applications/networking/irc/hexchat/default.nix rename to pkgs/by-name/he/hexchat/package.nix index 4aafcc272638..1834fceda867 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/by-name/he/hexchat/package.nix @@ -1,8 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gtk2, lua, perl, python3Packages -, pciutils, dbus-glib, libcanberra-gtk2, libproxy -, enchant2, libnotify, openssl, isocodes -, desktop-file-utils -, meson, ninja, makeWrapper +{ + dbus-glib, + desktop-file-utils, + enchant2, + fetchFromGitHub, + gtk2, + isocodes, + lib, + libcanberra-gtk2, + libnotify, + libproxy, + lua, + makeWrapper, + meson, + ninja, + openssl, + pciutils, + perl, + pkg-config, + python3Packages, + stdenv, }: stdenv.mkDerivation rec { @@ -13,17 +29,9 @@ stdenv.mkDerivation rec { owner = "hexchat"; repo = "hexchat"; rev = "v${version}"; - sha256 = "sha256-rgaXqXbBWlfSyz+CT0jRLyfGOR1cYYnRhEAu7AsaWus="; + hash = "sha256-rgaXqXbBWlfSyz+CT0jRLyfGOR1cYYnRhEAu7AsaWus="; }; - nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; - - buildInputs = [ - gtk2 lua perl python3Packages.python python3Packages.cffi pciutils dbus-glib libcanberra-gtk2 libproxy - libnotify openssl desktop-file-utils - isocodes - ]; - #hexchat and hexchat-text loads enchant spell checking library at run time and so it needs to have route to the path postPatch = '' sed -i "s,libenchant-2.so.2,${enchant2}/lib/libenchant-2.so.2,g" src/fe-gtk/sexy-spell-entry.c @@ -39,17 +47,44 @@ stdenv.mkDerivation rec { done ''; - mesonFlags = [ "-Dwith-lua=lua" "-Dtext-frontend=true" ]; + mesonFlags = [ + "-Dwith-lua=lua" + "-Dtext-frontend=true" + ]; + + nativeBuildInputs = [ + makeWrapper + meson + ninja + pkg-config + ]; + + buildInputs = [ + dbus-glib + desktop-file-utils + gtk2 + isocodes + libcanberra-gtk2 + libnotify + libproxy + lua + openssl + pciutils + perl + python3Packages.cffi + python3Packages.python + python3Packages.setuptools + ]; postInstall = '' wrapProgram $out/bin/hexchat --prefix PYTHONPATH : "$PYTHONPATH" ''; - meta = with lib; { + meta = { description = "Popular and easy to use graphical IRC (chat) client"; homepage = "https://hexchat.github.io/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ romildo ]; }; } diff --git a/pkgs/by-name/hi/hidviz/package.nix b/pkgs/by-name/hi/hidviz/package.nix index 5aeba2f5b082..52e1b8a586b7 100644 --- a/pkgs/by-name/hi/hidviz/package.nix +++ b/pkgs/by-name/hi/hidviz/package.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { description = "GUI application for in-depth analysis of USB HID class devices"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nayala ]; + maintainers = with maintainers; []; }; } diff --git a/pkgs/by-name/hi/highs/package.nix b/pkgs/by-name/hi/highs/package.nix index 14ab9fddb66f..2fc244131415 100644 --- a/pkgs/by-name/hi/highs/package.nix +++ b/pkgs/by-name/hi/highs/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "highs"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "ERGO-Code"; repo = "HiGHS"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-SJbS0403HyiW8zPrLsNWp8+h/wL7UdrS+QOEjLf1jzE="; + sha256 = "sha256-q18TfKbZyTZzzPZ8z3U57Yt8q2PSvbkg3qqqiPMgy5Q="; }; strictDeps = true; diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 55fc9c9f8329..d5e2d88ca8af 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2024-06-26"; + version = "0-unstable-2024-07-05"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "1a4f12ae0bda877ec4099b429cf439aad897d7e9"; - hash = "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4="; + rev = "c514e862cd5705e51edb6fe8d01146fdeec661f2"; + hash = "sha256-1GHh1/WO+f42TXxb1WiZFMuepM7ITA9iT+6yJBbBNsY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ho/homeassistant-satellite/package.nix b/pkgs/by-name/ho/homeassistant-satellite/package.nix index c5a6026d8ec3..cf69238d8af5 100644 --- a/pkgs/by-name/ho/homeassistant-satellite/package.nix +++ b/pkgs/by-name/ho/homeassistant-satellite/package.nix @@ -16,7 +16,6 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix index cedbe645f941..9cffed873290 100644 --- a/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/pkgs/by-name/ht/htb-toolkit/package.nix @@ -6,7 +6,7 @@ , stdenv , darwin , coreutils -, gnome +, gnome-keyring , libsecret , bash , openvpn @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ - gnome.gnome-keyring + gnome-keyring ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 3bbd7678c006..3cebfa3aa0c3 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.128.0"; + version = "0.128.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-dyiCEWOiUtRppKgpqI68kC7Hv1AMK76kvCEaS8nIIJM="; + hash = "sha256-vSszDPyRvaWpf7m27R4rbS1R7z4vk3hHzn3I0siijTE="; }; vendorHash = "sha256-iNI/5uAYMG+bfndpD17dp1v3rGbFdHnG9oQv/grb/XY="; diff --git a/pkgs/by-name/hy/hyperlink/package.nix b/pkgs/by-name/hy/hyperlink/package.nix index 4bf253c030f7..8f89a0081062 100644 --- a/pkgs/by-name/hy/hyperlink/package.nix +++ b/pkgs/by-name/hy/hyperlink/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { description = "Very fast link checker for CI"; homepage = "https://github.com/untitaker/hyperlink"; license = licenses.mit; - maintainers = [ maintainers.rossabaker ]; + maintainers = [ ]; mainProgram = "hyperlink"; }; } diff --git a/pkgs/by-name/hy/hyperspeedcube/Cargo.lock b/pkgs/by-name/hy/hyperspeedcube/Cargo.lock index 2e8dfdac706b..b46dcd303c98 100644 --- a/pkgs/by-name/hy/hyperspeedcube/Cargo.lock +++ b/pkgs/by-name/hy/hyperspeedcube/Cargo.lock @@ -1434,7 +1434,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyperspeedcube" -version = "1.0.6" +version = "1.0.7" dependencies = [ "ambassador", "anyhow", diff --git a/pkgs/by-name/hy/hyperspeedcube/package.nix b/pkgs/by-name/hy/hyperspeedcube/package.nix index 5b5c53b7708f..79cb640ce038 100644 --- a/pkgs/by-name/hy/hyperspeedcube/package.nix +++ b/pkgs/by-name/hy/hyperspeedcube/package.nix @@ -41,13 +41,13 @@ rustPlatform.buildRustPackage rec { pname = "hyperspeedcube"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "HactarCE"; repo = "Hyperspeedcube"; rev = "v${version}"; - hash = "sha256-FcQuXxVxiyI4hOKS70m62BtZMfN5FzGTLagS+2B3WdY="; + hash = "sha256-ykFf0dfc8j88Y25tx+G9lic09eHDz3WR+h6+owTeWbU="; }; cargoLock = { diff --git a/pkgs/by-name/hy/hypre/package.nix b/pkgs/by-name/hy/hypre/package.nix new file mode 100644 index 000000000000..1b5c918bee45 --- /dev/null +++ b/pkgs/by-name/hy/hypre/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mpi, +}: + +stdenv.mkDerivation (finalAttrs: { + name = "hypre"; + version = "2.31.0"; + + src = fetchFromGitHub { + owner = "hypre-space"; + repo = "hypre"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-eFOyM3IzQUNm7cSnORA3NrKYotEBmLKC8mi+fcwPMQA="; + }; + + sourceRoot = "${finalAttrs.src.name}/src"; + + buildInputs = [ mpi ]; + + configureFlags = [ + "--enable-mpi" + "--enable-shared" + ]; + + preBuild = '' + makeFlagsArray+=(AR="ar -rcu") + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/{include,lib} + cp -r hypre/include/* $out/include + cp -r hypre/lib/* $out/lib + runHook postInstall + ''; + + meta = with lib; { + description = "Parallel solvers for sparse linear systems featuring multigrid methods."; + homepage = "https://computing.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods"; + platforms = platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ mkez ]; + }; +}) diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 722e90b445ea..307475ecb535 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -7,6 +7,7 @@ libGL, libxkbcommon, hyprlang, + hyprutils, pam, wayland, wayland-protocols, @@ -22,14 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.3.0-unstable-2024-04-24"; + version = "0.4.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; - # FIXME: Change to a stable release once available - rev = "415262065fff0a04b229cd00165f346a86a0a73a"; - hash = "sha256-jla5Wo0Qt3NEnD0OjNj85BGw0pR4Zlz5uy8AqHH7tuE="; + rev = "v${finalAttrs.version}"; + hash = "sha256-Dd/DK6FKiwVhr6PygCieEjzn7AFf6xijw6mdhquLnkw="; }; strictDeps = true; @@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { cairo file hyprlang + hyprutils libdrm libGL libjpeg @@ -61,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Hyprland's GPU-accelerated screen locking utility"; homepage = "https://github.com/hyprwm/hyprlock"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ iynaix ]; mainProgram = "hyprlock"; platforms = [ "aarch64-linux" diff --git a/pkgs/by-name/hy/hyprls/package.nix b/pkgs/by-name/hy/hyprls/package.nix new file mode 100644 index 000000000000..d4ff467bc24b --- /dev/null +++ b/pkgs/by-name/hy/hyprls/package.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: +buildGoModule rec { + pname = "hyprls"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "hyprland-community"; + repo = "hyprls"; + rev = "v${version}"; + hash = "sha256-boA2kWlHm9bEM/o0xi/1FlH6WGU4wL1RRvbGGXdzHYQ="; + }; + + vendorHash = "sha256-rG+oGJOABA9ee5nIpC5/U0mMsPhwvVtQvJBlQWfxi5Y="; + + checkFlags = [ + # Not yet implemented + "-skip=TestHighLevelParse" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "LSP server for Hyprland's configuration language"; + homepage = "https://en.ewen.works/hyprls"; + changelog = "https://github.com/hyprland-community/hyprls/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ arthsmn ]; + mainProgram = "hyprls"; + }; +} diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index e345ca65c7ad..b67ef56b803b 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -20,10 +20,6 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = true; - nativeBuildInputs = with python3Packages; [ - pythonRelaxDepsHook - ]; - propagatedBuildInputs = with python3Packages; [ wheel setuptools @@ -79,6 +75,6 @@ python3Packages.buildPythonApplication rec { description = "iCloud Photos Downloader"; license = licenses.mit; mainProgram = "icloudpd"; - maintainers = with maintainers; [ anpin Enzime jnsgruk ]; + maintainers = with maintainers; [ anpin jnsgruk ]; }; } diff --git a/pkgs/by-name/id/ida-free/package.nix b/pkgs/by-name/id/ida-free/package.nix index a103480d7247..87d7457280ef 100644 --- a/pkgs/by-name/id/ida-free/package.nix +++ b/pkgs/by-name/id/ida-free/package.nix @@ -127,6 +127,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Freeware version of the world's smartest and most feature-full disassembler"; homepage = "https://hex-rays.com/ida-free/"; + changelog = "https://hex-rays.com/products/ida/news/"; license = licenses.unfree; mainProgram = "ida64"; maintainers = with maintainers; [ msanft ]; diff --git a/pkgs/applications/graphics/identity/Cargo.lock b/pkgs/by-name/id/identity/Cargo.lock similarity index 100% rename from pkgs/applications/graphics/identity/Cargo.lock rename to pkgs/by-name/id/identity/Cargo.lock diff --git a/pkgs/applications/graphics/identity/default.nix b/pkgs/by-name/id/identity/package.nix similarity index 73% rename from pkgs/applications/graphics/identity/default.nix rename to pkgs/by-name/id/identity/package.nix index debc7e2f423b..55731e045e10 100644 --- a/pkgs/applications/graphics/identity/default.nix +++ b/pkgs/by-name/id/identity/package.nix @@ -1,24 +1,23 @@ -{ lib -, stdenv -, fetchFromGitLab -, rustPlatform -, nix-update-script - -, appstream -, blueprint-compiler -, cargo -, desktop-file-utils -, meson -, ninja -, pkg-config -, rustc -, wrapGAppsHook4 - -, dav1d -, gst_all_1 -, gtk4 -, libadwaita -, libwebp +{ + lib, + stdenv, + fetchFromGitLab, + rustPlatform, + cargo, + rustc, + appstream, + blueprint-compiler, + dav1d, + desktop-file-utils, + gst_all_1, + gtk4, + libadwaita, + libwebp, + meson, + ninja, + pkg-config, + nix-update-script, + wrapGAppsHook4, }: stdenv.mkDerivation rec { @@ -67,12 +66,12 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Program for comparing multiple versions of an image or video"; - mainProgram = "identity"; homepage = "https://gitlab.gnome.org/YaLTeR/identity"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "identity"; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/id/idsk/package.nix b/pkgs/by-name/id/idsk/package.nix index 58774d62c31a..c053f3aa0c16 100644 --- a/pkgs/by-name/id/idsk/package.nix +++ b/pkgs/by-name/id/idsk/package.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Manipulating CPC dsk images and files"; homepage = "https://github.com/cpcsdk/idsk"; + changelog = "https://github.com/cpcsdk/idsk/releases/tag/${src.rev}"; license = licenses.mit; mainProgram = "iDSK"; maintainers = with maintainers; [ wegank ]; diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix index a1eba93894ed..dd635d356c06 100644 --- a/pkgs/by-name/ig/igir/package.nix +++ b/pkgs/by-name/ig/igir/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "igir"; - version = "2.8.2"; + version = "2.9.0"; src = fetchFromGitHub { owner = "emmercm"; repo = "igir"; rev = "v${version}"; - hash = "sha256-EKY9vzN4JYq+ydcjNZPHSqh5Tf6bLeDh1bwkPw01oK8="; + hash = "sha256-AdoY1STLldud9agh6j68CkCeZ2F0OYuu5cEpCTyPCGs="; }; - npmDepsHash = "sha256-7d/aMaKo3gsQ8PI8pSqRrv07k8+xBIpaHL+DPxAGTio="; + npmDepsHash = "sha256-6V5ROCJF2msd0rt6GFXYAhkFtjSEquteCQMscPR8XIw="; # I have no clue why I have to do this postPatch = '' diff --git a/pkgs/by-name/ii/iina/package.nix b/pkgs/by-name/ii/iina/package.nix index 0cf97bcbf9e1..1d3dea15fa19 100644 --- a/pkgs/by-name/ii/iina/package.nix +++ b/pkgs/by-name/ii/iina/package.nix @@ -28,6 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { + changelog = "https://github.com/iina/iina/releases/tag/v${finalAttrs.version}"; description = "Modern media player for macOS"; homepage = "https://iina.io/"; license = lib.licenses.gpl3; diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix index 8a39a6202fcd..227830eddd40 100644 --- a/pkgs/by-name/im/immich-go/package.nix +++ b/pkgs/by-name/im/immich-go/package.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, immich-go }: buildGoModule rec { pname = "immich-go"; - version = "0.17.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "simulot"; repo = "immich-go"; rev = "${version}"; - hash = "sha256-7F2TbZoD7RLG8jaQBGbLb6q/BOVyWxaCGq+mouBBNSg="; + hash = "sha256-cP31y/MfqsbJlzshISfvwT9m7N4sBU0/b8kYt4vwIU8="; # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32 # The intention here is to write the information into files in the `src`'s @@ -24,7 +24,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-nOJJz5KEXqxl3tP1Q12Cb/fugtxR67RjzH6khKg3ppE="; + vendorHash = "sha256-MKWlMoJZ0OECa7Ej26m4D6JYWjnnRuh0rdBUUPnF6SY="; # options used by upstream: # https://github.com/simulot/immich-go/blob/0.13.2/.goreleaser.yaml diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index b39b6b8fdbf1..3e266bd1e446 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -1,7 +1,7 @@ import ./generic.nix { - hash = "sha256-+q5qP7w2RdtuwvxPThCryYYEJ7s5WDnWHRvjo4TuajA="; - version = "6.0.0"; - vendorHash = "sha256-wcauzIbBcYpSWttZCVVE9m49AEQGolGYSsv9eEkhb7Y="; + hash = "sha256-8GgzMiXn/78HkMuJ49cQA9BEQVAzPbG7jOxTScByR6Q="; + version = "6.0.1"; + vendorHash = "sha256-dFg3LSG/ao73ODWcPDq5s9xUjuHabCMOB2AtngNCrlA="; patches = [ ]; lts = true; updateScriptArgs = "--lts=true --regex '6.0.*'"; diff --git a/pkgs/by-name/in/inotify-info/package.nix b/pkgs/by-name/in/inotify-info/package.nix index 6edae9b3f540..21de48577df6 100644 --- a/pkgs/by-name/in/inotify-info/package.nix +++ b/pkgs/by-name/in/inotify-info/package.nix @@ -5,22 +5,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "inotify-info"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "mikesart"; repo = "inotify-info"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-6EY2cyFWfMy1hPDdDGwIzSE92VkAPo0p5ZCG+B1wVYY="; + hash = "sha256-mxZpJMmSCgm5uV5/wknVb1PdxRIF/b2k+6rdOh4b8zA="; }; buildFlags = ["INOTIFYINFO_VERSION=v${finalAttrs.version}"]; - installPhase = '' - runHook preInstall - install -Dm755 _release/inotify-info $out/bin/inotify-info - runHook postInstall - ''; + installFlags = ["PREFIX=$$out"]; meta = with lib; { description = "Easily track down the number of inotify watches, instances, and which files are being watched"; diff --git a/pkgs/by-name/in/insync-nautilus/package.nix b/pkgs/by-name/in/insync-nautilus/package.nix index 8cf010c89326..d0e3b3d934e4 100644 --- a/pkgs/by-name/in/insync-nautilus/package.nix +++ b/pkgs/by-name/in/insync-nautilus/package.nix @@ -3,7 +3,7 @@ fetchurl, lib, dpkg, - gnome, + nautilus-python, insync-emblem-icons, }: @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ dpkg ]; buildInputs = [ - gnome.nautilus-python + nautilus-python insync-emblem-icons ]; diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index 48b945c833c3..945efaec3c19 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -23,11 +23,11 @@ }: stdenv.mkDerivation rec { pname = "intune-portal"; - version = "1.2404.25-jammy"; + version = "1.2405.17-jammy"; src = fetchurl { url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/${pname}/${pname}_${version}_amd64.deb"; - hash = "sha256-ZRJdhhDwXeOjIx7Ml4VvPUOotnJQ9f73nsYzgm6SQC8="; + hash = "sha256-WpVPWzh8jN092MaY2rMXhLfpVXsflMl9hOY9nNGJlLk="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/by-name/ip/ipam/package.nix b/pkgs/by-name/ip/ipam/package.nix index 987b82d03e05..3f5aa2ea78f2 100644 --- a/pkgs/by-name/ip/ipam/package.nix +++ b/pkgs/by-name/ip/ipam/package.nix @@ -36,7 +36,7 @@ buildGoModule rec { homepage = "https://ipam.lauka.net/"; changelog = "https://codeberg.org/lauralani/ipam/releases/tag/v${version}"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "ipam"; }; } diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix index 006eb004611d..bc1f877af11b 100644 --- a/pkgs/by-name/ir/ironbar/package.nix +++ b/pkgs/by-name/ir/ironbar/package.nix @@ -10,7 +10,7 @@ gsettings-desktop-schemas, wrapGAppsHook3, gtk-layer-shell, - gnome, + adwaita-icon-theme, libxkbcommon, openssl, pkg-config, @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { gtk-layer-shell glib-networking shared-mime-info - gnome.adwaita-icon-theme + adwaita-icon-theme hicolor-icon-theme gsettings-desktop-schemas libxkbcommon diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix index ba62bf6e6cc2..b6d323129abd 100644 --- a/pkgs/by-name/ir/irrd/package.nix +++ b/pkgs/by-name/ir/irrd/package.nix @@ -76,7 +76,6 @@ py.pkgs.buildPythonPackage rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; nativeCheckInputs = [ diff --git a/pkgs/applications/science/logic/isabelle/components/default.nix b/pkgs/by-name/is/isabelle/components/default.nix similarity index 100% rename from pkgs/applications/science/logic/isabelle/components/default.nix rename to pkgs/by-name/is/isabelle/components/default.nix diff --git a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix b/pkgs/by-name/is/isabelle/components/isabelle-linter.nix similarity index 85% rename from pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix rename to pkgs/by-name/is/isabelle/components/isabelle-linter.nix index 91bf5ba32b68..1be4ac532d05 100644 --- a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix +++ b/pkgs/by-name/is/isabelle/components/isabelle-linter.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "isabelle-linter"; - version = "2023-1.0.0"; + version = "2024-1.0.1"; src = fetchFromGitHub { owner = "isabelle-prover"; repo = "isabelle-linter"; - rev = "Isabelle2023-v1.0.0"; - sha256 = "sha256-q9+qN94NaTzvhbcNQj7yH/VVfs1QgCH8OU8HW+5+s9U="; + rev = "Isabelle2024-v1.0.1"; + sha256 = "sha256-oTrwcfJgbkpkIweDIyc6lZjAvdS9J4agPoJgZzH+PuQ="; }; nativeBuildInputs = [ isabelle ]; diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/by-name/is/isabelle/package.nix similarity index 85% rename from pkgs/applications/science/logic/isabelle/default.nix rename to pkgs/by-name/is/isabelle/package.nix index edc4483bcfa9..3adf58f467a3 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -12,6 +12,7 @@ , naproche , rlwrap , perl +, procps , makeDesktopItem , isabelle-components , symlinkJoin @@ -21,12 +22,12 @@ let sha1 = stdenv.mkDerivation { pname = "isabelle-sha1"; - version = "2021-1"; + version = "2024"; src = fetchhg { url = "https://isabelle.sketis.net/repos/sha1"; - rev = "e0239faa6f42"; - sha256 = "sha256-4sxHzU/ixMAkSo67FiE6/ZqWJq9Nb9OMNhMoXH2bEy4="; + rev = "0ce12663fe76"; + hash = "sha256-DB/ETVZhbT82IMZA97TmHG6gJcGpFavxDKDTwPzIF80="; }; buildPhase = (if stdenv.isDarwin then '' @@ -46,7 +47,7 @@ let }; in stdenv.mkDerivation (finalAttrs: rec { pname = "isabelle"; - version = "2023"; + version = "2024"; dirname = "Isabelle${version}"; @@ -56,24 +57,24 @@ in stdenv.mkDerivation (finalAttrs: rec { fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; - sha256 = "sha256-0VSW2SrHNI3/k4cCCZ724ruXaq7W1NCPsLrXFZ9l1/Q="; + hash = "sha256-IgNfmW9x6h8DBj9vFEGV62oEl01NkW7QdyzXlWmii8c="; } else if stdenv.hostPlatform.isx86 then fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "sha256-Go4ZCsDz5gJ7uWG5VLrNJOddMPX18G99FAadpX53Rqg="; + hash = "sha256-YDqq+KvqNll687BlHSwWKobAoN1EIHZvR+VyQDljkmc="; } else fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux_arm.tar.gz"; - hash = "sha256-Tzxxs0gKw6vymbaXIzH8tK5VgUrpOIp9vcWQ/zxnRCc="; + hash = "sha256-jXWVv18WwrVnqVX1s4Lnyf7DkOzPa3EdLXYxgtKD+YA="; }; nativeBuildInputs = [ java ]; buildInputs = [ polyml veriT vampire eprover-ho nettools ] - ++ lib.optionals (!stdenv.isDarwin) [ java ]; + ++ lib.optionals (!stdenv.isDarwin) [ java procps ]; sourceRoot = "${dirname}${lib.optionalString stdenv.isDarwin ".app"}"; @@ -130,30 +131,29 @@ in stdenv.mkDerivation (finalAttrs: rec { done substituteInPlace lib/Tools/env \ - --replace /usr/bin/env ${coreutils}/bin/env + --replace-fail /usr/bin/env ${coreutils}/bin/env substituteInPlace src/Tools/Setup/src/Environment.java \ - --replace 'cmd.add("/usr/bin/env");' "" \ - --replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");" + --replace-fail 'cmd.add("/usr/bin/env");' "" \ + --replace-fail 'cmd.add("bash");' "cmd.add(\"$SHELL\");" substituteInPlace src/Pure/General/sha1.ML \ - --replace '"$ML_HOME/" ^ (if ML_System.platform_is_windows then "sha1.dll" else "libsha1.so")' '"${sha1}/lib/libsha1.so"' + --replace-fail '"$ML_HOME/" ^ (if ML_System.platform_is_windows then "sha1.dll" else "libsha1.so")' '"${sha1}/lib/libsha1.so"' rm -r heaps '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' substituteInPlace lib/scripts/isabelle-platform \ - --replace 'ISABELLE_APPLE_PLATFORM64=arm64-darwin' "" + --replace-fail 'ISABELLE_APPLE_PLATFORM64=arm64-darwin' "" '' + lib.optionalString stdenv.isLinux '' - arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" - else if stdenv.hostPlatform.isx86 then "x86-linux" - else "arm64-linux"} - for f in contrib/*/$arch/{z3,epclextract,nunchaku,SPASS,zipperposition}; do + arch=${if stdenv.hostPlatform.system == "aarch64-linux" then "arm64-linux" else stdenv.hostPlatform.system} + for f in contrib/*/$arch/{z3,nunchaku,spass,zipperposition}; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"${lib.optionalString stdenv.isAarch64 " || true"} done - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/platform_$arch/bash_process + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/$arch/bash_process for d in contrib/kodkodi-*/jni/$arch; do patchelf --set-rpath "${lib.concatStringsSep ":" [ "${java}/lib/openjdk/lib/server" "${stdenv.cc.cc.lib}/lib" ]}" $d/*.so done + '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' patchelf --set-rpath "${stdenv.cc.cc.lib}/lib" contrib/z3-*/$arch/z3 ''; @@ -221,6 +221,7 @@ in stdenv.mkDerivation (finalAttrs: rec { license = licenses.bsd3; maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ]; platforms = platforms.unix; + broken = stdenv.isDarwin; }; passthru.withComponents = f: diff --git a/pkgs/by-name/is/iscc/package.nix b/pkgs/by-name/is/iscc/package.nix index fdd81c607a18..103484282276 100644 --- a/pkgs/by-name/is/iscc/package.nix +++ b/pkgs/by-name/is/iscc/package.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Compiler for Inno Setup, a tool for creating Windows installers"; homepage = "https://jrsoftware.org/isinfo.php"; + changelog = "https://jrsoftware.org/files/is6-whatsnew.htm"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ ]; platforms = wineWow64Packages.stable.meta.platforms; diff --git a/pkgs/by-name/it/itch/package.nix b/pkgs/by-name/it/itch/package.nix index 3f5337f04cf1..e49f389babd8 100644 --- a/pkgs/by-name/it/itch/package.nix +++ b/pkgs/by-name/it/itch/package.nix @@ -1,23 +1,21 @@ -{ lib -, stdenvNoCC -, fetchzip -, fetchFromGitHub -, butler -, electron -, steam-run -, makeWrapper -, copyDesktopItems -, makeDesktopItem +{ + lib, + stdenvNoCC, + fetchzip, + fetchFromGitHub, + electron, + steam-run, + makeWrapper, + copyDesktopItems, + makeDesktopItem, }: -stdenvNoCC.mkDerivation rec { - pname = "itch"; - version = "26.1.3"; - # TODO: Using kitch instead of itch, revert when possible - src = fetchzip { - url = "https://broth.itch.ovh/kitch/linux-amd64/${version}/archive/default#.zip"; +let + version = "26.1.9"; + butler = fetchzip { + url = "https://broth.itch.zone/butler/linux-amd64/15.21.0/butler.zip"; stripRoot = false; - hash = "sha256-FHwbzLPMzIpyg6KyYTq6/rSNRH76dytwb9D5f9vNKkU="; + hash = "sha256-jHni/5qf7xST6RRonP2EW8fJ6647jobzrnHe8VMx4IA="; }; itch-setup = fetchzip { @@ -26,16 +24,31 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-5MP6X33Jfu97o5R1n6Og64Bv4ZMxVM0A8lXeQug+bNA="; }; - icons = let sparseCheckout = "/release/images/itch-icons"; in + sparseCheckout = "/release/images/itch-icons"; + icons = fetchFromGitHub { - owner = "itchio"; - repo = "itch"; - rev = "v${version}-canary"; - hash = "sha256-0AMyDZ5oI7/pSvudoEqXnMZJtpcKVlUSR6YVm+s4xv0="; - sparseCheckout = [ sparseCheckout ]; - } + sparseCheckout; + owner = "itchio"; + repo = "itch"; + rev = "v${version}"; + hash = "sha256-jugg+hdP0y0OkFhdQuEI9neWDuNf2p3+DQuwxe09Zck="; + sparseCheckout = [ sparseCheckout ]; + } + + sparseCheckout; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "itch"; + inherit version; - nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + src = fetchzip { + url = "https://broth.itch.ovh/itch/linux-amd64/${finalAttrs.version}/archive/default#.zip"; + stripRoot = false; + hash = "sha256-4k6afBgOKGs7rzXAtIBpmuQeeT/Va8/0bZgNYjuJhgI="; + }; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; desktopItems = [ (makeDesktopItem { @@ -44,7 +57,10 @@ stdenvNoCC.mkDerivation rec { tryExec = "itch"; icon = "itch"; desktopName = "itch"; - mimeTypes = [ "x-scheme-handler/itchio" "x-scheme-handler/itch" ]; + mimeTypes = [ + "x-scheme-handler/itchio" + "x-scheme-handler/itch" + ]; comment = "Install and play itch.io games easily"; categories = [ "Game" ]; }) @@ -54,19 +70,15 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - # TODO: Remove when the next stable Itch is stabilized - substituteInPlace ./resources/app/package.json \ - --replace "kitch" "itch" - mkdir -p $out/bin $out/share/itch/resources/app cp -r resources/app "$out/share/itch/resources/" install -Dm644 LICENSE -t "$out/share/licenses/$pkgname/" install -Dm644 LICENSES.chromium.html -t "$out/share/licenses/$pkgname/" - for icon in $icons/icon*.png + for icon in ${icons}/icon*.png do - iconsize="''${icon#$icons/icon}" + iconsize="''${icon#${icons}/icon}" iconsize="''${iconsize%.png}" icondir="$out/share/icons/hicolor/''${iconsize}x''${iconsize}/apps/" install -Dm644 "$icon" "$icondir/itch.png" @@ -80,16 +92,17 @@ stdenvNoCC.mkDerivation rec { --add-flags ${electron}/bin/electron \ --add-flags $out/share/itch/resources/app \ --set BROTH_USE_LOCAL butler,itch-setup \ - --prefix PATH : ${butler}/bin/:${itch-setup} + --prefix PATH : ${butler}:${itch-setup} ''; - meta = with lib; { + meta = { description = "Best way to play itch.io games"; homepage = "https://github.com/itchio/itch"; - license = licenses.mit; - platforms = platforms.linux; + changelog = "https://github.com/itchio/itch/releases/tag/v${version}-canary"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; - maintainers = with maintainers; [ pasqui23 ]; + maintainers = with lib.maintainers; [ pasqui23 ]; mainProgram = "itch"; }; -} +}) diff --git a/pkgs/by-name/iw/iw/package.nix b/pkgs/by-name/iw/iw/package.nix index a218f8afc79d..bba9d3ffb2a5 100644 --- a/pkgs/by-name/iw/iw/package.nix +++ b/pkgs/by-name/iw/iw/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "iw"; - version = "6.7"; + version = "6.9"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/iw/iw-${finalAttrs.version}.tar.xz"; - hash = "sha256-qs9JwmaynVANcwhnmKHGUudgwZEmqFmf2BGFBDB4mjU="; + hash = "sha256-Py2yKtQcZ1JCuYrjlC2/MRJUjGCkL/c5IQ8t5OmOSJQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 11a298208f56..ad364086efa9 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -1,10 +1,11 @@ { lib , cmake , fetchFromGitHub -, freeglut +, libglut , libGL , libheif , libjpeg +, darwin , pkg-config , stdenv , enableHEIFCodec ? true @@ -36,8 +37,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableJPGCodec [ libjpeg ] ++ lib.optionals enableOpenGL [ - freeglut + libglut libGL + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa ]; # Since "build" already exists and is populated, cmake tries to use it, @@ -55,6 +58,14 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + # The value of __STDC_VERSION__ cannot be automatically determined when cross-compiling + # https://github.com/jasper-software/jasper/blob/87668487/CMakeLists.txt#L415 + # workaround taken from + # https://github.com/openembedded/meta-openembedded/blob/907b9c0a/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb#L16 + preConfigure = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + cmakeFlagsArray+=(-DJAS_STDC_VERSION="$(echo __STDC_VERSION__ | $CXX -E -P -)") + ''; + meta = { homepage = "https://jasper-software.github.io/jasper/"; description = "Image processing/coding toolkit"; @@ -79,9 +90,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "jasper"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - # The value of __STDC_VERSION__ cannot be automatically determined when - # cross-compiling. - broken = stdenv.buildPlatform != stdenv.hostPlatform; }; }) # TODO: investigate opengl support diff --git a/pkgs/by-name/jd/jdt-language-server/package.nix b/pkgs/by-name/jd/jdt-language-server/package.nix index 87031d45006b..a7e80cd17bb2 100644 --- a/pkgs/by-name/jd/jdt-language-server/package.nix +++ b/pkgs/by-name/jd/jdt-language-server/package.nix @@ -6,15 +6,15 @@ }: let - timestamp = "202405301306"; + timestamp = "202406271335"; in stdenv.mkDerivation (finalAttrs: { pname = "jdt-language-server"; - version = "1.36.0"; + version = "1.37.0"; src = fetchurl { url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz"; - hash = "sha256-Ao4nTQb0phytT/1W+J70FKj2VhPG0F2UZ2Ubf7A9rns="; + hash = "sha256-0EzZ9N9FzoWunPSVMMcqGjJLFO7nR68m4zdFAONrW9A="; }; sourceRoot = "."; @@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { # than in the original package. In addition, hard-code the path to the jdk # in the wrapper, instead of searching for it in PATH at runtime. substituteInPlace bin/jdtls.py \ - --replace "jdtls_base_path = Path(__file__).parent.parent" "jdtls_base_path = Path(\"$out/share/java/jdtls/\")" \ - --replace "java_executable = get_java_executable(known_args.validate_java_version)" "java_executable = '${lib.getExe jdk}'" + --replace-fail "jdtls_base_path = Path(__file__).parent.parent" "jdtls_base_path = Path(\"$out/share/java/jdtls/\")" \ + --replace-fail "java_executable = get_java_executable(known_args)" "java_executable = '${lib.getExe jdk}'" ''; installPhase = diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index 912ec7595ca6..7c88f7e4634d 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -9,11 +9,11 @@ }: let pname = "jetbrains-toolbox"; - version = "2.3.2.31487"; + version = "2.4.0.32175"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - sha256 = "sha256-5dgtaqi9cMpEoSl3MRaHWzCA8ktU5Mgjvt9CnBzr1ME="; + hash = "sha256-+EKl8o+S5nwV3u+RrhxuOm/6dLH6zRSvFnyaZRO8xc0="; stripRoot = false; }; diff --git a/pkgs/by-name/ji/jigdo/package.nix b/pkgs/by-name/ji/jigdo/package.nix index 4202bd4dd3dd..2bf1e193e5de 100644 --- a/pkgs/by-name/ji/jigdo/package.nix +++ b/pkgs/by-name/ji/jigdo/package.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Download utility that can fetch files from several sources simultaneously"; homepage = "https://www.einval.com/~steve/software/jigdo/"; + changelog = "https://git.einval.com/cgi-bin/gitweb.cgi?p=jigdo.git;a=blob;f=changelog;hb=refs/tags/${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ wegank ]; platforms = platforms.unix; diff --git a/pkgs/by-name/jo/jogl/package.nix b/pkgs/by-name/jo/jogl/package.nix index 5157fe679771..a12b6b762220 100644 --- a/pkgs/by-name/jo/jogl/package.nix +++ b/pkgs/by-name/jo/jogl/package.nix @@ -120,6 +120,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Java libraries for 3D Graphics, Multimedia and Processing"; homepage = "https://jogamp.org/"; + changelog = "https://jogamp.org/deployment/jogamp-current/archive/ChangeLogs/"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix index 3eb732dd336a..28486559a11f 100644 --- a/pkgs/by-name/jo/josm/package.nix +++ b/pkgs/by-name/jo/josm/package.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "19096"; + version = "19128"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-oX9B98yj9WmTLGVnDO8hOJ/rYFMTLiTaz1dWufD1wqg="; + hash = "sha256-ndbU3QQ3EN3ufBT31+i/YsBsOGC8Bd4m2tAbWADD5Rk="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; - hash = "sha256-qOMSG2eAaMHCvJXYzG07Ngb6fR9MbFQI5+1xuxGbBVU="; + hash = "sha256-HhvOmlxzKtTt52kQJF8PLh6E/UIBgWpXxhkNeZrsH88="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/by-name/js/jsonschema/package.nix b/pkgs/by-name/js/jsonschema/package.nix new file mode 100644 index 000000000000..aba8e7d4a2c1 --- /dev/null +++ b/pkgs/by-name/js/jsonschema/package.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: + +buildGoModule rec { + pname = "jsonschema"; + version = "5.3.1"; + + src = fetchFromGitHub { + owner = "santhosh-tekuri"; + repo = "jsonschema"; + rev = "refs/tags/v${version}"; + hash = "sha256-ANo9OkdNVCjV5uEqr9lNNbStquNb/3oxuTfMqE2nUzo="; + }; + + sourceRoot = "source/cmd/jv"; + passthru.updateScript = nix-update-script { }; + + vendorHash = "sha256-FuUkC7iwn/jO3fHjT9nGUXc2X1QuuxPc8DAzVpzhANk="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "JSON schema compilation and validation"; + homepage = "https://github.com/santhosh-tekuri/jsonschema"; + changelog = "https://github.com/santhosh-tekuri/jsonschema/releases/tag/v${version}"; + license = lib.licenses.asl20; + mainProgram = "jv"; + maintainers = with lib.maintainers; [ ibizaman ]; + }; +} diff --git a/pkgs/by-name/ke/keepass/package.nix b/pkgs/by-name/ke/keepass/package.nix index 06c83d2ebfa5..45af2a1dc577 100644 --- a/pkgs/by-name/ke/keepass/package.nix +++ b/pkgs/by-name/ke/keepass/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { xbuild /p:Configuration=Release - runHook postBuld + runHook postBuild ''; outputFiles = [ diff --git a/pkgs/by-name/ke/keycastr/package.nix b/pkgs/by-name/ke/keycastr/package.nix new file mode 100644 index 000000000000..8259a8bb400d --- /dev/null +++ b/pkgs/by-name/ke/keycastr/package.nix @@ -0,0 +1,35 @@ +{ + stdenvNoCC, + lib, + fetchurl, + unzip, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "keycastr"; + version = "0.9.18"; + + src = fetchurl { + url = "https://github.com/keycastr/keycastr/releases/download/v${finalAttrs.version}/KeyCastr.app.zip"; + hash = "sha256-q12c/W0yGoVL+wx+T/gaevx2P0Xwcv0a0FMv7bKfUnE="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + cp -r KeyCastr.app $out/Applications/ + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/keycastr/keycastr"; + description = "Open-source keystroke visualizer"; + license = lib.licenses.bsd3; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matteopacini ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/applications/misc/keymapp/default.nix b/pkgs/by-name/ke/keymapp/package.nix similarity index 68% rename from pkgs/applications/misc/keymapp/default.nix rename to pkgs/by-name/ke/keymapp/package.nix index 59dae9589fa7..c2777ce5c8e5 100644 --- a/pkgs/applications/misc/keymapp/default.nix +++ b/pkgs/by-name/ke/keymapp/package.nix @@ -1,44 +1,48 @@ -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, wrapGAppsHook3 -, libusb1 -, webkitgtk -, gtk3 -, writeShellScript -, makeDesktopItem -, copyDesktopItems +{ + stdenv, + lib, + fetchurl, + autoPatchelfHook, + wrapGAppsHook4, + libusb1, + libsoup_3, + webkitgtk_4_1, + writeShellScript, + makeDesktopItem, + copyDesktopItems, }: let desktopItem = makeDesktopItem { name = "keymapp"; icon = "keymapp"; desktopName = "Keymapp"; - categories = [ "Settings" "HardwareSettings" ]; + categories = [ + "Settings" + "HardwareSettings" + ]; type = "Application"; exec = "keymapp"; }; in stdenv.mkDerivation rec { pname = "keymapp"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz"; - hash = "sha256-tbRlJ65hHPBDwoXAXf++OdcW67RcqR1x1vfhbPCo1Ls="; + hash = "sha256-WiazQD40dG72B9tl4DwcMJgoVEl/Dgq55AHgeqK+sq8="; }; nativeBuildInputs = [ copyDesktopItems autoPatchelfHook - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ libusb1 - webkitgtk - gtk3 + webkitgtk_4_1 + libsoup_3 ]; sourceRoot = "."; @@ -61,7 +65,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.zsa.io/flash/"; description = "Application for ZSA keyboards"; - maintainers = with lib.maintainers; [ jankaifer shawn8901 ]; + maintainers = with lib.maintainers; [ + jankaifer + shawn8901 + ]; platforms = platforms.linux; license = lib.licenses.unfree; }; diff --git a/pkgs/by-name/ki/kikit/solidpython/default.nix b/pkgs/by-name/ki/kikit/solidpython/default.nix index 2244166bbfea..777f4db9c2bb 100644 --- a/pkgs/by-name/ki/kikit/solidpython/default.nix +++ b/pkgs/by-name/ki/kikit/solidpython/default.nix @@ -2,7 +2,6 @@ { buildPythonPackage , fetchFromGitHub , lib -, pythonRelaxDepsHook , poetry-core , prettytable @@ -24,7 +23,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix index 86e671834e0b..8738bad387fc 100644 --- a/pkgs/by-name/ko/kokkos/package.nix +++ b/pkgs/by-name/ko/kokkos/package.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C++ Performance Portability Programming EcoSystem"; homepage = "https://github.com/kokkos/kokkos"; + changelog = "https://github.com/kokkos/kokkos/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = with licenses; [ asl20-llvm ]; maintainers = with maintainers; [ Madouura ]; platforms = platforms.unix; diff --git a/pkgs/by-name/ko/koodousfinder/package.nix b/pkgs/by-name/ko/koodousfinder/package.nix index 103863b76ee3..b6602e2c6000 100644 --- a/pkgs/by-name/ko/koodousfinder/package.nix +++ b/pkgs/by-name/ko/koodousfinder/package.nix @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ keyring diff --git a/pkgs/by-name/ko/kooha/package.nix b/pkgs/by-name/ko/kooha/package.nix index bc9fdf70d9e5..8d46aadef5cf 100644 --- a/pkgs/by-name/ko/kooha/package.nix +++ b/pkgs/by-name/ko/kooha/package.nix @@ -22,19 +22,19 @@ stdenv.mkDerivation rec { pname = "kooha"; - version = "2.2.4"; + version = "2.3.0"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - hash = "sha256-D/+tsIfcXrlwwL6vSLRsiAp7wMVtIgzjNNd2uk+9bco="; + hash = "sha256-Z+PMSV6fipfHBrqGS24SOgGJS173Vct12sVzCGZL0IA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-iDyhK2k2RB7CvtW+91isVzIFOl2/Loh+Bvneu4TGfn0="; + hash = "sha256-m5y/VfjTJgK+/ZjsMo/9zPVxcV3kuwXb+HNdXR6hkV4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index 9a8863a30344..b5bc0d1608cf 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kor"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-mGHSfOW40NTFK1csckSNriCYF2bEQD/M1Zs34i3PptI="; + hash = "sha256-iwulXSS6nRwoQUPkQMkBbgJM0ityrGx1T+1s1la/lnM="; }; vendorHash = "sha256-9aZy1i0VrDRySt5A5aQHBXa0mPgD+rsyeqQrd6snWKc="; diff --git a/pkgs/by-name/ko/kotlin-interactive-shell/package.nix b/pkgs/by-name/ko/kotlin-interactive-shell/package.nix index 752be68d4245..83b0a99890fa 100644 --- a/pkgs/by-name/ko/kotlin-interactive-shell/package.nix +++ b/pkgs/by-name/ko/kotlin-interactive-shell/package.nix @@ -11,7 +11,7 @@ maven.buildMavenPackage rec { hash = "sha256-3DTyo7rPswpEVzFkcprT6FD+ITGJ+qCXFKXEGoCK+oE="; }; - mvnHash = "sha256-m1o0m0foqJhEzWjC9behBeld5HT08WClcZN2xc3fZrI="; + mvnHash = "sha256-UHtvBVw35QBwgCD+nSduR0924ANAOfwrr/a4qPEYsrM="; mvnParameters = "compile"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/kr/krbjack/package.nix b/pkgs/by-name/kr/krbjack/package.nix index a26b55144277..bd7455cef9a4 100644 --- a/pkgs/by-name/kr/krbjack/package.nix +++ b/pkgs/by-name/kr/krbjack/package.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ colorama diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix index 9b0163a1ae60..fcc690177da4 100644 --- a/pkgs/by-name/ku/kubo/package.nix +++ b/pkgs/by-name/ku/kubo/package.nix @@ -59,6 +59,7 @@ buildGoModule rec { meta = with lib; { description = "IPFS implementation in Go"; homepage = "https://ipfs.io/"; + changelog = "https://github.com/ipfs/kubo/releases/tag/${rev}"; license = licenses.mit; platforms = platforms.unix; mainProgram = "ipfs"; diff --git a/pkgs/by-name/kv/kvmarwaita/package.nix b/pkgs/by-name/kv/kvmarwaita/package.nix new file mode 100644 index 000000000000..012fd17e04c0 --- /dev/null +++ b/pkgs/by-name/kv/kvmarwaita/package.nix @@ -0,0 +1,34 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, unstableGitUpdater +}: + +stdenvNoCC.mkDerivation { + pname = "kvmarwaita"; + version = "0-unstable-2024-06-27"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = "KvMarwaita"; + rev = "3e5f62b8e23bde87f04aae157a453e380d6c5460"; + hash = "sha256-5hRqWQR1OZK7I5T8NV2D1i5yrifvWhHakgwGtdtQQPQ="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/Kvantum/KvMarwaita + cp -a Kv* $out/share/Kvantum/KvMarwaita/ + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Marwaita theme for Kvantum"; + homepage = "https://github.com/darkomarko42/KvMarwaita"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ romildo ]; + }; +} diff --git a/pkgs/by-name/ky/kyua/package.nix b/pkgs/by-name/ky/kyua/package.nix index 6209c2048037..ba399a44ab74 100644 --- a/pkgs/by-name/ky/kyua/package.nix +++ b/pkgs/by-name/ky/kyua/package.nix @@ -7,7 +7,7 @@ lutok, pkg-config, sqlite, - gitUpdater, + unstableGitUpdater, }: let @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstallCheck ''; - passthru.updateScript = gitUpdater { rev-prefix = "kyua-"; }; + passthru.updateScript = unstableGitUpdater { tagPrefix = "kyua-"; }; __structuredAttrs = true; diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix index 411df5eee29d..bde16f3d6b33 100644 --- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix +++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kyverno-chainsaw"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "kyverno"; repo = "chainsaw"; rev = "v${version}"; - hash = "sha256-YMUT1Wz/jDLH8eMYtfevdww/X+jdM9KqHjUCMSCRRXM="; + hash = "sha256-XkHXjRPthWPFr1t66DGeM5rQHqQEObEO5MhveClBmxg="; }; - vendorHash = "sha256-R2+HjziP0KtExYQ3ZPGZKkqfKinK3BBnxJJh454ed2w="; + vendorHash = "sha256-/W9tLNomE5sQb4NqZ4XCrNY+w6GbKblOhd9MilqLY50="; ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/la/latexminted/package.nix b/pkgs/by-name/la/latexminted/package.nix index fc5cb3a3a7e9..313084f41d47 100644 --- a/pkgs/by-name/la/latexminted/package.nix +++ b/pkgs/by-name/la/latexminted/package.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "latexminted"; - version = "0.1.0b5"; + version = "0.1.0b9"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1K43rX3hs+ywMzOyeKX+GmAGUVHTDZB3Yo87dZ/uYaQ="; + hash = "sha256-QUFfoX1jv5pVQDEBGaVd1madfqbTWTJyXPh4gw7P5UE="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/la/lavanda-gtk-theme/package.nix b/pkgs/by-name/la/lavanda-gtk-theme/package.nix new file mode 100644 index 000000000000..a4e69796fc76 --- /dev/null +++ b/pkgs/by-name/la/lavanda-gtk-theme/package.nix @@ -0,0 +1,52 @@ +{ + fetchFromGitHub, + gnome-themes-extra, + gtk-engine-murrine, + jdupes, + lib, + sassc, + stdenvNoCC, +}: + +stdenvNoCC.mkDerivation rec { + pname = "lavanda-gtk-theme"; + version = "2023-10-22"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = "Lavanda-gtk-theme"; + rev = version; + hash = "sha256-J243VVEqzg6o5dYLSCKPxWhUj5EKCnhvCHdia8EIfeQ="; + }; + + nativeBuildInputs = [ + jdupes + sassc + ]; + + buildInputs = [ gnome-themes-extra ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + preInstall = '' + mkdir -p $out/share/themes + ''; + + installPhase = '' + runHook preInstall + + bash install.sh -d $out/share/themes + + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + meta = with lib; { + description = "Lavanda gtk theme for linux desktops"; + homepage = "https://github.com/vinceliuice/Lavanda-gtk-theme"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ dretyuiop ]; + }; +} diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix index a807831ec435..5b6aeae29a0b 100644 --- a/pkgs/by-name/ld/ldc/package.nix +++ b/pkgs/by-name/ld/ldc/package.nix @@ -31,13 +31,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ldc"; - version = "1.38.0"; + version = "1.39.0"; src = fetchFromGitHub { owner = "ldc-developers"; repo = "ldc"; rev = "v${finalAttrs.version}"; - hash = "sha256-d/UREh+fHRRh0r3H60uPjHute+qspcm9TBFWZMbGDxk="; + hash = "sha256-ZiG0ATsY6Asu2nus3Y404fvqIwtKYoHl1JRUDU5A6mo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 160029bae89d..893371ab7538 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.6.18"; + version = "1.6.21"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-jJKnBQ+49LtwSNTzX2xsL/lFFlaBBvJtIL9ltODPhEk="; + hash = "sha256-8wSprlU0JYGHWZyozdRp1zNwwdDaKh+VguzaRW0WGAg="; }; vendorHash = "sha256-ralnfqrP6R58Wjc/AWRf1motWZICPagZxHCkqVcwYoo="; diff --git a/pkgs/by-name/li/liana/package.nix b/pkgs/by-name/li/liana/package.nix index f51e29c0eb89..42a45b77aa00 100644 --- a/pkgs/by-name/li/liana/package.nix +++ b/pkgs/by-name/li/liana/package.nix @@ -84,6 +84,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "liana-gui"; description = "A Bitcoin wallet leveraging on-chain timelocks for safety and recovery"; homepage = "https://wizardsardine.com/liana"; + changelog = "https://github.com/wizardsardine/liana/releases/tag/${src.rev}"; license = licenses.bsd3; maintainers = with maintainers; [ dunxen ]; platforms = platforms.linux; diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix index c122f840df32..c6f470c78953 100644 --- a/pkgs/by-name/li/libcamera/package.nix +++ b/pkgs/by-name/li/libcamera/package.nix @@ -25,18 +25,18 @@ stdenv.mkDerivation rec { pname = "libcamera"; - version = "0.2.0"; + version = "0.3.0"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; rev = "v${version}"; - hash = "sha256-x0Im9m9MoACJhQKorMI34YQ+/bd62NdAPc2nWwaJAvM="; + hash = "sha256-eCtOtdjpwn0S56ZyRVdG1QCBk1KGPh8YTXD50xev7Bc="; }; outputs = [ "out" "dev" ]; postPatch = '' - patchShebangs utils/ + patchShebangs src/py/ utils/ ''; # libcamera signs the IPA module libraries at install time, but they are then @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { pkg-config python3 python3Packages.jinja2 + python3Packages.pybind11 python3Packages.pyyaml python3Packages.ply python3Packages.sphinx @@ -112,6 +113,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source camera stack and framework for Linux, Android, and ChromeOS"; homepage = "https://libcamera.org"; + changelog = "https://git.libcamera.org/libcamera/libcamera.git/tag/?h=${src.rev}"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ citadelcore ]; badPlatforms = [ diff --git a/pkgs/by-name/li/libclipboard/package.nix b/pkgs/by-name/li/libclipboard/package.nix index 5420501270b3..1febf35d1c8f 100644 --- a/pkgs/by-name/li/libclipboard/package.nix +++ b/pkgs/by-name/li/libclipboard/package.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Lightweight cross-platform clipboard library"; homepage = "https://jtanx.github.io/libclipboard"; + changelog = "https://github.com/jtanx/libclipboard/releases/tag/${finalAttrs.src.rev}"; platforms = lib.platforms.unix; license = lib.licenses.mit; maintainers = [ lib.maintainers.sigmanificient ]; diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix index eb228ae3217b..f723ac9656ce 100644 --- a/pkgs/by-name/li/libedit/package.nix +++ b/pkgs/by-name/li/libedit/package.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://www.thrysoee.dk/editline/"; + changelog = "https://www.thrysoee.dk/editline/#changelog"; description = "Port of the NetBSD Editline library (libedit)"; longDescription = '' This is an autotool- and libtoolized port of the NetBSD Editline library diff --git a/pkgs/by-name/li/libetebase/package.nix b/pkgs/by-name/li/libetebase/package.nix new file mode 100644 index 000000000000..d039cad84201 --- /dev/null +++ b/pkgs/by-name/li/libetebase/package.nix @@ -0,0 +1,45 @@ +{ rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, lib +, stdenv +, testers +, libetebase +}: +rustPlatform.buildRustPackage rec { + pname = "libetebase"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "etesync"; + repo = "libetebase"; + rev = "v${version}"; + hash = "sha256-cXuOKfyMdk+YzDi0G8i44dyBRf4Ez5+AlCKG43BTSSU="; + }; + + cargoHash = "sha256-GUNj5GrY04CXnej3WDKZmW4EeJhoCl2blHSDfEkQKtE="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + postInstall = '' + install -d $out/lib/pkgconfig + sed s#@prefix@#$out#g etebase.pc.in > $out/lib/pkgconfig/etebase.pc + install -Dm644 EtebaseConfig.cmake -t $out/lib/cmake/Etebase + install -Dm644 target/etebase.h -t $out/include/etebase + ln -s $out/lib/libetebase.so $out/lib/libetebase.so.0 + ''; + + passthru.tests.pkgs-config = testers.testMetaPkgConfig libetebase; + + meta = with lib; { + description = "A C library for Etebase"; + homepage = "https://www.etebase.com/"; + license = licenses.bsd3; + broken = stdenv.isDarwin; + maintainers = with maintainers; [ laalsaas ]; + pkgConfigModules = [ "etebase" ]; + }; +} diff --git a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix b/pkgs/by-name/li/libgnome-keyring/package.nix similarity index 70% rename from pkgs/desktops/gnome/core/libgnome-keyring/default.nix rename to pkgs/by-name/li/libgnome-keyring/package.nix index 912953dfb33f..e845970a6ad7 100644 --- a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix +++ b/pkgs/by-name/li/libgnome-keyring/package.nix @@ -13,9 +13,23 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; + strictDeps = true; propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; + configureFlags = [ + # not ideal to use -config scripts but it's not possible switch it to pkg-config + # binaries in dev have a for build shebang + "LIBGCRYPT_CONFIG=${lib.getExe' (lib.getDev libgcrypt) "libgcrypt-config"}" + ]; + + postPatch = '' + # uses pkg-config in some places and uses the correct $PKG_CONFIG in some + # it's an ancient library so it has very old configure scripts and m4 + substituteInPlace ./configure \ + --replace "pkg-config" "$PKG_CONFIG" + ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { diff --git a/pkgs/by-name/li/libilbm/package.nix b/pkgs/by-name/li/libilbm/package.nix index 4d145a00021c..16f872df848b 100644 --- a/pkgs/by-name/li/libilbm/package.nix +++ b/pkgs/by-name/li/libilbm/package.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation { such as Deluxe Paint and Graphicraft to read and write images. ''; homepage = "https://github.com/svanderburg/libilbm"; + changelog = "https://github.com/svanderburg/libilbm/blob/master/ChangeLog"; maintainers = with maintainers; [ _414owen ]; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/by-name/li/libisocodes/package.nix b/pkgs/by-name/li/libisocodes/package.nix new file mode 100644 index 000000000000..4b4d4003d833 --- /dev/null +++ b/pkgs/by-name/li/libisocodes/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + vala, + pkg-config, + gobject-introspection, + libxml2, + libgee, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libisocodes"; + version = "1.2.5"; + + src = fetchFromGitHub { + owner = "toddy15"; + repo = "libisocodes"; + rev = "v${finalAttrs.version}"; + hash = "sha256-a2gVqiZXDiH1byEw/s3MqDQBBZ/bmnw8OyllGYfYykQ="; + }; + + nativeBuildInputs = [ + vala + pkg-config + gobject-introspection + ]; + + buildInputs = [ + libxml2 + libgee + ]; + + meta = { + description = "Easily access XML data of the iso-codes package"; + longDescription = '' + This library can be used to easily access XML data of + the iso-codes package. It will provide an abstraction + layer to handle both the version 3 and the upcoming + version 4 of iso-codes. Moreover, all available + translations can be used as well. + + This library makes use of the GObject introspection + features, so that it is accessible from a variety of + programming languages, for example C, Vala, Ruby, + Python, Perl, Lua, JavaScript, PHP and many more. + ''; + homepage = "https://github.com/toddy15/libisocodes"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/li/libmediainfo/package.nix b/pkgs/by-name/li/libmediainfo/package.nix index 931c24ad28d4..4f433e9b6f14 100644 --- a/pkgs/by-name/li/libmediainfo/package.nix +++ b/pkgs/by-name/li/libmediainfo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "24.05"; + version = "24.06"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-sU95EEsdDXjen7QoBfKdVP3wHD5Ckcw2OOBNCdFFuNY="; + hash = "sha256-BoPyiiR13CQXIFulKN68zEB9pNn6ZRbrS3Wz/3JE6W4="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/by-name/li/libplacebo_5/package.nix b/pkgs/by-name/li/libplacebo_5/package.nix index f307a869e940..8dc6dbe1cea6 100644 --- a/pkgs/by-name/li/libplacebo_5/package.nix +++ b/pkgs/by-name/li/libplacebo_5/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { homepage = "https://code.videolan.org/videolan/libplacebo"; changelog = "https://code.videolan.org/videolan/libplacebo/-/tags/v${version}"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ primeos tadeokondrak ]; + maintainers = with maintainers; [ primeos ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/li/librum/package.nix b/pkgs/by-name/li/librum/package.nix index 33972b85dc05..2d6612c68098 100644 --- a/pkgs/by-name/li/librum/package.nix +++ b/pkgs/by-name/li/librum/package.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { completely open source. ''; homepage = "https://librumreader.com"; + changelog = "https://github.com/Librum-Reader/Librum/releases/tag/${src.rev}"; license = licenses.gpl3Plus; mainProgram = "librum"; maintainers = with maintainers; [ aleksana oluceps ]; diff --git a/pkgs/by-name/li/libstrophe/package.nix b/pkgs/by-name/li/libstrophe/package.nix index d8ae379859cc..c78411b5c4f2 100644 --- a/pkgs/by-name/li/libstrophe/package.nix +++ b/pkgs/by-name/li/libstrophe/package.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { runs well on both Linux, Unix, and Windows based platforms. ''; homepage = "https://strophe.im/libstrophe/"; + changelog = "https://github.com/strophe/libstrophe/blob/${src.rev}/ChangeLog"; license = with licenses; [ gpl3Only mit ]; platforms = platforms.unix; maintainers = with maintainers; [ devhell flosse ]; diff --git a/pkgs/by-name/li/libtas/package.nix b/pkgs/by-name/li/libtas/package.nix index e7161894c795..7a3ab2e7a155 100644 --- a/pkgs/by-name/li/libtas/package.nix +++ b/pkgs/by-name/li/libtas/package.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://clementgallet.github.io/libTAS/"; + changelog = "https://github.com/clementgallet/libTAS/blob/${finalAttrs.src.rev}/CHANGELOG.md"; description = "GNU/Linux software to give TAS tools to games"; license = lib.licenses.gpl3Only; maintainers = with maintainers; [ skyrina ]; diff --git a/pkgs/by-name/li/libusbp/package.nix b/pkgs/by-name/li/libusbp/package.nix index 7502ee17490f..01d061fe0dcc 100644 --- a/pkgs/by-name/li/libusbp/package.nix +++ b/pkgs/by-name/li/libusbp/package.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation(finalAttrs: { meta = with lib; { homepage = "https://github.com/pololu/libusbp"; + changelog = "https://github.com/pololu/libusbp/blob/${finalAttrs.src.rev}/README.md#version-history"; description = "Pololu USB Library (also known as libusbp)"; longDescription = '' libusbp is a cross-platform C library for accessing USB devices diff --git a/pkgs/by-name/li/libv3270/package.nix b/pkgs/by-name/li/libv3270/package.nix index 90b6fd9f2832..4f053f2795c5 100644 --- a/pkgs/by-name/li/libv3270/package.nix +++ b/pkgs/by-name/li/libv3270/package.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "3270 Virtual Terminal for GTK"; homepage = "https://github.com/PerryWerneck/libv3270"; + changelog = "https://github.com/PerryWerneck/libv3270/blob/master/CHANGELOG"; license = licenses.lgpl3Plus; maintainers = [ maintainers.vifino ]; }; diff --git a/pkgs/by-name/li/libzim-glib/package.nix b/pkgs/by-name/li/libzim-glib/package.nix new file mode 100644 index 000000000000..39894323c227 --- /dev/null +++ b/pkgs/by-name/li/libzim-glib/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + vala, + pkg-config, + gobject-introspection, + glib, + zimlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libzim-glib"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "birros"; + repo = "libzim-glib"; + rev = "v${finalAttrs.version}"; + hash = "sha256-C1f/ULTJIHvt/LCSRw3dsGAWUkb1i4xaCmW1+QBZd2c="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + gobject-introspection + ]; + + buildInputs = [ + glib + zimlib + ]; + + # requires downloading test sample of a specific zimlib version + doCheck = false; + + meta = { + description = "Partial GObject/C bindings for libzim"; + homepage = "https://github.com/birros/libzim-glib"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/li/license-go/package.nix b/pkgs/by-name/li/license-go/package.nix index 2aa87c802070..17491272b426 100644 --- a/pkgs/by-name/li/license-go/package.nix +++ b/pkgs/by-name/li/license-go/package.nix @@ -29,6 +29,7 @@ buildGoModule { meta = { description = "Command line license text generator"; homepage = "https://github.com/nishanths/license"; + changelog = "https://github.com/nishanths/license/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ uncenter ]; mainProgram = "license"; diff --git a/pkgs/by-name/li/lightning/package.nix b/pkgs/by-name/li/lightning/package.nix index b9414fb61346..f85020499047 100644 --- a/pkgs/by-name/li/lightning/package.nix +++ b/pkgs/by-name/li/lightning/package.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.gnu.org/software/lightning/"; + changelog = "https://git.savannah.gnu.org/cgit/lightning.git/tree/ChangeLog?h=lightning-${finalAttrs.version}"; description = "Run-time code generation library"; longDescription = '' GNU lightning is a library that generates assembly language code at diff --git a/pkgs/by-name/li/likwid/package.nix b/pkgs/by-name/li/likwid/package.nix index 95fe029044fa..8a8a492fa0f4 100644 --- a/pkgs/by-name/li/likwid/package.nix +++ b/pkgs/by-name/li/likwid/package.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://hpc.fau.de/research/tools/likwid/"; + changelog = "https://github.com/RRZE-HPC/likwid/releases/tag/v${version}"; description = "Performance monitoring and benchmarking suite"; license = licenses.gpl3Only; # Might work on ARM by appropriately setting COMPILER in config.mk diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 4402cad9816a..eade9bd2d631 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -12,7 +12,7 @@ }: let - version = "7.8.0"; + version = "7.9.1"; in # The output of the derivation is a tool to create bootable images using Limine # as bootloader for various platforms and corresponding binary and helper files. @@ -24,7 +24,7 @@ stdenv.mkDerivation { # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"; - sha256 = "sha256-Fue2KPyJ76Q1f+chvhwmJlmQ4QwXksyCeztd2d2cTH0="; + sha256 = "sha256-cR6ilV5giwvbqUoOGbnXQnqZzUz/oL7OGZPYNoFKvy0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/linien-gui/package.nix b/pkgs/by-name/li/linien-gui/package.nix index dd9ca7e4ca58..1321fe076871 100644 --- a/pkgs/by-name/li/linien-gui/package.nix +++ b/pkgs/by-name/li/linien-gui/package.nix @@ -42,6 +42,7 @@ python3.pkgs.buildPythonApplication rec { description = "Graphical user interface of the Linien spectroscopy lock application"; mainProgram = "linien"; homepage = "https://github.com/linien-org/linien/tree/develop/linien-gui"; + changelog = "https://github.com/linien-org/linien/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fsagbuya doronbehar ]; }; diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix index 02838ccb83cc..0ec85d195db7 100644 --- a/pkgs/by-name/li/linux-wallpaperengine/package.nix +++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , ffmpeg -, freeglut +, libglut , freeimage , glew , glfw @@ -44,7 +44,7 @@ stdenv.mkDerivation { buildInputs = [ ffmpeg - freeglut + libglut freeimage glew glfw diff --git a/pkgs/by-name/li/literate/package.nix b/pkgs/by-name/li/literate/package.nix index 29b177ec53a8..bfd53ce1e5f0 100644 --- a/pkgs/by-name/li/literate/package.nix +++ b/pkgs/by-name/li/literate/package.nix @@ -27,7 +27,7 @@ buildDubPackage { installPhase = '' runHook preInstall install -Dm755 bin/lit -t $out/bin - runHook preInstall + runHook postInstall ''; meta = { diff --git a/pkgs/applications/misc/livecaptions/default.nix b/pkgs/by-name/li/livecaptions/package.nix similarity index 74% rename from pkgs/applications/misc/livecaptions/default.nix rename to pkgs/by-name/li/livecaptions/package.nix index 2d52e96fe359..1dc03b3e5d85 100644 --- a/pkgs/applications/misc/livecaptions/default.nix +++ b/pkgs/by-name/li/livecaptions/package.nix @@ -7,6 +7,7 @@ ninja, pkg-config, cmake, + appstream-glib, desktop-file-utils, wrapGAppsHook4, onnxruntime, @@ -21,22 +22,22 @@ rev = "3308e68442664552de593957cad0fa443ea183dd"; hash = "sha256-/cOZ2EcZu/Br9v0ComxnOegcEtlC9e8FYt3XHfah7mE="; }; - - aprilModel = fetchurl { - name = "april-english-dev-01110_en.april"; - url = "https://april.sapples.net/april-english-dev-01110_en.april"; - hash = "sha256-d+uV0PpPdwijfoaMImUwHubELcsl5jymPuo9nLrbwfM="; - }; in stdenv.mkDerivation (finalAttrs: { pname = "livecaptions"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "abb128"; repo = "LiveCaptions"; rev = "v${finalAttrs.version}"; - hash = "sha256-x8NetSooIBlOKzKUMvDkPFtpD6EVGYECnaqWurySUDU="; + hash = "sha256-bLWJQgZopuQ0t2pexazUTj1+C2weRMrL3PUhIHZ0W5M="; + }; + + model = fetchurl { + name = "april-english-dev-01110_en.april"; + url = "https://april.sapples.net/april-english-dev-01110_en.april"; + hash = "sha256-d+uV0PpPdwijfoaMImUwHubELcsl5jymPuo9nLrbwfM="; }; nativeBuildInputs = [ @@ -44,6 +45,7 @@ in ninja pkg-config cmake + appstream-glib # appstreamcli desktop-file-utils # update-desktop-database wrapGAppsHook4 ]; @@ -57,12 +59,12 @@ in postUnpack = '' rm -r source/subprojects/april-asr - ln -sf ${aprilAsr} source/subprojects/april-asr + ln -s ${aprilAsr} source/subprojects/april-asr ''; preFixup = '' gappsWrapperArgs+=( - --set APRIL_MODEL_PATH ${aprilModel} + --set APRIL_MODEL_PATH ${finalAttrs.model} ) ''; diff --git a/pkgs/by-name/li/livekit-cli/package.nix b/pkgs/by-name/li/livekit-cli/package.nix index fe276c14c343..777d71a987d2 100644 --- a/pkgs/by-name/li/livekit-cli/package.nix +++ b/pkgs/by-name/li/livekit-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "livekit-cli"; - version = "1.4.3"; + version = "1.5.1"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit-cli"; rev = "v${version}"; - hash = "sha256-IARQ5yxktem729SrxdT5i+7+1dY60xw+2KZU+unlsKM="; + hash = "sha256-J5tg3nm2pEemEZcIpObcxH+G4ByzvUtoSyy92CcWr6M="; }; - vendorHash = "sha256-3ePOwEEPexM+k0atW/mW4yNVtnsEXwv1w5NVQLyexbs="; + vendorHash = "sha256-ywHTIuiZaoY3p7hTsnImcCpuwMXHQZcnRsWerIlOU4o="; subPackages = [ "cmd/livekit-cli" ]; diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix index 3d7584b864e9..0e2b6997f153 100644 --- a/pkgs/by-name/li/livekit/package.nix +++ b/pkgs/by-name/li/livekit/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "livekit"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit"; rev = "v${version}"; - hash = "sha256-fJpW85bYV6Jl7EoyXsJdr4hUqBntMzBnJfTO316/En0="; + hash = "sha256-wUMp2U++6LQm8Iyv6CI8NSoc1sL2k/N12m4FVr35RS0="; }; - vendorHash = "sha256-V8kHIzIZj07B1N2KBGICIFF7aRFl2oynMIZUPeotCs8="; + vendorHash = "sha256-SN92BqNsbtXHwIcEk6AmVLoKyPr8Pn4MbKEIYS4ZodQ="; subPackages = [ "cmd/server" ]; diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 254f8c2a51f6..e1f14a4b31eb 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -46,16 +46,12 @@ let ++ optionals metalSupport [ MetalKit ]; cudaBuildInputs = with cudaPackages; [ - cuda_cccl.dev # + cuda_cccl # # A temporary hack for reducing the closure size, remove once cudaPackages # have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792 - cuda_cudart.dev - cuda_cudart.lib - cuda_cudart.static - libcublas.dev - libcublas.lib - libcublas.static + cuda_cudart + libcublas ]; rocmBuildInputs = with rocmPackages; [ @@ -71,13 +67,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "3091"; + version = "3260"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-ppujag6Nrk/M9QMQ4mYe2iADsfKzmfKtOP8Ib7GZBmk="; + hash = "sha256-0KVwSzxfGinpv5KkDCgF2J+1ijDv87PlDrC+ldscP6s="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -86,12 +82,12 @@ effectiveStdenv.mkDerivation (finalAttrs: { }; postPatch = '' - substituteInPlace ./ggml-metal.m \ + substituteInPlace ./ggml/src/ggml-metal.m \ --replace-fail '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";" - substituteInPlace ./scripts/build-info.cmake \ - --replace-fail 'set(BUILD_NUMBER 0)' 'set(BUILD_NUMBER ${finalAttrs.version})' \ - --replace-fail 'set(BUILD_COMMIT "unknown")' "set(BUILD_COMMIT \"$(cat COMMIT)\")" + substituteInPlace ./scripts/build-info.sh \ + --replace-fail 'build_number="0"' 'build_number="${finalAttrs.version}"' \ + --replace-fail 'build_commit="unknown"' "build_commit=\"$(cat COMMIT)\"" ''; nativeBuildInputs = [ cmake ninja pkg-config git ] @@ -109,17 +105,16 @@ effectiveStdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # -march=native is non-deterministic; override with platform-specific flags if needed - (cmakeBool "LLAMA_NATIVE" false) - (cmakeBool "BUILD_SHARED_SERVER" true) + (cmakeBool "GGML_NATIVE" false) + (cmakeBool "LLAMA_BUILD_SERVER" true) (cmakeBool "BUILD_SHARED_LIBS" true) - (cmakeBool "BUILD_SHARED_LIBS" true) - (cmakeBool "LLAMA_BLAS" blasSupport) - (cmakeBool "LLAMA_CLBLAST" openclSupport) - (cmakeBool "LLAMA_CUDA" cudaSupport) - (cmakeBool "LLAMA_HIPBLAS" rocmSupport) - (cmakeBool "LLAMA_METAL" metalSupport) - (cmakeBool "LLAMA_RPC" rpcSupport) - (cmakeBool "LLAMA_VULKAN" vulkanSupport) + (cmakeBool "GGML_BLAS" blasSupport) + (cmakeBool "GGML_CLBLAST" openclSupport) + (cmakeBool "GGML_CUDA" cudaSupport) + (cmakeBool "GGML_HIPBLAS" rocmSupport) + (cmakeBool "GGML_METAL" metalSupport) + (cmakeBool "GGML_RPC" rpcSupport) + (cmakeBool "GGML_VULKAN" vulkanSupport) ] ++ optionals cudaSupport [ (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) @@ -138,7 +133,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") (cmakeBool "LLAMA_METAL_EMBED_LIBRARY" true) ] ++ optionals rpcSupport [ - "-DLLAMA_RPC=ON" # This is done so we can move rpc-server out of bin because llama.cpp doesn't # install rpc-server in their install target. "-DCMAKE_SKIP_BUILD_RPATH=ON" @@ -147,10 +141,11 @@ effectiveStdenv.mkDerivation (finalAttrs: { # upstream plans on adding targets at the cmakelevel, remove those # additional steps after that postInstall = '' - mv $out/bin/main $out/bin/llama - mv $out/bin/server $out/bin/llama-server + # Match previous binary name for this package + ln -sf $out/bin/llama-cli $out/bin/llama + mkdir -p $out/include - cp $src/llama.h $out/include/ + cp $src/include/llama.h $out/include/ '' + optionalString rpcSupport "cp bin/rpc-server $out/bin/llama-rpc-server"; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index f08d2d1510b7..dae243747292 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://releases.lmstudio.ai/mac/arm64/${version}/latest/LM-Studio-${version}-arm64.dmg"; - hash = "sha256-byS0LNJQjs/+sf2anhTAdsXUWad9HujxmLx5uEfdlo8="; + hash = "sha256-zLbkb33Fmz2b+cloEINJybuj+i3ya+EVxb5CPWo/iXk="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index abca76ac032a..d5647e72caaa 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -8,7 +8,7 @@ let src = fetchurl { url = "https://releases.lmstudio.ai/linux/x86/${version}/beta/LM_Studio-${version}.AppImage"; - hash = "sha256-2a3ac+0m3C/YyPM0Waia+x2Q/lodfbyHNvlbB2AHT78="; + hash = "sha256-Mui9QxK7UDnt6cWpYzsoy4hp7P46kx/53+em7Alu1BA="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 962bd58a94f0..59af9b4f96b5 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -5,7 +5,7 @@ }: let pname = "lmstudio"; - version = "0.2.25"; + version = "0.2.27"; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; homepage = "https://lmstudio.ai/"; diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index 3e2c3fc165e4..498cc96a454b 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -97,21 +97,17 @@ let llama-cpp-rpc = (llama-cpp-grpc.overrideAttrs (prev: { name = "llama-cpp-rpc"; cmakeFlags = prev.cmakeFlags ++ [ - (lib.cmakeBool "LLAMA_AVX" false) - (lib.cmakeBool "LLAMA_AVX2" false) - (lib.cmakeBool "LLAMA_AVX512" false) - (lib.cmakeBool "LLAMA_FMA" false) - (lib.cmakeBool "LLAMA_F16C" false) - (lib.cmakeBool "LLAMA_RPC" true) + (lib.cmakeBool "GGML_AVX" false) + (lib.cmakeBool "GGML_AVX2" false) + (lib.cmakeBool "GGML_AVX512" false) + (lib.cmakeBool "GGML_FMA" false) + (lib.cmakeBool "GGML_F16C" false) ]; - postPatch = prev.postPatch + '' - sed -i examples/rpc/CMakeLists.txt \ - -e '$a\install(TARGETS rpc-server RUNTIME)' - ''; })).override { cudaSupport = false; openclSupport = false; blasSupport = false; + rpcSupport = true; }; llama-cpp-grpc = (llama-cpp.overrideAttrs (final: prev: { @@ -119,8 +115,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; - rev = "37bef8943312d91183ff06d8f1214082a17344a5"; - hash = "sha256-E3kCMDK5TXozBsprp4D581WHTVP9aljxB1KZUKug1pM="; + rev = "cb5fad4c6c2cbef92e9b8b63449e1cb7664e4846"; + hash = "sha256-cIJuDC+MFLd5hkA1kUxuaw2dZagHqn5fi5Q2XKvDEII="; fetchSubmodules = true; }; postPatch = prev.postPatch + '' @@ -137,14 +133,12 @@ let ''; cmakeFlags = prev.cmakeFlags ++ [ (lib.cmakeBool "BUILD_SHARED_LIBS" false) - (lib.cmakeBool "LLAMA_AVX" enable_avx) - (lib.cmakeBool "LLAMA_AVX2" enable_avx2) - (lib.cmakeBool "LLAMA_AVX512" enable_avx512) - (lib.cmakeBool "LLAMA_FMA" enable_fma) - (lib.cmakeBool "LLAMA_F16C" enable_f16c) + (lib.cmakeBool "GGML_AVX" enable_avx) + (lib.cmakeBool "GGML_AVX2" enable_avx2) + (lib.cmakeBool "GGML_AVX512" enable_avx512) + (lib.cmakeBool "GGML_FMA" enable_fma) + (lib.cmakeBool "GGML_F16C" enable_f16c) ]; - postInstall = null; - buildInputs = prev.buildInputs ++ [ protobuf # provides also abseil_cpp as propagated build input grpc @@ -394,18 +388,18 @@ let stdenv; pname = "local-ai"; - version = "2.17.1"; + version = "2.18.1"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; rev = "v${version}"; - hash = "sha256-G9My4t3vJ1sWyD+vxUgON4ezXURVAAgu1nAtTjd3ZR8="; + hash = "sha256-hRrbGUUawQV4fqxAn3eFBvn4/lZ+NrKhxnGHqpljrec="; }; self = buildGoModule.override { stdenv = effectiveStdenv; } { inherit pname version src; - vendorHash = "sha256-Hu7aJFi40CKNWAxYOR47VBZI1A/9SlBIVQVcB8iqcxA="; + vendorHash = "sha256-uvko1PQWW5P+6cgmwVKocKBm5GndszqCsSbxlXANqJs="; env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4"; @@ -441,7 +435,7 @@ let cp ${llama-cpp-rpc}/bin/grpc-server backend-assets/grpc/llama-cpp-grpc mkdir -p backend-assets/util - cp ${llama-cpp-rpc}/bin/rpc-server backend-assets/util/llama-cpp-rpc-server + cp ${llama-cpp-rpc}/bin/llama-rpc-server backend-assets/util/llama-cpp-rpc-server ''; buildInputs = [ ] @@ -515,7 +509,13 @@ let postFixup = let LD_LIBRARY_PATH = [ ] - ++ lib.optionals with_cublas [ (lib.getLib libcublas) cuda_cudart addDriverRunpath.driverLink ] + ++ lib.optionals with_cublas [ + # driverLink has to be first to avoid loading the stub version of libcuda.so + # https://github.com/NixOS/nixpkgs/issues/320145#issuecomment-2190319327 + addDriverRunpath.driverLink + (lib.getLib libcublas) + cuda_cudart + ] ++ lib.optionals with_clblas [ clblast ocl-icd ] ++ lib.optionals with_openblas [ openblas ] ++ lib.optionals with_tts [ piper-phonemize ]; diff --git a/pkgs/by-name/lo/loco-cli/package.nix b/pkgs/by-name/lo/loco-cli/package.nix index 66d2a468bdb4..fe8599a210d0 100644 --- a/pkgs/by-name/lo/loco-cli/package.nix +++ b/pkgs/by-name/lo/loco-cli/package.nix @@ -23,6 +23,7 @@ rustPlatform.buildRustPackage { mainProgram = "loco"; description = "Loco CLI is a powerful command-line tool designed to streamline the process of generating Loco websites"; homepage = "https://loco.rs"; + changelog = "https://github.com/loco-rs/loco/blob/master/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ sebrut ]; }; diff --git a/pkgs/by-name/lo/logiops/package.nix b/pkgs/by-name/lo/logiops/package.nix index cdd75e4963f3..0ed72e05b4ad 100644 --- a/pkgs/by-name/lo/logiops/package.nix +++ b/pkgs/by-name/lo/logiops/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (oldAttrs: { mainProgram = "logid"; homepage = "https://github.com/PixlOne/logiops"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; }) diff --git a/pkgs/by-name/lo/logiops_0_2_3/package.nix b/pkgs/by-name/lo/logiops_0_2_3/package.nix index f2a9c5be1589..b04e8d682e8e 100644 --- a/pkgs/by-name/lo/logiops_0_2_3/package.nix +++ b/pkgs/by-name/lo/logiops_0_2_3/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { mainProgram = "logid"; homepage = "https://github.com/PixlOne/logiops"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 5b7ad4a2f64f..668e1e2d1a25 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -22,9 +22,9 @@ }: stdenv.mkDerivation (self: { pname = "louvre"; - version = "2.1.0-1"; + version = "2.2.0-1"; rev = "v${self.version}"; - hash = "sha256-qRvAryZ6SIhh5yDugcosVYOM2Tq0XPuaA6ib8/jWxNI="; + hash = "sha256-Ds1TTxHFq0Z88djdpAunhtKAipOCTodKIKOh5oxF568="; src = fetchFromGitHub { inherit (self) rev hash; diff --git a/pkgs/by-name/ls/lshw/package.nix b/pkgs/by-name/ls/lshw/package.nix index 4f0cb5ce3c6b..f44aa8f7245e 100644 --- a/pkgs/by-name/ls/lshw/package.nix +++ b/pkgs/by-name/ls/lshw/package.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + changelog = "https://github.com/lyonel/lshw/blob/master/docs/Changelog"; description = "Provide detailed information on the hardware configuration of the machine"; homepage = "https://ezix.org/project/wiki/HardwareLiSter"; license = licenses.gpl2; diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 0590cb37de8b..f09541a3f57d 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -33,7 +33,7 @@ appimageTools.wrapType2 rec { homepage = "https://www.lunarclient.com/"; license = with licenses; [ unfree ]; mainProgram = "lunar-client"; - maintainers = with maintainers; [ zyansheep Technical27 surfaceflinger ]; + maintainers = with maintainers; [ Technical27 surfaceflinger ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/lv/lv_font_conv/package.nix b/pkgs/by-name/lv/lv_font_conv/package.nix new file mode 100644 index 000000000000..132adafe343a --- /dev/null +++ b/pkgs/by-name/lv/lv_font_conv/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage rec { + pname = "lv_font_conv"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "lvgl"; + repo = "lv_font_conv"; + rev = version; + hash = "sha256-tm6xPOW0pOO02M10O1H7ww+yXWq/DJtbDmlfrJ6Lp4Y="; + }; + + npmDepsHash = "sha256-nNMcOL3uu77e4qLoWGhtBgNQXxeEU+kUuKAc25a8fUc="; + + preBuild = '' + patchShebangs support/build_web.js + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Converts TTF/WOFF fonts to compact bitmap format"; + mainProgram = "lv_font_conv"; + homepage = " https://lvgl.io/tools/fontconverter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/by-name/lx/lxc/4428.diff b/pkgs/by-name/lx/lxc/4428.diff deleted file mode 100644 index 05f0c660c566..000000000000 --- a/pkgs/by-name/lx/lxc/4428.diff +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml -index 92d6f01c3d..d2b67d8d6f 100644 ---- a/.github/workflows/build.yml -+++ b/.github/workflows/build.yml -@@ -50,6 +50,7 @@ jobs: - meson setup build \ - -Dtests=true \ - -Dpam-cgroup=true \ -+ -Dtools-multicall=true \ - -Dwerror=true \ - -Db_lto_mode=default - ninja -C build -diff --git a/src/lxc/cmd/meson.build b/src/lxc/cmd/meson.build -index 3ed3670e4b..edfb986622 100644 ---- a/src/lxc/cmd/meson.build -+++ b/src/lxc/cmd/meson.build -@@ -46,7 +46,7 @@ cmd_lxc_init_static_sources = files( - '../string_utils.c', - '../string_utils.h') + include_sources - --cmd_lxc_monitord_sources = files('lxc_monitord.c') + include_sources + netns_ifaddrs_sources -+cmd_lxc_monitord_sources = files('lxc_monitord.c') - cmd_lxc_user_nic_sources = files('lxc_user_nic.c') + cmd_common_sources + netns_ifaddrs_sources - cmd_lxc_usernsexec_sources = files('lxc_usernsexec.c') + cmd_common_sources + netns_ifaddrs_sources - -@@ -88,8 +88,8 @@ cmd_programs += executable( - 'lxc-monitord', - cmd_lxc_monitord_sources, - include_directories: liblxc_includes, -- dependencies: liblxc_dep, -- link_with: [liblxc_static], -+ dependencies: liblxc_dependencies, -+ link_whole: [liblxc_static], - install: true, - install_dir: lxclibexec) - -diff --git a/src/lxc/tools/meson.build b/src/lxc/tools/meson.build -index 00a863d936..6d317fc80b 100644 ---- a/src/lxc/tools/meson.build -+++ b/src/lxc/tools/meson.build -@@ -1,6 +1,7 @@ - # SPDX-License-Identifier: LGPL-2.1+ - --tools_common_sources = files('arguments.c', 'arguments.h') + include_sources + netns_ifaddrs_sources -+tools_common_sources = files('arguments.c', 'arguments.h') + include_sources -+tools_common_sources_for_dynamic_link = tools_common_sources + netns_ifaddrs_sources - - tools_commands_dynamic_link = ['attach', 'autostart', 'cgroup', 'checkpoint', 'config', - 'console', 'copy', 'create', 'destroy', 'device', 'execute', 'freeze', -@@ -15,7 +16,7 @@ if want_tools - foreach cmd : tools_commands_dynamic_link - public_programs += executable( - 'lxc-' + cmd, -- files('lxc_' + cmd + '.c') + tools_common_sources + liblxc_ext_sources, -+ files('lxc_' + cmd + '.c') + tools_common_sources_for_dynamic_link + liblxc_ext_sources, - dependencies: liblxc_dependencies, - include_directories: liblxc_includes, - c_args: ['-DNO_LXC_CONF'], -@@ -26,16 +27,16 @@ if want_tools - foreach cmd : tools_commands_static_link - public_programs += executable( - 'lxc-' + cmd, -- files('lxc_' + cmd + '.c') + tools_common_sources, -+ files('lxc_' + cmd + '.c') + files('arguments.c', 'arguments.h'), - dependencies: liblxc_dependencies, - include_directories: liblxc_includes, -- link_with: [liblxc_static], -+ link_whole: [liblxc_static], - install: true) - endforeach - endif - - if want_tools_multicall -- tools_all_sources = files('lxc_multicall.c') + tools_common_sources -+ tools_all_sources = files('lxc_multicall.c') + tools_common_sources_for_dynamic_link - foreach cmd : tools_commands - tools_all_sources += files('lxc_' + cmd + '.c') - endforeach diff --git a/pkgs/by-name/lx/lxc/package.nix b/pkgs/by-name/lx/lxc/package.nix index ba817c1e2e50..7b24d70b5d0a 100644 --- a/pkgs/by-name/lx/lxc/package.nix +++ b/pkgs/by-name/lx/lxc/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxc"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "lxc"; repo = "lxc"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-D994gekFgW/1Q4iVFM/3Zi0JXKn9Ghfd3UcjckVfoFY="; + hash = "sha256-fJMNdMXlV1z9q1pMDh046tNmLDuK6zh6uPahTWzWMvc="; }; nativeBuildInputs = [ @@ -48,17 +48,14 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # fix docbook2man version detection ./docbook-hack.patch - - # fix linking - ./4428.diff ]; mesonFlags = [ "-Dinstall-init-files=false" "-Dinstall-state-dirs=false" "-Dspecfile=false" - # re-enable when fixed https://github.com/lxc/lxc/issues/4427 - # "-Dtools-multicall=true" + "-Dtools-multicall=true" + "-Dtools=false" ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix index 67562ddc7baa..6105b6ecd6a6 100644 --- a/pkgs/by-name/lx/lxcfs/package.nix +++ b/pkgs/by-name/lx/lxcfs/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "lxcfs"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = "v${version}"; - sha256 = "sha256-Mx2ZTul3hUEL9SloYSOh+MGoc2QmZg88MTsfIOvaIZU="; + sha256 = "sha256-kJ9QaNI8v03E0//UyU6fsav1YGOlKGMxsbE8Pr1Dtic="; }; patches = [ diff --git a/pkgs/by-name/lx/lxd-ui/package.nix b/pkgs/by-name/lx/lxd-ui/package.nix index a436f32e7d50..0402e61c3fb3 100644 --- a/pkgs/by-name/lx/lxd-ui/package.nix +++ b/pkgs/by-name/lx/lxd-ui/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation rec { pname = "lxd-ui"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "canonical"; repo = "lxd-ui"; rev = "refs/tags/${version}"; - hash = "sha256-4TIi/LPm35W86p+l5eYU0VETjno8TKmp43m2SReKElM="; + hash = "sha256-lXuPU1WWhrjst5ZbdLWPMovncHkUMYSUDNpsaWvdPgM="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-wExAVEl745X4O9hYhKYX2BjmW494Vr13X8bDmVxKMT4="; + hash = "sha256-X0xBYhoUKZe8GBqbRAfSE9o63FoAXIYTjzzDHMAygBI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix index 41b20f486068..0a95e10e9076 100644 --- a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix +++ b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix @@ -4,7 +4,7 @@ pkg-config, lxc, buildGo122Module, - fetchurl, + fetchFromGitHub, acl, libcap, dqlite, @@ -13,21 +13,22 @@ udev, installShellFiles, nixosTests, - gitUpdater, - callPackage, + nix-update-script, }: buildGo122Module rec { pname = "lxd-unwrapped-lts"; # major/minor are used in updateScript to pin to LTS - version = "5.21.0"; + version = "5.21.1"; - src = fetchurl { - url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; - hash = "sha256-vnh+8Jm4Olg+VdAPpGboLSbChdnwsU84IgyzGe4ltg8="; + src = fetchFromGitHub { + owner = "canonical"; + repo = "lxd"; + rev = "refs/tags/lxd-${version}"; + hash = "sha256-6php6dThpyADOY+2PZ38WxK2jPKd61D0OCwTKjAhAUg="; }; - vendorHash = null; + vendorHash = "sha256-iGW2FQjuqANadFuMHa+2VXiUgoU0VFBJYUyh0pMIdWY="; postPatch = '' substituteInPlace shared/usbid/load.go \ @@ -87,11 +88,16 @@ buildGo122Module rec { installShellCompletion --bash --name lxd ./scripts/bash/lxd-client ''; - passthru.tests.lxd = nixosTests.lxd; - passthru.tests.lxd-to-incus = nixosTests.incus.lxd-to-incus; - passthru.updateScript = gitUpdater { - url = "https://github.com/canonical/lxd.git"; - rev-prefix = "lxd-5.21"; + passthru = { + tests.lxd = nixosTests.lxd; + tests.lxd-to-incus = nixosTests.incus.lxd-to-incus; + + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "lxd-(5.21.*)" + ]; + }; }; meta = with lib; { diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index e6aa12fc5c2f..f1f4b5a5e587 100644 --- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.123.2"; + version = "1.124"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-soVFPeoU4Rovk4xpXd90CjzQ1y1rx1OT/4eKCZNTd4Q="; + hash = "sha256-dvdzbUYFOuqBww03Dh8t3ocTJBzvZPlcAjwdFbDm9Ys="; }; dontUnpack = true; diff --git a/pkgs/by-name/ma/maccy/package.nix b/pkgs/by-name/ma/maccy/package.nix index 41ea87634a1b..6e3821d7b7cf 100644 --- a/pkgs/by-name/ma/maccy/package.nix +++ b/pkgs/by-name/ma/maccy/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://maccy.app"; license = licenses.mit; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/by-name/ma/mackup/package.nix b/pkgs/by-name/ma/mackup/package.nix index b39590b6454a..1e75c0cefcb6 100644 --- a/pkgs/by-name/ma/mackup/package.nix +++ b/pkgs/by-name/ma/mackup/package.nix @@ -23,7 +23,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ poetry-core - pythonRelaxDepsHook nose ]; diff --git a/pkgs/by-name/ma/magnetic-catppuccin-gtk/package.nix b/pkgs/by-name/ma/magnetic-catppuccin-gtk/package.nix new file mode 100644 index 000000000000..447da7718526 --- /dev/null +++ b/pkgs/by-name/ma/magnetic-catppuccin-gtk/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gtk-engine-murrine, + jdupes, + sassc, + accent ? ["default"], + shade ? "dark", + size ? "standard", + tweaks ? [], +}: let + validAccents = ["default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all"]; + validShades = ["light" "dark"]; + validSizes = ["standard" "compact"]; + validTweaks = ["frappe" "macchiato" "black" "float" "outline" "macos"]; + + single = x: lib.optional (x != null) x; + pname = "Catppuccin-GTK"; +in + lib.checkListOfEnum "${pname} Valid theme accent(s)" validAccents accent + lib.checkListOfEnum "${pname} Valid shades" validShades (single shade) + lib.checkListOfEnum "${pname} Valid sizes" validSizes (single size) + lib.checkListOfEnum "${pname} Valid tweaks" validTweaks tweaks + + stdenv.mkDerivation { + pname = "magnetic-${lib.toLower pname}"; + version = "0-unstable-2024-06-27"; + + src = fetchFromGitHub { + owner = "Fausto-Korpsvart"; + repo = "Catppuccin-GTK-Theme"; + rev = "0bd2869e7f0fdb36c720a4fb873d4fed361b0606"; + hash = "sha256-oFVsYrJ27hYGY+x9+Z4SxVCp3w6PiLYTZaxmGhnpVHQ="; + }; + + nativeBuildInputs = [jdupes sassc]; + + propagatedUserEnvPkgs = [gtk-engine-murrine]; + + postPatch = '' + find -name "*.sh" -print0 | while IFS= read -r -d ''' file; do + patchShebangs "$file" + done + ''; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/themes + + ./themes/install.sh \ + --name ${pname} \ + ${toString (map (x: "--theme " + x) accent)} \ + ${lib.optionalString (shade != null) ("--color " + shade)} \ + ${lib.optionalString (size != null) ("--size " + size)} \ + ${toString (map (x: "--tweaks " + x) tweaks)} \ + --dest $out/share/themes + + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + meta = with lib; { + description = "GTK Theme with Catppuccin colour scheme"; + homepage = "https://github.com/Fausto-Korpsvart/Catppuccin-GTK-Theme"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ icy-thought ]; + platforms = platforms.all; + }; + } diff --git a/pkgs/by-name/ma/malwoverview/package.nix b/pkgs/by-name/ma/malwoverview/package.nix index 853aeab3bb71..02a5fc015162 100644 --- a/pkgs/by-name/ma/malwoverview/package.nix +++ b/pkgs/by-name/ma/malwoverview/package.nix @@ -19,10 +19,6 @@ python3.pkgs.buildPythonApplication rec { "pathlib" ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/data/themes/marwaita-manjaro/default.nix b/pkgs/by-name/ma/marwaita-darkcyan/package.nix similarity index 68% rename from pkgs/data/themes/marwaita-manjaro/default.nix rename to pkgs/by-name/ma/marwaita-darkcyan/package.nix index 19ff7c18b8a6..d031ad0b10b4 100644 --- a/pkgs/data/themes/marwaita-manjaro/default.nix +++ b/pkgs/by-name/ma/marwaita-darkcyan/package.nix @@ -5,17 +5,18 @@ , gtk-engine-murrine , gtk_engines , librsvg +, gitUpdater }: stdenv.mkDerivation rec { - pname = "marwaita-manjaro"; - version = "20.1"; + pname = "marwaita-darkcyan"; + version = "20.2-unstable-2024-07-01"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = version; - sha256 = "sha256-rEwSlLnDzW6iaPCf91mhL0PqycJAqm/ZmoRf35fl1RY="; + rev = "ad837492a377909e0e84f090c740f0296d311797"; + hash = "sha256-1aCJEVh97Ze600zg8twwRQmoU7Z9tbvPG0Zl0HTyvA0="; }; buildInputs = [ @@ -37,8 +38,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { - description = "Manjaro Style (green version) of Marwaita GTK theme"; + description = "Manjaro Style of Marwaita GTK theme"; homepage = "https://www.pling.com/p/1351213/"; license = licenses.gpl3Only; platforms = platforms.unix; diff --git a/pkgs/by-name/ma/marwaita-icons/package.nix b/pkgs/by-name/ma/marwaita-icons/package.nix new file mode 100644 index 000000000000..022e56b834e5 --- /dev/null +++ b/pkgs/by-name/ma/marwaita-icons/package.nix @@ -0,0 +1,53 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, breeze-icons +, hicolor-icon-theme +, pantheon +}: + +stdenvNoCC.mkDerivation rec { + pname = "marwaita-icons"; + version = "5.0"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = "marwaita-icons"; + rev = version; + hash = "sha256-6NFCXj80VAoFX+i4By5IpbtJC4qL+sAzlLHUJjTQ/sI="; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + breeze-icons + hicolor-icon-theme + pantheon.elementary-icon-theme + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + cp -a Marwaita* $out/share/icons + + for theme in $out/share/icons/*; do + gtk-update-icon-cache "$theme" + done + + runHook postInstall + ''; + + meta = { + description = "Icon pack for linux"; + homepage = "https://github.com/darkomarko42/Marwaita-Icons"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/by-name/ma/marwaita-mint/package.nix b/pkgs/by-name/ma/marwaita-mint/package.nix new file mode 100644 index 000000000000..a43e936dcd75 --- /dev/null +++ b/pkgs/by-name/ma/marwaita-mint/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "marwaita-mint"; + version = "20.2-unstable-2024-07-01"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = "marwaita-mint"; + rev = "ecdb79b45937466b7d8377d294838da3e8f4e61a"; + hash = "sha256-57oZgacQQF6nZney0AxSbGfv45eeBLjXHBK6wp1251U="; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Marwaita* $out/share/themes + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "Variation for marwaita GTK theme based on linux mint color scheme"; + homepage = "https://www.pling.com/p/1674243"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ romildo ]; + }; +}) diff --git a/pkgs/data/themes/marwaita-peppermint/default.nix b/pkgs/by-name/ma/marwaita-red/package.nix similarity index 81% rename from pkgs/data/themes/marwaita-peppermint/default.nix rename to pkgs/by-name/ma/marwaita-red/package.nix index 16a60de9287e..55d7cb136d24 100644 --- a/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/pkgs/by-name/ma/marwaita-red/package.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - pname = "marwaita-peppermint"; - version = "17.0"; + pname = "marwaita-red"; + version = "20.2-unstable-2024-07-01"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = "247f9c539d6eef8ae3a5f59beed42a40b1f10434"; - hash = "sha256-uT7KnpIdxypUqKhXOao3Bz3vJecJKK+GjcAp9biNyHc="; + rev = "79c65e37774395f7fa51ed1416874aa78f768d54"; + hash = "sha256-GmVen97oJel4KVm+IwV8GTemIyHnQ4XjvGclUjdGDvw="; }; buildInputs = [ diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/by-name/ma/marwaita/package.nix similarity index 91% rename from pkgs/data/themes/marwaita/default.nix rename to pkgs/by-name/ma/marwaita/package.nix index 9b279bba3aff..56346459c82b 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/by-name/ma/marwaita/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "marwaita"; - version = "20.1"; + version = "20.3"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - hash = "sha256-3kVfZnqRJs0CPl+EICDjg2+NSwuz18QccHx63cVLpFY="; + hash = "sha256-Zj995KsgLN6XYHRKx8eyDTrt5zpMqqUmzQgpoAofkeY="; }; buildInputs = [ diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix index 7856cadcfa94..ad591865e293 100644 --- a/pkgs/by-name/ma/maven/package.nix +++ b/pkgs/by-name/ma/maven/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "apache-maven"; - version = "3.9.6"; + version = "3.9.8"; src = fetchurl { url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz"; - hash = "sha256-bu3SyuNibWrTpcnuMkvSZYU9ZCl/B/AzQwdVvQ4MOks="; + hash = "sha256-BnZyYpB1t0Dj0Kko4hAh3WFaUyh6821MzKROh+CB0QI="; }; sourceRoot = "."; @@ -54,7 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; license = lib.licenses.asl20; mainProgram = "mvn"; - maintainers = with lib.maintainers; [ cko ]; + maintainers = with lib.maintainers; [ ]; inherit (jdk.meta) platforms; }; }) diff --git a/pkgs/by-name/mc/mcdreforged/package.nix b/pkgs/by-name/mc/mcdreforged/package.nix index d88e84b3a50f..3a4e7b582904 100644 --- a/pkgs/by-name/mc/mcdreforged/package.nix +++ b/pkgs/by-name/mc/mcdreforged/package.nix @@ -8,25 +8,27 @@ python3.pkgs.buildPythonApplication rec { pname = "mcdreforged"; - version = "2.12.3"; + version = "2.13.0"; pyproject = true; src = fetchFromGitHub { - owner = "Fallen-Breath"; + owner = "MCDReforged"; repo = "MCDReforged"; rev = "refs/tags/v${version}"; - sha256 = "sha256-MLub++mkkB/jshpHJXtqgIhs7Gcb4jHUyHqGE65S8A8="; + hash = "sha256-843vsazBXnvVs6DqY6HPUaBn33DktknT8+yH09n+aSI="; }; build-system = [ python3.pkgs.setuptools ]; dependencies = with python3.pkgs; [ - colorlog colorama + colorlog packaging parse prompt-toolkit psutil + requests + resolvelib ruamel-yaml typing-extensions ]; @@ -37,12 +39,12 @@ python3.pkgs.buildPythonApplication rec { version = testers.testVersion { package = mcdreforged; }; }; - meta = with lib; { - description = "A rewritten version of MCDaemon, a python tool to control your Minecraft server"; + meta = { + description = "Rewritten version of MCDaemon, a python tool to control your Minecraft server"; homepage = "https://mcdreforged.com"; changelog = "https://github.com/MCDReforged/MCDReforged/releases/tag/v${version}"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ moraxyc ]; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ moraxyc ]; mainProgram = "mcdreforged"; }; } diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index 6646a8ec0980..f93d6de6fb76 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -39,7 +39,6 @@ in pythonpkgs.buildPythonPackage rec { nativeBuildInputs = [ pythonpkgs.poetry-core - pythonpkgs.pythonRelaxDepsHook makeWrapper ]; diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 8053f6a93ada..5d3fa37fbebb 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -4,7 +4,6 @@ # https://github.com/mhogomchungu/media-downloader?tab=readme-ov-file#extensions extraPackages ? [ aria2 - yt-dlp ffmpeg python3 ], @@ -28,14 +27,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ykPYxRgzKZrA0KwS1FoxZOkSL+7TbLgy0yLfs7Iqpf4="; }; - # Disable automatically updating extensions when starting the program because this will - # invalidate the dependence on extensions and may cause potential security issues - # Can still be enabled in Configure > Actions At Startup - postPatch = '' - substituteInPlace src/settings.cpp \ - --replace-fail '"ShowVersionInfoAndAutoDownloadUpdates",true' '"ShowVersionInfoAndAutoDownloadUpdates",false' \ - ''; - nativeBuildInputs = [ cmake libsForQt5.wrapQtAppsHook @@ -52,8 +43,10 @@ stdenv.mkDerivation (finalAttrs: { lux, you-get, svtplay-dl, aria2c, wget and safari books. Read https://github.com/mhogomchungu/media-downloader/wiki/Extensions - for further information. We have packaged most of them, and they can - be added by overriding `extraPackages`. + for further information. Note that adding these packages to extraPackages + doesn't work, because the author doesn't intend to support custom + installation of them. These packages will be downloaded from original + source when executing the application for the first time. ''; homepage = "https://github.com/mhogomchungu/media-downloader"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix index 7016a9a6cc4c..3c9da25e33a5 100644 --- a/pkgs/by-name/me/mediainfo-gui/package.nix +++ b/pkgs/by-name/me/mediainfo-gui/package.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { pname = "mediainfo-gui"; - version = "24.04"; + version = "24.06"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-6+sctwGiMFnHNsszuRoxcsT5jnNB5EoLMKEZGRkaJ00="; + hash = "sha256-MvSoKjHjhuF3/fbkwjcFPkdbUBCJJpqyxylFKgkxNSA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/by-name/me/mediainfo/package.nix b/pkgs/by-name/me/mediainfo/package.nix index 581b37dcde30..d0df9a933e93 100644 --- a/pkgs/by-name/me/mediainfo/package.nix +++ b/pkgs/by-name/me/mediainfo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "24.04"; + version = "24.06"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-6+sctwGiMFnHNsszuRoxcsT5jnNB5EoLMKEZGRkaJ00="; + hash = "sha256-MvSoKjHjhuF3/fbkwjcFPkdbUBCJJpqyxylFKgkxNSA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/by-name/me/mednafen/package.nix b/pkgs/by-name/me/mednafen/package.nix index f3e0f8478c08..88079e48155d 100644 --- a/pkgs/by-name/me/mednafen/package.nix +++ b/pkgs/by-name/me/mednafen/package.nix @@ -5,7 +5,7 @@ alsa-lib, fetchurl, flac, - freeglut, + libglut, libGL, libGLU, libX11, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_net flac - freeglut + libglut libcdio libjack2 libsamplerate diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 6f66934fd0e4..821dc4843130 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -1,35 +1,36 @@ -{ lib -, SDL2 -, cmake -, extra-cmake-modules -, fetchFromGitHub -, libGL -, libarchive -, libpcap -, libsForQt5 -, libslirp -, pkg-config -, stdenv -, unstableGitUpdater -, wayland -, zstd +{ + lib, + SDL2, + cmake, + extra-cmake-modules, + fetchFromGitHub, + libGL, + libarchive, + libpcap, + libslirp, + pkg-config, + qt6, + stdenv, + unstableGitUpdater, + wayland, + zstd, }: let - inherit (libsForQt5) + inherit (qt6) qtbase qtmultimedia wrapQtAppsHook; in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-06-24"; + version = "0.9.5-unstable-2024-07-04"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "db20771ef36bfa5bc0dc624cf245844507724107"; - hash = "sha256-XGDMA+0IOvl1UN2HgfLikpxHXl/p0z+Yv6fJs5xv08Y="; + rev = "25b5ac91bdcddf537e3ccd78c184eda1d8486086"; + hash = "sha256-AsiFovjRHg1y/wtHxON6RGaYETPPc71mWVs6xZUJdoc="; }; nativeBuildInputs = [ @@ -46,16 +47,30 @@ stdenv.mkDerivation (finalAttrs: { libGL qtbase qtmultimedia - wayland zstd + ] ++ lib.optionals stdenv.isLinux [ + wayland + ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_QT6" true) ]; strictDeps = true; - qtWrapperArgs = [ + qtWrapperArgs = lib.optionals stdenv.isLinux [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" + ] ++ lib.optionals stdenv.isDarwin [ + "--prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" ]; + installPhase = lib.optionalString stdenv.isDarwin '' + runHook preInstall + mkdir -p $out/Applications + cp -r melonDS.app $out/Applications/ + runHook postInstall + ''; + passthru = { updateScript = unstableGitUpdater { }; }; @@ -88,6 +103,6 @@ stdenv.mkDerivation (finalAttrs: { benley shamilton ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix index 8b525a5f57de..3dc4f8513d02 100644 --- a/pkgs/by-name/me/mesonlsp/package.nix +++ b/pkgs/by-name/me/mesonlsp/package.nix @@ -25,19 +25,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "mesonlsp"; - version = "4.2.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "JCWasmx86"; repo = "mesonlsp"; rev = "v${finalAttrs.version}"; - hash = "sha256-pN8MCqrRfVpmM8KWa7HPTghoegplM4bP/HRVJVs05iE="; + hash = "sha256-4DwXhe/7zu49NH1M8/tY/fUjUVt4cvQaIO1+K7fh9fU="; }; - patches = [ - ./disable-tests-that-require-network-access.patch - ./simplify-the-format-header-polyfill.patch - ]; + patches = [ ./disable-tests-that-require-network-access.patch ]; nativeBuildInputs = [ gtest diff --git a/pkgs/by-name/me/mesonlsp/simplify-the-format-header-polyfill.patch b/pkgs/by-name/me/mesonlsp/simplify-the-format-header-polyfill.patch deleted file mode 100644 index df7972f07357..000000000000 --- a/pkgs/by-name/me/mesonlsp/simplify-the-format-header-polyfill.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ae3fb8943dd5b2d282a2c6d4525a8ce0dd0244e8 Mon Sep 17 00:00:00 2001 -From: Pavel Sobolev -Date: Tue, 25 Jun 2024 23:03:50 +0300 -Subject: [PATCH] Simplify the `` header polyfill. - ---- - src/polyfill/polyfill.hpp | 11 +++-------- - 1 file changed, 3 insertions(+), 8 deletions(-) - -diff --git a/src/polyfill/polyfill.hpp b/src/polyfill/polyfill.hpp -index 5c5ba39a..b5d145ed 100644 ---- a/src/polyfill/polyfill.hpp -+++ b/src/polyfill/polyfill.hpp -@@ -1,9 +1,6 @@ - #pragma once - - #if defined(__APPLE__) --#if __has_include() and !defined(__x86_64__) --#include --#else - #include - #include - -@@ -23,10 +20,8 @@ struct fmt::formatter> { - return fmt::format_to(ctx.out(), "{}", tp.time_since_epoch().count()); - } - }; --#endif --#else -+#elif defined(_WIN32) - #include --#ifdef _WIN32 - template <> struct std::formatter { - constexpr auto parse(format_parse_context &ctx) { return ctx.begin(); } - -@@ -35,6 +30,6 @@ template <> struct std::formatter { - return std::format_to(ctx.out(), L"{}", str); - } - }; -- --#endif -+#else -+#include - #endif --- -2.45.1 - diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix index c55083e5b224..b54fa83a4ffb 100644 --- a/pkgs/by-name/me/metacubexd/package.nix +++ b/pkgs/by-name/me/metacubexd/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "metacubexd"; - version = "1.140.0"; + version = "1.141.1"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "metacubexd"; rev = "v${finalAttrs.version}"; - hash = "sha256-OVLG+MHgwWTorPuBTHsHUAY1FSN91j7xWgRDJ7FiO7E="; + hash = "sha256-UstINf7Hv5QvinmCFpZC5ySIdec31Qzwz8KJ28smNOE="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-24PkWT5UZJwMtL3y8qdf3XFuf3v5PjiP9XESbw3oppY="; + hash = "sha256-Tl84geP6E/nUcx0I++/Gmuyu5n3RsmMKSsj8tgG2/eg="; }; buildPhase = '' diff --git a/pkgs/by-name/me/metadata/package.nix b/pkgs/by-name/me/metadata/package.nix new file mode 100644 index 000000000000..3a85f8e5f443 --- /dev/null +++ b/pkgs/by-name/me/metadata/package.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, ffmpeg_7 +, rustPlatform +, glib +, installShellFiles +, asciidoc +}: +rustPlatform.buildRustPackage rec { + pname = "metadata"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "zmwangx"; + repo = "metadata"; + rev = "v${version}"; + hash = "sha256-OFWdCV9Msy/mNaSubqoJi4tBiFqL7RuWWQluSnKe4fU="; + }; + + cargoHash = "sha256-F5jXS/W600nbQtu1FD4+DawrFsO+5lJjvAvTiFKT840="; + + nativeBuildInputs = [ + pkg-config + asciidoc + installShellFiles + rustPlatform.bindgenHook + ]; + + postBuild = '' + a2x --doctype manpage --format manpage man/metadata.1.adoc + ''; + postInstall = '' + installManPage man/metadata.1 + ''; + + buildInputs = [ + ffmpeg_7 + glib + ]; + + env.FFMPEG_DIR = ffmpeg_7.dev; + + meta = { + description = "Media metadata parser and formatter designed for human consumption, powered by FFmpeg"; + maintainers = with lib.maintainers; [ clevor ]; + license = lib.licenses.mit; + homepage = "https://github.com/zmwangx/metadata"; + mainProgram = "metadata"; + }; +} diff --git a/pkgs/by-name/mf/mfoc-hardnested/package.nix b/pkgs/by-name/mf/mfoc-hardnested/package.nix index 9fb22863c74b..916922375362 100644 --- a/pkgs/by-name/mf/mfoc-hardnested/package.nix +++ b/pkgs/by-name/mf/mfoc-hardnested/package.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "mfoc-hardnested"; license = licenses.gpl2; homepage = "https://github.com/nfc-tools/mfoc-hardnested"; + changelog = "https://github.com/nfc-tools/mfoc-hardnested/blob/master/debian/changelog"; maintainers = with maintainers; [ azuwis ]; platforms = platforms.unix; }; diff --git a/pkgs/by-name/mg/mgitstatus/package.nix b/pkgs/by-name/mg/mgitstatus/package.nix index 894a21cad75d..1214123cedd6 100644 --- a/pkgs/by-name/mg/mgitstatus/package.nix +++ b/pkgs/by-name/mg/mgitstatus/package.nix @@ -28,6 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Show uncommitted, untracked and unpushed changes for multiple Git repos"; downloadPage = "https://github.com/fboender/multi-git-status/releases/tag/v${finalAttrs.version}"; homepage = "https://github.com/fboender/multi-git-status"; + changelog = "https://github.com/fboender/multi-git-status/releases/tag/${finalAttrs.src.rev}"; license = licenses.mit; maintainers = with maintainers; [ getpsyched ]; mainProgram = "mgitstatus"; diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index b17e4c4b29ec..50529dec4b77 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.18.5"; + version = "1.18.6"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-YNnZ/wlOzmTAD76py4CRlClPi2S1b4PaanCfT/Q426A="; + hash = "sha256-h/H5T9UBCp/gXM+c5muRs8luz3LoHofBGwP3jofQ9Qg="; }; - vendorHash = "sha256-yBQ4Nt03VS2em6vkzMa1WH9jHc6pwdlW0tt9cth55oQ="; + vendorHash = "sha256-lBHL4vD+0JDOlc6SWFsj0cerE/ypImoh8UFbL736SmA="; excludedPackages = [ "./test" ]; diff --git a/pkgs/by-name/mi/min/package.nix b/pkgs/by-name/mi/min/package.nix index f334e27f457b..e39a82248542 100644 --- a/pkgs/by-name/mi/min/package.nix +++ b/pkgs/by-name/mi/min/package.nix @@ -37,6 +37,7 @@ buildNimPackage (finalAttrs: { description = "A functional, concatenative programming language with a minimalist syntax"; homepage = "https://min-lang.org/"; + changelog = "https://github.com/h3rald/min/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; mainProgram = "min"; maintainers = with lib.maintainers; [ ehmry ]; diff --git a/pkgs/by-name/mi/minetest-mapserver/package.nix b/pkgs/by-name/mi/minetest-mapserver/package.nix index 7a4819c3313f..bc35c9598847 100644 --- a/pkgs/by-name/mi/minetest-mapserver/package.nix +++ b/pkgs/by-name/mi/minetest-mapserver/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "minetest-mapserver"; - version = "4.8.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = pname; repo = "mapserver"; rev = "v${version}"; - hash = "sha256-MKWC8m+7QN1gq+jmUqsadX+OKRF3/jVdoYTuaODCOtM="; + hash = "sha256-3bL23hwJgYMPV2nSSfq9plttcx7UYvhUa6OCbKfBACY="; }; - vendorHash = "sha256-q8l0wFXsR32dznB0oYiG9K/2+YQx6kOGtSSnznXLr5E="; + vendorHash = "sha256-P3+M1ciRmFbOFnjy1+oWPhngPYFe/5o6Cs8pRlYNx2Q="; meta = with lib; { description = "Realtime mapserver for minetest"; diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index b8ca2a9c5931..c5117f038e09 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-aqoUsVj9XYlbi8wh2Rqxy+M9+RU9NLp97qlpTKUlJEI="; + hash = "sha256-3Frgeudh1Z4gpQJqyLxBZKi7gr4GIGLv7gW4Qf3LdVs="; }; - cargoHash = "sha256-G9nIlri7VwojNRsCwZxseZxcSxLqAKtnm+AV7TLqJm4="; + cargoHash = "sha256-7ohhnuy8baELLDvf0FfdJmSf62wtmnEfI2rl9yZp03w="; # The tests relies on the presence of network connection doCheck = false; diff --git a/pkgs/by-name/ty/typst-preview/Cargo.lock b/pkgs/by-name/mi/mistral-rs/Cargo.lock similarity index 60% rename from pkgs/by-name/ty/typst-preview/Cargo.lock rename to pkgs/by-name/mi/mistral-rs/Cargo.lock index c3f083ff3956..edc87e02386e 100644 --- a/pkgs/by-name/ty/typst-preview/Cargo.lock +++ b/pkgs/by-name/mi/mistral-rs/Cargo.lock @@ -3,10 +3,26 @@ version = 3 [[package]] -name = "addr2line" -version = "0.21.0" +name = "Inflector" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "accelerate-src" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "415ed64958754dbe991900f3940677e6a7eefb4d7367afd70d642677b0c7d19d" + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -19,24 +35,43 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "getrandom", + "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] +[[package]] +name = "akin" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1763692fc1416554cf051efc56a3de5595eca47299d731cc5c2b583adf8b4d2f" + +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -54,47 +89,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -102,30 +138,32 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" - -[[package]] -name = "append-only-vec" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb8f874ecf419dd8165d0279746de966cb8966636d028845e3bd65d519812a" - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" dependencies = [ - "num-traits", + "backtrace", ] [[package]] -name = "arrayref" -version = "0.3.7" +name = "arbitrary" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] [[package]] name = "arrayvec" @@ -134,40 +172,111 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] -name = "autocfg" -version = "1.1.0" +name = "async-trait" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "await-tree" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626aa057fb6d254883c2750ef6bcbe6f6a5ce45daff839b538708411794f794d" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ - "coarsetime", - "derive_builder", - "flexstr", - "indextree", - "itertools", - "parking_lot", - "pin-project", - "tokio", - "tracing", - "weak-table", + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] -name = "az" -version = "1.2.1" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", + "tracing", +] [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -179,63 +288,39 @@ dependencies = [ ] [[package]] -name = "base64" -version = "0.21.7" +name = "base16ct" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" -version = "0.22.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] -name = "base64-serde" -version = "0.7.0" +name = "base64" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba368df5de76a5bea49aaf0cf1b39ccfbbef176924d1ba5db3e4135216cbe3c7" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bindgen_cuda" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8489af5b7d17a81bffe37e0f4d6e1e4de87c87329d05447f22c35d95a1227d" dependencies = [ - "base64 0.21.7", - "serde", + "glob", + "num_cpus", + "rayon", ] [[package]] -name = "biblatex" -version = "0.9.3" +name = "bit_field" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27fe7285040d0227cd8b5395e1c4783f44f0b673eca5a657f4432ae401f2b7b8" -dependencies = [ - "numerals", - "paste", - "strum 0.26.1", - "unicode-normalization", - "unscanny", -] - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" [[package]] name = "bitflags" @@ -245,24 +330,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" -dependencies = [ - "serde", -] +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] -name = "bitvec" -version = "1.0.1" +name = "bitstream-io" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] +checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "block-buffer" @@ -274,38 +356,51 @@ dependencies = [ ] [[package]] -name = "bumpalo" -version = "3.15.4" +name = "buildstructor" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" - -[[package]] -name = "bytecheck" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +checksum = "c3907aac66c65520545ae3cb3c195306e20d5ed5c90bfbb992e061cf12a104d0" dependencies = [ + "lazy_static", "proc-macro2", "quote", - "syn 1.0.109", + "str_inflector", + "syn 2.0.66", + "thiserror", + "try_match", ] +[[package]] +name = "built" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] [[package]] name = "byteorder" @@ -313,52 +408,112 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +name = "candle-core" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" dependencies = [ - "serde", + "accelerate-src", + "byteorder", + "candle-kernels", + "candle-metal-kernels", + "cudarc", + "gemm", + "half", + "intel-mkl-src", + "libc", + "memmap2", + "metal", + "num-traits", + "num_cpus", + "rand", + "rand_distr", + "rayon", + "safetensors", + "thiserror", + "yoke", + "zip", ] [[package]] -name = "cargo-platform" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" +name = "candle-flash-attn" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" dependencies = [ - "serde", + "anyhow", + "bindgen_cuda", + "candle-core", + "half", ] [[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +name = "candle-kernels" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" dependencies = [ - "camino", - "cargo-platform", - "semver", + "bindgen_cuda", +] + +[[package]] +name = "candle-metal-kernels" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +dependencies = [ + "metal", + "once_cell", + "thiserror", + "tracing", +] + +[[package]] +name = "candle-nn" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +dependencies = [ + "accelerate-src", + "candle-core", + "candle-metal-kernels", + "half", + "intel-mkl-src", + "metal", + "num-traits", + "rayon", + "safetensors", "serde", - "serde_json", "thiserror", ] [[package]] name = "cc" -version = "1.0.90" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", + "once_cell", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", ] [[package]] @@ -368,78 +523,66 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "chinese-number" -version = "0.7.7" +name = "cfg_aliases" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fccaef6346f6d6a741908d3b79fe97c2debe2fbb5eb3a7d00ff5981b52bb6c" -dependencies = [ - "chinese-variant", - "enum-ordinalize", - "num-bigint", - "num-traits", -] +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] -name = "chinese-variant" -version = "1.1.3" +name = "cfgrammar" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7588475145507237ded760e52bf2f1085495245502033756d28ea72ade0e498b" +checksum = "ec07af28018dd8b4b52e49eb6e57268b19dda0996d4824889eb07ee0ef67378c" +dependencies = [ + "indexmap", + "lazy_static", + "num-traits", + "regex", + "serde", + "vob", +] [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", - "serde", - "windows-targets 0.52.4", + "wasm-bindgen", + "windows-targets 0.52.5", ] [[package]] -name = "ciborium" -version = "0.2.2" +name = "chrono-tz" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", + "chrono", + "chrono-tz-build", + "phf", ] [[package]] -name = "ciborium-io" -version = "0.2.2" +name = "chrono-tz-build" +version = "0.2.1" 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" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "citationberg" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82108f2b676c954076d2e5044f19a6a03887b24bd42804f322e0650d13035899" -dependencies = [ - "quick-xml", - "serde", + "parse-zoneinfo", + "phf", + "phf_codegen", ] [[package]] name = "clap" -version = "4.5.3" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -447,80 +590,57 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.0", -] - -[[package]] -name = "clap_complete" -version = "4.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" -dependencies = [ - "clap", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.5.3" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] -name = "clap_mangen" -version = "0.2.20" +name = "cli-table" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dd95b5ebb5c1c54581dd6346f3ed6a79a3eef95dd372fc2ac13d535535300e" -dependencies = [ - "clap", - "roff", -] - -[[package]] -name = "coarsetime" -version = "0.1.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b3839cf01bb7960114be3ccf2340f541b6d0c81f8690b007b2b39f750f7e5d" -dependencies = [ - "libc", - "wasix", - "wasm-bindgen", -] - -[[package]] -name = "cobs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +checksum = "adfbb116d9e2c4be7011360d0c0bee565712c11e969c9609b25b619366dc379d" dependencies = [ + "cli-table-derive", + "csv", "termcolor", "unicode-width", ] +[[package]] +name = "cli-table-derive" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af3bfb9da627b0a6c467624fb7963921433774ed435493b5c08a3053e829ad4" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -529,31 +649,21 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] -name = "comemo" -version = "0.4.0" +name = "console" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6916408a724339aa77b18214233355f3eb04c42eb895e5f8909215bd8a7a91" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ - "comemo-macros", - "once_cell", - "parking_lot", - "siphasher 1.0.0", -] - -[[package]] -name = "comemo-macros" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", ] [[package]] @@ -573,12 +683,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] -name = "core_maths" -version = "0.1.0" +name = "core-graphics-types" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ - "libm", + "bitflags 1.3.2", + "core-foundation", + "libc", ] [[package]] @@ -592,22 +704,13 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] -[[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" @@ -628,19 +731,35 @@ dependencies = [ ] [[package]] -name = "crossbeam-queue" -version = "0.3.11" +name = "crossbeam-utils" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crossterm" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" dependencies = [ - "crossbeam-utils", + "bitflags 1.3.2", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", ] [[package]] -name = "crossbeam-utils" -version = "0.8.19" +name = "crossterm_winapi" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] [[package]] name = "crunchy" @@ -680,30 +799,50 @@ dependencies = [ ] [[package]] -name = "darling" -version = "0.14.4" +name = "ctrlc" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", + "nix", + "windows-sys 0.52.0", +] + +[[package]] +name = "cudarc" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89df33b4eb35d6d3f19ce8015fda23079131afef42cf6ede03e961ab8aeb29af" +dependencies = [ + "half", + "libloading", ] [[package]] name = "darling" -version = "0.20.8" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "dbffa8f8e38810422f320ca457a93cf1cd0056dc9c06c556b867558e0d471463" dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", + "darling_core 0.11.0", + "darling_macro 0.11.0", +] + +[[package]] +name = "darling" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +dependencies = [ + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] name = "darling_core" -version = "0.14.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "06e172685d94b7b83800e3256a63261537b9d6129e10f21c8e13ddf9dba8c64d" dependencies = [ "fnv", "ident_case", @@ -715,103 +854,107 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.52", + "strsim 0.11.1", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "f0618ac802792cebd1918ac6042a6ea1eeab92db34b35656afaa577929820788" dependencies = [ - "darling_core 0.14.4", + "darling_core 0.11.0", "quote", "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.8", + "darling_core 0.20.9", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] -name = "dashmap" -version = "5.5.3" +name = "defmac" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "aafbece59594ed57696a1a69e8bb3ca1683fbc9cdb41d5c02726070b2cd8f19d" + +[[package]] +name = "derive-new" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ - "cfg-if", - "hashbrown 0.14.3", - "lock_api", - "once_cell", - "parking_lot_core", + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] -name = "data-encoding" -version = "2.5.0" +name = "derive_arbitrary" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] -name = "data-url" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ - "powerfmt", - "serde", + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] name = "derive_builder" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "darling 0.14.4", + "darling 0.20.9", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "derive_builder_macro" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", + "syn 2.0.66", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -825,6 +968,15 @@ dependencies = [ "crypto-common", ] +[[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" version = "5.0.1" @@ -854,101 +1006,59 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] -name = "dissimilar" -version = "1.0.7" +name = "dyn-stack" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" +checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b" +dependencies = [ + "bytemuck", + "reborrow", +] [[package]] -name = "downcast-rs" -version = "1.2.0" +name = "either" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "ecow" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba31a30727c42ff5e60468d695c7f21e43a6db2808b7195adcab908fbd9f794" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" dependencies = [ "serde", ] [[package]] -name = "either" -version = "1.10.0" +name = "encode_unicode" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "elsa" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "embedded-io" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] [[package]] -name = "enum-ordinalize" -version = "4.3.0" +name = "endian-type" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" -dependencies = [ - "enum-ordinalize-derive", -] +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" [[package]] -name = "enum-ordinalize-derive" -version = "4.3.1" +name = "enum-as-inner" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.52", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", + "syn 2.0.66", ] [[package]] @@ -959,35 +1069,54 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", ] [[package]] -name = "fancy-regex" -version = "0.11.0" +name = "esaxx-rs" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" dependencies = [ - "bit-set", - "regex", + "cc", ] [[package]] -name = "fast-srgb8" -version = "1.0.0" +name = "exr" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[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 = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1006,71 +1135,63 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "windows-sys 0.52.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", ] [[package]] -name = "flexstr" -version = "0.9.2" +name = "flume" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d50aef14619d336a54fca5a592d952eb39037b1a1e7e6afd9f91c892ac7ef65" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "static_assertions", + "spin", ] -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" - [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "fontconfig-parser" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" -dependencies = [ - "roxmltree", -] - -[[package]] -name = "fontdb" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2", - "slotmap", - "tinyvec", - "ttf-parser", -] - [[package]] name = "foreign-types" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -1079,6 +1200,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1088,27 +1215,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "fst" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futures" version = "0.3.30" @@ -1165,7 +1271,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -1199,12 +1305,131 @@ dependencies = [ ] [[package]] -name = "fxhash" -version = "0.2.1" +name = "galil-seiferas" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +checksum = "794ac25cfda3fa11d2b07ff8c65889c6c03411646df54e59e606878d899e1d5a" dependencies = [ - "byteorder", + "defmac", + "unchecked-index", +] + +[[package]] +name = "gemm" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab24cc62135b40090e31a76a9b2766a501979f3070fa27f689c27ec04377d32" +dependencies = [ + "dyn-stack", + "gemm-c32", + "gemm-c64", + "gemm-common", + "gemm-f16", + "gemm-f32", + "gemm-f64", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c32" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9c030d0b983d1e34a546b86e08f600c11696fde16199f971cd46c12e67512c0" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c64" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb5f2e79fefb9693d18e1066a557b4546cd334b226beadc68b11a8f9431852a" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-common" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2e7ea062c987abcd8db95db917b4ffb4ecdfd0668471d8dc54734fdff2354e8" +dependencies = [ + "bytemuck", + "dyn-stack", + "half", + "num-complex", + "num-traits", + "once_cell", + "paste", + "pulp", + "raw-cpuid", + "rayon", + "seq-macro", + "sysctl", +] + +[[package]] +name = "gemm-f16" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca4c06b9b11952071d317604acb332e924e817bd891bec8dfb494168c7cedd4" +dependencies = [ + "dyn-stack", + "gemm-common", + "gemm-f32", + "half", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f32" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9a69f51aaefbd9cf12d18faf273d3e982d9d711f60775645ed5c8047b4ae113" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-f64" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa397a48544fadf0b81ec8741e5c0fba0043008113f71f2034def1935645d2b0" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", ] [[package]] @@ -1219,15 +1444,27 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", "wasi", ] +[[package]] +name = "getset" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "gif" version = "0.13.1" @@ -1240,36 +1477,29 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] -name = "git2" -version = "0.18.2" +name = "glob" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" -dependencies = [ - "bitflags 2.4.2", - "libc", - "libgit2-sys", - "log", - "url", -] +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.24" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.2.5", + "http", + "indexmap", "slab", "tokio", "tokio-util", @@ -1278,48 +1508,26 @@ dependencies = [ [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ + "bytemuck", "cfg-if", "crunchy", + "num-traits", + "rand", + "rand_distr", ] [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - -[[package]] -name = "hayagriva" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2e670de5191df083ddd112cd253049f8213277ccf0c15e18a8bf10e6c666cc" -dependencies = [ - "biblatex", - "ciborium", - "citationberg", - "indexmap 2.2.5", - "numerals", - "paste", - "serde", - "serde_yaml", - "thiserror", - "unic-langid", - "unicode-segmentation", - "unscanny", - "url", + "allocator-api2", ] [[package]] @@ -1341,20 +1549,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] -name = "hex" -version = "0.4.3" +name = "hf-hub" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" dependencies = [ - "bytes", - "fnv", - "itoa", + "dirs", + "indicatif", + "log", + "native-tls", + "rand", + "serde", + "serde_json", + "thiserror", + "ureq", ] [[package]] @@ -1370,20 +1578,32 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 0.2.12", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545" [[package]] name = "httpdate" @@ -1391,68 +1611,79 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyper" -version = "0.14.28" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "h2", - "http 0.2.12", + "http", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", - "http 0.2.12", + "http", "hyper", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", + "http-body-util", "hyper", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", ] [[package]] -name = "hypher" +name = "hyper-util" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b24ad5637230df201ab1034d593f1d09bf7f2a9274f2e8897638078579f4265" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] [[package]] name = "iana-time-zone" @@ -1479,12 +1710,11 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "137d96353afc8544d437e8a99eceb10ab291352699573b0de5b08bda38c78c60" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" dependencies = [ "displaydoc", - "serde", "yoke", "zerofrom", "zerovec", @@ -1492,9 +1722,9 @@ dependencies = [ [[package]] name = "icu_locid" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" dependencies = [ "displaydoc", "litemap", @@ -1505,9 +1735,9 @@ dependencies = [ [[package]] name = "icu_locid_transform" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" dependencies = [ "displaydoc", "icu_locid", @@ -1519,43 +1749,64 @@ dependencies = [ [[package]] name = "icu_locid_transform_data" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" +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.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976e296217453af983efa25f287a4c1da04b9a63bf1ed63719455068e4453eb5" +checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" dependencies = [ "displaydoc", "icu_collections", "icu_locid_transform", "icu_properties_data", "icu_provider", - "serde", "tinystr", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a86c0e384532b06b6c104814f9c1b13bcd5b64409001c0d05713a1f3529d99" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" [[package]] name = "icu_provider" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" dependencies = [ "displaydoc", "icu_locid", "icu_provider_macros", - "postcard", - "serde", "stable_deref_trait", "tinystr", "writeable", @@ -1564,67 +1815,17 @@ dependencies = [ "zerovec", ] -[[package]] -name = "icu_provider_adapters" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a229f978260da7c3aabb68cb7dc7316589936680570fe55e50fdd3f97711a4dd" -dependencies = [ - "icu_locid", - "icu_locid_transform", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_provider_blob" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7202cddda672db167c6352719959e9b01cb1ca576d32fa79103f61b5a73601" -dependencies = [ - "icu_provider", - "postcard", - "serde", - "writeable", - "zerotrie", - "zerovec", -] - [[package]] name = "icu_provider_macros" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] -[[package]] -name = "icu_segmenter" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2dc1e8f4ba33a6a4956770ac5c08570f255d6605519fb3a859a0c0a270a2f8f" -dependencies = [ - "core_maths", - "displaydoc", - "icu_collections", - "icu_locid", - "icu_provider", - "icu_segmenter_data", - "serde", - "utf8_iter", - "zerovec", -] - -[[package]] -name = "icu_segmenter_data" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3673d6698dcffce08cfe8fc5da3c11c3f2c663d5d6137fd58ab2cbf44235ab46" - [[package]] name = "ident_case" version = "1.0.1" @@ -1633,104 +1834,134 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", ] -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - [[package]] name = "image" -version = "0.24.9" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", "byteorder", "color_quant", + "exr", "gif", - "jpeg-decoder", + "image-webp", "num-traits", "png", + "qoi", + "ravif", + "rayon", + "rgb", + "tiff", + "zune-core", + "zune-jpeg", ] [[package]] -name = "imagesize" -version = "0.12.0" +name = "image-webp" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", + "byteorder-lite", + "thiserror", ] [[package]] -name = "indexmap" -version = "2.2.5" +name = "imgref" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + +[[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", + "hashbrown", "serde", ] [[package]] -name = "indexmap-nostd" -version = "0.4.0" +name = "indicatif" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" - -[[package]] -name = "indextree" -version = "4.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c40411d0e5c63ef1323c3d09ce5ec6d84d71531e18daed0743fccea279d7deb6" - -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", + "console", + "instant", + "number_prefix", + "portable-atomic", + "rayon", + "unicode-width", ] [[package]] -name = "inotify-sys" -version = "0.1.5" +name = "indoc" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] +[[package]] +name = "intel-mkl-src" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee70586cd5b3e772a8739a1bd43eaa90d4f4bf0fb2a4edc202e979937ee7f5e" +dependencies = [ + "anyhow", + "intel-mkl-tool", + "ocipkg", +] + +[[package]] +name = "intel-mkl-tool" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887a16b4537d82227af54d3372971cfa5e0cde53322e60f57584056c16ada1b4" +dependencies = [ + "anyhow", + "log", + "walkdir", +] + +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "ipnet" version = "2.9.0" @@ -1738,23 +1969,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] -name = "is-docker" -version = "0.2.0" +name = "is_terminal_polyfill" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" -dependencies = [ - "once_cell", -] - -[[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", -] +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itertools" @@ -1766,16 +1984,34 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.10" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +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.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -1795,44 +2031,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kamadak-exif" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" -dependencies = [ - "mutate_once", -] - -[[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 = "kurbo" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" -dependencies = [ - "arrayvec", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -1840,21 +2038,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "libc" -version = "0.2.153" +name = "lebe" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] -name = "libgit2-sys" -version = "0.16.2+1.7.2" +name = "libc" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" dependencies = [ + "arbitrary", "cc", - "libc", - "libz-sys", - "pkg-config", + "once_cell", +] + +[[package]] +name = "libloading" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +dependencies = [ + "cfg-if", + "windows-targets 0.52.5", ] [[package]] @@ -1865,72 +2078,31 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", - "redox_syscall", ] -[[package]] -name = "libz-sys" -version = "1.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - -[[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" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lipsum" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5e9ef2d2ad6fe67a59ace27c203c8d3a71d195532ee82e3bbe0d5f9a9ca541" -dependencies = [ - "rand", - "rand_chacha", -] +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litemap" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" -dependencies = [ - "serde", -] +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1943,10 +2115,82 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] -name = "memchr" -version = "2.7.1" +name = "loop9" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + +[[package]] +name = "lrtable" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fcefc5628209d1b1f4b2cd0bcefd0e50be80bdf178e886cb07317f5ce4f2856" +dependencies = [ + "cfgrammar", + "fnv", + "num-traits", + "sparsevec", + "vob", +] + +[[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[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 = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -1955,6 +2199,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", + "stable_deref_trait", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.5.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", ] [[package]] @@ -1974,10 +2243,35 @@ dependencies = [ ] [[package]] -name = "miniz_oxide" -version = "0.7.2" +name = "minijinja" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "e136ef580d7955019ab0a407b68d77c292a9976907e217900f3f76bc8f6dc1a4" +dependencies = [ + "serde", +] + +[[package]] +name = "minijinja-contrib" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15ee37078c98d31e510d6a7af488031a2c3ccacdb76c5c4fc98ddfe6d0e9da07" +dependencies = [ + "minijinja", + "serde", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", "simd-adler32", @@ -1996,18 +2290,177 @@ dependencies = [ ] [[package]] -name = "mutate_once" -version = "0.1.1" +name = "mistralrs" +version = "0.1.18" +dependencies = [ + "anyhow", + "candle-core", + "either", + "image", + "indexmap", + "mistralrs-core", + "serde_json", + "tokio", +] + +[[package]] +name = "mistralrs-bench" +version = "0.1.18" +dependencies = [ + "anyhow", + "candle-core", + "clap", + "cli-table", + "either", + "mistralrs-core", + "serde", + "serde_json", + "tokio", + "tracing", +] + +[[package]] +name = "mistralrs-core" +version = "0.1.18" +dependencies = [ + "accelerate-src", + "akin", + "anyhow", + "async-trait", + "bindgen_cuda", + "buildstructor", + "bytemuck", + "candle-core", + "candle-flash-attn", + "candle-nn", + "cfgrammar", + "chrono", + "clap", + "derive-new", + "derive_more", + "dirs", + "either", + "futures", + "galil-seiferas", + "half", + "hf-hub", + "image", + "indexmap", + "indicatif", + "intel-mkl-src", + "itertools 0.13.0", + "lrtable", + "minijinja", + "minijinja-contrib", + "mistralrs-vision", + "once_cell", + "pyo3", + "radix_trie", + "rand", + "rand_isaac", + "range-checked", + "rayon", + "regex-automata 0.4.7", + "rustc-hash", + "serde", + "serde_json", + "strum", + "thiserror", + "tokenizers", + "tokio", + "tokio-rayon", + "toml", + "tqdm", + "tracing", + "tracing-subscriber", + "variantly", + "vob", +] + +[[package]] +name = "mistralrs-pyo3" +version = "0.1.18" +dependencies = [ + "accelerate-src", + "base64 0.22.1", + "candle-core", + "either", + "futures", + "image", + "indexmap", + "intel-mkl-src", + "mistralrs-core", + "pyo3", + "pyo3-build-config", + "reqwest", + "serde", + "serde_json", + "tokio", +] + +[[package]] +name = "mistralrs-server" +version = "0.1.18" +dependencies = [ + "accelerate-src", + "anyhow", + "axum", + "base64 0.22.1", + "candle-core", + "clap", + "ctrlc", + "either", + "futures", + "image", + "indexmap", + "intel-mkl-src", + "mistralrs-core", + "once_cell", + "reqwest", + "serde", + "serde_json", + "tokio", + "tower-http", + "tracing", + "utoipa", + "utoipa-swagger-ui", +] + +[[package]] +name = "mistralrs-vision" +version = "0.1.18" +dependencies = [ + "candle-core", + "image", +] + +[[package]] +name = "monostate" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" +checksum = "0d208407d7552cd041d8cdb69a1bc3303e029c598738177a3d87082004dc0e1e" +dependencies = [ + "monostate-impl", + "serde", +] + +[[package]] +name = "monostate-impl" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -2020,46 +2473,88 @@ dependencies = [ ] [[package]] -name = "nohash-hasher" -version = "0.2.0" +name = "new_debug_unreachable" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] -name = "notify" -version = "6.1.1" +name = "nibble_vec" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" dependencies = [ - "bitflags 2.4.2", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", + "smallvec", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases", "libc", - "log", - "mio", - "walkdir", - "windows-sys 0.48.0", +] + +[[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 = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[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-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] -name = "num-conv" -version = "0.1.0" +name = "num-complex" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "bytemuck", + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] [[package]] name = "num-integer" @@ -2071,12 +2566,24 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.18" +name = "num-rational" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -2090,29 +2597,100 @@ dependencies = [ ] [[package]] -name = "num_threads" -version = "0.1.7" +name = "num_enum" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "libc", + "num_enum_derive", ] [[package]] -name = "numerals" -version = "0.1.4" +name = "num_enum_derive" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] [[package]] name = "object" -version = "0.32.2" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] +[[package]] +name = "oci-spec" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e423c4f827362c0d8d8da4b1f571270f389ebde73bcd3240a3d23c6d6f61d0f0" +dependencies = [ + "derive_builder", + "getset", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "ocipkg" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb3293021f06540803301af45e7ab81693d50e89a7398a3420bdab139e7ba5e" +dependencies = [ + "base16ct", + "base64 0.22.1", + "chrono", + "directories", + "flate2", + "lazy_static", + "log", + "oci-spec", + "regex", + "serde", + "serde_json", + "sha2", + "tar", + "thiserror", + "toml", + "ureq", + "url", + "uuid 1.8.0", + "walkdir", +] + [[package]] name = "once_cell" version = "1.19.0" @@ -2120,14 +2698,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] -name = "open" -version = "5.1.2" +name = "onig" +version = "6.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" dependencies = [ - "is-wsl", + "bitflags 1.3.2", "libc", - "pathdiff", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", ] [[package]] @@ -2136,9 +2725,9 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", - "foreign-types", + "foreign-types 0.3.2", "libc", "once_cell", "openssl-macros", @@ -2153,7 +2742,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -2164,9 +2753,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.101" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -2181,33 +2770,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] -name = "palette" -version = "0.7.5" +name = "overload" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" -dependencies = [ - "approx", - "fast-srgb8", - "libm", - "palette_derive", -] +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] -name = "palette_derive" -version = "0.7.5" +name = "packedvec" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" +checksum = "bde3c690ec20e4a2b4fb46f0289a451181eb50011a1e2acc8d85e2fde9062a45" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", + "num-traits", + "serde", ] [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2215,34 +2797,31 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", +] + +[[package]] +name = "parse-zoneinfo" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" +dependencies = [ + "regex", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "path-clean" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -2256,7 +2835,16 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros", + "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", ] @@ -2270,34 +2858,15 @@ dependencies = [ "rand", ] -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 2.0.52", -] - [[package]] name = "phf_shared" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher 0.3.11", + "siphasher", ] -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - [[package]] name = "pin-project" version = "1.1.5" @@ -2315,14 +2884,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2336,20 +2905,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "plist" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" -dependencies = [ - "base64 0.21.7", - "indexmap 2.2.5", - "line-wrap", - "quick-xml", - "serde", - "time", -] - [[package]] name = "png" version = "0.17.13" @@ -2369,23 +2924,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" -[[package]] -name = "postcard" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" -dependencies = [ - "cobs", - "embedded-io", - "serde", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2393,73 +2931,186 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "proc-macro2" -version = "1.0.78" +name = "proc-macro-crate" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] [[package]] -name = "psm" -version = "0.1.21" +name = "profiling" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" dependencies = [ - "cc", + "profiling-procmacros", ] [[package]] -name = "ptr_meta" -version = "0.1.4" +name = "profiling-procmacros" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ - "ptr_meta_derive", + "quote", + "syn 2.0.66", ] [[package]] -name = "ptr_meta_derive" -version = "0.1.4" +name = "pulp" +version = "0.18.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +checksum = "0ec8d02258294f59e4e223b41ad7e81c874aa6b15bc4ced9ba3965826da0eed5" +dependencies = [ + "bytemuck", + "libm", + "num-complex", + "reborrow", +] + +[[package]] +name = "pyo3" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" +dependencies = [ + "anyhow", + "cfg-if", + "chrono", + "chrono-tz", + "either", + "eyre", + "hashbrown", + "indexmap", + "indoc", + "libc", + "memoffset", + "num-bigint", + "num-complex", + "parking_lot", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "rust_decimal", + "serde", + "smallvec", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" dependencies = [ "proc-macro2", + "pyo3-macros-backend", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] -name = "qcms" -version = "0.3.0" +name = "pyo3-macros-backend" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edecfcd5d755a5e5d98e24cf43113e7cdaec5a070edd0f6b250c03a573da30fa" - -[[package]] -name = "quick-xml" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" dependencies = [ - "memchr", - "serde", + "heck 0.4.1", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn 2.0.66", ] +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] [[package]] -name = "radium" -version = "0.7.0" +name = "radix_trie" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] [[package]] name = "rand" @@ -2492,15 +3143,109 @@ dependencies = [ ] [[package]] -name = "rayon" -version = "1.9.0" +name = "rand_distr" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand", +] + +[[package]] +name = "rand_isaac" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fac4373cd91b4f55722c553fb0f286edbb81ef3ff6eec7b99d1898a4110a0b28" +dependencies = [ + "rand_core", +] + +[[package]] +name = "range-checked" +version = "0.1.0" +source = "git+https://github.com/EricLBuehler/range-checked.git#655349cc093fcd4965f35b25de394a24ff4b0c7b" + +[[package]] +name = "rav1e" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools 0.12.1", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rayon", + "rgb", +] + +[[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[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-cond" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +dependencies = [ + "either", + "itertools 0.11.0", + "rayon", +] + [[package]] name = "rayon-core" version = "1.12.1" @@ -2511,6 +3256,12 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "reborrow" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" + [[package]] name = "redox_syscall" version = "0.4.1" @@ -2521,110 +3272,104 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.4" +name = "redox_syscall" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.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", ] -[[package]] -name = "reflexo" -version = "0.5.0-rc2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "247ea8050cb5c88b41a68b3269f5a2eb7ebff55851a564d96b035643418346e6" -dependencies = [ - "base64 0.22.0", - "bitvec", - "comemo", - "dashmap", - "ecow", - "fxhash", - "once_cell", - "parking_lot", - "path-clean", - "rkyv", - "serde", - "serde_json", - "serde_repr", - "serde_with", - "siphasher 1.0.0", - "tiny-skia-path", -] - [[package]] name = "regex" -version = "1.10.3" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.4", ] [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "rend" -version = "0.4.2" +name = "regex-syntax" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" -dependencies = [ - "bytecheck", -] +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.11.25" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eea5a9eb898d3783f17c6407670e3592fd174cb81a10e51d4c37f49450b9946" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bytes", "encoding_rs", + "futures-channel", "futures-core", "futures-util", "h2", - "http 0.2.12", + "http", "http-body", + "http-body-util", "hyper", "hyper-rustls", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", "mime", - "mime_guess", "native-tls", "once_cell", "percent-encoding", "pin-project-lite", "rustls", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", @@ -2638,6 +3383,15 @@ dependencies = [ "winreg", ] +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + [[package]] name = "ring" version = "0.17.8" @@ -2654,51 +3408,54 @@ dependencies = [ ] [[package]] -name = "rkyv" -version = "0.7.44" +name = "rust-embed" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" dependencies = [ - "bitvec", - "bytecheck", - "bytes", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", + "rust-embed-impl", + "rust-embed-utils", + "walkdir", ] [[package]] -name = "rkyv_derive" -version = "0.7.44" +name = "rust-embed-impl" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "rust-embed-utils", + "syn 2.0.66", + "walkdir", ] [[package]] -name = "roff" -version = "0.2.1" +name = "rust-embed-utils" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" +checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" +dependencies = [ + "sha2", + "walkdir", +] [[package]] -name = "roxmltree" -version = "0.19.0" +name = "rust_decimal" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +dependencies = [ + "arrayvec", + "num-traits", +] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -2717,11 +3474,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -2730,68 +3487,66 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", + "rustls-pki-types", ] [[package]] -name = "rustls-webpki" -version = "0.101.7" +name = "rustls-pki-types" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[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" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "rustybuzz" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" -dependencies = [ - "bitflags 2.4.2", - "bytemuck", - "smallvec", - "ttf-parser", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-properties", - "unicode-script", -] +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] -name = "safemem" -version = "0.3.3" +name = "safetensors" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "8ced76b22c7fba1162f11a5a75d9d8405264b467a07ae0c9c29be119b9297db9" +dependencies = [ + "serde", + "serde_json", +] [[package]] name = "same-file" @@ -2817,29 +3572,13 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -2848,9 +3587,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -2858,38 +3597,41 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" -dependencies = [ - "serde", -] +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "seq-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -2897,21 +3639,20 @@ dependencies = [ ] [[package]] -name = "serde_repr" -version = "0.1.18" +name = "serde_path_to_error" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", + "itoa", + "serde", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -2928,60 +3669,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "3.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270" -dependencies = [ - "base64 0.21.7", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.2.5", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d" -dependencies = [ - "darling 0.20.8", - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "serde_yaml" -version = "0.9.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" -dependencies = [ - "indexmap 2.2.5", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[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" @@ -2994,10 +3681,40 @@ dependencies = [ ] [[package]] -name = "signal-hook-registry" -version = "1.4.1" +name = "sharded-slab" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3009,18 +3726,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] -name = "simdutf8" -version = "0.1.4" +name = "simd_helpers" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "simplecss" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" dependencies = [ - "log", + "quote", ] [[package]] @@ -3029,12 +3740,6 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" -[[package]] -name = "siphasher" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" - [[package]] name = "slab" version = "0.4.9" @@ -3044,36 +3749,54 @@ dependencies = [ "autocfg", ] -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "version_check", -] - [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", ] +[[package]] +name = "sparsevec" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35df5d2e580b29f3f7ec5b4ed49b0ab3acf7f3624122b3e823cafb9630f293b8" +dependencies = [ + "num-traits", + "packedvec", + "serde", + "vob", +] + [[package]] name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom", + "serde", + "unicode-segmentation", +] [[package]] name = "stable_deref_trait" @@ -3082,31 +3805,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "stacker" -version = "0.1.15" +name = "str_inflector" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +checksum = "ec0b848d5a7695b33ad1be00f84a3c079fe85c9278a325ff9159e6c99cef4ef7" dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "winapi", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" -dependencies = [ - "float-cmp", + "lazy_static", + "regex", ] [[package]] @@ -3117,63 +3822,37 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ - "strum_macros 0.25.3", -] - -[[package]] -name = "strum" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" -dependencies = [ - "strum_macros 0.26.1", + "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] -name = "strum_macros" -version = "0.26.1" +name = "subtle" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.52", -] - -[[package]] -name = "svgtypes" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" -dependencies = [ - "kurbo", - "siphasher 0.3.11", -] +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -3188,9 +3867,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -3203,6 +3882,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "synstructure" version = "0.13.1" @@ -3211,69 +3896,74 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] -name = "syntect" -version = "5.2.0" +name = "sysctl" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" +checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" dependencies = [ - "bincode", - "bitflags 1.3.2", - "fancy-regex", - "flate2", - "fnv", - "once_cell", - "plist", - "regex-syntax", - "serde", - "serde_derive", - "serde_json", + "bitflags 2.5.0", + "byteorder", + "enum-as-inner", + "libc", "thiserror", "walkdir", - "yaml-rust", ] [[package]] name = "system-configuration" -version = "0.6.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags 2.4.2", + "bitflags 1.3.2", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.6.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ "core-foundation-sys", "libc", ] [[package]] -name = "tap" -version = "1.0.1" +name = "system-deps" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml", + "version-compare", +] [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", "xattr", ] +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + [[package]] name = "tempfile" version = "3.10.1" @@ -3297,114 +3987,92 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] -name = "time" -version = "0.3.34" +name = "thread_local" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ - "deranged", - "itoa", - "libc", - "num-conv", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny-skia" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", "cfg-if", - "log", - "png", - "tiny-skia-path", + "once_cell", ] [[package]] -name = "tiny-skia-path" -version = "0.11.4" +name = "tiff" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ - "arrayref", - "bytemuck", - "strict-num", + "flate2", + "jpeg-decoder", + "weezl", ] [[package]] name = "tinystr" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", - "serde", "zerovec", ] [[package]] -name = "tinyvec" -version = "1.6.0" +name = "tokenizers" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "e500fad1dd3af3d626327e6a3fe5050e664a6eaa4708b8ca92f1794aaf73e6fd" dependencies = [ - "tinyvec_macros", + "aho-corasick", + "derive_builder", + "esaxx-rs", + "getrandom", + "indicatif", + "itertools 0.12.1", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand", + "rayon", + "rayon-cond", + "regex", + "regex-syntax 0.8.4", + "serde", + "serde_json", + "spm_precompiled", + "thiserror", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", ] -[[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.36.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -3421,13 +4089,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -3441,87 +4109,146 @@ dependencies = [ ] [[package]] -name = "tokio-rustls" -version = "0.24.1" +name = "tokio-rayon" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "7cf33a76e0b1dd03b778f83244137bd59887abf25c0e87bc3e7071105f457693" dependencies = [ - "rustls", + "rayon", "tokio", ] [[package]] -name = "tokio-tungstenite" -version = "0.21.0" +name = "tokio-rustls" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "futures-util", - "log", + "rustls", + "rustls-pki-types", "tokio", - "tungstenite", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.10" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.22.14", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.5", + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +dependencies = [ + "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.13", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +dependencies = [ + "bitflags 2.5.0", + "bytes", + "http", + "http-body", + "http-body-util", + "pin-project-lite", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +[[package]] +name = "tqdm" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2d2932240205a99b65f15d9861992c95fbb8c9fb280b3a1f17a92db6dc611f" +dependencies = [ + "anyhow", + "crossterm", + "once_cell", +] + [[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", @@ -3535,7 +4262,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -3545,6 +4272,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", + "valuable", +] + +[[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", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", ] [[package]] @@ -3554,47 +4311,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] -name = "ttf-parser" -version = "0.20.0" +name = "try_match" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" - -[[package]] -name = "tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +checksum = "61ae3c1941e8859e30d28e572683fbfa89ae5330748b45139aedf488389e2be4" dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.1.0", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", + "try_match_inner", ] [[package]] -name = "two-face" -version = "0.3.0" +name = "try_match_inner" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37bed2135b2459c7eefba72c906d374697eb15949c205f2f124e3636a46b5eeb" +checksum = "b0a91713132798caecb23c977488945566875e7b61b902fb111979871cbff34e" dependencies = [ - "once_cell", - "serde", - "syntect", + "proc-macro2", + "quote", + "syn 2.0.66", ] -[[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" @@ -3602,260 +4337,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] -name = "typst" -version = "0.11.0" +name = "unchecked-index" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82ce6533a33d2cc4b5eba6b009b862e75c8f9146a584f84ca154c94463e43993" -dependencies = [ - "az", - "bitflags 2.4.2", - "chinese-number", - "ciborium", - "comemo", - "csv", - "ecow", - "fontdb", - "hayagriva", - "hypher", - "icu_properties", - "icu_provider", - "icu_provider_adapters", - "icu_provider_blob", - "icu_segmenter", - "if_chain", - "image", - "indexmap 2.2.5", - "kamadak-exif", - "kurbo", - "lipsum", - "log", - "once_cell", - "palette", - "phf", - "png", - "portable-atomic", - "qcms", - "rayon", - "regex", - "roxmltree", - "rustybuzz", - "serde", - "serde_json", - "serde_yaml", - "siphasher 1.0.0", - "smallvec", - "stacker", - "syntect", - "time", - "toml", - "ttf-parser", - "two-face", - "typed-arena", - "typst-assets", - "typst-macros", - "typst-syntax", - "typst-timing", - "unicode-bidi", - "unicode-math-class", - "unicode-script", - "unicode-segmentation", - "usvg", - "wasmi", -] - -[[package]] -name = "typst-assets" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13f85360328da54847dd7fefaf272dfa5b6d1fdeb53f32938924c39bf5b2c6c" - -[[package]] -name = "typst-macros" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e48fdd6dabf48a0e595960aaef6ae43dac7d243e8c1c6926a0787d5b8a9ba7" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "typst-preview" -version = "0.11.4" -dependencies = [ - "anyhow", - "await-tree", - "clap", - "clap_complete", - "clap_mangen", - "comemo", - "elsa", - "env_logger", - "futures", - "hyper", - "indexmap 2.2.5", - "log", - "memmap2", - "notify", - "once_cell", - "open", - "serde", - "serde_json", - "tiny-skia", - "tokio", - "tokio-tungstenite", - "typst", - "typst-assets", - "typst-ts-compiler", - "typst-ts-core", - "typst-ts-svg-exporter", - "vergen", -] - -[[package]] -name = "typst-syntax" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "367d86bf18f0363146bea1ea76fad19b54458695fdfad5e74ead3ede574b75fe" -dependencies = [ - "comemo", - "ecow", - "once_cell", - "serde", - "unicode-ident", - "unicode-math-class", - "unicode-script", - "unicode-segmentation", - "unscanny", -] - -[[package]] -name = "typst-timing" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b2629933cde6f299c43627b90c83bb006cb906c56cc5dec7324f0a5017d5fd8" -dependencies = [ - "parking_lot", - "serde", - "serde_json", - "typst-syntax", -] - -[[package]] -name = "typst-ts-compiler" -version = "0.5.0-rc2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c18cf7d96c0c558901b3f7e3f5200ecb7e3d7d3dcc5a1222e94bc875237ff352" -dependencies = [ - "append-only-vec", - "base64 0.22.0", - "chrono", - "codespan-reporting", - "comemo", - "dirs", - "dissimilar", - "flate2", - "fontdb", - "fst", - "hex", - "indexmap 2.2.5", - "instant", - "log", - "nohash-hasher", - "notify", - "once_cell", - "parking_lot", - "pathdiff", - "reqwest", - "rustc-hash", - "serde", - "serde_json", - "sha2", - "strum 0.25.0", - "tar", - "tokio", - "typst", - "typst-ts-core", - "typst-ts-svg-exporter", - "walkdir", -] - -[[package]] -name = "typst-ts-core" -version = "0.5.0-rc2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69135c380eb60efa4aeabd986d27d82ecd1b4c843fd3393992b449409317847" -dependencies = [ - "base64 0.22.0", - "base64-serde", - "bitvec", - "byteorder", - "comemo", - "crossbeam-queue", - "dashmap", - "ecow", - "elsa", - "flate2", - "fxhash", - "hex", - "log", - "once_cell", - "parking_lot", - "path-clean", - "rayon", - "reflexo", - "rustc-hash", - "serde", - "serde_json", - "serde_repr", - "serde_with", - "sha2", - "siphasher 1.0.0", - "tiny-skia", - "tiny-skia-path", - "ttf-parser", - "typst", - "xmlparser", -] - -[[package]] -name = "typst-ts-svg-exporter" -version = "0.5.0-rc2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6063f63c8e3ba3d4d7f4cb1a8fd96b096e8e713f24783278fea98dac0746966" -dependencies = [ - "base64 0.22.0", - "comemo", - "log", - "once_cell", - "rayon", - "reflexo", - "siphasher 1.0.0", - "tiny-skia", - "typst", - "typst-ts-core", -] - -[[package]] -name = "unic-langid" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" -dependencies = [ - "unic-langid-impl", -] - -[[package]] -name = "unic-langid-impl" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" -dependencies = [ - "serde", - "tinystr", -] +checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c" [[package]] name = "unicase" @@ -3866,24 +4351,6 @@ 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-bidi-mirroring" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" - -[[package]] -name = "unicode-ccc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" - [[package]] name = "unicode-ident" version = "1.0.12" @@ -3891,61 +4358,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "unicode-math-class" -version = "0.1.0" +name = "unicode-normalization-alignments" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" dependencies = [ - "tinyvec", + "smallvec", ] -[[package]] -name = "unicode-properties" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" - -[[package]] -name = "unicode-script" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" - [[package]] name = "unicode-segmentation" version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" -[[package]] -name = "unicode-vo" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" - [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] -name = "unsafe-libyaml" -version = "0.2.10" +name = "unicode_categories" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] -name = "unscanny" -version = "0.1.0" +name = "unindent" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "untrusted" @@ -3954,82 +4397,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] -name = "url" -version = "2.5.0" +name = "ureq" +version = "2.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "native-tls", + "once_cell", + "rustls", + "rustls-pki-types", + "rustls-webpki", + "serde", + "serde_json", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde", ] [[package]] -name = "usvg" -version = "0.38.0" +name = "utf16_iter" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377f62b4a3c173de8654c1aa80ab1dac1154e6f13a779a9943e53780120d1625" -dependencies = [ - "base64 0.21.7", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", -] - -[[package]] -name = "usvg-parser" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a05e6f2023d6b4e946f734240a3927aefdcf930d7d42587a2c8a8869814b0" -dependencies = [ - "data-url", - "flate2", - "imagesize", - "kurbo", - "log", - "roxmltree", - "simplecss", - "siphasher 0.3.11", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c41888b9d5cf431fe852eaf9d047bbde83251b98f1749c2f08b1071e6db46e2" -dependencies = [ - "fontdb", - "kurbo", - "log", - "rustybuzz", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18863e0404ed153d6e56362c5b1146db9f4f262a3244e3cf2dbe7d8a85909f05" -dependencies = [ - "strict-num", - "svgtypes", - "tiny-skia-path", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" [[package]] name = "utf8_iter" @@ -4039,15 +4441,101 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "utoipa" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5afb1a60e207dca502682537fefcfd9921e71d0b83e9576060f09abc6efab23" +dependencies = [ + "indexmap", + "serde", + "serde_json", + "utoipa-gen", +] + +[[package]] +name = "utoipa-gen" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bf0e16c02bc4bf5322ab65f10ab1149bdbcaa782cba66dc7057370a3f8190be" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "regex", + "syn 2.0.66", +] + +[[package]] +name = "utoipa-swagger-ui" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "943e0ff606c6d57d410fd5663a4d7c074ab2c5f14ab903b9514565e59fa1189e" +dependencies = [ + "axum", + "mime_guess", + "regex", + "reqwest", + "rust-embed", + "serde", + "serde_json", + "url", + "utoipa", + "zip", +] [[package]] name = "uuid" -version = "1.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "uuid" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +dependencies = [ + "getrandom", +] + +[[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "variantly" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72a332341ba79a179d9e9b33c0d72fbf3dc2c80e1be79416401a08d2b820ef56" +dependencies = [ + "Inflector", + "darling 0.11.0", + "proc-macro2", + "quote", + "syn 1.0.109", + "uuid 0.8.2", +] [[package]] name = "vcpkg" @@ -4056,20 +4544,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] -name = "vergen" -version = "8.3.1" +name = "version-compare" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" -dependencies = [ - "anyhow", - "cargo_metadata", - "cfg-if", - "git2", - "regex", - "rustc_version", - "rustversion", - "time", -] +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -4077,6 +4555,17 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "vob" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c058f4c41e71a043c67744cb76dcc1ae63ece328c1732a72489ccccc2dec23e6" +dependencies = [ + "num-traits", + "rustc_version", + "serde", +] + [[package]] name = "walkdir" version = "2.5.0" @@ -4102,15 +4591,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasix" -version = "0.12.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d" -dependencies = [ - "wasi", -] - [[package]] name = "wasm-bindgen" version = "0.2.92" @@ -4132,7 +4612,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -4166,7 +4646,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4177,52 +4657,6 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "wasmi" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" -dependencies = [ - "smallvec", - "spin", - "wasmi_arena", - "wasmi_core", - "wasmparser-nostd", -] - -[[package]] -name = "wasmi_arena" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" - -[[package]] -name = "wasmi_core" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" -dependencies = [ - "downcast-rs", - "libm", - "num-traits", - "paste", -] - -[[package]] -name = "wasmparser-nostd" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" -dependencies = [ - "indexmap-nostd", -] - -[[package]] -name = "weak-table" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" - [[package]] name = "web-sys" version = "0.3.69" @@ -4235,9 +4669,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "weezl" @@ -4263,11 +4700,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4282,7 +4719,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -4300,7 +4737,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -4320,17 +4757,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -4341,9 +4779,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -4353,9 +4791,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -4365,9 +4803,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -4377,9 +4821,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -4389,9 +4833,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -4401,9 +4845,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -4413,43 +4857,49 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.6.5" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", ] [[package]] -name = "writeable" -version = "0.5.4" +name = "write16" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] -name = "wyz" -version = "0.5.1" +name = "writeable" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "xattr" @@ -4462,32 +4912,11 @@ dependencies = [ "rustix", ] -[[package]] -name = "xmlparser" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" - -[[package]] -name = "xmlwriter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" - -[[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 = "yoke" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" dependencies = [ "serde", "stable_deref_trait", @@ -4497,56 +4926,69 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", "synstructure", ] [[package]] -name = "zerofrom" -version = "0.1.3" +name = "zerocopy" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[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.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", "synstructure", ] [[package]] -name = "zerotrie" -version = "0.1.2" +name = "zeroize" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0594125a0574fb93059c92c588ab209cc036a23d1baeb3410fa9181bea551a0" -dependencies = [ - "displaydoc", - "litemap", - "serde", - "zerovec", -] +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zerovec" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" +checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" dependencies = [ - "serde", "yoke", "zerofrom", "zerovec-derive", @@ -4554,11 +4996,51 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" +checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", +] + +[[package]] +name = "zip" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "displaydoc", + "flate2", + "indexmap", + "num_enum", + "thiserror", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", ] diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix new file mode 100644 index 000000000000..4c5324e8d856 --- /dev/null +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -0,0 +1,201 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + + # nativeBuildInputs + pkg-config, + python3, + + # buildInputs + oniguruma, + openssl, + mkl, + stdenv, + darwin, + + # env + fetchurl, + + testers, + mistral-rs, + + cudaPackages, + cudaCapability ? null, + + config, + # one of `[ null false "cuda" "mkl" "metal" ]` + acceleration ? null, + +}: + +let + accelIsValid = builtins.elem acceleration [ + null + false + "cuda" + "mkl" + "metal" + ]; + + cudaSupport = + assert accelIsValid; + (acceleration == "cuda") || (config.cudaSupport && acceleration == null); + + minRequiredCudaCapability = "6.1"; # build fails with 6.0 + inherit (cudaPackages.cudaFlags) cudaCapabilities; + cudaCapabilityString = + if cudaCapability == null then + (builtins.head ( + (builtins.filter (cap: lib.versionAtLeast cap minRequiredCudaCapability) cudaCapabilities) + ++ [ + (lib.warn "mistral-rs doesn't support ${lib.concatStringsSep " " cudaCapabilities}" minRequiredCudaCapability) + ] + )) + else + cudaCapability; + cudaCapability' = lib.toInt (cudaPackages.cudaFlags.dropDot cudaCapabilityString); + + # TODO Should we assert mklAccel -> stdenv.isLinux && stdenv.isx86_64 ? + mklSupport = + assert accelIsValid; + (acceleration == "mkl"); + + metalSupport = + assert accelIsValid; + (acceleration == "metal") || (stdenv.isDarwin && stdenv.isAarch64 && (acceleration == null)); + + darwinBuildInputs = + with darwin.apple_sdk.frameworks; + [ + Accelerate + CoreVideo + CoreGraphics + ] + ++ lib.optionals metalSupport [ + MetalKit + MetalPerformanceShaders + ]; +in + +rustPlatform.buildRustPackage rec { + pname = "mistral-rs"; + version = "0.1.18"; + + src = fetchFromGitHub { + owner = "EricLBuehler"; + repo = "mistral.rs"; + rev = "refs/tags/v${version}"; + hash = "sha256-lMDFWNv9b0UfckqLmyWRVwnqmGe6nxYsUHzoi2+oG84="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "candle-core-0.6.0" = "sha256-DxGBWf2H7MamrbboTJ4zHy1HeE8ZVT7QvE3sTYrRxBc="; + "range-checked-0.1.0" = "sha256-S+zcF13TjwQPFWZLIbUDkvEeaYdaxCOtDLtI+JRvum8="; + }; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ + pkg-config + python3 + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + + buildInputs = + [ + oniguruma + openssl + ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvrtc + cudaPackages.libcublas + cudaPackages.libcurand + ] + ++ lib.optionals mklSupport [ mkl ] + ++ lib.optionals stdenv.isDarwin darwinBuildInputs; + + cargoBuildFlags = + lib.optionals cudaSupport [ "--features=cuda" ] + ++ lib.optionals mklSupport [ "--features=mkl" ] + ++ lib.optionals (stdenv.isDarwin && metalSupport) [ "--features=metal" ]; + + env = + { + SWAGGER_UI_DOWNLOAD_URL = + let + # When updating: + # - Look for the version of `utopia-swagger-ui` at: + # https://github.com/EricLBuehler/mistral.rs/blob/v/mistralrs-server/Cargo.toml + # - Look at the corresponding version of `swagger-ui` at: + # https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-/utoipa-swagger-ui/build.rs#L21-L22 + swaggerUiVersion = "5.17.12"; + + swaggerUi = fetchurl { + url = "https://github.com/swagger-api/swagger-ui/archive/refs/tags/v${swaggerUiVersion}.zip"; + hash = "sha256-HK4z/JI+1yq8BTBJveYXv9bpN/sXru7bn/8g5mf2B/I="; + }; + in + "file://${swaggerUi}"; + + RUSTONIG_SYSTEM_LIBONIG = true; + } + // (lib.optionalAttrs cudaSupport { + CUDA_COMPUTE_CAP = cudaCapability'; + + # Apparently, cudart is enough: No need to provide the entire cudaPackages.cudatoolkit derivation. + CUDA_TOOLKIT_ROOT_DIR = lib.getDev cudaPackages.cuda_cudart; + }); + + NVCC_PREPEND_FLAGS = lib.optionals cudaSupport [ + "-I${lib.getDev cudaPackages.cuda_cudart}/include" + "-I${lib.getDev cudaPackages.cuda_cccl}/include" + ]; + + # swagger-ui will once more be copied in the target directory during the check phase + # Not deleting the existing unpacked archive leads to a `PermissionDenied` error + preCheck = '' + rm -rf target/${stdenv.hostPlatform.config}/release/build/ + ''; + + # Try to access internet + checkFlags = [ + "--skip=gguf::gguf_tokenizer::tests::test_decode_gpt2" + "--skip=gguf::gguf_tokenizer::tests::test_decode_llama" + "--skip=gguf::gguf_tokenizer::tests::test_encode_gpt2" + "--skip=gguf::gguf_tokenizer::tests::test_encode_llama" + "--skip=sampler::tests::test_argmax" + "--skip=sampler::tests::test_gumbel_speculative" + ]; + + passthru = { + tests = { + version = testers.testVersion { package = mistral-rs; }; + + withMkl = mistral-rs.override { acceleration = "mkl"; }; + withCuda = mistral-rs.override { acceleration = "cuda"; }; + withMetal = mistral-rs.override { acceleration = "metal"; }; + }; + }; + + meta = { + description = "Blazingly fast LLM inference"; + homepage = "https://github.com/EricLBuehler/mistral.rs"; + changelog = "https://github.com/EricLBuehler/mistral.rs/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "mistralrs-server"; + platforms = + if cudaSupport then + lib.platforms.linux + else if metalSupport then + [ "aarch64-darwin" ] + else + lib.platforms.unix; + broken = mklSupport; + }; +} diff --git a/pkgs/by-name/mk/mksh/package.nix b/pkgs/by-name/mk/mksh/package.nix index 2572e378ddf4..f22fc93578a3 100644 --- a/pkgs/by-name/mk/mksh/package.nix +++ b/pkgs/by-name/mk/mksh/package.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://www.mirbsd.org/mksh.htm"; + changelog = "https://www.mirbsd.org/mksh.htm#clog"; description = "MirBSD Korn Shell"; mainProgram = "mksh"; longDescription = '' diff --git a/pkgs/by-name/mo/mokuro/package.nix b/pkgs/by-name/mo/mokuro/package.nix index 95054f371480..1fb6ca5443b4 100644 --- a/pkgs/by-name/mo/mokuro/package.nix +++ b/pkgs/by-name/mo/mokuro/package.nix @@ -22,7 +22,6 @@ python3Packages.buildPythonApplication rec { --replace-fail 'opencv-python' 'opencv' ''; - nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "torchvision" ]; diff --git a/pkgs/by-name/mo/mommy/package.nix b/pkgs/by-name/mo/mommy/package.nix index 280b8caae996..c83c91e20e49 100644 --- a/pkgs/by-name/mo/mommy/package.nix +++ b/pkgs/by-name/mo/mommy/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/FWDekker/mommy/blob/v${version}/CHANGELOG.md"; license = licenses.unlicense; platforms = platforms.all; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; mainProgram = "mommy"; }; } diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/by-name/mo/monado/package.nix similarity index 81% rename from pkgs/applications/graphics/monado/default.nix rename to pkgs/by-name/mo/monado/package.nix index 4cbd7a8f00c9..6f420f497e33 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -9,7 +9,6 @@ , doxygen , eigen , elfutils -, ffmpeg , glslang , gst-plugins-base , gstreamer @@ -31,6 +30,7 @@ , libXdmcp , libXext , libXrandr +, nix-update-script , onnxruntime , opencv4 , openhmd @@ -51,23 +51,23 @@ , zlib , zstd , nixosTests -# Set as 'false' to build monado without service support, i.e. allow VR -# applications linking against libopenxr_monado.so to use OpenXR standalone -# instead of via the monado-service program. For more information see: -# https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled + # Set as 'false' to build monado without service support, i.e. allow VR + # applications linking against libopenxr_monado.so to use OpenXR standalone + # instead of via the monado-service program. For more information see: + # https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled , serviceSupport ? true }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "monado"; - version = "unstable-2024-01-02"; + version = "24.0.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; - rev = "bfa1c16ff9fc759327ca251a5d086b958b1a3b8a"; - hash = "sha256-wXRwOs9MkDre/VeW686DzmvKjX0qCSS13MILbYQD6OY="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-lFy0VvaLD4Oyu2TZJnaIWjuaJUZjGGDJS0VsRfIUpcc="; }; nativeBuildInputs = [ @@ -92,7 +92,6 @@ stdenv.mkDerivation { dbus eigen elfutils - ffmpeg gst-plugins-base gstreamer hidapi @@ -143,8 +142,9 @@ stdenv.mkDerivation { export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}} ''; - passthru.tests = { - basic-service = nixosTests.monado; + passthru = { + updateScript = nix-update-script { }; + tests.basic-service = nixosTests.monado; }; meta = with lib; { @@ -155,4 +155,4 @@ stdenv.mkDerivation { platforms = platforms.linux; mainProgram = "monado-cli"; }; -} +}) diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index fe11f1ef5644..74431e60f2ac 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -33,7 +33,7 @@ }: let - version = "1.43.2"; + version = "1.43.4"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - hash = "sha256-idOFt60MlspB8Bm9HbLAhd/F1zhkHSVmdTxvCsgjGvk="; + hash = "sha256-K4BOWmlXO16cF8WN+rncifWSHJRxSADxLdKRHCet5Co="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix new file mode 100644 index 000000000000..f94a40ac220c --- /dev/null +++ b/pkgs/by-name/mo/moonlight-qt/package.nix @@ -0,0 +1,114 @@ +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + darwin, + overrideSDK, + qt6, + pkg-config, + vulkan-headers, + SDL2, + SDL2_ttf, + ffmpeg, + libopus, + libplacebo, + openssl, + alsa-lib, + libpulseaudio, + libva, + libvdpau, + libxkbcommon, + wayland, + nix-update-script, +}: + +let + inherit (darwin.apple_sdk_11_0.frameworks) + AVFoundation + AppKit + AudioUnit + Cocoa + VideoToolbox + ; + stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; +in + +stdenv'.mkDerivation rec { + pname = "moonlight-qt"; + version = "6.0.1"; + + src = fetchFromGitHub { + owner = "moonlight-stream"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-zrl8WPXvQ/7FTqFnpwoXEJ85prtgJWoWNsdckw5+JHI="; + fetchSubmodules = true; + }; + + patches = [ + # Don't precompile QML files with disable-prebuilts, fix build on darwin + (fetchpatch { + url = "https://github.com/moonlight-stream/moonlight-qt/commit/d73df12367749425b86b72c250bb0fba13ddfd29.patch"; + hash = "sha256-RIrQpZWbwUHs1Iwz/pXfXgshJeHYrzGxuaR5mRG85QY="; + }) + ]; + + nativeBuildInputs = [ + qt6.qmake + qt6.wrapQtAppsHook + pkg-config + vulkan-headers + ]; + + buildInputs = + [ + (SDL2.override { drmSupport = stdenv.isLinux; }) + SDL2_ttf + ffmpeg + libopus + libplacebo + qt6.qtdeclarative + qt6.qtsvg + openssl + ] + ++ lib.optionals stdenv.isLinux [ + alsa-lib + libpulseaudio + libva + libvdpau + libxkbcommon + qt6.qtwayland + wayland + ] + ++ lib.optionals stdenv.isDarwin [ + AVFoundation + AppKit + AudioUnit + Cocoa + VideoToolbox + ]; + + qmakeFlags = [ "CONFIG+=disable-prebuilts" ]; + + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir $out/Applications $out/bin + mv app/Moonlight.app $out/Applications + ln -s $out/Applications/Moonlight.app/Contents/MacOS/Moonlight $out/bin/moonlight + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Play your PC games on almost any device"; + homepage = "https://moonlight-stream.org"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ + azuwis + luc65r + zmitchell + ]; + platforms = platforms.all; + mainProgram = "moonlight"; + }; +} diff --git a/pkgs/by-name/mo/morphosis/package.nix b/pkgs/by-name/mo/morphosis/package.nix new file mode 100644 index 000000000000..fc611305df08 --- /dev/null +++ b/pkgs/by-name/mo/morphosis/package.nix @@ -0,0 +1,62 @@ +{ + lib, + python3Packages, + fetchFromGitLab, + appstream, + blueprint-compiler, + desktop-file-utils, + gobject-introspection, + libadwaita, + meson, + ninja, + pandoc, + pkg-config, + webkitgtk_6_0, + wrapGAppsHook4, +}: +python3Packages.buildPythonApplication rec { + pname = "morphosis"; + version = "1.3"; + pyproject = false; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "morphosis"; + rev = "v${version}"; + hash = "sha256-JEZFgON4QkxHDbWSZbDNLpIFctt8mDHdGVVu3Q+WH4U="; + }; + + nativeBuildInputs = [ + appstream + blueprint-compiler + desktop-file-utils + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + webkitgtk_6_0 + ]; + + dependencies = with python3Packages; [ pygobject3 ]; + + dontWrapGApps = true; + makeWrapperArgs = [ + ''''${gappsWrapperArgs[@]}'' + "--prefix PATH : ${lib.makeBinPath [ pandoc ]}" + ]; + + meta = { + description = "Convert your documents"; + homepage = "https://gitlab.gnome.org/Monster/morphosis"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "morphosis"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/mo/mos/package.nix b/pkgs/by-name/mo/mos/package.nix index a85b77c4f3e0..8cbca9f53445 100644 --- a/pkgs/by-name/mo/mos/package.nix +++ b/pkgs/by-name/mo/mos/package.nix @@ -27,6 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = with lib; { description = "Smooths scrolling and set mouse scroll directions independently"; homepage = "http://mos.caldis.me/"; + changelog = "https://github.com/Caldis/Mos/releases/tag/${finalAttrs.version}"; license = licenses.cc-by-nc-40; maintainers = with maintainers; [ ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/mo/mov-cli/mov-cli-test.nix b/pkgs/by-name/mo/mov-cli/mov-cli-test.nix new file mode 100644 index 000000000000..f135d863c1d5 --- /dev/null +++ b/pkgs/by-name/mo/mov-cli/mov-cli-test.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools-scm, + pytubefix, + requests, + devgoldyutils, +}: + +buildPythonPackage rec { + pname = "mov-cli-test"; + version = "1.1.7"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "mov-cli"; + repo = "mov-cli-test"; + rev = "refs/tags/${version}"; + hash = "sha256-INdPAJxPxfo5bKg4Xn1r7bildxznXrTJxmDI21wylnI="; + }; + + doCheck = false; + + propagatedBuildInputs = [ + pytubefix + requests + devgoldyutils + ]; + + nativeBuildInputs = [ setuptools-scm ]; + + meta = { + description = "A mov-cli plugin that let's you test mov-cli's capabilities by watching free films and animations in the creative commons"; + homepage = "https://github.com/mov-cli/mov-cli-test"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ roshaen ]; + }; +} diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix index 05691e619285..1a00f4ba019a 100644 --- a/pkgs/by-name/mo/mov-cli/package.nix +++ b/pkgs/by-name/mo/mov-cli/package.nix @@ -8,7 +8,7 @@ let pname = "mov-cli"; - version = "1.5.7"; + version = "4.4.5"; in python3.pkgs.buildPythonPackage { inherit pname version; @@ -18,25 +18,29 @@ python3.pkgs.buildPythonPackage { owner = "mov-cli"; repo = "mov-cli"; rev = version; - hash = "sha256-OJhZtrSB5rjPY80GkTSU82hkcBgFYpW7Rc24BlBH7CE="; + hash = "sha256-Q5fzxdMEUDL1VgeTTgU76z0nksocgjyonAroP/m/Q+0="; }; propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 click colorama + deprecation httpx + inquirer krfzf-py lxml poetry-core pycrypto + python-decouple setuptools six + thefuzz tldextract - ]; - - nativeBuildInputs = [ - python3.pkgs.pythonRelaxDepsHook + toml + typer + unidecode + (callPackage ./mov-cli-test.nix {}) ]; pythonRelaxDeps = [ diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix new file mode 100644 index 000000000000..9fe9530d2c94 --- /dev/null +++ b/pkgs/by-name/mu/museum/package.nix @@ -0,0 +1,48 @@ +{ lib +, fetchFromGitHub +, pkg-config +, libsodium +, buildGoModule +}: + +buildGoModule rec { + + version = "photos-v0.9.5"; + pname = "museum"; + + src = fetchFromGitHub { + owner = "ente-io"; + repo = "ente"; + sparseCheckout = [ "server" ]; + rev = version; + hash = "sha256-U+3k6uIJWDw7QxF1GRF+f6ZXdmCwSkOJ/F60rU1PXRM="; + }; + + sourceRoot = "${src.name}/server"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libsodium ]; + + # fatal: "Not running tests in non-test environment" + doCheck = false; + + postInstall = '' + mkdir -p $out/share/museum + cp -R configurations \ + migrations \ + mail-templates \ + $out/share/museum + ''; + + meta = with lib; { + description = "API server for ente.io"; + homepage = "https://github.com/ente-io/ente/tree/main/server"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ surfaceflinger pinpox ]; + mainProgram = "museum"; + platforms = platforms.linux; + }; + vendorHash = "sha256-Vo3KhWWxO0k/d5qUFRfX44oTZBXtJeUlz6qaUvXLDag="; +} + + diff --git a/pkgs/by-name/mu/musikcube/package.nix b/pkgs/by-name/mu/musikcube/package.nix new file mode 100644 index 000000000000..af318e978122 --- /dev/null +++ b/pkgs/by-name/mu/musikcube/package.nix @@ -0,0 +1,108 @@ +{ + asio, + cmake, + curl, + fetchFromGitHub, + ffmpeg_7-headless, + gnutls, + lame, + lib, + libev, + game-music-emu, + libmicrohttpd, + libopenmpt, + mpg123, + ncurses, + pkg-config, + portaudio, + stdenv, + taglib, + # Linux Dependencies + alsa-lib, + pipewireSupport ? !stdenv.hostPlatform.isDarwin, + pipewire, + pulseaudio, + sndioSupport ? true, + sndio, + systemd, + systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, + # Darwin Dependencies + darwin, + coreaudioSupport ? stdenv.hostPlatform.isDarwin, +}: + +let + ffmpeg = ffmpeg_7-headless; +in +stdenv.mkDerivation (finalAttrs: { + pname = "musikcube"; + version = "3.0.3"; + + src = fetchFromGitHub { + owner = "clangen"; + repo = "musikcube"; + rev = finalAttrs.version; + hash = "sha512-Yqh35hyGzGZlh4UoHK0MGYBa+zugYJg3F+8F223saTdDChiX4cSncroSTexRyJVGm7EE8INNJoXg3HU6bZ08lA=="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = + [ + asio + curl + ffmpeg + gnutls + lame + libev + game-music-emu + libmicrohttpd + libopenmpt + mpg123 + ncurses + portaudio + taglib + ] + ++ lib.optionals systemdSupport [ systemd ] + ++ lib.optionals stdenv.isLinux [ + alsa-lib + pulseaudio + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Cocoa + SystemConfiguration + ] + ) + ++ lib.optionals coreaudioSupport (with darwin.apple_sdk.frameworks; [ CoreAudio ]) + ++ lib.optionals sndioSupport [ sndio ] + ++ lib.optionals pipewireSupport [ pipewire ]; + + cmakeFlags = [ "-DDISABLE_STRIP=true" ]; + + postFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath $out/share/musikcube $out/share/musikcube/musikcube + install_name_tool -add_rpath $out/share/musikcube $out/share/musikcube/musikcubed + ''; + + meta = { + description = "Terminal-based music player, library, and streaming audio server"; + homepage = "https://musikcube.com/"; + maintainers = with lib.maintainers; [ + aanderse + afh + ]; + mainProgram = "musikcube"; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 5e79e29ee458..45a9d0470aad 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.380"; + version = "0.0.381"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-DAOSkWT+fe0av0EpjK8HxgIei6urgFJrNeMdZfrDqDM="; + hash = "sha256-WQBA3NtkxrN3NzKl/DsIlp8gdqQpo05n1MZzIKNJdQc="; }; vendorHash = "sha256-y+mXUzkY5w2hYECtfcBBUCWsRwhip6IhX617lRX698Q="; diff --git a/pkgs/applications/science/logic/naproche/default.nix b/pkgs/by-name/na/naproche/package.nix similarity index 85% rename from pkgs/applications/science/logic/naproche/default.nix rename to pkgs/by-name/na/naproche/package.nix index d2070ba8240f..1843ebf1c789 100644 --- a/pkgs/applications/science/logic/naproche/default.nix +++ b/pkgs/by-name/na/naproche/package.nix @@ -2,13 +2,13 @@ with haskellPackages; mkDerivation { pname = "Naproche-SAD"; - version = "unstable-2024-01-18"; + version = "unstable-2024-05-19"; src = fetchFromGitHub { owner = "naproche"; repo = "naproche"; - rev = "bb3dbcbd2173e3334bc5bdcd04c07c6836a11387"; - hash = "sha256-DWcowUjy8/VBuhqvDYlVINHssF4KhuzT0L+m1YwUxoE="; + rev = "ccb35e6eeb31c82bdd8857d5f84deda296ed53ec"; + hash = "sha256-pIRKjbSFP1q8ldMZXm0WSP0FJqy/lQslNQcoed/y9W0="; }; isExecutable = true; diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix index c3493fb5735d..728445a1da2e 100644 --- a/pkgs/by-name/na/naps2/package.nix +++ b/pkgs/by-name/na/naps2/package.nix @@ -12,13 +12,13 @@ buildDotnetModule rec { pname = "naps2"; - version = "7.4.2"; + version = "7.4.3"; src = fetchFromGitHub { owner = "cyanfish"; repo = "naps2"; rev = "v${version}"; - hash = "sha256-1tPPb8bAQSc5FpizWpi7q4alxoA6xfb/QOAaTK2eNc8="; + hash = "sha256-/qSfxGHcCSoNp516LFYWgEL4csf8EKgtSffBt1C02uE="; }; projectFile = "NAPS2.App.Gtk/NAPS2.App.Gtk.csproj"; diff --git a/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix b/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix index 638d6ac671e1..cb8c6434e24c 100644 --- a/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix +++ b/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix @@ -1,4 +1,4 @@ -{ python3, fetchFromGitHub, gnome, stdenv, lib }: +{ python3, fetchFromGitHub, nautilus-python, stdenv, lib }: stdenv.mkDerivation rec { pname = "nautilus-open-in-blackbox"; version = "0.1.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./paths.patch ]; buildInputs = [ - gnome.nautilus-python + nautilus-python python3.pkgs.pygobject3 ]; diff --git a/pkgs/desktops/gnome/misc/nautilus-python/fix-paths.patch b/pkgs/by-name/na/nautilus-python/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/misc/nautilus-python/fix-paths.patch rename to pkgs/by-name/na/nautilus-python/fix-paths.patch diff --git a/pkgs/desktops/gnome/misc/nautilus-python/default.nix b/pkgs/by-name/na/nautilus-python/package.nix similarity index 72% rename from pkgs/desktops/gnome/misc/nautilus-python/default.nix rename to pkgs/by-name/na/nautilus-python/package.nix index 73767f31219d..993d3e2933af 100644 --- a/pkgs/desktops/gnome/misc/nautilus-python/default.nix +++ b/pkgs/by-name/na/nautilus-python/package.nix @@ -1,26 +1,32 @@ -{ stdenv -, lib -, substituteAll -, fetchurl -, meson -, ninja -, pkg-config -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_412 -, python3 -, nautilus -, gnome +{ + stdenv, + lib, + substituteAll, + fetchurl, + meson, + ninja, + pkg-config, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_412, + python3, + nautilus, + gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs:{ pname = "nautilus-python"; version = "4.0.1"; - outputs = [ "out" "dev" "doc" "devdoc" ]; + outputs = [ + "out" + "dev" + "doc" + "devdoc" + ]; src = fetchurl { - url = "mirror://gnome/sources/nautilus-python/${lib.versions.majorMinor version}/nautilus-python-${version}.tar.xz"; + url = "mirror://gnome/sources/nautilus-python/${lib.versions.majorMinor finalAttrs.version}/nautilus-python-${finalAttrs.version}.tar.xz"; hash = "sha256-/EnBBPsyoK0ZWmawE2eEzRnRDYs+jVnV7n9z6PlOko8="; }; @@ -51,8 +57,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "nautilus-python"; }; }; @@ -63,4 +68,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch b/pkgs/by-name/na/nautilus/extension_dir.patch similarity index 100% rename from pkgs/desktops/gnome/core/nautilus/extension_dir.patch rename to pkgs/by-name/na/nautilus/extension_dir.patch diff --git a/pkgs/desktops/gnome/core/nautilus/fix-paths.patch b/pkgs/by-name/na/nautilus/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/nautilus/fix-paths.patch rename to pkgs/by-name/na/nautilus/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/by-name/na/nautilus/package.nix similarity index 75% rename from pkgs/desktops/gnome/core/nautilus/default.nix rename to pkgs/by-name/na/nautilus/package.nix index f8d650b4648a..660867e81ebd 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -1,46 +1,52 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gi-docgen -, docbook-xsl-nons -, gettext -, desktop-file-utils -, wrapGAppsHook4 -, gtk4 -, libadwaita -, libportal-gtk4 -, gnome -, gnome-autoar -, glib-networking -, shared-mime-info -, libnotify -, libexif -, libjxl -, libseccomp -, librsvg -, webp-pixbuf-loader -, tracker -, tracker-miners -, gexiv2 -, libselinux -, libcloudproviders -, gdk-pixbuf -, substituteAll -, gnome-desktop -, gst_all_1 -, gsettings-desktop-schemas -, gnome-user-share -, gobject-introspection +{ + lib, + stdenv, + fetchurl, + meson, + ninja, + pkg-config, + gi-docgen, + docbook-xsl-nons, + gettext, + desktop-file-utils, + wrapGAppsHook4, + gtk4, + libadwaita, + libportal-gtk4, + gnome, + adwaita-icon-theme, + gnome-autoar, + glib-networking, + shared-mime-info, + libnotify, + libexif, + libjxl, + libseccomp, + librsvg, + webp-pixbuf-loader, + tracker, + tracker-miners, + gexiv2, + libselinux, + libcloudproviders, + gdk-pixbuf, + substituteAll, + gnome-desktop, + gst_all_1, + gsettings-desktop-schemas, + gnome-user-share, + gobject-introspection, }: stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; version = "46.2"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ + "out" + "dev" + "devdoc" + ]; src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; @@ -74,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { gexiv2 glib-networking gnome-desktop - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas gnome-user-share gst_all_1.gst-plugins-base @@ -120,7 +126,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "nautilus"; - attrPath = "gnome.nautilus"; }; }; diff --git a/pkgs/by-name/nd/ndstrim/package.nix b/pkgs/by-name/nd/ndstrim/package.nix index 403bd831a76b..edf35039388a 100644 --- a/pkgs/by-name/nd/ndstrim/package.nix +++ b/pkgs/by-name/nd/ndstrim/package.nix @@ -42,6 +42,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Trim the excess padding found in Nintendo DS(i) ROMs"; homepage = "https://github.com/Nemris/ndstrim"; + changelog = "https://github.com/Nemris/ndstrim/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ thiagokokada ]; diff --git a/pkgs/applications/editors/neovim/neovim-gtk.nix b/pkgs/by-name/ne/neovim-gtk/package.nix similarity index 100% rename from pkgs/applications/editors/neovim/neovim-gtk.nix rename to pkgs/by-name/ne/neovim-gtk/package.nix diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/by-name/ne/neovim-remote/package.nix similarity index 100% rename from pkgs/applications/editors/neovim/neovim-remote.nix rename to pkgs/by-name/ne/neovim-remote/package.nix diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix index e1d81cf5a914..516ca5aa11ec 100644 --- a/pkgs/by-name/ne/netscanner/package.nix +++ b/pkgs/by-name/ne/netscanner/package.nix @@ -6,7 +6,7 @@ }: let pname = "netscanner"; - version = "0.5.1"; + version = "0.5.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "Chleba"; repo = "netscanner"; rev = "refs/tags/v${version}"; - hash = "sha256-iRVmazOiUvpl29A0Ju0e2mzFRJtQD7ViY22Jai005nY="; + hash = "sha256-gVwI5dGQqSQf2wR7oKMTRIqseUbAEDTTuQ51S6dvEFw="; }; - cargoHash = "sha256-oH+rU8IZwC8aZ320bIehddPq/+9IYQs+AlZe94LHNYk="; + cargoHash = "sha256-30VSeBbaVWVEO14eUx28HSymfkCxH0IZmEN4cnJ9wIk="; postFixup = '' wrapProgram $out/bin/netscanner \ diff --git a/pkgs/by-name/ne/next-ls/package.nix b/pkgs/by-name/ne/next-ls/package.nix new file mode 100644 index 000000000000..1a375bfe309f --- /dev/null +++ b/pkgs/by-name/ne/next-ls/package.nix @@ -0,0 +1,54 @@ +{ + lib, + + beam_minimal, + fetchFromGitHub, +}: + +let + beamPackages = beam_minimal.packages.erlang_27; + elixir = beamPackages.elixir_1_17; +in + +beamPackages.mixRelease rec { + pname = "next-ls"; + version = "0.23.0"; + + src = fetchFromGitHub { + owner = "elixir-tools"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-wTEf0pxVIT7qmPufAN9vGR9rY31kWjNabYZwKe/hkVU="; + }; + + mixFodDeps = beamPackages.fetchMixDeps { + inherit src version elixir; + pname = "next-ls-deps"; + hash = "sha256-4Rt5Q0fX+fbncvxyXdpIhgEvn9VYX/QDxDdnbanT21Q="; + }; + + inherit elixir; + inherit (beamPackages) erlang; + + removeCookie = false; + + # replace installPhase to change release target + installPhase = '' + runHook preInstall + + mix release --no-deps-check --path $out plain + makeWrapper $out/bin/plain $out/bin/nextls --add-flags "eval \"System.no_halt(true); Application.ensure_all_started(:next_ls)\"" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.elixir-tools.dev/next-ls/"; + changelog = "https://github.com/elixir-tools/next-ls/releases/tag/v${version}"; + description = "The language server for Elixir that just works"; + license = licenses.mit; + mainProgram = "nextls"; + maintainers = [ maintainers.adamcstephens ]; + platforms = beamPackages.erlang.meta.platforms; + }; +} diff --git a/pkgs/development/tools/repository-managers/nexus/nexus-bin.patch b/pkgs/by-name/ne/nexus/nexus-bin.patch similarity index 100% rename from pkgs/development/tools/repository-managers/nexus/nexus-bin.patch rename to pkgs/by-name/ne/nexus/nexus-bin.patch diff --git a/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch b/pkgs/by-name/ne/nexus/nexus-vm-opts.patch similarity index 100% rename from pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch rename to pkgs/by-name/ne/nexus/nexus-vm-opts.patch diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/by-name/ne/nexus/package.nix similarity index 55% rename from pkgs/development/tools/repository-managers/nexus/default.nix rename to pkgs/by-name/ne/nexus/package.nix index 5f8a751aa0c7..00e4e7325e04 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/by-name/ne/nexus/package.nix @@ -1,12 +1,19 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre_headless, gawk }: +{ + lib, + stdenv, + fetchurl, + makeWrapper, + jre_headless, + gawk, +}: stdenv.mkDerivation rec { pname = "nexus"; - version = "3.68.1-02"; + version = "3.69.0-02"; src = fetchurl { url = "https://download.sonatype.com/nexus/3/nexus-${version}-unix.tar.gz"; - hash = "sha256-VHS4KDFgU3djteDzDAe43TZIwRG/8bb7u3usoOCJS5M="; + hash = "sha256-7sgLPuM93mFEPlTd3qJY+FGVHErvgcTGJWwSBcqBgWI="; }; preferLocalBuild = true; @@ -15,13 +22,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - patches = [ ./nexus-bin.patch ./nexus-vm-opts.patch ]; + patches = [ + ./nexus-bin.patch + ./nexus-vm-opts.patch + ]; postPatch = '' substituteInPlace bin/nexus.vmoptions \ - --replace ../sonatype-work /var/lib/sonatype-work \ - --replace etc/karaf $out/etc/karaf \ - --replace =. =$out + --replace-fail ../sonatype-work /var/lib/sonatype-work \ + --replace-fail etc/karaf $out/etc/karaf \ + --replace-fail =. =$out ''; installPhase = '' @@ -39,12 +49,17 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Repository manager for binary software components"; homepage = "https://www.sonatype.com/products/sonatype-nexus-oss"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.epl10; - platforms = platforms.all; - maintainers = with maintainers; [ aespinosa ironpinguin zaninime ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.epl10; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ + aespinosa + ironpinguin + luftmensch-luftmensch + zaninime + ]; }; } diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index f96b06f2e927..0c50dc4ecef2 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "nezha-agent"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; rev = "refs/tags/v${version}"; - hash = "sha256-PUBomSo11URCCJB/qFeSHSS3pw/vvcgDBo9Kc0lJQLE="; + hash = "sha256-dnmoGf9z7R14Fen7maQyk/H600Hgkx7esGWvjddLDMc="; }; - vendorHash = "sha256-wVZWP8yvazxs8sG47MTOlWzKwjsZO/b7PN987fwWEaY="; + vendorHash = "sha256-SLF5Oq++VzKzy6mfqJuRlAJMBXyb1EHWN+qoyCw9kv4="; ldflags = [ "-s" diff --git a/pkgs/by-name/ng/nginx-language-server/package.nix b/pkgs/by-name/ng/nginx-language-server/package.nix index 891d6e4d5cb6..39a5a55f5abd 100644 --- a/pkgs/by-name/ng/nginx-language-server/package.nix +++ b/pkgs/by-name/ng/nginx-language-server/package.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index 14c22003e64c..e11a8fc3f957 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -10,7 +10,7 @@ , nix-output-monitor }: let - version = "3.5.17"; + version = "3.5.18"; runtimeDeps = [ nvd nix-output-monitor ]; in rustPlatform.buildRustPackage { @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "viperML"; repo = "nh"; rev = "refs/tags/v${version}"; - hash = "sha256-o4K6QHBjXrmcYkX9MIw9gZ+DHM3OaEVswswHRX9h8Is="; + hash = "sha256-G5iteuo2gobI0Y5jHNEBc6UN9ixjwj6zopPKi7bJBE4="; }; strictDeps = true; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; - cargoHash = "sha256-6Y5vpXEuHZXe9HKk6KomujlibzwtZJbtn6YgOqbmInk="; + cargoHash = "sha256-jd8GOuI5E+l3u8klAKdwUdEP9N0Nao6MfTdHkSjym0M="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix index 84ff857e8168..2ee91f9753b5 100644 --- a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix +++ b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix @@ -1,35 +1,51 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, gnome-themes-extra -, gtk-engine-murrine +{ + lib, + stdenvNoCC, + fetchFromGitHub, + gnome, + sassc, + gnome-themes-extra, + gtk-engine-murrine, + colorVariants ? [] # default: install all icons }: -stdenvNoCC.mkDerivation { +let pname = "nightfox-gtk-theme"; - version = "unstable-2023-05-28"; + colorVariantList = [ + "dark" + "light" + ]; + +in +lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants + +stdenvNoCC.mkDerivation { + inherit pname; + version = "0-unstable-2024-06-27"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Nightfox-GTK-Theme"; - rev = "a8b01a28f2d1d9dd57d98d3708602b0d72340338"; - hash = "sha256-GrlKYCqO9vgRbPdPhugPBg2rYtDxzbQwRPtTBIyIyx4="; + rev = "ef4e6e1fa3efe2a5d838d61191776abfe4d87766"; + hash = "sha256-RsDEHauz9jQs1rqsoKbL/s0Vst3GzJXyGsE3uFtLjCY="; }; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - buildInputs = [ - gnome-themes-extra - ]; + nativeBuildInputs = [ gnome.gnome-shell sassc ]; + buildInputs = [ gnome-themes-extra ]; dontBuild = true; + postPatch = '' + patchShebangs themes/install.sh + ''; + installPhase = '' runHook preInstall mkdir -p $out/share/themes - cp -a themes/* $out/share/themes + cd themes + ./install.sh -n Nightfox -c ${lib.concatStringsSep " " (if colorVariants != [] then colorVariants else colorVariantList)} --tweaks macos -d "$out/share/themes" runHook postInstall ''; diff --git a/pkgs/by-name/ni/niri/Cargo.lock b/pkgs/by-name/ni/niri/Cargo.lock index f0fe7268f0b2..0c1286e542a4 100644 --- a/pkgs/by-name/ni/niri/Cargo.lock +++ b/pkgs/by-name/ni/niri/Cargo.lock @@ -38,9 +38,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", "bitflags 2.5.0", @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] @@ -124,9 +124,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "appendlist" @@ -143,6 +143,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + [[package]] name = "arrayvec" version = "0.7.4" @@ -172,16 +181,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ "async-task", "concurrent-queue", @@ -224,17 +233,17 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 3.3.0", + "async-lock 3.4.0", "cfg-if", "concurrent-queue", "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.0", + "polling 3.7.2", "rustix 0.38.34", "slab", "tracing", @@ -252,12 +261,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] @@ -286,17 +295,17 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.3", + "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", @@ -321,7 +330,16 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", +] + +[[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", ] [[package]] @@ -360,7 +378,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -405,33 +423,22 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - [[package]] name = "block2" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "block-sys", "objc2", ] [[package]] name = "blocking" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", "futures-io", "futures-lite 2.3.0", @@ -446,22 +453,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -508,7 +515,7 @@ checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ "bitflags 2.5.0", "log", - "polling 3.7.0", + "polling 3.7.2", "rustix 0.38.34", "slab", "thiserror", @@ -516,18 +523,17 @@ dependencies = [ [[package]] name = "calloop" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +checksum = "c58a38167d6fba8c67cce63c4a91f2a73ca42cbdaf6fb9ba164f1e07b43ecc10" dependencies = [ "async-task", "bitflags 2.5.0", "futures-io", "log", - "polling 3.7.0", + "polling 3.7.2", "rustix 0.38.34", "slab", - "thiserror", ] [[package]] @@ -544,9 +550,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.97" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", @@ -586,9 +592,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "cgmath" @@ -596,7 +602,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317" dependencies = [ - "approx", + "approx 0.4.0", "num-traits", ] @@ -611,9 +617,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -651,7 +657,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -764,18 +770,18 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -901,6 +907,12 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dpi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + [[package]] name = "drm" version = "0.12.0" @@ -948,15 +960,15 @@ checksum = "2ab5fa33485cd85ac354df485819a63360fefa312fe04cffe65e6f175be1522c" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -964,13 +976,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -1008,43 +1020,22 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - [[package]] name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener 5.3.1", "pin-project-lite", ] @@ -1116,7 +1107,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -1218,7 +1209,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -1277,9 +1268,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.19.2" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" +checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1289,9 +1280,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f" +checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379" dependencies = [ "gio-sys", "glib-sys", @@ -1379,9 +1370,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" +checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe" dependencies = [ "futures-channel", "futures-core", @@ -1397,9 +1388,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" +checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" dependencies = [ "glib-sys", "gobject-sys", @@ -1425,7 +1416,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -1441,15 +1432,15 @@ dependencies = [ [[package]] name = "glam" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9" +checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" [[package]] name = "glib" -version = "0.19.6" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0116c428e4841cab183a32a71b900fd6712194c20f9c424f01d2c016c96bd23" +checksum = "b664491bc77ab55daa6714a592cdbe1a55e28abec09cb50e87689b90de456ff4" dependencies = [ "bitflags 2.5.0", "futures-channel", @@ -1469,22 +1460,22 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed782fa3e949c31146671da6e7a227a5e7d354660df1db6d0aac4974dc82a3c" +checksum = "1d405205a405182f95e637710850a8e82f25ba01fdd6baebc82dabeaf0883376" dependencies = [ "heck 0.5.0", "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] name = "glib-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" +checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" dependencies = [ "libc", "system-deps", @@ -1498,9 +1489,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" +checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" dependencies = [ "glib-sys", "libc", @@ -1509,9 +1500,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.19.2" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" +checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf" dependencies = [ "glib", "graphene-sys", @@ -1520,9 +1511,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d" +checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05" dependencies = [ "glib-sys", "libc", @@ -1591,7 +1582,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -1644,23 +1635,18 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2", - "dispatch", - "objc2", -] - [[package]] name = "idna" version = "0.5.0" @@ -1703,9 +1689,9 @@ checksum = "bd4f5b4d1c00331c5245163aacfe5f20be75b564c7112d45893d4ae038119eb0" [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -1716,7 +1702,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -1801,7 +1787,7 @@ dependencies = [ "libc", "proc-macro2", "regex", - "syn 2.0.63", + "syn 2.0.67", "terminal_size", ] @@ -1893,9 +1879,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -1921,7 +1907,7 @@ checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ "bitflags 2.5.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall", ] [[package]] @@ -2000,9 +1986,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" @@ -2062,9 +2048,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2122,7 +2108,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -2133,9 +2119,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -2143,9 +2129,9 @@ dependencies = [ [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ "bitflags 2.5.0", "jni-sys", @@ -2164,24 +2150,26 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.5.0+25.2.9519653" +version = "0.6.0+11769913" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" dependencies = [ "jni-sys", ] [[package]] name = "niri" -version = "0.1.6" +version = "0.1.7" dependencies = [ "anyhow", + "approx 0.5.1", "arrayvec", "async-channel", "async-io 1.13.0", + "atomic", "bitflags 2.5.0", "bytemuck", - "calloop 0.13.0", + "calloop 0.14.0", "clap", "directories", "drm-ffi", @@ -2197,6 +2185,7 @@ dependencies = [ "niri-config", "niri-ipc", "notify-rust", + "ordered-float", "pangocairo", "pipewire", "png", @@ -2220,13 +2209,14 @@ dependencies = [ [[package]] name = "niri-config" -version = "0.1.6" +version = "0.1.7" dependencies = [ "bitflags 2.5.0", "csscolorparser", "knuffel", "miette", "niri-ipc", + "pretty_assertions", "regex", "smithay", "tracing", @@ -2235,7 +2225,7 @@ dependencies = [ [[package]] name = "niri-ipc" -version = "0.1.6" +version = "0.1.7" dependencies = [ "clap", "serde", @@ -2244,7 +2234,7 @@ dependencies = [ [[package]] name = "niri-visual-tests" -version = "0.1.6" +version = "0.1.7" dependencies = [ "anyhow", "gtk4", @@ -2343,10 +2333,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -2371,25 +2361,206 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", "objc2-encode", ] [[package]] -name = "objc2-encode" -version = "3.0.0" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.5.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2", + "objc2", + "objc2-contacts", + "objc2-foundation", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.5.0", + "block2", + "dispatch", + "libc", + "objc2", +] + +[[package]] +name = "objc2-link-presentation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +dependencies = [ + "block2", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] [[package]] name = "objc_id" @@ -2421,6 +2592,15 @@ dependencies = [ "libredox 0.0.2", ] +[[package]] +name = "ordered-float" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" +dependencies = [ + "num-traits", +] + [[package]] name = "ordered-stream" version = "0.2.0" @@ -2439,9 +2619,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pango" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" +checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd" dependencies = [ "gio", "glib", @@ -2451,9 +2631,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" +checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0" dependencies = [ "glib-sys", "gobject-sys", @@ -2463,9 +2643,9 @@ dependencies = [ [[package]] name = "pangocairo" -version = "0.19.2" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6620c77967c62c7a84c6ca15ab855e8eecb248beb8ee43bc0eeaadd39123f687" +checksum = "e4c8b43c02ec1c4e16daf7fc50fbce6b8ead5705c18ae56274f703233cce1cd9" dependencies = [ "cairo-rs", "glib", @@ -2476,9 +2656,9 @@ dependencies = [ [[package]] name = "pangocairo-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d680caf5094d735c37312ce9166127a1d759d86a3d632b83d4a5354ee7568659" +checksum = "591904498438879785f5b7a2fdf7c38e9ec08c514b93c614b5c3b48cd11dd8d7" dependencies = [ "cairo-sys-rs", "glib-sys", @@ -2535,7 +2715,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -2547,6 +2727,26 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.67", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -2561,9 +2761,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -2653,13 +2853,13 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix 0.38.34", "tracing", @@ -2684,6 +2884,16 @@ 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 = "1.3.1" @@ -2729,9 +2939,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -2753,7 +2963,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -2770,7 +2980,7 @@ dependencies = [ "rand", "rand_chacha", "rand_xorshift", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", "rusty-fork", "tempfile", "unarray", @@ -2861,18 +3071,9 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b" - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "redox_syscall" @@ -2896,14 +3097,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -2917,13 +3118,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -2934,9 +3135,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rustc-hash" @@ -2976,7 +3177,7 @@ dependencies = [ "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -3039,22 +3240,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -3076,7 +3277,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -3153,11 +3354,11 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/Smithay/smithay.git#900b938970081cb525dc94ff083d76aa07c60e54" +source = "git+https://github.com/Smithay/smithay.git#234586dbea6bc084cb72a32f164997e47ea36b2b" dependencies = [ "appendlist", "bitflags 2.5.0", - "calloop 0.13.0", + "calloop 0.14.0", "cc", "cgmath", "cursor-icon", @@ -3187,10 +3388,12 @@ dependencies = [ "tracing", "udev", "wayland-backend", + "wayland-client", + "wayland-cursor", "wayland-egl", - "wayland-protocols", + "wayland-protocols 0.32.1", "wayland-protocols-misc", - "wayland-protocols-wlr", + "wayland-protocols-wlr 0.3.1", "wayland-server", "wayland-sys", "winit", @@ -3216,8 +3419,8 @@ dependencies = [ "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr 0.2.0", "wayland-scanner", "xkeysym", ] @@ -3225,7 +3428,7 @@ dependencies = [ [[package]] name = "smithay-drm-extras" version = "0.1.0" -source = "git+https://github.com/Smithay/smithay.git#900b938970081cb525dc94ff083d76aa07c60e54" +source = "git+https://github.com/Smithay/smithay.git#234586dbea6bc084cb72a32f164997e47ea36b2b" dependencies = [ "drm", "edid-rs", @@ -3275,9 +3478,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.63" +version = "2.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" +checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90" dependencies = [ "proc-macro2", "quote", @@ -3337,22 +3540,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -3401,14 +3604,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.13", + "toml_edit 0.22.14", ] [[package]] @@ -3444,15 +3647,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.8", + "winnow 0.6.13", ] [[package]] @@ -3474,7 +3677,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -3600,15 +3803,15 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -3617,9 +3820,9 @@ dependencies = [ [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "valuable" @@ -3691,7 +3894,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", "wasm-bindgen-shared", ] @@ -3725,7 +3928,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3738,9 +3941,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wayland-backend" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" dependencies = [ "cc", "downcast-rs", @@ -3752,9 +3955,9 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.2" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" dependencies = [ "bitflags 2.5.0", "rustix 0.38.34", @@ -3775,9 +3978,9 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.1" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" dependencies = [ "rustix 0.38.34", "wayland-client", @@ -3786,9 +3989,9 @@ dependencies = [ [[package]] name = "wayland-egl" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f652e5a24ae02d2ad536c8fc2d3dcc6c2bd635027cd6103a193e7d75eeda2" +checksum = "18cede1c33845ccd8fcebf7f107595170abf0ad0a28d47c50b444e06019b16e8" dependencies = [ "wayland-backend", "wayland-sys", @@ -3804,18 +4007,29 @@ dependencies = [ "wayland-backend", "wayland-client", "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-scanner", "wayland-server", ] [[package]] name = "wayland-protocols-misc" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e" +checksum = "e76311e1866c955afbbc46ae97e57542acda1dc9b0298358263a8550b5247331" dependencies = [ "bitflags 2.5.0", "wayland-backend", - "wayland-protocols", + "wayland-protocols 0.32.1", "wayland-scanner", "wayland-server", ] @@ -3829,7 +4043,7 @@ dependencies = [ "bitflags 2.5.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-scanner", ] @@ -3842,16 +4056,28 @@ dependencies = [ "bitflags 2.5.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-protocols 0.32.1", "wayland-scanner", "wayland-server", ] [[package]] name = "wayland-scanner" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565" dependencies = [ "proc-macro2", "quick-xml 0.31.0", @@ -3860,9 +4086,9 @@ dependencies = [ [[package]] name = "wayland-server" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e6e4d5c285bc24ba4ed2d5a4bd4febd5fd904451f465973225c8e99772fdb7" +checksum = "63e89118bd072ba6ce0f9c2c92fa41f72d1d78a138d2abc497a80a8264565559" dependencies = [ "bitflags 2.5.0", "downcast-rs", @@ -3874,9 +4100,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12" dependencies = [ "dlib", "libc", @@ -3898,9 +4124,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -3978,9 +4204,9 @@ dependencies = [ [[package]] name = "windows-result" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ "windows-targets 0.52.5", ] @@ -4192,46 +4418,50 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winit" -version = "0.29.15" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +checksum = "49f45a7b7e2de6af35448d7718dab6d95acec466eb3bb7a56f4d31d1af754004" dependencies = [ "ahash", "android-activity", "atomic-waker", "bitflags 2.5.0", + "block2", "bytemuck", "calloop 0.12.4", "cfg_aliases", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate", + "dpi", "js-sys", "libc", - "log", "memmap2 0.9.4", "ndk", - "ndk-sys", "objc2", - "once_cell", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", + "pin-project", "raw-window-handle", - "redox_syscall 0.3.5", + "redox_syscall", "rustix 0.38.34", "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-protocols-plasma", "web-sys", "web-time", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -4248,9 +4478,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -4295,12 +4525,12 @@ checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4329,9 +4559,9 @@ dependencies = [ [[package]] name = "xkeysym" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" @@ -4354,6 +4584,12 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852" +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + [[package]] name = "yansi-term" version = "0.1.2" @@ -4446,7 +4682,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 8799988a4bed..c1f23836461e 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, nix-update-script , pkg-config , libxkbcommon , pango @@ -19,19 +20,19 @@ rustPlatform.buildRustPackage rec { pname = "niri"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "YaLTeR"; repo = "niri"; rev = "v${version}"; - hash = "sha256-MJh0CR2YHJE0GNnxaTcElNMuZUEI0pe9fvC0mfy4484="; + hash = "sha256-EdlOGL9RdO77HnZxv2UpPwrJdFH8qPrPSRtkBBV167s="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "smithay-0.3.0" = "sha256-UzX5pws8yxJhXdKIDzu6uw+PlVLRS9U9ZAfQovKv0w0="; + "smithay-0.3.0" = "sha256-K1lguY6f1mbrfxkDNeLlNAXSM9JC8Jm61MyBIsIYiNs="; }; }; @@ -76,6 +77,8 @@ rustPlatform.buildRustPackage rec { install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/share/systemd/user ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Scrollable-tiling Wayland compositor"; homepage = "https://github.com/YaLTeR/niri"; diff --git a/pkgs/by-name/ni/nix-fast-build/package.nix b/pkgs/by-name/ni/nix-fast-build/package.nix new file mode 100644 index 000000000000..f610c1f3a9ac --- /dev/null +++ b/pkgs/by-name/ni/nix-fast-build/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + nix-eval-jobs, + nix-output-monitor, + nix-update-script, +}: + +python3Packages.buildPythonApplication rec { + pname = "nix-fast-build"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "nix-fast-build"; + rev = "refs/tags/${version}"; + hash = "sha256-8zW6eWvE9T03cMpo/hY8RRZIsSCfs1zmsJOkEZzuYwM="; + }; + + build-system = [ python3Packages.setuptools ]; + + makeWrapperArgs = [ + "--prefix PATH : ${ + lib.makeBinPath ( + [ + nix-eval-jobs + nix-eval-jobs.nix + ] + ++ lib.optional (lib.meta.availableOn stdenv.buildPlatform nix-output-monitor.compiler) nix-output-monitor + ) + }" + ]; + + # Don't run integration tests as they try to run nix + # to build stuff, which we cannot do inside the sandbox. + checkPhase = '' + PYTHONPATH= $out/bin/nix-fast-build --help + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Combine the power of nix-eval-jobs with nix-output-monitor to speed-up your evaluation and building process"; + homepage = "https://github.com/Mic92/nix-fast-build"; + changelog = "https://github.com/Mic92/nix-fast-build/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + getchoo + mic92 + ]; + mainProgram = "nix-fast-build"; + }; +} diff --git a/pkgs/by-name/ni/nix-top/package.nix b/pkgs/by-name/ni/nix-top/package.nix new file mode 100644 index 000000000000..55170ec40896 --- /dev/null +++ b/pkgs/by-name/ni/nix-top/package.nix @@ -0,0 +1,62 @@ +{ + binutils-unwrapped, # strings + coreutils, + getent, # /etc/passwd + fetchFromGitHub, + findutils, + lib, + makeWrapper, + ncurses, # tput + ruby, + stdenv, +}: + +# No gems used, so mkDerivation is fine. +let + additionalPath = lib.makeBinPath [ + getent + ncurses + binutils-unwrapped + coreutils + findutils + ]; +in +stdenv.mkDerivation rec { + pname = "nix-top"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "jerith666"; + repo = "nix-top"; + rev = "v${version}"; + hash = "sha256-w/TKzbZmMt4CX2KnLwPvR1ydp5NNlp9nNx78jJvhp54="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ ruby ]; + + installPhase = + '' + runHook preInstall + mkdir -p $out/libexec/nix-top + install -D -m755 ./nix-top $out/bin/nix-top + wrapProgram $out/bin/nix-top \ + --prefix PATH : "$out/libexec/nix-top:${additionalPath}" + '' + + lib.optionalString stdenv.isDarwin '' + ln -s /bin/stty $out/libexec/nix-top + '' + + '' + runHook postInstall + ''; + + meta = { + description = "Tracks what nix is building"; + homepage = "https://github.com/jerith666/nix-top"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jerith666 ]; + platforms = lib.platforms.unix; + mainProgram = "nix-top"; + }; +} diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt index c494f5c70a47..c934f09efc35 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt +++ b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt @@ -1 +1 @@ -2024-05-28 +2024-07-03 diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix index 44ae05865fdd..70179792da8c 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix +++ b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix @@ -8,8 +8,8 @@ mkDerivation { pname = "nixfmt"; version = "0.6.0"; src = fetchzip { - url = "https://github.com/nixos/nixfmt/archive/c67a7b65906bd2432730929bd0e4957659c95b8e.tar.gz"; - sha256 = "03f00vwlla6i3m125389h3xjsl5xm07630ahm4w5gqwq1007y3r2"; + url = "https://github.com/nixos/nixfmt/archive/698954723ecec3f91770460ecae762ce590f2d9e.tar.gz"; + sha256 = "1k057nxj58ghid15gd4xi19whaavqgspypk69r0qshb5bhl74nm5"; }; isLibrary = true; isExecutable = true; @@ -22,7 +22,7 @@ mkDerivation { ]; jailbreak = true; homepage = "https://github.com/NixOS/nixfmt"; - description = "Opinionated formatter for Nix"; + description = "The official formatter for Nix code"; license = lib.licenses.mpl20; mainProgram = "nixfmt"; } diff --git a/pkgs/by-name/nn/nn/package.nix b/pkgs/by-name/nn/nn/package.nix new file mode 100644 index 000000000000..6613dc365e0d --- /dev/null +++ b/pkgs/by-name/nn/nn/package.nix @@ -0,0 +1,29 @@ +{ + stdenv, + lib, + fetchFromGitHub, + unstableGitUpdater, +}: +stdenv.mkDerivation (finalAttrs: { + name = "nn"; + version = "2.0.8-unstable-2024-04-08"; + + src = fetchFromGitHub { + owner = "sakov"; + repo = "nn-c"; + rev = "f8e880b6ae39ff4bb4d617f61db5f92311bd04b6"; + hash = "sha256-SzkLxR5ZkIlCoMlN18+uc1/xYWhHhXMdd2PpA1jvnFI="; + }; + + sourceRoot = "${finalAttrs.src.name}/nn"; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "C code for Natural Neighbours interpolation of 2D scattered data"; + homepage = "https://github.com/sakov/nn-c/"; + platforms = platforms.unix; + license = licenses.bsd3; + maintainers = with maintainers; [ mkez ]; + }; +}) diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix index a7c349a7a356..e862247b0df5 100644 --- a/pkgs/by-name/no/normcap/package.nix +++ b/pkgs/by-name/no/normcap/package.nix @@ -52,7 +52,6 @@ ps.buildPythonApplication rec { ]; nativeBuildInputs = [ - ps.pythonRelaxDepsHook ps.hatchling ps.babel ]; @@ -76,7 +75,7 @@ ps.buildPythonApplication rec { ps.toml ] ++ lib.optionals stdenv.isLinux [ ps.pytest-xvfb - xorg.xorgserver + xorg.xvfb ]; preCheck = '' diff --git a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix index 37f56db62df1..c365f2db1904 100644 --- a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix +++ b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix @@ -50,6 +50,8 @@ stdenvNoCC.mkDerivation rec { sed -i 's;\t@;\t;' Makefile ''; + buildFlags = [ "BYPASS_SEQUENCE_CHECK=True" ]; + enableParallelBuilding = true; installPhase = '' diff --git a/pkgs/by-name/no/nova-password/package.nix b/pkgs/by-name/no/nova-password/package.nix new file mode 100644 index 000000000000..a396e0c80dbb --- /dev/null +++ b/pkgs/by-name/no/nova-password/package.nix @@ -0,0 +1,28 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "nova-password"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "sapcc"; + repo = "nova-password"; + rev = "refs/tags/v${version}"; + hash = "sha256-pBew5c+wlXwMLDjgwwdOSUyTxPGpa9AwbhZni8FfTsQ="; + }; + + # The repo contains vendored dependencies + vendorHash = null; + + meta = { + description = "Decrypt the admin password generated for the VM in OpenStack"; + homepage = "https://github.com/sapcc/nova-password"; + license = lib.licenses.asl20; + mainProgram = "nova-password"; + maintainers = with lib.maintainers; [ vinetos ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/nu/nulloy/package.nix b/pkgs/by-name/nu/nulloy/package.nix index fbc8d093635f..8e82b6ae0638 100644 --- a/pkgs/by-name/nu/nulloy/package.nix +++ b/pkgs/by-name/nu/nulloy/package.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Music player with a waveform progress bar"; homepage = "https://nulloy.com"; + changelog = "https://github.com/nulloy/nulloy/blob/${src.rev}/ChangeLog"; license = licenses.gpl3Only; mainProgram = "nulloy"; maintainers = with maintainers; [ aleksana ]; diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index 000d86b4baf4..aee0747973c0 100644 --- a/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -12,13 +12,13 @@ let pname = "nwg-drawer"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-drawer"; rev = "v${version}"; - hash = "sha256-ZfWl9DfU8h300WbvFNOCs7QGp11NB49ShPRxY5hpNFE="; + hash = "sha256-KhgALKJNS7Y+u5pAfpvTup0W1+Vi6r1uaVFQZRiv4Dk="; }; vendorHash = "sha256-J7r3YyfV5lRZbjKo7ZNHQrOqR1GNbUB7GxRMlXuuw/c="; @@ -56,6 +56,7 @@ buildGoModule { meta = with lib; { description = "Application drawer for sway Wayland compositor"; homepage = "https://github.com/nwg-piotr/nwg-drawer"; + changelog = "https://github.com/nwg-piotr/nwg-drawer/releases/tag/${src.rev}"; license = with lib.licenses; [ mit ]; mainProgram = "nwg-drawer"; maintainers = with lib.maintainers; [ AndersonTorres ]; diff --git a/pkgs/by-name/nw/nwg-hello/package.nix b/pkgs/by-name/nw/nwg-hello/package.nix index 004979ced17b..ba333024e414 100644 --- a/pkgs/by-name/nw/nwg-hello/package.nix +++ b/pkgs/by-name/nw/nwg-hello/package.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-hello"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-hello"; rev = "refs/tags/v${version}"; - hash = "sha256-WKDj68hQDPNsqyDG9kB1SklRIl/BSfVl7ebjVKA+33c="; + hash = "sha256-czvKUuSAGEqtjIcIW9mm/LlUsvkGknHbwuXJw5YGT5A="; }; nativeBuildInputs = [ @@ -58,6 +58,7 @@ python3Packages.buildPythonApplication rec { meta = { homepage = "https://github.com/nwg-piotr/nwg-hello"; + changelog = "https://github.com/nwg-piotr/nwg-hello/releases/tag/v${version}"; description = "GTK3-based greeter for the greetd daemon, written in python"; license = lib.licenses.mit; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix index e37539b12cea..7e40dcd4581c 100644 --- a/pkgs/by-name/nw/nwg-panel/package.nix +++ b/pkgs/by-name/nw/nwg-panel/package.nix @@ -55,6 +55,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/nwg-piotr/nwg-panel"; + changelog = "https://github.com/nwg-piotr/nwg-panel/releases/tag/v${version}"; description = "GTK3-based panel for Sway window manager"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/by-name/nw/nwipe/package.nix similarity index 59% rename from pkgs/tools/security/nwipe/default.nix rename to pkgs/by-name/nw/nwipe/package.nix index 00c66f351930..33264c49e763 100644 --- a/pkgs/tools/security/nwipe/default.nix +++ b/pkgs/by-name/nw/nwipe/package.nix @@ -1,43 +1,53 @@ { lib , stdenv , autoreconfHook +, makeWrapper , fetchFromGitHub , ncurses , parted , pkg-config +, libconfig +, hdparm +, smartmontools +, dmidecode }: stdenv.mkDerivation rec { pname = "nwipe"; - version = "0.34"; + version = "0.37"; src = fetchFromGitHub { owner = "martijnvanbrummelen"; repo = "nwipe"; rev = "v${version}"; - sha256 = "sha256-7WI8AwWkg9rOjAbOyDgCVOpeMxvJ5Bd1yvzfSv6TPLs="; + sha256 = "sha256-0mBiWKkMV8i9n158k843caulF90k43ctpMvKhc4HZxY"; }; nativeBuildInputs = [ autoreconfHook + makeWrapper pkg-config ]; buildInputs = [ ncurses parted + libconfig ]; - preConfigure = '' - sh init.sh || : + postInstall = '' + wrapProgram $out/bin/nwipe \ + --prefix PATH : ${lib.makeBinPath [ hdparm smartmontools dmidecode ]} ''; + enableParallelBuilding = true; + meta = with lib; { description = "Securely erase disks"; mainProgram = "nwipe"; homepage = "https://github.com/martijnvanbrummelen/nwipe"; license = licenses.gpl2Only; - maintainers = with maintainers; [ woffs ]; + maintainers = with maintainers; [ vifino woffs ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/nx/nxengine-evo/package.nix b/pkgs/by-name/nx/nxengine-evo/package.nix index 79589e2f3281..10acb961d441 100644 --- a/pkgs/by-name/nx/nxengine-evo/package.nix +++ b/pkgs/by-name/nx/nxengine-evo/package.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/nxengine/nxengine-evo"; + changelog = "https://github.com/nxengine/nxengine-evo/releases/tag/${finalAttrs.src.rev}"; description = "Complete open-source clone/rewrite of the masterpiece jump-and-run platformer Doukutsu Monogatari (also known as Cave Story)"; license = with lib.licenses; [ gpl3Plus diff --git a/pkgs/by-name/ob/oboete/Cargo.lock b/pkgs/by-name/ob/oboete/Cargo.lock new file mode 100644 index 000000000000..f64e35c3701c --- /dev/null +++ b/pkgs/by-name/ob/oboete/Cargo.lock @@ -0,0 +1,6710 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c3a1cbc201cc13ed06cf875efb781f2249b3677f5c74571b67d817877f9d697" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accesskit" +version = "0.12.2" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" + +[[package]] +name = "accesskit_consumer" +version = "0.17.0" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_macos" +version = "0.11.0" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", + "accesskit_consumer", + "icrate 0.1.2", + "objc2 0.5.2", + "once_cell", +] + +[[package]] +name = "accesskit_unix" +version = "0.7.1" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", + "accesskit_consumer", + "async-channel", + "async-executor", + "async-task", + "atspi", + "futures-lite 1.13.0", + "futures-util", + "once_cell", + "serde", + "zbus 3.15.2", +] + +[[package]] +name = "accesskit_windows" +version = "0.16.0" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", + "accesskit_consumer", + "once_cell", + "paste", + "static_assertions", + "windows 0.48.0", +] + +[[package]] +name = "accesskit_winit" +version = "0.18.1" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", + "accesskit_macos", + "accesskit_unix", + "accesskit_windows", + "raw-window-handle", + "winit", +] + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[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 = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +dependencies = [ + "android-properties", + "bitflags 2.6.0", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[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 = "apply" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +dependencies = [ + "async-fs 2.1.2", + "async-net", + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "zbus 4.3.1", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.0", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-net" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io 2.3.3", + "blocking", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-process" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +dependencies = [ + "async-channel", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.1", + "futures-lite 2.3.0", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "async-signal" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +dependencies = [ + "async-io 2.3.3", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" +dependencies = [ + "rustix 0.38.34", + "tempfile", + "windows-sys 0.48.0", +] + +[[package]] +name = "atspi" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6059f350ab6f593ea00727b334265c4dfc7fd442ee32d264794bd9bdc68e87ca" +dependencies = [ + "atspi-common", + "atspi-connection", + "atspi-proxies", +] + +[[package]] +name = "atspi-common" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92af95f966d2431f962bc632c2e68eda7777330158bf640c4af4249349b2cdf5" +dependencies = [ + "enumflags2", + "serde", + "static_assertions", + "zbus 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "atspi-connection" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" +dependencies = [ + "atspi-common", + "atspi-proxies", + "futures-lite 1.13.0", + "zbus 3.15.2", +] + +[[package]] +name = "atspi-proxies" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" +dependencies = [ + "atspi-common", + "serde", + "zbus 3.15.2", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +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 = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[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" +dependencies = [ + "serde", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[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-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys", + "objc2 0.4.1", +] + +[[package]] +name = "block2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" +dependencies = [ + "block-sys", + "objc2 0.5.2", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "by_address" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" + +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.6.0", + "log", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "thiserror", +] + +[[package]] +name = "calloop" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +dependencies = [ + "bitflags 2.6.0", + "log", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop 0.12.4", + "rustix 0.38.34", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" +dependencies = [ + "calloop 0.13.0", + "rustix 0.38.34", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "cc" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +dependencies = [ + "jobserver", + "libc", + "once_cell", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[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 = "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.5", +] + +[[package]] +name = "clipboard-win" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +dependencies = [ + "error-code", +] + +[[package]] +name = "clipboard_macos" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "objc", + "objc-foundation", + "objc_id", +] + +[[package]] +name = "clipboard_wayland" +version = "0.2.2" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "dnd", + "mime", + "smithay-clipboard", +] + +[[package]] +name = "clipboard_x11" +version = "0.4.2" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "thiserror", + "x11rb", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "com" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +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 = "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 = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "atomicwrites", + "cosmic-config-derive", + "cosmic-settings-daemon", + "dirs", + "futures-util", + "iced_futures", + "known-folders", + "notify", + "once_cell", + "ron", + "serde", + "tokio", + "tracing", + "xdg", + "zbus 4.3.1", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-settings-daemon" +version = "0.1.0" +source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a" +dependencies = [ + "zbus 4.3.1", +] + +[[package]] +name = "cosmic-text" +version = "0.12.0" +source = "git+https://github.com/pop-os/cosmic-text.git#a03ec6b75f0ea8fd6264d6cd05afcec3c2213f8f" +dependencies = [ + "bitflags 2.6.0", + "fontdb", + "log", + "rangemap", + "rayon", + "rustc-hash", + "rustybuzz 0.14.1", + "self_cell 1.0.4", + "swash", + "sys-locale", + "ttf-parser 0.21.1", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "dirs", + "lazy_static", + "palette", + "ron", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[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 = "css-color" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42aaeae719fd78ce501d77c6cdf01f7e96f26bcd5617a4903a1c2b97e388543a" + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "ctor-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b" + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "d3d12" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "bitflags 2.6.0", + "libloading 0.8.4", + "winapi", +] + +[[package]] +name = "darling" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.68", +] + +[[package]] +name = "darling_macro" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core 0.9.10", +] + +[[package]] +name = "data-url" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +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 = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[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.68", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.4", +] + +[[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 = "dnd" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "bitflags 2.6.0", + "mime", + "raw-window-handle", + "smithay-client-toolkit 0.19.1", + "smithay-clipboard", +] + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "drm" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "rustix 0.38.34", +] + +[[package]] +name = "drm-ffi" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" +dependencies = [ + "drm-sys", + "rustix 0.38.34", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" +dependencies = [ + "libc", + "linux-raw-sys 0.6.4", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +dependencies = [ + "serde", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-code" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + +[[package]] +name = "etagere" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e2f1e3be19fb10f549be8c1bf013e8675b4066c445e36eb76d2ebb2f54ee495" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[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 = "euclid" +version = "0.22.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" +dependencies = [ + "num-traits", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" + +[[package]] +name = "float_next_after" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" + +[[package]] +name = "fluent" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell 0.10.3", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" +dependencies = [ + "thiserror", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "font-types" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "fontconfig-parser" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.9.4", + "slotmap", + "tinyvec", + "ttf-parser 0.20.0", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[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 = "fraction" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a78dd758a47a7305478e0e054f9fde4e983b9f9eccda162bf7ca03b79e9d40" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "freedesktop-icons" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8ef34245e0540c9a3ce7a28340b98d2c12b75da0d446da4e8224923fcaa0c16" +dependencies = [ + "dirs", + "once_cell", + "rust-ini", + "thiserror", + "xdg", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[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", + "num_cpus", +] + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot 0.12.3", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[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.68", +] + +[[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-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 = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "glyphon" +version = "0.5.0" +source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.6.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "gpu-allocator" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +dependencies = [ + "log", + "presser", + "thiserror", + "winapi", + "windows 0.52.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.6.0", + "gpu-descriptor-types", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "grid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[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", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "hassle-rs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" +dependencies = [ + "bitflags 2.6.0", + "com", + "libc", + "libloading 0.8.4", + "thiserror", + "widestring", + "winapi", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[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 = "i18n-config" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" +dependencies = [ + "log", + "serde", + "serde_derive", + "thiserror", + "toml 0.8.14", + "unic-langid", +] + +[[package]] +name = "i18n-embed" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot 0.12.3", + "rust-embed", + "thiserror", + "unic-langid", + "walkdir", +] + +[[package]] +name = "i18n-embed-fl" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8241a781f49e923415e106fcd1f89c3fab92cc9f699a521c56e95dee273903d3" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 2.0.68", + "unic-langid", +] + +[[package]] +name = "i18n-embed-impl" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" +dependencies = [ + "find-crate", + "i18n-config", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[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 = "iced" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "dnd", + "iced_accessibility", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_widget", + "iced_winit", + "image", + "mime", + "thiserror", + "window_clipboard", +] + +[[package]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "accesskit", + "accesskit_winit", +] + +[[package]] +name = "iced_core" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "bitflags 2.6.0", + "dnd", + "log", + "mime", + "num-traits", + "palette", + "raw-window-handle", + "serde", + "smol_str", + "thiserror", + "web-time", + "window_clipboard", + "xxhash-rust", +] + +[[package]] +name = "iced_futures" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "futures", + "iced_core", + "log", + "tokio", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "cosmic-text", + "glam", + "half", + "iced_core", + "iced_futures", + "image", + "kamadak-exif", + "log", + "lyon_path", + "once_cell", + "raw-window-handle", + "rustc-hash", + "thiserror", + "unicode-segmentation", + "xxhash-rust", +] + +[[package]] +name = "iced_renderer" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "dnd", + "iced_core", + "iced_futures", + "thiserror", + "window_clipboard", +] + +[[package]] +name = "iced_style" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo", + "log", + "resvg", + "rustc-hash", + "softbuffer", + "tiny-skia", + "xxhash-rust", +] + +[[package]] +name = "iced_wgpu" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "once_cell", + "raw-window-handle", + "resvg", + "rustix 0.38.34", + "smithay-client-toolkit 0.19.1", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.32.1", + "wayland-sys", + "wgpu", +] + +[[package]] +name = "iced_widget" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "dnd", + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "thiserror", + "unicode-segmentation", + "window_clipboard", +] + +[[package]] +name = "iced_winit" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "dnd", + "iced_graphics", + "iced_runtime", + "iced_style", + "log", + "thiserror", + "tracing", + "web-sys", + "winapi", + "window_clipboard", + "winit", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2 0.3.0", + "dispatch", + "objc2 0.4.1", +] + +[[package]] +name = "icrate" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" +dependencies = [ + "block2 0.4.0", + "objc2 0.5.2", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[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 = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif 0.13.1", + "jpeg-decoder", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +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 = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", +] + +[[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-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kamadak-exif" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.4", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "known-folders" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8" +dependencies = [ + "windows-sys 0.52.0", +] + +[[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 = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic.git#41d1f4a7cdafd0bf15d7a8213697932a2dc6e8ba" +dependencies = [ + "apply", + "ashpd", + "chrono", + "cosmic-config", + "cosmic-settings-daemon", + "cosmic-theme", + "css-color", + "derive_setters", + "fraction", + "freedesktop-icons", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_style", + "iced_tiny_skia", + "iced_wgpu", + "iced_widget", + "iced_winit", + "lazy_static", + "palette", + "rfd", + "serde", + "slotmap", + "taffy", + "thiserror", + "tokio", + "tracing", + "unicode-segmentation", + "url", + "zbus 4.3.1", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +dependencies = [ + "cfg-if", + "windows-targets 0.52.5", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.4.1", +] + +[[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", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "linux-raw-sys" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lru" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "lyon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" +dependencies = [ + "lyon_algorithms", + "lyon_tessellation", +] + +[[package]] +name = "lyon_algorithms" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_geom" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c08a606c7a59638d6c6aa18ac91a06aa9fb5f765a7efb27e6a4da58700740d7" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579d42360a4b09846eff2feef28f538696c7d6c7439bfa65874ff3cbe0951b2c" +dependencies = [ + "float_next_after", + "lyon_path", + "num-traits", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", +] + +[[package]] +name = "mime" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "smithay-clipboard", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[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 = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.6.0", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.6.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[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", + "memoffset 0.9.1", +] + +[[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 = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.6.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[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" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode 3.0.0", +] + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode 4.0.3", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +dependencies = [ + "memchr", +] + +[[package]] +name = "oboete" +version = "0.1.4" +dependencies = [ + "ashpd", + "dirs", + "futures", + "i18n-embed", + "i18n-embed-fl", + "libcosmic", + "log", + "once_cell", + "open", + "paste", + "percent-encoding", + "rand", + "rust-embed", + "serde", + "serde_json", + "sqlx", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "open" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d2c909a3fce3bd80efef4cd1c6c056bd9376a8fe06fcfdbebaf32cb485a7e37" +dependencies = [ + "is-wsl", + "libc", + "pathdiff", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox 0.0.2", +] + +[[package]] +name = "ordered-multimap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" +dependencies = [ + "dlv-list", + "hashbrown", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" +dependencies = [ + "ttf-parser 0.21.1", +] + +[[package]] +name = "palette" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" +dependencies = [ + "by_address", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[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 0.9.10", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.2", + "smallvec", + "windows-targets 0.52.5", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "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_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +dependencies = [ + "atomic-waker", + "fastrand 2.1.0", + "futures-io", +] + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[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-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +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 = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[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 = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "read-fonts" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" +dependencies = [ + "bytemuck", + "font-types", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +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 0.1.3", + "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", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "renderdoc-sys" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" + +[[package]] +name = "resvg" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" +dependencies = [ + "gif 0.12.0", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rfd" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" +dependencies = [ + "ashpd", + "block", + "dispatch", + "js-sys", + "log", + "objc", + "objc-foundation", + "objc_id", + "pollster", + "raw-window-handle", + "urlencoding", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rgb" +version = "0.8.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741" +dependencies = [ + "bytemuck", +] + +[[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 = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.6.0", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" + +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rust-embed" +version = "8.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 2.0.68", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust-ini" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "ring", + "rustls-webpki", + "sct", +] + +[[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-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustybuzz" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "smallvec", + "ttf-parser 0.20.0", + "unicode-bidi-mirroring 0.1.0", + "unicode-ccc 0.1.2", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.21.1", + "unicode-bidi-mirroring 0.2.0", + "unicode-ccc 0.2.0", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[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 = "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 = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sctk-adwaita" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +dependencies = [ + "ab_glyph", + "log", + "memmap2 0.9.4", + "smithay-client-toolkit 0.18.1", + "tiny-skia", +] + +[[package]] +name = "self_cell" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" +dependencies = [ + "self_cell 1.0.4", +] + +[[package]] +name = "self_cell" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" + +[[package]] +name = "serde" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[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_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "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-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "skrifa" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +dependencies = [ + "bytemuck", + "read-fonts", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +dependencies = [ + "bitflags 2.6.0", + "calloop 0.12.4", + "calloop-wayland-source 0.2.0", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "rustix 0.38.34", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr 0.2.0", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "837d3067369e24aeda699a5d9fc5aa14ca14a84dd70aeed7156bfa04a5605b32" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "calloop 0.13.0", + "calloop-wayland-source 0.3.0", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "pkg-config", + "rustix 0.38.34", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.32.1", + "wayland-protocols-wlr 0.3.1", + "wayland-scanner", + "xkbcommon", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.8.0" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#d099e82a4c1e7d3e88dc34b7333de21928b1b22c" +dependencies = [ + "libc", + "raw-window-handle", + "smithay-client-toolkit 0.19.1", + "wayland-backend", +] + +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "softbuffer" +version = "0.4.1" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#6e75b1ad7e98397d37cb187886d05969bc480995" +dependencies = [ + "as-raw-xcb-connection", + "bytemuck", + "cfg_aliases 0.2.1", + "cocoa", + "core-graphics", + "drm", + "fastrand 2.1.0", + "foreign-types", + "js-sys", + "log", + "memmap2 0.9.4", + "objc", + "raw-window-handle", + "redox_syscall 0.4.1", + "rustix 0.38.34", + "tiny-xlib", + "wasm-bindgen", + "wayland-backend", + "wayland-client", + "wayland-sys", + "web-sys", + "windows-sys 0.52.0", + "x11rb", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sqlformat" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" +dependencies = [ + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +dependencies = [ + "ahash", + "atoi", + "byteorder", + "bytes", + "crc", + "crossbeam-queue", + "either", + "event-listener 2.5.3", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "webpki-roots", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +dependencies = [ + "dotenvy", + "either", + "heck", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +dependencies = [ + "atoi", + "base64", + "bitflags 2.6.0", + "byteorder", + "bytes", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +dependencies = [ + "atoi", + "base64", + "bitflags 2.6.0", + "byteorder", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +dependencies = [ + "atoi", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", + "urlencoding", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] + +[[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 = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "svg_fmt" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" + +[[package]] +name = "svgtypes" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +dependencies = [ + "kurbo", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" +dependencies = [ + "skrifa", + "yazi", + "zeno", +] + +[[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.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy?rev=7781c70#7781c70241f7f572130c13106f2a869a9cf80885" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[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 = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tiny-skia" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-xlib" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" +dependencies = [ + "as-raw-xcb-connection", + "ctor-lite", + "libloading 0.8.4", + "pkg-config", + "tracing", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tinyvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +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 0.12.3", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.7", + "tokio-macros", + "tracing", + "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.68", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.14", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[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 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.13", +] + +[[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.68", +] + +[[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-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-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "nu-ansi-term", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "ttf-parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] +name = "ttf-parser" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" + +[[package]] +name = "type-map" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" +dependencies = [ + "rustc-hash", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + +[[package]] +name = "unic-langid" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" +dependencies = [ + "serde", + "tinystr", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-ccc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + +[[package]] +name = "unicode-script" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "usvg" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" +dependencies = [ + "base64", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" +dependencies = [ + "fontdb", + "kurbo", + "log", + "rustybuzz 0.12.1", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3" +dependencies = [ + "rctree", + "strict-num", + "svgtypes", + "tiny-skia-path", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[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 = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" +dependencies = [ + "cc", + "downcast-rs", + "rustix 0.38.34", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" +dependencies = [ + "bitflags 2.6.0", + "rustix 0.38.34", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.6.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" +dependencies = [ + "rustix 0.38.34", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.32.1", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + +[[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 = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +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 = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "wgpu" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "arrayvec", + "cfg-if", + "cfg_aliases 0.1.1", + "js-sys", + "log", + "naga", + "parking_lot 0.12.3", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "codespan-reporting", + "indexmap", + "log", + "naga", + "once_cell", + "parking_lot 0.12.3", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.6.0", + "block", + "cfg_aliases 0.1.1", + "core-graphics-types", + "d3d12", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.4", + "log", + "metal", + "naga", + "objc", + "once_cell", + "parking_lot 0.12.3", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "bitflags 2.6.0", + "js-sys", + "web-sys", +] + +[[package]] +name = "whoami" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall 0.4.1", + "wasite", +] + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + +[[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 = "window_clipboard" +version = "0.4.1" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "clipboard-win", + "clipboard_macos", + "clipboard_wayland", + "clipboard_x11", + "dnd", + "mime", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + +[[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.5", +] + +[[package]] +name = "windows-implement" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-interface" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[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.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winit" +version = "0.29.10" +source = "git+https://github.com/pop-os/winit.git?branch=winit-0.29#bdc66109acc85c912264c9e4b864520345bdb45f" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.6.0", + "bytemuck", + "calloop 0.12.4", + "cfg_aliases 0.1.1", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate 0.0.4", + "js-sys", + "libc", + "log", + "memmap2 0.9.4", + "ndk", + "ndk-sys", + "objc2 0.4.1", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle", + "redox_syscall 0.3.5", + "rustix 0.38.34", + "sctk-adwaita", + "smithay-client-toolkit 0.18.1", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading 0.8.4", + "once_cell", + "rustix 0.38.34", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xdg-home" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.6.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "xxhash-rust" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast 0.5.1", + "async-executor", + "async-fs 1.6.0", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process 1.8.1", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" +dependencies = [ + "async-broadcast 0.7.1", + "async-executor", + "async-fs 2.1.2", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-process 2.2.3", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.1", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.29.0", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros 4.3.1", + "zbus_names 3.0.0", + "zvariant 4.1.2", +] + +[[package]] +name = "zbus_macros" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zbus_macros" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zbus_names" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +dependencies = [ + "serde", + "static_assertions", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant 4.1.2", +] + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zerocopy" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive 3.15.2", +] + +[[package]] +name = "zvariant" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "url", + "zvariant_derive 4.1.2", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zvariant_derive" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix new file mode 100644 index 000000000000..c351b1d7b6b4 --- /dev/null +++ b/pkgs/by-name/ob/oboete/package.nix @@ -0,0 +1,78 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + wrapGAppsHook3, + libxkbcommon, + sqlite, + vulkan-loader, + wayland, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "oboete"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "mariinkys"; + repo = "oboete"; + rev = "refs/tags/${version}"; + hash = "sha256-fEnjjxuAoEkJFHyB9mtMEQW0K/Bt3nSpcFTZTZy2UYY="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ="; + "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; + "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; + "cosmic-config-0.1.0" = "sha256-1l1X4LtfTOo28MDILiH3vxE5AyJp7XkMYRR34Wvqa9M="; + "cosmic-settings-daemon-0.1.0" = "sha256-+1XB7r45Uc71fLnNR4U0DUF2EB8uzKeE4HIrdvKhFXo="; + "cosmic-text-0.12.0" = "sha256-x7UMzlzYkWySFgSQTO1rRn+pyPG9tXKpJ7gzx/wpm8U="; + "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; + "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "smithay-clipboard-0.8.0" = "sha256-pBQZ+UXo9hZ907mfpcZk+a+8pKrIWdczVvPkjT3TS8U="; + "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; + "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; + "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; + }; + }; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + libxkbcommon + sqlite + vulkan-loader + wayland + ]; + + postFixup = '' + wrapProgram $out/bin/oboete \ + --prefix LD_LIBRARY_PATH : "${ + lib.makeLibraryPath [ + libxkbcommon + wayland + ] + }" + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "A simple flashcards application for the COSMIC™ desktop written in Rust"; + homepage = "https://github.com/mariinkys/oboete"; + changelog = "https://github.com/mariinkys/oboete/releases/tag/${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; + platforms = lib.platforms.linux; + mainProgram = "oboete"; + }; +} diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix index f3db65626793..e537ea521a7d 100644 --- a/pkgs/by-name/ob/obs-cmd/package.nix +++ b/pkgs/by-name/ob/obs-cmd/package.nix @@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Minimal CLI to control OBS Studio via obs-websocket"; homepage = "https://github.com/grigio/obs-cmd"; + changelog = "https://github.com/grigio/obs-cmd/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ ianmjones ]; mainProgram = "obs-cmd"; diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix new file mode 100644 index 000000000000..0cf308987bbd --- /dev/null +++ b/pkgs/by-name/od/odin/package.nix @@ -0,0 +1,98 @@ +{ + fetchFromGitHub, + lib, + libiconv, + llvmPackages, + MacOSX-SDK, + makeBinaryWrapper, + nix-update-script, + Security, + which, +}: + +let + inherit (llvmPackages) stdenv; +in +stdenv.mkDerivation rec { + pname = "odin"; + version = "dev-2024-07"; + + src = fetchFromGitHub { + owner = "odin-lang"; + repo = "Odin"; + rev = version; + hash = "sha256-FeiVTLwgP0x1EZqqiYkGbKALhZWC4xE6a/3PPcEElAc="; + }; + + postPatch = + lib.optionalString stdenv.isDarwin '' + substituteInPlace src/linker.cpp \ + --replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK} + '' + + '' + substituteInPlace build_odin.sh \ + --replace-fail '-framework System' '-lSystem' + patchShebangs build_odin.sh + ''; + + LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; + + dontConfigure = true; + + buildFlags = [ "release" ]; + + nativeBuildInputs = [ + makeBinaryWrapper + which + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Security + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp odin $out/bin/odin + + mkdir -p $out/share + cp -r base $out/share/base + cp -r core $out/share/core + cp -r vendor $out/share/vendor + + wrapProgram $out/bin/odin \ + --prefix PATH : ${ + lib.makeBinPath ( + with llvmPackages; + [ + bintools + llvm + clang + lld + ] + ) + } \ + --set-default ODIN_ROOT $out/share + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fast, concise, readable, pragmatic and open sourced programming language"; + downloadPage = "https://github.com/odin-lang/Odin"; + homepage = "https://odin-lang.org/"; + license = lib.licenses.bsd3; + mainProgram = "odin"; + maintainers = with lib.maintainers; [ + astavie + luc65r + znaniye + ]; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isMusl; + }; +} diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index bc33e030dead..4321ed571923 100644 --- a/pkgs/by-name/oh/oh-my-posh/package.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "21.9.1"; + version = "21.17.2"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QzIKxvG1fg6f4Xk18XBXYirvD1cPmvzwXZoaLhSeuTI="; + hash = "sha256-9+gzjDxkDMOy7r3M6MVepNJ44HJszyzYs5LrM8x3m6Q="; }; - vendorHash = "sha256-N71kM9T8EHh/i8NUSxfPaIRlWk/WADieCkObhVcSyEU="; + vendorHash = "sha256-yArae/1TxiQkNCkElFOHdujWzLCfltSV72I8tQKDyw8="; sourceRoot = "${src.name}/src"; diff --git a/pkgs/by-name/ok/okolors/package.nix b/pkgs/by-name/ok/okolors/package.nix index f3b35e2bc160..411021f9593e 100644 --- a/pkgs/by-name/ok/okolors/package.nix +++ b/pkgs/by-name/ok/okolors/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "okolors"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Ivordir"; repo = "Okolors"; rev = "v${version}"; - sha256 = "sha256-xroiiDTm3B2sVC1sO7oe3deqh+j3URmiy/ctwqrvvkI="; + sha256 = "sha256-U7rLynXZGHCeZjaXoXx2IRDgUFv7zOKfb4BPgDROzBc="; }; - cargoHash = "sha256-Ru7VZM+vLGkYeLqWilQvpWUnbNZqkJHn1D/Vo/KUmRk="; + cargoHash = "sha256-xRCxpmIocvkg1ErYVqBLHb/jXV2eWeWHg4IO/QsnnF0="; meta = with lib; { description = "Generate a color palette from an image using k-means clustering in the Oklab color space"; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 94de36bce94d..c8f7f7beccc4 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -7,6 +7,7 @@ , overrideCC , makeWrapper , stdenv +, addDriverRunpath , cmake , gcc12 @@ -14,8 +15,8 @@ , libdrm , rocmPackages , cudaPackages -, linuxPackages , darwin +, autoAddDriverRunpath , nixosTests , testers @@ -31,13 +32,13 @@ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.1.47"; + version = "0.1.48"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-gxai2ORHABchnmdzjr9oYzk9p21qQjSIxrKt5k356i4="; + hash = "sha256-rMStHUFC88TXIH/1c9bCOU0csnEZHOhWKBlLKarmCmE="; fetchSubmodules = true; }; @@ -101,12 +102,12 @@ let }; cudaToolkit = buildEnv { - name = "cuda-toolkit"; - ignoreCollisions = true; # FIXME: find a cleaner way to do this without ignoring collisions + name = "cuda-merged"; paths = [ - cudaPackages.cudatoolkit - cudaPackages.cuda_cudart - cudaPackages.cuda_cudart.static + (lib.getBin (cudaPackages.cuda_nvcc.__spliced.buildHost or cudaPackages.cuda_nvcc)) + (lib.getLib cudaPackages.cuda_cudart) + (lib.getOutput "static" cudaPackages.cuda_cudart) + (lib.getLib cudaPackages.libcublas) ]; }; @@ -118,16 +119,17 @@ let appleFrameworks.MetalPerformanceShaders ]; - runtimeLibs = lib.optionals enableRocm [ - rocmPath - ] ++ lib.optionals enableCuda [ - linuxPackages.nvidia_x11 - ]; - wrapperOptions = builtins.concatStringsSep " " ([ - "--suffix LD_LIBRARY_PATH : '/run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}'" + wrapperOptions = [ + # ollama embeds llama-cpp binaries which actually run the ai models + # these llama-cpp binaries are unaffected by the ollama binary's DT_RUNPATH + # LD_LIBRARY_PATH is temporarily required to use the gpu + # until these llama-cpp binaries can have their runpath patched + "--suffix LD_LIBRARY_PATH : '${addDriverRunpath.driverLink}/lib'" ] ++ lib.optionals enableRocm [ + "--suffix LD_LIBRARY_PATH : '${rocmPath}/lib'" "--set-default HIP_PATH '${rocmPath}'" - ]); + ]; + wrapperArgs = builtins.concatStringsSep " " wrapperOptions; goBuild = @@ -142,8 +144,6 @@ goBuild ((lib.optionalAttrs enableRocm { CLBlast_DIR = "${clblast}/lib/cmake/CLBlast"; }) // (lib.optionalAttrs enableCuda { CUDA_LIB_DIR = "${cudaToolkit}/lib"; - CUDACXX = "${cudaToolkit}/bin/nvcc"; - CUDAToolkit_ROOT = cudaToolkit; }) // { inherit pname version src vendorHash; @@ -151,8 +151,11 @@ goBuild ((lib.optionalAttrs enableRocm { cmake ] ++ lib.optionals enableRocm [ rocmPackages.llvm.bintools + ] ++ lib.optionals enableCuda [ + cudaPackages.cuda_nvcc ] ++ lib.optionals (enableRocm || enableCuda) [ makeWrapper + autoAddDriverRunpath ] ++ lib.optionals stdenv.isDarwin metalFrameworks; @@ -160,6 +163,8 @@ goBuild ((lib.optionalAttrs enableRocm { (rocmLibs ++ [ libdrm ]) ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart + cudaPackages.cuda_cccl + cudaPackages.libcublas ] ++ lib.optionals stdenv.isDarwin metalFrameworks; @@ -188,8 +193,7 @@ goBuild ((lib.optionalAttrs enableRocm { mv "$out/bin/app" "$out/bin/.ollama-app" '' + lib.optionalString (enableRocm || enableCuda) '' # expose runtime libraries necessary to use the gpu - mv "$out/bin/ollama" "$out/bin/.ollama-unwrapped" - makeWrapper "$out/bin/.ollama-unwrapped" "$out/bin/ollama" ${wrapperOptions} + wrapProgram "$out/bin/ollama" ${wrapperArgs} ''; ldflags = [ diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix index 68a53dbc0a07..e4782d6b3bcf 100644 --- a/pkgs/by-name/ol/ols/package.nix +++ b/pkgs/by-name/ol/ols/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-06-18"; + version = "0-unstable-2024-07-01"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "6209c11593a3ac175d058a1b12a884fa4d288620"; - hash = "sha256-YAeYmX62+5FjHIYt2uWY4aVW6v326vNFl4vQLl585lg="; + rev = "ee368d473146d33e89f9be9f754fd6d0ee08ecc6"; + hash = "sha256-WowbFsec8oZVPTMDefQJYOb4GfH3xa40bN3P9AIjflE="; }; postPatch = '' diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index ab72a4933ac0..cd2629e2a700 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "omnictl"; - version = "0.38.2"; + version = "0.38.3"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-Qm5Q+yZq6m/3xAAMdz57fXC13lLDMu5GY1xs5vHAFoo="; + hash = "sha256-8AqXF7bBgn8br3mooh1BHvN2wWQnmpvVeBHbbJ5shGA="; }; vendorHash = "sha256-BF/F/siVIYJT4abOlwQjpnQpmNFdOo566VGPIo08PO0="; diff --git a/pkgs/by-name/on/onlyoffice-bin_latest/package.nix b/pkgs/by-name/on/onlyoffice-bin_latest/package.nix index 538e55b8bb25..726bda8df039 100644 --- a/pkgs/by-name/on/onlyoffice-bin_latest/package.nix +++ b/pkgs/by-name/on/onlyoffice-bin_latest/package.nix @@ -65,11 +65,11 @@ let derivation = stdenv.mkDerivation rec { pname = "onlyoffice-desktopeditors"; - version = "8.0.0"; + version = "8.1.0"; minor = null; src = fetchurl { url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - sha256 = "sha256-YtR2fiARMKw8dOgAPXYM+WFwmhKZRsIIBQYTxppu3F0="; + sha256 = "sha256-hS1+gLN17sP3EFud3fQXRWeFiQbrumBONLjqXEl89Js="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/on/onthespot/package.nix b/pkgs/by-name/on/onthespot/package.nix index 138ac6e94b7c..696a7e51f78e 100644 --- a/pkgs/by-name/on/onthespot/package.nix +++ b/pkgs/by-name/on/onthespot/package.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ copyDesktopItems - pythonRelaxDepsHook libsForQt5.wrapQtAppsHook ]; diff --git a/pkgs/by-name/oo/ooklaserver/package.nix b/pkgs/by-name/oo/ooklaserver/package.nix new file mode 100644 index 000000000000..0f265470b6fd --- /dev/null +++ b/pkgs/by-name/oo/ooklaserver/package.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchurl +, unzip +}: +let + filenameMapping = { + "x86_64-linux" = "OoklaServer-linux-x86_64-static-musl.zip"; + "aarch64-linux" = "OoklaServer-linux-aarch64-static-musl.zip"; + # Mach-O universal binary with 2 architectures: [x86_64:Mach-O 64-bit executable x86_64] [arm64] + "x86_64-darwin" = "OoklaServer-macosx.zip"; + "aarch64-darwin" = "OoklaServer-macosx.zip"; + "x86_64-windows" = "OoklaServer-windows64.zip"; + "i686-windows" = "OoklaServer-windows32.zip"; + # OoklaServer-linux64-deb9.zip + # OoklaServer-freebsd12_64.zip + # OoklaServer-freebsd13_64.zip + }; +in +stdenv.mkDerivation rec { + version = "2.11.1.2"; + pname = "ooklaserver"; + + src = fetchurl { + url = "https://web.archive.org/web/20240703022648/https://install.speedtest.net/ooklaserver/stable/OoklaServer.tgz"; + hash = "sha256-tctLtTGmrVHs+4pI1PRHrqY+a4ISs6TKvLRKlFdWw88="; + }; + sourceRoot = "."; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + unzip ${filenameMapping.${stdenv.system}} + install -Dm555 OoklaServer${stdenv.hostPlatform.extensions.executable} "$out/bin/OoklaServer" + install -Dm444 OoklaServer.properties.default "$out/etc/OoklaServer.properties.default" + runHook postInstall + ''; + + meta = { + description = "Ookla TCP based server daemon that provides standalone testing"; + homepage = "https://www.speedtest.net"; + changelog = "https://support.ookla.com/hc/en-us/articles/234578608-Speedtest-Server-Release-Notes"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ neverbehave ]; + platforms = builtins.attrNames filenameMapping; + mainProgram = "OoklaServer"; + }; +} diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 90bda880211d..bffa3c7d3e1c 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -122,7 +122,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ hatchling ]; - nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; pythonImportsCheck = [ "open_webui" ]; diff --git a/pkgs/by-name/op/openapi-changes/package.nix b/pkgs/by-name/op/openapi-changes/package.nix index 0020856ee975..929f9cd44355 100644 --- a/pkgs/by-name/op/openapi-changes/package.nix +++ b/pkgs/by-name/op/openapi-changes/package.nix @@ -7,15 +7,13 @@ buildGoModule rec { pname = "openapi-changes"; - version = "0.0.61"; + version = "0.0.65"; src = fetchFromGitHub { owner = "pb33f"; repo = pname; - # github reports `the given path has multiple possibilities` for the tagged release - # rev = "v${version}"; - rev = "f0bccc1fcf42ea6a97a81acc3283dbe14a3ebb51"; - hash = "sha256-D0jUXCxlf1aF0uc/P9Lgu9Va4Es3CQcko9BzGg1pCq8="; + rev = "v${version}"; + hash = "sha256-nqyKMlVx1WsbFk30XfnP/JQfy81kEYFEwLx1Tg0n7lQ="; }; # this test requires the `.git` of the project to be present @@ -29,7 +27,7 @@ buildGoModule rec { wrapProgram $out/bin/openapi-changes --prefix PATH : ${lib.makeBinPath [ git ]} ''; - vendorHash = "sha256-gaBVwrSaIwe1eh8voq928cxM/d0urVUF0OUwWZb2fR8="; + vendorHash = "sha256-VtwIAP2+FZ6Vpexcb9O68WfJdsTMrJn5bDjkxDe69e4="; meta = with lib; { description = "World's sexiest OpenAPI breaking changes detector"; diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index da858575ab06..5c1ddb9a9f76 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openasar"; - version = "0-unstable-2024-01-13"; + version = "0-unstable-2024-06-30"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "4f264d860a5a6a32e1862ce26178b9cf6402335d"; - hash = "sha256-NPUUDqntsMxnT/RN5M9DtLDwJXDyjOED4GlXa1oU8l8="; + rev = "5c875eb048e96543f1ec711fae522ace5e4a836c"; + hash = "sha256-dlf4X+2W2GfL2E46ZM35PqpcoKHoZ4fhroOCLpye1D0="; }; postPatch = '' diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index 173e4b05d76f..40bc6f785839 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation { cmakeFlags = [ (lib.cmakeBool "USE_SYSTEM_OPENXR" true) (lib.cmakeBool "USE_SYSTEM_GLM" true) + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DGLM_ENABLE_EXPERIMENTAL") # debug logging macros cause format-security warnings (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security") ]; diff --git a/pkgs/by-name/op/openctm/package.nix b/pkgs/by-name/op/openctm/package.nix index e255e209111d..169e4469abcd 100644 --- a/pkgs/by-name/op/openctm/package.nix +++ b/pkgs/by-name/op/openctm/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, pkg-config, - freeglut, + libglut, gtk2, libGLU, }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - freeglut + libglut gtk2 libGLU ]; diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix index 4c08f32b3f74..09bb3ce8ffaa 100644 --- a/pkgs/by-name/op/openfga-cli/package.nix +++ b/pkgs/by-name/op/openfga-cli/package.nix @@ -7,7 +7,7 @@ let pname = "openfga-cli"; - version = "0.4.1"; + version = "0.5.1"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "cli"; rev = "v${version}"; - hash = "sha256-Eex2Bts0A6Lu5M626idVK3lqVCX+2WosD8YrQP4DuC8="; + hash = "sha256-o7JwMLelnHfQd21yTHRfhrX4KgZ1jgyru1/J/+KyjVE="; }; - vendorHash = "sha256-cr9Y72ilUZxAjOIopx7VmZVtE8TxJhxdKSJIj6NawRI="; + vendorHash = "sha256-OR9UB6/5qPXw/ghE08hL3qlHmLUMvgLoqGBI4tqVr0w="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix index e4421c334df0..bcbf1a8faec9 100644 --- a/pkgs/by-name/op/openfga/package.nix +++ b/pkgs/by-name/op/openfga/package.nix @@ -7,7 +7,7 @@ let pname = "openfga"; - version = "1.5.4"; + version = "1.5.5"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "openfga"; rev = "v${version}"; - hash = "sha256-0K4z5CPNx+MVJ1PeB8rmO8+6hDGZ3ZALTFBWwR2Xl1k="; + hash = "sha256-g6cAN+OhpcBkaVVvHes7ETgKuY7aEhlyvdH7bxiTANA="; }; - vendorHash = "sha256-sihNWuxwptBrVO9sXD2YNP20mgwYU2y4NSb8wqVWmCk="; + vendorHash = "sha256-NwEGElYT6dmx5+U166E3XJoP1z3oUjp+jb5WHhVtNrs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index 053c088a6990..03b23225ada8 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -65,7 +65,7 @@ buildGoModule { mainProgram = "opengist"; homepage = "https://github.com/thomiceli/opengist"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ lf- ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix index a0dbd7e10a25..00a4be3e9ece 100644 --- a/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-card-tools"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "openpgp-card"; repo = "openpgp-card-tools"; rev = "v${version}"; - hash = "sha256-4PRUBzVy1sb15sYsbitBrOfQnsdbGKoR2OA4EjSc8B8="; + hash = "sha256-htFhNzBuinj9qiTzcW0eia74jvCT/+9b1aLli594JJQ="; }; - cargoHash = "sha256-Jm1181WQfYZPKnu0f2om/hxkJ8Bm5AA/3IwBgZkpF0I="; + cargoHash = "sha256-I2ExtUUM0ZJyhtyzP+IsgiMPMUFVHqPiMHFlvuUMjRc="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index 1e14580b42bb..09514490ebf9 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -149,11 +149,14 @@ clangStdenv.mkDerivation rec { "-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld" "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" ]; + doCheck = true; + + nativeCheckInputs = [ + mesa.llvmpipeHook + ]; + checkPhase = '' - # for running mesa llvmpipe - export __EGL_VENDOR_LIBRARY_FILENAMES=${mesa.drivers}/share/glvnd/egl_vendor.d/50_mesa.json - export LIBGL_DRIVERS_PATH=${mesa.drivers}/lib:${mesa.drivers}/lib/dri # some fontconfig issues cause pdf output to have wrong font ctest -j$NIX_BUILD_CORES -E pdfexporttest.\* ''; diff --git a/pkgs/by-name/op/opensnitch-ui/package.nix b/pkgs/by-name/op/opensnitch-ui/package.nix index 7628df552c76..d697826f03d6 100644 --- a/pkgs/by-name/op/opensnitch-ui/package.nix +++ b/pkgs/by-name/op/opensnitch-ui/package.nix @@ -1,27 +1,28 @@ -{ python3Packages +{ python311Packages , fetchFromGitHub +, nix-update-script , qt5 , lib }: -python3Packages.buildPythonApplication rec { +python311Packages.buildPythonApplication rec { pname = "opensnitch-ui"; - version = "1.6.5.1"; + version = "1.6.6"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "refs/tags/v${version}"; - hash = "sha256-IVrAAHzLS7A7cYhRk+IUx8/5TGKeqC7M/7iXOpPe2ZA="; + hash = "sha256-pJPpkXRp7cby6Mvc7IzxH9u6MY4PcrRPkimTw3je6iI="; }; postPatch = '' substituteInPlace ui/opensnitch/utils/__init__.py \ - --replace /usr/lib/python3/dist-packages/data ${python3Packages.pyasn}/${python3Packages.python.sitePackages}/pyasn/data + --replace /usr/lib/python3/dist-packages/data ${python311Packages.pyasn}/${python311Packages.python.sitePackages}/pyasn/data ''; nativeBuildInputs = [ - python3Packages.pyqt5 + python311Packages.pyqt5 qt5.wrapQtAppsHook ]; @@ -29,7 +30,7 @@ python3Packages.buildPythonApplication rec { qt5.qtwayland ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python311Packages; [ grpcio-tools notify2 pyasn @@ -56,7 +57,7 @@ python3Packages.buildPythonApplication rec { ''; postInstall = '' - mv $out/${python3Packages.python.sitePackages}/usr/* $out/ + mv $out/${python311Packages.python.sitePackages}/usr/* $out/ ''; dontWrapQtApps = true; @@ -65,6 +66,8 @@ python3Packages.buildPythonApplication rec { # All tests are sandbox-incompatible and disabled for now doCheck = false; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Application firewall"; mainProgram = "opensnitch-ui"; diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix index dec178c4031c..41172f038cc8 100644 --- a/pkgs/by-name/op/opensnitch/package.nix +++ b/pkgs/by-name/op/opensnitch/package.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "opensnitch"; - version = "1.6.5.1"; + version = "1.6.6"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "refs/tags/v${version}"; - hash = "sha256-IVrAAHzLS7A7cYhRk+IUx8/5TGKeqC7M/7iXOpPe2ZA="; + hash = "sha256-pJPpkXRp7cby6Mvc7IzxH9u6MY4PcrRPkimTw3je6iI="; }; postPatch = '' diff --git a/pkgs/by-name/op/opensplat/package.nix b/pkgs/by-name/op/opensplat/package.nix index cd6052f5369b..d808a403e7bd 100644 --- a/pkgs/by-name/op/opensplat/package.nix +++ b/pkgs/by-name/op/opensplat/package.nix @@ -4,13 +4,13 @@ cmake, ninja, fetchFromGitHub, - fetchpatch, python3, opencv, nlohmann_json, nanoflann, glm, cxxopts, + nix-update-script, config, # Upstream has rocm/hip support, too. anyone? cudaSupport ? config.cudaSupport, @@ -18,7 +18,7 @@ autoAddDriverRunpath, }: let - version = "1.1.2"; + version = "1.1.3"; torch = python3.pkgs.torch.override { inherit cudaSupport; }; # Using a normal stdenv with cuda torch gives # ld: /nix/store/k1l7y96gv0nc685cg7i3g43i4icmddzk-python3.11-torch-2.2.1-lib/lib/libc10.so: undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32' @@ -32,27 +32,9 @@ stdenv'.mkDerivation { owner = "pierotofy"; repo = "OpenSplat"; rev = "refs/tags/v${version}"; - hash = "sha256-3tk62b5fSf6wzuc5TwkdfAKgUMrw3ZxetCJa2RVMS/s="; + hash = "sha256-2NcKb2SWU/vNsnd2KhdU85J60fJPuc44ZxIle/1UT6g="; }; - patches = [ - (fetchpatch { - name = "install-executables.patch"; - url = "https://github.com/pierotofy/OpenSplat/commit/b4c4176819b508978583b7ebf66306171807a8e6.patch"; - hash = "sha256-BUgPMcO3lt3ZEzv24u36k3aTEIoloOhxrCGi1KQ5Epk="; - }) - ]; - - postPatch = '' - # the two vendored gsplats are so heavily modified they may be considered a fork - find vendor ! -name 'gsplat*' -maxdepth 1 -mindepth 1 -exec rm -rf {} + - mkdir vendor/{nanoflann,glm} - ln -s ${glm}/include/glm vendor/glm/glm - ln -s ${nanoflann}/include/nanoflann.hpp vendor/nanoflann/nanoflann.hpp - ln -s ${nlohmann_json}/include/nlohmann vendor/json - ln -s ${cxxopts}/include/cxxopts.hpp vendor/cxxopts.hpp - ''; - nativeBuildInputs = [ cmake ninja @@ -63,6 +45,9 @@ stdenv'.mkDerivation { buildInputs = [ nlohmann_json + nanoflann + glm + cxxopts torch.cxxdev torch opencv @@ -74,15 +59,23 @@ stdenv'.mkDerivation { cmakeFlags = [ (lib.cmakeBool "CMAKE_SKIP_RPATH" true) + (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") ] ++ lib.optionals cudaSupport [ (lib.cmakeFeature "GPU_RUNTIME" "CUDA") (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}/") ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Production-grade 3D gaussian splatting"; homepage = "https://github.com/pierotofy/OpenSplat/"; - license = lib.licenses.mit; + license = [ + # main + lib.licenses.agpl3Only + # vendored+modified gsplat + lib.licenses.asl20 + ]; maintainers = [ lib.maintainers.jcaesar ]; platforms = lib.platforms.linux ++ lib.optionals (!cudaSupport) lib.platforms.darwin; }; diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix index e6f3fb3a5ff7..58ca6a4139b5 100644 --- a/pkgs/by-name/op/openturns/package.nix +++ b/pkgs/by-name/op/openturns/package.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openturns"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${finalAttrs.version}"; - hash = "sha256-ku3/mPoa1YJVJB99R/kWlOubIO+OZAiKfPqS/DrtJQk="; + hash = "sha256-csl5cZvxU8fdLKvh04ZWKizClrHqF79c7tAMSejo2lk="; }; nativeBuildInputs = [ @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_SPHINX" enablePython) (lib.cmakeFeature "CMAKE_UNITY_BUILD_BATCH_SIZE" "32") (lib.cmakeFeature "SWIG_COMPILE_FLAGS" "-O1") - (lib.cmakeOptionType "PATH" "OPENTURNS_SYSCONFIG_PATH" "$out/etc") + (lib.cmakeOptionType "PATH" "OPENTURNS_SYSCONFIG_PATH" "${placeholder "out"}/etc") ]; checkTarget = lib.concatStringsSep " " [ diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index edc89bbaf2ba..464e2c1ff778 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -28,13 +28,13 @@ python3.pkgs.buildPythonApplication rec { pname = "orca"; - version = "46.1"; + version = "46.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-z2deNQwYrA+ilDbGVZ0dqXX3///vqAjr5HbY+enRERQ="; + hash = "sha256-j2MpmxpPnDCFfCKfapzhbyxD6u6pD7+QkxTKi7c+/V4="; }; patches = [ @@ -98,6 +98,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://orca.gnome.org/"; + changelog = "https://gitlab.gnome.org/GNOME/orca/-/blob/main/NEWS"; description = "Screen reader"; mainProgram = "orca"; longDescription = '' diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 0d664860befd..30d030e96acc 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-wmIC5Vzne0fe42lCBj+7kNIDG777meUuehJpgmYnPuw="; + hash = "sha256-zHnrb0GU26VCfBeISjp6Ru4Vyul+CRAGMCCgLlJZNTA="; # 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; diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix new file mode 100644 index 000000000000..9dca52e18195 --- /dev/null +++ b/pkgs/by-name/os/ossia-score/package.nix @@ -0,0 +1,159 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, ninja +, clangStdenv +, pkg-config +, alsa-lib +, avahi +, avahi-compat +, bluez +, boost185 +, fmt +, ffmpeg +, fftw +, flac +, git +, gnutls +, lame +, libcoap +, libjack2 +, libopus +, libsamplerate +, libsndfile +, libvorbis +, lilv +, lv2 +, mpg123 +, pipewire +, portaudio +, qt6 +, rapidfuzz-cpp +, re2 +, rubberband +, snappy +, SDL2 +, spdlog +, suil +, udev +}: + +# TODO: figure out LLVM jit +# assert lib.versionAtLeast llvm.version "15"; + +stdenv.mkDerivation (finalAttrs: { + pname = "ossia-score"; + version = "3.2.3-3"; + + src = fetchFromGitHub { + owner = "ossia"; + repo = "score"; + rev = "v3.2.3-3"; + hash = "sha256-xRqsMKwuejbl+5ljYMFhQv/j1MfnFH5MGIn9rCQG/ro="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ninja git pkg-config qt6.qttools qt6.wrapQtAppsHook ]; + + buildInputs = [ + alsa-lib + boost185 + avahi + avahi-compat + bluez + ffmpeg + fftw + flac + fmt + gnutls + lame + libcoap + libjack2 + libopus + libsamplerate + libsndfile + libvorbis + lilv + lv2 + mpg123 + pipewire + portaudio + qt6.qtbase + qt6.qtdeclarative + qt6.qtserialport + qt6.qtscxml + qt6.qtshadertools + qt6.qtsvg + qt6.qtwayland + qt6.qtwebsockets + rapidfuzz-cpp + re2 + rubberband + snappy + SDL2 + spdlog + suil + udev + ]; + + cmakeFlags = [ + "-Wno-dev" + + "-DSCORE_DEPLOYMENT_BUILD=1" + "-DSCORE_STATIC_PLUGINS=1" + "-DSCORE_FHS_BUILD=1" + "-DCMAKE_UNITY_BUILD=1" + "-DCMAKE_SKIP_RPATH=ON" + "-DOSSIA_USE_SYSTEM_LIBRARIES=1" + "-DSCORE_USE_SYSTEM_LIBRARIES=1" + + "-DLilv_INCLUDE_DIR=${lilv.dev}/include/lilv-0" + "-DSuil_INCLUDE_DIR=${suil}/include/suil-0" + ]; + + # Needed for libraries that get dlopen'd + env.NIX_LDFLAGS = toString [ + "-lasound" + "-llilv-0" + "-lsuil-0" + "-lsndfile" + "-lpipewire-0.3" + "-lfftw3" + "-lfftw3_threads" + "-ludev" + ]; + + runtimeDependencies = [ + alsa-lib + avahi + avahi-compat + bluez + fftw + lilv + suil + pipewire + udev + ]; + + installPhase = '' + runHook preInstall + + cmake -DCMAKE_INSTALL_DO_STRIP=1 -DCOMPONENT=OssiaScore -P cmake_install.cmake + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://ossia.io/score/about.html"; + description = "Sequencer for audio-visual artists"; + longDescription = '' + ossia score is a sequencer for audio-visual artists, designed to enable + the creation of interactive shows, museum installations, intermedia + digital artworks, interactive music and more in an intuitive user interface. + ''; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jcelerier minijackson ]; + }; +}) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index 9651b8d9cf3b..680a66820d87 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -28,7 +28,6 @@ python3Packages.buildPythonApplication rec { build-system = with python3Packages; [ poetry-core ]; - nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; dependencies = with python3Packages; [ aiohttp diff --git a/pkgs/by-name/ou/outfox/package.nix b/pkgs/by-name/ou/outfox/package.nix index 4e8942073d9e..b38e096823ec 100644 --- a/pkgs/by-name/ou/outfox/package.nix +++ b/pkgs/by-name/ou/outfox/package.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Rhythm game engine forked from StepMania"; homepage = "https://projectoutfox.com"; + changelog = "https://projectoutfox.com/releases/${version}"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "armv7l-linux" ]; diff --git a/pkgs/by-name/ou/outguess/package.nix b/pkgs/by-name/ou/outguess/package.nix new file mode 100644 index 000000000000..1a4bbb44035a --- /dev/null +++ b/pkgs/by-name/ou/outguess/package.nix @@ -0,0 +1,30 @@ +{ fetchFromGitHub +, stdenv +, lib +, autoreconfHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "outguess"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "resurrecting-open-source-projects"; + repo = "outguess"; + rev = finalAttrs.version; + hash = "sha256-yv01jquPTnVk9fd1tqAt1Lxis+ZHZqdG3NiTFxfoXAE="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + configureFlags = [ "--with-generic-jconfig" ]; + + meta = { + description = "Universal steganographic tool that allows the insertion of hidden information into the redundant bits of data sources"; + homepage = "https://github.com/resurrecting-open-source-projects/outguess"; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + mainProgram = "outguess"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ou/outputcheck/package.nix b/pkgs/by-name/ou/outputcheck/package.nix index f9ec2fd3c2f0..b7ae0b61f27b 100644 --- a/pkgs/by-name/ou/outputcheck/package.nix +++ b/pkgs/by-name/ou/outputcheck/package.nix @@ -45,6 +45,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool for checking tool output inspired by LLVM's FileCheck"; homepage = "https://github.com/stp/OutputCheck"; + changelog = "https://github.com/stp/OutputCheck/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fsagbuya ]; mainProgram = "OutputCheck"; diff --git a/pkgs/by-name/ov/ovn/generic.nix b/pkgs/by-name/ov/ovn/generic.nix index a584a9ce15f3..c3dbb8f145d9 100644 --- a/pkgs/by-name/ov/ovn/generic.nix +++ b/pkgs/by-name/ov/ovn/generic.nix @@ -58,6 +58,10 @@ stdenv.mkDerivation rec { popd ''; + configureFlags = [ + "--localstatedir=/var" + ]; + enableParallelBuilding = true; # disable tests due to networking issues and because individual tests can't be skipped easily diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix index 0d7a60c3cf6d..23db01329511 100644 --- a/pkgs/by-name/ow/owmods-cli/package.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "owmods-cli"; - version = "0.14.0"; + version = "0.14.3"; src = fetchFromGitHub { owner = "ow-mods"; repo = "ow-mod-man"; rev = "cli_v${version}"; - hash = "sha256-PTYpkYDj9mlCPp9cPethGh6G4/QXwyXA6fsmtfmR79s="; + hash = "sha256-ONvmTBF9y3NMQx1KgNhJt+0nV57xc9cLalpfDqrTSq0="; }; - cargoHash = "sha256-zjAs+p6SxCliUBrqLg2bpgciRH9HJ4vBrghVy9uCI9E="; + cargoHash = "sha256-I4OX27LHpT5YYW6yEhX+sCuA8m0KZd/qud4xdEUzkyA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pa/pablodraw/deps.nix b/pkgs/by-name/pa/pablodraw/deps.nix index 16de8a8c63fd..268256d0603f 100644 --- a/pkgs/by-name/pa/pablodraw/deps.nix +++ b/pkgs/by-name/pa/pablodraw/deps.nix @@ -2,27 +2,27 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.38"; sha256 = "12dv3j8nzhjb5c0093djajdnv8n7m0q7vq2d5ry2v4xk9wqzxpr7"; }) - (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.38"; sha256 = "0n3y5w088k81apxik9amfvjdwcic4k2ixxvnrk9cw6d2wh1d5r8d"; }) - (fetchNuGet { pname = "dotnet-outdated-tool"; version = "4.1.0"; sha256 = "1i3i2hnf4qszlp3yzwggnvz4qpp3lgrzf19ygsmbvqzw1g7w150c"; }) - (fetchNuGet { pname = "Eto.Forms"; version = "2.7.4"; sha256 = "0q50fw646h25an5j8c4p1gck8ja20vy344w1gb7rdp167d573mb3"; }) - (fetchNuGet { pname = "Eto.Platform.Gtk"; version = "2.7.4"; sha256 = "0zy35zw1s4al305y4b496f5nf9vmmm7i0jf8j0dlq6df8bfjifcn"; }) - (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.38"; sha256 = "0c5gzg106bnnc4wwwhch6lja68623a9hk8r2sjcv35hl5dh21616"; }) - (fetchNuGet { pname = "GioSharp"; version = "3.24.24.38"; sha256 = "1b3irarxjbbpf24fw2avdglcslb5653gn6m829yhlcm5ay37pds4"; }) - (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.38"; sha256 = "1a0ixdq1gdb46gkb2nnlydsi10bjrbd3risfyaphsy8fbsyzrzvm"; }) - (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.38"; sha256 = "0cn8aggci6n088y5giiaxmyzv01rcz37r8pm738q2bsb57zppz2j"; }) - (fetchNuGet { pname = "Lidgren.Network"; version = "1.0.2"; sha256 = "0ka0vwyy060wd1dn1551m56fv957mmc7dxlj71g7n6qmsi1mdhif"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Mono.Nat"; version = "3.0.3"; sha256 = "1b3alh1wz28y62cflwl1jppigv499cndm8sds32xsmvwpdwiq4yl"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) - (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.38"; sha256 = "0cma8j4cy4j3fw0nvsxlqi0azjkvfjsw0wb6k6b2k21rdpy5rbbn"; }) - (fetchNuGet { pname = "SharpCompress"; version = "0.32.2"; sha256 = "1p198bl08ia89rf4n6yjpacj3yrz6s574snsfl40l8vlqcdrc1pm"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) + (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.38"; hash = "sha256-J9/+MU+zky18Lk3gfTCox6Jtm1SyjQQAK0vCb5Ecu4k="; }) + (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.38"; hash = "sha256-DeXSAuSiGc7SzHb3HsUkLDLe5HZVpRn7VQFNhAAvflg="; }) + (fetchNuGet { pname = "dotnet-outdated-tool"; version = "4.1.0"; hash = "sha256-DJTAzwv8472qfj4F9/Oj415M/rbv8e/HpV9j4iwUccQ="; }) + (fetchNuGet { pname = "Eto.Forms"; version = "2.7.4"; hash = "sha256-Y9VxSjsm3JbPeoETMvwGQkk02QuXMCSLVUVAQwx3oGA="; }) + (fetchNuGet { pname = "Eto.Platform.Gtk"; version = "2.7.4"; hash = "sha256-lrko3UKuGUwbkMhJEE+tdSdnizOJLOILGFQRHfgvw38="; }) + (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.38"; hash = "sha256-JpggYCsUlrGZ1CKjCZMawiCjJDWQQc45YdYuA8L7rzA="; }) + (fetchNuGet { pname = "GioSharp"; version = "3.24.24.38"; hash = "sha256-RLd7hlelMgp9Eqga+0YxZVHN6GtbCe6IcHct2bPKcaw="; }) + (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.38"; hash = "sha256-df/8vV4OeQ2v8k7HPNrKcoEQdfPUWrHmM2S1F3DrEag="; }) + (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.38"; hash = "sha256-Uvx7/ylLL4HROPWifMZnOYD9fe0qxlc8QsCayN5TyDI="; }) + (fetchNuGet { pname = "Lidgren.Network"; version = "1.0.2"; hash = "sha256-LsJWQ9QVG3teOJL2dlitp6TtTKmhlGBbaBwY4D3fQE0="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Mono.Nat"; version = "3.0.3"; hash = "sha256-1BMcebt8V93F0E2j2ixLiewX75WBcuqYMB6JzwOkaqw="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; hash = "sha256-ESyjt/R7y9dDvvz5Sftozk+e/3Otn38bOcLGGh69Ot0="; }) + (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.38"; hash = "sha256-dq1c/G05iCmWmWZxwLV0e8qvQMS0620Bd0MSz4hEqjI="; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.32.2"; hash = "sha256-9QaWG8N0IwoIddpqcoo2P/shmbrSG0tcTkhFBOhCKdw="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; hash = "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; hash = "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; }) ] diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix index 46143afdb5e3..5c87d124ee96 100644 --- a/pkgs/by-name/pa/pacu/package.nix +++ b/pkgs/by-name/pa/pacu/package.nix @@ -32,7 +32,6 @@ python.pkgs.buildPythonApplication rec { build-system = with python.pkgs; [ poetry-core ]; - nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; dependencies = [ awscli ] diff --git a/pkgs/by-name/pa/paper-age/package.nix b/pkgs/by-name/pa/paper-age/package.nix index 64a90eba0aa1..700e55d2db58 100644 --- a/pkgs/by-name/pa/paper-age/package.nix +++ b/pkgs/by-name/pa/paper-age/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "paper-age"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "matiaskorhonen"; repo = "paper-age"; rev = "v${version}"; - hash = "sha256-WWRX5St701ja/7wl4beiqD3+ZEEsb9n5N/pbbjdrgDM="; + hash = "sha256-OnCE277CeU9k7NGO0fEF2wI9S1wxOw4lK7iSNp1D+KQ="; }; - cargoHash = "sha256-Ede/BNLTSJPMsu/uYyowuUxBVu1oggiqKcE+vWHCtgU="; + cargoHash = "sha256-2WhzXr5ugPu56BS++MiTNOzcJxSL9F17IM/+yfjkL8k="; meta = with lib; { description = "Easy and secure paper backups of secrets"; diff --git a/pkgs/by-name/pa/paper-plane/package.nix b/pkgs/by-name/pa/paper-plane/package.nix index dcbee261c461..d308a9325425 100644 --- a/pkgs/by-name/pa/paper-plane/package.nix +++ b/pkgs/by-name/pa/paper-plane/package.nix @@ -16,6 +16,7 @@ , blueprint-compiler , libxml2 , libshumate +, gst_all_1 , darwin }: @@ -96,6 +97,10 @@ stdenv.mkDerivation { libadwaita-paperplane tdlib-paperplane rlottie-paperplane + gst_all_1.gstreamer + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index dcdb5e6b19f7..c0de8348e838 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -13,7 +13,7 @@ , shared-mime-info , itstool , poppler -, gnome +, nautilus , darwin , djvulibre , libspectre @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals supportXPS [ libgxps ] ++ lib.optionals supportNautilus [ - gnome.nautilus + nautilus ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/by-name/pa/paratest/package.nix b/pkgs/by-name/pa/paratest/package.nix index 8961c70f551c..b51dac8f237a 100644 --- a/pkgs/by-name/pa/paratest/package.nix +++ b/pkgs/by-name/pa/paratest/package.nix @@ -23,6 +23,6 @@ homepage = "https://github.com/paratestphp/paratest"; license = lib.licenses.mit; mainProgram = "paratest"; - maintainers = with lib.maintainers; [ patka ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix index 6daf6ae1919a..091c187d0481 100644 --- a/pkgs/by-name/pa/passt/package.nix +++ b/pkgs/by-name/pa/passt/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "passt"; - version = "2024_05_23.765eb0b"; + version = "2024_06_24.1ee2eca"; src = fetchurl { url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz"; - hash = "sha256-4i+83uv7fXeK4/0bf1FYGALKwjCqCx51rQAGTOnbrNE="; + hash = "sha256-Q4AbpzJ4Gbu1ArdjzZCf0GmTz0nWZN+kEuhLPT8uPqg="; }; makeFlags = [ diff --git a/pkgs/by-name/pc/pcsx2/darwin.nix b/pkgs/by-name/pc/pcsx2/darwin.nix new file mode 100644 index 000000000000..c0655b7879af --- /dev/null +++ b/pkgs/by-name/pc/pcsx2/darwin.nix @@ -0,0 +1,32 @@ +{ + stdenvNoCC, + fetchurl, + pname, + version, + meta, + makeWrapper, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + inherit pname version meta; + + src = fetchurl { + url = "https://github.com/PCSX2/pcsx2/releases/download/v${version}/pcsx2-v${version}-macos-Qt.tar.xz"; + hash = "sha256-NYgHsYXoIhI2pxqqiMgz5sKBAezEFf4AfEfu5S3diMg="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,Applications} + cp -r "PCSX2-v${finalAttrs.version}.app" $out/Applications/PCSX2.app + makeWrapper $out/Applications/PCSX2.app/Contents/MacOS/PCSX2 $out/bin/pcsx2-qt + runHook postInstall + ''; +}) diff --git a/pkgs/by-name/pc/pcsx2/linux.nix b/pkgs/by-name/pc/pcsx2/linux.nix new file mode 100644 index 000000000000..862b20150ef3 --- /dev/null +++ b/pkgs/by-name/pc/pcsx2/linux.nix @@ -0,0 +1,130 @@ +{ + cmake, + fetchFromGitHub, + lib, + llvmPackages_17, + callPackage, + cubeb, + curl, + extra-cmake-modules, + ffmpeg, + libaio, + libbacktrace, + libpcap, + libwebp, + libXrandr, + lz4, + makeWrapper, + pkg-config, + qt6, + SDL2, + soundtouch, + strip-nondeterminism, + vulkan-headers, + vulkan-loader, + wayland, + zip, + zstd, + + pname, + version, + meta, +}: + +let + shaderc-patched = callPackage ./shaderc-patched.nix { }; + # The pre-zipped files in releases don't have a versioned link, we need to zip them ourselves + pcsx2_patches = fetchFromGitHub { + owner = "PCSX2"; + repo = "pcsx2_patches"; + rev = "9e71956797332471010e563a4b75a5934bef9d4e"; + hash = "sha256-jpaRpvJox78zRGyrVIGYVoSEo/ICBlBfw3dTMz9QGuU="; + }; + inherit (qt6) + qtbase + qtsvg + qttools + qtwayland + wrapQtAppsHook + ; +in +llvmPackages_17.stdenv.mkDerivation (finalAttrs: { + inherit pname version meta; + + src = fetchFromGitHub { + owner = "PCSX2"; + repo = "pcsx2"; + rev = "v${finalAttrs.version}"; + # NOTE: Don't forget to change the hash in shaderc-patched.nix as well. + hash = "sha256-cDugEbbz40uLPW64bcDGxfo1Y3ahYnEVaalfMp/J95s="; + }; + + patches = [ ./define-rev.patch ]; + + cmakeFlags = [ + (lib.cmakeBool "DISABLE_ADVANCE_SIMD" true) + (lib.cmakeBool "USE_LINKED_FFMPEG" true) + (lib.cmakeFeature "PCSX2_GIT_REV" finalAttrs.src.rev) + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + strip-nondeterminism + wrapQtAppsHook + zip + ]; + + buildInputs = [ + curl + ffmpeg + libaio + libbacktrace + libpcap + libwebp + libXrandr + lz4 + qtbase + qtsvg + qttools + qtwayland + SDL2 + shaderc-patched + soundtouch + vulkan-headers + wayland + zstd + ] ++ cubeb.passthru.backendLibs; + + installPhase = '' + mkdir -p $out/bin + cp -a bin/pcsx2-qt bin/resources $out/bin/ + + install -Dm644 $src/pcsx2-qt/resources/icons/AppIcon64.png $out/share/pixmaps/PCSX2.png + install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop + + zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/* + strip-nondeterminism $out/bin/resources/patches.zip + ''; + + qtWrapperArgs = + let + libs = lib.makeLibraryPath ( + [ + vulkan-loader + shaderc-patched + ] + ++ cubeb.passthru.backendLibs + ); + in + [ "--prefix LD_LIBRARY_PATH : ${libs}" ]; + + # https://github.com/PCSX2/pcsx2/pull/10200 + # Can't avoid the double wrapping, the binary wrapper from qtWrapperArgs doesn't support --run + postFixup = '' + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/pcsx2-qt \ + --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi' + ''; +}) diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix index 89efacebb515..bd982263c0a8 100644 --- a/pkgs/by-name/pc/pcsx2/package.nix +++ b/pkgs/by-name/pc/pcsx2/package.nix @@ -1,139 +1,11 @@ -{ cmake -, fetchFromGitHub -, lib -, llvmPackages_17 -, callPackage -, cubeb -, curl -, extra-cmake-modules -, fetchpatch -, ffmpeg -, libaio -, libbacktrace -, libpcap -, libwebp -, libXrandr -, lz4 -, makeWrapper -, pkg-config -, qt6 -, SDL2 -, soundtouch -, strip-nondeterminism -, vulkan-headers -, vulkan-loader -, wayland -, zip -, zstd +{ + stdenv, + lib, + callPackage, }: - let - shaderc-patched = callPackage ./shaderc-patched.nix { }; - # The pre-zipped files in releases don't have a versioned link, we need to zip them ourselves - pcsx2_patches = fetchFromGitHub { - owner = "PCSX2"; - repo = "pcsx2_patches"; - rev = "b3a788e16ea12efac006cbbe1ece45b6b9b34326"; - sha256 = "sha256-Uvpz2Gpj533Sr6wLruubZxssoXefQDey8GHIDKWhW3s="; - }; - inherit (qt6) - qtbase - qtsvg - qttools - qtwayland - wrapQtAppsHook - ; -in -llvmPackages_17.stdenv.mkDerivation (finalAttrs: { pname = "pcsx2"; - version = "1.7.5779"; - - src = fetchFromGitHub { - owner = "PCSX2"; - repo = "pcsx2"; - fetchSubmodules = true; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-WiwnP5yoBy8bRLUPuCZ7z4nhIzrY8P29KS5ZjErM/A4="; - }; - - patches = [ - ./define-rev.patch - # Backport patches to fix random crashes on startup - (fetchpatch { - url = "https://github.com/PCSX2/pcsx2/commit/e47bcf8d80df9a93201eefbaf169ec1a0673a833.patch"; - sha256 = "sha256-7CL1Kpu+/JgtKIenn9rQKAs3A+oJ40W5XHlqSg77Q7Y="; - }) - (fetchpatch { - url = "https://github.com/PCSX2/pcsx2/commit/92b707db994f821bccc35d6eef67727ea3ab496b.patch"; - sha256 = "sha256-HWJ8KZAY/qBBotAJerZg6zi5QUHuTD51zKH1rAtZ3tc="; - }) - ]; - - cmakeFlags = [ - (lib.cmakeBool "DISABLE_ADVANCE_SIMD" true) - (lib.cmakeBool "USE_LINKED_FFMPEG" true) - (lib.cmakeFeature "PCSX2_GIT_REV" finalAttrs.src.rev) - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - strip-nondeterminism - wrapQtAppsHook - zip - ]; - - buildInputs = [ - curl - ffmpeg - libaio - libbacktrace - libpcap - libwebp - libXrandr - lz4 - qtbase - qtsvg - qttools - qtwayland - SDL2 - shaderc-patched - soundtouch - vulkan-headers - wayland - zstd - ] - ++ cubeb.passthru.backendLibs; - - installPhase = '' - mkdir -p $out/bin - cp -a bin/pcsx2-qt bin/resources $out/bin/ - - install -Dm644 $src/pcsx2-qt/resources/icons/AppIcon64.png $out/share/pixmaps/PCSX2.png - install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop - - zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/* - strip-nondeterminism $out/bin/resources/patches.zip - ''; - - qtWrapperArgs = - let - libs = lib.makeLibraryPath ([ - vulkan-loader - ] ++ cubeb.passthru.backendLibs); - in [ - "--prefix LD_LIBRARY_PATH : ${libs}" - ]; - - # https://github.com/PCSX2/pcsx2/pull/10200 - # Can't avoid the double wrapping, the binary wrapper from qtWrapperArgs doesn't support --run - postFixup = '' - source "${makeWrapper}/nix-support/setup-hook" - wrapProgram $out/bin/pcsx2-qt \ - --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi' - ''; - + version = "1.7.5919"; meta = with lib; { description = "Playstation 2 emulator"; longDescription = '' @@ -143,10 +15,25 @@ llvmPackages_17.stdenv.mkDerivation (finalAttrs: { states and PS2 system memory. This allows you to play PS2 games on your PC, with many additional features and benefits. ''; + hydraPlatforms = platforms.linux; homepage = "https://pcsx2.net"; - license = with licenses; [ gpl3Plus lgpl3Plus ]; - maintainers = with maintainers; [ hrdinka govanify ]; + license = with licenses; [ + gpl3Plus + lgpl3Plus + ]; + maintainers = with maintainers; [ + hrdinka + govanify + matteopacini + ]; mainProgram = "pcsx2-qt"; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + sourceProvenance = + lib.optional stdenv.isDarwin sourceTypes.binaryNativeCode + ++ lib.optional stdenv.isLinux sourceTypes.fromSource; }; -}) +in +if stdenv.isDarwin then + callPackage ./darwin.nix { inherit pname version meta; } +else + callPackage ./linux.nix { inherit pname version meta; } diff --git a/pkgs/by-name/pc/pcsx2/shaderc-patched.nix b/pkgs/by-name/pc/pcsx2/shaderc-patched.nix index 82f9721a87d6..1b6ef4c02cb0 100644 --- a/pkgs/by-name/pc/pcsx2/shaderc-patched.nix +++ b/pkgs/by-name/pc/pcsx2/shaderc-patched.nix @@ -1,20 +1,35 @@ { + lib, + fetchFromGitHub, fetchpatch, pcsx2, shaderc, }: +let + version = "2024.1"; +in shaderc.overrideAttrs (old: { + inherit version; pname = "shaderc-patched-for-pcsx2"; + src = fetchFromGitHub { + owner = "google"; + repo = "shaderc"; + rev = "v${version}"; + hash = "sha256-2L/8n6KLVZWXt6FrYraVlZV5YqbPHD7rzXPCkD0d4kg="; + }; patches = (old.patches or [ ]) ++ [ (fetchpatch { url = "file://${pcsx2.src}/.github/workflows/scripts/common/shaderc-changes.patch"; - hash = "sha256-Ps/D+CdSbjVWg3ZGOEcgbpQbCNkI5Nuizm4E5qiM9Wo="; + hash = "sha256-/qX2yD0RBuPh4Cf7n6OjVA2IyurpaCgvCEsIX/hXFdQ="; excludes = [ - "CHANGES" - "CMakeLists.txt" "libshaderc/CMakeLists.txt" + "third_party/CMakeLists.txt" ]; }) ]; + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + (lib.cmakeBool "SHADERC_SKIP_EXAMPLES" true) + (lib.cmakeBool "SHADERC_SKIP_TESTS" true) + ]; }) diff --git a/pkgs/by-name/pd/pdf4qt/package.nix b/pkgs/by-name/pd/pdf4qt/package.nix index fd87006b8bd1..ff9aa46666cf 100644 --- a/pkgs/by-name/pd/pdf4qt/package.nix +++ b/pkgs/by-name/pd/pdf4qt/package.nix @@ -6,19 +6,21 @@ , cmake , pkg-config , qt6 +, wrapGAppsHook3 , openjpeg , tbb_2021_11 +, blend2d }: stdenv.mkDerivation (finalAttrs: { pname = "pdf4qt"; - version = "1.3.7"; + version = "1.4.0.0"; src = fetchFromGitHub { owner = "JakubMelka"; repo = "PDF4QT"; rev = "v${finalAttrs.version}"; - hash = "sha256-wZJDMLEaHGBPSToQ+ObSfB5tw/fTIX1i5tmNPmIa7Ck="; + hash = "sha256-NlIy/C4uHRG5wwXPuqCShe113qhhsQ5jp50zrOLLA2c="; }; patches = [ @@ -33,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config qt6.qttools qt6.wrapQtAppsHook + # GLib-GIO-ERROR: No GSettings schemas are installed on the system + wrapGAppsHook3 ]; buildInputs = [ @@ -43,12 +47,19 @@ stdenv.mkDerivation (finalAttrs: { lcms openjpeg tbb_2021_11 + blend2d ]; cmakeFlags = [ (lib.cmakeBool "PDF4QT_INSTALL_TO_USR" false) ]; + dontWrapGApps = true; + + preFixup = '' + qtWrapperArgs+=(''${gappsWrapperArgs[@]}) + ''; + meta = { description = "Open source PDF editor"; longDescription = '' diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/by-name/pd/pdfarranger/package.nix similarity index 59% rename from pkgs/applications/misc/pdfarranger/default.nix rename to pkgs/by-name/pd/pdfarranger/package.nix index 5dda053eb753..bcbad7a32dcb 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/by-name/pd/pdfarranger/package.nix @@ -1,10 +1,11 @@ -{ fetchFromGitHub -, lib -, wrapGAppsHook3 -, python3Packages -, gtk3 -, poppler_gi -, libhandy +{ + fetchFromGitHub, + lib, + wrapGAppsHook3, + python3Packages, + gtk3, + poppler_gi, + libhandy, }: python3Packages.buildPythonApplication rec { @@ -19,11 +20,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-bHV6EluA7xp+HyejnSWJwfRBDcTuZq5Gzz0KWIs0qhA="; }; - nativeBuildInputs = [ - wrapGAppsHook3 - ] ++ (with python3Packages; [ - setuptools - ]); + nativeBuildInputs = [ wrapGAppsHook3 ]; + + build-system = with python3Packages; [ setuptools ]; buildInputs = [ gtk3 @@ -31,7 +30,7 @@ python3Packages.buildPythonApplication rec { libhandy ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pygobject3 pikepdf img2pdf @@ -42,19 +41,17 @@ python3Packages.buildPythonApplication rec { # incompatible with wrapGAppsHook3 strictDeps = false; dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; doCheck = false; # no tests - meta = with lib; { + meta = { inherit (src.meta) homepage; - description = "Merge or split pdf documents and rotate, crop and rearrange their pages using an interactive and intuitive graphical interface"; + description = "Merge or split pdf documents and rotate, crop and rearrange their pages using a graphical interface"; mainProgram = "pdfarranger"; - platforms = platforms.linux; - maintainers = with maintainers; [ symphorien ]; - license = licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ symphorien ]; + license = lib.licenses.gpl3Plus; changelog = "https://github.com/pdfarranger/pdfarranger/releases/tag/${version}"; }; } diff --git a/pkgs/by-name/pe/pegtl/package.nix b/pkgs/by-name/pe/pegtl/package.nix index 152aa513133a..d7a57caa58fe 100644 --- a/pkgs/by-name/pe/pegtl/package.nix +++ b/pkgs/by-name/pe/pegtl/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { for creating parsers according to a Parsing Expression Grammar (PEG). ''; license = lib.licenses.boost; - maintainers = with lib.maintainers; [ vigress8 ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/pe/pest/package.nix b/pkgs/by-name/pe/pest/package.nix index 6b7231ec8f8e..6157da0d8a81 100644 --- a/pkgs/by-name/pe/pest/package.nix +++ b/pkgs/by-name/pe/pest/package.nix @@ -21,6 +21,6 @@ php.buildComposerProject (finalAttrs: { homepage = "https://pestphp.com"; license = lib.licenses.mit; mainProgram = "pest"; - maintainers = with lib.maintainers; [ patka ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch b/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch similarity index 74% rename from pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch rename to pkgs/by-name/pe/petsc/filter_mpi_warnings.patch index f3a34de9304e..6659f2d084d9 100644 --- a/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch +++ b/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch @@ -1,12 +1,12 @@ diff --git a/src/snes/tutorials/makefile b/src/snes/tutorials/makefile -index 672a62a..a5fd1c4 100644 +index fa15faad39e..7670e80931e 100644 --- a/src/snes/tutorials/makefile +++ b/src/snes/tutorials/makefile -@@ -13,6 +13,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules +@@ -13,6 +13,7 @@ ex55: ex55.o ex55k.o # these tests are used by the makefile in PETSC_DIR for basic tests of the install and should not be removed testex5f: ex5f.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex5f -snes_rtol 1e-4 > ex5f_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ if (${DIFF} output/ex5f_1.testout ex5f_1.tmp > /dev/null 2>&1) then \ echo "Fortran example src/snes/tutorials/ex5f run successfully with 1 MPI process"; \ else \ @@ -14,7 +14,7 @@ index 672a62a..a5fd1c4 100644 ${MAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} ex5f.rm; testex19: ex19.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 1 MPI process"; \ else \ @@ -22,7 +22,7 @@ index 672a62a..a5fd1c4 100644 ${RM} -f ex19_1.tmp; testex19_mpi: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 2 MPI processes"; \ else \ @@ -30,71 +30,83 @@ index 672a62a..a5fd1c4 100644 #use unpreconditioned norm because HYPRE device installations use different AMG parameters runex19_hypre: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE"; \ else \ @@ -57,6 +61,7 @@ runex19_hypre: ${RM} -f ex19_1.tmp runex19_hypre_cuda: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type cuda -dm_mat_type aijcusparse -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/cuda"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/CUDA"; \ else \ @@ -66,6 +71,7 @@ runex19_hypre_cuda: ${RM} -f ex19_1.tmp runex19_hypre_hip: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type hip -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/hip"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/HIP"; \ else \ @@ -75,6 +81,7 @@ runex19_hypre_hip: ${RM} -f ex19_1.tmp runex19_cuda: - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -pc_gamg_esteig_ksp_max_it 10 -ksp_monitor -mg_levels_ksp_max_it 3 > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ + -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -ksp_monitor -mg_levels_ksp_max_it 1 > ex19_1.tmp 2>&1; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_cuda_1.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with cuda"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with CUDA"; \ else \ @@ -84,6 +91,7 @@ runex19_cuda: ${RM} -f ex19_1.tmp runex19_ml: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type ml > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_ml.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with ml"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with ML"; \ else \ @@ -93,6 +101,7 @@ runex19_ml: ${RM} -f ex19_1.tmp runex19_fieldsplit_mumps: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -pc_type fieldsplit -pc_fieldsplit_block_size 4 -pc_fieldsplit_type SCHUR -pc_fieldsplit_0_fields 0,1,2 -pc_fieldsplit_1_fields 3 -fieldsplit_0_pc_type lu -fieldsplit_1_pc_type lu -snes_monitor_short -ksp_monitor_short -fieldsplit_0_pc_factor_mat_solver_type mumps -fieldsplit_1_pc_factor_mat_solver_type mumps > ex19_6.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ if (${DIFF} output/ex19_fieldsplit_5.out ex19_6.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with mumps"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with MUMPS"; \ else \ @@ -102,6 +111,7 @@ runex19_fieldsplit_mumps: ${RM} -f ex19_6.tmp runex19_superlu_dist: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_grid_x 20 -da_grid_y 20 -pc_type lu -pc_factor_mat_solver_type superlu_dist > ex19.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \ if (${DIFF} output/ex19_superlu.out ex19.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with superlu_dist"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuperLU_DIST"; \ else \ @@ -111,6 +121,7 @@ runex19_superlu_dist: ${RM} -f ex19.tmp runex19_suitesparse: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type lu -pc_factor_mat_solver_type umfpack > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_suitesparse.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with suitesparse"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuiteSparse"; \ else \ @@ -120,6 +131,7 @@ runex19_suitesparse: ${RM} -f ex19_1.tmp runex3k_kokkos: ex3k.PETSc -@OMP_PROC_BIND=false ${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex3k -view_initial -dm_vec_type kokkos -dm_mat_type aijkokkos -use_gpu_aware_mpi 0 -snes_monitor > ex3k_1.tmp 2>&1 ;\ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ if (${DIFF} output/ex3k_1.out ex3k_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex3k run successfully with kokkos-kernels"; \ + echo "C/C++ example src/snes/tutorials/ex3k run successfully with Kokkos Kernels"; \ else \ +diff --git a/src/vec/vec/tests/makefile b/src/vec/vec/tests/makefile +index d1f047820ec..aab400535dd 100644 +--- a/src/vec/vec/tests/makefile ++++ b/src/vec/vec/tests/makefile +@@ -5,6 +5,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules + + runex47: ex47.PETSc + -@H5OUT=`mktemp -t petsc.h5.XXXXXX`; ${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex47 -filename $${H5OUT} > ex47_1.tmp 2>&1; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex47_1.tmp; \ + if (${DIFF} output/ex47_1.out ex47_1.tmp) then \ + echo "C/C++ example src/vec/vec/tests/ex47 run successfully with HDF5"; \ + else \ diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix new file mode 100644 index 000000000000..5a547144b491 --- /dev/null +++ b/pkgs/by-name/pe/petsc/package.nix @@ -0,0 +1,131 @@ +{ + lib, + stdenv, + fetchzip, + darwin, + gfortran, + python3, + blas, + lapack, + mpiSupport ? true, + mpi, # generic mpi dependency + openssh, # required for openmpi tests + petsc-withp4est ? false, + hdf5-support ? false, + hdf5, + metis, + parmetis, + pkg-config, + p4est, + zlib, # propagated by p4est but required by petsc + petsc-optimized ? false, + petsc-scalar-type ? "real", + petsc-precision ? "double", +}: + +# This version of PETSc does not support a non-MPI p4est build +assert petsc-withp4est -> p4est.mpiSupport; + +stdenv.mkDerivation rec { + pname = "petsc"; + version = "3.21.0"; + + src = fetchzip { + url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${version}.tar.gz"; + hash = "sha256-2J6jtIKz1ZT9qwN8tuYQNBIeBJdE4Gt9cE3b5rTIeF4="; + }; + + inherit mpiSupport; + withp4est = petsc-withp4est; + + strictDeps = true; + nativeBuildInputs = [ + python3 + gfortran + pkg-config + ] ++ lib.optional mpiSupport mpi ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh; + buildInputs = [ + blas + lapack + ] ++ lib.optional hdf5-support hdf5 ++ lib.optional withp4est p4est; + + prePatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace config/install.py \ + --replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool + ''; + + # Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr): + # [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery. + # [1684747490.391106] [localhost:14258:0] tcp_iface.c:837 UCX ERROR opendir(/sys/class/net) failed: No such file or directory + # These messages contaminate test output, which makes the quicktest suite to fail. The patch adds filtering for these messages. + patches = [ ./filter_mpi_warnings.patch ]; + + preConfigure = '' + patchShebangs ./lib/petsc/bin + configureFlagsArray=( + $configureFlagsArray + ${ + if !mpiSupport then + '' + "--with-mpi=0" + '' + else + '' + "--CC=mpicc" + "--with-cxx=mpicxx" + "--with-fc=mpif90" + "--with-mpi=1" + "--with-metis=1" + "--with-metis-dir=${metis}" + "--with-parmetis=1" + "--with-parmetis-dir=${parmetis}" + '' + } + ${lib.optionalString withp4est '' + "--with-p4est=1" + "--with-zlib-include=${zlib.dev}/include" + "--with-zlib-lib=-L${zlib}/lib -lz" + ''} + ${lib.optionalString hdf5-support '' + "--with-hdf5=1" + "--with-hdf5-fortran-bindings=1" + "--with-hdf5-lib=-L${hdf5}/lib -lhdf5" + "--with-hdf5-include=${hdf5.dev}/include" + ''} + "--with-blas=1" + "--with-lapack=1" + "--with-scalar-type=${petsc-scalar-type}" + "--with-precision=${petsc-precision}" + ${lib.optionalString petsc-optimized '' + "--with-debugging=0" + COPTFLAGS='-O3' + FOPTFLAGS='-O3' + CXXOPTFLAGS='-O3' + CXXFLAGS='-O3' + ''} + ) + ''; + + hardeningDisable = lib.optionals (!petsc-optimized) [ + "fortify" + "fortify3" + ]; + + configureScript = "python ./configure"; + + enableParallelBuilding = true; + + # This is needed as the checks need to compile and link the test cases with + # -lpetsc, which is not available in the checkPhase, which is executed before + # the installPhase. The installCheckPhase comes after the installPhase, so + # the library is installed and available. + doInstallCheck = true; + installCheckTarget = "check_install"; + + meta = with lib; { + description = "Portable Extensible Toolkit for Scientific computation"; + homepage = "https://petsc.org/release/"; + license = licenses.bsd2; + maintainers = with maintainers; [ cburstedde ]; + }; +} diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index 535eff92fb22..6b15867215e9 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "pgmoneta"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; rev = version; - hash = "sha256-+2pS3KG5wwP7bnaV+x8WxvDvQuXqmiMbuLScMNLqBtI="; + hash = "sha256-366UdWw2lJ30LhPR4Q0Iym1BTcgauEwwsGzn6Wew9gk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ph/pharo/package.nix b/pkgs/by-name/ph/pharo/package.nix index 1b76f6261365..5831cebc911e 100644 --- a/pkgs/by-name/ph/pharo/package.nix +++ b/pkgs/by-name/ph/pharo/package.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Clean and innovative Smalltalk-inspired environment"; homepage = "https://pharo.org"; + changelog = "https://github.com/pharo-project/pharo/releases/"; license = lib.licenses.mit; longDescription = '' Pharo's goal is to deliver a clean, innovative, free open-source diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 80dc6f2e6f89..2c40203cf047 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpactor"; - version = "2024.03.09.0"; + version = "2024.06.30.0"; src = fetchFromGitHub { owner = "phpactor"; repo = "phpactor"; rev = finalAttrs.version; - hash = "sha256-1QPBq8S3mOkSackXyCuFdoxfAdUQaRuUfoOfKOGuiR0="; + hash = "sha256-QcKkkgpWWypapQPawK1hu+6tkF9c5ICPeEPWqCwrUBM="; }; - vendorHash = "sha256-9YN+fy+AvNnF0Astrirpewjmh/bSINAhW9fLvN5HGGI="; + vendorHash = "sha256-onUhRO6d2osf7n5QlYY86eamlCCslQMVltAv1shskgI="; nativeBuildInputs = [ installShellFiles ]; @@ -30,6 +30,6 @@ php.buildComposerProject (finalAttrs: { homepage = "https://github.com/phpactor/phpactor"; license = lib.licenses.mit; mainProgram = "phpactor"; - maintainers = [ lib.maintainers.patka ] ++ lib.teams.php.members; + maintainers = lib.teams.php.members; }; }) diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 34ab9d229721..951a7edb5358 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpunit"; - version = "11.2.5"; + version = "11.2.6"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; rev = finalAttrs.version; - hash = "sha256-qHHzhDZYzFWQwuXUCpqWgAP5dx4XKYYPSSY6ITSbYjI="; + hash = "sha256-cR7tJlx0cnWPDWoZAVrGY1UGe9lS4pohFaViC/MxT+w="; }; - vendorHash = "sha256-7SRUjCV8raCUcrxnkQhDNAicBhGXTmLIDr0firdPaUk="; + vendorHash = "sha256-B/uo1isTpGPwQc2K752OwwuNU6jy/YFNWvun8nSSKqM="; passthru.updateScript = nix-update-script { }; @@ -25,6 +25,6 @@ php.buildComposerProject (finalAttrs: { homepage = "https://phpunit.de"; license = lib.licenses.bsd3; mainProgram = "phpunit"; - maintainers = with lib.maintainers; [ onny patka ] ++ lib.teams.php.members; + maintainers = with lib.maintainers; [ onny ] ++ lib.teams.php.members; }; }) diff --git a/pkgs/by-name/ph/phraze/package.nix b/pkgs/by-name/ph/phraze/package.nix new file mode 100644 index 000000000000..1ebd806bfc1d --- /dev/null +++ b/pkgs/by-name/ph/phraze/package.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "phraze"; + version = "0.3.12"; + + src = fetchFromGitHub { + owner = "sts10"; + repo = "phraze"; + rev = "v${version}"; + hash = "sha256-lW7oYivIDGYg78MgcLFFNyxciVk+wKU/OBzWYx3KwPI="; + }; + + doCheck = true; + + cargoHash = "sha256-kFk04YKDYiABWtild6aaP9H8gt/TuckOWRJE69dAXGU="; + + meta = { + description = "Generate random passphrases"; + homepage = "https://github.com/sts10/phraze"; + changelog = "https://github.com/sts10/phraze/releases/tag/v${version}"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ x123 ]; + mainProgram = "phraze"; + }; +} diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix new file mode 100644 index 000000000000..964746933186 --- /dev/null +++ b/pkgs/by-name/pi/picocrypt/package.nix @@ -0,0 +1,78 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + stdenv, + darwin, + copyDesktopItems, + makeDesktopItem, + + xorg, + glfw, + gtk3, + pkg-config, + wrapGAppsHook3, +}: + +buildGoModule rec { + pname = "picocrypt"; + version = "1.37"; + + src = fetchFromGitHub { + owner = "Picocrypt"; + repo = "Picocrypt"; + rev = version; + hash = "sha256-K1zaDHTI9NH2Xn2N1aiE2+wZrfVQBvqIyLTBCZs3Am8="; + }; + + sourceRoot = "${src.name}/src"; + + vendorHash = "sha256-lc34GeO8y5XGRk0x6ghw/m/Ew7TDn6MOk4fc2u9UofQ="; + + ldflags = [ + "-s" + "-w" + ]; + + buildInputs = + # Depends on a vendored, patched GLFW. + glfw.buildInputs or [ ] + ++ glfw.propagatedBuildInputs or [ ] + ++ lib.optionals (!stdenv.isDarwin) [ + gtk3 + xorg.libXxf86vm + ]; + + nativeBuildInputs = [ + copyDesktopItems + pkg-config + wrapGAppsHook3 + ]; + + CGO_ENABLED = 1; + + postInstall = '' + mv $out/bin/Picocrypt $out/bin/picocrypt-gui + install -Dm644 $src/images/key.svg $out/share/icons/hicolor/scalable/apps/picocrypt.svg + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Picocrypt"; + exec = "picocrypt-gui"; + icon = "picocrypt"; + comment = meta.description; + desktopName = "Picocrypt"; + categories = [ "Utility" ]; + }) + ]; + + meta = { + description = "Very small, very simple, yet very secure encryption tool, written in Go"; + homepage = "https://github.com/Picocrypt/Picocrypt"; + changelog = "https://github.com/Picocrypt/Picocrypt/blob/main/Changelog.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ryand56 ]; + mainProgram = "picocrypt-gui"; + }; +} diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix index 998514b3f981..8337b0f694b4 100644 --- a/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -8,13 +8,13 @@ }: picom.overrideAttrs (previousAttrs: { pname = "picom-pijulius"; - version = "8.2-unstable-2024-06-13"; + version = "8.2-unstable-2024-07-01"; src = fetchFromGitHub { owner = "pijulius"; repo = "picom"; - rev = "a0e818855daba0d2f11a298f7fd238f8a6049167"; - hash = "sha256-w1SWYhPfFGX2EumEe8UBZA3atW4jvW54GsMYLGg59Ys="; + rev = "b8fe9323e7606709d692976a7fe7d2455b328bc6"; + hash = "sha256-bXeoWg1ZukXv+6ZNeRc8gGNsbtBztyW5lpfK0lQK+DE="; }; buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ]; diff --git a/pkgs/by-name/pi/pietrasanta-traceroute/package.nix b/pkgs/by-name/pi/pietrasanta-traceroute/package.nix index fef33f4b1ba3..195ea1ad97b0 100644 --- a/pkgs/by-name/pi/pietrasanta-traceroute/package.nix +++ b/pkgs/by-name/pi/pietrasanta-traceroute/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pietrasanta-traceroute"; - version = "0.0.5-unstable-2023-11-28"; + version = "0.0.5-unstable-2024-06-11"; src = fetchFromGitHub { owner = "catchpoint"; repo = "Networking.traceroute"; - rev = "c870c7bd7bafeab815f8564a67a281892c3a6230"; - hash = "sha256-CKqm8b6qNLEpso25+uTvtiR/hFMKJzuXUZkQ7lWzGd8="; + rev = "5b9f9cd2cbd5b8d90442d4ddb71ab788297e2153"; + hash = "sha256-/WsBh42brVCRP31LnCPS34kRaQKMvP+XEENyD5MjCfw="; }; passthru.updateScript = unstableGitUpdater { }; @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { mainProgram = "traceroute"; maintainers = with maintainers; [ nicoo ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/by-name/pi/piv-agent/package.nix b/pkgs/by-name/pi/piv-agent/package.nix index b37b38163a94..d1c35d815341 100644 --- a/pkgs/by-name/pi/piv-agent/package.nix +++ b/pkgs/by-name/pi/piv-agent/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "piv-agent"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "smlx"; repo = "piv-agent"; rev = "v${version}"; - hash = "sha256-M6klwP85Ujd/DtWh4AwCVrqk6GYqxdz0DrnKKbmdtX4="; + hash = "sha256-nHxtQaQ5Lc0QAJrWU6fUWViDwOKkxVyj9/B6XZ+Y0zw="; }; vendorHash = "sha256-L5HuTYA01w3LUtSy7OVxG6QN5uQZ8LVYyrBcJQTkIUA="; diff --git a/pkgs/by-name/pk/pkcs11-provider/package.nix b/pkgs/by-name/pk/pkcs11-provider/package.nix index d0d03d70a9e9..334431587708 100644 --- a/pkgs/by-name/pk/pkcs11-provider/package.nix +++ b/pkgs/by-name/pk/pkcs11-provider/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pkcs11-provider"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "latchset"; repo = "pkcs11-provider"; rev = "v${version}"; - hash = "sha256-f4BbW2awSXS1srSkn1CTRCqNp+2pvVpc4YL79Ht0w0A="; + hash = "sha256-ii2xQPBgqIjrAP27qTQR9IXbEGZcc79M/cYzFwcAajQ="; }; buildInputs = [ openssl nss p11-kit ]; diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix new file mode 100644 index 000000000000..c70384091934 --- /dev/null +++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, kdePackages +}: +stdenv.mkDerivation (finalAttrs: { + pname = "plasmusic-toolbar"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "ccatterina"; + repo = "plasmusic-toolbar"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rThoh7NkpWlKUNOsAY9WEt1F1MFoKliNYCB9ySfKYy8="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/plasma/plasmoids/plasmusic-toolbar + cp -r src/* $out/share/plasma/plasmoids/plasmusic-toolbar + runHook postInstall + ''; + + meta = { + description = "KDE Plasma widget that shows currently playing song information and provide playback controls."; + homepage = "https://github.com/ccatterina/plasmusic-toolbar"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + inherit (kdePackages.kwindowsystem.meta) platforms; + }; +}) diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index 84584bf42188..2306bee07642 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -33,11 +33,11 @@ }: stdenv.mkDerivation rec { pname = "plasticity"; - version = "24.1.6"; + version = "24.1.7"; src = fetchurl { url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm"; - hash = "sha256-gGfDsAqg0PkORrOEvBWLpKgLv5a+M9Rj+oC+jF1gYqA="; + hash = "sha256-HVAQXDfj/5UoOGvgrOW09xFeVv4MF/wXqxtRdwZAqso="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/pm/pm2/package.nix b/pkgs/by-name/pm/pm2/package.nix index 20ad72df7853..271c4eec105c 100644 --- a/pkgs/by-name/pm/pm2/package.nix +++ b/pkgs/by-name/pm/pm2/package.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "pm2"; - version = "5.4.1"; + version = "5.4.2"; src = fetchFromGitHub { owner = "Unitech"; repo = "pm2"; rev = "v${version}"; - hash = "sha256-LMBQ1+VyGjq76Qs5HtELSvEuml3XfzLBbvcuAFuJzw4="; + hash = "sha256-8Fsh7rld7rtT55qVgj3/XbujNpZx0BfzTRcLjdPLFSA="; }; - npmDepsHash = "sha256-hXP+rXXn0Ds81D2iLWVkgfFiFA3dDD5wrAoVivHaRHA="; + npmDepsHash = "sha256-Rp3euhURkZgVyszyAwrIftL7lY4aoP+Q4kSQBFxwTcs="; dontNpmBuild = true; diff --git a/pkgs/by-name/pn/pnfft/package.nix b/pkgs/by-name/pn/pnfft/package.nix index 43890b217e62..10d6278aec8b 100644 --- a/pkgs/by-name/pn/pnfft/package.nix +++ b/pkgs/by-name/pn/pnfft/package.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Parallel nonequispaced fast Fourier transforms"; homepage = "https://www-user.tu-chemnitz.de/~potts/workgroup/pippig/software.php.en#pnfft"; + changelog = "https://github.com/mpip/pnfft/blob/master/ChangeLog"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ hmenke ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/po/pocl/package.nix b/pkgs/by-name/po/pocl/package.nix new file mode 100644 index 000000000000..d3c58c00e21e --- /dev/null +++ b/pkgs/by-name/po/pocl/package.nix @@ -0,0 +1,92 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + cmake, + pkg-config, + hwloc, + llvmPackages, + libxml2, # required for statically linked llvm + spirv-llvm-translator, + spirv-tools, + lttng-ust, + ocl-icd, + python3, + runCommand, + makeWrapper, +}: + +let + clang = llvmPackages.clangUseLLVM; + # Workaround to make sure libclang finds libgcc.a and libgcc_s.so when + # invoked from within libpocl + clangWrapped = runCommand "clang-pocl" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p $out/bin + cp -r ${clang}/bin/* $out/bin/ + LIBGCC_DIR=$(dirname $(find ${stdenv.cc.cc}/lib/ -name libgcc.a)) + for F in ${clang}/bin/ld*; do + BASENAME=$(basename "$F") + rm -f $out/bin/$BASENAME + makeWrapper ${clang}/bin/$BASENAME $out/bin/$BASENAME \ + --add-flags "-L$LIBGCC_DIR" \ + --add-flags "-L${stdenv.cc.cc.lib}/lib" + done + ''; +in +stdenv.mkDerivation (finalAttrs: { + pname = "pocl"; + version = "6.0"; + + src = fetchFromGitHub { + owner = "pocl"; + repo = "pocl"; + rev = "v${finalAttrs.version}"; + hash = "sha256-NHR9yrI6Odb/s/OBnEVifdcLEXvwqzAMZWpGViv2cJg="; + }; + + cmakeFlags = [ + "-DKERNELLIB_HOST_CPU_VARIANTS=distro" + # avoid the runtime linker pulling in a different llvm e.g. from graphics drivers + "-DSTATIC_LLVM=ON" + "-DENABLE_POCL_BUILDING=OFF" + "-DPOCL_ICD_ABSOLUTE_PATH=ON" + "-DENABLE_ICD=ON" + "-DCLANG=${clangWrapped}/bin/clang" + "-DCLANGXX=${clangWrapped}/bin/clang++" + "-DENABLE_REMOTE_CLIENT=ON" + "-DENABLE_REMOTE_SERVER=ON" + ]; + + nativeBuildInputs = [ + cmake + pkg-config + clangWrapped + python3 + ]; + + buildInputs = [ + hwloc + libxml2 + llvmPackages.llvm + llvmPackages.libclang + lttng-ust + ocl-icd + spirv-tools + spirv-llvm-translator + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A portable open source (MIT-licensed) implementation of the OpenCL standard"; + homepage = "http://portablecl.org"; + changelog = "https://github.com/pocl/pocl/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + jansol + xddxdd + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/po/polarity/Cargo.lock b/pkgs/by-name/po/polarity/Cargo.lock new file mode 100644 index 000000000000..fcb03ea98020 --- /dev/null +++ b/pkgs/by-name/po/polarity/Cargo.lock @@ -0,0 +1,3188 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +dependencies = [ + "anstyle 0.3.5", + "anstyle-parse 0.1.1", + "anstyle-wincon 0.2.0", + "concolor-override", + "concolor-query", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle 1.0.7", + "anstyle-parse 0.2.4", + "anstyle-query", + "anstyle-wincon 3.0.3", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" + +[[package]] +name = "anstyle" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" + +[[package]] +name = "anstyle-parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-parse" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +dependencies = [ + "anstyle 0.3.5", + "windows-sys 0.45.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle 1.0.7", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + +[[package]] +name = "assert_cmd" +version = "2.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" +dependencies = [ + "anstyle 1.0.7", + "bstr", + "doc-comment", + "predicates", + "predicates-core", + "predicates-tree", + "wait-timeout", +] + +[[package]] +name = "async-channel" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-codec-lite" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2527c30e3972d8ff366b353125dae828c4252a154dbe6063684f6c5e014760a3" +dependencies = [ + "anyhow", + "bytes", + "futures-core", + "futures-io", + "futures-sink", + "log", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "async-executor" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +dependencies = [ + "async-channel", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-channel", + "async-global-executor", + "async-io", + "async-lock", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "async-trait" +version = "0.1.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[package]] +name = "atomic-waker" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "auto_impl" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7862e21c893d65a1650125d157eaeec691439379a1cee17ee49031b79236ada4" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "backtrace-ext" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" +dependencies = [ + "backtrace", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "beef" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitpacking" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c7d2ac73c167c06af4a5f37e6e59d84148d57ccbe4480b76f0273eefea82d7" +dependencies = [ + "crunchy", +] + +[[package]] +name = "blocking" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", +] + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "regex-automata 0.4.6", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "census" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fafee10a5dd1cffcb5cc560e0d0df8803d7355a2b12272e3557dee57314cb6e" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +dependencies = [ + "anstream 0.2.6", + "anstyle 0.3.5", + "bitflags", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[package]] +name = "clap_lex" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" + +[[package]] +name = "codespan" +version = "0.11.1" +source = "git+https://github.com/polarity-lang/codespan.git?rev=542320ab177fd38fff3a398a97b3f0352e065149#542320ab177fd38fff3a398a97b3f0352e065149" +dependencies = [ + "lsp-types 0.91.1", + "url", +] + +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "memchr", +] + +[[package]] +name = "concolor-override" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" + +[[package]] +name = "concolor-query" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" +dependencies = [ + "windows-sys 0.45.0", +] + +[[package]] +name = "concurrent-queue" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +dependencies = [ + "crossbeam-utils", +] + +[[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 = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "dashmap" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +dependencies = [ + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +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 = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "elaborator" +version = "0.1.0" +dependencies = [ + "codespan", + "derivative", + "log", + "miette", + "miette_util", + "pretty", + "printer", + "syntax", + "thiserror", +] + +[[package]] +name = "ena" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +dependencies = [ + "log", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "anstream 0.6.14", + "anstyle 1.0.7", + "env_filter", + "humantime", + "log", +] + +[[package]] +name = "errno" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "fail" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5e43d0f78a42ad591453aedb1d7ae631ce7ee445c7643691055a9ed8d3b01c" +dependencies = [ + "log", + "once_cell", + "rand", +] + +[[package]] +name = "fastdivide" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25c7df09945d65ea8d70b3321547ed414bbc540aad5bac6883d021b970f35b04" + +[[package]] +name = "fastfield_codecs" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dff2ee906bb242438742b5ecac909c0719cbd9db546f6c3d9ac86bd93f5b07e" +dependencies = [ + "tantivy-bitpacker", + "tantivy-common", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[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 = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-lite" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generator" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33a20a288a94683f5f4da0adecdbe095c94a77c295e514cc6484e9394dd8376e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + +[[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 = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "htmlescape" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[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 = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[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 = "io-lifetimes" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.45.0", +] + +[[package]] +name = "is_ci" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[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.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "lalrpop" +version = "0.19.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f34313ec00c2eb5c3c87ca6732ea02dcf3af99c3ff7a8fb622ffb99c9d860a87" +dependencies = [ + "ascii-canvas", + "bit-set", + "diff", + "ena", + "is-terminal", + "itertools 0.10.5", + "lalrpop-util 0.19.9", + "petgraph", + "pico-args 0.4.2", + "regex", + "regex-syntax 0.6.29", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", +] + +[[package]] +name = "lalrpop" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" +dependencies = [ + "ascii-canvas", + "bit-set", + "ena", + "itertools 0.11.0", + "lalrpop-util 0.20.2", + "petgraph", + "pico-args 0.5.0", + "regex", + "regex-syntax 0.8.3", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", + "walkdir", +] + +[[package]] +name = "lalrpop-util" +version = "0.19.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5c1f7869c94d214466c5fd432dfed12c379fd87786768d36455892d46b18edd" +dependencies = [ + "regex", +] + +[[package]] +name = "lalrpop-util" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" +dependencies = [ + "regex-automata 0.4.6", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "levenshtein_automata" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" + +[[package]] +name = "libc" +version = "0.2.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" + +[[package]] +name = "lifting" +version = "0.1.0" +dependencies = [ + "codespan", + "derivative", + "renaming", + "syntax", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +dependencies = [ + "value-bag", +] + +[[package]] +name = "logos" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "161971eb88a0da7ae0c333e1063467c5b5727e7fb6b710b8db4814eade3a42e8" +dependencies = [ + "logos-derive", +] + +[[package]] +name = "logos-codegen" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e31badd9de5131fdf4921f6473d457e3dd85b11b7f091ceb50e4df7c3eeb12a" +dependencies = [ + "beef", + "fnv", + "lazy_static", + "proc-macro2", + "quote", + "regex-syntax 0.8.3", + "syn 2.0.13", +] + +[[package]] +name = "logos-derive" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c2a69b3eb68d5bd595107c9ee58d7e07fe2bb5e360cc85b0f084dedac80de0a" +dependencies = [ + "logos-codegen", +] + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "pin-utils", + "scoped-tls", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "lowering" +version = "0.1.0" +dependencies = [ + "codespan", + "miette", + "miette_util", + "num-bigint", + "parser", + "syntax", + "thiserror", +] + +[[package]] +name = "lru" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "lsp-browser" +version = "0.0.0" +dependencies = [ + "console_error_panic_hook", + "futures", + "js-sys", + "lsp-server", + "tower-lsp", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", +] + +[[package]] +name = "lsp-server" +version = "0.1.0" +dependencies = [ + "async-lock", + "codespan", + "lsp-types 0.93.2", + "miette", + "miette_util", + "printer", + "query", + "syntax", + "tower-lsp", +] + +[[package]] +name = "lsp-types" +version = "0.91.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2368312c59425dd133cb9a327afee65be0a633a8ce471d248e2202a48f8f68ae" +dependencies = [ + "bitflags", + "serde", + "serde_json", + "serde_repr", + "url", +] + +[[package]] +name = "lsp-types" +version = "0.93.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51" +dependencies = [ + "bitflags", + "serde", + "serde_json", + "serde_repr", + "url", +] + +[[package]] +name = "lz4_flex" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a8cbbb2831780bc3b9c15a41f5b49222ef756b6730a95f3decfdd15903eb5a3" + +[[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 = "measure_time" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56220900f1a0923789ecd6bf25fbae8af3b2f1ff3e9e297fc9b6b8674dd4d852" +dependencies = [ + "instant", + "log", +] + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miette" +version = "5.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abdc09c381c9336b9f2e9bd6067a9a5290d20e2d2e2296f275456121c33ae89" +dependencies = [ + "backtrace", + "backtrace-ext", + "is-terminal", + "miette-derive", + "once_cell", + "owo-colors", + "supports-color", + "supports-hyperlinks", + "supports-unicode", + "terminal_size", + "textwrap", + "thiserror", + "unicode-width", +] + +[[package]] +name = "miette-derive" +version = "5.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8842972f23939443013dfd3720f46772b743e86f1a81d120d4b6fb090f87de1c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[package]] +name = "miette_util" +version = "0.1.0" +dependencies = [ + "codespan", + "miette", +] + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "murmurhash32" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d736ff882f0e85fe9689fb23db229616c4c00aee2b3ac282f666d8f20eb25d4a" +dependencies = [ + "byteorder", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi 0.3.9", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "numtoa" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" + +[[package]] +name = "object" +version = "0.30.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "oneshot" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc22d22931513428ea6cc089e942d38600e3d00976eef8c86de6b8a3aadec6eb" +dependencies = [ + "loom", +] + +[[package]] +name = "output_vt100" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "ownedbytes" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2981bd7cfb2a70e6c50083c60561275a269fc7458f151c53b126ec1b15cc040" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "parking" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" + +[[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.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "windows-sys 0.45.0", +] + +[[package]] +name = "parser" +version = "0.1.0" +dependencies = [ + "codespan", + "lalrpop 0.19.9", + "lalrpop 0.20.2", + "lalrpop-util 0.20.2", + "logos", + "miette", + "num-bigint", + "thiserror", + "url", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "polarity" +version = "0.1.0" +dependencies = [ + "assert_cmd", + "async-std", + "clap", + "elaborator", + "env_logger", + "futures", + "lsp-server", + "miette", + "printer", + "query", + "syntax", + "termsize", + "thiserror", + "tokio", + "tower-lsp", +] + +[[package]] +name = "polling" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" +dependencies = [ + "autocfg", + "bitflags", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.45.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "predicates" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +dependencies = [ + "anstyle 1.0.7", + "difflib", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" + +[[package]] +name = "predicates-tree" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "pretty" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83f3aa1e3ca87d3b124db7461265ac176b40c277f37e503eaa29c9c75c037846" +dependencies = [ + "arrayvec", + "log", + "termcolor", + "typed-arena", + "unicode-segmentation", +] + +[[package]] +name = "pretty_assertions" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +dependencies = [ + "ctor", + "diff", + "output_vt100", + "yansi", +] + +[[package]] +name = "printer" +version = "0.1.0" +dependencies = [ + "pretty", + "syntax", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "query" +version = "0.1.0" +dependencies = [ + "codespan", + "elaborator", + "lifting", + "lowering", + "miette", + "parser", + "printer", + "renaming", + "ropey", + "rust-lapper", + "syntax", + "thiserror", + "url", + "xfunc", +] + +[[package]] +name = "quote" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +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.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_termios" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" +dependencies = [ + "redox_syscall 0.2.16", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +dependencies = [ + "aho-corasick 0.7.20", + "memchr", + "regex-syntax 0.6.29", +] + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick 1.1.3", + "memchr", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-syntax" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "renaming" +version = "0.1.0" +dependencies = [ + "codespan", + "syntax", +] + +[[package]] +name = "ropey" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53ce7a2c43a32e50d666e33c5a80251b31147bb4b49024bcab11fb6f20c671ed" +dependencies = [ + "smallvec", + "str_indices", +] + +[[package]] +name = "rust-lapper" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee43d8e721ac803031dbab6a944b957b49a3b11eadbc099880c8aaaebf23ed27" +dependencies = [ + "num-traits", +] + +[[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-demangle" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" + +[[package]] +name = "rustix" +version = "0.37.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustversion" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[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 = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[package]] +name = "serde_json" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "smawk" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "str_indices" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f026164926842ec52deb1938fae44f83dfdb82d0a5b0270c5bd5935ab74d6dd" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared", + "precomputed-hash", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "supports-color" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354" +dependencies = [ + "is-terminal", + "is_ci", +] + +[[package]] +name = "supports-hyperlinks" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b4806e0b03b9906e76b018a5d821ebf198c8e9dc0829ed3328eeeb5094aed60" +dependencies = [ + "is-terminal", +] + +[[package]] +name = "supports-unicode" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b6c2cb240ab5dd21ed4906895ee23fe5a48acdbd15a3ce388e7b62a9b66baf7" +dependencies = [ + "is-terminal", +] + +[[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.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syntax" +version = "0.1.0" +dependencies = [ + "codespan", + "derivative", + "fxhash", + "miette", + "miette_util", + "num-bigint", + "thiserror", + "url", +] + +[[package]] +name = "tantivy" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d1878f2daa432d6b907e1a7e16a25ba7eab6cc0da059e69943276a5165d81b" +dependencies = [ + "async-trait", + "base64", + "bitpacking", + "byteorder", + "census", + "crc32fast", + "crossbeam-channel", + "downcast-rs", + "fail", + "fastdivide", + "fastfield_codecs", + "fnv", + "fs2", + "htmlescape", + "itertools 0.10.5", + "levenshtein_automata", + "log", + "lru", + "lz4_flex", + "measure_time", + "memmap2", + "murmurhash32", + "num_cpus", + "once_cell", + "oneshot", + "ownedbytes", + "pretty_assertions", + "rayon", + "regex", + "rust-stemmers", + "serde", + "serde_json", + "smallvec", + "stable_deref_trait", + "tantivy-bitpacker", + "tantivy-common", + "tantivy-fst", + "tantivy-query-grammar", + "tempfile", + "thiserror", + "time", + "uuid", + "winapi 0.3.9", +] + +[[package]] +name = "tantivy-bitpacker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90f95c862d26a32e1fdb161ab139c5a3bba221f5fac512af40034e13e25f3131" + +[[package]] +name = "tantivy-common" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec19155b3ed963ae1653bc4995ab8175281f68400c39081205ae25b53fd9750" +dependencies = [ + "byteorder", + "ownedbytes", +] + +[[package]] +name = "tantivy-fst" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb20cdc0d83e9184560bdde9cd60142dbb4af2e0f770e88fce45770495224205" +dependencies = [ + "byteorder", + "regex-syntax 0.4.2", + "utf8-ranges", +] + +[[package]] +name = "tantivy-query-grammar" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6bbdce99f2b8dcbe24ee25acffb36a2b45b31344531374df1008f6a64bb583" +dependencies = [ + "combine", + "once_cell", + "regex", +] + +[[package]] +name = "tempfile" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.45.0", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi 0.3.9", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "terminal_size" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "termion" +version = "1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" +dependencies = [ + "libc", + "numtoa", + "redox_syscall 0.2.16", + "redox_termios", +] + +[[package]] +name = "termsize" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e86d824a8e90f342ad3ef4bd51ef7119a9b681b0cc9f8ee7b2852f02ccd2517" +dependencies = [ + "atty", + "kernel32-sys", + "libc", + "termion", + "winapi 0.2.8", +] + +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + +[[package]] +name = "test-runner" +version = "0.1.0" +dependencies = [ + "clap", + "elaborator", + "env_logger", + "lowering", + "parser", + "printer", + "renaming", + "serde", + "serde_derive", + "syntax", + "tantivy", + "toml", + "url", +] + +[[package]] +name = "textwrap" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" +dependencies = [ + "smawk", + "unicode-linebreak", + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[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 = "time" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +dependencies = [ + "time-core", +] + +[[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.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +dependencies = [ + "autocfg", + "num_cpus", + "pin-project-lite", + "windows-sys 0.45.0", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-lsp" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43e094780b4447366c59f79acfd65b1375ecaa84e61dddbde1421aa506334024" +dependencies = [ + "async-codec-lite", + "async-trait", + "auto_impl", + "bytes", + "dashmap", + "futures", + "httparse", + "log", + "lsp-types 0.93.2", + "memchr", + "serde", + "serde_json", + "tower", + "tower-lsp-macros", +] + +[[package]] +name = "tower-lsp-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ebd99eec668d0a450c177acbc4d05e0d0d13b1f8d3db13cd706c52cbec4ac04" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + +[[package]] +name = "unicode-linebreak" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" +dependencies = [ + "hashbrown", + "regex", +] + +[[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.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[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 = "utf8-ranges" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-bag" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[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.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 1.0.109", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +dependencies = [ + "cfg-if", + "futures-core", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "wasm-streams" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[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.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "xfunc" +version = "0.1.0" +dependencies = [ + "codespan", + "miette", + "syntax", + "thiserror", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix new file mode 100644 index 000000000000..7ae41d90317d --- /dev/null +++ b/pkgs/by-name/po/polarity/package.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "polarity"; + version = "0-unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "polarity-lang"; + repo = "polarity"; + rev = "59bd7a2c3c3d0a61b25d3bb85b9d21f7b3fef343"; + hash = "sha256-85uo2GAGxWAWwN2vyhUqwz28Ofb+2eOSuetzovAle+A="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { "codespan-0.11.1" = "sha256-Wq99v77bqSGIOK/iyv+x/EG1563XSeaTDW5K2X3kSXU="; }; + }; + + meta = { + description = "A Language with Dependent Data and Codata Types"; + homepage = "https://polarity-lang.github.io/"; + changelog = "https://github.com/polarity-lang/polarity/blob/${src.rev}/CHANGELOG.md"; + license = with lib.licenses; [ mit asl20 ]; + maintainers = [ lib.maintainers.mangoiv ]; + mainProgram = "pol"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix index 66da65842d31..7771eec81d2b 100644 --- a/pkgs/by-name/po/polybar/package.nix +++ b/pkgs/by-name/po/polybar/package.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { having a black belt in shell scripting. ''; license = licenses.mit; - maintainers = with maintainers; [ afldcr Br1ght0ne moni ckie ]; + maintainers = with maintainers; [ afldcr Br1ght0ne moni ]; mainProgram = "polybar"; platforms = platforms.linux; }; diff --git a/pkgs/by-name/po/powerjoular/package.nix b/pkgs/by-name/po/powerjoular/package.nix index 213e61c62726..7bed7daab639 100644 --- a/pkgs/by-name/po/powerjoular/package.nix +++ b/pkgs/by-name/po/powerjoular/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "powerjoular"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "joular"; repo = pname; rev = version; - hash = "sha256-3YKoxZTh9ScudAtsE4CJUbcallm7/vvxIdXwaOZt2hA="; + hash = "sha256-1XNXe5EZHB1kK2C5oyRt4TzfjZivW9DOEvS1MxJHC8E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix index 513227e5637c..404d64790992 100644 --- a/pkgs/by-name/pr/pragtical/package.nix +++ b/pkgs/by-name/pr/pragtical/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pragtical"; - version = "3.3.1"; + version = "3.4.0"; pluginManagerVersion = "1.2.9"; src = fetchFromGitHub { @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { find subprojects -type d -name .git -prune -execdir rm -r {} + ''; - hash = "sha256-T0IHpfMfx4P84RyBLtaYNead6a7cID2cUYwkyNnYMgc="; + hash = "sha256-6feS9ougTlunkIr1WRUYieR4O8vHN1++VdfX5DreWFg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/pre2k/package.nix b/pkgs/by-name/pr/pre2k/package.nix index 4865269b5565..98b763cb011d 100644 --- a/pkgs/by-name/pr/pre2k/package.nix +++ b/pkgs/by-name/pr/pre2k/package.nix @@ -24,7 +24,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 784976d06eaf..6313a6748b8d 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -91,7 +91,6 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gettext ] ++ (with python.pkgs; [ - pythonRelaxDepsHook setuptools ]); @@ -99,12 +98,14 @@ python.pkgs.buildPythonApplication rec { "celery" "css-inline" "cssutils" + "django-compressor" "django-csp" "django-filter" "django-hierarkey" "djangorestframework" "markdown" "pillow" + "publicsuffixlist" "python-dateutil" "reportlab" "requests" diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index f4e744af6748..fa30d5c1a17d 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -34,17 +34,19 @@ let }; pretix-plugin-build = self.callPackage ./plugin-build.nix { }; + + sentry-sdk = super.sentry-sdk_2; }; }; pname = "pretix"; - version = "2024.5.0"; + version = "2024.6.0"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; rev = "refs/tags/v${version}"; - hash = "sha256-dLzCugbRQSGuOwe99a3WLMffisyvYWNRdSdcdW9knjY="; + hash = "sha256-erI3Ai6zwNSvMiF3YKfnU9ePb9R92rfi5rsxfAOh6EQ="; }; npmDeps = buildNpmPackage { @@ -52,7 +54,7 @@ let inherit version src; sourceRoot = "${src.name}/src/pretix/static/npm_dir"; - npmDepsHash = "sha256-SEgAC3dmnxG1xM9QZQ/e+6NFOwXU3tXlbfZCzrAMFO0="; + npmDepsHash = "sha256-//CLPnx5eUxIHIUGc7x2UF8qsfAYRtvHbHXSDNtI/eI="; dontBuild = true; @@ -97,7 +99,8 @@ python.pkgs.buildPythonApplication rec { --replace-fail "protobuf==5.27.*" protobuf \ --replace-fail "pycryptodome==3.20.*" pycryptodome \ --replace-fail "python-dateutil==2.9.*" python-dateutil \ - --replace-fail "requests==2.32.*" "requests" \ + --replace-fail "requests==2.31.*" "requests" \ + --replace-fail "sentry-sdk==2.5.*" "sentry-sdk>=2" \ --replace-fail "stripe==7.9.*" stripe ''; @@ -226,6 +229,13 @@ python.pkgs.buildPythonApplication rec { disabledTests = [ # unreliable around day changes "test_order_create_invoice" + + # outdated translation files + # https://github.com/pretix/pretix/commit/c4db2a48b6ac81763fa67475d8182aee41c31376 + "test_different_dates_spanish" + "test_same_day_spanish" + "test_same_month_spanish" + "test_same_year_spanish" ]; preCheck = '' diff --git a/pkgs/development/tools/prettierd/package.json b/pkgs/by-name/pr/prettierd/package.json similarity index 100% rename from pkgs/development/tools/prettierd/package.json rename to pkgs/by-name/pr/prettierd/package.json diff --git a/pkgs/development/tools/prettierd/default.nix b/pkgs/by-name/pr/prettierd/package.nix similarity index 79% rename from pkgs/development/tools/prettierd/default.nix rename to pkgs/by-name/pr/prettierd/package.nix index bf7ab9e69203..1025a90fbd37 100644 --- a/pkgs/development/tools/prettierd/default.nix +++ b/pkgs/by-name/pr/prettierd/package.nix @@ -1,10 +1,10 @@ -{ lib -, mkYarnPackage -, fetchFromGitHub -, makeWrapper -, nodejs -, fetchYarnDeps -, +{ + lib, + mkYarnPackage, + fetchFromGitHub, + makeWrapper, + nodejs, + fetchYarnDeps, }: mkYarnPackage rec { pname = "prettierd"; @@ -40,13 +40,16 @@ mkYarnPackage rec { doDist = false; - meta = with lib; { + meta = { mainProgram = "prettierd"; description = "Prettier, as a daemon, for improved formatting speed"; homepage = "https://github.com/fsouza/prettierd"; - license = licenses.isc; + license = lib.licenses.isc; changelog = "https://github.com/fsouza/prettierd/blob/${src.rev}/CHANGELOG.md"; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ NotAShelf n3oney ]; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ + NotAShelf + n3oney + ]; }; } diff --git a/pkgs/by-name/pr/progress-tracker/package.nix b/pkgs/by-name/pr/progress-tracker/package.nix new file mode 100644 index 000000000000..5cc967b5ef1d --- /dev/null +++ b/pkgs/by-name/pr/progress-tracker/package.nix @@ -0,0 +1,58 @@ +{ + lib, + catch2_3, + cmake, + fetchFromGitHub, + gtkmm4, + libadwaita, + pcre2, + pkg-config, + stdenv, + tinyxml-2, + wrapGAppsHook4, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "progress-tracker"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "smolBlackCat"; + repo = "progress-tracker"; + rev = "v${finalAttrs.version}"; + hash = "sha256-0FpWUNsXYIQRn6ciLoRbKBuEZT739sAAIfSBxFqfEpk="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + catch2_3 + gtkmm4 + libadwaita + pcre2 + tinyxml-2 + ]; + + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace-fail "/usr/bin/" "${placeholder "out"}/bin/" + + substituteInPlace po/CMakeLists.txt \ + --replace-fail "/usr/share/" "${placeholder "out"}/share/" + + substituteInPlace data/CMakeLists.txt \ + --replace-fail "/usr/share/" "${placeholder "out"}/share/" + ''; + + meta = { + description = "Simple kanban-style task organiser"; + homepage = "https://github.com/smolBlackCat/progress-tracker"; + license = lib.licenses.mit; + mainProgram = "progress"; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix b/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix new file mode 100644 index 000000000000..3b98cf5e3d76 --- /dev/null +++ b/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix @@ -0,0 +1,35 @@ +{ lib +, python3 +, fetchFromGitHub +, nixosTests +}: + +python3.pkgs.buildPythonApplication rec { + pname = "deluge-exporter"; + version = "2.4.0-unstable-2024-06-02"; + + src = fetchFromGitHub { + owner = "ibizaman"; + repo = "deluge_exporter"; + rev = "8d446c8cba4a324aa052e66c115121b23adc970f"; + hash = "sha256-1brLWx6IEGffcvHPCkz10k9GCNQIXXJ9PYZuEzlKHTA="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + deluge-client + loguru + prometheus-client + ]; + + pythonImportsCheck = [ + "deluge_exporter" + ]; + + meta = with lib; { + description = "Prometheus exporter for Deluge"; + homepage = "https://github.com/ibizaman/deluge_exporter"; + license = licenses.isc; + maintainers = with maintainers; [ ibizaman ]; + mainProgram = "deluge-exporter"; + }; +} diff --git a/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix index 179acfe520ac..49ca4c9d6d84 100644 --- a/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix +++ b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix @@ -10,10 +10,10 @@ stdenv.mkDerivation ( in { pname = "jmx-prometheus-javaagent"; - version = "0.20.0"; + version = "1.0.1"; src = fetchurl { url = "mirror://maven/io/prometheus/jmx/jmx_prometheus_javaagent/${finalAttrs.version}/${jarName}"; - sha256 = "sha256-i2ftQEhdR1ZIw20R0hRktIRAb4X6+RKzNj9xpqeGEyA="; + sha256 = "sha256-fWH3N/1mFhDMwUrqeXZPqh6pSjQMvI8AKbPS7eo9gME="; }; dontUnpack = true; diff --git a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix index 1c9098997010..217449b85bb4 100644 --- a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "squid-exporter"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "boynux"; repo = "squid-exporter"; rev = "v${version}"; - sha256 = "sha256-43f6952IqUHoB5CN0p5R5J/sMKbTe2msF9FGqykwMBo="; + sha256 = "sha256-low1nIL7FbIYfIP7KWPskAQ50Hh+d7JI+ryYoR+mP10="; }; - vendorHash = null; + vendorHash = "sha256-0BNhjNveUDd0+X0do4Md58zJjXe3+KN27MPEviNuF3g="; meta = { description = "Squid Prometheus exporter"; diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 3afa04ec788a..71e26e3d57b4 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.37.1"; + version = "0.38.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-IqXxjR+M1OCRKUA2HCT6WQvdBMOa0efT8m+drhyQCoE="; + hash = "sha256-60PLC/5aouvUy33Qw/orEv+3/3j//3frUxZdh4chlMc="; }; - cargoHash = "sha256-NnTiT1jLMo9EfYau+U0FiAC+V67GnoI90vSsotwniio="; + cargoHash = "sha256-l6BzvJI+DimykVKYl7Gow+7f3uwfDFajmHcXKoUwcUk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 186943dd9dca..d5a19506a42d 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -1,18 +1,22 @@ -{ lib -, stdenvNoCC -, fetchzip -, writeScript +{ + lib, + stdenvNoCC, + fetchzip, + writeScript, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-7"; + version = "GE-Proton9-10"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-/FXdyPuCe6rD5HoMOHPVlwRXu3DMJ3lEOnRloYZMA8s="; + hash = "sha256-dd0qR/iin3VWAMTOvoOURk6s+PNBnZaXBhnxpczL6w8="; }; - outputs = [ "out" "steamcompattool" ]; + outputs = [ + "out" + "steamcompattool" + ]; buildCommand = '' runHook preBuild @@ -50,7 +54,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/GloriousEggroll/proton-ge-custom"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ NotAShelf shawn8901 ]; + maintainers = with lib.maintainers; [ + NotAShelf + shawn8901 + ]; platforms = [ "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index 1d22e7a5d5ba..572bff100579 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.18.0"; + version = "1.19.2"; src = fetchurl { url = "https://proton.me/download/PassDesktop/linux/x64/ProtonPass_${finalAttrs.version}.deb"; - hash = "sha256-dP6mXa5KOK35T3LCL/51/wi/dScqNj6bNYFOl4lCbcY="; + hash = "sha256-p16QleX6ZUu6ZfEPWCaTaWcMzoF2ruNgtvnDDH95iLQ="; }; dontConfigure = true; diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index cf843d8ab1c7..4b19cadb0e3a 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -34,10 +34,6 @@ python3.pkgs.buildPythonApplication rec { "slack-sdk" ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - build-system = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/by-name/pt/ptyxis/package.nix b/pkgs/by-name/pt/ptyxis/package.nix index 18a9da1fc7cf..6c08b924f8cd 100644 --- a/pkgs/by-name/pt/ptyxis/package.nix +++ b/pkgs/by-name/pt/ptyxis/package.nix @@ -15,14 +15,14 @@ }: let - version = "46.3"; + version = "46.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "ptyxis"; rev = version; - hash = "sha256-DKZgnistOv6eFWtqYPtMc1tQJWovCWIqrqGgs9uWu5k="; + hash = "sha256-FIq05EDOEi0qx6s5i5a2T9bacVUMQWe0nl6xUp6CY1s="; }; vte-gtk4-patched = vte-gtk4.overrideAttrs (prev: { diff --git a/pkgs/by-name/pv/pvsneslib/package.nix b/pkgs/by-name/pv/pvsneslib/package.nix index 80f8e333d370..fe78293e2e07 100644 --- a/pkgs/by-name/pv/pvsneslib/package.nix +++ b/pkgs/by-name/pv/pvsneslib/package.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { meta = { description = "Free and open source development kit for the Nintendo SNES"; homepage = "https://github.com/alekmaul/pvsneslib"; + changelog = "https://github.com/alekmaul/pvsneslib/releases/tag/${src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ soyouzpanda ]; mainProgram = "pvsneslib"; diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 6ab92197c131..8d53e6cd0a38 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.369"; + version = "1.1.370"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-YAv+2QiArHoZrLNisCFaBNhqQm5uHJdtil0w4xtLl4k="; + hash = "sha256-IYQ6HUEaT3KjMcFeWal4Ru2A/Kxf7sAMZ1p48l9RQ2o="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-xnS7guT8E/wHk3d2ESve4HgMPfH/NuP5TsnsGlvQtUI="; + npmDepsHash = "sha256-P57+FEyjsHXwZ3A91bfecCuXvkrrwqsRHMjV3oGt1Nw="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-ijG0thy0YPPrgMYCJrRqIXkexuHVKcXX7PxPpCJbsg8="; + npmDepsHash = "sha256-tLRSGuJMKAKvTsmERI7SyQXamAJPi/h4P/wQEo4HdtY="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/py/pysqlrecon/package.nix b/pkgs/by-name/py/pysqlrecon/package.nix index e2019c45b134..d9d8c51bb828 100644 --- a/pkgs/by-name/py/pysqlrecon/package.nix +++ b/pkgs/by-name/py/pysqlrecon/package.nix @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix index bc45201732d7..189441135aeb 100644 --- a/pkgs/by-name/py/pywal16/package.nix +++ b/pkgs/by-name/py/pywal16/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pywal16"; - version = "3.5.4"; + version = "3.6.0"; pyproject = true; src = fetchFromGitHub { owner = "eylles"; repo = "pywal16"; rev = "refs/tags/${version}"; - hash = "sha256-14xl0E4zpUCjW8rkqWA87TGsDy8lgqOQm9GeE9JIsVk="; + hash = "sha256-YKHOH1bEsZHTgYm8AYpfA6C8RtWxAqNQ+GHMcdaj/JU="; }; nativeBuildInputs = [ python3.pkgs.setuptools ]; diff --git a/pkgs/by-name/py/pyzy/package.nix b/pkgs/by-name/py/pyzy/package.nix new file mode 100644 index 000000000000..5fdcae56c47b --- /dev/null +++ b/pkgs/by-name/py/pyzy/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + python3, + glib, + libuuid, + sqlite, + nix-update-script, +}: + +stdenv.mkDerivation { + pname = "pyzy"; + version = "1.1-unstable-2023-02-28"; + + src = fetchFromGitHub { + owner = "openSUSE"; + repo = "pyzy"; + rev = "ec719d053bd491ec64fe68fe0d1699ca6039ad80"; + hash = "sha256-wU7EgP/CPNhBx9N7mOu0WdnoLazzpQtbRxmBKrTUbKM="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + python3 + ]; + + buildInputs = [ + glib + libuuid + sqlite + ]; + + postPatch = '' + patchShebangs ./data/db/android/create_db.py + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = with lib; { + description = "The Chinese PinYin and Bopomofo conversion library"; + homepage = "https://github.com/openSUSE/pyzy"; + license = licenses.lgpl21; + maintainers = with maintainers; [ azuwis ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/qp/qpoases/package.nix b/pkgs/by-name/qp/qpoases/package.nix index 5dec04c6aee7..42e442d4ff07 100644 --- a/pkgs/by-name/qp/qpoases/package.nix +++ b/pkgs/by-name/qp/qpoases/package.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Open-source C++ implementation of the recently proposed online active set strategy"; homepage = "https://github.com/coin-or/qpOASES"; + changelog = "https://github.com/coin-or/qpOASES/blob/${finalAttrs.src.rev}/VERSIONS.txt"; license = licenses.lgpl21; maintainers = with maintainers; [ nim65s ]; }; diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index 1b4c4a29ac2e..ff76f6aa512e 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "qrtool"; - version = "0.10.10"; + version = "0.11.0"; src = fetchFromGitHub { owner = "sorairolake"; repo = "qrtool"; rev = "v${version}"; - sha256 = "sha256-2gUvnQjAA0nTeJL4IbsfCmeSD+mGKjywJCCi914f5mM="; + sha256 = "sha256-p9iQznP7/eGSHB4V+AzscStjdnllKEW2igvaxjJ1LN4="; }; - cargoHash = "sha256-M5G5f+aycpIbFaPbkUNalMK3if1PIAXD7MaNsLzdvI4="; + cargoHash = "sha256-aGg50NEJbKnfMAlO0KhSztabuvcXDRnKAR8hdfMpAbA="; nativeBuildInputs = [ asciidoctor installShellFiles ]; diff --git a/pkgs/by-name/qt/qtractor/package.nix b/pkgs/by-name/qt/qtractor/package.nix index 67f2e2b86501..d92c1c5eca3f 100644 --- a/pkgs/by-name/qt/qtractor/package.nix +++ b/pkgs/by-name/qt/qtractor/package.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.39"; + version = "1.0.0"; src = fetchurl { url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz"; - hash = "sha256-5gyPNxthrBbSHvlvJbQ0rvxVEq68uQEg+qnxHQb+NVU="; + hash = "sha256-yoVxRUXUhZrIzJVWLKA6G4hBf52dvJdr7FlfM+ZHUeo="; }; nativeBuildInputs = [ @@ -73,6 +73,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Audio/MIDI multi-track sequencer"; homepage = "https://qtractor.sourceforge.io"; + changelog = let + version' = builtins.replaceStrings ["."] ["_"] version; + in "https://github.com/rncbc/qtractor/blob/qtractor_${version'}/ChangeLog"; license = licenses.gpl2Plus; mainProgram = "qtractor"; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index adc40aeea30d..80501f0f5e04 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.11.3"; + version = "3.12.0"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-cZZoGU7v3SKe3dvYUR5T8jKwAkLnDJt+SWYzgMmdJwA="; + hash = "sha256-bausbHHKyX6ITYz1a0xb2AxPeyJlyp/ddzCRs1nYuOc="; }; nativeBuildInputs = [ makeWrapper ]; @@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Quarkus is a Kubernetes-native Java framework tailored for GraalVM and HotSpot, crafted from best-of-breed Java libraries and standards"; homepage = "https://quarkus.io"; + changelog = "https://github.com/quarkusio/quarkus/releases/tag/${finalAttrs.version}"; license = licenses.asl20; maintainers = [ maintainers.vinetos ]; platforms = platforms.all; diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix index 83b44bfc388d..1f8e0cf07118 100644 --- a/pkgs/by-name/qu/quickemu/package.nix +++ b/pkgs/by-name/qu/quickemu/package.nix @@ -14,7 +14,7 @@ pciutils, procps, python3, - qemu, + qemu_full, socat, spice-gtk, swtpm, @@ -42,7 +42,7 @@ let pciutils procps python3 - qemu + qemu_full socat swtpm util-linux @@ -73,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: { -e '/OVMF_CODE_4M.fd/s|ovmfs=(|ovmfs=("${OVMF.firmware}","${OVMF.variables}" |' \ -e '/cp "''${VARS_IN}" "''${VARS_OUT}"/a chmod +w "''${VARS_OUT}"' \ -e 's/Icon=.*qemu.svg/Icon=qemu/' \ + -e 's,\[ -x "\$(command -v smbd)" \],true,' \ quickemu ''; diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix index f0d353e7f6fb..887c482e6c86 100644 --- a/pkgs/by-name/qu/quickjs-ng/package.nix +++ b/pkgs/by-name/qu/quickjs-ng/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "quickjs-ng"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "quickjs-ng"; repo = "quickjs"; rev = "v${finalAttrs.version}"; - hash = "sha256-mo+YBhaCqGRWfVRvZCD0iB2pd/DsHsfWGFeFxwwyxPk="; + hash = "sha256-4CC7IxA5t+L99H4Rvkx0xkXFHuqNP3HTmS46JEuy7Vs="; }; outputs = [ "bin" "out" "dev" "doc" "info" ]; @@ -29,6 +29,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_STATIC_QJS_EXE" stdenv.hostPlatform.isStatic) ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + "-Wno-error=stringop-overflow" + ]); + postInstall = '' (cd ../doc makeinfo --output quickjs.info quickjs.texi diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix index 75a8ab6e5976..6b3800ade7ea 100644 --- a/pkgs/by-name/r0/r0vm/package.nix +++ b/pkgs/by-name/r0/r0vm/package.nix @@ -52,6 +52,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "RISC Zero zero-knowledge VM"; homepage = "https://github.com/risc0/risc0"; + changelog = "https://github.com/risc0/risc0/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ marijanp ]; mainProgram = "r0vm"; diff --git a/pkgs/by-name/ra/rabbit/package.nix b/pkgs/by-name/ra/rabbit/package.nix index 09fb2d789423..1ec1e092c1f1 100644 --- a/pkgs/by-name/ra/rabbit/package.nix +++ b/pkgs/by-name/ra/rabbit/package.nix @@ -20,7 +20,6 @@ python3.pkgs.buildPythonApplication rec { build-system = [ python3.pkgs.setuptools python3.pkgs.wheel - python3.pkgs.pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index 46a35fda34ca..f1f9e5e5993f 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -13,17 +13,17 @@ }: rustPlatform.buildRustPackage rec { pname = "radicle-httpd"; - version = "0.11.0"; + version = "0.13.0"; env.RADICLE_VERSION = version; src = fetchgit { url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git"; rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}"; - hash = "sha256-XMEO+L362uaPUr25YUkMh41a2BcKEy8bgXfwKlvBtnQ="; + hash = "sha256-C7kMREIEq2nv+mq/YXS4yPNKgJxz5tTzqRwO9CtM1Bg="; sparseCheckout = [ "radicle-httpd" ]; }; sourceRoot = "${src.name}/radicle-httpd"; - cargoHash = "sha256-WdgPL6X3FMxHW6OVoTkrbo0azAxp35UzGMcTJ5pNnkI="; + cargoHash = "sha256-fbHg1hwHloy9AZMDCHNVkNTfLMG4Dv6IPxTp8F5okrk="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 05324f6ff44a..7453899f8b06 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -16,15 +16,15 @@ , xdg-utils }: rustPlatform.buildRustPackage rec { pname = "radicle-node"; - version = "1.0.0-rc.11"; + version = "1.0.0-rc.12"; env.RADICLE_VERSION = version; src = fetchgit { url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"; rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}"; - hash = "sha256-P1Gg2uk87ppco7CAPjEqN0uqgb0K8apOSC7cfdgaT0Y="; + hash = "sha256-bXFhufmMgJ+bX4PASIUPmNQ2L5Y8LHJ+pLevpJAYkYc="; }; - cargoHash = "sha256-M01NjqvMSaa3+YPb4vDtIucBeF5BYx3cpmMoLJOwRsI="; + cargoHash = "sha256-CAxy9J5bOPHedf6g7TEfM35F+Batom6g2V3k7CPC8Sk="; nativeBuildInputs = [ asciidoctor installShellFiles makeWrapper ]; nativeCheckInputs = [ git ]; @@ -32,7 +32,8 @@ darwin.apple_sdk.frameworks.Security ]; - doCheck = stdenv.hostPlatform.isLinux; + # tests regularly time out on aarch64 + doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86; preCheck = '' export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release @@ -44,6 +45,8 @@ "--skip=tests::test_announcement_relay" # https://radicle.zulipchat.com/#narrow/stream/369277-heartwood/topic/Flaky.20tests/near/438352360 "--skip=tests::e2e::test_connection_crossing" + # https://radicle.zulipchat.com/#narrow/stream/369277-heartwood/topic/Clone.20Partial.20Fail.20Flake + "--skip=rad_clone_partial_fail" ]; postInstall = '' diff --git a/pkgs/by-name/ra/raffi/package.nix b/pkgs/by-name/ra/raffi/package.nix new file mode 100644 index 000000000000..d32478ba7069 --- /dev/null +++ b/pkgs/by-name/ra/raffi/package.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, makeBinaryWrapper +, fuzzel +, additionalPrograms ? [ ] +}: + +rustPlatform.buildRustPackage rec { + pname = "raffi"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "chmouel"; + repo = "raffi"; + rev = "v${version}"; + hash = "sha256-i4PM82vGb9Z2pwW006114/h9crokVLUpLxNjr7tgAU8="; + }; + + cargoHash = "sha256-DS56H2XjEgdXC9TKLjwyfLpFHB9dUThhr8pNFEJuAZE="; + + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + postFixup = '' + wrapProgram $out/bin/raffi \ + --prefix PATH : ${lib.makeBinPath ([ fuzzel ] ++ additionalPrograms)} + ''; + + meta = { + description = "Fuzzel launcher based on yaml configuration"; + homepage = "https://github.com/chmouel/raffi"; + changelog = "https://github.com/chmouel/raffi/releases/tag/v${version}"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ aos ]; + mainProgram = "raffi"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ra/rainbowcrack/package.nix b/pkgs/by-name/ra/rainbowcrack/package.nix new file mode 100644 index 000000000000..bc138dbc9c74 --- /dev/null +++ b/pkgs/by-name/ra/rainbowcrack/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchurl, + alglib, + unzip, + autoPatchelfHook, +}: + +stdenv.mkDerivation rec { + pname = "rainbowcrack"; + version = "1.8"; + + src = fetchurl { + url = "http://project-rainbowcrack.com/rainbowcrack-${version}-linux64.zip"; + hash = "sha256-xMC9teHiDvBY/VHV63TsNQjdcuLqHGeXUyjHvRTO9HQ="; + }; + + nativeBuildInputs = [ + unzip + autoPatchelfHook + ]; + + buildInputs = [ stdenv.cc.cc.lib ]; + + dontConfigure = true; + + dontBuild = true; + + unpackPhase = '' + mkdir -p $out/{bin,share/rainbowcrack} + unzip $src -d $out || true + ''; + + installPhase = '' + install -Dm644 $out/rainbowcrack-1.8-linux64/*.txt $out/share/rainbowcrack + install -Dm755 $out/rainbowcrack-1.8-linux64/rt* $out/rainbowcrack-1.8-linux64/rcrack $out/bin + chmod +x $out/bin/* + rm -rf $out/rainbowcrack-1.8-linux64 + ''; + + runtimeDependencies = [ alglib ]; + + meta = { + description = "Rainbow table generator used for password cracking"; + homepage = "http://project-rainbowcrack.com"; + maintainers = with lib.maintainers; [ tochiaha ]; + license = lib.licenses.unfree; + mainProgram = "rcrack"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux64" ]; + }; +} diff --git a/pkgs/by-name/ra/raze/package.nix b/pkgs/by-name/ra/raze/package.nix new file mode 100644 index 000000000000..8739aa1108a1 --- /dev/null +++ b/pkgs/by-name/ra/raze/package.nix @@ -0,0 +1,90 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + SDL2, + zmusic, + libvpx, + pkg-config, + makeWrapper, + bzip2, + gtk3, + fluidsynth, + openal, + libGL, + vulkan-loader, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "raze"; + version = "1.10.2"; + + src = fetchFromGitHub { + owner = "ZDoom"; + repo = "Raze"; + rev = finalAttrs.version; + hash = "sha256-R3Sm/cibg+D2QPS4UisRp91xvz3Ine2BUR8jF5Rbj1g="; + leaveDotGit = true; + postFetch = '' + cd $out + git rev-parse HEAD > COMMIT + rm -rf .git + ''; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + makeWrapper + ]; + + buildInputs = [ + SDL2 + zmusic + libvpx + bzip2 + gtk3 + fluidsynth + openal + libGL + vulkan-loader + ]; + + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") + (lib.cmakeBool "DYN_GTK" false) + (lib.cmakeBool "DYN_OPENAL" false) + ]; + + postPatch = '' + substituteInPlace tools/updaterevision/gitinfo.h.in \ + --replace-fail "@Tag@" "${finalAttrs.version}" \ + --replace-fail "@Hash@" "$(cat COMMIT)" \ + --replace-fail "@Timestamp@" "1970-01-01 00:00:01 +0000" + ''; + + postInstall = '' + mv $out/bin/raze $out/share/raze + makeWrapper $out/share/raze/raze $out/bin/raze + install -Dm644 ../source/platform/posix/org.zdoom.Raze.256.png $out/share/pixmaps/org.zdoom.Raze.png + install -Dm644 ../source/platform/posix/org.zdoom.Raze.desktop $out/share/applications/org.zdoom.Raze.desktop + install -Dm644 ../soundfont/raze.sf2 $out/share/raze/soundfonts/raze.sf2 + ''; + + meta = { + description = "Build engine port backed by GZDoom tech"; + longDescription = '' + Raze is a fork of Build engine games backed by GZDoom tech and combines + Duke Nukem 3D, Blood, Redneck Rampage, Shadow Warrior and Exhumed/Powerslave + in a single package. It is also capable of playing Nam and WW2 GI. + ''; + homepage = "https://github.com/ZDoom/Raze"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ qubitnano ]; + mainProgram = "raze"; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index 4be5a5429d1e..8cca9c52e26a 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { tqdm ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook pythonRelaxDepsHook ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; pythonRelaxDeps = [ "torch" "torchvision" ]; diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index 9d2f64c9b22b..8b92529936e3 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "rcp"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "wykurz"; repo = "rcp"; rev = "v${version}"; - hash = "sha256-nNMcZyJAvqxVSoytmfSqsfk1yVzzZ5aIOj72L+jFAAM="; + hash = "sha256-ymqglANM4vIIBC/lCnnLbYvAqJzdxX+lZGw4IB5O1sE="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); - cargoHash = "sha256-3+w+pTws8WjrUqIWYGbE2V438mVUUyrjBH9mHI8uRMQ="; + cargoHash = "sha256-88DSK0E1Wu9RMYJsbsnnieCorJZ50TRF7Fm/uCSOYHU="; RUSTFLAGS = "--cfg tokio_unstable"; diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 3398236ec6a5..ea319d0d8b19 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { src = let src-tarball = requireFile { name = "rcu-d${version}-source.tar.gz"; - sha256 = "1njsfj4pfqh4c9gppkdlkkfba31v186wjz3zm94adhhpdwzx2ybb"; + sha256 = "15559537bjrviq5n87yz4q6n3y3l3bwip8rxg34zf0w9zmr4zmqn"; url = "http://www.davisr.me/projects/rcu/"; }; in runCommand "${src-tarball.name}-unpacked" {} '' diff --git a/pkgs/by-name/rd/rdwatool/package.nix b/pkgs/by-name/rd/rdwatool/package.nix index 49459eb39a9e..7ae9db0bfae7 100644 --- a/pkgs/by-name/rd/rdwatool/package.nix +++ b/pkgs/by-name/rd/rdwatool/package.nix @@ -24,7 +24,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/by-name/re/reactphysics3d/package.nix b/pkgs/by-name/re/reactphysics3d/package.nix index a7a313b36754..6f0a98d159bf 100644 --- a/pkgs/by-name/re/reactphysics3d/package.nix +++ b/pkgs/by-name/re/reactphysics3d/package.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Open source C++ physics engine library"; homepage = "https://www.reactphysics3d.com"; + changelog = "https://github.com/DanielChappuis/reactphysics3d/releases/tag/${finalAttrs.src.rev}"; maintainers = with maintainers; [ rexxDigital ]; license = licenses.zlib; platforms = platforms.all; diff --git a/pkgs/by-name/re/read-it-later/package.nix b/pkgs/by-name/re/read-it-later/package.nix index 2c17e72d9510..397d03a13e13 100644 --- a/pkgs/by-name/re/read-it-later/package.nix +++ b/pkgs/by-name/re/read-it-later/package.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple Wallabag client with basic features to manage articles"; homepage = "https://gitlab.gnome.org/World/read-it-later"; + changelog = "https://gitlab.gnome.org/World/read-it-later/-/releases/${src.rev}"; license = licenses.gpl3Plus; mainProgram = "read-it-later"; maintainers = with maintainers; [ aleksana ]; diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix similarity index 87% rename from pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix rename to pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix index 4bd6869d2def..7b2f6523f13b 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl rec { name = "VNC-Viewer-${finalAttrs.version}-MacOSX-universal.dmg"; url = "https://downloads.realvnc.com/download/file/viewer.files/${name}"; - sha256 = "0k72fdnx1zmyi9z5n3lazc7s70gcddxq0s73akp0al0y9hzq9prh"; + hash = "sha256-haD2QsBF9Dps1V/2tkkALAc7+kUY3PSNj7BjTIqnNcU="; }; sourceRoot = "."; diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/linux.nix b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix similarity index 92% rename from pkgs/tools/admin/realvnc-vnc-viewer/linux.nix rename to pkgs/by-name/re/realvnc-vnc-viewer/linux.nix index 552b1dc03539..30d2b60c2042 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/linux.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { inherit pname version; - src = rec { + src = { "x86_64-linux" = fetchurl rec { name = "VNC-Viewer-${finalAttrs.version}-Linux-x64.rpm"; url = "https://downloads.realvnc.com/download/file/viewer.files/${name}"; - sha256 = "sha256-Ull9iNi8NxB12YwEThWE0P9k1xOV2LZnebuRrVH/zwI="; + hash = "sha256-KJZbH3mfxuyUslkYvB/RKquEsB7ayJSv6yNqfLmAsGI="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/by-name/re/realvnc-vnc-viewer/package.nix similarity index 71% rename from pkgs/tools/admin/realvnc-vnc-viewer/default.nix rename to pkgs/by-name/re/realvnc-vnc-viewer/package.nix index 9776ececcfd2..6e1dc6762b14 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/package.nix @@ -4,19 +4,19 @@ }: let pname = "realvnc-vnc-viewer"; - version = "7.5.1"; + version = "7.12.0"; - meta = with lib; { + meta = { description = "VNC remote desktop client software by RealVNC"; homepage = "https://www.realvnc.com/en/connect/download/viewer/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = { fullName = "VNC Connect End User License Agreement"; url = "https://static.realvnc.com/media/documents/LICENSE-4.0a_en.pdf"; free = false; }; - maintainers = with maintainers; [ emilytrau onedragon ]; - platforms = [ "x86_64-linux" ] ++ platforms.darwin; + maintainers = with lib.maintainers; [ emilytrau onedragon ]; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; mainProgram = "vncviewer"; }; in diff --git a/pkgs/by-name/re/recoverdm/package.nix b/pkgs/by-name/re/recoverdm/package.nix index 647f50e97a8c..d5e4aeb7fc0d 100644 --- a/pkgs/by-name/re/recoverdm/package.nix +++ b/pkgs/by-name/re/recoverdm/package.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Recover damaged CD DVD and disks with bad sectors"; mainProgram = "recoverdm"; homepage = "https://salsa.debian.org/pkg-security-team/recoverdm"; + changelog = "https://salsa.debian.org/pkg-security-team/recoverdm/-/blob/debian/master/debian/changelog"; maintainers = with maintainers; [ d3vil0p3r ]; platforms = platforms.unix; license = licenses.gpl1Only; diff --git a/pkgs/by-name/re/rectangle-pro/package.nix b/pkgs/by-name/re/rectangle-pro/package.nix index 0768912463bb..a7ef394fde64 100644 --- a/pkgs/by-name/re/rectangle-pro/package.nix +++ b/pkgs/by-name/re/rectangle-pro/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://rectangleapp.com/pro"; license = licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/by-name/re/redfishtool/package.nix b/pkgs/by-name/re/redfishtool/package.nix index 67aece20026f..020adb304479 100644 --- a/pkgs/by-name/re/redfishtool/package.nix +++ b/pkgs/by-name/re/redfishtool/package.nix @@ -21,6 +21,7 @@ python3.pkgs.buildPythonApplication { meta = with lib; { description = "Python34 program that implements a command line tool for accessing the Redfish API"; homepage = "https://github.com/DMTF/Redfishtool"; + changelog = "https://github.com/DMTF/Redfishtool/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ jfvillablanca ]; mainProgram = "redfishtool"; diff --git a/pkgs/by-name/re/redka/package.nix b/pkgs/by-name/re/redka/package.nix index fda4439808e2..53ba16d568d4 100644 --- a/pkgs/by-name/re/redka/package.nix +++ b/pkgs/by-name/re/redka/package.nix @@ -24,6 +24,7 @@ buildGoModule rec { meta = { description = "Redis re-implemented with SQLite"; homepage = "https://github.com/nalgeon/redka"; + changelog = "https://github.com/nalgeon/redka/releases/tag/${src.rev}"; maintainers = with lib.maintainers; [ sikmir ]; license = lib.licenses.bsd3; }; diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index 216b3f08a25c..3497bc9ba4d1 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "redlib"; - version = "0.34.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "redlib-org"; repo = "redlib"; rev = "refs/tags/v${version}"; - hash = "sha256-JpuCX2ae9me+zHxQj5jqQlgDci2NV+TEVUAqnuTn3cA="; + hash = "sha256-W1v7iOE60/6UyZSHQW+L+wHCoKnKUNb3kpm4LVLPZ6c="; }; - cargoHash = "sha256-gkRblCHUFiprZeYtu43GIGBZqCq5l/HEGaQN91XbfSs="; + cargoHash = "sha256-3NQWiu/nTtHrivYL1pgxqQxEuIW0xfjxwK0ZEa2y1Kk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix index 9329c0a111e6..1140c17ef75c 100644 --- a/pkgs/by-name/re/redmine/package.nix +++ b/pkgs/by-name/re/redmine/package.nix @@ -46,6 +46,7 @@ in meta = with lib; { homepage = "https://www.redmine.org/"; + changelog = "https://www.redmine.org/projects/redmine/wiki/changelog"; platforms = platforms.linux; maintainers = with maintainers; [ aanderse felixsinger megheaiulian ]; license = licenses.gpl2; diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix index 2d23539271ee..71df968a3d79 100644 --- a/pkgs/by-name/re/redocly/package.nix +++ b/pkgs/by-name/re/redocly/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "redocly"; - version = "1.15.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-qGjFueL05f7DgDa0/B+w1Ix2tRx7PicMneub2sWJ7Gw="; + hash = "sha256-6aPNgqem3nG+rPJmxMyjqYPm5mE+93h/uXKCuiUeLxI="; }; - npmDepsHash = "sha256-pO1ewVInuPCLDk2V4HRqOCFmT1VTVa/qRkJ5rxREWMU="; + npmDepsHash = "sha256-J+nlY+FKZqwhj4JyuyReW/UoAMX/eouuOAZ2WCzW2VA="; npmBuildScript = "prepare"; @@ -49,6 +49,7 @@ buildNpmPackage rec { }; meta = { + changelog = "https://redocly.com/docs/cli/changelog/"; description = "Makes OpenAPI easy. Lint/validate to any standard, generate beautiful docs, and more"; homepage = "https://github.com/Redocly/redocly-cli"; license = lib.licenses.mit; diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index 812a9f8a2f91..5d04d8857f24 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -17,6 +17,7 @@ buildGoModule rec { description = "Linter and language server for Rego"; mainProgram = "regal"; homepage = "https://github.com/StyraInc/regal"; + changelog = "https://github.com/StyraInc/regal/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ rinx ]; }; diff --git a/pkgs/by-name/re/regols/package.nix b/pkgs/by-name/re/regols/package.nix index d96dda45bf71..ca04a777f416 100644 --- a/pkgs/by-name/re/regols/package.nix +++ b/pkgs/by-name/re/regols/package.nix @@ -17,6 +17,7 @@ buildGoModule rec { description = "OPA Rego language server"; mainProgram = "regols"; homepage = "https://github.com/kitagry/regols"; + changelog = "https://github.com/kitagry/regols/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ alias-dev ]; }; diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/by-name/re/remnote/package.nix similarity index 95% rename from pkgs/applications/misc/remnote/default.nix rename to pkgs/by-name/re/remnote/package.nix index b86a69ea2794..1871bc980262 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.16.48"; + version = "1.16.55"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-tECIn43fTr+Enkp63S7INUjOrs8Ni7Nmhxsr/p6kPzo="; + hash = "sha256-O1AHUiaW1amawwDVd+QXY6GyUI7cGkBifVOqoSLiiTw="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 26d5d3685196..e166ef18f09d 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2024-06-26"; + version = "0-unstable-2024-07-02"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "e5e3c4150dd5cdb0d923a0a26d61060d18c77e75"; - hash = "sha256-ZNeKiORQAJxvm+EjzjlJh54YlwEz6F/mGQmdO9nbips="; + rev = "35aa35658558b759c909e32c713091d6617186bd"; + hash = "sha256-OySqcbrpqSOPJWTv3V2NM6DRbQ/wH55+z1SvHFQwe0U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 6b8d276895f5..acec8f5c9dcb 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -5,11 +5,11 @@ renode.overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.1+20240623git05720ced1"; + version = "1.15.1+20240627git66a08265a"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-xqAkOBdG1tC7uFDxxG6DzQMs9NqG2QtBXACzEGN44u8="; + hash = "sha256-Np/+QydZ+temEOCPI4K+PHScCQBYeFPZ2pOlFLWYXmA="; }; passthru.updateScript = diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix index 561dfca37aa5..8b1774e776ea 100644 --- a/pkgs/by-name/re/renode/package.nix +++ b/pkgs/by-name/re/renode/package.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Virtual development framework for complex embedded systems"; homepage = "https://renode.io"; + changelog = "https://github.com/renode/renode/blob/v${finalAttrs.version}/CHANGELOG.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ otavio ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index ca84aa9ce4ef..e15fff10eab7 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -11,6 +11,7 @@ testers, xcbuild, nixosTests, + nix-update-script, }: let @@ -20,13 +21,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "renovate"; - version = "37.393.0"; + version = "37.424.3"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-YgxcGNMgmwrausdR7kvG1NiyQPn0FcCq/isf9qUDCFY="; + hash = "sha256-OOanxZte0H27U5L1MGrNUxYDWQ7ctAoNVVUukbE7v7s="; }; postPatch = '' @@ -43,7 +44,7 @@ stdenv'.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-Zbe561q6xDKDIN+E/2eyQMz2GtpPvJEv2pAauMa+8pE="; + hash = "sha256-tOe0CqRVkN5Uu7S0o9sCV7Tdtkp3JDrupyx0r0AJfs4="; }; env.COREPACK_ENABLE_STRICT = 0; @@ -88,14 +89,18 @@ stdenv'.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests = { - version = testers.testVersion { package = renovate; }; - vm-test = nixosTests.renovate; + passthru = { + tests = { + version = testers.testVersion { package = renovate; }; + vm-test = nixosTests.renovate; + }; + updateScript = nix-update-script { }; }; meta = { description = "Cross-platform Dependency Automation by Mend.io"; homepage = "https://github.com/renovatebot/renovate"; + changelog = "https://github.com/renovatebot/renovate/releases/tag/${finalAttrs.version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ marie diff --git a/pkgs/by-name/re/replxx/package.nix b/pkgs/by-name/re/replxx/package.nix index 1df434315fe3..de6c2c9313b2 100644 --- a/pkgs/by-name/re/replxx/package.nix +++ b/pkgs/by-name/re/replxx/package.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/AmokHuginnsson/replxx"; + changelog = "https://github.com/AmokHuginnsson/replxx/releases/tag/release-${finalAttrs.version}"; description = "Readline and libedit replacement that supports UTF-8, syntax highlighting, hints and Windows and is BSD licensed"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix new file mode 100644 index 000000000000..8ae98f2c292b --- /dev/null +++ b/pkgs/by-name/re/reposilite/package.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchurl, makeWrapper, jre_headless }: + +stdenv.mkDerivation (finalAttrs: { + pname = "Reposilite"; + version = "3.5.13"; + + src = fetchurl { + url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar"; + hash = "sha256-G9J1nOK1dM8XC+3Mj8uUnNvM5BiUPzOIRT/T5CZzvqo="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp $src $out/lib/reposilite + makeWrapper ${jre_headless}/bin/java $out/bin/reposilite \ + --add-flags "-Xmx40m -jar $out/lib/reposilite" + + runHook postInstall + ''; + + meta = { + description = "Lightweight and easy-to-use repository management software dedicated for the Maven based artifacts in the JVM ecosystem"; + homepage = "https://github.com/dzikoysk/reposilite"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jamalam ]; + inherit (jre_headless.meta) platforms; + mainProgram = "reposilite"; + }; +}) diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 6fedb10cfed1..4d9c8da8041c 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -126,8 +126,5 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with maintainers; [ SomeoneSerge ]; mainProgram = "rerun"; - # See comment about wasm32-unknown-unknown in rustc.nix. - broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; }; } diff --git a/pkgs/by-name/re/restinio/package.nix b/pkgs/by-name/re/restinio/package.nix index be6478c1a378..84e8ff69e2dc 100644 --- a/pkgs/by-name/re/restinio/package.nix +++ b/pkgs/by-name/re/restinio/package.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Cross-platform, efficient, customizable, and robust asynchronous HTTP(S)/WebSocket server C++ library"; homepage = "https://github.com/Stiffstream/restinio"; + changelog = "https://github.com/Stiffstream/restinio/releases/tag/${finalAttrs.src.rev}"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ tobim ]; diff --git a/pkgs/by-name/re/restinio_0_6/package.nix b/pkgs/by-name/re/restinio_0_6/package.nix index 9472bd0a554e..91b83060ecbe 100644 --- a/pkgs/by-name/re/restinio_0_6/package.nix +++ b/pkgs/by-name/re/restinio_0_6/package.nix @@ -23,6 +23,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Cross-platform, efficient, customizable, and robust asynchronous HTTP/WebSocket server C++14 library"; homepage = "https://github.com/Stiffstream/restinio"; + changelog = "https://github.com/Stiffstream/restinio/releases/tag/v.${version}"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/by-name/re/restls/package.nix b/pkgs/by-name/re/restls/package.nix index ff260ada3468..c0164322322c 100644 --- a/pkgs/by-name/re/restls/package.nix +++ b/pkgs/by-name/re/restls/package.nix @@ -18,6 +18,7 @@ rustPlatform.buildRustPackage rec{ meta = with lib; { homepage = "https://github.com/3andne/restls"; + changelog = "https://github.com/3andne/restls/releases/tag/${src.rev}"; description = "Perfect Impersonation of TLS"; license = licenses.bsd3; mainProgram = "restls"; diff --git a/pkgs/by-name/re/retool/package.nix b/pkgs/by-name/re/retool/package.nix index 84bba4dae2ee..a22ce582b9eb 100644 --- a/pkgs/by-name/re/retool/package.nix +++ b/pkgs/by-name/re/retool/package.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ hatchling - pythonRelaxDepsHook qt6.wrapQtAppsHook ]; @@ -50,6 +49,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Better filter tool for Redump and No-Intro dats"; homepage = "https://github.com/unexpectedpanda/retool"; + changelog = "https://github.com/unexpectedpanda/retool/blob/v${version}/changelog.md"; license = licenses.bsd3; maintainers = with maintainers; [ thiagokokada ]; }; diff --git a/pkgs/by-name/re/retrospy/package.nix b/pkgs/by-name/re/retrospy/package.nix index 07ba2d35da36..dbc6b6b0716a 100644 --- a/pkgs/by-name/re/retrospy/package.nix +++ b/pkgs/by-name/re/retrospy/package.nix @@ -81,6 +81,7 @@ buildDotnetModule { meta = { description = "Live controller viewer for Nintendo consoles as well as many other retro consoles and computers"; homepage = "https://retro-spy.com/"; + changelog = "https://github.com/retrospy/RetroSpy/releases/tag/${src.rev}"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.naxdy ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/re/revup/package.nix b/pkgs/by-name/re/revup/package.nix index 2aacb3ce5670..3046a893b4b9 100644 --- a/pkgs/by-name/re/revup/package.nix +++ b/pkgs/by-name/re/revup/package.nix @@ -6,10 +6,10 @@ let pname = "revup"; - version = "0.2.1"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - hash = "sha256-EaBI414m5kihuaOkaHYAzvVxeJCgMIh9lD0JnCeVdZM="; + hash = "sha256-LrSRcnWc4AvWbpSrOLprs+rVM0sR1joLat3g9og6BwE="; }; in python3.pkgs.buildPythonPackage { @@ -39,6 +39,7 @@ python3.pkgs.buildPythonPackage { meta = { homepage = "https://github.com/Skydio/revup"; + changelog = "https://github.com/Skydio/revup/releases/tag/v${version}"; description = " Revolutionary github tools"; longDescription = '' Revup provides command-line tools that allow developers to iterate faster diff --git a/pkgs/by-name/ri/ricochet-refresh/package.nix b/pkgs/by-name/ri/ricochet-refresh/package.nix index 6072f05e06c1..e0e55bb8c515 100644 --- a/pkgs/by-name/ri/ricochet-refresh/package.nix +++ b/pkgs/by-name/ri/ricochet-refresh/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ricochet-refresh"; - version = "3.0.24"; + version = "3.0.25"; src = fetchFromGitHub { owner = "blueprint-freespeech"; repo = "ricochet-refresh"; rev = "v${finalAttrs.version}-release"; fetchSubmodules = true; - hash = "sha256-xz1cyNQgmXUIZc56OHwWZCGVNpp7CFFyCd0EvAas4zw="; + hash = "sha256-MXbsNrF3y2DimXUuf6XbqqCxcNsTGfNHSAMstdX1MoU="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix index 52adbc5387d0..25d18248d5bb 100644 --- a/pkgs/by-name/ri/ride/package.nix +++ b/pkgs/by-name/ri/ride/package.nix @@ -12,6 +12,7 @@ copyDesktopItems, makeDesktopItem, electron, + darwin, }: let @@ -31,6 +32,8 @@ let }; platformInfo = platformInfos.${stdenv.system}; + + electronDist = electron + (if stdenv.isDarwin then "/Applications" else "/libexec/electron"); in buildNpmPackage rec { pname = "ride"; @@ -83,22 +86,33 @@ buildNpmPackage rec { popd ''; - nativeBuildInputs = [ - zip - makeWrapper - copyDesktopItems - ]; + nativeBuildInputs = + [ + zip + makeWrapper + ] + ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ] + ++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + # Fix error: no member named 'aligned_alloc' in the global namespace + env.NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0" + ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; + npmBuildFlags = platformInfo.buildCmd; # This package uses electron-packager instead of electron-builder # Here, we create a local cache of electron zip-files, so electron-packager can copy from it postConfigure = '' mkdir local-cache - cp -r --no-preserve=all ${electron}/libexec/electron electron - pushd electron + + # electron files need to be writable on Darwin + cp -r ${electronDist} electron-dist + chmod -R u+w electron-dist + + pushd electron-dist zip -qr ../local-cache/electron-v${electron.version}-${platformInfo.zipSuffix}.zip * popd ''; @@ -106,19 +120,27 @@ buildNpmPackage rec { installPhase = '' runHook preInstall - install -Dm644 D.png $out/share/icons/hicolor/64x64/apps/ride.png - install -Dm644 D.svg $out/share/icons/hicolor/scalable/apps/ride.svg - pushd _/ride*/* install -Dm644 ThirdPartyNotices.txt -t $out/share/doc/ride - mkdir -p $out/share/ride - cp -r locales resources{,.pak} $out/share/ride - makeWrapper ${lib.getExe electron} $out/bin/ride \ - --add-flags $out/share/ride/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --inherit-argv0 + ${lib.optionalString (!stdenv.isDarwin) '' + install -Dm644 $src/D.png $out/share/icons/hicolor/64x64/apps/ride.png + install -Dm644 $src/D.svg $out/share/icons/hicolor/scalable/apps/ride.svg + + mkdir -p $out/share/ride + cp -r locales resources{,.pak} $out/share/ride + makeWrapper ${lib.getExe electron} $out/bin/ride \ + --add-flags $out/share/ride/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --inherit-argv0 + ''} + + ${lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -r Ride-*.app $out/Applications + makeWrapper $out/Applications/Ride-*.app/Contents/MacOS/Ride-* $out/bin/ride + ''} popd @@ -141,7 +163,6 @@ buildNpmPackage rec { ]; meta = { - broken = stdenv.isDarwin; changelog = "https://github.com/Dyalog/ride/releases/tag/${src.rev}"; description = "Remote IDE for Dyalog APL"; homepage = "https://github.com/Dyalog/ride"; diff --git a/pkgs/by-name/ri/rimgo/package.nix b/pkgs/by-name/ri/rimgo/package.nix index b69412bb5e2a..9a97990bee56 100644 --- a/pkgs/by-name/ri/rimgo/package.nix +++ b/pkgs/by-name/ri/rimgo/package.nix @@ -6,14 +6,14 @@ }: buildGoModule rec { pname = "rimgo"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitea { domain = "codeberg.org"; owner = "rimgo"; repo = "rimgo"; rev = "v${version}"; - hash = "sha256-MSYTupt5f3ZjB84iLBp7bR+/nie1murpONKfXrBCu9Q="; + hash = "sha256-PBzbCiRIDrtKH3j6jxmylPpwafR5qgRYDHgYP1m/+Ok="; }; vendorHash = "sha256-nk1Pl9K62RjmBUgTlbp3u6cCoiEwpUHavfT3Oy0iyGU="; diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index 8709e0b4de99..37d7c8c889b2 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2024-06-27"; + version = "0-unstable-2024-07-02"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "86b2f74a24fdf2957f6aad28fb999fa6a2e43e82"; - hash = "sha256-ns6j8ChJpV4ryxajGmdbRlJj3eL8qRIYzrD4VPfTYDY="; + rev = "1675a26fbf06d3085759ccd63b102b3ce8583c3a"; + hash = "sha256-4GPEufI5j03jCN3N8AUtQIKAsFjPi4DbfNcdoMnbNQ0="; }; dontConfigure = true; diff --git a/pkgs/by-name/ro/rotonda/package.nix b/pkgs/by-name/ro/rotonda/package.nix new file mode 100644 index 000000000000..f049049279d5 --- /dev/null +++ b/pkgs/by-name/ro/rotonda/package.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "rotonda"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "NLnetLabs"; + repo = "rotonda"; + rev = "v${version}"; + hash = "sha256-bhuVzoEgDrfj4z2rfD+2agkXKNLZXN/MA+AxmEaeuLk="; + }; + + cargoHash = "sha256-0i1dFMPNUAMgTdZ+f9fg0DvvhkpCmlPOjYoyFvHT4v4="; + + meta = with lib; { + description = "Rotonda - composable, programmable BGP Engine"; + homepage = "https://github.com/NLnetLabs/rotonda"; + changelog = "https://github.com/NLnetLabs/rotonda/blob/${src.rev}/Changelog.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ _0x4A6F ]; + mainProgram = "rotonda"; + }; +} diff --git a/pkgs/by-name/ro/route-graph/package.nix b/pkgs/by-name/ro/route-graph/package.nix index 36158282f783..7e6e8d2bd6a6 100644 --- a/pkgs/by-name/ro/route-graph/package.nix +++ b/pkgs/by-name/ro/route-graph/package.nix @@ -25,10 +25,6 @@ python3.pkgs.buildPythonApplication rec { poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - propagatedBuildInputs = [ graphviz ] ++ (with python3.pkgs; [ diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index 50e4a41c3577..a8fa2e5abb33 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -28,14 +28,15 @@ , SDL2 , waylandSupport ? true , wayland +, wrapGAppsHook3 }: let # Keep these separate so the update script can regex them - rpcs3GitVersion = "16648-71524271e"; - rpcs3Version = "0.0.32-16648-71524271e"; - rpcs3Revision = "71524271e948316d57515422bd0da0159a55d24d"; - rpcs3Hash = "sha256-uKzikzl33EBOjmLU3IML6CIfQbRaOs4NYZylSOVo9Dg="; + rpcs3GitVersion = "16659-33851d51a"; + rpcs3Version = "0.0.32-16659-33851d51a"; + rpcs3Revision = "33851d51ab93c3c73be18a6cb5ed7723219ee1e3"; + rpcs3Hash = "sha256-Gv3zkvZdvnRUKvS0JhrvHOOz5OVSqxHBkbbOdYWzRvU="; inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland; in @@ -81,7 +82,9 @@ stdenv.mkDerivation { (lib.cmakeBool "USE_FAUDIO" faudioSupport) ]; - nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ]; + dontWrapGApps = true; + + nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook wrapGAppsHook3 ]; buildInputs = [ qtbase qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg @@ -90,6 +93,10 @@ stdenv.mkDerivation { ++ lib.optional faudioSupport faudio ++ lib.optionals waylandSupport [ wayland qtwayland ]; + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + postInstall = '' # Taken from https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration install -D ${./99-ds3-controllers.rules} $out/etc/udev/rules.d/99-ds3-controllers.rules diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix index 1e5b513f5ac0..a099f92881ce 100644 --- a/pkgs/by-name/rs/rs-tftpd/package.nix +++ b/pkgs/by-name/rs/rs-tftpd/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "rs-tftpd"; - version = "0.2.13"; + version = "0.3.0"; src = fetchFromGitHub { owner = "altugbakan"; repo = "rs-tftpd"; rev = version; - hash = "sha256-ABxgptbdepyTqMOz1YHSNRn1+8xYo8vN/dqZiSleJz4="; + hash = "sha256-J7Cy8ymqZH1dCQ4/NWi+ukOsD/0KAfqgYBnCgfRt/KU="; }; - cargoHash = "sha256-8QVgdQnis0ihkU5ZYtxbPIM+9arfO4do1ToRHoi94A8="; + cargoHash = "sha256-gVNwMgv3acJaoQFJi5G/zo2ECzxYvcgaHlpwuCF2HVE="; passthru.updateScript = nix-update-script {}; diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index 6dedaf3acf86..89d4ce79ee5d 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -5,7 +5,7 @@ , fetchFromGitHub , flutter316 , gst_all_1 -, fuse +, fuse3 , libXtst , libaom , libopus @@ -127,7 +127,7 @@ in flutter316.buildFlutterApplication rec { ]; buildInputs = [ - fuse + fuse3 gst_all_1.gst-plugins-base gst_all_1.gstreamer libXtst diff --git a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch b/pkgs/by-name/ry/rygel/add-option-for-installation-sysconfdir.patch similarity index 100% rename from pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch rename to pkgs/by-name/ry/rygel/add-option-for-installation-sysconfdir.patch diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/by-name/ry/rygel/package.nix similarity index 98% rename from pkgs/desktops/gnome/core/rygel/default.nix rename to pkgs/by-name/ry/rygel/package.nix index 7c93bc8668e4..66d2a5ffae8c 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "rygel"; - attrPath = "gnome.rygel"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/by-name/ry/ryujinx/deps.nix b/pkgs/by-name/ry/ryujinx/deps.nix index fe5120574047..0262b9903fc5 100644 --- a/pkgs/by-name/ry/ryujinx/deps.nix +++ b/pkgs/by-name/ry/ryujinx/deps.nix @@ -58,10 +58,10 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.0"; sha256 = "18g4j9n47387k4ym3kl2dzhhhs6fs5rq96757fc4lcdql2rpkmp0"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.0"; sha256 = "11znwbbg44hhz3ly6j6q81qz83yqf97jj5zhpldng5zq0h791srl"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.0"; sha256 = "1slkzygcn4abpqip4rmi73h9096ihjkkaiwgmkaiba9pidn9lzlx"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.0"; sha256 = "1blj1ayw9qpjpsnb4k95s03pdkin0032mxgznfaw1z1qhhiqdnsi"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.2"; sha256 = "02vjbpn852iprpf5ay4f6b5da75z33pii4cbm8pqx3v9j7w7r5r2"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.2"; sha256 = "0bnmxfh0whdvd3vcj6z0w4zxkld6dsxjv1nwg8k2qv9508qy8z4l"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.2"; sha256 = "1v7vqpvg0039l9r3k196fp4pwzjbaxk27dg8hxph6y55kqwipll4"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.2"; sha256 = "0nvrn2nc6s1r4s1g1kggpg9pc96wsw6xqy4qkknnfyz2w3dlsj9z"; }) (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "3.0.1"; sha256 = "12hiz0c7xqff3a0kfmmr11vdi38ba1my06xs4p5galqwj7zn0wds"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; sha256 = "1lls1fly2gr1n9n1xyl9k33l2v4pwfmylyzkq8v4v5ldnwkl1zdb"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix index b2b7f08ace1b..15606e8a1195 100644 --- a/pkgs/by-name/ry/ryujinx/package.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -26,13 +26,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.1336"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.1340"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "0afa8f2c14f046b46ac5ba14c96f3a5ce523ba16"; - sha256 = "1n8f0ijj8amp1nvw2pm2gric51i21kv2gl9r6vwnp64hi08vczqg"; + rev = "1a0a351a152f837094699e78f51f8970e131bd1a"; + sha256 = "0vkzbrp1b3ig1gsax6jyr02m1vqxx4xps741y5j77a2wxv8l6zsm"; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; diff --git a/pkgs/by-name/ry/ryzen-monitor-ng/package.nix b/pkgs/by-name/ry/ryzen-monitor-ng/package.nix index 9a9996ecf61a..5bcb65be3622 100644 --- a/pkgs/by-name/ry/ryzen-monitor-ng/package.nix +++ b/pkgs/by-name/ry/ryzen-monitor-ng/package.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Access Ryzen SMU information exposed by the ryzen_smu driver"; homepage = "https://github.com/mann1x/ryzen_monitor_ng"; + changelog = "https://github.com/mann1x/ryzen_monitor_ng/blob/master/CHANGELOG.md"; license = licenses.agpl3Only; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ phdyellow ]; diff --git a/pkgs/by-name/s3/s3scanner/package.nix b/pkgs/by-name/s3/s3scanner/package.nix index ab660d3e54bb..e2a9c89f2c11 100644 --- a/pkgs/by-name/s3/s3scanner/package.nix +++ b/pkgs/by-name/s3/s3scanner/package.nix @@ -19,6 +19,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { + changelog = "https://github.com/sa7mon/S3Scanner/releases/tag/${src.rev}"; description = "Scan for misconfigured S3 buckets across S3-compatible APIs"; downloadPage = "https://github.com/sa7mon/S3Scanner/releases/tag/v${version}"; homepage = "https://github.com/sa7mon/s3scanner"; diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 3e9497b699da..ab1d90a21a1c 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "System for Automated Geoscientific Analyses"; homepage = "https://saga-gis.sourceforge.io"; + changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog ${version}/"; license = licenses.gpl2Plus; maintainers = with maintainers; teams.geospatial.members ++ [ michelk mpickering ]; platforms = with platforms; unix; diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix index 375e3be3385a..cbdc4b010a6d 100644 --- a/pkgs/by-name/sa/samrewritten/package.nix +++ b/pkgs/by-name/sa/samrewritten/package.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Steam Achievement Manager For Linux. Rewritten in C++"; mainProgram = "samrewritten"; homepage = "https://github.com/PaulCombal/SamRewritten"; + changelog = "https://github.com/PaulCombal/SamRewritten/releases"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ludovicopiero ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix index ff1447e49203..17217e5f8e56 100644 --- a/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.14"; + version = "1.0.15"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-1LWooboM+vPbft1+Gvg9Cp24RFEeJPG4yvNiexRi/pg="; + hash = "sha256-jN50v0N7wSL/F6qOSjp+nRmooR/mNiebsbe4Iy5YmeM="; }; sourceRoot = "."; diff --git a/pkgs/by-name/sb/sbctl/fix-go-module.patch b/pkgs/by-name/sb/sbctl/fix-go-module.patch new file mode 100644 index 000000000000..7e160aa34157 --- /dev/null +++ b/pkgs/by-name/sb/sbctl/fix-go-module.patch @@ -0,0 +1,108 @@ +From cf12e591c6007c6e32bd86167816e316f5b70c26 Mon Sep 17 00:00:00 2001 +From: Sefa Eyeoglu +Date: Sat, 25 May 2024 15:38:41 +0200 +Subject: [PATCH] Fix go module + +Signed-off-by: Sefa Eyeoglu +--- + go.mod | 4 +++- + go.sum | 10 ++++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/go.mod b/go.mod +index 2e23dd6..7668f57 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,6 +1,8 @@ + module github.com/foxboron/sbctl + +-go 1.20 ++go 1.21 ++ ++toolchain go1.22.3 + + require ( + github.com/fatih/color v1.13.0 +diff --git a/go.sum b/go.sum +index 9f29d75..d3f4af4 100644 +--- a/go.sum ++++ b/go.sum +@@ -314,6 +314,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ + github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= + github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= + github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= ++github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= + github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM= + github.com/google/go-licenses v0.0.0-20210329231322-ce1d9163b77d/go.mod h1:+TYOmkVoJOpwnS0wfdsJCV9CoD5nJYsHoFk/0CrTK4M= + github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +@@ -322,9 +323,11 @@ github.com/google/go-replayers/httpreplay v0.1.0/go.mod h1:YKZViNhiGgqdBlUbI2MwG + github.com/google/go-tpm v0.9.0 h1:sQF6YqWMi+SCXpsmS3fd21oPy/vSddwZry4JnmltHVk= + github.com/google/go-tpm v0.9.0/go.mod h1:FkNVkc6C+IsvDI9Jw1OveJmxGZUUaKxtrpOS47QWKfU= + github.com/google/go-tpm-tools v0.4.2 h1:iyaCPKt2N5Rd0yz0G8ANa022SgCNZkMpp+db6QELtvI= ++github.com/google/go-tpm-tools v0.4.2/go.mod h1:fGUDZu4tw3V4hUVuFHmiYgRd0c58/IXivn9v3Ea/ck4= + github.com/google/go-tspi v0.3.0 h1:ADtq8RKfP+jrTyIWIZDIYcKOMecRqNJFOew2IT0Inus= + github.com/google/go-tspi v0.3.0/go.mod h1:xfMGI3G0PhxCdNVcYr1C4C+EizojDg/TXuX5by8CiHI= + github.com/google/goexpect v0.0.0-20210430020637-ab937bf7fd6f h1:7MmqygqdeJtziBUpm4Z9ThROFZUaVGaePMfcDnluf1E= ++github.com/google/goexpect v0.0.0-20210430020637-ab937bf7fd6f/go.mod h1:n1ej5+FqyEytMt/mugVDZLIiqTMO+vsrgY+kM6ohzN0= + github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= + github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2 h1:CVuJwN34x4xM2aT4sIKhmeib40NeBPhRihNjQmpJsA4= + github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2/go.mod h1:nOFQdrUlIlx6M6ODdSpBj1NVA+VgLC6kmw60mkw34H4= +@@ -422,6 +425,7 @@ github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbc + github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= + github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= + github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8= ++github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis= + github.com/hugelgupf/vmtest v0.0.0-20240110072021-f6f07acb7aa1 h1:aa9+0fjwoGotyC8A3QjdITMAX89g/+qvDAhKPrK1NKE= + github.com/hugelgupf/vmtest v0.0.0-20240110072021-f6f07acb7aa1/go.mod h1:a4SVM0HTMEt2IqrtCMOF44++nnzhrkHmQpkpw6Yrpso= + github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +@@ -554,6 +558,7 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi + github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= + github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= + github.com/ncruces/go-fs v0.2.2 h1:ak7h7jdihotXtXqjrBb2YZViJ+n41tLIqMG9ZY7bJMQ= ++github.com/ncruces/go-fs v0.2.2/go.mod h1:07xkoGj//ID8iICNv3rcD2PtMjia3mABv1yZzdq7qZ8= + github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= + github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= + github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +@@ -641,6 +646,7 @@ github.com/pseudomuto/protoc-gen-doc v1.5.0/go.mod h1:exDTOVwqpp30eV/EDPFLZy3Pwr + github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= + github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= + github.com/rekby/gpt v0.0.0-20200219180433-a930afbc6edc h1:goZGTwEEn8mWLcY012VouWZWkJ8GrXm9tS3VORMxT90= ++github.com/rekby/gpt v0.0.0-20200219180433-a930afbc6edc/go.mod h1:scrOqOnnHVKCHENvFw8k9ajCb88uqLQDA4BvuJNJ2ew= + github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= + github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= + github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +@@ -705,6 +711,7 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 + github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= + github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= + github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= ++github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= + github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= + github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= + github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0= +@@ -774,6 +781,7 @@ go.etcd.io/etcd/tests/v3 v3.5.0/go.mod h1:f+mtZ1bE1YPvgKdOJV2BKy4JQW0nAFnQehgOE7 + go.etcd.io/etcd/v3 v3.5.0-alpha.0/go.mod h1:JZ79d3LV6NUfPjUxXrpiFAYcjhT+06qqw+i28snx8To= + go.etcd.io/etcd/v3 v3.5.0/go.mod h1:FldM0/VzcxYWLvWx1sdA7ghKw7C3L2DvUTzGrcEtsC4= + go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 h1:A/5uWzF44DlIgdm/PQFwfMkW0JX+cIcQi/SwLAmZP5M= ++go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= + go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= + go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= + go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +@@ -1277,6 +1285,7 @@ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD + google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= + google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= + google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= ++google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= + google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= + google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= + google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +@@ -1328,6 +1337,7 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= + gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= ++gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= + honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= + honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= + honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +-- +2.44.1 + diff --git a/pkgs/tools/security/sbctl/default.nix b/pkgs/by-name/sb/sbctl/package.nix similarity index 79% rename from pkgs/tools/security/sbctl/default.nix rename to pkgs/by-name/sb/sbctl/package.nix index ac3e2a4dd43f..75c752cc8849 100644 --- a/pkgs/tools/security/sbctl/default.nix +++ b/pkgs/by-name/sb/sbctl/package.nix @@ -4,20 +4,25 @@ , installShellFiles , asciidoc , databasePath ? "/etc/secureboot" +, nix-update-script }: buildGoModule rec { pname = "sbctl"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "Foxboron"; repo = pname; rev = version; - hash = "sha256-vxPYWoBU4k2fKWXGaMzIkUdj+EmPWTtCvMwAVmsgKaE="; + hash = "sha256-1TprUr+bLPOlMpe4ReV1S/QbVsA8Q7QIOcLczEaSyAQ="; }; - vendorHash = "sha256-kVXzHTONPCE1UeAnUiULjubJeZFD0DAxIk+w8/Dqs6c="; + patches = [ + ./fix-go-module.patch + ]; + + vendorHash = "sha256-LuSewWK/sxaHibJ6a05PM9CPen8J+MJD6lwk4SNOWSA="; ldflags = [ "-s" "-w" "-X github.com/foxboron/sbctl.DatabasePath=${databasePath}" ]; @@ -36,6 +41,8 @@ buildGoModule rec { --zsh <($out/bin/sbctl completion zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Secure Boot key manager"; mainProgram = "sbctl"; diff --git a/pkgs/by-name/sc/scc/package.nix b/pkgs/by-name/sc/scc/package.nix index 8d3f65e1621c..bdd5ab70ba3c 100644 --- a/pkgs/by-name/sc/scc/package.nix +++ b/pkgs/by-name/sc/scc/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "scc"; - version = "3.3.4"; + version = "3.3.5"; src = fetchFromGitHub { owner = "boyter"; repo = "scc"; rev = "v${version}"; - hash = "sha256-mKKUFW01WVBNfy6z4v3y+yu9DJuLZkQSWpekzmVuMn0="; + hash = "sha256-7qenc/1FEwiyR7qz6u8L35Wb8zAUVQ5sG5bvYpZKdzs="; }; vendorHash = null; diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix index 830f6deb232f..ab0516dd72ee 100644 --- a/pkgs/by-name/sc/scion/package.nix +++ b/pkgs/by-name/sc/scion/package.nix @@ -35,6 +35,8 @@ buildGoModule { doCheck = true; + tags = [ "sqlite_mattn" ]; + passthru.tests = { inherit (nixosTests) scion-freestanding-deployment; }; diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/by-name/se/seahorse/package.nix similarity index 98% rename from pkgs/desktops/gnome/apps/seahorse/default.nix rename to pkgs/by-name/se/seahorse/package.nix index 4cbc455c3da9..2ebc5bae4d0b 100644 --- a/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/pkgs/by-name/se/seahorse/package.nix @@ -100,7 +100,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/by-name/se/seclists/package.nix b/pkgs/by-name/se/seclists/package.nix index 7a149ca92a74..cb2341796cc0 100644 --- a/pkgs/by-name/se/seclists/package.nix +++ b/pkgs/by-name/se/seclists/package.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation { description = "Collection of multiple types of lists used during security assessments, collected in one place"; homepage = "https://github.com/danielmiessler/seclists"; license = licenses.mit; - maintainers = with maintainers; [ tochiaha janik pamplemousse ]; + maintainers = with maintainers; [ tochiaha pamplemousse ]; }; } diff --git a/pkgs/by-name/se/segger-jlink/package.nix b/pkgs/by-name/se/segger-jlink/package.nix old mode 100755 new mode 100644 index d7b2e0cfcaeb..a092097bce3b --- a/pkgs/by-name/se/segger-jlink/package.nix +++ b/pkgs/by-name/se/segger-jlink/package.nix @@ -1,39 +1,23 @@ { lib , stdenv , fetchurl +, callPackage , autoPatchelfHook , udev , config , acceptLicense ? config.segger-jlink.acceptLicense or false -, fontconfig -, xorg +, headless ? false , makeDesktopItem , copyDesktopItems }: let - supported = { - x86_64-linux = { - name = "x86_64"; - hash = "sha256-UsDP+wMS7ZeWMQBObwv5RxbwuWU8nLnHes7LEXK6imE="; - }; - i686-linux = { - name = "i386"; - hash = "sha256-InNHXWAc6QZEWyEcTTUCRMDsKd0RtR8d7O0clWKuFo8="; - }; - aarch64-linux = { - name = "arm64"; - hash = "sha256-ueIGdqfuIRCuEwaPkgZMgghO9DU11IboLLMryg/mxQ8="; - }; - armv7l-linux = { - name = "arm"; - hash = "sha256-6nTQGQpkbqQntheQqiUAdVS4rp30nl2KRUn5Adsfeoo="; - }; - }; + source = import ./source.nix; + supported = removeAttrs source ["version"]; platform = supported.${stdenv.system} or (throw "unsupported platform ${stdenv.system}"); - version = "796b"; + inherit (source) version; url = "https://www.segger.com/downloads/jlink/JLink_Linux_V${version}_${platform.name}.tgz"; @@ -66,69 +50,7 @@ let curlOpts = "--data accept_license_agreement=accepted"; }; - qt4-bundled = stdenv.mkDerivation { - pname = "segger-jlink-qt4"; - inherit src version; - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - buildInputs = [ - stdenv.cc.cc.lib - fontconfig - xorg.libXrandr - xorg.libXfixes - xorg.libXcursor - xorg.libSM - xorg.libICE - xorg.libX11 - ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - # Install libraries - mkdir -p $out/lib - mv libQt* $out/lib - - runHook postInstall - ''; - - meta = with lib; { - description = "Bundled QT4 libraries for the J-Link Software and Documentation pack"; - homepage = "https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack"; - license = licenses.lgpl21; - maintainers = with maintainers; [ stargate01 ]; - knownVulnerabilities = [ - "This bundled version of Qt 4 has reached its end of life after 2015. See https://github.com/NixOS/nixpkgs/pull/174634" - "CVE-2023-43114" - "CVE-2023-38197" - "CVE-2023-37369" - "CVE-2023-34410" - "CVE-2023-32763" - "CVE-2023-32762" - "CVE-2023-32573" - "CVE-2022-25634" - "CVE-2020-17507" - "CVE-2020-0570" - "CVE-2018-21035" - "CVE-2018-19873" - "CVE-2018-19871" - "CVE-2018-19870" - "CVE-2018-19869" - "CVE-2015-1290" - "CVE-2014-0190" - "CVE-2013-0254" - "CVE-2012-6093" - "CVE-2012-5624" - "CVE-2009-2700" - ]; - }; - }; + qt4-bundled = callPackage ./qt4-bundled.nix { inherit src version; }; in stdenv.mkDerivation { pname = "segger-jlink"; @@ -136,10 +58,11 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook + ] ++ lib.optionals (!headless) [ copyDesktopItems ]; - buildInputs = [ + buildInputs = lib.optionals (!headless) [ qt4-bundled ]; @@ -151,55 +74,60 @@ in stdenv.mkDerivation { dontConfigure = true; dontBuild = true; - desktopItems = map (entry: - (makeDesktopItem { - name = entry; - exec = entry; - icon = "applications-utilities"; - desktopName = entry; - genericName = "SEGGER ${entry}"; - categories = [ "Development" ]; - type = "Application"; - terminal = false; - startupNotify = false; - }) - ) [ - "JFlash" - "JFlashLite" - "JFlashSPI" - "JLinkConfig" - "JLinkGDBServer" - "JLinkLicenseManager" - "JLinkRTTViewer" - "JLinkRegistration" - "JLinkRemoteServer" - "JLinkSWOViewer" - "JLinkUSBWebServer" - "JMem" - ]; + desktopItems = lib.optionals (!headless) ( + map (entry: + (makeDesktopItem { + name = entry; + exec = entry; + icon = "applications-utilities"; + desktopName = entry; + genericName = "SEGGER ${entry}"; + categories = [ "Development" ]; + type = "Application"; + terminal = false; + startupNotify = false; + }) + ) [ + "JFlash" + "JFlashLite" + "JFlashSPI" + "JLinkConfig" + "JLinkGDBServer" + "JLinkLicenseManager" + "JLinkRTTViewer" + "JLinkRegistration" + "JLinkRemoteServer" + "JLinkSWOViewer" + "JLinkUSBWebServer" + "JMem" + ] + ); installPhase = '' runHook preInstall - # Install binaries and runtime files into /opt/ mkdir -p $out/opt - mv J* ETC GDBServer Firmwares $out/opt - # Link executables into /bin/ - mkdir -p $out/bin - for binr in $out/opt/*Exe; do - binrlink=''${binr#"$out/opt/"} - ln -s $binr $out/bin/$binrlink - # Create additional symlinks without "Exe" suffix - binrlink=''${binrlink/%Exe} - ln -s $binr $out/bin/$binrlink - done + ${lib.optionalString (!headless) '' + # Install binaries and runtime files into /opt/ + mv J* ETC GDBServer Firmwares $out/opt - # Copy special alias symlinks - for slink in $(find $out/opt/. -type l); do - cp -P -n $slink $out/bin || true - rm $slink - done + # Link executables into /bin/ + mkdir -p $out/bin + for binr in $out/opt/*Exe; do + binrlink=''${binr#"$out/opt/"} + ln -s $binr $out/bin/$binrlink + # Create additional symlinks without "Exe" suffix + binrlink=''${binrlink/%Exe} + ln -s $binr $out/bin/$binrlink + done + + # Copy special alias symlinks + for slink in $(find $out/opt/. -type l); do + cp -P -n $slink $out/bin || true + rm $slink + done + ''} # Install libraries install -Dm444 libjlinkarm.so* -t $out/lib @@ -218,11 +146,18 @@ in stdenv.mkDerivation { runHook postInstall ''; + passthru.updateScript = ./update.py; + meta = with lib; { description = "J-Link Software and Documentation pack"; homepage = "https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack"; + changelog = "https://www.segger.com/downloads/jlink/ReleaseNotes_JLink.html"; license = licenses.unfree; platforms = attrNames supported; - maintainers = with maintainers; [ FlorianFranzen stargate01 ]; + maintainers = with maintainers; [ + FlorianFranzen + h7x4 + stargate01 + ]; }; } diff --git a/pkgs/by-name/se/segger-jlink/qt4-bundled.nix b/pkgs/by-name/se/segger-jlink/qt4-bundled.nix new file mode 100644 index 000000000000..b1cce1f4a351 --- /dev/null +++ b/pkgs/by-name/se/segger-jlink/qt4-bundled.nix @@ -0,0 +1,74 @@ +{ + lib +, stdenv +, src +, version +, autoPatchelfHook +, fontconfig +, xorg +}: + +stdenv.mkDerivation { + pname = "segger-jlink-qt4"; + inherit src version; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + stdenv.cc.cc.lib + fontconfig + xorg.libXrandr + xorg.libXfixes + xorg.libXcursor + xorg.libSM + xorg.libICE + xorg.libX11 + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + # Install libraries + mkdir -p $out/lib + mv libQt* $out/lib + + runHook postInstall + ''; + + meta = with lib; { + description = "Bundled QT4 libraries for the J-Link Software and Documentation pack"; + homepage = "https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack"; + license = licenses.lgpl21; + maintainers = with maintainers; [ stargate01 ]; + knownVulnerabilities = [ + "This bundled version of Qt 4 has reached its end of life after 2015. See https://github.com/NixOS/nixpkgs/pull/174634" + "CVE-2023-43114" + "CVE-2023-38197" + "CVE-2023-37369" + "CVE-2023-34410" + "CVE-2023-32763" + "CVE-2023-32762" + "CVE-2023-32573" + "CVE-2022-25634" + "CVE-2020-17507" + "CVE-2020-0570" + "CVE-2018-21035" + "CVE-2018-19873" + "CVE-2018-19871" + "CVE-2018-19870" + "CVE-2018-19869" + "CVE-2015-1290" + "CVE-2014-0190" + "CVE-2013-0254" + "CVE-2012-6093" + "CVE-2012-5624" + "CVE-2009-2700" + ]; + }; +} + diff --git a/pkgs/by-name/se/segger-jlink/source.nix b/pkgs/by-name/se/segger-jlink/source.nix new file mode 100644 index 000000000000..89517ffb0073 --- /dev/null +++ b/pkgs/by-name/se/segger-jlink/source.nix @@ -0,0 +1,19 @@ +{ + version = "796k"; + x86_64-linux = { + name = "x86_64"; + hash = "sha256-GDmdKjMD9nJLPl4Qaxgrb5+b9CsUdyNqNak1JG4ERjo="; + }; + i686-linux = { + name = "i386"; + hash = "sha256-8j2UkPtDyIA+mfXl4jIVp89CpGA+T4eU5IQ0GwROgwU="; + }; + aarch64-linux = { + name = "arm64"; + hash = "sha256-FIzg7vAPlhnjuKEm5uGa7a37srp1U0e4eqlG9C6q26s="; + }; + armv7l-linux = { + name = "arm"; + hash = "sha256-NceqkV54QVXEJr4pJ3nvY3zxSYb9Er0uQWQ4vaojkv8="; + }; +} diff --git a/pkgs/by-name/se/segger-jlink/update.py b/pkgs/by-name/se/segger-jlink/update.py new file mode 100755 index 000000000000..73e5e274ab69 --- /dev/null +++ b/pkgs/by-name/se/segger-jlink/update.py @@ -0,0 +1,87 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 python3Packages.beautifulsoup4 python3Packages.requests + +import requests +import subprocess + +from bs4 import BeautifulSoup +from pathlib import Path +from tempfile import NamedTemporaryFile +from textwrap import indent, dedent + + +ARCH_MAP = { + 'x86_64-linux': 'x86_64', + 'i686-linux': 'i386', + 'aarch64-linux': 'arm64', + 'armv7l-linux': 'arm', +} + + +def find_latest_jlink_version() -> str: + try: + response = requests.get('https://www.segger.com/downloads/jlink/') + response.raise_for_status() + except requests.RequestException as e: + raise RuntimeError(f"Error fetching J-Link version: {e}") + + soup = BeautifulSoup(response.text, 'html.parser') + + jlink_download_tile = soup.find(lambda tag: tag.name == 'tbody' and "J-Link Software and Documentation pack" in tag.text) + version_select = jlink_download_tile.find('select') + version = next(o.text for o in version_select.find_all('option')) + + if version is None: + raise RuntimeError("Could not find the J-Link version on the download page.") + + return version.removeprefix('V').replace('.', '') + + +def nar_hash(url: str) -> str: + try: + response = requests.post(url, data={'accept_license_agreement': 'accepted'}) + response.raise_for_status() + except requests.RequestException as e: + raise RuntimeError(f"Error downloading file from {url}: {e}") + + with NamedTemporaryFile() as tmpfile: + tmpfile.write(response.content) + tmpfile.flush() + output = subprocess.check_output([ + "nix", + "--extra-experimental-features", "nix-command", + "hash", "file", "--sri", tmpfile.name + ]).decode("utf8") + + return output.strip() + + +def calculate_package_hashes(version: str) -> list[tuple[str, str, str]]: + result = [] + for (arch_nix, arch_web) in ARCH_MAP.items(): + url = f"https://www.segger.com/downloads/jlink/JLink_Linux_V{version}_{arch_web}.tgz"; + nhash = nar_hash(url) + result.append((arch_nix, arch_web, nhash)) + return result + + +def update_source(version: str, package_hashes: list[tuple[str, str, str]]): + content = f'version = "{version}";\n' + for arch_nix, arch_web, nhash in package_hashes: + content += dedent(f''' + {arch_nix} = {{ + name = "{arch_web}"; + hash = "{nhash}"; + }};''').strip() + '\n' + + content = '{\n' + indent(content, ' ') + '}\n' + + with open(Path(__file__).parent / 'source.nix', 'w') as file: + file.write(content) + + +if __name__ == '__main__': + version = find_latest_jlink_version() + package_hashes = calculate_package_hashes(version) + update_source(version, package_hashes) + diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 4dac1c11b433..d9f127a1c953 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "selenium-manager"; - version = "4.18.1"; + version = "4.22.0"; src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; rev = "selenium-${version}"; - hash = "sha256-1C9Epsk9rFlShxHGGzbWl6smrMzPn2h3yCWlzUIMpY8="; + hash = "sha256-qBuZgI5SSBwxbSBrAT0W/HzzV2JmPL00hPJ6s57QTeg="; }; sourceRoot = "${src.name}/rust"; - cargoHash = "sha256-BystESOFIitw3ER2K1TPOf5luOBvKXFuqc/unL93yRY="; + cargoHash = "sha256-1CPUOAfBfUeZt5S8t5SM3oyrNwXKHplhHG5idVy4YrE="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix index 15d6b6f7caa6..02a94f86f563 100644 --- a/pkgs/by-name/se/serpl/package.nix +++ b/pkgs/by-name/se/serpl/package.nix @@ -8,7 +8,7 @@ }: let pname = "serpl"; - version = "0.1.26"; + version = "0.1.30"; in rustPlatform.buildRustPackage { inherit pname version; @@ -16,12 +16,12 @@ rustPlatform.buildRustPackage { owner = "yassinebridi"; repo = "serpl"; rev = version; - hash = "sha256-ppF74VI0ceB4G/RLTa1phEy+tQ34r4hOMxqlK7YeLo0="; + hash = "sha256-ZltOhlx9aPD5vO9eTpoXWR6qXUwB+jW+tATkwX9UlIU="; }; nativeBuildInputs = [ makeWrapper ]; - cargoHash = "sha256-/TnuRRzeCPp8pqa/soGV0b3ZYp0cCbt3un6SjatSGp0="; + cargoHash = "sha256-FDS9JOmOtWOajB1tSd7QyW/KutRujs+3KjXxlNktrDM="; postFixup = '' # Serpl needs ripgrep to function properly. diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix index 92f451b24088..6558c612d84f 100644 --- a/pkgs/by-name/sh/shell-gpt/package.nix +++ b/pkgs/by-name/sh/shell-gpt/package.nix @@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ hatchling ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ click diff --git a/pkgs/by-name/sh/show-midi/package.nix b/pkgs/by-name/sh/show-midi/package.nix index f3f64967e627..86380c40dbe1 100644 --- a/pkgs/by-name/sh/show-midi/package.nix +++ b/pkgs/by-name/sh/show-midi/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "show-midi"; - version = "0.9.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "gbevin"; repo = "ShowMIDI"; rev = finalAttrs.version; - hash = "sha256-xt2LpoiaOWAeWM/YzaKM0WGi8aHs4T7pvMw1s/P4Oj0="; + hash = "sha256-ezX2W3qCnbJORfBqZqiDuxuDyfuxDMyaWjF9AfoPAS8="; fetchSubmodules = true; }; diff --git a/pkgs/desktops/gnome/core/simple-scan/default.nix b/pkgs/by-name/si/simple-scan/package.nix similarity index 100% rename from pkgs/desktops/gnome/core/simple-scan/default.nix rename to pkgs/by-name/si/simple-scan/package.nix diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index d262dbd5a50d..3e433c2d88f6 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "simplex-chat-desktop"; - version = "5.8.0"; + version = "5.8.1"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-EYoUsxJgG9xqXtjys0InJJaqvX1XXcef9PYQ3nZPNuo="; + hash = "sha256-s5gyamNQk79+FEO2JlHIhlI9LK6M16Mf+D9qz9J67qw="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index 7e34a1041db1..91b050403a01 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -1,90 +1,62 @@ -let - artifacts = [ "shell" "lua" "font" ]; -in -{ lib -, stdenvNoCC -, fetchurl -, common-updater-scripts -, curl -, jq -, writeShellScript -, artifactList ? artifacts +{ + fetchFromGitHub, + lib, + pnpm, + stdenvNoCC, + nodejs, + nix-update-script, }: -lib.checkListOfEnum "sketchybar-app-font: artifacts" artifacts artifactList - stdenvNoCC.mkDerivation - (finalAttrs: - let - selectedSources = map (artifact: builtins.getAttr artifact finalAttrs.passthru.sources) artifactList; - in - { - pname = "sketchybar-app-font"; - version = "2.0.19"; - srcs = selectedSources; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "sketchybar-app-font"; + version = "2.0.19"; - unpackPhase = '' - runHook preUnpack + src = fetchFromGitHub { + owner = "kvndrsslr"; + repo = "sketchybar-app-font"; + rev = "v2.0.19"; + hash = "sha256-4D3ONeGSvFYdeD3alzXlDxyLh6EyIC+lr4A6t7YWBaw="; + }; - for s in $selectedSources; do - b=$(basename $s) - cp $s ''${b#*-} - done + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-u0Rr086p6gotS+p9365+P8uKEqxDNGnWCsZDCaj8eEE="; + }; - runHook postUnpack + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + buildPhase = '' + runHook preBuild + + pnpm i + pnpm run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 dist/sketchybar-app-font.ttf "$out/share/fonts/truetype/sketchybar-app-font.ttf" + install -Dm755 dist/icon_map.sh "$out/bin/icon_map.sh" + install -Dm644 dist/icon_map.lua "$out/lib/sketchybar-app-font/icon_map.lua" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Ligature-based symbol font and a mapping function for sketchybar"; + longDescription = '' + A ligature-based symbol font and a mapping function for sketchybar, inspired by simple-bar's usage of community-contributed minimalistic app icons. ''; - - installPhase = '' - runHook preInstall - - '' + lib.optionalString (lib.elem "font" artifactList) '' - install -Dm644 ${finalAttrs.passthru.sources.font} "$out/share/fonts/truetype/sketchybar-app-font.ttf" - - '' + lib.optionalString (lib.elem "shell" artifactList) '' - install -Dm755 ${finalAttrs.passthru.sources.shell} "$out/bin/icon_map.sh" - - '' + lib.optionalString (lib.elem "lua" artifactList) '' - install -Dm644 ${finalAttrs.passthru.sources.lua} "$out/lib/sketchybar-app-font/icon_map.lua" - - runHook postInstall - ''; - - passthru = { - sources = { - font = fetchurl { - url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; - hash = "sha256-AH4Zkaccms1gNt7ZHZRHYPOx/iLpbcA4MiyBStHRDfU="; - }; - lua = fetchurl { - url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/icon_map.lua"; - hash = "sha256-AGcHBgOZY2EBR0WEfaQhEsTRdo8QfEawx6Q2rdBuKIg="; - }; - shell = fetchurl { - url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/icon_map.sh"; - hash = "sha256-fdKnweYF92zCLVBVXTjLWK9vdzMD8FvOHjEo2vqPbhQ="; - }; - }; - - updateScript = writeShellScript "update-sketchybar-app-font" '' - set -o errexit - export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}" - NEW_VERSION=$(curl --silent https://api.github.com/repos/kvndrsslr/sketchybar-app-font/releases/latest | jq '.tag_name | ltrimstr("v")' --raw-output) - if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then - echo "The new version same as the old version." - exit 0 - fi - for artifact in ${lib.escapeShellArgs (lib.mapAttrsToList(a: _: a) finalAttrs.passthru.sources)}; do - update-source-version "sketchybar-app-font" "$NEW_VERSION" --ignore-same-version --source-key="sources.$artifact" - done - ''; - }; - - meta = { - description = "Ligature-based symbol font and a mapping function for sketchybar"; - longDescription = '' - A ligature-based symbol font and a mapping function for sketchybar, inspired by simple-bar's usage of community-contributed minimalistic app icons. - ''; - homepage = "https://github.com/kvndrsslr/sketchybar-app-font"; - license = lib.licenses.cc0; - maintainers = with lib.maintainers; [ khaneliman ]; - }; - }) + homepage = "https://github.com/kvndrsslr/sketchybar-app-font"; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ khaneliman ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix new file mode 100644 index 000000000000..1182b835cd18 --- /dev/null +++ b/pkgs/by-name/sk/skypeforlinux/package.nix @@ -0,0 +1,197 @@ +{ + lib, + stdenv, + fetchurl, + squashfsTools, + writeScript, + alsa-lib, + atk, + cairo, + cups, + curl, + dbus, + expat, + fontconfig, + freetype, + gdk-pixbuf, + glib, + glibc, + gnome-keyring, + gtk3, + libappindicator-gtk3, + libnotify, + libpulseaudio, + libsecret, + libv4l, + nspr, + nss, + pango, + systemd, + wrapGAppsHook3, + xorg, + at-spi2-atk, + libuuid, + at-spi2-core, + libdrm, + mesa, + libxkbcommon, + libxshmfence, +}: + +let + + # Please keep the version x.y.0.z and do not update to x.y.76.z because the + # source of the latter disappears much faster. + version = "8.119.0.201"; + revision = "348"; + + rpath = + lib.makeLibraryPath [ + alsa-lib + atk + at-spi2-atk + at-spi2-core + cairo + cups + curl + dbus + expat + fontconfig + freetype + glib + glibc + libsecret + libuuid + + gdk-pixbuf + gtk3 + libappindicator-gtk3 + + gnome-keyring + + libnotify + libpulseaudio + nspr + nss + pango + stdenv.cc.cc + systemd + + libv4l + libdrm + mesa + libxkbcommon + libxshmfence + xorg.libxkbfile + xorg.libX11 + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libXScrnSaver + xorg.libxcb + ] + + ":${stdenv.cc.cc.lib}/lib64"; + + src = + if stdenv.hostPlatform.system == "x86_64-linux" then + fetchurl { + name = "skypeforlinux-${version}-${revision}.snap"; + url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap"; + hash = "sha512-sHbLmpF+5qaKTUArHceqv91NJxNpflQE2ojO9sepQBhXacn66hluC7cGb7toQnteYKUsx00TBYs2Ugk/BkT0uA=="; + } + else + throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; + +in +stdenv.mkDerivation { + pname = "skypeforlinux"; + inherit version revision; + + system = "x86_64-linux"; + + inherit src; + + nativeBuildInputs = [ + wrapGAppsHook3 + glib # For setup hook populating GSETTINGS_SCHEMA_PATH + ]; + + buildInputs = [ squashfsTools ]; + + unpackPhase = '' + runHook preUnpack + + unsquashfs "$src" /meta/{'gui/*.desktop',snap.yaml} \ + /usr/share/{doc/skypeforlinux,'icons/hicolor/*/apps/skypeforlinux.png',kservices5,pixmaps,skypeforlinux} + sourceRoot=squashfs-root + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + mv meta/gui usr/share/applications + mv meta/snap.yaml usr/share "$out" + ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin" + + runHook postInstall + ''; + + postFixup = '' + for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* -or -name \*.node\* \) ); do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true + done + + # Fix the desktop link + substituteInPlace "$out/share/applications/"*.desktop \ + --replace-fail 'Exec=skype ' 'Exec=skypeforlinux ' \ + --replace-fail 'Icon=''${SNAP}/meta/gui/skypeforlinux.png' 'Icon=skypeforlinux' + substituteInPlace "$out/share/kservices5/ServiceMenus/skypeforlinux.desktop" \ + --replace-fail 'Exec=/usr/bin/skypeforlinux ' 'Exec=skypeforlinux ' + ''; + + passthru.updateScript = writeScript "update-skypeforlinux" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl jq + + set -eu -o pipefail + + data=$(curl -H 'X-Ubuntu-Series: 16' \ + 'https://api.snapcraft.io/api/v1/snaps/details/skype?channel=stable&fields=download_sha512,revision,version') + + version=$(jq -r .version <<<"$data") + + if [[ "x$UPDATE_NIX_OLD_VERSION" != "x$version" ]]; then + + revision=$(jq -r .revision <<<"$data") + hash=$(nix hash to-sri "sha512:$(jq -r .download_sha512 <<<"$data")") + + update-source-version "$UPDATE_NIX_ATTR_PATH" "$version" "$hash" + update-source-version --ignore-same-hash --version-key=revision "$UPDATE_NIX_ATTR_PATH" "$revision" "$hash" + + fi + ''; + + meta = { + description = "Linux client for Skype"; + homepage = "https://www.skype.com"; + changelog = "https://support.microsoft.com/en-us/skype/what-s-new-in-skype-for-windows-mac-linux-and-web-d32f674c-abb3-40a5-a0b7-ee269ca60831"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + panaeon + jraygauthier + ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "skypeforlinux"; + }; +} diff --git a/pkgs/by-name/sl/slurp/package.nix b/pkgs/by-name/sl/slurp/package.nix index 996bf4c75d67..103d5e741517 100644 --- a/pkgs/by-name/sl/slurp/package.nix +++ b/pkgs/by-name/sl/slurp/package.nix @@ -52,9 +52,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/emersion/slurp"; license = lib.licenses.mit; mainProgram = "slurp"; - maintainers = with lib.maintainers; [ - buffet - nickcao - ]; + maintainers = with lib.maintainers; [ nickcao ]; }; }) diff --git a/pkgs/by-name/sm/smartgithg/package.nix b/pkgs/by-name/sm/smartgithg/package.nix index 65c5a78ad299..d3bb1ed1b67d 100644 --- a/pkgs/by-name/sm/smartgithg/package.nix +++ b/pkgs/by-name/sm/smartgithg/package.nix @@ -5,7 +5,7 @@ , openjdk21 , gtk3 , glib -, gnome +, adwaita-icon-theme , wrapGAppsHook3 , libXtst , which @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook3 ]; - buildInputs = [ jre gnome.adwaita-icon-theme gtk3 ]; + buildInputs = [ jre adwaita-icon-theme gtk3 ]; preFixup = with lib; '' gappsWrapperArgs+=( \ diff --git a/pkgs/by-name/sm/smassh/package.nix b/pkgs/by-name/sm/smassh/package.nix index eb82f51399ac..d723be41d2b9 100644 --- a/pkgs/by-name/sm/smassh/package.nix +++ b/pkgs/by-name/sm/smassh/package.nix @@ -19,7 +19,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index 38d0f47edbaa..5fd0b80ce6ec 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -105,7 +105,6 @@ python3Packages.buildPythonApplication rec { ]; nativeBuildInputs = with python3Packages; [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/by-name/so/sonarr/deps.nix b/pkgs/by-name/so/sonarr/deps.nix new file mode 100644 index 000000000000..661374123252 --- /dev/null +++ b/pkgs/by-name/so/sonarr/deps.nix @@ -0,0 +1,357 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; sha256 = "1caf4878nvjid3cw3rw18p9cn53brfs5x8dkvf82xvcdwc3i0nd1"; }) + (fetchNuGet { pname = "coverlet.collector"; version = "3.0.4-preview.27.ge7cb7c3b40"; sha256 = "00r2mi76x4jj30sw1vh0qb9123766g86mxd6f3hgsbczy5mqaa2j"; url = "https://pkgs.dev.azure.com/Servarr/7f7f0cec-b6d1-4285-a8c2-5c0b3ce99d29/_packaging/88cb5621-d569-46bd-ab53-84dba1855910/nuget/v3/flat2/coverlet.collector/3.0.4-preview.27.ge7cb7c3b40/coverlet.collector.3.0.4-preview.27.ge7cb7c3b40.nupkg"; }) + (fetchNuGet { pname = "coverlet.core"; version = "3.0.4-preview.27.ge7cb7c3b40"; sha256 = "1gs17rkrpy64fzdybsfyg76xafcp5i9qdarrg2wrgkraxnhl31cw"; url = "https://pkgs.dev.azure.com/Servarr/7f7f0cec-b6d1-4285-a8c2-5c0b3ce99d29/_packaging/88cb5621-d569-46bd-ab53-84dba1855910/nuget/v3/flat2/coverlet.core/3.0.4-preview.27.ge7cb7c3b40/coverlet.core.3.0.4-preview.27.ge7cb7c3b40.nupkg"; }) + (fetchNuGet { pname = "Dapper"; version = "2.0.123"; sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91"; }) + (fetchNuGet { pname = "Diacritical.Net"; version = "1.0.4"; sha256 = "1vw1qx5djgcikkb9z5b280fib45s5fgh0mzvqz7i3ggv7kl2a5mc"; }) + (fetchNuGet { pname = "DryIoc.dll"; version = "5.4.3"; sha256 = "1pkkaabw636wnwxar9vr8pg62zjapk3j5f21fvqq9fwh519fqkda"; }) + (fetchNuGet { pname = "DryIoc.Microsoft.DependencyInjection"; version = "6.2.0"; sha256 = "0iygbabd73ggzyq1ckbxifrh1kvzwlkr3x32ahamka7pv3982khb"; }) + (fetchNuGet { pname = "Dynamitey"; version = "2.0.9.136"; sha256 = "1wzd4g58bgvlxj2wkx71jgv6yxaikgm2q9b8cvicr2hndr6wl6y1"; }) + (fetchNuGet { pname = "Equ"; version = "2.3.0"; sha256 = "1b4nhs8xxyddbp7vbih7xf0kn86prwq150bw7ri1gsgaac5r3h9c"; }) + (fetchNuGet { pname = "FluentAssertions"; version = "6.10.0"; sha256 = "0agw9snp59hzsdy8plwj6byiy20xd5l3zx5627yn44m4lh8md17q"; }) + (fetchNuGet { pname = "FluentValidation"; version = "9.5.4"; sha256 = "11g4w8y08k7c8infhhrcd6jp4l4m723m19rgzgknmdy1p0lzrll6"; }) + (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.3.3"; sha256 = "12rpibz66bm4img2v1knjhawp4g94qmb78pfbpbhmg60zpnmjg7x"; }) + (fetchNuGet { pname = "Ical.Net"; version = "4.2.0"; sha256 = "19qcbsfmpzm4iclga4zd8qzb37gggq9vs665viyjc8x77nm2zi9r"; }) + (fetchNuGet { pname = "ImpromptuInterface"; version = "7.0.1"; sha256 = "1kyjp5skhsajvmabz438abcvddaz1w8s3d3csybw3znngpj9hlpb"; }) + (fetchNuGet { pname = "Instances"; version = "1.6.1"; sha256 = "1lbb3j7f21yq63xsqbiwlx61blf9f54f8zsp3q50a156gd2kvvl1"; }) + (fetchNuGet { pname = "Lib.Harmony"; version = "2.0.1"; sha256 = "0m9inqv1mx90cr7r57jra2j8qp0yjnvg6032djhiqv03hnhchv4s"; }) + (fetchNuGet { pname = "MailKit"; version = "3.6.0"; sha256 = "1i7fjvi5pp1bi9h4dp82dn7kfp7y6rwc4lwyp1zphyvv3gc54ahh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "6.0.21"; sha256 = "1flywd4z2mjllcni6crcp3rm4l1ffhl32likfcgn34d2vicxxjv0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; version = "6.0.21"; sha256 = "0gv8k2dmak4p3n6abcn219d91naw4z4svmd0vrlr8l4pirz1bkm1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Owin"; version = "6.0.21"; sha256 = "15bji9cx9hda8vncvabahgr5037qriyi3bb72m7vj79sad6nbshp"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "Microsoft.Bcl.TimeProvider"; version = "8.0.0"; sha256 = "11bzf84kg54g5vq5w4zshdfl9a1agkph6gmg9lrq68fjf14w66vw"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; sha256 = "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.5.0"; sha256 = "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) + (fetchNuGet { pname = "Microsoft.Data.SqlClient"; version = "2.1.2"; sha256 = "1l9qvvqdg1jmqg525k0cgfw08j9jyvb9ibh3x1wl1zidkwg1xgbz"; }) + (fetchNuGet { pname = "Microsoft.Data.SqlClient.SNI.runtime"; version = "2.1.1"; sha256 = "0c04sjbhm5lyn2b4faz8zlc338i4lavv1638yz64nw6xxrp2b0zr"; }) + (fetchNuGet { pname = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.1"; sha256 = "0wg6ilgm0vkhgh8jkvpna7kqiix47zpcgzdvh6c237bi8h0lz7mz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.1"; sha256 = "164i6xmkpl419akn17ag4hng8jq866g39wyxns4wv5glahwb6xai"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "6.0.0"; sha256 = "1hb4qrq9xdxzh2px515pv1vkz1jigwaxw1hfg9w8s6pgl8z04l4c"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.1"; sha256 = "16xpqfzpcjk3mg70g5g2qrkhqf7rppah3q6dasdddbpikw43ni47"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "6.0.0"; sha256 = "1c6l5szma1pdn61ncq1kaqibg0dz65hbma2xl626a8d1m6awn353"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "6.0.1"; sha256 = "0faddzvkhjhsn9fp269r4sapjrahiynwlwakhzljfg3k94jfldk1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.1"; sha256 = "0kl5ypidmzllyxb91gwy3z950dc416p1y8wikzbdbp0l7aaaxq2p"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.0.1"; sha256 = "0p1xb5vcsbmxdi538736avj7kkafsvjsl98mz5sgs7a048pmq5s0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "6.0.1"; sha256 = "11jwzzyryr6i2nwfcrs4rjv4qg0zmm15gaa882xk54ric3zc37ig"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "6.0.0"; sha256 = "1mwjx6li4a82nb589763whpnhf5hfy1bpv1dzqqvczb1lhxhzhlj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.WindowsServices"; version = "6.0.2"; sha256 = "0613a766fxr4pzy8a8p731d0ibz7p8m4hxil2cmzl6g755vg40l6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.1"; sha256 = "1l6jhhdxnvvy9bszmkv2q58qsms78d5k7zbkq1lj7djncly71wr7"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "6.0.0"; sha256 = "0aql9kc45g2d6z1hmwr3p1a2qy9m3f36bds3054givsnpnis81wk"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "6.0.0"; sha256 = "0j3g2k8sr99kr73w66yk4ghq469syyxzayq6fjfnjjgj1y7x05fl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "6.0.0"; sha256 = "0ck8r63qal88349kkbj1i98fd8z9kcp41s13yyz8cpkygn15wq4g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.1"; sha256 = "1xndfwz6wgqpkjkfkbxgnmg7b691ihyx9x95mkp0sjg5hpfvxdw5"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.21.1"; sha256 = "11czikqfn0sx2a1algv2v233h0ndjs8rncfm306qm376w917brs3"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.8.0"; sha256 = "12df8mliwc33gj671a61ivd74hdrlmaffs841bblk4pmgfrscq72"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.8.0"; sha256 = "16jcnkm9mn3pv8mn2wv4vvndarhfhrkx4n395n3kvp03638wyy63"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "6.8.0"; sha256 = "0z417z28b9raxy8hi0b3l9js5lqrzcxwxcjlwimbichsi0jilcd3"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "6.8.0"; sha256 = "1gm4df8rb7ppzhydgbz1ib423s9pwi00dh3gxfmp0myz224nflsa"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.8.0"; sha256 = "0mn8j3sqmfa5ksyydnpypwdbbr7dvyahwiyqkp85mbbhcayhi6rl"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.1"; sha256 = "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.1"; sha256 = "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.1"; sha256 = "1igpx7ldxqx9fkrbhakd2bybc0dgpvj86zr30vpfj31ncm6lp4id"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.1"; sha256 = "0agmphcspyg4pmpzfrfpbmgqf3wd3kqqvs87xls0i1139pa8ryi9"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.7.0"; sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) + (fetchNuGet { pname = "MimeKit"; version = "3.6.0"; sha256 = "0l54df3s0qnj0b06a4z5mldlx4nnfvw8sbfl57ddalz505q3mayg"; }) + (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.1"; sha256 = "0c7srz0vqm0npli2ixg9j6x934l0drrng8brwanqh96s1wwaikr7"; }) + (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.2"; sha256 = "114idyjaa6npi580d61gvr7i5xfcy5xi2yc1pfr9y82pj5kj7x5a"; }) + (fetchNuGet { pname = "Mono.Nat"; version = "3.0.1"; sha256 = "1xy3c9wsiz8k3rx8v60y6gnps337rsb5jpyj0r6g384prg6z4vh0"; }) + (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "5.20.1.34-servarr24"; sha256 = "1dng80xi6qp62zp4p23cigkbykvhkk8g8k2qgzl5ky9kk6hdvb3a"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/9845f7c9-6c8c-4845-b5ee-58375c59e0d8/nuget/v3/flat2/mono.posix.netstandard/5.20.1.34-servarr24/mono.posix.netstandard.5.20.1.34-servarr24.nupkg"; }) + (fetchNuGet { pname = "MonoMod.Common"; version = "20.5.7.1"; sha256 = "1aa61i75n1435az43jzh80ra8mqna4yqq3byjzyaadg8dvcwq1rg"; }) + (fetchNuGet { pname = "MonoTorrent"; version = "2.0.7"; sha256 = "030nh2fvj78fmllbv08f2bzdwfb2nhgbjn5x5hggd7ibg8mmx8ax"; }) + (fetchNuGet { pname = "Moq"; version = "4.18.4"; sha256 = "0x439pcaqg8kv0an4cjbspw8d98gq144yrqwhnnh6xf9qjaris94"; }) + (fetchNuGet { pname = "NBuilder"; version = "6.1.0"; sha256 = "17qi59fnfk3qpwyc14z2jaigvjl0rjy592927wv3nlh8wq7aajyw"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "NLog"; version = "4.7.11"; sha256 = "0vvgypqh6cxzkrfymjaghads5dg88l2xvbz6dxwwrnjg5hhpcjaw"; }) + (fetchNuGet { pname = "NLog"; version = "4.7.14"; sha256 = "1pjkxlf20vrh9b8r6wzay1563fdhhxslxb7acdkn5ss8gvd2m23n"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "1.7.4"; sha256 = "1lilk9sv3j9jg23hl0vhxd8w63bh6xvns42rkz5n582wpf5k2r24"; }) + (fetchNuGet { pname = "NLog.Targets.Syslog"; version = "6.0.3"; sha256 = "17d1chixs9f3g1gwg74k1ms9y7v7c396jdvycsj54d6a7hkwr5fx"; }) + (fetchNuGet { pname = "NodaTime"; version = "3.0.0"; sha256 = "1rk6jxpy7rngznmci02hi346wr7ibr262m8jn0bf5rdk6y8qds4h"; }) + (fetchNuGet { pname = "Npgsql"; version = "7.0.7"; sha256 = "1rsss91i3q0irafps64bqdhg741cayw4i1r3j3sblgwhxl8czw82"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) + (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) + (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.17.0"; sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) + (fetchNuGet { pname = "NunitXml.TestLogger"; version = "3.0.131"; sha256 = "0a1b9v3rl0jxdm0clma5xv73w9kwv33asix6041dv6x7xzyqi2p4"; }) + (fetchNuGet { pname = "Polly"; version = "8.3.1"; sha256 = "19q7s493sv90879052pxfcbsk3bmxjg5688ya7l12964ddafiwsl"; }) + (fetchNuGet { pname = "Polly.Core"; version = "8.3.1"; sha256 = "15ylkqdcwpr76n0nfzpvd6s00ywjagn1ignyrcz9arwahrxpsm4b"; }) + (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.9.0"; sha256 = "0kphjwz4hk2nki3b4f9z096xzd520nrpvi3cjib8fkjk6zhwrr8q"; }) + (fetchNuGet { pname = "RestSharp"; version = "106.15.0"; sha256 = "1g2gbzaldyriy46rgf5yvnd5b8q7y0blhcwals80j0gv3igs2h7i"; }) + (fetchNuGet { pname = "ReusableTasks"; version = "2.0.0"; sha256 = "0qag69n8kx164minz3h50g6f7cdq15r89vikcd1llbkdwq4qldaa"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "Sentry"; version = "4.0.2"; sha256 = "118k34q5zrzz2k150nq10mp6iplxpvfsyzi9f6fn81ra0v200fsg"; }) + (fetchNuGet { pname = "Servarr.FFMpegCore"; version = "4.7.0-26"; sha256 = "11hlvzd78rq2by05ywbmf5xgcc1f0y53y3aq46hipcvqnaqy0v50"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/783c2dce-dbc3-4218-8816-4a5e12af4d84/nuget/v3/flat2/servarr.ffmpegcore/4.7.0-26/servarr.ffmpegcore.4.7.0-26.nupkg"; }) + (fetchNuGet { pname = "Servarr.FFprobe"; version = "5.1.4.112"; sha256 = "07cy85gi8n3axpfrj1zgyf037p9yxcll0jd1d8bks6ibjyywilrr"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/783c2dce-dbc3-4218-8816-4a5e12af4d84/nuget/v3/flat2/servarr.ffprobe/5.1.4.112/servarr.ffprobe.5.1.4.112.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator"; version = "3.3.2.9"; sha256 = "1lyb4d13c3azj1xgr4cdp2pmwxkzpr9qh9qzc0lf0v5iddpir4dw"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator/3.3.2.9/servarr.fluentmigrator.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Abstractions"; version = "3.3.2.9"; sha256 = "1606h83gdgv2rg32xjzd3nsi037dwdqqc3n0lrn4q3nxlrlcx2lm"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.abstractions/3.3.2.9/servarr.fluentmigrator.abstractions.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Extensions.Oracle"; version = "3.3.2.9"; sha256 = "14wvmsg881mgigazszyas9sshr8119m40a0gd1bddbq9iwbz5wfj"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.oracle/3.3.2.9/servarr.fluentmigrator.extensions.oracle.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Extensions.Postgres"; version = "3.3.2.9"; sha256 = "0vqd1jxxn66ydbkrwq9qkykf28i8z74a0ixr03mwzcrgg1h2wh0g"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.postgres/3.3.2.9/servarr.fluentmigrator.extensions.postgres.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Extensions.SqlAnywhere"; version = "3.3.2.9"; sha256 = "1mz7j4wara40l1hhmflja2z62nd5i8qcpaxc7xkxaw7wdbd3qslb"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.sqlanywhere/3.3.2.9/servarr.fluentmigrator.extensions.sqlanywhere.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Extensions.SqlServer"; version = "3.3.2.9"; sha256 = "04s1wd89zn8k0s7m256sgnzw32lvin6iylba545hjysrkqfl438z"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.extensions.sqlserver/3.3.2.9/servarr.fluentmigrator.extensions.sqlserver.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner"; version = "3.3.2.9"; sha256 = "020mv58591cv172dc3sw0r555xf42nwsrra92irvlk796vpxm34j"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner/3.3.2.9/servarr.fluentmigrator.runner.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Core"; version = "3.3.2.9"; sha256 = "19y34dw0qs5y1hp0w5yq5z85wv6ibw8gyim6ghvzg7vbw8hhgg60"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.core/3.3.2.9/servarr.fluentmigrator.runner.core.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Db2"; version = "3.3.2.9"; sha256 = "1ikb0anvh6i88x48k9mscp362crj873v5fxd174zs7rqyw6fs8kj"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.db2/3.3.2.9/servarr.fluentmigrator.runner.db2.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Firebird"; version = "3.3.2.9"; sha256 = "07dvw3y5n39fxrpfqkdn30gncxh8x2j6jvw1vnijay9cxmhn7cxc"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.firebird/3.3.2.9/servarr.fluentmigrator.runner.firebird.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Hana"; version = "3.3.2.9"; sha256 = "10fi2xq1izxqd3mhcg42ahyxl8i0iyhl6hi3zcbnr88x9kdafagc"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.hana/3.3.2.9/servarr.fluentmigrator.runner.hana.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.MySql"; version = "3.3.2.9"; sha256 = "1nggyp6acsz7931gy7iq2pa0z56g9m2rv9ang4969ajr47whd3ii"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.mysql/3.3.2.9/servarr.fluentmigrator.runner.mysql.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Oracle"; version = "3.3.2.9"; sha256 = "0y17z0bv5gcaw19cirgfhf8lj90h748bpc5cniq8hqc62spbyv70"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.oracle/3.3.2.9/servarr.fluentmigrator.runner.oracle.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Postgres"; version = "3.3.2.9"; sha256 = "17j7c2cas53b1x5wi6rvn6yli347qfbp1m9l2jrxrb8dj58n79ii"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.postgres/3.3.2.9/servarr.fluentmigrator.runner.postgres.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.Redshift"; version = "3.3.2.9"; sha256 = "1w6055ifmbay1d0dmnkk3nsszn7ihkx8gskrxlh0ysgcrz6qcwlf"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.redshift/3.3.2.9/servarr.fluentmigrator.runner.redshift.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SqlAnywhere"; version = "3.3.2.9"; sha256 = "1fzfkaa9cbhjy9lrb78h7yakka4j1gfi6hn7kxrlidkw382yv7d9"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlanywhere/3.3.2.9/servarr.fluentmigrator.runner.sqlanywhere.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SQLite"; version = "3.3.2.9"; sha256 = "1903cc4z31b0pcs64zagk7hn6dkgmfyj2di7bdf0i4zl2h365x3m"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlite/3.3.2.9/servarr.fluentmigrator.runner.sqlite.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SqlServer"; version = "3.3.2.9"; sha256 = "1zwmhwniwh46h9r9jr1vjpmh8k94xldg4fgzdlaa22pr7m8iyclq"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlserver/3.3.2.9/servarr.fluentmigrator.runner.sqlserver.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SqlServerCe"; version = "3.3.2.9"; sha256 = "07j9nmhyb946mdlpp9i159f4c7mq9w1ar5p8dvskzkzmp26dj7ck"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlserverce/3.3.2.9/servarr.fluentmigrator.runner.sqlserverce.3.3.2.9.nupkg"; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; sha256 = "0cs6wfx74rwp88m5arci04ldv2s92kpif28ykfm9ig17h9a8gsnc"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) + (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.4.1"; sha256 = "1d46yx6h36bssqyshq44qxx0fsx43bjf09zrlbvqfigacfsp9mph"; }) + (fetchNuGet { pname = "System.ComponentModel.EventBasedAsync"; version = "4.3.0"; sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; }) + (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) + (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.4.0"; sha256 = "1hjgmz47v5229cbzd2pwz2h0dkq78lb2wp9grx8qr72pb5i0dk7v"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.7.0"; sha256 = "0pav0n21ghf2ax6fiwjbng29f27wkb4a2ddma0cqx04s97yyk25d"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.1"; sha256 = "1d6cx49fzycbl2fam8d1j3491sqx6mh7qkb5ddrawr00x74hgzak"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Data.SQLite.Core.Servarr"; version = "1.0.115.5-18"; sha256 = "0dx5n2rp2bbn9c0044skybsv6njybr2h3mh03zqa6nx4s8l2z90z"; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/f762697f-09fa-4960-89a1-64e48069bf6a/nuget/v3/flat2/system.data.sqlite.core.servarr/1.0.115.5-18/system.data.sqlite.core.servarr.1.0.115.5-18.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.7.0"; sha256 = "0cr0v5dz8l5ackxv6b772fjcyj2nimqmrmzanjs4cw2668v568n1"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; sha256 = "08y1x2d5w2hnhkh9r1998pjc7r4qp0rmzax062abha85s11chifd"; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "4.7.0"; sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.2"; sha256 = "08kgiywg5whhw80xshlrp0q9mkl8hlkgqdsnk1gm6bb898f1l3gs"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.8.0"; sha256 = "1j0cfyg5718rfp6i8c4qmmr8lcx6p4dq1byicnlvmlnr4kx8ks2m"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "6.0.0-preview.5.21301.5"; sha256 = "0clg39zqzdp45r8pp9shlgvnpvsskf608vdz5qjn8k4fbm69cyx0"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.7.0"; sha256 = "0l8jpxhpgjlf1nkz5lvp61r4kfdbhr29qi8aapcxn3izd9wd0j8r"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.5.0"; sha256 = "1bqqs9w424cw6an5n0rvd1d9522d50z550fn75g2lysl480gkkn0"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.7.0"; sha256 = "04qw9km34pmzr2alckb3mqdb4fpqwlvzk59lg8c7jfidghcl4jqq"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.Caching"; version = "4.7.0"; sha256 = "1bxv0jfxm50z4303znp790bijm7pg6nli0l8fin83scfhkc34h7y"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0-preview.5.21301.5"; sha256 = "131f3z3ikv3n8442chr11nj4x46amq00mb53pb2ds42dabldkdgy"; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.0"; sha256 = "1q80znpwkv5wrzgx0qnzxqaa5k1s72fnk3g1yng62l7y14d8ki64"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.7.0"; sha256 = "1s1sh8k10s0apa09c5m2lkavi3ys90y657whg2smb3y8mpkfr5vm"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "4.7.0"; sha256 = "13f366sj36jwbvld957gk2q64k2xbj48r8b0k9avrri2nlq1fs04"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "6.0.0-preview.5.21301.5"; sha256 = "1q3iikvjcfrm5p89p1j7qlw1szvryq680qypk023wgy9phmlwi57"; }) + (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "6.0.1"; sha256 = "15nvnflqfrz2fsclcwgaq8r532x2fbv1ds3rck95l8psb7pgx1v5"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.7.0"; sha256 = "00yamg3b111blkjvyckxl5nxsxs2n9iccp7z1x0c2j96czgf60pz"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.9"; sha256 = "1fvqlicbn774da3b1zyfbnd7lw350sxq8hr7jcincv1fbz2yyf76"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.4.0"; sha256 = "1wydfgszs00yxga57sam66vzv9fshk2pw7gim57saplsnkfliaif"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "4.7.0"; sha256 = "11dmyx3j0jafjx5r9mkj1v4w2a4rzrdn8fgwm2d1g7fs1ayqcvy9"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) + (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) + (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) +] diff --git a/pkgs/by-name/so/sonarr/nuget-config.patch b/pkgs/by-name/so/sonarr/nuget-config.patch new file mode 100644 index 000000000000..c844b419d7a5 --- /dev/null +++ b/pkgs/by-name/so/sonarr/nuget-config.patch @@ -0,0 +1,9 @@ +Move NuGet configuration file to the source root where Nixpkgs .NET +build infrastructure expects to find it. + +https://github.com/NixOS/nixpkgs/pull/291640#discussion_r1601841807 + +diff --git a/src/NuGet.Config b/NuGet.Config +similarity index 100% +rename from src/NuGet.Config +rename to NuGet.Config diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix new file mode 100644 index 000000000000..d6a72b492642 --- /dev/null +++ b/pkgs/by-name/so/sonarr/package.nix @@ -0,0 +1,161 @@ +{ lib +, fetchFromGitHub +, buildDotnetModule +, dotnetCorePackages +, sqlite +, withFFmpeg ? true # replace bundled ffprobe binary with symlink to ffmpeg package. +, ffmpeg +, fetchYarnDeps +, yarn +, fixup-yarn-lock +, nodejs +, nixosTests + # update script +, writers +, python3Packages +, nix +, prefetch-yarn-deps +}: +let + version = "4.0.5.1710"; + src = fetchFromGitHub { + owner = "Sonarr"; + repo = "Sonarr"; + rev = "v${version}"; + hash = "sha256-9mrt5/6v8odPv1rwJoT6laXGlh3blgZAL97tsllj7MY="; + }; +in +buildDotnetModule { + pname = "sonarr"; + inherit version src; + + patches = [ + ./nuget-config.patch + ]; + + strictDeps = true; + nativeBuildInputs = [ nodejs yarn prefetch-yarn-deps fixup-yarn-lock ]; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-dSZBifvUGJx5lj7C+Sj+kJprK8JG6SE5vg6+X6QdCZ8="; + }; + + ffprobe = lib.optionalDrvAttr withFFmpeg (lib.getExe' ffmpeg "ffprobe"); + + postConfigure = '' + yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" + fixup-yarn-lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs --build node_modules + ''; + postBuild = '' + yarn --offline run build --env production + ''; + postInstall = lib.optionalString withFFmpeg '' + rm -- "$out/lib/sonarr/ffprobe" + ln -s -- "$ffprobe" "$out/lib/sonarr/ffprobe" + '' + '' + cp -a -- _output/UI "$out/lib/sonarr/UI" + ''; + # Add an alias for compatibility with Sonarr v3 package. + postFixup = '' + ln -s -- Sonarr "$out/bin/NzbDrone" + ''; + + nugetDeps = ./deps.nix; + + runtimeDeps = [ sqlite ]; + + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; + + doCheck = true; + + __darwinAllowLocalNetworking = true; # for tests + + __structuredAttrs = true; # for Copyright property that contains spaces + + executables = [ "Sonarr" ]; + + projectFile = [ + "src/NzbDrone.Console/Sonarr.Console.csproj" + "src/NzbDrone.Mono/Sonarr.Mono.csproj" + ]; + + testProjectFile = [ + "src/NzbDrone.Api.Test/Sonarr.Api.Test.csproj" + "src/NzbDrone.Common.Test/Sonarr.Common.Test.csproj" + "src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj" + "src/NzbDrone.Host.Test/Sonarr.Host.Test.csproj" + "src/NzbDrone.Libraries.Test/Sonarr.Libraries.Test.csproj" + "src/NzbDrone.Mono.Test/Sonarr.Mono.Test.csproj" + "src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj" + ]; + + dotnetFlags = [ + "--property:TargetFramework=net6.0" + "--property:EnableAnalyzers=false" + # Override defaults in src/Directory.Build.props that use current time. + "--property:Copyright=Copyright 2014-2024 sonarr.tv (GNU General Public v3)" + "--property:AssemblyVersion=${version}" + "--property:AssemblyConfiguration=main" + ]; + + # Skip manual, integration, automation and platform-dependent tests. + dotnetTestFlags = [ + "--filter:${lib.concatStringsSep "&" [ + "TestCategory!=ManualTest" + "TestCategory!=IntegrationTest" + "TestCategory!=AutomationTest" + + # setgid tests + "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.DiskProviderFixture.should_preserve_setgid_on_set_folder_permissions" + "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.DiskProviderFixture.should_clear_setgid_on_set_folder_permissions" + + # we do not set application data directory during tests (i.e. XDG data directory) + "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.FreeSpaceFixture.should_return_free_disk_space" + + # attempts to read /etc/*release and fails since it does not exist + "FullyQualifiedName!=NzbDrone.Mono.Test.EnvironmentInfo.ReleaseFileVersionAdapterFixture.should_get_version_info" + + # fails to start test dummy because it cannot locate .NET runtime for some reason + "FullyQualifiedName!=NzbDrone.Common.Test.ProcessProviderFixture.Should_be_able_to_start_process" + "FullyQualifiedName!=NzbDrone.Common.Test.ProcessProviderFixture.kill_all_should_kill_all_process_with_name" + + # makes real HTTP requests + "FullyQualifiedName!~NzbDrone.Core.Test.TvTests.RefreshEpisodeServiceFixture" + "FullyQualifiedName!~NzbDrone.Core.Test.UpdateTests.UpdatePackageProviderFixture" + + # fails on macOS + "FullyQualifiedName!~NzbDrone.Core.Test.Http.HttpProxySettingsProviderFixture" + ]}" + ]; + + passthru = { + tests = { + inherit (nixosTests) sonarr; + }; + + updateScript = writers.writePython3 "sonarr-updater" + { + libraries = with python3Packages; [ requests ]; + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ nix prefetch-yarn-deps ]) + ]; + } + ./update.py; + }; + + meta = { + description = "Smart PVR for newsgroup and bittorrent users"; + homepage = "https://sonarr.tv"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fadenb purcell tie ]; + mainProgram = "Sonarr"; + # platforms inherited from dotnet-sdk. + }; +} diff --git a/pkgs/by-name/so/sonarr/update.py b/pkgs/by-name/so/sonarr/update.py new file mode 100644 index 000000000000..195a2d5d05ac --- /dev/null +++ b/pkgs/by-name/so/sonarr/update.py @@ -0,0 +1,160 @@ +import json +import os +import pathlib +import requests +import shutil +import subprocess +import sys +import tempfile + + +def replace_in_file(file_path, replacements): + file_contents = pathlib.Path(file_path).read_text() + for old, new in replacements.items(): + if old == new: + continue + updated_file_contents = file_contents.replace(old, new) + # A dumb way to check that we’ve actually replaced the string. + if file_contents == updated_file_contents: + print(f"no string to replace: {old} → {new}", file=sys.stderr) + sys.exit(1) + file_contents = updated_file_contents + with tempfile.NamedTemporaryFile(mode="w") as t: + t.write(file_contents) + t.flush() + shutil.copyfile(t.name, file_path) + + +def nix_hash_to_sri(hash): + return subprocess.run( + [ + "nix", + "--extra-experimental-features", "nix-command", + "hash", + "to-sri", + "--type", "sha256", + "--", + hash, + ], + stdout=subprocess.PIPE, + text=True, + check=True, + ).stdout.rstrip() + + +nixpkgs_path = "." +attr_path = os.getenv("UPDATE_NIX_ATTR_PATH", "sonarr") + +package_attrs = json.loads(subprocess.run( + [ + "nix", + "--extra-experimental-features", "nix-command", + "eval", + "--json", + "--file", nixpkgs_path, + "--apply", """p: { + dir = builtins.dirOf p.meta.position; + version = p.version; + sourceHash = p.src.outputHash; + yarnHash = p.yarnOfflineCache.outputHash; + }""", + "--", + attr_path, + ], + stdout=subprocess.PIPE, + text=True, + check=True, +).stdout) + +old_version = package_attrs["version"] +new_version = old_version + +# Note that we use Sonarr API instead of GitHub to fetch latest stable release. +# This corresponds to the Updates tab in the web UI. See also +# https://github.com/Sonarr/Sonarr/blob/070919a7e6a96ca7e26524996417c6f8d1b5fcaa/src/NzbDrone.Core/Update/UpdatePackageProvider.cs +version_update = requests.get( + f"https://services.sonarr.tv/v1/update/main?version={old_version}", +).json() +if version_update["available"]: + new_version = version_update["updatePackage"]["version"] + +if new_version == old_version: + sys.exit() + +source_nix_hash, source_store_path = subprocess.run( + [ + "nix-prefetch-url", + "--name", "source", + "--unpack", + "--print-path", + f"https://github.com/Sonarr/Sonarr/archive/v{new_version}.tar.gz", + ], + stdout=subprocess.PIPE, + text=True, + check=True, +).stdout.rstrip().split("\n") + +old_source_hash = package_attrs["sourceHash"] +new_source_hash = nix_hash_to_sri(source_nix_hash) + +old_yarn_hash = package_attrs["yarnHash"] +new_yarn_hash = nix_hash_to_sri(subprocess.run( + [ + "prefetch-yarn-deps", + # does not support "--" separator :( + # Also --verbose writes to stdout, yikes. + os.path.join(source_store_path, "yarn.lock"), + ], + stdout=subprocess.PIPE, + text=True, + check=True, +).stdout.rstrip()) + +package_dir = package_attrs["dir"] +package_file_name = "package.nix" +deps_file_name = "deps.nix" + +# To update deps.nix, we copy the package to a temporary directory and run +# passthru.fetch-deps script there. +with tempfile.TemporaryDirectory() as work_dir: + package_file = os.path.join(work_dir, package_file_name) + deps_file = os.path.join(work_dir, deps_file_name) + + shutil.copytree(package_dir, work_dir, dirs_exist_ok=True) + + replace_in_file(package_file, { + # NB unlike hashes, versions are likely to be used in code or comments. + # Try to be more specific to avoid false positive matches. + f"version = \"{old_version}\"": f"version = \"{new_version}\"", + old_source_hash: new_source_hash, + old_yarn_hash: new_yarn_hash, + }) + + # Generate nuget-to-nix dependency lock file. + fetch_deps = os.path.join(work_dir, "fetch-deps") + subprocess.run( + [ + "nix", + "--extra-experimental-features", "nix-command", + "build", + "--impure", + "--nix-path", "", + "--include", f"nixpkgs={nixpkgs_path}", + "--include", f"package={package_file}", + "--expr", "(import { }).callPackage { }", + "--out-link", fetch_deps, + "passthru.fetch-deps", + ], + check=True, + ) + subprocess.run( + [ + fetch_deps, + deps_file, + ], + stdout=subprocess.DEVNULL, + check=True, + ) + + shutil.copy(deps_file, os.path.join(package_dir, deps_file_name)) + shutil.copy(package_file, os.path.join(package_dir, package_file_name)) diff --git a/pkgs/by-name/so/sozi/package.nix b/pkgs/by-name/so/sozi/package.nix new file mode 100644 index 000000000000..612aa93cde2d --- /dev/null +++ b/pkgs/by-name/so/sozi/package.nix @@ -0,0 +1,35 @@ +{ appimageTools, lib, fetchurl }: +let + pname = "sozi"; + version = "23.7.25-1690311612"; + + src = fetchurl { + url = "https://github.com/sozi-projects/Sozi/releases/download/v23.07/Sozi-${version}.AppImage"; + hash = "sha256-QHvgevv60ZTkkdt+IWaCuXt0XVnhe5Q5oROwa2LFie8="; + }; + + appimageContents = appimageTools.extract { + inherit version pname src; + }; +in appimageTools.wrapType2 { + inherit pname version src; + + extraPkgs = pkgs: with pkgs; [ polkit udev ]; + + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/sozi.desktop -t $out/share/applications + cp -r ${appimageContents}/usr/share/icons $out/share + substituteInPlace $out/share/applications/sozi.desktop \ + --replace 'Exec=AppRun' 'Exec=sozi' + ''; + + meta = { + description = "Zooming presentation editor and player"; + homepage = "https://sozi.baierouge.fr/"; + license = lib.licenses.mpl20; + mainProgram = "sozi"; + maintainers = with lib.maintainers; [ srghma ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/sp/spades/package.nix b/pkgs/by-name/sp/spades/package.nix index 9a60ee499a64..b390524f718c 100644 --- a/pkgs/by-name/sp/spades/package.nix +++ b/pkgs/by-name/sp/spades/package.nix @@ -1,46 +1,72 @@ { lib, stdenv, - fetchurl, - zlib, bzip2, cmake, + fetchFromGitHub, + fetchpatch, + ncurses, python3, + readline, }: stdenv.mkDerivation (finalAttrs: { pname = "spades"; - version = "3.15.5"; + version = "4.0.0"; - src = fetchurl { - url = "https://github.com/ablab/spades/releases/download/v${finalAttrs.version}/SPAdes-${finalAttrs.version}.tar.gz"; - hash = "sha256-FVw2QNVx8uexmgUDHR/Q0ZvYLfeF04hw+5O9JBsSu/o="; + src = fetchFromGitHub { + owner = "ablab"; + repo = "spades"; + rev = "v${finalAttrs.version}"; + hash = "sha256-k2+ddJIgGE41KGZODovU9VdurbWerEtdqNrFDwyuFjo="; }; - sourceRoot = "SPAdes-${finalAttrs.version}/src"; - env.CXXFLAGS = toString [ - # GCC 13: error: 'uint32_t' does not name a type - "-include cstdint" + sourceRoot = "source/src"; + + patches = [ + # https://github.com/ablab/spades/pull/1314 + (fetchpatch { + name = "copytree.patch"; + url = "https://github.com/ablab/spades/commit/af1f756a46c5da669897b841d4f753af1eaa9588.patch"; + hash = "sha256-tkT7hb0TqsbLkcTs9u43nzvV8bVdh3G9VKYqFFLrQv8="; + stripLen = 3; + extraPrefix = "projects/"; + }) ]; + cmakeFlags = [ + "-DZLIB_ENABLE_TESTS=OFF" + "-DSPADES_BUILD_INTERNAL=OFF" + ]; + + preConfigure = '' + # The CMakeListsInternal.txt file should be empty in the release tarball + echo "" > CMakeListsInternal.txt + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ - zlib bzip2 + ncurses python3 + readline ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + doCheck = true; + strictDeps = true; + meta = { description = "St. Petersburg genome assembler, a toolkit for assembling and analyzing sequencing data"; - license = lib.licenses.gpl2Only; + changelog = "https://github.com/ablab/spades/blob/${finalAttrs.version}/changelog.md"; + downloadPage = "https://github.com/ablab/spades"; homepage = "http://ablab.github.io/spades"; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ bzizou ]; + broken = stdenv.hostPlatform.isMusl; }; }) diff --git a/pkgs/by-name/sp/sploitscan/package.nix b/pkgs/by-name/sp/sploitscan/package.nix index 183832f09912..aaf61456b922 100644 --- a/pkgs/by-name/sp/sploitscan/package.nix +++ b/pkgs/by-name/sp/sploitscan/package.nix @@ -24,8 +24,6 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; - dependencies = with python3.pkgs; [ jinja2 openai diff --git a/pkgs/by-name/ss/sshesame/package.nix b/pkgs/by-name/ss/sshesame/package.nix index b64b18300b9e..aef563ba3df4 100644 --- a/pkgs/by-name/ss/sshesame/package.nix +++ b/pkgs/by-name/ss/sshesame/package.nix @@ -1,25 +1,26 @@ { lib , buildGoModule , fetchFromGitHub +, stdenv , nix-update-script }: buildGoModule rec { pname = "sshesame"; - version = "0.0.27"; + version = "0.0.35"; src = fetchFromGitHub { owner = "jaksi"; repo = "sshesame"; rev = "v${version}"; - hash = "sha256-pDLCOyjvbHM8Cw1AIt7+qTbCmH0tGSmwaTBz5pQ05bc="; + hash = "sha256-D+vygu+Zx/p/UmqOXqx/4zGv6mtCUKTeU5HdBhxdbN4="; }; - vendorHash = "sha256-iaINGWpj2gHfwsIOEp5PwlFBohXX591+/FBGyu656qI="; + vendorHash = "sha256-WX3rgv9xz3lisYSjf7xvx4oukDSuxE1yqLl6Sz/iDYc="; ldflags = [ "-s" "-w" ]; - hardeningEnable = [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 3b98ecdd069d..790978872c9e 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-+E+GEjlytspTfe057GbEiwZXGedrnGC6uwJBFpO0J7I="; + hash = "sha256-egAN97ANeuadxHpEpqI6eTjZRuPR2O2khjh0wgGLqIM="; }; - vendorHash = "sha256-/JYkfGYJNk3xi6tvaY26tO4lkSI/cdB3+J+NnVBOCBE="; + vendorHash = "sha256-vHzPNNU2im22bypkxaweBLcC9KAuuCobNrZ6l7jvv9s="; subPackages = [ "." ]; diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 14df24b62ef8..2a3699ebdc86 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -23,7 +23,7 @@ let # See upstream issue for rocksdb 9.X support # https://github.com/stalwartlabs/mail-server/issues/407 rocksdb = rocksdb_8_11; - version = "0.8.2"; + version = "0.8.5"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -33,11 +33,11 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "v${version}"; - hash = "sha256-JzbfQ/WZrHGdG9vv9ngfTxqwBxS+ZezIIp8yUJ2VplE="; + hash = "sha256-Y28o4BIoGcakEY3ig4wNR0sI6YBoR6BQUhXWK7fA3qo="; fetchSubmodules = true; }; - cargoHash = "sha256-w40mksUVMBXSr/LBXj0uyZ/VbvJFMFJaQN5Kx6sLm5I="; + cargoHash = "sha256-axLg7igmupGHU6xohDN+UIwaZB+vt02p9WIK+P9YkY8="; patches = [ # Remove "PermissionsStartOnly" from systemd service files, diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index a85e7d36f982..39d1ed2442a3 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.10.18"; + version = "2.10.19"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-iBo6rP8V7jGTFaKyd3er3L2EWW3slCyV6eFoJT3w7z8="; + hash = "sha256-1mmKpcJJdEiX/KZkE/VnL/xMrNzlq1LSAr5z3CdoPMI="; }; sourceRoot = "."; @@ -34,11 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "macOS system monitor in your menu bar"; homepage = "https://github.com/exelban/stats"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - donteatoreo - emilytrau - Enzime - ]; + maintainers = with lib.maintainers; [ donteatoreo emilytrau ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/st/steam-play-none/package.nix b/pkgs/by-name/st/steam-play-none/package.nix new file mode 100644 index 000000000000..7cca9fe29b7f --- /dev/null +++ b/pkgs/by-name/st/steam-play-none/package.nix @@ -0,0 +1,42 @@ +{ fetchFromGitHub +, stdenvNoCC +, lib +, bash +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "steam-play-none"; + version = "0-unstable-2022-12-15"; + src = fetchFromGitHub { + repo = finalAttrs.pname; + owner = "Scrumplex"; + rev = "42e38706eb37fdaaedbe9951d59ef44148fcacbf"; + hash = "sha256-sSHLrB5TlGMKpztTnbh5oIOhcrRd+ke2OUUbiQUqoh0="; + }; + buildInputs = [ bash ]; + strictDeps = true; + outputs = [ "out" "steamcompattool" ]; + installPhase = '' + runHook preInstall + + # Make it impossible to add to an environment. You should use the appropriate NixOS option. + # Also leave some breadcrumbs in the file. + echo "${finalAttrs.pname} should not be installed into environments. Please use programs.steam.extraCompatPackages instead." > $out + + install -Dt $steamcompattool compatibilitytool.vdf toolmanifest.vdf + install -Dt $steamcompattool -m755 launch.sh + + runHook postInstall + ''; + + meta = { + description = '' + Steam Play Compatibility Tool to run games as-is + + (This is intended for use in the `programs.steam.extraCompatPackages` option only.) + ''; + homepage = "https://github.com/Scrumplex/Steam-Play-None"; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ matthewcroughan Scrumplex ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix new file mode 100644 index 000000000000..eb77d5936486 --- /dev/null +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "stevenblack-blocklist"; + version = "3.14.84"; + + src = fetchFromGitHub { + owner = "StevenBlack"; + repo = "hosts"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-tahf6mdtmZofwMZfMsuDAqCR/V1qZt6vV+o6t4YTKG0="; + }; + + outputs = [ + # default src fallback + "out" + + # base hosts file + "ads" + + # extensions only + "fakenews" + "gambling" + "porn" + "social" + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out $ads $fakenews $gambling $porn $social + + # out + find alternates -type f -not -name "hosts" -exec rm {} + + cp -r alternates $out + install -Dm644 hosts $out + + # ads + install -Dm644 hosts $ads + + # extensions + install -Dm644 alternates/fakenews-only/hosts $fakenews + install -Dm644 alternates/gambling-only/hosts $gambling + install -Dm644 alternates/porn-only/hosts $porn + install -Dm644 alternates/social-only/hosts $social + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Unified hosts file with base extensions"; + homepage = "https://github.com/StevenBlack/hosts"; + license = licenses.mit; + maintainers = with maintainers; [ + moni + Guanran928 + frontear + ]; + }; +}) diff --git a/pkgs/by-name/st/streamdeck-ui/package.nix b/pkgs/by-name/st/streamdeck-ui/package.nix index 4af7ad66c789..1549d2c6e1c9 100644 --- a/pkgs/by-name/st/streamdeck-ui/package.nix +++ b/pkgs/by-name/st/streamdeck-ui/package.nix @@ -40,7 +40,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.poetry-core - python3Packages.pythonRelaxDepsHook copyDesktopItems qt6.wrapQtAppsHook wrapGAppsHook3 diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix index 326feb08afa6..aa0adea474be 100644 --- a/pkgs/by-name/st/strictdoc/package.nix +++ b/pkgs/by-name/st/strictdoc/package.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ python3.pkgs.hatchling - python3.pkgs.pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix new file mode 100644 index 000000000000..c1e2454a73f8 --- /dev/null +++ b/pkgs/by-name/st/stu/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, + darwin, + stu, + testers, +}: +let + version = "0.5.0"; +in +rustPlatform.buildRustPackage { + pname = "stu"; + inherit version; + + src = fetchFromGitHub { + owner = "lusingander"; + repo = "stu"; + rev = "v${version}"; + hash = "sha256-VETEcRuJk0cCWB5y8IRdycKcKb3uiAWOyjeZWCJykG4="; + }; + + cargoHash = "sha256-s2QvRberSz4egVO8A2h3cx8oUlZM1bV5qZ0U4EiuPRs="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreGraphics + ]; + + passthru.tests.version = testers.testVersion { package = stu; }; + + meta = { + description = "Terminal file explorer for S3 buckets"; + changelog = "https://github.com/lusingander/stu/releases/tag/v${version}"; + homepage = "https://lusingander.github.io/stu/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.Nebucatnetzer ]; + mainProgram = "stu"; + }; +} diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix index 21abce75d3d0..0ba66643442b 100644 --- a/pkgs/by-name/su/superfile/package.nix +++ b/pkgs/by-name/su/superfile/package.nix @@ -3,30 +3,27 @@ buildGoModule, fetchFromGitHub, }: -let - version = "1.1.2"; -in -buildGoModule { +buildGoModule rec { pname = "superfile"; - inherit version; + version = "1.1.3"; - src = - fetchFromGitHub { - owner = "MHNightCat"; - repo = "superfile"; - rev = "v${version}"; - hash = "sha256-Cn03oPGT+vCZQcC62p7COx8N8BGgra+qQaZyF+osVsA="; - } - + "/src"; + src = fetchFromGitHub { + owner = "yorukot"; + repo = "superfile"; + rev = "v${version}"; + hash = "sha256-z1jcRzID20s7tEDUaEcnOYBfv/BPZtcXz9fy3V5iPPg="; + }; - vendorHash = "sha256-gWrhy3qzlXG072u5mW971N2Y4Vmt0KbZkB8SFsFgSzo="; + vendorHash = "sha256-OzPH7dNu/V4HDGSxrvYxu3s+hw36NiulFZs0BJ44Pjk="; - meta = { - changelog = "https://github.com/MHNightCat/superfile/blob/v${version}/changelog.md"; + ldflags = ["-s" "-w"]; + + meta = with lib; { description = "Pretty fancy and modern terminal file manager"; - homepage = "https://github.com/MHNightCat/superfile"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ momeemt ]; + homepage = "https://github.com/yorukot/superfile"; + changelog = "https://github.com/yorukot/superfile/blob/${src.rev}/changelog.md"; + license = licenses.mit; + maintainers = with maintainers; [momeemt]; mainProgram = "superfile"; }; } diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 2f877d881ae4..f789d28f90d8 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-tuXpK1KYp0INSCuCQFw1crgPjqW655AagwHZswLrodg="; + hash = "sha256-SbG5jzsR1ggGYbQ3kwrvKeGfkF+LlZwPV6L5/rKT49A="; }; - vendorHash = "sha256-hYFz9XEYkHv9HOCYKE3a17eDUspv6QmkH/+ipjJuaz0="; + vendorHash = "sha256-N2HdXGdb0OEfczPmc40jdx1rxKj2vxcEjbn+6K6vHhU="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/by-name/su/sushi/package.nix similarity index 97% rename from pkgs/desktops/gnome/core/sushi/default.nix rename to pkgs/by-name/su/sushi/package.nix index 18f6b382737d..aad4727da20b 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/by-name/su/sushi/package.nix @@ -4,6 +4,7 @@ , meson , gettext , gobject-introspection +, evince , glib , gnome , gtksourceview4 @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - gnome.evince + evince icu harfbuzz gjs @@ -71,7 +72,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "sushi"; - attrPath = "gnome.sushi"; }; }; diff --git a/pkgs/by-name/sv/svelte-language-server/package-lock.json b/pkgs/by-name/sv/svelte-language-server/package-lock.json index 9aaf27606721..d4d9aaa3baa4 100644 --- a/pkgs/by-name/sv/svelte-language-server/package-lock.json +++ b/pkgs/by-name/sv/svelte-language-server/package-lock.json @@ -1,12 +1,12 @@ { "name": "svelte-language-server", - "version": "0.16.11", + "version": "0.16.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "svelte-language-server", - "version": "0.16.11", + "version": "0.16.13", "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.17", @@ -20,8 +20,8 @@ "svelte": "^3.57.0", "svelte-preprocess": "^5.1.3", "svelte2tsx": "~0.7.0", - "typescript": "^5.3.2", - "typescript-auto-import-cache": "^0.3.2", + "typescript": "^5.5.2", + "typescript-auto-import-cache": "^0.3.3", "vscode-css-languageservice": "~6.2.10", "vscode-html-languageservice": "~5.1.1", "vscode-languageserver": "8.0.2", @@ -1635,9 +1635,9 @@ } }, "node_modules/svelte2tsx": { - "version": "0.7.10", - "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.10.tgz", - "integrity": "sha512-POOXaTncPGjwXMj6NVSRvdNj8KFqqLabFtXsQal3WyPy4X5raGsiDST2+ELhceKwfHk79/hR3qGUeU7KxYo4vQ==", + "version": "0.7.13", + "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.13.tgz", + "integrity": "sha512-aObZ93/kGAiLXA/I/kP+x9FriZM+GboB/ReOIGmLNbVGEd2xC+aTCppm3mk1cc9I/z60VQf7b2QDxC3jOXu3yw==", "dependencies": { "dedent-js": "^1.0.1", "pascal-case": "^3.1.1" @@ -1737,9 +1737,9 @@ } }, "node_modules/typescript-auto-import-cache": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.2.tgz", - "integrity": "sha512-+laqe5SFL1vN62FPOOJSUDTZxtgsoOXjneYOXIpx5rQ4UMiN89NAtJLpqLqyebv9fgQ/IMeeTX+mQyRnwvJzvg==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.3.tgz", + "integrity": "sha512-ojEC7+Ci1ij9eE6hp8Jl9VUNnsEKzztktP5gtYNRMrTmfXVwA1PITYYAkpxCvvupdSYa/Re51B6KMcv1CTZEUA==", "dependencies": { "semver": "^7.3.8" } diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix index 008abf6bc6f2..fbb086c540af 100644 --- a/pkgs/by-name/sv/svelte-language-server/package.nix +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -3,17 +3,17 @@ , fetchurl }: let - version = "0.16.11"; + version = "0.16.13"; in buildNpmPackage { pname = "svelte-language-server"; inherit version; src = fetchurl { url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz"; - hash = "sha256-xTBdiOS6XwJN5t6L49COWeoyMUBRzlxbAND5S1e9/Xw="; + hash = "sha256-BtKeYAFDxaGPvN3d/2Kt+ViNukfKV92c6K0W2qdQHjU="; }; - npmDepsHash = "sha256-RR67TdgQHgF7RdrHjebGzIVGkeLABwXQgikd+Bc8lSE="; + npmDepsHash = "sha256-YG6gxXDfgaHevwO62EdhWTXXZq/plC7Mx9RKZNDyLqo="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/sv/svp/package.nix b/pkgs/by-name/sv/svp/package.nix index c34507c91e44..30e540ba7416 100644 --- a/pkgs/by-name/sv/svp/package.nix +++ b/pkgs/by-name/sv/svp/package.nix @@ -7,7 +7,6 @@ , copyDesktopItems , ffmpeg , glibc -, gnome , jq , lib , libmediainfo @@ -20,6 +19,7 @@ , vapoursynth , xdg-utils , xorg +, zenity }: let mpvForSVP = callPackage ./mpv.nix { }; @@ -42,7 +42,7 @@ let fakeLsof ffmpeg.bin glibc - gnome.zenity + zenity libmediainfo libsForQt5.qtbase libsForQt5.qtwayland diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index ec69daf3f337..a6e1a4a8d48d 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -26,13 +26,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "artemsen"; repo = "swayimg"; rev = "v${finalAttrs.version}"; - hash = "sha256-CTl1hlRE4MnA6WdQaR4VG5G/wop/9xK7thRiCY7teYU="; + hash = "sha256-MAVxOUM1x6dkvbWPz/JS+sITi3BhCeaweKZZserkXz8="; }; strictDeps = true; diff --git a/pkgs/by-name/sw/sweet/package.nix b/pkgs/by-name/sw/sweet/package.nix new file mode 100644 index 000000000000..de979e69118e --- /dev/null +++ b/pkgs/by-name/sw/sweet/package.nix @@ -0,0 +1,104 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +, gtk-engine-murrine +, colorVariants ? [] # default: install all icons +}: + +let + pname = "sweet"; + colorVariantList = [ + "Sweet-Ambar-Blue-Dark-v40" + "Sweet-Ambar-Blue-Dark" + "Sweet-Ambar-Blue-v40" + "Sweet-Ambar-Blue" + "Sweet-Ambar-v40" + "Sweet-Ambar" + "Sweet-Dark-v40" + "Sweet-Dark" + "Sweet-mars-v40" + "Sweet-mars" + "Sweet-v40" + "Sweet" + ]; + +in +lib.checkListOfEnum "${pname}: color variants" colorVariantList colorVariants + +stdenvNoCC.mkDerivation (finalAttrs: { + inherit pname; + version = "5.0"; + + srcs = [ + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-Dark-v40.tar.xz"; + hash = "sha256-fCCkkEYr4XPnP5aPrs3HAwIwM/Qb0NFY8Rf1ABu0ygY="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-Dark.tar.xz"; + hash = "sha256-xMAqUsol1FPeFoq8KLTmKCeZMF34FDAjhiagsRmjGT8="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-v40.tar.xz"; + hash = "sha256-JlpomJ8Ao4bJFJbCDliRtxNckEG3LzINBqhWzfTARJs="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue.tar.xz"; + hash = "sha256-HKJ/Ca5cy91kJZVEETyMcOcrgLliHF/S2rdBmWfKi08="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-v40.tar.xz"; + hash = "sha256-0LjARDbSPyQWN5nT97k2c//eebxhgStGYsebpNQn9+w="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar.tar.xz"; + hash = "sha256-UjH4popJCqQ18HZUngsO6cE4axSAM7/EXwM8nHAdVS4="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Dark-v40.tar.xz"; + hash = "sha256-4/e81slrkcO3WdrQ2atGHdZsErlzme4mRImfLvmGJnQ="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Dark.tar.xz"; + hash = "sha256-Tv+xtUee1TIdRLlnP84aVfk+V6xgeeeICRZCdeSSjE8="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-mars-v40.tar.xz"; + hash = "sha256-FmJoPeQ8iLA6X6lFawBqG8lviQXWBHG5lgQsZvU68BM="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-mars.tar.xz"; + hash = "sha256-bqL9jR8yPF9ZnEZ1O+P3/e6E59m+MY7mQNT3BhYVhu4="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-v40.tar.xz"; + hash = "sha256-Oesx/McKmTlqwJX8u6RrV3AtOIB73BQveD8slbD14js="; + }) + (fetchurl { + url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet.tar.xz"; + hash = "sha256-m0tQHV/3UkDoOAmBZF6Nvugj6fEkmLbeLPdQ/IFkHOo="; + }) + ]; + + nativeBuildInputs = [ unzip ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes/ + cp -r ${lib.concatStringsSep " " (if colorVariants != [] then colorVariants else colorVariantList)} $out/share/themes/ + runHook postInstall + ''; + + meta = with lib; { + description = "Light and dark colorful Gtk3.20+ theme"; + homepage = "https://github.com/EliverLara/Sweet"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fuzen d3vil0p3r ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/java/swt/awt-libs.patch b/pkgs/by-name/sw/swt/awt-libs.patch similarity index 100% rename from pkgs/development/libraries/java/swt/awt-libs.patch rename to pkgs/by-name/sw/swt/awt-libs.patch diff --git a/pkgs/development/libraries/java/swt/gtk-libs.patch b/pkgs/by-name/sw/swt/gtk-libs.patch similarity index 100% rename from pkgs/development/libraries/java/swt/gtk-libs.patch rename to pkgs/by-name/sw/swt/gtk-libs.patch diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix new file mode 100644 index 000000000000..c67424f4fc06 --- /dev/null +++ b/pkgs/by-name/sw/swt/package.nix @@ -0,0 +1,155 @@ +{ + atk, + fetchzip, + glib, + gtk2, + jdk, + lib, + libGL, + libGLU, + libXt, + libXtst, + pkg-config, + stdenv, + stripJavaArchivesHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "swt"; + version = "4.5"; + fullVersion = "${finalAttrs.version}-201506032000"; + + hardeningDisable = [ "format" ]; + + passthru.srcMetadataByPlatform = { + x86_64-linux.platform = "gtk-linux-x86_64"; + x86_64-linux.sha256 = "17frac2nsx22hfa72264as31rn35hfh9gfgy0n6wvc3knl5d2716"; + i686-linux.platform = "gtk-linux-x86"; + i686-linux.sha256 = "13ca17rga9yvdshqvh0sfzarmdcl4wv4pid0ls7v35v4844zbc8b"; + x86_64-darwin.platform = "cocoa-macosx-x86_64"; + x86_64-darwin.sha256 = "0wjyxlw7i9zd2m8syd6k1q85fj8pzhxlfsrl8fpgsj37p698bd0a"; + }; + passthru.srcMetadata = + finalAttrs.passthru.srcMetadataByPlatform.${stdenv.hostPlatform.system} or null; + # Alas, the Eclipse Project apparently doesn't produce source-only + # releases of SWT. So we just grab a binary release and extract + # "src.zip" from that. + src = + let + inherit (finalAttrs.passthru) srcMetadata; + in + assert srcMetadata != null; + fetchzip { + url = "https://archive.eclipse.org/eclipse/downloads/drops4/R-${finalAttrs.fullVersion}/swt-${finalAttrs.version}-${srcMetadata.platform}.zip"; + inherit (srcMetadata) sha256; + stripRoot = false; + postFetch = '' + mkdir "$unpackDir" + cd "$unpackDir" + + renamed="$TMPDIR/src.zip" + mv -- "$out/src.zip" "$renamed" + unpackFile "$renamed" + rm -r -- "$out" + + mv -- "$unpackDir" "$out" + ''; + }; + + nativeBuildInputs = [ + stripJavaArchivesHook + pkg-config + ]; + buildInputs = [ + atk + gtk2 + jdk + libGL + libGLU + libXtst + ] ++ lib.optionals (lib.hasPrefix "8u" jdk.version) [ libXt ]; + + patches = [ + ./awt-libs.patch + ./gtk-libs.patch + ]; + + prePatch = '' + # clear whitespace from makefiles (since we match on EOL later) + sed -i 's/ \+$//' ./*.mak + ''; + + postPatch = + let + makefile-sed = builtins.toFile "swt-makefile.sed" '' + # fix pkg-config invocations in CFLAGS/LIBS pairs. + # + # change: + # FOOCFLAGS = `pkg-config --cflags `foo bar` + # FOOLIBS = `pkg-config --libs-only-L foo` -lbaz + # into: + # FOOCFLAGS = `pkg-config --cflags foo bar` + # FOOLIBS = `pkg-config --libs foo bar` + # + # the latter works more consistently. + /^[A-Z0-9_]\+CFLAGS = `pkg-config --cflags [^`]\+`$/ { + N + s/${'' + ^\([A-Z0-9_]\+\)CFLAGS = `pkg-config --cflags \(.\+\)`\ + \1LIBS = `pkg-config --libs-only-L .\+$''}/${'' + \1CFLAGS = `pkg-config --cflags \2`\ + \1LIBS = `pkg-config --libs \2`''}/ + } + # fix WebKit libs not being there + s/\$(WEBKIT_LIB) \$(WEBKIT_OBJECTS)$/\0 `pkg-config --libs glib-2.0`/g + ''; + in + '' + declare -a makefiles=(./*.mak) + sed -i -f ${makefile-sed} "''${makefiles[@]}" + # assign Makefile variables eagerly & change backticks to `$(shell …)` + sed -i -e 's/ = `\([^`]\+\)`/ := $(shell \1)/' \ + -e 's/`\([^`]\+\)`/$(shell \1)/' \ + "''${makefiles[@]}" + ''; + + buildPhase = '' + runHook preBuild + + export JAVA_HOME=${jdk} + + ./build.sh + + mkdir out + find org/ -name '*.java' -type f -exec javac -d out/ {} + + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + if [[ -n "$prefix" ]]; then + install -d -- "$prefix" + fi + + install -Dm 644 -t "$out/lib" -- *.so + + install -d -- "$out/jars" + install -m 644 -t out -- version.txt + (cd out && jar -c *) > "$out/jars/swt.jar" + + runHook postInstall + ''; + + meta = { + homepage = "https://www.eclipse.org/swt/"; + description = '' + A widget toolkit for Java to access the user-interface facilities of + the operating systems on which it is implemented. + ''; + license = lib.licenses.epl10; + maintainers = [ ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix index 2c3f8415d349..20b099e47ad0 100644 --- a/pkgs/by-name/sy/syncstorage-rs/package.nix +++ b/pkgs/by-name/sy/syncstorage-rs/package.nix @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mozilla-services/syncstorage-rs"; changelog = "https://github.com/mozilla-services/syncstorage-rs/releases/tag/${version}"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ pennae ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "syncserver"; }; diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix index a22f8ea1b105..29fc520edc30 100644 --- a/pkgs/by-name/sy/syshud/package.nix +++ b/pkgs/by-name/sy/syshud/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "syshud"; - version = "0-unstable-2024-06-20"; + version = "0-unstable-2024-07-01"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syshud"; - rev = "2b97f3441970efe67c788a8313eb58182aa7965b"; - hash = "sha256-XPAKjBLaTGEyDgiZT8tYinYzMivOocOEeauzR4leOjI="; + rev = "cfe4a3a898c7f7b2e7065095c7fdcc33d99ed4bf"; + hash = "sha256-UrAKFehcqsuFHJJC0Ske+tOr6Wquqm/BM536hKoGEWw="; }; postPatch = '' diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix index 92560fb9247a..666a943ad19c 100644 --- a/pkgs/by-name/ta/tabiew/package.nix +++ b/pkgs/by-name/ta/tabiew/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "tabiew"; - version = "0.3.5"; + version = "0.4.1"; src = fetchFromGitHub { owner = "shshemi"; repo = "tabiew"; rev = "v${version}"; - hash = "sha256-ObS+8901Uw9mIzMK14D0UgCWJFRNaQ0tOIq5merHYIo="; + hash = "sha256-/W6ffanDg+p0g5MFUEF9bjWmYPWjZeCGmHqbruju2hk="; }; - cargoHash = "sha256-vOdjHBR/FZjYkLMvPvBZ/xTPKXgchv92BQSLLodymgY="; + cargoHash = "sha256-dBk6lfUG7MFJCOdDt+LpkewnYS/awqCLPLUCFSyi5Y8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix index a7d1a466b97a..bd34aa578509 100644 --- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -9,7 +9,7 @@ }: let - version = "0.0.18"; + version = "0.0.20"; in buildNpmPackage { pname = "tailwindcss-language-server"; @@ -19,11 +19,11 @@ buildNpmPackage { owner = "tailwindlabs"; repo = "tailwindcss-intellisense"; rev = "@tailwindcss/language-server@v${version}"; - hash = "sha256-A2P7AzFciVpXEWOH6hu2+TYKTn23z1iS8mmD0nvsR2Y="; + hash = "sha256-MKJHRJPDivq/TDQUEI8usKxDeNkVondotjo+gZiz9n0="; }; makeCacheWritable = true; - npmDepsHash = "sha256-/vr7PCohzw4QEEOx6+7IAzBM4xC2nxvNb3PLtSUT7YM="; + npmDepsHash = "sha256-DYK7/gfZPKiSYG9IFPUnxhscxGooSUTdG1wFihFY/vA="; npmWorkspace = "packages/tailwindcss-language-server"; buildInputs = [ libsecret ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security AppKit ]); diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix index 4f3b158522f0..e030e2aaaacb 100644 --- a/pkgs/by-name/ta/taler-exchange/package.nix +++ b/pkgs/by-name/ta/taler-exchange/package.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation { payment system. ''; homepage = "https://taler.net/"; + changelog = "https://git.taler.net/exchange.git/tree/ChangeLog"; license = licenses.agpl3Plus; maintainers = with maintainers; [ astro ]; platforms = platforms.linux; diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix index 65367499e23c..730d318a3e5f 100644 --- a/pkgs/by-name/ta/taler-merchant/package.nix +++ b/pkgs/by-name/ta/taler-merchant/package.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation { to know the customer's physical address. ''; homepage = "https://taler.net/"; + changelog = "https://git.taler.net/merchant.git/tree/ChangeLog"; license = licenses.agpl3Plus; maintainers = with maintainers; [ astro ]; platforms = platforms.linux; diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix index 0034f72725c6..d464b55c2a92 100644 --- a/pkgs/by-name/ta/tana/package.nix +++ b/pkgs/by-name/ta/tana/package.nix @@ -103,6 +103,7 @@ stdenv.mkDerivation { of the tasks. ''; homepage = "https://tana.inc"; + changelog = "https://tana.inc/releases"; license = licenses.unfree; maintainers = [ maintainers.massimogengarelli ]; platforms = platforms.linux; diff --git a/pkgs/by-name/ta/tartan/package.nix b/pkgs/by-name/ta/tartan/package.nix index d7d4d4a6f745..d73ffdf99bb5 100644 --- a/pkgs/by-name/ta/tartan/package.nix +++ b/pkgs/by-name/ta/tartan/package.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation { broken = stdenv.isDarwin; description = "Tools and Clang plugins for developing code with GLib"; homepage = "https://gitlab.freedesktop.org/tartan/tartan"; + changelog = "https://gitlab.freedesktop.org/tartan/tartan/-/blob/main/NEWS"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ jtojnar ]; diff --git a/pkgs/by-name/co/cosmic-tasks/Cargo.lock b/pkgs/by-name/ta/tasks/Cargo.lock similarity index 85% rename from pkgs/by-name/co/cosmic-tasks/Cargo.lock rename to pkgs/by-name/ta/tasks/Cargo.lock index c50bb5d678ed..62e5c8c1585e 100644 --- a/pkgs/by-name/co/cosmic-tasks/Cargo.lock +++ b/pkgs/by-name/ta/tasks/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.24" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e08104bebc65a46f8bc7aa733d39ea6874bfa7156f41a46b805785e3af1587d" +checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -38,8 +38,8 @@ source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c82 dependencies = [ "accesskit", "accesskit_consumer", - "icrate 0.1.0", - "objc2 0.5.0", + "icrate 0.1.2", + "objc2 0.5.2", "once_cell", ] @@ -58,7 +58,7 @@ dependencies = [ "futures-util", "once_cell", "serde", - "zbus", + "zbus 3.15.2", ] [[package]] @@ -83,7 +83,7 @@ dependencies = [ "accesskit_macos", "accesskit_unix", "accesskit_windows", - "raw-window-handle 0.6.0", + "raw-window-handle", "winit", ] @@ -132,9 +132,9 @@ checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "almost" @@ -186,47 +186,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -234,9 +235,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "apply" @@ -288,28 +289,12 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.6.8" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac22eda5891cc086690cb6fa10121c0390de0e3b04eb269f2d766b00d3f2d81" -dependencies = [ - "enumflags2", - "futures-channel", - "futures-util", - "once_cell", - "rand", - "serde", - "serde_repr", - "tokio", - "url", - "zbus", -] - -[[package]] -name = "ashpd" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01992ad7774250d5b7fe214e2676cb99bf92564436d8135ab44fe815e71769a9" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" dependencies = [ + "async-fs 2.1.2", + "async-net", "enumflags2", "futures-channel", "futures-util", @@ -318,7 +303,7 @@ dependencies = [ "serde_repr", "tokio", "url", - "zbus", + "zbus 4.2.2", ] [[package]] @@ -332,28 +317,38 @@ dependencies = [ ] [[package]] -name = "async-channel" -version = "2.2.0" +name = "async-broadcast" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +dependencies = [ + "event-listener 5.3.0", + "event-listener-strategy 0.5.2", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-lite 2.3.0", "slab", ] @@ -370,6 +365,17 @@ dependencies = [ "futures-lite 1.13.0", ] +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock 3.3.0", + "blocking", + "futures-lite 2.3.0", +] + [[package]] name = "async-io" version = "1.13.0" @@ -402,8 +408,8 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.6.0", - "rustix 0.38.32", + "polling 3.7.0", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -429,6 +435,17 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-net" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io 2.3.2", + "blocking", + "futures-lite 2.3.0", +] + [[package]] name = "async-process" version = "1.8.1" @@ -442,66 +459,83 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.32", + "rustix 0.38.34", "windows-sys 0.48.0", ] +[[package]] +name = "async-process" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +dependencies = [ + "async-channel", + "async-io 2.3.2", + "async-lock 3.3.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.0", + "futures-lite 2.3.0", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" dependencies = [ "async-io 2.3.2", - "async-lock 2.8.0", + "async-lock 3.3.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.32", + "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] -name = "atk-sys" -version = "0.18.0" +name = "atoi" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", + "num-traits", ] [[package]] @@ -515,7 +549,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.32", + "rustix 0.38.34", "tempfile", "windows-sys 0.48.0", ] @@ -526,7 +560,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7b2dbe9169059af0f821e811180fddc971fc210c776c133c7819ccd6e478db" dependencies = [ - "rustix 0.38.32", + "rustix 0.38.34", "tempfile", "windows-sys 0.52.0", ] @@ -551,9 +585,9 @@ dependencies = [ "enumflags2", "serde", "static_assertions", - "zbus", - "zbus_names", - "zvariant", + "zbus 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", ] [[package]] @@ -565,7 +599,7 @@ dependencies = [ "atspi-common", "atspi-proxies", "futures-lite 1.13.0", - "zbus", + "zbus 3.15.2", ] [[package]] @@ -576,14 +610,14 @@ checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" dependencies = [ "atspi-common", "serde", - "zbus", + "zbus 3.15.2", ] [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" @@ -683,23 +717,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" dependencies = [ "block-sys", - "objc2 0.5.0", + "objc2 0.5.2", ] [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", - "fastrand 2.0.2", "futures-io", "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] @@ -709,23 +740,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] -name = "bytemuck" -version = "1.15.0" +name = "by_address" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" + +[[package]] +name = "bytemuck" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +checksum = "369cfaf2a5bed5d8f8202073b2e093c9f508251de1551a0deb4253e4c7d80909" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -740,16 +777,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" -[[package]] -name = "cairo-sys-rs" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" -dependencies = [ - "libc", - "system-deps", -] - [[package]] name = "calloop" version = "0.12.4" @@ -758,8 +785,8 @@ checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ "bitflags 2.5.0", "log", - "polling 3.6.0", - "rustix 0.38.32", + "polling 3.7.0", + "rustix 0.38.34", "slab", "thiserror", ] @@ -772,8 +799,8 @@ checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ "bitflags 2.5.0", "log", - "polling 3.6.0", - "rustix 0.38.32", + "polling 3.7.0", + "rustix 0.38.34", "slab", "thiserror", ] @@ -785,7 +812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ "calloop 0.12.4", - "rustix 0.38.32", + "rustix 0.38.34", "wayland-backend", "wayland-client 0.31.2", ] @@ -797,19 +824,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop 0.13.0", - "rustix 0.38.32", + "rustix 0.38.34", "wayland-backend", "wayland-client 0.31.2", ] [[package]] name = "cc" -version = "1.0.92" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -818,16 +846,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -842,15 +860,15 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "cfg_aliases" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -858,7 +876,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -888,9 +906,9 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" +checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" dependencies = [ "error-code 3.2.0", ] @@ -898,7 +916,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" dependencies = [ "objc", "objc-foundation", @@ -908,7 +926,7 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" dependencies = [ "dnd", "mime", @@ -918,10 +936,10 @@ dependencies = [ [[package]] name = "clipboard_x11" version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" dependencies = [ "thiserror", - "x11rb 0.13.0", + "x11rb 0.13.1", ] [[package]] @@ -972,9 +990,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "com" @@ -1019,9 +1037,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -1089,7 +1107,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "atomicwrites 0.4.2", "cosmic-config-derive", @@ -1100,49 +1118,24 @@ dependencies = [ "once_cell", "ron", "serde", + "tokio", + "tracing", "xdg", ] [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "quote", "syn 1.0.109", ] -[[package]] -name = "cosmic-tasks" -version = "0.1.0" -dependencies = [ - "chrono", - "cli-clipboard", - "dirs", - "done_core", - "emojis", - "env_logger", - "fork", - "i18n-embed", - "i18n-embed-fl", - "libcosmic", - "log", - "once_cell", - "open", - "paste", - "rust-embed", - "serde", - "slotmap", - "smol_str", - "tokio", - "tracing", - "vergen", -] - [[package]] name = "cosmic-text" version = "0.11.2" -source = "git+https://github.com/pop-os/cosmic-text.git#ff5501d9a36e51c50d908413caf7632d8f7533b7" +source = "git+https://github.com/pop-os/cosmic-text.git#b0a70c70ffba883ac6ff022b535db195712f552f" dependencies = [ "bitflags 2.5.0", "fontdb", @@ -1151,10 +1144,10 @@ dependencies = [ "rangemap", "rustc-hash", "rustybuzz", - "self_cell 1.0.3", + "self_cell 1.0.4", "swash", "sys-locale", - "ttf-parser", + "ttf-parser 0.20.0", "unicode-bidi", "unicode-linebreak", "unicode-script", @@ -1164,7 +1157,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "almost", "cosmic-config", @@ -1174,6 +1167,7 @@ dependencies = [ "palette", "ron", "serde", + "serde_json", "thiserror", ] @@ -1187,19 +1181,34 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.4.0" +name = "crc" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1224,10 +1233,19 @@ dependencies = [ ] [[package]] -name = "crossbeam-utils" -version = "0.8.19" +name = "crossbeam-queue" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1263,12 +1281,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -1289,9 +1307,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -1299,27 +1317,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.58", + "strsim 0.11.1", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -1332,7 +1350,7 @@ dependencies = [ "hashbrown", "lock_api", "once_cell", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -1361,6 +1379,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive-getters" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2c35ab6e03642397cdda1dd58abbc05d418aef8e36297f336d5aba060fe8df" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "derive-new" version = "0.5.9" @@ -1381,52 +1410,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.58", -] - -[[package]] -name = "diesel" -version = "2.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03fc05c17098f21b89bc7d98fe1dd3cce2c11c2ad8e145f2a44fe08ed28eb559" -dependencies = [ - "chrono", - "diesel_derives", - "libsqlite3-sys", - "r2d2", - "time", -] - -[[package]] -name = "diesel_derives" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d02eecb814ae714ffe61ddc2db2dd03e6c49a42e269b5001355500d431cce0c" -dependencies = [ - "diesel_table_macro_syntax", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "diesel_migrations" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac" -dependencies = [ - "diesel", - "migrations_internals", - "migrations_macros", -] - -[[package]] -name = "diesel_table_macro_syntax" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" -dependencies = [ - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -1474,7 +1458,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -1498,35 +1482,20 @@ dependencies = [ [[package]] name = "dnd" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" dependencies = [ "bitflags 2.5.0", "mime", - "raw-window-handle 0.6.0", + "raw-window-handle", "smithay-client-toolkit 0.18.0", "smithay-clipboard", ] [[package]] -name = "done_core" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "chrono", - "diesel", - "diesel_migrations", - "emojis", - "futures", - "libset", - "serde", - "serde_json", - "strum", - "strum_macros", - "tracing", - "url", - "uuid", -] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "downcast-rs" @@ -1544,7 +1513,7 @@ dependencies = [ "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.32", + "rustix 0.38.34", ] [[package]] @@ -1554,7 +1523,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.32", + "rustix 0.38.34", ] [[package]] @@ -1575,9 +1544,12 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +dependencies = [ + "serde", +] [[package]] name = "emojis" @@ -1588,6 +1560,12 @@ dependencies = [ "phf", ] +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + [[package]] name = "enumflags2" version = "0.7.9" @@ -1606,7 +1584,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -1640,9 +1618,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1676,9 +1654,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.9" +version = "0.22.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" dependencies = [ "num-traits", ] @@ -1734,9 +1712,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ "event-listener 5.3.0", "pin-project-lite", @@ -1775,9 +1753,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1817,9 +1795,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1839,9 +1817,9 @@ checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" [[package]] name = "fluent" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +checksum = "bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a" dependencies = [ "fluent-bundle", "unic-langid", @@ -1849,9 +1827,9 @@ dependencies = [ [[package]] name = "fluent-bundle" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493" dependencies = [ "fluent-langneg", "fluent-syntax", @@ -1874,9 +1852,9 @@ dependencies = [ [[package]] name = "fluent-syntax" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" dependencies = [ "thiserror", ] @@ -1887,6 +1865,8 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ + "futures-core", + "futures-sink", "spin", ] @@ -1898,9 +1878,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6784a76a9c2b136ea3b8462391e9328252e938eb706eb44d752723b4c3a533" +checksum = "bdf6aa1de86490d8e39e04589bd04eb5953cc2a5ef0c25e389e807f44fd24e41" dependencies = [ "bytemuck", ] @@ -1922,10 +1902,10 @@ checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", - "memmap2", + "memmap2 0.9.4", "slotmap", "tinyvec", - "ttf-parser", + "ttf-parser 0.20.0", ] [[package]] @@ -1946,7 +1926,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -2048,6 +2028,17 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot 0.12.3", +] + [[package]] name = "futures-io" version = "0.3.30" @@ -2075,7 +2066,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -2090,7 +2081,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -2123,36 +2114,6 @@ dependencies = [ "slab", ] -[[package]] -name = "gdk-pixbuf-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -2185,9 +2146,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -2220,19 +2181,6 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" -[[package]] -name = "gio-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi", -] - [[package]] name = "gl_generator" version = "0.14.0" @@ -2250,16 +2198,6 @@ version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" -[[package]] -name = "glib-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" -dependencies = [ - "libc", - "system-deps", -] - [[package]] name = "glow" version = "0.13.1" @@ -2292,17 +2230,6 @@ dependencies = [ "wgpu", ] -[[package]] -name = "gobject-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - [[package]] name = "gpu-alloc" version = "0.6.0" @@ -2361,24 +2288,6 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" -[[package]] -name = "gtk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps", -] - [[package]] name = "guillotiere" version = "0.6.2" @@ -2401,14 +2310,23 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", ] +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown", +] + [[package]] name = "hassle-rs" version = "0.11.0" @@ -2429,12 +2347,9 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "hermit-abi" @@ -2479,7 +2394,7 @@ dependencies = [ "serde", "serde_derive", "thiserror", - "toml 0.8.12", + "toml 0.8.13", "unic-langid", ] @@ -2498,7 +2413,7 @@ dependencies = [ "lazy_static", "locale_config", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rust-embed", "thiserror", "unic-langid", @@ -2521,8 +2436,8 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "strsim", - "syn 2.0.58", + "strsim 0.10.0", + "syn 2.0.66", "unic-langid", ] @@ -2536,7 +2451,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -2565,7 +2480,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "dnd", "iced_accessibility", @@ -2583,7 +2498,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "accesskit", "accesskit_winit", @@ -2592,7 +2507,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "bitflags 2.5.0", "dnd", @@ -2600,7 +2515,7 @@ dependencies = [ "mime", "num-traits", "palette", - "raw-window-handle 0.6.0", + "raw-window-handle", "serde", "smol_str", "thiserror", @@ -2612,7 +2527,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "futures", "iced_core", @@ -2625,7 +2540,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2639,7 +2554,7 @@ dependencies = [ "log", "lyon_path", "once_cell", - "raw-window-handle 0.6.0", + "raw-window-handle", "rustc-hash", "thiserror", "unicode-segmentation", @@ -2649,7 +2564,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2661,7 +2576,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "dnd", "iced_core", @@ -2673,7 +2588,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "iced_core", "once_cell", @@ -2683,7 +2598,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "bytemuck", "cosmic-text", @@ -2700,7 +2615,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2712,14 +2627,21 @@ dependencies = [ "log", "lyon", "once_cell", + "raw-window-handle", "resvg", + "rustix 0.38.34", + "smithay-client-toolkit 0.18.0", + "wayland-backend", + "wayland-client 0.31.2", + "wayland-protocols 0.31.2", + "wayland-sys 0.31.1", "wgpu", ] [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "dnd", "iced_renderer", @@ -2735,7 +2657,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "dnd", "iced_graphics", @@ -2763,12 +2685,12 @@ dependencies = [ [[package]] name = "icrate" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e286f4b975ac6c054971a0600a9b76438b332edace54bff79c71c9d3adfc9772" +checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" dependencies = [ "block2 0.4.0", - "objc2 0.5.0", + "objc2 0.5.2", ] [[package]] @@ -2843,18 +2765,18 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] [[package]] name = "intl-memoizer" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda" dependencies = [ "type-map", "unic-langid", @@ -2899,6 +2821,21 @@ dependencies = [ "once_cell", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[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.11" @@ -2929,9 +2866,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -3032,17 +2969,17 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +source = "git+https://github.com/pop-os/libcosmic.git#f60c6893eb828f0e5c2caa8e0a96938938bb3262" dependencies = [ "apply", - "ashpd 0.7.0", + "ashpd", "chrono", "cosmic-config", "cosmic-theme", @@ -3057,11 +2994,13 @@ dependencies = [ "iced_runtime", "iced_style", "iced_tiny_skia", + "iced_wgpu", "iced_widget", "iced_winit", "lazy_static", "palette", "rfd", + "serde", "slotmap", "taffy", "thiserror", @@ -3069,7 +3008,7 @@ dependencies = [ "tracing", "unicode-segmentation", "url", - "zbus", + "zbus 4.2.2", ] [[package]] @@ -3089,7 +3028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -3137,10 +3076,11 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.28.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ + "cc", "pkg-config", "vcpkg", ] @@ -3153,9 +3093,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" @@ -3178,9 +3118,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -3234,9 +3174,9 @@ dependencies = [ [[package]] name = "lyon_path" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +checksum = "9c08a606c7a59638d6c6aa18ac91a06aa9fb5f765a7efb27e6a4da58700740d7" dependencies = [ "lyon_geom", "num-traits", @@ -3244,9 +3184,9 @@ dependencies = [ [[package]] name = "lyon_tessellation" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c67b5bc8123b352b2e7e742b47d1f236a13fe77619433be9568fbd888e9c0" +checksum = "579d42360a4b09846eff2feef28f538696c7d6c7439bfa65874ff3cbe0951b2c" dependencies = [ "float_next_after", "lyon_path", @@ -3268,6 +3208,15 @@ version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + [[package]] name = "memmap2" version = "0.9.4" @@ -3319,31 +3268,10 @@ dependencies = [ "paste", ] -[[package]] -name = "migrations_internals" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" -dependencies = [ - "serde", - "toml 0.7.8", -] - -[[package]] -name = "migrations_macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08" -dependencies = [ - "migrations_internals", - "proc-macro2", - "quote", -] - [[package]] name = "mime" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" dependencies = [ "smithay-clipboard", ] @@ -3356,9 +3284,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", "simd-adler32", @@ -3413,7 +3341,7 @@ dependencies = [ "log", "ndk-sys", "num_enum", - "raw-window-handle 0.6.0", + "raw-window-handle", "thiserror", ] @@ -3456,6 +3384,19 @@ dependencies = [ "memoffset 0.7.1", ] +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases 0.1.1", + "libc", + "memoffset 0.9.1", +] + [[package]] name = "nom" version = "7.1.3" @@ -3487,9 +3428,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -3501,20 +3442,19 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -3536,9 +3476,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -3547,11 +3487,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -3559,9 +3498,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -3595,7 +3534,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3630,9 +3569,9 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" @@ -3646,12 +3585,12 @@ dependencies = [ [[package]] name = "objc2" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9c7f0d511a4ce26b078183179dca908171cfc69f88986fe36c5138e1834476" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", - "objc2-encode 4.0.0", + "objc2-encode 4.0.3", ] [[package]] @@ -3662,9 +3601,9 @@ checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" [[package]] name = "objc2-encode" -version = "4.0.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ff06a6505cde0766484f38d8479ac8e6d31c66fbc2d5492f65ca8c091456379" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" [[package]] name = "objc_exception" @@ -3701,9 +3640,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.1.2" +version = "5.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" +checksum = "2eb49fbd5616580e9974662cb96a3463da4476e649a7e4b258df0de065db0657" dependencies = [ "is-wsl", "libc", @@ -3772,27 +3711,27 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "owned_ttf_parser" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" dependencies = [ - "ttf-parser", + "ttf-parser 0.21.1", ] [[package]] name = "palette" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" +checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" dependencies = [ "approx", "fast-srgb8", @@ -3803,25 +3742,14 @@ dependencies = [ [[package]] name = "palette_derive" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" +checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" dependencies = [ + "by_address", "proc-macro2", "quote", - "syn 2.0.58", -] - -[[package]] -name = "pango-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", + "syn 2.0.66", ] [[package]] @@ -3843,12 +3771,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -3867,22 +3795,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" @@ -3898,9 +3826,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap", @@ -3936,7 +3864,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3968,12 +3896,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" dependencies = [ "atomic-waker", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-io", ] @@ -4014,19 +3942,25 @@ dependencies = [ [[package]] name = "polling" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi", "pin-project-lite", - "rustix 0.38.32", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + [[package]] name = "powerfmt" version = "0.2.0" @@ -4090,9 +4024,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] @@ -4130,17 +4064,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "r2d2" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" -dependencies = [ - "log", - "parking_lot 0.12.1", - "scheduled-thread-pool", -] - [[package]] name = "rand" version = "0.8.5" @@ -4185,15 +4108,9 @@ checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" [[package]] name = "raw-window-handle" -version = "0.5.2" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "raw-window-handle" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "rayon" @@ -4223,9 +4140,9 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "read-fonts" -version = "0.19.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea75b5ec052843434d263ef7a4c31cf86db5908c729694afb1ad3c884252a1b6" +checksum = "af4749db2bd1c853db31a7ae5ee2fc6c30bbddce353ea8fedf673fed187c68c7" dependencies = [ "bytemuck", "font-types", @@ -4258,6 +4175,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "redox_users" version = "0.4.5" @@ -4323,22 +4249,21 @@ dependencies = [ [[package]] name = "rfd" -version = "0.13.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0d8ab342bcc5436e04d3a4c1e09e17d74958bfaddf8d5fad6f85607df0f994f" +checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" dependencies = [ - "ashpd 0.6.8", + "ashpd", "block", "dispatch", - "glib-sys", - "gobject-sys", - "gtk-sys", "js-sys", "log", "objc", "objc-foundation", "objc_id", - "raw-window-handle 0.5.2", + "pollster", + "raw-window-handle", + "urlencoding", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -4374,9 +4299,9 @@ checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" [[package]] name = "rust-embed" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" +checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -4385,22 +4310,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" +checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.58", + "syn 2.0.66", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" +checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" dependencies = [ "sha2", "walkdir", @@ -4418,9 +4343,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -4444,22 +4369,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustybuzz" @@ -4471,7 +4396,7 @@ dependencies = [ "bytemuck", "libm", "smallvec", - "ttf-parser", + "ttf-parser 0.20.0", "unicode-bidi-mirroring", "unicode-ccc", "unicode-properties", @@ -4480,9 +4405,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -4493,15 +4418,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "scheduled-thread-pool" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" -dependencies = [ - "parking_lot 0.12.1", -] - [[package]] name = "scoped-tls" version = "1.0.1" @@ -4522,7 +4438,7 @@ checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" dependencies = [ "ab_glyph", "log", - "memmap2", + "memmap2 0.9.4", "smithay-client-toolkit 0.18.1", "tiny-skia", ] @@ -4533,41 +4449,42 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" dependencies = [ - "self_cell 1.0.3", + "self_cell 1.0.4", ] [[package]] name = "self_cell" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ + "indexmap", "itoa", "ryu", "serde", @@ -4581,14 +4498,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -4617,9 +4534,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -4675,13 +4592,15 @@ version = "0.18.0" source = "git+https://github.com/smithay/client-toolkit?rev=3bed072#3bed072b966022f5f929d12f3aff089b1ace980b" dependencies = [ "bitflags 2.5.0", + "bytemuck", "calloop 0.13.0", "calloop-wayland-source 0.3.0", "cursor-icon", "libc", "log", - "memmap2", - "rustix 0.38.32", + "memmap2 0.9.4", + "pkg-config", + "rustix 0.38.34", "thiserror", "wayland-backend", "wayland-client 0.31.2", @@ -4690,6 +4609,7 @@ dependencies = [ "wayland-protocols 0.31.2", "wayland-protocols-wlr", "wayland-scanner 0.31.1", + "xkbcommon", "xkeysym", ] @@ -4705,8 +4625,8 @@ dependencies = [ "cursor-icon", "libc", "log", - "memmap2", - "rustix 0.38.32", + "memmap2 0.9.4", + "rustix 0.38.34", "thiserror", "wayland-backend", "wayland-client 0.31.2", @@ -4721,19 +4641,19 @@ dependencies = [ [[package]] name = "smithay-clipboard" version = "0.8.0" -source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-3#2f2430bec35f0adb9cb93e85e648ff8449d44dad" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-4#ab422ddcc95a9a1717df094f9c8fe69e2fdb2a27" dependencies = [ "libc", - "raw-window-handle 0.6.0", + "raw-window-handle", "smithay-client-toolkit 0.18.0", "wayland-backend", ] [[package]] name = "smol_str" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" dependencies = [ "serde", ] @@ -4750,9 +4670,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4765,19 +4685,19 @@ source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#6e75b1ad7e9839 dependencies = [ "as-raw-xcb-connection", "bytemuck", - "cfg_aliases 0.2.0", + "cfg_aliases 0.2.1", "cocoa", "core-graphics", "drm", - "fastrand 2.0.2", + "fastrand 2.1.0", "foreign-types", "js-sys", "log", - "memmap2", + "memmap2 0.9.4", "objc", - "raw-window-handle 0.6.0", + "raw-window-handle", "redox_syscall 0.4.1", - "rustix 0.38.32", + "rustix 0.38.34", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -4785,7 +4705,7 @@ dependencies = [ "wayland-sys 0.31.1", "web-sys", "windows-sys 0.52.0", - "x11rb 0.13.0", + "x11rb 0.13.1", ] [[package]] @@ -4806,6 +4726,123 @@ dependencies = [ "bitflags 2.5.0", ] +[[package]] +name = "sqlformat" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" +dependencies = [ + "itertools", + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +dependencies = [ + "ahash", + "atoi", + "byteorder", + "bytes", + "crc", + "crossbeam-queue", + "either", + "event-listener 2.5.3", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "serde", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "tracing", + "url", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +dependencies = [ + "dotenvy", + "either", + "heck", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "url", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +dependencies = [ + "atoi", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", + "urlencoding", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -4834,29 +4871,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "strum" -version = "0.25.0" +name = "strsim" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" - -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.58", -] +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "svg_fmt" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499" +checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" [[package]] name = "svgtypes" @@ -4870,9 +4894,9 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ec889a8e0a6fcb91041996c8f1f6be0fe1a09e94478785e07c32ce2bca2d2b" +checksum = "682a612b50baf09e8a039547ecf49e6c155690dcb751b1bcb19c93cdeb3d42d4" dependencies = [ "read-fonts", "yazi", @@ -4892,9 +4916,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -4910,19 +4934,6 @@ dependencies = [ "libc", ] -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck 0.5.0", - "pkg-config", - "toml 0.8.12", - "version-compare", -] - [[package]] name = "taffy" version = "0.3.11" @@ -4935,10 +4946,51 @@ dependencies = [ ] [[package]] -name = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +name = "tasks" +version = "0.1.0" +dependencies = [ + "chrono", + "cli-clipboard", + "dirs", + "emojis", + "env_logger", + "fork", + "i18n-embed", + "i18n-embed-fl", + "libcosmic", + "log", + "once_cell", + "open", + "paste", + "rust-embed", + "serde", + "slotmap", + "smol_str", + "tasks-core", + "tokio", + "tracing", + "vergen", +] + +[[package]] +name = "tasks-core" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "chrono", + "derive-getters", + "derive_setters", + "dirs", + "emojis", + "libset", + "ron", + "serde", + "serde_json", + "sqlx", + "tracing", + "uuid", +] [[package]] name = "tempfile" @@ -4947,8 +4999,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.2", - "rustix 0.38.32", + "fastrand 2.1.0", + "rustix 0.38.34", "windows-sys 0.52.0", ] @@ -4963,22 +5015,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -5109,7 +5161,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2 0.5.7", "tracing", "windows-sys 0.48.0", ] @@ -5125,33 +5177,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.19.15", -] - -[[package]] -name = "toml" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.13", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -5163,8 +5203,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", - "serde", - "serde_spanned", "toml_datetime", "winnow 0.5.40", ] @@ -5182,15 +5220,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.8", ] [[package]] @@ -5199,6 +5237,7 @@ 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", @@ -5212,7 +5251,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -5245,10 +5284,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" [[package]] -name = "type-map" -version = "0.4.0" +name = "ttf-parser" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" + +[[package]] +name = "type-map" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" dependencies = [ "rustc-hash", ] @@ -5272,18 +5317,18 @@ dependencies = [ [[package]] name = "unic-langid" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" dependencies = [ "unic-langid-impl", ] [[package]] name = "unic-langid-impl" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" dependencies = [ "serde", "tinystr", @@ -5354,9 +5399,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode-xid" @@ -5364,6 +5409,12 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + [[package]] name = "url" version = "2.5.0" @@ -5376,6 +5427,12 @@ dependencies = [ "serde", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "usvg" version = "0.37.0" @@ -5470,12 +5527,6 @@ dependencies = [ "time", ] -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - [[package]] name = "version_check" version = "0.9.4" @@ -5484,9 +5535,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" @@ -5525,7 +5576,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -5559,7 +5610,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5593,7 +5644,7 @@ checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.32", + "rustix 0.38.34", "scoped-tls", "smallvec", "wayland-sys 0.31.1", @@ -5621,7 +5672,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ "bitflags 2.5.0", - "rustix 0.38.32", + "rustix 0.38.34", "wayland-backend", "wayland-scanner 0.31.1", ] @@ -5655,7 +5706,7 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" dependencies = [ - "rustix 0.38.32", + "rustix 0.38.34", "wayland-client 0.31.2", "xcursor", ] @@ -5790,9 +5841,9 @@ dependencies = [ "js-sys", "log", "naga", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", @@ -5817,9 +5868,9 @@ dependencies = [ "log", "naga", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle", "rustc-hash", "smallvec", "thiserror", @@ -5857,10 +5908,10 @@ dependencies = [ "naga", "objc", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "profiling", "range-alloc", - "raw-window-handle 0.6.0", + "raw-window-handle", "renderdoc-sys", "rustc-hash", "smallvec", @@ -5905,11 +5956,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -5930,15 +5981,15 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" dependencies = [ - "clipboard-win 5.3.0", + "clipboard-win 5.3.1", "clipboard_macos", "clipboard_wayland", "clipboard_x11", "dnd", "mime", - "raw-window-handle 0.6.0", + "raw-window-handle", "thiserror", ] @@ -5960,7 +6011,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5969,7 +6020,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -6018,7 +6069,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -6053,17 +6104,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -6080,9 +6132,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -6098,9 +6150,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -6116,9 +6168,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -6134,9 +6192,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -6152,9 +6210,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -6170,9 +6228,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -6188,9 +6246,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winit" @@ -6211,16 +6269,16 @@ dependencies = [ "js-sys", "libc", "log", - "memmap2", + "memmap2 0.9.4", "ndk", "ndk-sys", "objc2 0.4.1", "once_cell", "orbclient", "percent-encoding", - "raw-window-handle 0.6.0", + "raw-window-handle", "redox_syscall 0.3.5", - "rustix 0.38.32", + "rustix 0.38.34", "sctk-adwaita", "smithay-client-toolkit 0.18.1", "smol_str", @@ -6235,7 +6293,7 @@ dependencies = [ "web-time", "windows-sys 0.48.0", "x11-dl", - "x11rb 0.13.0", + "x11rb 0.13.1", "xkbcommon-dl", ] @@ -6250,9 +6308,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] @@ -6310,17 +6368,17 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "as-raw-xcb-connection", "gethostname 0.4.3", "libc", "libloading 0.8.3", "once_cell", - "rustix 0.38.32", - "x11rb-protocol 0.13.0", + "rustix 0.38.34", + "x11rb-protocol 0.13.1", ] [[package]] @@ -6334,9 +6392,9 @@ dependencies = [ [[package]] name = "x11rb-protocol" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" @@ -6360,6 +6418,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + [[package]] name = "xkbcommon-dl" version = "0.4.2" @@ -6378,6 +6447,9 @@ name = "xkeysym" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", +] [[package]] name = "xml-rs" @@ -6409,12 +6481,12 @@ version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ - "async-broadcast", + "async-broadcast 0.5.1", "async-executor", - "async-fs", + "async-fs 1.6.0", "async-io 1.13.0", "async-lock 2.8.0", - "async-process", + "async-process 1.8.1", "async-recursion", "async-task", "async-trait", @@ -6435,14 +6507,52 @@ dependencies = [ "serde_repr", "sha1", "static_assertions", - "tokio", "tracing", "uds_windows", "winapi", "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", + "zbus_macros 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" +dependencies = [ + "async-broadcast 0.7.0", + "async-executor", + "async-fs 2.1.2", + "async-io 2.3.2", + "async-lock 3.3.0", + "async-process 2.2.2", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.0", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.28.0", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros 4.2.2", + "zbus_names 3.0.0", + "zvariant 4.1.1", ] [[package]] @@ -6456,7 +6566,20 @@ dependencies = [ "quote", "regex", "syn 1.0.109", - "zvariant_utils", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zbus_macros" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.66", + "zvariant_utils 2.0.0", ] [[package]] @@ -6467,7 +6590,18 @@ checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ "serde", "static_assertions", - "zvariant", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant 4.1.1", ] [[package]] @@ -6478,22 +6612,22 @@ checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -6516,8 +6650,21 @@ dependencies = [ "libc", "serde", "static_assertions", + "zvariant_derive 3.15.2", +] + +[[package]] +name = "zvariant" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", "url", - "zvariant_derive", + "zvariant_derive 4.1.1", ] [[package]] @@ -6530,7 +6677,20 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "zvariant_utils", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zvariant_derive" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.66", + "zvariant_utils 2.0.0", ] [[package]] @@ -6543,3 +6703,14 @@ dependencies = [ "quote", "syn 1.0.109", ] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] diff --git a/pkgs/by-name/ta/tasks/package.nix b/pkgs/by-name/ta/tasks/package.nix new file mode 100644 index 000000000000..6a28ea7ee609 --- /dev/null +++ b/pkgs/by-name/ta/tasks/package.nix @@ -0,0 +1,99 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + wrapGAppsHook3, + atk, + cairo, + gdk-pixbuf, + glib, + gtk3, + libsecret, + libxkbcommon, + openssl, + pango, + sqlite, + vulkan-loader, + stdenv, + wayland, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "tasks"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "edfloreshz"; + repo = "tasks"; + rev = "refs/tags/${version}"; + hash = "sha256-0bXzeKnJ5MIl7vCo+7kyXm3L6QrCdm5sPreca1SPi8U="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.12.2" = "sha256-ksaYMGT/oug7isQY8/1WD97XDUsX2ShBdabUzxWffYw="; + "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; + "clipboard_macos-0.1.0" = "sha256-temNg+RdvquSLAdkwU5b6dtu9vZkXjnDASS/eJo2rz8="; + "cosmic-config-0.1.0" = "sha256-dYxBp/2JkgFUtkcfzQieHS7MPf6GoOIxuCN/8AZraio="; + "cosmic-text-0.11.2" = "sha256-O8l3Auo+7/aqPYvWQXpOdrVHHdjc1fjoU1nFxqdiZ5I="; + "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; + "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "smithay-client-toolkit-0.18.0" = "sha256-/7twYMt5/LpzxLXAQKTGNnWcfspUkkZsN5hJu7KaANc="; + "smithay-clipboard-0.8.0" = "sha256-MqzynFCZvzVg9/Ry/zrbH5R6//erlZV+nmQ2St63Wnc="; + "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; + "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; + "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; + }; + }; + + # COSMIC applications now uses vergen for the About page + # Update the COMMIT_DATE to match when the commit was made + env.VERGEN_GIT_COMMIT_DATE = "2024-07-03"; + env.VERGEN_GIT_SHA = "0e8c728c88a9cac1bac130eb083ca0fe58c7121d"; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk3 + libsecret + libxkbcommon + openssl + pango + sqlite + vulkan-loader + wayland + ]; + + postFixup = '' + wrapProgram $out/bin/tasks \ + --prefix LD_LIBRARY_PATH : "${ + lib.makeLibraryPath [ + libxkbcommon + wayland + ] + }" + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Simple task management application for the COSMIC desktop"; + homepage = "https://github.com/edfloreshz/tasks"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ GaetanLepage ]; + platforms = platforms.linux; + mainProgram = "tasks"; + }; +} diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index dd5f038b1503..17a14daf2adf 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + changelog = "https://github.com/GothenburgBitFactory/taskwarrior/blob/${src.rev}/ChangeLog"; description = "Highly flexible command-line tool to manage TODO lists"; homepage = "https://taskwarrior.org"; license = licenses.mit; diff --git a/pkgs/by-name/tb/tbump/package.nix b/pkgs/by-name/tb/tbump/package.nix index 2812dd2f05d0..1314c1ec6d12 100644 --- a/pkgs/by-name/tb/tbump/package.nix +++ b/pkgs/by-name/tb/tbump/package.nix @@ -18,7 +18,6 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "tomlkit" ]; - nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; build-system = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/te/techmino/package.nix b/pkgs/by-name/te/techmino/package.nix index c0467e0e5009..8b49abd69340 100644 --- a/pkgs/by-name/te/techmino/package.nix +++ b/pkgs/by-name/te/techmino/package.nix @@ -31,11 +31,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "0.17.16"; + version = "0.17.17"; src = fetchurl { url = "https://github.com/26F-Studio/Techmino/releases/download/v${version}/Techmino_Bare.love"; - hash = "sha256-IgeVsVS5FLBgoZkJiyMFC1t24HZ/fukE5R0p2YbETTA="; + hash = "sha256-ExVdS2QXSRVMlRhrjD/Plo7fhQ3uUBHlwv6y91/S3uA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/te/telescope/package.nix b/pkgs/by-name/te/telescope/package.nix index 368c15d7e636..8198bd4750f7 100644 --- a/pkgs/by-name/te/telescope/package.nix +++ b/pkgs/by-name/te/telescope/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "telescope"; - version = "0.9.1"; + version = "0.10"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - hash = "sha256-OAqXYmlehL9AjZ7V0U0h7RCm/hn77Sf0Wp6R/GRaGY8="; + hash = "sha256-hkXXM/I7sNFomWamT0q1JH62arX1hFbt68Axcijadug="; }; postPatch = '' @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Telescope is a w3m-like browser for Gemini"; - homepage = "https://telescope.omarpolo.com/"; + homepage = "https://www.telescope-browser.org/"; license = licenses.isc; maintainers = with maintainers; [ heph2 ]; platforms = platforms.unix; diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix index 31effdf8334b..c5928357f753 100644 --- a/pkgs/by-name/te/templ/package.nix +++ b/pkgs/by-name/te/templ/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "templ"; - version = "0.2.707"; + version = "0.2.747"; src = fetchFromGitHub { owner = "a-h"; repo = "templ"; rev = "v${version}"; - hash = "sha256-4TkK8zeoWWGmcBg8YwALo2EyKfOyq5ut/3TjG81a+8M="; + hash = "sha256-XFktmKFVN1/1Y57ZoUTVKDgEk38491N92orgejFLnMA="; }; - vendorHash = "sha256-Fa6bmG0yfbICMfHlM52V+obxoVsQa4VNydIHXS+lGxw="; + vendorHash = "sha256-p2xuyy11N1nGjz5OhLIy04Kgzz90k3s0+09qi6hbjEc="; subPackages = [ "cmd/templ" ]; diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix index 3796065194ab..f1af42f8c888 100644 --- a/pkgs/by-name/te/tenv/package.nix +++ b/pkgs/by-name/te/tenv/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tenv"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; rev = "v${version}"; - hash = "sha256-je+T+Kbin0O7CuTRSsv3u+3IWLahTRn8io7yasubLM8="; + hash = "sha256-AQzxrUEq6Bp6784uoUiinR7Rb18pjJrFxkmWAcPNyb0="; }; vendorHash = "sha256-v1NWlZhfypoS+bZCtr+P2s1t4qYVncbjx9IyRhi2sa4="; diff --git a/pkgs/by-name/te/terraform-local/package.nix b/pkgs/by-name/te/terraform-local/package.nix new file mode 100644 index 000000000000..7b1d91e2c6ca --- /dev/null +++ b/pkgs/by-name/te/terraform-local/package.nix @@ -0,0 +1,36 @@ +{ + lib, + python3Packages, + fetchPypi, +}: +python3Packages.buildPythonApplication rec { + pname = "terraform_local"; + version = "0.18.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-8opiMd6ZxgWRJIDa0vhZJh5bmsO/CaHgGJ4sdEdxZLc="; + }; + + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ + python-hcl2 + packaging + localstack-client + ]; + + # Can’t run `pytestCheckHook` because the tests are integration tests and expect localstack to be present, which in turn expects docker to be running. + doCheck = false; + + # There is no `pythonImportsCheck` because the package only outputs a binary: tflocal + dontUsePythonImportsCheck = true; + + meta = with lib; { + description = "Terraform CLI wrapper to deploy your Terraform applications directly to LocalStack"; + homepage = "https://github.com/localstack/terraform-local"; + license = licenses.asl20; + maintainers = with maintainers; [ shivaraj-bh ]; + }; +} diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index cc5b89898510..80c2df8d8902 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.59.3"; + version = "0.59.6"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3tXhv/W8F9ag5G7hOjuS7AOU0sdpjdasedhPgMQAV0k="; + hash = "sha256-B5rcbAxWatPgYZgNWVJyOQU79kH2vVEGeSend83kLrk="; }; nativeBuildInputs = [ go-mockery ]; @@ -21,7 +21,7 @@ buildGoModule rec { make generate-mocks ''; - vendorHash = "sha256-a/pWEgEcT8MFES0/Z1vFCnbSaI47ZIVjhWZbvMC/OJk="; + vendorHash = "sha256-15d20xDw19TEqfWQDVp+sQ0GPwIxe3q3ibxyAC2uydA="; doCheck = false; diff --git a/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix b/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix index c01bc623c9d9..0ee89e9e037b 100644 --- a/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix +++ b/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix @@ -78,9 +78,6 @@ let license = lib.licenses.mit; maintainers = with lib.maintainers; [ huantian wackbyte ]; platforms = lib.platforms.linux; - # See comment about wasm32-unknown-unknown in rustc.nix. - broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; }; }; diff --git a/pkgs/by-name/tg/tg-archive/package.nix b/pkgs/by-name/tg/tg-archive/package.nix index 7fd336ecedec..4465fa35cbc7 100644 --- a/pkgs/by-name/tg/tg-archive/package.nix +++ b/pkgs/by-name/tg/tg-archive/package.nix @@ -20,10 +20,6 @@ in python3.pkgs.buildPythonApplication { pyproject = true; pythonRelaxDeps = true; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - propagatedBuildInputs = with python3.pkgs; [ setuptools telethon diff --git a/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix b/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix index 00a5458c0882..8b43215c52dc 100644 --- a/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix +++ b/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix @@ -5,7 +5,7 @@ , makeWrapper , bash , subversion - , gnome + , zenity }: stdenv.mkDerivation { pname = "thcrap-proton"; @@ -37,7 +37,7 @@ stdenv.mkDerivation { lib.makeBinPath [ bash subversion - gnome.zenity + zenity ] } ''; diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/by-name/th/thefuck/package.nix similarity index 56% rename from pkgs/tools/misc/thefuck/default.nix rename to pkgs/by-name/th/thefuck/package.nix index 48d4f395b047..7d908b9f8d99 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/by-name/th/thefuck/package.nix @@ -1,22 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication -, colorama, decorator, psutil, pyte, six -, go, mock, pytest7CheckHook, pytest-mock +{ + lib, + stdenv, + fetchFromGitHub, + python311Packages, + go, }: -buildPythonApplication rec { +python311Packages.buildPythonApplication rec { pname = "thefuck"; version = "3.32"; src = fetchFromGitHub { owner = "nvbn"; - repo = pname; - rev = version; - sha256 = "sha256-bRCy95owBJaxoyCNQF6gEENoxCkmorhyKzZgU1dQN6I="; + repo = "thefuck"; + rev = "refs/tags/${version}"; + hash = "sha256-bRCy95owBJaxoyCNQF6gEENoxCkmorhyKzZgU1dQN6I="; }; - propagatedBuildInputs = [ colorama decorator psutil pyte six ]; + dependencies = with python311Packages; [ + colorama + decorator + psutil + pyte + six + ]; - nativeCheckInputs = [ go mock pytest7CheckHook pytest-mock ]; + nativeCheckInputs = + [ go ] + ++ (with python311Packages; [ + mock + pytest7CheckHook + pytest-mock + ]); disabledTests = lib.optionals stdenv.isDarwin [ "test_settings_defaults" @@ -35,10 +50,10 @@ buildPythonApplication rec { "test_when_successfully_configured" ]; - meta = with lib; { + meta = { homepage = "https://github.com/nvbn/thefuck"; description = "Magnificent app which corrects your previous console command"; - license = licenses.mit; - maintainers = with maintainers; [ marcusramberg ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marcusramberg ]; }; } diff --git a/pkgs/by-name/ti/tile38/package.nix b/pkgs/by-name/ti/tile38/package.nix index 53f9baafc082..99d83ed7e5b4 100644 --- a/pkgs/by-name/ti/tile38/package.nix +++ b/pkgs/by-name/ti/tile38/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tile38"; - version = "1.33.0"; + version = "1.33.1"; src = fetchFromGitHub { owner = "tidwall"; repo = pname; rev = version; - sha256 = "sha256-07Yp64JaIyKD4WrwUKOIupin8tdN2iL72Yf6l5PSIg0="; + sha256 = "sha256-Rr1TcZedC+dJDN/oZTbKXS1Z1QYMofVtMS4YLA1r27E="; }; vendorHash = "sha256-nnamNwowRPWQBKUMg800bFgijv8iHbdh/wUwTfX0NcY="; diff --git a/pkgs/by-name/ti/tinymist/Cargo.lock b/pkgs/by-name/ti/tinymist/Cargo.lock index 6d7f036cc735..4178b9c5babc 100644 --- a/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/pkgs/by-name/ti/tinymist/Cargo.lock @@ -174,26 +174,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "async-lsp" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "855d6246a5d31e6e469eeef718d9a098f2d99207985a00dfdd3f4b5c5003c09a" -dependencies = [ - "futures", - "lsp-types", - "pin-project-lite", - "rustix", - "serde", - "serde_json", - "thiserror", - "tokio", - "tower-layer", - "tower-service", - "tracing", - "waitpid-any", -] - [[package]] name = "async-trait" version = "0.1.80" @@ -3715,6 +3695,26 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync-lsp" +version = "0.11.14" +dependencies = [ + "anyhow", + "clap", + "crossbeam-channel", + "futures", + "log", + "lsp-server", + "lsp-types", + "parking_lot", + "reflexo", + "serde", + "serde_json", + "tinymist-query", + "tokio", + "tokio-util", +] + [[package]] name = "sync_wrapper" version = "0.1.2" @@ -3836,7 +3836,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.12" +version = "0.11.14" dependencies = [ "insta", "lsp-server", @@ -3933,10 +3933,9 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.12" +version = "0.11.14" dependencies = [ "anyhow", - "async-lsp", "async-trait", "await-tree", "base64 0.22.1", @@ -3967,7 +3966,8 @@ dependencies = [ "reflexo", "serde", "serde_json", - "tinymist-assets 0.11.12 (registry+https://github.com/rust-lang/crates.io-index)", + "sync-lsp", + "tinymist-assets 0.11.14 (registry+https://github.com/rust-lang/crates.io-index)", "tinymist-query", "tinymist-render", "tokio", @@ -3994,17 +3994,17 @@ dependencies = [ [[package]] name = "tinymist-assets" -version = "0.11.12" +version = "0.11.14" [[package]] name = "tinymist-assets" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51823bcf79f6ae1d0a1eb75c26cd9139cc062b7e2ae4f12077e5fb30b6aafa5" +checksum = "e4e5159484d14f149de53df7cf5f04d9cff4a4d414688cc0cc81910162d74892" [[package]] name = "tinymist-query" -version = "0.11.12" +version = "0.11.14" dependencies = [ "anyhow", "biblatex", @@ -4050,7 +4050,7 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.12" +version = "0.11.14" dependencies = [ "base64 0.22.1", "log", @@ -4428,7 +4428,7 @@ dependencies = [ [[package]] name = "typst-preview" -version = "0.11.12" +version = "0.11.14" dependencies = [ "await-tree", "clap", @@ -4440,7 +4440,7 @@ dependencies = [ "once_cell", "serde", "serde_json", - "tinymist-assets 0.11.12 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.14 (registry+https://github.com/rust-lang/crates.io-index)", "tokio", "tokio-tungstenite", "typst", @@ -4890,16 +4890,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "waitpid-any" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0189157c93c54d86e5c61ddf0c1223baa25e5bfb2f6f9983c678985b028d7c12" -dependencies = [ - "rustix", - "windows-sys 0.52.0", -] - [[package]] name = "walkdir" version = "2.5.0" diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 2e001701e715..083ec3f60745 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.12"; + version = "0.11.14"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "refs/tags/v${version}"; - hash = "sha256-hqTVfEKaAG18JpUZajm0XaoX6kw26aE37T/kfoNNxk8="; + hash = "sha256-6dUI0w9GKubK2hVK8fOkAYoUdEII9umPEZZ6uSh7XjE="; }; cargoLock = { diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix new file mode 100644 index 000000000000..70e8d9d37672 --- /dev/null +++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + gnome, + sassc, + gnome-themes-extra, + gtk-engine-murrine, + colorVariants ? [] # default: install all icons +}: + +let + pname = "tokyonight-gtk-theme"; + colorVariantList = [ + "dark" + "light" + ]; + +in +lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants + +stdenvNoCC.mkDerivation { + inherit pname; + version = "0-unstable-2024-06-27"; + + src = fetchFromGitHub { + owner = "Fausto-Korpsvart"; + repo = "Tokyonight-GTK-Theme"; + rev = "2f566d89856516bef988df3cc32261f752299886"; + hash = "sha256-oKqLb66N4swHfhjUZJIGryE0D9MkuLdKFQa6j3TFmOg="; + }; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + nativeBuildInputs = [ gnome.gnome-shell sassc ]; + buildInputs = [ gnome-themes-extra ]; + + dontBuild = true; + + postPatch = '' + patchShebangs themes/install.sh + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cd themes + ./install.sh -n Tokyonight -c ${lib.concatStringsSep " " (if colorVariants != [] then colorVariants else colorVariantList)} --tweaks macos -d "$out/share/themes" + runHook postInstall + ''; + + meta = with lib; { + description = "GTK theme based on the Tokyo Night colour palette"; + homepage = "https://github.com/Fausto-Korpsvart/Tokyonight-GTK-Theme"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ garaiza-93 Madouura d3vil0p3r ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/by-name/to/totem/package.nix similarity index 98% rename from pkgs/desktops/gnome/core/totem/default.nix rename to pkgs/by-name/to/totem/package.nix index 56da00923f94..c2cf2ff9a7d4 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/by-name/to/totem/package.nix @@ -125,7 +125,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "totem"; - attrPath = "gnome.totem"; }; }; diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index fe33c5ba6923..752e0447cb0e 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.53.2"; + version = "2.53.10"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-LquQDKgh1yZ0kUuLIDHM3b8Xe8mdh/ZjILGvnOMm+Os="; + hash = "sha256-JUC8iIfISRKvVMZo2DjmuZ9g9TxSW2+lGIhUpfH6i5Y="; }; postPatch = '' diff --git a/pkgs/by-name/tr/treefmt2/package.nix b/pkgs/by-name/tr/treefmt2/package.nix index 81ca1b6b6f62..b830c724ef7c 100644 --- a/pkgs/by-name/tr/treefmt2/package.nix +++ b/pkgs/by-name/tr/treefmt2/package.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "treefmt"; - version = "2.0.1"; + version = "2.0.3"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - hash = "sha256-Ckvpb2at7lg7AB0XNtIxeo8lWXX+04MVHHKoUs876dg="; + hash = "sha256-aTZBI4D0ZZ59CU1tS1EzszZzlqeUOmiA9bnOohqq7M0="; }; vendorHash = "sha256-rjdGNfR2DpLZCzL/+3xiZ7gGDd4bPyBT5qMCO+NyWbg="; diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix index 228dccf4ad41..ad6799ad6201 100644 --- a/pkgs/by-name/tr/trickest-cli/package.nix +++ b/pkgs/by-name/tr/trickest-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "trickest-cli"; - version = "1.7.5"; + version = "1.8.0"; src = fetchFromGitHub { owner = "trickest"; repo = "trickest-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-erPcb+cHCAmhPGwfu+g0yyAFx252+tpIOFQiUBuPUcs="; + hash = "sha256-wzBUPotuv1natDB896Uu+O9Nj4ycT8jkcvIumjMdbqs="; }; vendorHash = "sha256-gk8YMMvTHBL7yoXU9n0jhtUS472fqLW5m+mSl4Lio6c="; diff --git a/pkgs/by-name/tr/trigger-control/package.nix b/pkgs/by-name/tr/trigger-control/package.nix index b0a389e29ec4..3398a3fe0aab 100644 --- a/pkgs/by-name/tr/trigger-control/package.nix +++ b/pkgs/by-name/tr/trigger-control/package.nix @@ -10,13 +10,9 @@ , libdecor , libnotify , dejavu_fonts -, gnome +, zenity }: -let - inherit (gnome) zenity; -in - stdenv.mkDerivation (finalAttrs: { pname = "trigger-control"; version = "1.5.1"; diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index 0906dd4becb2..a23d8da4eaf7 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ chardet diff --git a/pkgs/by-name/tr/trrntzip/package.nix b/pkgs/by-name/tr/trrntzip/package.nix new file mode 100644 index 000000000000..89018ea649af --- /dev/null +++ b/pkgs/by-name/tr/trrntzip/package.nix @@ -0,0 +1,53 @@ +# This is a revival of the old trrntzip at +# https://sourceforge.net/projects/trrntzip +# +# See https://sourceforge.net/p/trrntzip/discussion/457469/thread/d3610ea3b6/ +# there hasn't been any response +# +# Besides the new one is on github instead of sourceforge +# which makes life for us easier + +{ lib +, stdenv +, fetchFromGitHub +, cmake +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "trrntzip"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "0-wiz-0"; + repo = "trrntzip"; + rev = "v${finalAttrs.version}"; + hash = "sha256-7BrTJCQH9x9cNqm7tGOLxQlbTmlxs5S2hAD4ZWIady8="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ zlib ]; + + meta = with lib; { + description = "The goal of the program is to use standard values when creating zips to create identical files over multiple systems"; + longDescription = '' + Torrentzip converts zip archives to a standard format with some + pre-defined values, sorting the files, and using particular compression + settings so that running it on zip archives created by other tools will + always result in the same output. This helps e.g. with sharing + zip archives using BitTorrent (which is where the name comes from). + + This is a revival of https://sourceforge.net/projects/trrntzip. + ''; + homepage = "https://github.com/0-wiz-0/trrntzip"; + license = with licenses; [ + # "This software includes code from minizip, which is part of zlib" + licenses.zlib + + gpl2Plus + ]; + platforms = platforms.linux; + maintainers = with maintainers; [ TheBrainScrambler ]; + }; +}) diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix index c2b214ce55b1..7ccb8e4b237f 100644 --- a/pkgs/by-name/tu/tuifimanager/package.nix +++ b/pkgs/by-name/tu/tuifimanager/package.nix @@ -3,7 +3,7 @@ , python3 , fetchFromGitHub , kdePackages -, gnome +, gnome-themes-extra , qt6 , makeWrapper , x11Support ? stdenv.isLinux @@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication rec { postFixup = let # fix missing 'adwaita' warning missing with ncurses tui # see: https://github.com/NixOS/nixpkgs/issues/60918 - theme = gnome.gnome-themes-extra; + theme = gnome-themes-extra; in lib.optionalString enableDragAndDrop '' wrapProgram $out/bin/tuifi \ diff --git a/pkgs/by-name/tu/tunnelgraf/package.nix b/pkgs/by-name/tu/tunnelgraf/package.nix index d7f2c77dab0a..a24ea1b67fc6 100644 --- a/pkgs/by-name/tu/tunnelgraf/package.nix +++ b/pkgs/by-name/tu/tunnelgraf/package.nix @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ hatchling - pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/by-name/tu/turtle/package.nix b/pkgs/by-name/tu/turtle/package.nix index 2db5440055b7..446a4bde3bed 100644 --- a/pkgs/by-name/tu/turtle/package.nix +++ b/pkgs/by-name/tu/turtle/package.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "turtle"; - version = "0.8"; + version = "0.9"; pyproject = true; src = fetchFromGitLab { @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { owner = "philippun1"; repo = "turtle"; rev = version; - hash = "sha256-YacuT5S6WrhSz031XXCQTo++r+DBozrIIXrn9BwmrR0="; + hash = "sha256-jTO0xUh4VKhjCrmzcRSvxfGPw2j8WKD6uF4mg6nG16g="; }; postPatch = '' @@ -38,6 +38,7 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ pygobject3 pygit2 + dbus-python ]; postInstall = '' diff --git a/pkgs/by-name/tw/twitch-dl/package.nix b/pkgs/by-name/tw/twitch-dl/package.nix index 81c444ea340f..b98f88d30060 100644 --- a/pkgs/by-name/tw/twitch-dl/package.nix +++ b/pkgs/by-name/tw/twitch-dl/package.nix @@ -24,7 +24,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.setuptools python3Packages.setuptools-scm - python3Packages.pythonRelaxDepsHook installShellFiles scdoc ]; diff --git a/pkgs/by-name/tx/txr/package.nix b/pkgs/by-name/tx/txr/package.nix index 0b40b8e77a59..dfa532e494c7 100644 --- a/pkgs/by-name/tx/txr/package.nix +++ b/pkgs/by-name/tx/txr/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "txr"; - version = "294"; + version = "295"; src = fetchurl { url = "https://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2"; - hash = "sha256-QdkN4FwobGRPQNQGcHC62Wi5hwQqsgyLo9etYYEfqDc="; + hash = "sha256-0HLrbO4v4gfk95w5SIXeQ/oNQMCMKBDkhtVJiVQtCYU="; }; buildInputs = [ libffi ]; diff --git a/pkgs/by-name/ty/typescript-language-server/package.nix b/pkgs/by-name/ty/typescript-language-server/package.nix new file mode 100644 index 000000000000..053f665ce7eb --- /dev/null +++ b/pkgs/by-name/ty/typescript-language-server/package.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, fixup-yarn-lock +, makeWrapper +, nodejs +, prefetch-yarn-deps +, yarn +, testers +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "typescript-language-server"; + version = "4.3.3"; + + src = fetchFromGitHub { + owner = "typescript-language-server"; + repo = "typescript-language-server"; + rev = "v${finalAttrs.version}"; + hash = "sha256-FCv0+tA7AuCdGeG6FEiMyRAHcl0WbezhNYLL7xp5FWU="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-nSMhPfbWD93sGIKehBBE/bh4RzHXFtGAjeyG20m/LWQ="; + }; + + nativeBuildInputs = [ + fixup-yarn-lock + makeWrapper + nodejs + prefetch-yarn-deps + yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror $offlineCache + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p "$out/lib/node_modules/typescript-language-server" + cp -r lib node_modules package.json "$out/lib/node_modules/typescript-language-server" + + makeWrapper "${nodejs}/bin/node" "$out/bin/typescript-language-server" \ + --add-flags "$out/lib/node_modules/typescript-language-server/lib/cli.mjs" + + runHook postInstall + ''; + + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; + + meta = { + changelog = "https://github.com/typescript-language-server/typescript-language-server/releases/tag/v${finalAttrs.version}"; + description = "Language Server Protocol implementation for TypeScript using tsserver"; + homepage = "https://github.com/typescript-language-server/typescript-language-server"; + license = with lib.licenses; [ asl20 mit ]; + mainProgram = "typescript-language-server"; + maintainers = with lib.maintainers; [ marcel ]; + }; +}) diff --git a/pkgs/by-name/ty/typst-preview/dom.json b/pkgs/by-name/ty/typst-preview/dom.json deleted file mode 100644 index c29dc931d121..000000000000 --- a/pkgs/by-name/ty/typst-preview/dom.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "typst-dom", - "private": true, - "version": "0.0.0", - "type": "module", - "scripts": { - "dev": "vite", - "build": "vite build && tsc", - "preview": "vite preview", - "test": "vitest", - "coverage": "vitest run --coverage", - "link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer", - "unlink:local": "yarn unlink @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer" - }, - "peerDependencies": { - "@myriaddreamin/typst-ts-renderer": "0.5.0-rc4", - "@myriaddreamin/typst.ts": "0.5.0-rc4" - }, - "devDependencies": { - "@myriaddreamin/typst-ts-renderer": "0.5.0-rc4", - "@myriaddreamin/typst.ts": "0.5.0-rc4", - "typescript": "^5.0.2", - "vite": "^4.3.9", - "vite-plugin-singlefile": "^0.13.5", - "vite-plugin-wasm": "^3.2.2", - "vitest": "^0.32.2" - }, - "exports": { - ".": "./src/index.mts", - "./*": "./src/*" - } -} diff --git a/pkgs/by-name/ty/typst-preview/frontend.json b/pkgs/by-name/ty/typst-preview/frontend.json deleted file mode 100644 index a0d9417f0f91..000000000000 --- a/pkgs/by-name/ty/typst-preview/frontend.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "typst-preview-frontend", - "private": true, - "version": "0.0.0", - "type": "module", - "scripts": { - "dev": "vite", - "build": "tsc && vite build", - "preview": "vite preview", - "test": "vitest", - "coverage": "vitest run --coverage", - "link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer", - "unlink:local": "yarn unlink @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer" - }, - "dependencies": { - "@myriaddreamin/typst-ts-renderer": "0.5.0-rc4", - "@myriaddreamin/typst.ts": "0.5.0-rc4", - "typst-dom": "link:../typst-dom", - "rxjs": "^7.8.1" - }, - "devDependencies": { - "typescript": "^5.3.3", - "vite": "^4.3.9", - "vite-plugin-singlefile": "^0.13.5", - "vite-plugin-wasm": "^3.2.2", - "vitest": "^0.32.2" - } -} diff --git a/pkgs/by-name/ty/typst-preview/package.nix b/pkgs/by-name/ty/typst-preview/package.nix deleted file mode 100644 index b0e6c780e5d6..000000000000 --- a/pkgs/by-name/ty/typst-preview/package.nix +++ /dev/null @@ -1,125 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, mkYarnPackage -, fetchYarnDeps -, pkg-config -, libgit2 -, openssl -, zlib -, stdenv -, darwin -}: - -let - # Keep the vscode "mgt19937.typst-preview" extension in sync when updating - # this package at pkgs/applications/editors/vscode/extensions/default.nix - version = "0.11.7"; - - src = fetchFromGitHub { - owner = "Enter-tainer"; - repo = "typst-preview"; - rev = "v${version}"; - hash = "sha256-N4PK9RucuOwminikayXq9aqK9l6T6v9a6tcksMllKdM="; - fetchSubmodules = true; - - postFetch = '' - cd $out - substituteInPlace addons/frontend/yarn.lock \ - --replace-fail '"typst-dom@link:../typst-dom"' '"typst-dom@file:../typst-dom"' - ''; - }; - - frontendSrc = "${src}/addons/frontend"; - domSrc = "${src}/addons/typst-dom"; - - typst-dom = mkYarnPackage { - inherit version; - pname = "typst-dom"; - src = domSrc; - packageJSON = ./dom.json; - - offlineCache = fetchYarnDeps { - yarnLock = "${domSrc}/yarn.lock"; - hash = "sha256-XAVxUKf2XJCOUkAT+tTefAk8myGismhz1aOHosZA+d4="; - }; - - buildPhase = '' - runHook preBuild - yarn --offline build - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - cp -R deps/typst-dom $out - runHook postInstall - ''; - - doDist = false; - }; - - frontend = mkYarnPackage { - inherit version; - pname = "typst-preview-frontend"; - src = frontendSrc; - packageJSON = ./frontend.json; - - offlineCache = fetchYarnDeps { - yarnLock = "${frontendSrc}/yarn.lock"; - hash = "sha256-jZZG8omzwrustcrdVb42nypu6JKXPW/fJn26NUrc/ZA="; - }; - - packageResolutions = { inherit typst-dom; }; - - buildPhase = '' - runHook preBuild - yarn --offline build - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - cp -R deps/typst-preview-frontend/dist $out - runHook postInstall - ''; - - doDist = false; - }; - -in -rustPlatform.buildRustPackage { - pname = "typst-preview"; - inherit version src; - - cargoHash = "sha256-JDUHESH0aFIlXX61IxOXNSaTlFCgo3hFRbfoQWWq6e0="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - libgit2 - openssl - zlib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - prePatch = '' - mkdir -p addons/vscode/out/frontend - cp -R ${frontend}/* addons/vscode/out/frontend/ - cp -R ${frontend}/index.html ./src/index.html - ''; - - meta = { - description = "Typst preview extension for VSCode"; - homepage = "https://github.com/Enter-tainer/typst-preview/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ berberman ]; - mainProgram = "typst-preview"; - }; -} diff --git a/pkgs/by-name/ty/typstwriter/package.nix b/pkgs/by-name/ty/typstwriter/package.nix new file mode 100644 index 000000000000..e5087a62039a --- /dev/null +++ b/pkgs/by-name/ty/typstwriter/package.nix @@ -0,0 +1,46 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "typstwriter"; + version = "0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Bzero"; + repo = "typstwriter"; + rev = "V${version}"; + hash = "sha256-xgBBZTViMzYgxaYb24druUwLqVWdf9utCETC+goLqYk="; + }; + + build-system = [ python3.pkgs.flit-core ]; + + dependencies = with python3.pkgs; [ + pygments + pyside6 + qtpy + send2trash + superqt + ]; + + optional-dependencies = with python3.pkgs; { + tests = [ + pytest + pytest-qt + ]; + }; + + pythonImportsCheck = [ "typstwriter" ]; + + meta = { + changelog = "https://github.com/Bzero/typstwriter/releases/tag/V${version}"; + description = "Integrated editor for the typst typesetting system"; + homepage = "https://github.com/Bzero/typstwriter"; + license = lib.licenses.mit; + mainProgram = "typstwriter"; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/by-name/ug/uglify-js/package-lock.json b/pkgs/by-name/ug/uglify-js/package-lock.json new file mode 100644 index 000000000000..961c9ef4314f --- /dev/null +++ b/pkgs/by-name/ug/uglify-js/package-lock.json @@ -0,0 +1,44 @@ +{ + "name": "uglify-js", + "version": "3.18.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "uglify-js", + "version": "3.18.0", + "license": "BSD-2-Clause", + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "devDependencies": { + "acorn": "~8.7.1", + "semver": "~6.3.0" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/acorn": { + "version": "8.7.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", + "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + } + } +} diff --git a/pkgs/by-name/ug/uglify-js/package.nix b/pkgs/by-name/ug/uglify-js/package.nix new file mode 100644 index 000000000000..4056c78af31f --- /dev/null +++ b/pkgs/by-name/ug/uglify-js/package.nix @@ -0,0 +1,62 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + testers, + runCommand, + writeText, + uglify-js, +}: + +buildNpmPackage rec { + pname = "uglify-js"; + version = "3.18.0"; + + src = fetchFromGitHub { + owner = "mishoo"; + repo = "UglifyJS"; + rev = "v${version}"; + hash = "sha256-m+OEcvWEk4RX0C4re9TFZpkcBvSwl7qfIM+56t100ws="; + }; + + npmDepsHash = "sha256-iLWmNifHpVvFSFXkfItVpGlh6za9T9wSr1Af4CQQSGM="; + + postPatch = '' + cp ${./package-lock.json} package-lock.json + ''; + + dontNpmBuild = true; + + passthru = { + updateScript = ./update.sh; + tests = { + version = testers.testVersion { package = uglify-js; }; + + simple = testers.testEqualContents { + assertion = "uglify-js minifies a basic js file"; + expected = writeText "expected" '' + console.log(1); + ''; + actual = + runCommand "actual" + { + nativeBuildInputs = [ uglify-js ]; + base = writeText "base" '' + console . log ( ( 1 ) ) ; + ''; + } + '' + uglifyjs $base > $out + ''; + }; + }; + }; + + meta = { + homepage = "https://github.com/mishoo/UglifyJS"; + description = "JavaScript parser / mangler / compressor / beautifier toolkit"; + mainProgram = "uglifyjs"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ lelgenio ]; + }; +} diff --git a/pkgs/by-name/ug/uglify-js/update.sh b/pkgs/by-name/ug/uglify-js/update.sh new file mode 100755 index 000000000000..a9ebcf39e93b --- /dev/null +++ b/pkgs/by-name/ug/uglify-js/update.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p ripgrep common-updater-scripts nodejs prefetch-npm-deps jq + +set -xeu -o pipefail + +PACKAGE_DIR="$(realpath "$(dirname "$0")")" +cd "$PACKAGE_DIR/.." +while ! test -f flake.nix; do cd .. ; done +NIXPKGS_DIR="$PWD" + +version="$( + list-git-tags --url=https://github.com/mishoo/UglifyJS \ + | rg '^v([\d.]+)$' -r '$1' \ + | sort --version-sort \ + | tail -n1 +)" +update-source-version uglify-js "$version" + +TMPDIR="$(mktemp -d)" +trap "rm -rf '$TMPDIR'" EXIT +cd "$TMPDIR" + +src="$(nix-build --no-link "$NIXPKGS_DIR" -A uglify-js.src)" +cp $src/package*.json . + +# Maybe one day upstream may ship a package-lock.json, +# until then we must generate a fresh one +test -f package-lock.json || npm install --package-lock-only +cp -v package-lock.json "$PACKAGE_DIR/package-lock.json" + +prev_npm_hash=$( + nix-instantiate "$NIXPKGS_DIR" \ + --eval --json -A uglify-js.npmDepsHash \ + | jq -r . +) +new_npm_hash=$(prefetch-npm-deps ./package-lock.json) +sd --fixed-strings "$prev_npm_hash" "$new_npm_hash" "$PACKAGE_DIR/package.nix" diff --git a/pkgs/by-name/un/undollar/package.nix b/pkgs/by-name/un/undollar/package.nix new file mode 100644 index 000000000000..633d095df9d8 --- /dev/null +++ b/pkgs/by-name/un/undollar/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nodejs +}: + +stdenvNoCC.mkDerivation { + pname = "undollar"; + version = "1.0.0-unstable-2018-09-14"; + + src = fetchFromGitHub { + owner = "xtyrrell"; + repo = "undollar"; + # Upstream has no tagged version + rev = "27e5f0f87ddc4c9b58fe02a68e83a601078ebb43"; + hash = "sha256-2nudiUh8B5tSg3TeKh1FEJaf8MJ18/IkYikFD07c4Pw="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mv undollar.js $out/bin/$ + substituteInPlace $out/bin/$ \ + --replace-fail "/usr/bin/env node" "${lib.getExe nodejs}" + runHook postInstall + ''; + + meta = { + description = "eats the dollar sign in the command you just pasted into your terminal"; + mainProgram = "$"; + homepage = "https://github.com/xtyrrell/undollar"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + inherit (nodejs.meta) platforms; + }; +} diff --git a/pkgs/by-name/un/unsilence/package.nix b/pkgs/by-name/un/unsilence/package.nix index c82fe04616b6..76a362f279c3 100644 --- a/pkgs/by-name/un/unsilence/package.nix +++ b/pkgs/by-name/un/unsilence/package.nix @@ -17,7 +17,6 @@ python3Packages.buildPythonPackage rec { nativeBuildInputs = with python3Packages; [ rich - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/up/upiano/package.nix b/pkgs/by-name/up/upiano/package.nix index 46224f45a9bb..4ad1456fc96e 100644 --- a/pkgs/by-name/up/upiano/package.nix +++ b/pkgs/by-name/up/upiano/package.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 18313bd9b952..d56bc4907632 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -408,8 +408,8 @@ dependencies = [ "uv-dispatch", "uv-distribution", "uv-git", + "uv-python", "uv-resolver", - "uv-toolchain", "uv-types", ] @@ -684,9 +684,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", "clap_derive", @@ -694,9 +694,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstream", "anstyle", @@ -748,9 +748,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -989,11 +989,12 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.3" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" dependencies = [ "cfg-if", + "crossbeam-utils", "hashbrown 0.14.5", "lock_api", "once_cell", @@ -1145,9 +1146,9 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -2073,9 +2074,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2715,7 +2716,7 @@ dependencies = [ "indoc", "libc", "memoffset 0.9.1", - "parking_lot 0.12.3", + "parking_lot 0.11.2", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -3116,9 +3117,8 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45d100244a467870f6cb763c4484d010a6bed6bd610b3676e3825d93fb4cfbd" +version = "0.3.2" +source = "git+https://github.com/astral-sh/reqwest-middleware?rev=21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe#21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe" dependencies = [ "anyhow", "async-trait", @@ -3131,9 +3131,8 @@ dependencies = [ [[package]] name = "reqwest-retry" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40f342894422862af74c50e1e9601cf0931accc9c6981e5eb413c46603b616b5" +version = "0.7.0" +source = "git+https://github.com/astral-sh/reqwest-middleware?rev=21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe#21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe" dependencies = [ "anyhow", "async-trait", @@ -3146,6 +3145,7 @@ dependencies = [ "reqwest", "reqwest-middleware", "retry-policies", + "thiserror", "tokio", "tracing", "wasm-timer", @@ -3172,12 +3172,10 @@ dependencies = [ [[package]] name = "retry-policies" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "493b4243e32d6eedd29f9a398896e35c6943a123b55eec97dcaee98310d25810" +checksum = "5875471e6cab2871bc150ecb8c727db5113c9338cc3354dc5ee3425b6aa40a1c" dependencies = [ - "anyhow", - "chrono", "rand", ] @@ -3517,9 +3515,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "e8eddb61f0697cc3989c5d64b452f5488e2b8a60fd7d5076a3045076ffef8cb0" dependencies = [ "itoa", "ryu", @@ -4427,7 +4425,7 @@ checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "uv" -version = "0.2.15" +version = "0.2.22" dependencies = [ "anstream", "anyhow", @@ -4436,6 +4434,7 @@ dependencies = [ "axoupdater", "base64 0.22.1", "byteorder", + "cache-key", "chrono", "clap", "distribution-types", @@ -4485,10 +4484,12 @@ dependencies = [ "uv-git", "uv-installer", "uv-normalize", + "uv-python", "uv-requirements", "uv-resolver", + "uv-scripts", "uv-settings", - "uv-toolchain", + "uv-tool", "uv-types", "uv-virtualenv", "uv-warnings", @@ -4543,7 +4544,7 @@ dependencies = [ "tracing", "uv-configuration", "uv-fs", - "uv-toolchain", + "uv-python", "uv-types", "uv-virtualenv", ] @@ -4587,9 +4588,9 @@ dependencies = [ "uv-cache", "uv-configuration", "uv-normalize", + "uv-python", "uv-resolver", "uv-settings", - "uv-toolchain", "uv-version", "uv-warnings", ] @@ -4699,9 +4700,9 @@ dependencies = [ "uv-distribution", "uv-git", "uv-installer", + "uv-python", "uv-resolver", "uv-settings", - "uv-toolchain", "uv-types", "walkdir", ] @@ -4725,8 +4726,8 @@ dependencies = [ "uv-distribution", "uv-git", "uv-installer", + "uv-python", "uv-resolver", - "uv-toolchain", "uv-types", ] @@ -4737,6 +4738,7 @@ dependencies = [ "anyhow", "distribution-filename", "distribution-types", + "either", "fs-err", "futures", "glob", @@ -4829,6 +4831,7 @@ dependencies = [ "dashmap", "fs-err", "reqwest", + "reqwest-middleware", "thiserror", "tokio", "tracing", @@ -4869,7 +4872,7 @@ dependencies = [ "uv-fs", "uv-git", "uv-normalize", - "uv-toolchain", + "uv-python", "uv-types", "uv-warnings", "walkdir", @@ -4892,6 +4895,52 @@ dependencies = [ "serde", ] +[[package]] +name = "uv-python" +version = "0.0.1" +dependencies = [ + "anyhow", + "assert_fs", + "cache-key", + "clap", + "configparser", + "fs-err", + "futures", + "indoc", + "install-wheel-rs", + "itertools 0.13.0", + "once_cell", + "pep440_rs", + "pep508_rs", + "platform-tags", + "pypi-types", + "regex", + "reqwest", + "reqwest-middleware", + "rmp-serde", + "same-file", + "schemars", + "serde", + "serde_json", + "target-lexicon", + "temp-env", + "tempfile", + "test-log", + "thiserror", + "tokio-util", + "tracing", + "url", + "uv-cache", + "uv-client", + "uv-configuration", + "uv-extract", + "uv-fs", + "uv-state", + "uv-warnings", + "which", + "winapi", +] + [[package]] name = "uv-requirements" version = "0.1.0" @@ -4972,11 +5021,27 @@ dependencies = [ "uv-distribution", "uv-git", "uv-normalize", - "uv-toolchain", + "uv-python", "uv-types", "uv-warnings", ] +[[package]] +name = "uv-scripts" +version = "0.0.1" +dependencies = [ + "fs-err", + "indoc", + "memchr", + "once_cell", + "pep440_rs", + "pep508_rs", + "pypi-types", + "serde", + "thiserror", + "toml", +] + [[package]] name = "uv-settings" version = "0.0.1" @@ -4996,8 +5061,9 @@ dependencies = [ "uv-fs", "uv-macros", "uv-normalize", + "uv-python", "uv-resolver", - "uv-toolchain", + "uv-warnings", ] [[package]] @@ -5010,49 +5076,29 @@ dependencies = [ ] [[package]] -name = "uv-toolchain" +name = "uv-tool" version = "0.0.1" dependencies = [ - "anyhow", - "assert_fs", - "cache-key", - "clap", - "configparser", + "dirs-sys", "fs-err", - "futures", - "indoc", "install-wheel-rs", - "itertools 0.13.0", - "once_cell", + "path-slash", + "pathdiff", "pep440_rs", "pep508_rs", - "platform-tags", "pypi-types", - "regex", - "reqwest", - "reqwest-middleware", - "rmp-serde", - "same-file", - "schemars", "serde", - "serde_json", - "target-lexicon", - "temp-env", - "tempfile", - "test-log", "thiserror", - "tokio-util", + "toml", + "toml_edit", "tracing", - "url", "uv-cache", - "uv-client", - "uv-configuration", - "uv-extract", "uv-fs", + "uv-installer", + "uv-python", "uv-state", + "uv-virtualenv", "uv-warnings", - "which", - "winapi", ] [[package]] @@ -5072,12 +5118,12 @@ dependencies = [ "uv-configuration", "uv-git", "uv-normalize", - "uv-toolchain", + "uv-python", ] [[package]] name = "uv-version" -version = "0.2.15" +version = "0.2.22" [[package]] name = "uv-virtualenv" @@ -5091,7 +5137,7 @@ dependencies = [ "thiserror", "tracing", "uv-fs", - "uv-toolchain", + "uv-python", "uv-version", ] diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 8590c1bee0e5..7e209a767129 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , installShellFiles , libiconv -, openssl , pkg-config , python3Packages , rustPlatform @@ -16,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.2.15"; + version = "0.2.22"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-dHw08huVslrePcZvIXhui87bPGp5+CChiN+DtY7bLVw="; + hash = "sha256-+eQdR6+0O1CTZoNIodM52R25lLZT+qB2kFy7oWaE+7M="; }; cargoDeps = rustPlatform.importCargoLock { @@ -31,6 +30,7 @@ python3Packages.buildPythonApplication rec { outputHashes = { "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs="; "pubgrub-0.2.1" = "sha256-6tr+HATYSn1A1uVJwmz40S4yLDOJlX8vEokOOtdFG0M="; + "reqwest-middleware-0.3.2" = "sha256-OiC8Kg+F2eKy7YNuLtgYPi95DrbxLvsIKrKEeyuzQTo="; }; }; @@ -44,7 +44,6 @@ python3Packages.buildPythonApplication rec { buildInputs = [ libiconv - openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -53,10 +52,6 @@ python3Packages.buildPythonApplication rec { cargoBuildFlags = [ "--package" "uv" ]; - env = { - OPENSSL_NO_VENDOR = true; - }; - postInstall = '' export HOME=$TMPDIR installShellCompletion --cmd uv \ diff --git a/pkgs/by-name/uw/uwhoisd/package.nix b/pkgs/by-name/uw/uwhoisd/package.nix index 2fb31c23669d..81080d476e8e 100644 --- a/pkgs/by-name/uw/uwhoisd/package.nix +++ b/pkgs/by-name/uw/uwhoisd/package.nix @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/ve/versionCheckHook/hook.sh b/pkgs/by-name/ve/versionCheckHook/hook.sh new file mode 100644 index 000000000000..cd417493e6c2 --- /dev/null +++ b/pkgs/by-name/ve/versionCheckHook/hook.sh @@ -0,0 +1,60 @@ +_handleCmdOutput(){ + local versionOutput + versionOutput="$(env --chdir=/ --argv0="$(basename "$1")" --ignore-environment "$@" 2>&1 || true)" + if [[ "$versionOutput" =~ "$version" ]]; then + echoPrefix="Successfully managed to" + else + echoPrefix="Did not" + fi + # The return value of this function is this variable: + echo "$echoPrefix" + # And in anycase we want these to be printed in the build log, useful for + # debugging, so we print these to stderr. + echo "$echoPrefix" find version "$version" in the output of the command \ + "$@" >&2 + echo "$versionOutput" >&2 +} +versionCheckHook(){ + runHook preVersionCheck + echo Executing versionCheckPhase + + local cmdProgram cmdArg echoPrefix + if [[ -z "${versionCheckProgram-}" ]]; then + if [[ -z "${pname-}" ]]; then + echo "both \$pname and \$versionCheckProgram are empty, so" \ + "we don't know which program to run the versionCheckPhase" \ + "upon" >&2 + exit 2 + else + cmdProgram="${!outputBin}/bin/$pname" + fi + else + cmdProgram="$versionCheckProgram" + fi + if [[ ! -x "$cmdProgram" ]]; then + echo "versionCheckHook: $cmdProgram was not found, or is not an executable" >&2 + exit 2 + fi + if [[ -z "${versionCheckProgramArg}" ]]; then + for cmdArg in "--help" "--version"; do + echoPrefix="$(_handleCmdOutput "$cmdProgram" "$cmdArg")" + if [[ "$echoPrefix" == "Successfully managed to" ]]; then + break + fi + done + else + cmdArg="$versionCheckProgramArg" + echoPrefix="$(_handleCmdOutput "$cmdProgram" "$cmdArg")" + fi + if [[ "$echoPrefix" == "Did not" ]]; then + exit 2 + fi + + runHook postVersionCheck + echo Finished versionCheckPhase +} + +if [[ -z "${dontVersionCheck-}" ]]; then + echo "Using versionCheckHook" + preInstallCheckHooks+=(versionCheckHook) +fi diff --git a/pkgs/by-name/ve/versionCheckHook/package.nix b/pkgs/by-name/ve/versionCheckHook/package.nix new file mode 100644 index 000000000000..ed35384d7960 --- /dev/null +++ b/pkgs/by-name/ve/versionCheckHook/package.nix @@ -0,0 +1,12 @@ +{ + lib, + makeSetupHook, +}: + +makeSetupHook { + name = "version-check-hook"; + meta = { + description = "Lookup for $version in the output of --help and --version"; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} ./hook.sh diff --git a/pkgs/by-name/ve/vesktop/disable_update_checking.patch b/pkgs/by-name/ve/vesktop/disable_update_checking.patch index 590951b675c0..a134dc0fd169 100644 --- a/pkgs/by-name/ve/vesktop/disable_update_checking.patch +++ b/pkgs/by-name/ve/vesktop/disable_update_checking.patch @@ -1,12 +1,12 @@ -diff --git a/src/updater/main.ts b/src/updater/main.ts -index 059afb9..274802e 100644 ---- a/src/updater/main.ts -+++ b/src/updater/main.ts -@@ -77,6 +77,7 @@ function isOutdated(oldVersion: string, newVersion: string) { +diff --git a/src/main/index.ts b/src/main/index.ts +index 2e0d6f7..1108c0f 100644 +--- a/src/main/index.ts ++++ b/src/main/index.ts +@@ -20,7 +20,6 @@ import { isDeckGameMode } from "./utils/steamOS"; + if (IS_DEV) { + require("source-map-support").install(); + } else { +- autoUpdater.checkForUpdatesAndNotify(); } - export async function checkUpdates() { -+ return; - if (Settings.store.checkUpdates === false) return; - - try { + // Make the Vencord files use our DATA_DIR diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 2c60537b0cb4..54cee68c90c8 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -13,38 +13,39 @@ pipewire, libpulseaudio, autoPatchelfHook, - pnpm, + pnpm_9, nodejs, withTTS ? true, + withMiddleClickScroll ? false, # Enables the use of vencord from nixpkgs instead of # letting vesktop manage it's own version withSystemVencord ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${finalAttrs.version}"; - hash = "sha256-cZOyydwpIW9Xq716KVi1RGtSlgVnOP3w8vXDwouS70E="; + hash = "sha256-HlT7ddlrMHG1qOCqdaYjuWhJD+5FF1Nkv2sfXLWd07o="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src patches ; - hash = "sha256-PogE8uf3W5cKSCqFHMz7FOvT7ONUP4FiFWGBgtk3UC8="; + hash = "sha256-rizJu6v04wFEpJtakC2tfPg/uylz7gAOzJiXvUwdDI4="; }; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ] ++ lib.optionals stdenv.isLinux [ # vesktop uses venmic, which is a shipped as a prebuilt node module @@ -134,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${electron}/bin/electron $out/bin/vesktop \ --add-flags $out/opt/Vesktop/resources/app.asar \ ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ + ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" '' + lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/by-name/ve/vesktop/use_system_vencord.patch b/pkgs/by-name/ve/vesktop/use_system_vencord.patch index 242fdcbb21e7..99ac643ef653 100644 --- a/pkgs/by-name/ve/vesktop/use_system_vencord.patch +++ b/pkgs/by-name/ve/vesktop/use_system_vencord.patch @@ -1,13 +1,13 @@ diff --git a/src/main/constants.ts b/src/main/constants.ts -index d5c5fa6..a1b32f1 100644 +index 40d91a5..7b46bbf 100644 --- a/src/main/constants.ts +++ b/src/main/constants.ts -@@ -16,7 +16,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes"); - // needs to be inline require because of circular dependency +@@ -49,7 +49,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes"); // as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised export const VENCORD_FILES_DIR = -- (require("./settings") as typeof import("./settings")).Settings.store.vencordDir || join(DATA_DIR, "vencordDist"); -+ (require("./settings") as typeof import("./settings")).Settings.store.vencordDir || "@vencord@"; + (require("./settings") as typeof import("./settings")).State.store.vencordDir || +- join(SESSION_DATA_DIR, "vencordFiles"); ++ "@vencord@"; export const USER_AGENT = `Vesktop/${app.getVersion()} (https://github.com/Vencord/Vesktop)`; diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 622d042e7302..d17b8ce22974 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -89,7 +89,6 @@ buildGoModule rec { maintainers = with maintainers; [ yorickvp ivan - nullx76 leona shawn8901 ]; diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/by-name/vn/vnote/package.nix similarity index 73% rename from pkgs/applications/office/vnote/default.nix rename to pkgs/by-name/vn/vnote/package.nix index 1b815228ac2d..a787f4a09e4b 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/by-name/vn/vnote/package.nix @@ -1,34 +1,34 @@ { lib , stdenv , fetchFromGitHub -, qmake -, qtbase -, qtwebengine -, qtx11extras -, wrapQtAppsHook +, cmake +, qt6 }: stdenv.mkDerivation (finalAttrs: { pname = "vnote"; - version = "3.17.0"; + version = "3.18.0"; src = fetchFromGitHub { owner = "vnotex"; repo = "vnote"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-NUVu6tKXrrwAoT4BgxX05mmGSC9yx20lwvXzd4y19Zs="; + hash = "sha256-OpQjMngSEnmtTMLXLllDlIzucdSLSqdFU4ZtPb7ytvQ="; }; nativeBuildInputs = [ - qmake - wrapQtAppsHook + cmake + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtwebengine - qtx11extras + qt6.qtbase + qt6.qtwebengine + qt6.qtsvg + qt6.qttools + qt6.qt5compat + qt6.qtwayland ]; meta = { diff --git a/pkgs/tools/networking/voms/default.nix b/pkgs/by-name/vo/voms/package.nix similarity index 75% rename from pkgs/tools/networking/voms/default.nix rename to pkgs/by-name/vo/voms/package.nix index b51b583e6937..b878e0b9d13b 100644 --- a/pkgs/tools/networking/voms/default.nix +++ b/pkgs/by-name/vo/voms/package.nix @@ -1,32 +1,33 @@ -{ lib -, stdenv -, fetchFromGitHub +{ + lib, + stdenv, + fetchFromGitHub, # Native build inputs -, autoreconfHook -, bison -, flex -, pkg-config + autoreconfHook, + bison, + flex, + pkg-config, # Build inputs -, expat -, gsoap -, openssl -, zlib + expat, + gsoap, + openssl, + zlib, # Configuration overridable with .override # If not null, the builder will # create a new output "etc", move "$out/etc" to "$etc/etc" # and symlink "$out/etc" to externalEtc. -, externalEtc ? "/etc" + externalEtc ? "/etc", }: -stdenv.mkDerivation rec{ - pname = "voms-unstable"; - version = "2022-06-14"; +stdenv.mkDerivation (finalAttrs: { + pname = "voms"; + version = "2.1.0"; src = fetchFromGitHub { owner = "italiangrid"; repo = "voms"; - rev = "8e99bb96baaf197f0f557836e2829084bb1bb00e"; # develop branch - hash = "sha256-FG4fHO2lsQ3t/ZaKT9xY+xqdQHfdtzi5ULtxLhdPnss="; + rev = "v${finalAttrs.version}"; + hash = "sha256-Xz9+NYaSZsVuoIbyuejVWmwEmsPmMVtBAD94/SXP8ag="; }; passthru = { @@ -47,7 +48,15 @@ stdenv.mkDerivation rec{ zlib ]; - outputs = [ "bin" "out" "dev" "man" ] + outputs = + [ + "bin" + "out" + "dev" + "man" + ] + # `etc` output for default configurations that can optionally be + # installed to /etc (system-wide) or profile-path>/etc. ++ lib.optional (externalEtc != null) "etc"; preAutoreconf = '' @@ -83,4 +92,4 @@ stdenv.mkDerivation rec{ platforms = platforms.linux; # gsoap is currently Linux-only in Nixpkgs maintainers = with maintainers; [ ShamrockLee ]; }; -} +}) diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix index 8c46715b023a..2fac21d32f2f 100644 --- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix +++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "vpl-gpu-rt"; - version = "24.2.3"; + version = "24.2.5"; outputs = [ "out" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "vpl-gpu-rt"; rev = "intel-onevpl-${version}"; - sha256 = "sha256-n2lkt7zRlpbPedNxa21EQvFdYyOAPF//TsY4srbGHQE="; + sha256 = "sha256-WYlA8+i8TTFHsU4+doLcv75F9MR2V/BEuNGGLgM4p1s="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix index 80a13d18102c..48d92ffb67e3 100644 --- a/pkgs/by-name/vs/vscode-js-debug/package.nix +++ b/pkgs/by-name/vs/vscode-js-debug/package.nix @@ -16,16 +16,16 @@ buildNpmPackage rec { pname = "vscode-js-debug"; - version = "1.90.0"; + version = "1.91.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-js-debug"; rev = "v${version}"; - hash = "sha256-SmWPKO7CEXaOIkuf9Y+825EfGsIz+rWlnCsh1T2UEF0="; + hash = "sha256-3SZIIBHv599qLaW419CA0Nr7F6R7GB9wqUnOqbV4jKc="; }; - npmDepsHash = "sha256-DfeaiqKadTnGzOObK01ctlavwqTMa0tqn59sLZMPvUM="; + npmDepsHash = "sha256-kZ5wCcmdpYtT6dqtV3i8R9LKFs20sq0rZC1W1w00XJQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/vu/vue-language-server/package-lock.json b/pkgs/by-name/vu/vue-language-server/package-lock.json index 7be780852f85..682ef08c3232 100644 --- a/pkgs/by-name/vu/vue-language-server/package-lock.json +++ b/pkgs/by-name/vu/vue-language-server/package-lock.json @@ -1,19 +1,19 @@ { "name": "@vue/language-server", - "version": "2.0.21", + "version": "2.0.24", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@vue/language-server", - "version": "2.0.21", + "version": "2.0.24", "license": "MIT", "dependencies": { - "@volar/language-core": "~2.3.0-alpha.15", - "@volar/language-server": "~2.3.0-alpha.15", - "@vue/language-core": "2.0.21", - "@vue/language-service": "2.0.21", - "@vue/typescript-plugin": "2.0.21", + "@volar/language-core": "~2.4.0-alpha.2", + "@volar/language-server": "~2.4.0-alpha.2", + "@vue/language-core": "2.0.24", + "@vue/language-service": "2.0.24", + "@vue/typescript-plugin": "2.0.24", "vscode-languageserver-protocol": "^3.17.5", "vscode-uri": "^3.0.8" }, @@ -86,22 +86,22 @@ "integrity": "sha512-qqNS/YD0Nck5wtQLCPHAfGVgWbbGafxSPjNh0ekYPFSNNqnDH2kamnduzYly8IiADmeVx/MfAE1njMEjVeHTMA==" }, "node_modules/@volar/language-core": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.3.0.tgz", - "integrity": "sha512-pvhL24WUh3VDnv7Yw5N1sjhPtdx7q9g+Wl3tggmnkMcyK8GcCNElF2zHiKznryn0DiUGk+eez/p2qQhz+puuHw==", + "version": "2.4.0-alpha.7", + "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.0-alpha.7.tgz", + "integrity": "sha512-3ncRpnoVHCTzJeTiUyKwFTLb3jGfe1r5+S3MwRDPEjsV4LID6Rq6EmdRoF+aKw+Iwg63x4nV+/KYZjeYrp5mNA==", "dependencies": { - "@volar/source-map": "2.3.0" + "@volar/source-map": "2.4.0-alpha.7" } }, "node_modules/@volar/language-server": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.3.0.tgz", - "integrity": "sha512-KXujrZoBd4lhdL+N+4bwsPbDZy8/zFyZSiyqLr6uIbSxJC/njRznQx5u5y5Txw5hbNuQCCR9B8EPv2jjKUbyeA==", + "version": "2.4.0-alpha.7", + "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.0-alpha.7.tgz", + "integrity": "sha512-WxCFxHRy5SOEJAUEcStMW6OuC/V25y5AsJEyJaPq5sZ76EeJgc8BbImO6Yi7r6qXRENDjcVTE10t2JR4t5+qRw==", "dependencies": { - "@volar/language-core": "2.3.0", - "@volar/language-service": "2.3.0", - "@volar/snapshot-document": "2.3.0", - "@volar/typescript": "2.3.0", + "@volar/language-core": "2.4.0-alpha.7", + "@volar/language-service": "2.4.0-alpha.7", + "@volar/snapshot-document": "2.4.0-alpha.7", + "@volar/typescript": "2.4.0-alpha.7", "path-browserify": "^1.0.1", "request-light": "^0.7.0", "vscode-languageserver": "^9.0.1", @@ -111,39 +111,36 @@ } }, "node_modules/@volar/language-service": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.3.0.tgz", - "integrity": "sha512-U0ggeoHh4afYflGD2vjw8QPwnnDg5V4QDkZ5meL+B2YwrXEF9bVAHTjYaR8AxJ2qb3mwOwXLtZ9psJJSjkdctw==", + "version": "2.4.0-alpha.7", + "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.0-alpha.7.tgz", + "integrity": "sha512-vSuH2c0o7z9zDPcmUGqK9sT4l71B8Ooj6VKKB1H6F++ZAI0I9Uch7V7wc6VQjuB2LuYmojxwKxl1bydjnGxpHg==", "dependencies": { - "@volar/language-core": "2.3.0", + "@volar/language-core": "2.4.0-alpha.7", "vscode-languageserver-protocol": "^3.17.5", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" } }, "node_modules/@volar/snapshot-document": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.3.0.tgz", - "integrity": "sha512-0dBMaxElxYOX9eSRjpIM5+cV0aqrypArJwjCzc/gQ3E1H+MEAi3YpAzUyLxG8aSidUm8msUWZc4X+gP/rSIeng==", + "version": "2.4.0-alpha.7", + "resolved": "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.4.0-alpha.7.tgz", + "integrity": "sha512-gBxnWi1ioC97bpynl9M0GE8XTiIDnslgCsCSi2WgNEaknrivYs9bR6dsA2G0iMz7lHScim47pmIlhtO9eSvY7A==", "dependencies": { "vscode-languageserver-protocol": "^3.17.5", "vscode-languageserver-textdocument": "^1.0.11" } }, "node_modules/@volar/source-map": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.3.0.tgz", - "integrity": "sha512-G/228aZjAOGhDjhlyZ++nDbKrS9uk+5DMaEstjvzglaAw7nqtDyhnQAsYzUg6BMP9BtwZ59RIw5HGePrutn00Q==", - "dependencies": { - "muggle-string": "^0.4.0" - } + "version": "2.4.0-alpha.7", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.7.tgz", + "integrity": "sha512-yn66qcUXxUCyyW8PXMHE4z9RdfTO1OhP6BMa/JI0Ed6I6bggzkxvXsJOaMqw3EalCskGPuIWAbWgxwa3Hlp7SA==" }, "node_modules/@volar/typescript": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.3.0.tgz", - "integrity": "sha512-PtUwMM87WsKVeLJN33GSTUjBexlKfKgouWlOUIv7pjrOnTwhXHZNSmpc312xgXdTjQPpToK6KXSIcKu9sBQ5LQ==", + "version": "2.4.0-alpha.7", + "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.0-alpha.7.tgz", + "integrity": "sha512-MjvkhcIYPDZS5vbE4bSvbWi8z/VI47AY8MkPVgfa6xqTDLLxV6+QulJ8hIC3wYxh3dfVmA5MOoL5c3cZAsWbDQ==", "dependencies": { - "@volar/language-core": "2.3.0", + "@volar/language-core": "2.4.0-alpha.7", "path-browserify": "^1.0.1", "vscode-uri": "^3.0.8" } @@ -171,36 +168,37 @@ "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==" }, "node_modules/@vue/compiler-core": { - "version": "3.4.29", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.29.tgz", - "integrity": "sha512-TFKiRkKKsRCKvg/jTSSKK7mYLJEQdUiUfykbG49rubC9SfDyvT2JrzTReopWlz2MxqeLyxh9UZhvxEIBgAhtrg==", + "version": "3.4.31", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.31.tgz", + "integrity": "sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==", "dependencies": { "@babel/parser": "^7.24.7", - "@vue/shared": "3.4.29", + "@vue/shared": "3.4.31", "entities": "^4.5.0", "estree-walker": "^2.0.2", "source-map-js": "^1.2.0" } }, "node_modules/@vue/compiler-dom": { - "version": "3.4.29", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.29.tgz", - "integrity": "sha512-A6+iZ2fKIEGnfPJejdB7b1FlJzgiD+Y/sxxKwJWg1EbJu6ZPgzaPQQ51ESGNv0CP6jm6Z7/pO6Ia8Ze6IKrX7w==", + "version": "3.4.31", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.31.tgz", + "integrity": "sha512-wK424WMXsG1IGMyDGyLqB+TbmEBFM78hIsOJ9QwUVLGrcSk0ak6zYty7Pj8ftm7nEtdU/DGQxAXp0/lM/2cEpQ==", "dependencies": { - "@vue/compiler-core": "3.4.29", - "@vue/shared": "3.4.29" + "@vue/compiler-core": "3.4.31", + "@vue/shared": "3.4.31" } }, "node_modules/@vue/language-core": { - "version": "2.0.21", - "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.21.tgz", - "integrity": "sha512-vjs6KwnCK++kIXT+eI63BGpJHfHNVJcUCr3RnvJsccT3vbJnZV5IhHR2puEkoOkIbDdp0Gqi1wEnv3hEd3WsxQ==", + "version": "2.0.24", + "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.24.tgz", + "integrity": "sha512-997YD6Lq/66LXr3ZOLNxDCmyn13z9NP8LU1UZn9hGCDWhzlbXAIP0hOgL3w3x4RKEaWTaaRtsHP9DzHvmduruQ==", "dependencies": { - "@volar/language-core": "~2.3.0-alpha.15", + "@volar/language-core": "~2.4.0-alpha.2", "@vue/compiler-dom": "^3.4.0", "@vue/shared": "^3.4.0", "computeds": "^0.0.1", "minimatch": "^9.0.3", + "muggle-string": "^0.4.1", "path-browserify": "^1.0.1", "vue-template-compiler": "^2.7.14" }, @@ -214,44 +212,44 @@ } }, "node_modules/@vue/language-service": { - "version": "2.0.21", - "resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.0.21.tgz", - "integrity": "sha512-AyhoOubcGWC0aA/Ae+VUFszeJ9m+6uWrbYlyjNyHF4RM8aj+ymOjzyPVE4WbER3g9sTNu/zm/zu+Sl5avIDZbg==", + "version": "2.0.24", + "resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.0.24.tgz", + "integrity": "sha512-CoiTPlc73I/LCji9rnI0Z89GVBOoejUfBzIzEg+6TFw8Eelp2fncgLAvgR8vmOWRVaLn0XgmL2wa0jgtLLderg==", "dependencies": { - "@volar/language-core": "~2.3.0-alpha.15", - "@volar/language-service": "~2.3.0-alpha.15", - "@volar/typescript": "~2.3.0-alpha.15", + "@volar/language-core": "~2.4.0-alpha.2", + "@volar/language-service": "~2.4.0-alpha.2", + "@volar/typescript": "~2.4.0-alpha.2", "@vue/compiler-dom": "^3.4.0", - "@vue/language-core": "2.0.21", + "@vue/language-core": "2.0.24", "@vue/shared": "^3.4.0", - "@vue/typescript-plugin": "2.0.21", + "@vue/typescript-plugin": "2.0.24", "computeds": "^0.0.1", "path-browserify": "^1.0.1", - "volar-service-css": "0.0.50", - "volar-service-emmet": "0.0.50", - "volar-service-html": "0.0.50", - "volar-service-json": "0.0.50", - "volar-service-pug": "0.0.50", - "volar-service-pug-beautify": "0.0.50", - "volar-service-typescript": "0.0.50", - "volar-service-typescript-twoslash-queries": "0.0.50", - "vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462", + "volar-service-css": "0.0.56", + "volar-service-emmet": "0.0.56", + "volar-service-html": "0.0.56", + "volar-service-json": "0.0.56", + "volar-service-pug": "0.0.56", + "volar-service-pug-beautify": "0.0.56", + "volar-service-typescript": "0.0.56", + "volar-service-typescript-twoslash-queries": "0.0.56", + "vscode-html-languageservice": "^5.2.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" } }, "node_modules/@vue/shared": { - "version": "3.4.29", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.29.tgz", - "integrity": "sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==" + "version": "3.4.31", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz", + "integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA==" }, "node_modules/@vue/typescript-plugin": { - "version": "2.0.21", - "resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.0.21.tgz", - "integrity": "sha512-RNiM0VgETuP/kEhMYfikDoqXvqwO6LZtL8zMLWeciNQFKGq7DCBk8chOO5dpnOXl6hrENCqk3keIvp3jPdLSCQ==", + "version": "2.0.24", + "resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.0.24.tgz", + "integrity": "sha512-UjC6iKiyJ1pn0CbcsDW3IyiNb7z7vtABI3b9tDZ8xLGDvVLduZ0qwzq22b5jg2cVEIhLdjbQ4quaEoZflltfTw==", "dependencies": { - "@volar/typescript": "~2.3.0-alpha.15", - "@vue/language-core": "2.0.21", + "@volar/typescript": "~2.4.0-alpha.2", + "@vue/language-core": "2.0.24", "@vue/shared": "^3.4.0" } }, @@ -335,6 +333,12 @@ "version": "2.4.7", "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.4.7.tgz", "integrity": "sha512-O5O5QNqtdlnQM2bmKHtJgyChcrFMgQuulI+WdiOw2NArzprUqqxUW6bgYtKvzKgrsYpuLWalOkdhNP+1jluhCA==", + "workspaces": [ + "./packages/scanner", + "./packages/abbreviation", + "./packages/css-abbreviation", + "./" + ], "dependencies": { "@emmetio/abbreviation": "^2.3.3", "@emmetio/css-abbreviation": "^2.1.8" @@ -508,9 +512,9 @@ "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==" }, "node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -609,24 +613,24 @@ "integrity": "sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==" }, "node_modules/typescript-auto-import-cache": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.2.tgz", - "integrity": "sha512-+laqe5SFL1vN62FPOOJSUDTZxtgsoOXjneYOXIpx5rQ4UMiN89NAtJLpqLqyebv9fgQ/IMeeTX+mQyRnwvJzvg==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.3.tgz", + "integrity": "sha512-ojEC7+Ci1ij9eE6hp8Jl9VUNnsEKzztktP5gtYNRMrTmfXVwA1PITYYAkpxCvvupdSYa/Re51B6KMcv1CTZEUA==", "dependencies": { "semver": "^7.3.8" } }, "node_modules/volar-service-css": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.50.tgz", - "integrity": "sha512-x2KkGRBY4IRarIFrBrR5CcynNSPv8oviYgekQvKVBtJdll00jOkstnArNa6h0x0k06bJ1WFB/i9Nd3L+WgtcMg==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.56.tgz", + "integrity": "sha512-Pdbk5QayLNWJislbik4Lo0QLLyd4pTqcgZCE2gaEQp9ozHCtrRNj3vY7KAh4BTgfiOqTSAj/UhViOXVAtdF3yg==", "dependencies": { - "vscode-css-languageservice": "^6.2.10", + "vscode-css-languageservice": "^6.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.3.0-alpha.5" + "@volar/language-service": "~2.4.0-alpha.1" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -635,17 +639,17 @@ } }, "node_modules/volar-service-emmet": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.50.tgz", - "integrity": "sha512-W70iT0lkiyERXTTQMgQhRP0fqW0JO2Kn4JUWvWTLblRvYPKJ7MxWQKwVQN+ng3L9U6fZCkrd2P3FN00Tl8M4Qw==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.56.tgz", + "integrity": "sha512-2WqvOMTYBOpNAHtEWj0C9d8Wyco8aY4KL+9lfdFCWJd7RYU6R6mIlbrvcdSP2De8b5Z7gwTCUm6Kcjt8qOCvjQ==", "dependencies": { "@emmetio/css-parser": "^0.4.0", "@emmetio/html-matcher": "^1.3.0", - "@vscode/emmet-helper": "^2.9.2", + "@vscode/emmet-helper": "^2.9.3", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.3.0-alpha.5" + "@volar/language-service": "~2.4.0-alpha.1" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -654,16 +658,16 @@ } }, "node_modules/volar-service-html": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.50.tgz", - "integrity": "sha512-pcyQo1Pzxp5O27CIt66KjussUnKDmlTmI23L8DABOr7U7uNHV5bqzcDE8dOTHP2Jf5d0+TKAaUSWY9g5BcziQQ==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.56.tgz", + "integrity": "sha512-OwDRiASNqFxAFdO55CZ0/XKnPt7WGw8CoaM/g6QzExikPZ92ySbK/kvh1zi6WR3w+hP6C4BNeVITzOk9tjgNGw==", "dependencies": { - "vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462", + "vscode-html-languageservice": "^5.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.3.0-alpha.5" + "@volar/language-service": "~2.4.0-alpha.1" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -672,15 +676,15 @@ } }, "node_modules/volar-service-json": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-json/-/volar-service-json-0.0.50.tgz", - "integrity": "sha512-u/DSm8N9fMnIeD+FyXYKElqK3C2c2PGs7cW1evk9tRzT53cJmoDDtca3P1AdqKl4ZpomKEOA9MfXvQFashzpvw==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-json/-/volar-service-json-0.0.56.tgz", + "integrity": "sha512-eYXfOYTJLOw9UeA2YNtxGp/Lgu4pKk9u72I/HI+TcqLdMJKoXpOwLF6nUEhZVTy9LqTSRF0QvgXFa4q4mcLwIg==", "dependencies": { - "vscode-json-languageservice": "^5.3.7", + "vscode-json-languageservice": "^5.4.0", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.3.0-alpha.5" + "@volar/language-service": "~2.4.0-alpha.1" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -689,27 +693,28 @@ } }, "node_modules/volar-service-pug": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-pug/-/volar-service-pug-0.0.50.tgz", - "integrity": "sha512-z9TFeHnNDhJNyQCL7KinVMpmNaPDo86odG1nG4ysn8D0uMKD/E1m7Qe5sttaKPyx8nywhQKWBYZTPsVuoIB9fQ==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-pug/-/volar-service-pug-0.0.56.tgz", + "integrity": "sha512-NaobSQiuAFBTzBE7YHAyHyCZXqVNFFbXvuXTtXsJP6LR1lvBWg7IUgg45kzV1OS146qq2cmY3lryhlNRHwCmmg==", "dependencies": { - "@volar/language-service": "~2.3.0-alpha.5", + "@volar/language-service": "~2.4.0-alpha.1", + "muggle-string": "^0.4.1", "pug-lexer": "^5.0.1", "pug-parser": "^6.0.0", - "volar-service-html": "0.0.50", - "vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462", + "volar-service-html": "0.0.56", + "vscode-html-languageservice": "^5.3.0", "vscode-languageserver-textdocument": "^1.0.11" } }, "node_modules/volar-service-pug-beautify": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-pug-beautify/-/volar-service-pug-beautify-0.0.50.tgz", - "integrity": "sha512-xzTBsjglVpNWyH8auUznE9EDL57RavwoldjRlxkgV2vppQXvRl8S5dXihGxkcW+/lrV6xaDCckuf7kcmd0osqA==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-pug-beautify/-/volar-service-pug-beautify-0.0.56.tgz", + "integrity": "sha512-ai79ljMfKH2bjcVjUET0zAwpVjDNtMCjizkttxCkNHCMTYIc1muhHIEj1+nNAw4zrDT51lxZgW6OJMTXQ+BW9A==", "dependencies": { "@johnsoncodehk/pug-beautify": "^0.2.2" }, "peerDependencies": { - "@volar/language-service": "~2.3.0-alpha.5" + "@volar/language-service": "~2.4.0-alpha.1" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -718,19 +723,19 @@ } }, "node_modules/volar-service-typescript": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.50.tgz", - "integrity": "sha512-2QNEtBtZ0dA1WfITavj+7fFCzVCqkpgTgDI8uxMHkWuqMfkETPlYz04603TG1/KOQ1dO2THW8zj4OXDJFmdYXQ==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.56.tgz", + "integrity": "sha512-p16fn61j4IiNLhLl7ZxdnRRDpRLWiqIRhZm1xLgek4JshCCy5Z7KShYG6LVZXK3hNvXxM8f61PIl0KDCCzStKA==", "dependencies": { "path-browserify": "^1.0.1", - "semver": "^7.5.4", - "typescript-auto-import-cache": "^0.3.1", + "semver": "^7.6.2", + "typescript-auto-import-cache": "^0.3.3", "vscode-languageserver-textdocument": "^1.0.11", "vscode-nls": "^5.2.0", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.3.0-alpha.5" + "@volar/language-service": "~2.4.0-alpha.1" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -739,14 +744,14 @@ } }, "node_modules/volar-service-typescript-twoslash-queries": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.50.tgz", - "integrity": "sha512-8fYdKlONEl4rU51Wf6qYM4rTFOHvVIhZ1oa9ZmI/tDQIYvK+JSwvov2IPfTVfHmqTet/aS4njmKa0D25CgKuGA==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.56.tgz", + "integrity": "sha512-VqOp3xQucUzLpJCOEQcAiAUlbv6c1laTbFsM/pc06S/+l78eHPDbnivoSwL+0MKbNoLwLsS5w0OwBfwQ2Dn2Jg==", "dependencies": { "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.3.0-alpha.5" + "@volar/language-service": "~2.4.0-alpha.1" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -755,9 +760,9 @@ } }, "node_modules/vscode-css-languageservice": { - "version": "6.2.14", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.14.tgz", - "integrity": "sha512-5UPQ9Y1sUTnuMyaMBpO7LrBkqjhEJb5eAwdUlDp+Uez8lry+Tspnk3+3p2qWS4LlNsr4p3v9WkZxUf1ltgFpgw==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.0.tgz", + "integrity": "sha512-nU92imtkgzpCL0xikrIb8WvedV553F2BENzgz23wFuok/HLN5BeQmroMy26pUwFxV2eV8oNRmYCUv8iO7kSMhw==", "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.11", @@ -766,10 +771,9 @@ } }, "node_modules/vscode-html-languageservice": { - "name": "@johnsoncodehk/vscode-html-languageservice", - "version": "5.2.0-34a5462", - "resolved": "https://registry.npmjs.org/@johnsoncodehk/vscode-html-languageservice/-/vscode-html-languageservice-5.2.0-34a5462.tgz", - "integrity": "sha512-etqLfpSJ5zaw76KUNF603be6d6QsiQPmaHr9FKEp4zhLZJzWCCMH6Icak7MtLUFLZLMpL761mZNImi/joBo1ZA==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.0.tgz", + "integrity": "sha512-C4Z3KsP5Ih+fjHpiBc5jxmvCl+4iEwvXegIrzu2F5pktbWvQaBT3YkVPk8N+QlSSMk8oCG6PKtZ/Sq2YHb5e8g==", "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.11", @@ -778,21 +782,21 @@ } }, "node_modules/vscode-json-languageservice": { - "version": "5.3.11", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.11.tgz", - "integrity": "sha512-WYS72Ymria3dn8ZbjtBbt5K71m05wY1Q6hpXV5JxUT0q75Ts0ljLmnZJAVpx8DjPgYbFD+Z8KHpWh2laKLUCtQ==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.4.0.tgz", + "integrity": "sha512-NCkkCr63OHVkE4lcb0xlUAaix6vE5gHQW4NrswbLEh3ArXj81lrGuFTsGEYEUXlNHdnc53vWPcjeSy/nMTrfXg==", "dependencies": { "@vscode/l10n": "^0.0.18", - "jsonc-parser": "^3.2.1", + "jsonc-parser": "^3.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-languageserver-types": "^3.17.5", "vscode-uri": "^3.0.8" } }, "node_modules/vscode-json-languageservice/node_modules/jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==" + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", + "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==" }, "node_modules/vscode-jsonrpc": { "version": "8.2.0", diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index d18ac720c6aa..07f305f0160a 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "vue-language-server"; - version = "2.0.21"; + version = "2.0.24"; src = fetchurl { url = "https://registry.npmjs.org/@vue/language-server/-/language-server-${version}.tgz"; - hash = "sha256-FTsLvSZr+03o8h/udMfcUGBK41/xkrNeMUuOliataH8="; + hash = "sha256-uEYDg4Sybqodb2/w2mmZqi0uWffBzSSTvttcNWt01MI="; }; - npmDepsHash = "sha256-wYrLN42If6gAjRok0tAdVvVoDmv5oK/vvPoT3BxtgdA="; + npmDepsHash = "sha256-6idBvR+Ua6uwwX4doB1X8ERqgBI5bJ6e9G13JhPUFP4="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/vu/vulkan-memory-allocator/package.nix b/pkgs/by-name/vu/vulkan-memory-allocator/package.nix new file mode 100644 index 000000000000..4ed32516210f --- /dev/null +++ b/pkgs/by-name/vu/vulkan-memory-allocator/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, cmake +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "vulkan-memory-allocator"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "GPUOpen-LibrariesAndSDKs"; + repo = "VulkanMemoryAllocator"; + rev = "v${finalAttrs.version}"; + hash = "sha256-j0Z9OEwQx3RB2cni9eK3gYfwkhOc2ST213b6VseaVzg="; + }; + + # A compiler is only required for the samples. This lets us use stdenvNoCC. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-warn 'LANGUAGES CXX' 'LANGUAGES NONE' + ''; + + nativeBuildInputs = [ + cmake + ]; + + strictDeps = true; + + meta = { + description = "Easy to integrate Vulkan memory allocation library"; + homepage = "https://gpuopen.com/vulkan-memory-allocator/"; + changelog = "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fgaz ]; + mainProgram = "vulkan-memory-allocator"; + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; +}) diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index 9ca3f5d42c33..53df74f8533c 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { "sqlalchemy" ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; build-system = with python3.pkgs; [ poetry-core diff --git a/pkgs/by-name/vv/vvvvvv/package.nix b/pkgs/by-name/vv/vvvvvv/package.nix index a03f3617d2ff..6d11bafa746f 100644 --- a/pkgs/by-name/vv/vvvvvv/package.nix +++ b/pkgs/by-name/vv/vvvvvv/package.nix @@ -91,8 +91,9 @@ stdenv.mkDerivation rec { (Redistributable version, doesn't include the original levels.) ''; homepage = "https://thelettervsixtim.es"; + changelog = "https://github.com/TerryCavanagh/VVVVVV/releases/tag/${src.rev}"; license = licenses.unfree; - maintainers = with maintainers; [ martfont ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix index 812c6dd9b8d7..a30c5df8d851 100644 --- a/pkgs/by-name/wa/waf/package.nix +++ b/pkgs/by-name/wa/waf/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waf"; - version = "2.0.27"; + version = "2.1.1"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "waf-${finalAttrs.version}"; - hash = "sha256-GeEoD5CHubwR4ndGk7J7czEf0hWtPQr88TqJDPqeK0s="; + hash = "sha256-38u8DJ1KLkb7FfeCr+1e5UBE3Qkx1q2FBsm5HDXnunQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix index dcec3c2b314b..89a3d4b8f7cb 100644 --- a/pkgs/by-name/wa/wakatime-cli/package.nix +++ b/pkgs/by-name/wa/wakatime-cli/package.nix @@ -8,16 +8,16 @@ buildGo122Module rec { pname = "wakatime-cli"; - version = "1.90.0"; + version = "1.93.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - hash = "sha256-A2YrDrXmMR4BJUOYuo3h3Pa5HqyYSoDr/qdH54INU3w="; + hash = "sha256-S4AvAGpaxp5lKi9RnLLaN8qLURYsLWIzhtXKRgQPuGc="; }; - vendorHash = "sha256-pejrUFcv9c4ZAE3Cuw7uytc1T2pr7SOZNJ/Wr8K+fas="; + vendorHash = "sha256-+9zdEIaKQlLcBwFaY5Fe5mpHWQDqfV+j1TPmDkdRjyk="; ldflags = [ "-s" @@ -25,6 +25,11 @@ buildGo122Module rec { "-X github.com/wakatime/wakatime-cli/pkg/version.Version=${version}" ]; + postPatch = '' + substituteInPlace go.mod \ + --replace-fail "go 1.22.4" "go 1.22.3" + ''; + checkFlags = let skippedTests = [ diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index 573e08678199..8eae7a2a5dbd 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -99,7 +99,7 @@ meta = with lib; { homepage = "https://www.warp.dev"; license = licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime imadnyc donteatoreo ]; + maintainers = with maintainers; [ emilytrau imadnyc donteatoreo johnrtitor ]; platforms = platforms.darwin ++ [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/wa/wash-cli/package.nix b/pkgs/by-name/wa/wash-cli/package.nix index c186a035814b..d5b3ebecf8cd 100644 --- a/pkgs/by-name/wa/wash-cli/package.nix +++ b/pkgs/by-name/wa/wash-cli/package.nix @@ -2,24 +2,24 @@ let wasiPreviewCommandComponentAdapter = fetchurl { - url = "https://github.com/bytecodealliance/wasmtime/releases/download/v13.0.0/wasi_snapshot_preview1.command.wasm"; - hash = "sha256-QihT0Iaq9VJs2mLL9CdS32lVMtDc9M952k/ZZ4tO6qs="; + url = "https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasi_snapshot_preview1.command.wasm"; + hash = "sha256-UVBFddlI0Yh1ZNs0b2jSnKsHvGGAS5U09yuwm8Q6lxw="; }; wasiPreviewReactorComponentAdapter = fetchurl { - url = "https://github.com/bytecodealliance/wasmtime/releases/download/v13.0.0/wasi_snapshot_preview1.reactor.wasm"; - hash = "sha256-bNmx/IqYPkA7YHvlYvHPmIMF/fkKtSXlZx1bjR3Neow="; + url = "https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasi_snapshot_preview1.reactor.wasm"; + hash = "sha256-oE53IRMZgysSWT7RhrpZJjdaIyzCRf0h4d1yjqj/PSk="; }; in rustPlatform.buildRustPackage rec { pname = "wash-cli"; - version = "0.24.0"; + version = "0.29.2"; src = fetchCrate { inherit version pname; - hash = "sha256-exhN+44Sikcn2JiIry/jHOpYrPG2oQOpwq/Mq+0VK0U="; + hash = "sha256-A66KSDYFbByguhnlzzU5nf8pE3lhnYQjI3h73SKB2Zo="; }; - cargoHash = "sha256-eEfkMoi4BPpKWkiTshHj59loFPzyrhFN/S8HKdMCGFM="; + cargoHash = "sha256-2mo30xHQ3aCExdI0ITDY9g/C5peN48PdUNFVVxM//+c="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index 596d1d075219..5fcbcfa64259 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -4,6 +4,8 @@ , pkg-config , sqlite , zstd +, stdenv +, darwin }: rustPlatform.buildRustPackage rec { @@ -26,6 +28,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix index 134742caa2c8..69ea3958a73d 100644 --- a/pkgs/by-name/wa/waybar/package.nix +++ b/pkgs/by-name/wa/waybar/package.nix @@ -73,8 +73,8 @@ let libcava.src = fetchFromGitHub { owner = "LukashonakV"; repo = "cava"; - rev = "0.10.1"; - hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw="; + rev = "0.10.2"; + hash = "sha256-jU7RQV2txruu/nUUl0TzjK4nai7G38J1rcTjO7UXumY="; }; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/wb/wb32-dfu-updater/package.nix b/pkgs/by-name/wb/wb32-dfu-updater/package.nix index 02498c4e520a..762a4eb8e891 100644 --- a/pkgs/by-name/wb/wb32-dfu-updater/package.nix +++ b/pkgs/by-name/wb/wb32-dfu-updater/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/WestberryTech/wb32-dfu-updater"; license = licenses.asl20; - maintainers = [ maintainers.liketechnik ]; + maintainers = [ ]; mainProgram = "wb32-dfu-updater_cli"; platforms = platforms.all; }; diff --git a/pkgs/by-name/we/web-archives/package.nix b/pkgs/by-name/we/web-archives/package.nix new file mode 100644 index 000000000000..2c052474489b --- /dev/null +++ b/pkgs/by-name/we/web-archives/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + meson, + ninja, + vala, + pkg-config, + wrapGAppsHook3, + libzim-glib, + sqlite, + webkitgtk_4_1, + tracker, + libxml2, + libisocodes, + libhandy, + glib-networking, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "web-archives"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "birros"; + repo = "web-archives"; + rev = "v${finalAttrs.version}"; + hash = "sha256-EYHChI+4tpjRp4KveHTB+5BSLtw0YLp5z2JJmA0xTlM="; + }; + + web-archive-darkreader = fetchurl { + # This is the same with build-aux/darkreader/Makefile + url = "https://github.com/birros/web-archives-darkreader/releases/download/v0.0.1/web-archives-darkreader_v0.0.1.js"; + hash = "sha256-juhAqs2eCYZKerLnX3NvaW3NS0uOhqB7pyf/PRDvMqE="; + }; + + postPatch = '' + substituteInPlace meson.build \ + --replace-fail \ + "'make', '-C', 'build-aux/darkreader'" \ + "'cp', '${finalAttrs.web-archive-darkreader}', 'build-aux/darkreader/web-archives-darkreader.js'" + ''; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + libzim-glib + sqlite + webkitgtk_4_1 + tracker + libxml2 + libisocodes + libhandy + glib-networking + ]; + + strictDeps = true; + + passthru = { + inherit (finalAttrs) web-archive-darkreader; + }; + + meta = { + description = "Web archives reader offering the ability to browse offline millions of articles"; + homepage = "https://github.com/birros/web-archives"; + license = lib.licenses.gpl3Plus; + mainProgram = "web-archives"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/we/weevely/package.nix b/pkgs/by-name/we/weevely/package.nix new file mode 100644 index 000000000000..bd640b2723b6 --- /dev/null +++ b/pkgs/by-name/we/weevely/package.nix @@ -0,0 +1,55 @@ +{ lib +, fetchFromGitHub +, python3 +, python3Packages +, makeWrapper +, installShellFiles +}: + +python3Packages.buildPythonApplication rec { + pname = "weevely"; + version = "4.0.2-unstable-2024-04-29"; + pyproject = false; + + src = fetchFromGitHub { + owner = "epinna"; + repo = "weevely3"; + rev = "3fe896a67af8c0b44f39f50fb7234812a9da2118"; + hash = "sha256-rUFwy6eoQQ8eQFcmOP+tCS6mKdWmRjeeyAqsc0TYCHU="; + }; + + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; + + propagatedBuildInputs = with python3Packages; [ + dateutils + mako + prettytable + pyopenssl + pysocks + pyyaml + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share/weevely} + installManPage weevely.1 + rm README.md CHANGELOG.md requirements.txt LICENSE weevely.1 + cp -a * $out/share/weevely/ + makeWrapper ${python3}/bin/python $out/bin/weevely \ + --add-flags "$out/share/weevely/weevely.py" \ + --prefix PYTHONPATH : ${python3Packages.makePythonPath propagatedBuildInputs} + runHook postInstall + ''; + + meta = with lib; { + description = "Weaponized web shell"; + homepage = "https://github.com/epinna/weevely3"; + mainProgram = "weevely"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ d3vil0p3r ]; + }; +} diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 35d1773bec88..39044c950dce 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "werf"; - version = "2.6.2"; + version = "2.6.7"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-jZNypjCmMlDAthoLJiV/82vUbugGi4vP5SNZbasG7YE="; + hash = "sha256-nR/fEUoRWOeZih54emRAOLywhvymSp562tHLQAH2mc0="; }; - vendorHash = "sha256-x64PKLLkvHKW6lbxWSfAQ5xVy6JpGbCAslfz1seUQ2g="; + vendorHash = "sha256-Ta2owh1Z7mB4e85ZHK1maL5GoBMzM0mf3wsU6ho+4Z0="; proxyVendor = true; diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix index 72a3953c667c..be7001ca2a83 100644 --- a/pkgs/by-name/wh/whistle/package.nix +++ b/pkgs/by-name/wh/whistle/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.76"; + version = "2.9.77"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-cE9I975QOuXusuRCVyhXcHJ1ItgqPKAylNMeVTSUl9Y="; + hash = "sha256-T0w1oKQDE37Tc1BkMTpvpLEtfS18rFqjA2Z6iV+VXDA="; }; - npmDepsHash = "sha256-qqzmLr01rg6f1VpJlPrZ38BobVeAiEkiDk2jiXCpsX4="; + npmDepsHash = "sha256-d8qBiRKkKQnUiVasGHp0yPp7uF6khqKnEQZZBJHaS2k="; dontNpmBuild = true; diff --git a/pkgs/by-name/wi/wifi-qr/package.nix b/pkgs/by-name/wi/wifi-qr/package.nix index 341077edaefa..3c5a37b071b8 100644 --- a/pkgs/by-name/wi/wifi-qr/package.nix +++ b/pkgs/by-name/wi/wifi-qr/package.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , installShellFiles , makeWrapper -, gnome +, zenity , ncurses , networkmanager , patsh @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { }; buildInputs = [ - gnome.zenity + zenity ncurses networkmanager procps diff --git a/pkgs/by-name/wi/wiliwili/package.nix b/pkgs/by-name/wi/wiliwili/package.nix new file mode 100644 index 000000000000..302b47b65b4e --- /dev/null +++ b/pkgs/by-name/wi/wiliwili/package.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + wayland-scanner, + mpv-unwrapped, + openssl, + curl, + libxkbcommon, + dbus, + libffi, + wayland, + egl-wayland, + xorg, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wiliwili"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "xfangfang"; + repo = "wiliwili"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-Fl8YV7yBW9dmcpcHCDVvkAzICTopNb4zKziDkR6NEwU="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals stdenv.isLinux [ + wayland-scanner + ]; + + buildInputs = [ + mpv-unwrapped + openssl + curl + libxkbcommon + dbus + ] ++ lib.optionals stdenv.isLinux [ + libffi # needed for wayland + wayland + egl-wayland + xorg.libX11 + xorg.libXrandr + xorg.libXinerama + xorg.libXcursor + xorg.libXi + ]; + + cmakeFlags = [ + (lib.cmakeBool "PLATFORM_DESKTOP" true) + (lib.cmakeBool "INSTALL" true) + (lib.cmakeBool "GLFW_BUILD_WAYLAND" stdenv.isLinux) + (lib.cmakeBool "GLFW_BUILD_X11" stdenv.isLinux) + # Otherwise cpr cmake will try to download zlib + (lib.cmakeBool "CPR_FORCE_USE_SYSTEM_CURL" true) + ]; + + meta = { + description = "Third-party Bilibili client with a switch-like UI"; + homepage = "https://xfangfang.github.io/wiliwili"; + # https://github.com/xfangfang/wiliwili/discussions/355 + license = lib.licenses.gpl3Only; + mainProgram = "wiliwili"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = with lib.platforms; unix ++ windows; + # Testing on darwin was blocked due to broken swift + # buildInputs should still need some tweaking, but can't be sure + badPlatforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix index cf794ea44473..bd8300483052 100644 --- a/pkgs/by-name/wi/wiremock/package.nix +++ b/pkgs/by-name/wi/wiremock/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wiremock"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar"; - hash = "sha256-8nP+Qv+QZjyG0VcaBd22UIiEYsfPq/D13c+KT2700Vk="; + hash = "sha256-cEsa2xg8ZDb5/LQO5Gj+LCuV18D+LbEK7nrGT+cm158="; }; dontUnpack = true; diff --git a/pkgs/by-name/wi/wireviz/package.nix b/pkgs/by-name/wi/wireviz/package.nix index 99cb3702680e..31b33986b407 100644 --- a/pkgs/by-name/wi/wireviz/package.nix +++ b/pkgs/by-name/wi/wireviz/package.nix @@ -5,12 +5,12 @@ python3.pkgs.buildPythonApplication rec { pname = "wireviz"; - version = "0.3.2"; + version = "0.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-MBgX7dWOr3SorOJQjVlRGlSvL+A7Lg+gC1UoS3un9rU="; + hash = "sha256-lFJG0jkE42h2boCxDzXfWPmKFc2Ycqx598wPhD/jaLM="; }; nativeBuildInputs = [ @@ -19,12 +19,17 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ + click graphviz pillow pyyaml ]; - pythonImportsCheck = [ "wireviz" ]; + pythonImportsCheck = [ + "wireviz" + "wireviz.wireviz" + "wireviz.wv_cli" + ]; meta = with lib; { description = "Easily document cables and wiring harnesses"; diff --git a/pkgs/by-name/wi/witnessme/package.nix b/pkgs/by-name/wi/witnessme/package.nix index a19a387f3185..de83d1475360 100644 --- a/pkgs/by-name/wi/witnessme/package.nix +++ b/pkgs/by-name/wi/witnessme/package.nix @@ -28,10 +28,6 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - build-system = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/by-name/wo/wordlists/package.nix b/pkgs/by-name/wo/wordlists/package.nix index 0b1b7cc61622..2d7b43b3894f 100644 --- a/pkgs/by-name/wo/wordlists/package.nix +++ b/pkgs/by-name/wo/wordlists/package.nix @@ -68,6 +68,6 @@ in symlinkJoin { If you want to add a new package that provides wordlist/s the convention is to copy it to {file}`$out/share/wordlists/myNewWordlist`. ''; - maintainers = with maintainers; [ janik pamplemousse h7x4 ]; + maintainers = with maintainers; [ pamplemousse h7x4 ]; }; } diff --git a/pkgs/by-name/ws/wsrepl/package.nix b/pkgs/by-name/ws/wsrepl/package.nix index 9bab0957d5b3..9557fec2210c 100644 --- a/pkgs/by-name/ws/wsrepl/package.nix +++ b/pkgs/by-name/ws/wsrepl/package.nix @@ -19,10 +19,6 @@ python3.pkgs.buildPythonApplication rec { "textual" ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - build-system = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/by-name/wt/wtfis/package.nix b/pkgs/by-name/wt/wtfis/package.nix index ad710bf8f229..3d8e97ea80f0 100644 --- a/pkgs/by-name/wt/wtfis/package.nix +++ b/pkgs/by-name/wt/wtfis/package.nix @@ -17,10 +17,6 @@ in python3.pkgs.buildPythonApplication { format = "pyproject"; - nativeBuildInputs = [ - python3.pkgs.pythonRelaxDepsHook - ]; - propagatedBuildInputs = [ python3.pkgs.hatchling python3.pkgs.pydantic diff --git a/pkgs/by-name/wy/wyoming-satellite/package.nix b/pkgs/by-name/wy/wyoming-satellite/package.nix index cb34afc5b2f1..f23a5864b452 100644 --- a/pkgs/by-name/wy/wyoming-satellite/package.nix +++ b/pkgs/by-name/wy/wyoming-satellite/package.nix @@ -17,7 +17,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix index d2c06e36038a..2ecf6e3173c4 100644 --- a/pkgs/by-name/xa/xarcan/package.nix +++ b/pkgs/by-name/xa/xarcan/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalPackages: { pname = "xarcan"; - version = "0-unstable-2024-05-11"; + version = "0-unstable-2024-05-23"; src = fetchFromGitHub { owner = "letoram"; repo = "xarcan"; - rev = "ecc4d0a6408dfeb19934e3bfd4c382b0862c03b4"; - hash = "sha256-PmaoeemQpin5NN8I6JYOumP+PrzkyTYrqAyxxwBO9K0="; + rev = "ebb46609315d95fb286009310de11b03f7333022"; + hash = "sha256-XXA5c/yV6QaPiz1LHWkb+Tm6Wmead8EndkSk3onvrcs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xi/xivlauncher/deps.nix b/pkgs/by-name/xi/xivlauncher/deps.nix index 4f8e95ba382f..fa65ff3a7d1f 100644 --- a/pkgs/by-name/xi/xivlauncher/deps.nix +++ b/pkgs/by-name/xi/xivlauncher/deps.nix @@ -10,8 +10,6 @@ (fetchNuGet { pname = "goaaats.Steamworks"; version = "2.3.4"; sha256 = "1khxkkjvh6af60rxc13bacxn85amdfzr8z0b9a6gfg6m1fnmlkss"; }) (fetchNuGet { pname = "ImGui.NET"; version = "1.87.2"; sha256 = "0rv0n18fvz1gbh45crhzn1f8xw8zkc8qyiyj91vajjcry8mq1x7q"; }) (fetchNuGet { pname = "KeySharp"; version = "1.0.5"; sha256 = "1ic10v0a174fw6w89iyg4yzji36bsj15573y676cj5n09n6s75d4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.31"; sha256 = "0hki4z9x60vzcg53s8cxnig4g1xnpqcj629r2cg5q1xw0sknfp5d"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "050dzfy49c4jwcm8dfrz2lqbbyhmgnq485zdhpcnc3w08z0ppbs6"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.3"; sha256 = "1z6x0d8lpcfjr3sxy25493i17vvcg5bsay6c03qan6mnj5aqzw2k"; }) @@ -22,9 +20,6 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.3"; sha256 = "020214swxm0hip1d9gjskrzmqzjnji7c6l5b3xcch8vp166066m9"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.3"; sha256 = "0dpyjp0hy9kkvk2dd4dclfmb10yq5avsw2a6v8nra9g6ii2p1nla"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.31"; sha256 = "10s0p30qzfn9zibp1ldnqar87hqs47ni3rwqpvwx4jn3589cl9sn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.31"; sha256 = "19a4ainxj8jxij7ckglbmlnvrjxp72xfgx0r6lbglzh9dhsakwm7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "0pw2n3j6vbmbghda1cvkhi3c39a49xk0a4w059mfya017adl6kac"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) diff --git a/pkgs/by-name/xi/xivlauncher/package.nix b/pkgs/by-name/xi/xivlauncher/package.nix index 064bce81d8d9..86fb36532711 100644 --- a/pkgs/by-name/xi/xivlauncher/package.nix +++ b/pkgs/by-name/xi/xivlauncher/package.nix @@ -3,7 +3,7 @@ , useSteamRun ? true }: let - rev = "1.0.9"; + rev = "1.1.0"; in buildDotnetModule rec { pname = "XIVLauncher"; @@ -13,7 +13,7 @@ in owner = "goatcorp"; repo = "XIVLauncher.Core"; inherit rev; - hash = "sha256-UOKJMQPule0swwm5p6OPcOt1SYHji2J4MWvN6nGkj/M="; + hash = "sha256-vf9cGY+JvMBpQliS1LDmbWjtAbXByrIeXThKtJGQrO8="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ in # please do not unpin these even if they match the defaults, xivlauncher is sensitive to .NET versions dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; dotnetFlags = [ "-p:BuildHash=${rev}" @@ -52,7 +52,7 @@ in }).run; in '' substituteInPlace $out/bin/XIVLauncher.Core \ - --replace 'exec' 'exec ${steam-run}/bin/steam-run' + --replace-fail 'exec' 'exec ${steam-run}/bin/steam-run' '') + '' wrapProgram $out/bin/XIVLauncher.Core --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" # the reference to aria2 gets mangled as UTF-16LE and isn't detectable by nix: https://github.com/NixOS/nixpkgs/issues/220065 diff --git a/pkgs/by-name/xo/xonsh/package.nix b/pkgs/by-name/xo/xonsh/package.nix index 45c14cb4f2ef..60b96dd67f24 100644 --- a/pkgs/by-name/xo/xonsh/package.nix +++ b/pkgs/by-name/xo/xonsh/package.nix @@ -111,7 +111,7 @@ let changelog = "https://github.com/xonsh/xonsh/raw/main/CHANGELOG.rst"; license = with lib.licenses; [ bsd3 ]; mainProgram = "xonsh"; - maintainers = with lib.maintainers; [ AndersonTorres samlukeyes123 ]; + maintainers = with lib.maintainers; [ samlukeyes123 ]; }; }; in diff --git a/pkgs/by-name/xs/xsct/package.nix b/pkgs/by-name/xs/xsct/package.nix index 8e384f8ef978..20bcbd76f71e 100644 --- a/pkgs/by-name/xs/xsct/package.nix +++ b/pkgs/by-name/xs/xsct/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xsct"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "faf0"; repo = "sct"; - rev = finalAttrs.version; - hash = "sha256-PDkbZTtl14wYdfALv43SIU9MKhbfiYlRqkI1mFn1qa4="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-L93Gk7/jcRoUWogWhrOiBvWCCj+EbyGKxBR5oOVjPPU="; }; buildInputs = [ @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Set color temperature of screen"; mainProgram = "xsct"; homepage = "https://github.com/faf0/sct"; + changelog = "https://github.com/faf0/sct/blob/${finalAttrs.version}/CHANGELOG"; license = licenses.unlicense; maintainers = with maintainers; [ OPNA2608 ]; platforms = with platforms; linux ++ freebsd ++ openbsd; diff --git a/pkgs/development/libraries/xsimd/disable-test_error_gamma.patch b/pkgs/by-name/xs/xsimd/disable-test_error_gamma.patch similarity index 100% rename from pkgs/development/libraries/xsimd/disable-test_error_gamma.patch rename to pkgs/by-name/xs/xsimd/disable-test_error_gamma.patch diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/by-name/xs/xsimd/package.nix similarity index 82% rename from pkgs/development/libraries/xsimd/default.nix rename to pkgs/by-name/xs/xsimd/package.nix index 019b3afbefc8..8f8c72bc3f6a 100644 --- a/pkgs/development/libraries/xsimd/default.nix +++ b/pkgs/by-name/xs/xsimd/package.nix @@ -28,10 +28,17 @@ stdenv.mkDerivation (finalAttrs: { ./disable-test_error_gamma.patch ]; + # strictDeps raises the chance that xsimd will be able to be cross compiled + strictDeps = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ + doctest + ]; + cmakeFlags = [ # Always build the tests, even if not running them, because testing whether # they can be built is a test in itself. @@ -39,12 +46,12 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = true; - nativeCheckInputs = [ - doctest - ]; checkTarget = "xtest"; meta = with lib; { + changelog = "https://github.com/xtensor-stack/xsimd/blob/${finalAttrs.version}/Changelog.rst#${ + builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version + }"; description = "C++ wrappers for SIMD intrinsics"; homepage = "https://github.com/xtensor-stack/xsimd"; license = licenses.bsd3; diff --git a/pkgs/by-name/xw/xwayland-run/package.nix b/pkgs/by-name/xw/xwayland-run/package.nix index f15812d9c5f1..b229c66df918 100644 --- a/pkgs/by-name/xw/xwayland-run/package.nix +++ b/pkgs/by-name/xw/xwayland-run/package.nix @@ -49,6 +49,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with lib; { + changelog = "https://gitlab.freedesktop.org/ofourdan/xwayland-run/-/releases/${src.rev}"; description = "Set of small utilities revolving around running Xwayland and various Wayland compositor headless"; homepage = "https://gitlab.freedesktop.org/ofourdan/xwayland-run"; license = licenses.gpl2Only; diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix new file mode 100644 index 000000000000..bf8f60dc095f --- /dev/null +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -0,0 +1,56 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, xwayland +, xcb-util-cursor +, libxcb +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "xwayland-satellite"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "Supreeeme"; + repo = "xwayland-satellite"; + rev = "v${version}"; + hash = "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI="; + }; + + cargoHash = "sha256-nKPSkHbh73xKWNpN/OpDmLnVmA3uygs3a+ejOhwU3yA="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + xwayland + libxcb + xcb-util-cursor + ]; + + # disable Xwayland integration tests which need a running display server + checkFlags = [ + "--exact" + "--skip=copy_from_wayland" + "--skip=copy_from_x11" + "--skip=input_focus" + "--skip=quick_delete" + "--skip=reparent" + "--skip=toplevel_flow" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Rootless Xwayland integration to any Wayland compositor implementing xdg_wm_base"; + homepage = "https://github.com/Supreeeme/xwayland-satellite"; + license = licenses.mpl20; + maintainers = with maintainers; [ if-loop69420 ]; + mainProgram = "xwayland-satellite"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index 73f8e884c91b..34cc939e372b 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.63"; + version = "0.1.64"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-BxLFWIbRNYSGWVoPyOH2VaudVQQ/PCloBqQZM9MYg2s="; + hash = "sha256-VrcY0bZWQ+sEQQ5UxW3aQfjZfQ1rJNqYN+O4Ecs45KA="; }; executable = "ys"; diff --git a/pkgs/by-name/ya/yanic/package.nix b/pkgs/by-name/ya/yanic/package.nix index 33384aa727d7..4784d98dccc3 100644 --- a/pkgs/by-name/ya/yanic/package.nix +++ b/pkgs/by-name/ya/yanic/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "yanic"; - version = "1.5.2"; + version = "1.6.1"; src = fetchFromGitHub { owner = "FreifunkBremen"; repo = "yanic"; rev = "v${version}"; - sha256 = "sha256-UxTlo8HkC5iTfcfTAlhSkRQo8QJhI03JDSSItuE7BCE="; + sha256 = "sha256-tXngAnq30xBxR1dpVbE4kMNhvX2Rt5D22EBytB6qHUI="; }; - vendorHash = "sha256-D9V53/+C/+iv1U4kVrYWzJ8iD0MA1QcR8f5ifejFhLo="; + vendorHash = "sha256-6UiiajKLzW5e7y0F6GMYDZP6xTyOiccLIKlwvOY7LRo="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/emulators/yapesdl/default.nix b/pkgs/by-name/ya/yapesdl/package.nix similarity index 62% rename from pkgs/applications/emulators/yapesdl/default.nix rename to pkgs/by-name/ya/yapesdl/package.nix index 652b2cff3488..44bb2a0dbaf8 100644 --- a/pkgs/applications/emulators/yapesdl/default.nix +++ b/pkgs/by-name/ya/yapesdl/package.nix @@ -1,22 +1,24 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, SDL2 +{ + lib, + SDL2, + fetchFromGitHub, + pkg-config, + stdenv, }: stdenv.mkDerivation (finalAttrs: { pname = "yapesdl"; - version = "0.71.2"; + version = "0.80.1"; src = fetchFromGitHub { owner = "calmopyrin"; repo = "yapesdl"; rev = "v${finalAttrs.version}"; - hash = "sha256-QGF3aS/YSzdGxHONKyA/iTewEVYsjBAsKARVMXkFV2k="; + hash = "sha256-VCjxdVatu1h6VNMkLYL8Nknwn7ax0J2OhO1bc7dnQRA="; }; nativeBuildInputs = [ + SDL2 pkg-config ]; @@ -26,20 +28,25 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "CC=${stdenv.cc.targetPrefix}c++" ]; + outputs = [ "out" "doc" ]; + + strictDeps = true; + installPhase = '' runHook preInstall - install -Dm755 yapesdl -t $out/bin/ - install -Dm755 README.SDL -t $out/share/doc/yapesdl/ + install -Dm755 yapesdl -t ''${!outputBin}/bin/ + install -Dm755 README.SDL -t ''${!outputDoc}/share/doc/yapesdl/ runHook postInstall ''; meta = { homepage = "http://yape.plus4.net/"; description = "Multiplatform Commodore 64 and 264 family emulator"; + changelog = "https://github.com/calmopyrin/yapesdl/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl2Plus; + mainProgram = "yapesdl"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; broken = stdenv.isDarwin; - mainProgram = "yapesdl"; }; }) diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index 4e831ec920e4..81db3bed5376 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform , cmake @@ -9,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "yara-x"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; rev = "refs/tags/v${version}"; - hash = "sha256-N82s6SEQerAVjtOL4o/AmT184fWKTETmZEpKYt7Piv0="; + hash = "sha256-/5UYweF/+oshJlZaTnbr1TJMYgenRZmb8EZudyxcTU0="; }; - cargoHash = "sha256-1lfkG9SsnnUzEZaIxeMxhaRmLAGLB3J0UMfWXHJcmUo="; + cargoHash = "sha256-BXYegw1Rl8HvUxlBg3xwF3ZJemzJnJZPoPNMXYBgoF0="; nativeBuildInputs = [ cmake installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd yr \ --bash <($out/bin/yr completion bash) \ --fish <($out/bin/yr completion fish) \ diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index 77a9b9ad8b5b..a9b89f1bd870 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -1,13 +1,14 @@ -{ rustPlatform -, fetchFromGitHub -, lib +{ + rustPlatform, + fetchFromGitHub, + lib, -, installShellFiles -, stdenv -, Foundation -, rust-jemalloc-sys + installShellFiles, + stdenv, + Foundation, + rust-jemalloc-sys, -, nix-update-script + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -25,6 +26,14 @@ rustPlatform.buildRustPackage rec { env.YAZI_GEN_COMPLETIONS = true; + # TODO: remove in the next release + cargoBuildFlags = [ + "-p" + "yazi-fm" + "-p" + "yazi-cli" + ]; + nativeBuildInputs = [ installShellFiles ]; buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; @@ -44,7 +53,12 @@ rustPlatform.buildRustPackage rec { description = "Blazing fast terminal file manager written in Rust, based on async I/O"; homepage = "https://github.com/sxyazi/yazi"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ xyenon matthiasbeyer linsui ]; + maintainers = with lib.maintainers; [ + xyenon + matthiasbeyer + linsui + eljamm + ]; mainProgram = "yazi"; }; } diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix index 276d0251710b..a6b2d5ca9498 100644 --- a/pkgs/by-name/ya/yazi/package.nix +++ b/pkgs/by-name/ya/yazi/package.nix @@ -1,89 +1,94 @@ -{ lib -, runCommand -, makeWrapper -, yazi-unwrapped +{ + lib, + formats, + runCommand, + makeWrapper, -, withRuntimeDeps ? true -, withFile ? true -, file -, withJq ? true -, jq -, withPoppler ? true -, poppler_utils -, withUnar ? true -, unar -, withFfmpegthumbnailer ? true -, ffmpegthumbnailer -, withFd ? true -, fd -, withRipgrep ? true -, ripgrep -, withFzf ? true -, fzf -, withZoxide ? true -, zoxide -, settings ? { } -, formats -, plugins ? { } -, flavors ? { } -, initLua ? null + extraPackages ? [ ], + optionalDeps ? [ + jq + poppler_utils + unar + ffmpegthumbnailer + fd + ripgrep + fzf + zoxide + ], + + # deps + file, + yazi-unwrapped, + + # optional deps + jq, + poppler_utils, + unar, + ffmpegthumbnailer, + fd, + ripgrep, + fzf, + zoxide, + + settings ? { }, + plugins ? { }, + flavors ? { }, + initLua ? null, }: let - runtimePaths = with lib; - [ ] - ++ optional withFile file - ++ optional withJq jq - ++ optional withPoppler poppler_utils - ++ optional withUnar unar - ++ optional withFfmpegthumbnailer ffmpegthumbnailer - ++ optional withFd fd - ++ optional withRipgrep ripgrep - ++ optional withFzf fzf - ++ optional withZoxide zoxide; + runtimePaths = [ file ] ++ optionalDeps ++ extraPackages; settingsFormat = formats.toml { }; - files = [ "yazi" "theme" "keymap" ]; + files = [ + "yazi" + "theme" + "keymap" + ]; - configHome = if (settings == { } && initLua == null && plugins == { } && flavors == { }) then null else - runCommand "YAZI_CONFIG_HOME" { } '' - mkdir -p $out - ${lib.concatMapStringsSep - "\n" - (name: lib.optionalString (settings ? ${name} && settings.${name} != { }) '' - ln -s ${settingsFormat.generate "${name}.toml" settings.${name}} $out/${name}.toml - '') - files} + configHome = + if (settings == { } && initLua == null && plugins == { } && flavors == { }) then + null + else + runCommand "YAZI_CONFIG_HOME" { } '' + mkdir -p $out + ${lib.concatMapStringsSep "\n" ( + name: + lib.optionalString (settings ? ${name} && settings.${name} != { }) '' + ln -s ${settingsFormat.generate "${name}.toml" settings.${name}} $out/${name}.toml + '' + ) files} - mkdir $out/plugins - ${lib.optionalString (plugins != { }) '' - ${lib.concatStringsSep - "\n" - (lib.mapAttrsToList (name: value: "ln -s ${value} $out/plugins/${name}") plugins)} - ''} + mkdir $out/plugins + ${lib.optionalString (plugins != { }) '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: value: "ln -s ${value} $out/plugins/${name}") plugins + )} + ''} - mkdir $out/flavors - ${lib.optionalString (flavors != { }) '' - ${lib.concatStringsSep - "\n" - (lib.mapAttrsToList (name: value: "ln -s ${value} $out/flavors/${name}") flavors)} - ''} + mkdir $out/flavors + ${lib.optionalString (flavors != { }) '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: value: "ln -s ${value} $out/flavors/${name}") flavors + )} + ''} - ${lib.optionalString (initLua != null) "ln -s ${initLua} $out/init.lua"} - ''; + ${lib.optionalString (initLua != null) "ln -s ${initLua} $out/init.lua"} + ''; in -if (!withRuntimeDeps && configHome == null) then yazi-unwrapped else runCommand yazi-unwrapped.name -{ - inherit (yazi-unwrapped) pname version meta; + { + inherit (yazi-unwrapped) pname version meta; - nativeBuildInputs = [ makeWrapper ]; -} '' - mkdir -p $out/bin - ln -s ${yazi-unwrapped}/share $out/share - makeWrapper ${yazi-unwrapped}/bin/yazi $out/bin/yazi \ - ${lib.optionalString withRuntimeDeps "--prefix PATH : \"${lib.makeBinPath runtimePaths}\""} \ - ${lib.optionalString (configHome != null) "--set YAZI_CONFIG_HOME ${configHome}"} -'' + nativeBuildInputs = [ makeWrapper ]; + } + '' + mkdir -p $out/bin + ln -s ${yazi-unwrapped}/share $out/share + ln -s ${yazi-unwrapped}/bin/ya $out/bin/ya + makeWrapper ${yazi-unwrapped}/bin/yazi $out/bin/yazi \ + --prefix PATH : ${lib.makeBinPath runtimePaths} \ + ${lib.optionalString (configHome != null) "--set YAZI_CONFIG_HOME ${configHome}"} + '' diff --git a/pkgs/desktops/gnome/core/yelp-xsl/default.nix b/pkgs/by-name/ye/yelp-xsl/package.nix similarity index 96% rename from pkgs/desktops/gnome/core/yelp-xsl/default.nix rename to pkgs/by-name/ye/yelp-xsl/package.nix index e440df2423bf..572f68a923a8 100644 --- a/pkgs/desktops/gnome/core/yelp-xsl/default.nix +++ b/pkgs/by-name/ye/yelp-xsl/package.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/by-name/ye/yelp/package.nix similarity index 93% rename from pkgs/desktops/gnome/core/yelp/default.nix rename to pkgs/by-name/ye/yelp/package.nix index c5bb44b46f01..7d9549d97093 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/by-name/ye/yelp/package.nix @@ -8,12 +8,14 @@ , libhandy , glib , gnome +, adwaita-icon-theme , sqlite , itstool , libxml2 , libxslt , gst_all_1 , wrapGAppsHook3 +, yelp-xsl }: stdenv.mkDerivation rec { @@ -40,8 +42,8 @@ stdenv.mkDerivation rec { sqlite libxml2 libxslt - gnome.yelp-xsl - gnome.adwaita-icon-theme + yelp-xsl + adwaita-icon-theme gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix index 9695dd3e0a8f..91435544c84d 100644 --- a/pkgs/by-name/yo/youtrack/package.nix +++ b/pkgs/by-name/yo/youtrack/package.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "youtrack"; - version = "2024.2.34646"; + version = "2024.2.35942"; src = fetchzip { url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip"; - hash = "sha256-9htjtB1TC+p+eETsXH5B36NKnZsFA/Og/PIW9gHQefc="; + hash = "sha256-JK6MQ2M+isJz/kCbJAtJ4ADZkkixzXehTORl7n/4QDk="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/yu/yutto/package.nix b/pkgs/by-name/yu/yutto/package.nix index b225dbf803ba..eb5b983e8f96 100644 --- a/pkgs/by-name/yu/yutto/package.nix +++ b/pkgs/by-name/yu/yutto/package.nix @@ -1,13 +1,14 @@ -{ lib -, python3Packages -, fetchFromGitHub -, ffmpeg -, nix-update-script +{ + lib, + python3Packages, + fetchFromGitHub, + ffmpeg, + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "yutto"; - version = "2.0.0-beta.37"; + version = "2.0.0-beta.40"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.9"; @@ -16,21 +17,22 @@ python3Packages.buildPythonApplication rec { owner = "yutto-dev"; repo = "yutto"; rev = "v${version}"; - hash = "sha256-daRuFYfR3FjvhVsQM1FXI19iOH+bukh6WxfH5O+CFk4="; + hash = "sha256-gopCQ8tEhwtDFs/w+jafD3ZW/4MIrYxPcMh8SbOCwww="; }; - nativeBuildInputs = with python3Packages; [ - poetry-core - ]; + nativeBuildInputs = with python3Packages; [ poetry-core ]; - propagatedBuildInputs = with python3Packages; [ - httpx - aiofiles - biliass - dict2xml - colorama - typing-extensions - ] ++ (with httpx.optional-dependencies; http2 ++ socks); + propagatedBuildInputs = + with python3Packages; + [ + httpx + aiofiles + biliass + dict2xml + colorama + typing-extensions + ] + ++ (with httpx.optional-dependencies; http2 ++ socks); preFixup = '' makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}) @@ -39,7 +41,10 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "yutto" ]; passthru.updateScript = nix-update-script { - extraArgs = [ "--version" "unstable" ]; + extraArgs = [ + "--version" + "unstable" + ]; }; meta = with lib; { diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index a9875eccc05f..be95732a6fff 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -113,6 +113,10 @@ rustPlatform.buildRustPackage rec { ] ); + cargoBuildFlags = [ + "--package=zed" + "--package=cli" + ]; buildFeatures = [ "gpui/runtime_shaders" ]; env = { @@ -129,8 +133,8 @@ rustPlatform.buildRustPackage rec { gpu-lib = if withGLES then libglvnd else vulkan-loader; postFixup = lib.optionalString stdenv.isLinux '' - patchelf --add-rpath ${gpu-lib}/lib $out/bin/* - patchelf --add-rpath ${wayland}/lib $out/bin/* + patchelf --add-rpath ${gpu-lib}/lib $out/libexec/* + patchelf --add-rpath ${wayland}/lib $out/libexec/* ''; checkFlags = lib.optionals stdenv.hostPlatform.isLinux [ @@ -138,19 +142,29 @@ rustPlatform.buildRustPackage rec { "--skip=test_open_paths_action" ]; - postInstall = '' + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/libexec + cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/zed $out/libexec/zed-editor + cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $out/bin/zed + install -D ${src}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png install -D ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png - # extracted from https://github.com/zed-industries/zed/blob/v0.141.2/script/bundle-linux + # extracted from https://github.com/zed-industries/zed/blob/v0.141.2/script/bundle-linux (envsubst) + # and https://github.com/zed-industries/zed/blob/v0.141.2/script/install.sh (final desktop file name) ( export DO_STARTUP_NOTIFY="true" export APP_CLI="zed" export APP_ICON="zed" export APP_NAME="Zed" + export APP_ARGS="%U" mkdir -p "$out/share/applications" - ${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/zed.desktop" + ${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/dev.zed.Zed.desktop" ) + + runHook postInstall ''; passthru.updateScript = nix-update-script { diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/by-name/ze/zenity/package.nix similarity index 96% rename from pkgs/desktops/gnome/core/zenity/default.nix rename to pkgs/by-name/ze/zenity/package.nix index aa98b8c83320..b9e43a42b27b 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/by-name/ze/zenity/package.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "zenity"; - attrPath = "gnome.zenity"; }; }; diff --git a/pkgs/by-name/zl/zluda/package.nix b/pkgs/by-name/zl/zluda/package.nix index 2e1088887b47..c2b7d745040b 100644 --- a/pkgs/by-name/zl/zluda/package.nix +++ b/pkgs/by-name/zl/zluda/package.nix @@ -73,6 +73,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "ZLUDA - CUDA on Intel GPUs"; homepage = "https://github.com/vosen/ZLUDA"; + changelog = "https://github.com/vosen/ZLUDA/releases/tag/${src.rev}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.errnoh diff --git a/pkgs/by-name/zm/zmkBATx/package.nix b/pkgs/by-name/zm/zmkBATx/package.nix index 82e49e99c95e..e956effbe8b3 100644 --- a/pkgs/by-name/zm/zmkBATx/package.nix +++ b/pkgs/by-name/zm/zmkBATx/package.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Battery monitoring for ZMK split keyboards"; longDescription = "Opensource tool for peripheral battery monitoring zmk split keyboard over BLE for linux."; homepage = "https://github.com/mh4x0f/zmkBATx"; + changelog = "https://github.com/mh4x0f/zmkBATx/releases/tag/${finalAttrs.src.rev}"; license = licenses.mit; mainProgram = "zmkbatx"; platforms = platforms.linux; diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index 9ba51b15abad..9cdbf06294ca 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zpaqfranz"; - version = "59.9"; + version = "60.1"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-1TmJHksFeiDjkIslA9FAZrWElgfCV1HOtS7H2pq8sHY="; + hash = "sha256-XvT1Ldle1RqSuMJEG+DuVaUx3MWEDqpEmgQC9L9zqE4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/zs/zsh-zhooks/package.nix b/pkgs/by-name/zs/zsh-zhooks/package.nix index 1fea11eb4e6a..f787f4eb4309 100644 --- a/pkgs/by-name/zs/zsh-zhooks/package.nix +++ b/pkgs/by-name/zs/zsh-zhooks/package.nix @@ -1,11 +1,11 @@ { lib, - stdenv, + stdenvNoCC, fetchFromGitHub, }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "zsh-zhooks"; - version = "0-unstable-10-31-2021"; + version = "0-unstable-2021-10-31"; src = fetchFromGitHub { owner = "agkozak"; @@ -17,7 +17,9 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' + runHook preInstall install -m755 -D zhooks.plugin.zsh --target-directory $out/share/zsh/zhooks + runHook postInstall ''; meta = { @@ -29,5 +31,6 @@ stdenv.mkDerivation { hook arrays (such as precmd_functions). ''; maintainers = [ lib.maintainers.fidgetingbits ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/zw/zwave-js-server/package.nix b/pkgs/by-name/zw/zwave-js-server/package.nix index dfdf0ce3072f..4a51af0abefb 100644 --- a/pkgs/by-name/zw/zwave-js-server/package.nix +++ b/pkgs/by-name/zw/zwave-js-server/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "zwave-js-server"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "zwave-js"; repo = pname; rev = version; - hash = "sha256-9TUS8m3Vizs36GVYaDQTRXPO8zLLJUs8RPkArRRCqsw="; + hash = "sha256-+GyQy7CVd3t98kUDTpPzmPs5WNU8Ct/e+kHPh08gb0Q="; }; - npmDepsHash = "sha256-zTcN04g7EsLFCA+rdqhSQMy06NoMFYCyiUxe9ck2kIE="; + npmDepsHash = "sha256-u9Y9yOLZZ+DnFYAAhF0SUa+qW+Mj+3duzAKKS6xCkp0="; # For some reason the zwave-js dependency is in devDependencies npmFlags = [ "--include=dev" ]; diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index adb735c38a1e..e934271b1671 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stdman"; - version = "2022.07.30"; + version = "2024.07.05"; src = fetchFromGitHub { owner = "jeaye"; repo = "stdman"; rev = version; - sha256 = "sha256-ABogxVQS6p3wUV8GuB2tp7vMxe63t51dNoclEnYpa/0="; + sha256 = "sha256-/yJqKwJHonnBkP6/yQQJT3yPyYO6/nFAf4XFrgl3L0A="; }; outputDevdoc = "out"; diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix index 1c3f6ab49141..2c48756413fa 100644 --- a/pkgs/data/fonts/creep/default.nix +++ b/pkgs/data/fonts/creep/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/romeovs/creep"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ buffet ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index a5ffc2ec33a5..dc990b6e42db 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -4,6 +4,8 @@ , python3 , config , acceptLicense ? config.input-fonts.acceptLicense or false +, parallel +, writeShellApplication }: let @@ -44,17 +46,28 @@ stdenv.mkDerivation rec { sha256 = "BESZ4Bjgm2hvQ7oPpMvYSlE8EqvQjqHZtXWIovqyIzA="; stripRoot = false; - postFetch = '' - # Reset the timestamp to release date for determinism. - PATH=${lib.makeBinPath [ python3.pkgs.fonttools ]}:$PATH - for ttf_file in $out/Input_Fonts/*/*/*.ttf; do - ttx_file=$(dirname "$ttf_file")/$(basename "$ttf_file" .ttf).ttx - ttx "$ttf_file" - rm "$ttf_file" - touch -m -t ${builtins.replaceStrings [ "-" ] [ "" ] releaseDate}0000 "$ttx_file" - ttx --recalc-timestamp "$ttx_file" - rm "$ttx_file" - done + # Reset the timestamp to release date for determinism. + postFetch = let + ttf-fixup = writeShellApplication { + name = "ttf-fixup"; + runtimeInputs = [ python3.pkgs.fonttools ]; + text = '' + if [ $# != 1 ]; then + echo "Usage: $0 : Resets timestamp on for determinism" >&2 + exit 1 + fi + + ttf_file="$1" + ttx_file=$(dirname "$ttf_file")/$(basename "$ttf_file" .ttf).ttx + ttx "$ttf_file" + rm "$ttf_file" + touch -m -t ${builtins.replaceStrings [ "-" ] [ "" ] releaseDate}0000 "$ttx_file" + ttx --recalc-timestamp "$ttx_file" + rm "$ttx_file" + ''; + }; + in '' + find $out/Input_Fonts -type f -name '*.ttf' -print0 | ${lib.getExe parallel} -0 -j $NIX_BUILD_CORES ${lib.getExe ttf-fixup} {} ''; }; diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 37fe1795bfa1..aa57e7454287 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "30.3.0"; + version = "30.3.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 7d4bae07081f..b684843c34a2 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "30.3.0"; + version = "30.3.2"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-GzIyDQchi8o4CGQexkQez2sqqI0IEBy/nppqyXlad8U="; + hash = "sha256-Ksd1REqCe+42hpIwikIeKNYIYaHc5hqxuny8lYRuQcY="; }; - npmDepsHash = "sha256-SKYxEilEvNu+Tc6ytEjjfE5gl1hFiIoE9YP7IwaDzKg="; + npmDepsHash = "sha256-8IyQK1eoVwq6E/HZkavLSRXiZst3LuyDIPc8D/yMD9E="; nativeBuildInputs = [ remarshal diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 26a4439c4dc5..34e81eec1ef8 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "10vg87ifnx48vxmrcn0nz43lri10dzpgl24qfaj6vg1nwbywag3c"; - IosevkaAile = "1gym03y63x92vzisdy2x9sx3qbxvvpd70q6krlfp5zf7d3cph7fg"; - IosevkaCurly = "0bvdp99ybv0agx4n2qn78jsv8x8m86i44zvgp2h93lnji6dv67s7"; - IosevkaCurlySlab = "1mskl851z5wp3wwsxapbnq3gaarnmh4if0q6m7y3wb0c18s18f92"; - IosevkaEtoile = "10ccailwfmfjxzvk9lbns989dixqjbfdkw5j3fdkxvny07qviq54"; - IosevkaSlab = "0wnmm8hm4mis0pbqfma3qcd3rx08wgqi4f6ixg58vd9ds7a7rg8f"; - IosevkaSS01 = "19fhvx7r48mkzgadzpf1dh9w331cnjig70kyw8jzib9rlhca7y38"; - IosevkaSS02 = "0idwdmnfgq88l2rhlmlqkfbkrqhz35jqp902qc18sdwprwmj7kpz"; - IosevkaSS03 = "17scd42b67fylh5ws463793p3lakxhip8vfdk0z85z27x0yg97cc"; - IosevkaSS04 = "0p2bqkxnghkmvk84nb30vn3wl1ivfzb9s508hm0m3nzgj67mljf0"; - IosevkaSS05 = "0d6jfp83wcwx6v3rizss6z43kainv5zlrnsaya1m1n7qmpxgrj3p"; - IosevkaSS06 = "1b7s6ki4k0qqszznmsgf28vhqmx8vr3d1glbb87vqzgm59hfpcyk"; - IosevkaSS07 = "0hzf4byciw745gwzgr88pb5plaxrml5av4af84dw7qp1j4wzbamd"; - IosevkaSS08 = "0yismsjpgmb9s5rfvp4bz4dym48885pl7gf2mcv9dxwcly4wax5j"; - IosevkaSS09 = "1zcylrrs2q5w6160hd160ismmhjm835ki2j5r3axxzas9va6la4z"; - IosevkaSS10 = "0vh5nax33i0drw86vp2l13p5g13dfcc2py794spjda72pkdzvfiy"; - IosevkaSS11 = "12iw2vl0pz1bj2wnqjf9471rbg8bqrym56ziimdzknv5id033fbs"; - IosevkaSS12 = "017ipava1n37lyxd3a11rnabjjv28l975h1c2l2nramaqqa5pszx"; - IosevkaSS13 = "16mk6dc6rn362m1432fklllaqjadnlbdhl3faddlrf3mklwm1wlc"; - IosevkaSS14 = "0gzl2r4g3xn6y349wvr572s8cvc0cn7zyfp0s88pmnj632i5y0d9"; - IosevkaSS15 = "0rr15v2gyn01k4l4wq7w7fd3vqssnk03nf7zj4nf8f1az7dxskmh"; - IosevkaSS16 = "17l32p6yx888g4dgkbw8nj54d4a3b8rnqb5w2vaiickns851yh9c"; - IosevkaSS17 = "1rsrqbw1azwl0j0h88zlvsc0q0rlamw8j3kz910nsk3l4b8nicy4"; - IosevkaSS18 = "0l42b9zwm6xddf69lp1z273md3008a9gz8dnvf09ig6bmw1vp1rk"; - SGr-Iosevka = "0yda9880sg7jk5j1n36ji4w68l24s9prpaniya0jjyprylwfs7sh"; - SGr-IosevkaCurly = "1q2kmzjgxkhqwrai1zn3nhv0rf4xfi2f93j3w9zwlqc15v7ngn38"; - SGr-IosevkaCurlySlab = "1j170hxlk168hspnip9qvwjp44jb7i15swia8xy7ccb7jh6x28c8"; - SGr-IosevkaFixed = "1gmgwwa5rfqclncal5mir2iksirxzfjmfbcpn7qn4qhq9wms1j7x"; - SGr-IosevkaFixedCurly = "1ici7jgfzm4ivxvz6890r2ij3r686m9ikd0wy60bh13gp09h16dw"; - SGr-IosevkaFixedCurlySlab = "1cfkxcbdfaq0pk7ikdzqmkq1zwc542kzsc4rrns8sd9j2qzdi1bk"; - SGr-IosevkaFixedSlab = "0fvkcdfkzzc8dsx0cwcdk1l8qdaadnxdghkv6s8xdsj2q47dk20b"; - SGr-IosevkaFixedSS01 = "1j3v88j7a3r01a2q0g41k5w1dfy58igx2bvs0rlngvrhcyphdp4b"; - SGr-IosevkaFixedSS02 = "02sj966nsr9ck4kl77319lxikly96k83r27hxdyfhxmig7q4965l"; - SGr-IosevkaFixedSS03 = "1c50zshmg09g7z3zzdkdmj7slpvj59nl40k2dxwrldnyfvjpzxvb"; - SGr-IosevkaFixedSS04 = "03jb49rgx06wm13mb2b8gg6xpfj9nh8yh49ki8ybb4ivwmym3pfg"; - SGr-IosevkaFixedSS05 = "0ng7kmq8x4dllgbv7xnw0s5cnigm71q65vbszfdda6dzkgf0vhxz"; - SGr-IosevkaFixedSS06 = "021330rsnbnizxp36aaq4478vdi378vfypsan58k8cnl4nfsqygf"; - SGr-IosevkaFixedSS07 = "1b07d7srv6is7rx9f2hxd45jjg3yi07hr3xxqk0sssa0i8x79r85"; - SGr-IosevkaFixedSS08 = "00jihg0hks0aqqa4m6cgq7p5anpvhn1jr16rh4iycxc8m22wh90i"; - SGr-IosevkaFixedSS09 = "0m1j23wrgh56avcgl22lff4jqzhajcwwx7f56wh4kc173d1r8k9m"; - SGr-IosevkaFixedSS10 = "0g9g2bxl51y9rd3ag3vy0aslz3pw6f21mhpxyshcjl3558yqqly8"; - SGr-IosevkaFixedSS11 = "0h0wayawf7hf4vda5widcm92lfwrhb26kb258xs6w5vqc8vp3g96"; - SGr-IosevkaFixedSS12 = "0g6b0f6wsv0sgpdip2la44wxm3xxyxaq95vj9jiw43pdhrm2q5nz"; - SGr-IosevkaFixedSS13 = "0hzs4svcb8scnag1822vgx4fsrg684nl56wxgmlp6db5121p6xlx"; - SGr-IosevkaFixedSS14 = "09xlcsajfrwz2ji0klzp534vwp94wfawl2ixcc9x0whira867zbc"; - SGr-IosevkaFixedSS15 = "0pzjw32ffqsbw51msnr62b87hlqlpwz6nk98wy69dixx5jjqiv9c"; - SGr-IosevkaFixedSS16 = "04hcm1xb58qbsxf93qp18j4xk0x0ir1gmc1mz80xy38kvdn2l33h"; - SGr-IosevkaFixedSS17 = "0n8l3a5hmy907c1ysn8a6ada2v3wgb1pcv2bbdrzklcic0ww1zj8"; - SGr-IosevkaFixedSS18 = "0gjw1qk2ygxnd91vd107biarzrpfxpc3hflwa3aqpaga1qxc3f4p"; - SGr-IosevkaSlab = "18v5yayks1mnag9avgdslih8j9j8z9f4ygwjjs2mwwws547m9438"; - SGr-IosevkaSS01 = "188j0i31bzzyqzqly4hxbil5q9ccnv444285bv84vn9wivqgc44p"; - SGr-IosevkaSS02 = "052h4w9n8anfsjmh3q8i4aycg0qfx1l59wy7ag0fncl8r2ynw95m"; - SGr-IosevkaSS03 = "0d2xg6l63sp6yrb2vjh4wbb5jfw2ad8dm9f8hbigs5yqvb3762if"; - SGr-IosevkaSS04 = "0r08iay0i8z2hsp154j9grvyd3k2njjmad35q1h6yxmhawz63hzg"; - SGr-IosevkaSS05 = "0ds2cf96d9nbjhj5qj319a8pg162ia48rx2dk6kd019ijgciwcqf"; - SGr-IosevkaSS06 = "0a7vvplb39szmfj46fx1g5rql60my02akn37hrb228bcnrrhcskx"; - SGr-IosevkaSS07 = "1mar641pj2g9f9ap88j28zbmw7p015dahh35395720x7f7jk9y2b"; - SGr-IosevkaSS08 = "05y7ixzgngszkdrh1bv7idp0hwlrb4gn0sjl9m3hddd9rxs5bjqn"; - SGr-IosevkaSS09 = "1c83aiqqdcscgdih4m119jk6805j06jk6sn87dd81aybm0rdir13"; - SGr-IosevkaSS10 = "145d699f4s8z01fwdssmhcc60n6s84sd156yy17jgspazgp227mv"; - SGr-IosevkaSS11 = "0sqj7dbdk74ahxi17bdydqkyrdm3si2zr0q7fl8lj5v61x8kxg5g"; - SGr-IosevkaSS12 = "0l4ym9gr2d53hifhvf76r0w1s1rwxkniv9fgdb65saj6a2vd49f4"; - SGr-IosevkaSS13 = "03ygs3bj65mzyn9hyd663wc19a9jr6g11l9gdr8qn54v38g0brdb"; - SGr-IosevkaSS14 = "1pwwhnhjbswgyjmn54jnnz4vb4zvzc891vpd8lc029g0h80zm0j8"; - SGr-IosevkaSS15 = "0qa7m038d5vjrfxwmm9pvcs0r63ahqz1hxgv13bik4p2bifbq361"; - SGr-IosevkaSS16 = "12wpv1cjks0zxrv4a3fvsqzmwqk8rwrjxwc00dhl5rhgkk1mn51f"; - SGr-IosevkaSS17 = "04n13qlxiavzax85lrl5dr2a7wlqk1yjyl274hsjrw7cxghjjd30"; - SGr-IosevkaSS18 = "0ymh6vgs9gcsv2l7hx66gplq1x60hy582iwy33w3kp9nvinxm21k"; - SGr-IosevkaTerm = "17a1rv7awksy3fjs3m6qj365js4572wm1f0yy8qbkk0lv7bn1dd7"; - SGr-IosevkaTermCurly = "1cdm79fbb21jl4bdw2im961cfskf104gzkv9riliw1b7vkrfxl1n"; - SGr-IosevkaTermCurlySlab = "0ykn3d72az3sgn35vr2vf5d70l10spmhli05s7sk68y669g0z5jb"; - SGr-IosevkaTermSlab = "0sxzcpnh8xykk09kk3sdm0pxqmr48cc0k8cyx0s94adwr9hg4dl7"; - SGr-IosevkaTermSS01 = "1rr9i5hq2zz66abdavpwg4mpbhf5wl463bdy7xnjnqpbpj766f90"; - SGr-IosevkaTermSS02 = "1nzadff8ml61z3fa2b0hrla0dz02hjk68p0byzahn5hr9cgc1v4j"; - SGr-IosevkaTermSS03 = "0f8axrzy8skxzsnfkb16vbbjww152npqhd7y73vzcqn8r90ngs53"; - SGr-IosevkaTermSS04 = "1i37y1nsfhm27vga6d7av5986qyvwscnmlbrskdrbrhl7sg12yb2"; - SGr-IosevkaTermSS05 = "0i3aidf3p5dqlpkrz595nxr6ljj94nzwg7cmdmy3c6685050bk35"; - SGr-IosevkaTermSS06 = "08jdfpa9sm0vwrz7vgz5rib2wj26jdp9lry9gj4g3iins6f41vwq"; - SGr-IosevkaTermSS07 = "1gjp6yfq6licmhkqf5ag8ldynjxfa7lbaad10cv56frqkkg85v4c"; - SGr-IosevkaTermSS08 = "1w8vxwxvpadf82sv7p56hc75lllp09ygm2k5rw6s5iyx580w4m6h"; - SGr-IosevkaTermSS09 = "1d1jvgd5wy1bwlmd0gqdjpqz4611dr27gf6kh8i65q24sbjk4mw8"; - SGr-IosevkaTermSS10 = "07r63vr3yqfssqkc8icj7qyrk80i9jnx295i254ianknbmjd8991"; - SGr-IosevkaTermSS11 = "1vqpsl0yk3cgrc40rf0mm4v9q30c6y5c858g7piibcj3bp2adi8z"; - SGr-IosevkaTermSS12 = "1i4ngsxwj82hz4vqla1pr3i7xkhnq872k0f91pvbz63fyi8ij7sy"; - SGr-IosevkaTermSS13 = "1pf36mlndldl01jgbza5jjlf12mqxqwzr7j3zx4vp587yjf6iqap"; - SGr-IosevkaTermSS14 = "1nv3gdpfdwc2pci130kj1n2890b1lnbczgw826cdpp3w7spxs04f"; - SGr-IosevkaTermSS15 = "1xj9q80v0n65nn7zxnckdmc23bb3458v6pv8f36ynj3icbb645zj"; - SGr-IosevkaTermSS16 = "0gxk5bfaq1g7is8n7l60iv6hhygx4i3b9j8zxq5svybhmg4malnk"; - SGr-IosevkaTermSS17 = "00kvld6l6mzp5bbygwq4sy3f262jb295kyk8nq9gwvamg92md7hc"; - SGr-IosevkaTermSS18 = "0dzzfc8y7wgz727z3p5zdd5g25y6h1d5y1aflnz4r2grg5rv6kvp"; + Iosevka = "0fi5x3nj6zxgac7l1smdxjwlphc7f3py83zxn5b93mizn3ypj4f0"; + IosevkaAile = "180armmv9a4jxb7jnirmi1r7wj6hlf3gsv56w7yzcg6m1x17hrb8"; + IosevkaCurly = "1z9nqbd2sbyr005g9v5zk4y06d4mbvc8k6w95rzy9ls92xnrpqch"; + IosevkaCurlySlab = "1k2zygx7q3cxvnj7spz736d6xxi3x2wxsk8wz652xmcwi8nawh1i"; + IosevkaEtoile = "1z6aj3m8m3hi4fw4lalgjfdc7lnmif418xqwlydzqc9klrkjw9q7"; + IosevkaSlab = "0yazmxc012zjlwdp06rgakjra0ylsjpn157yws3q3nn2552vi1qk"; + IosevkaSS01 = "1bp89wyxy55yll567q7ri48zll9n920waynhvsdalfqvl21x3baw"; + IosevkaSS02 = "154i35m6i41rimdyp2nwfmamkwqn4y4aj0m365jw152ybdmd01x2"; + IosevkaSS03 = "16ifwa93cpcjgkpvw6w3nar4x8dmfqi8gimhhh06hhdda1r9rhdh"; + IosevkaSS04 = "0xb7slc91991r7p23xl6kxdf0a244lcjhdpzd9cp765f18fxxf64"; + IosevkaSS05 = "0cl24iy7ghh7glp5xkjar2g9d0rh2kyjdsck3x9bk15lx0r2vkdf"; + IosevkaSS06 = "1gcdkw8d67i2vq6p40s8y23c4k1vyxph5ywkm21i2p0sa73z5j8q"; + IosevkaSS07 = "1y9v5j74y3cpzn19ixzwxvsz0d2f8dp9l9mfk02ijrbvncmjb3ql"; + IosevkaSS08 = "194la3gxb64ifqhzy74dvdz2ajw6qxhzf88g7bfmyxmhkqgwpyzs"; + IosevkaSS09 = "14lyqkk2xsgq114rxh2vb3alp8j835zl48dia8zi5kd896vbmf6j"; + IosevkaSS10 = "1jqh8zfcv96l1ldrl5lqigjcl31b7yqaix873842mrimqyyjgxvc"; + IosevkaSS11 = "1id5chzwpwzapfpavl3mjjysm2q7k1y94nbh8xzprg2gyzg0d1ic"; + IosevkaSS12 = "0hkcmjk6yhbxcl65yc91amz69bj9ybjpp598hnqpv8qi8c65ip17"; + IosevkaSS13 = "08gvncs6i4giyj773r1rq2hfxs6y0lba5j644w6r73q3vyw0ym95"; + IosevkaSS14 = "1w3haxahhcd7sybbsr1r5qcfsdyaijyymwqr591cg1ldxvk5nm0a"; + IosevkaSS15 = "0p2q794l5p14g0fmykxmzyvwvn34lx35x48fd7ikpvwggx8wn9v1"; + IosevkaSS16 = "13203i7hfl1d5mwnpdl8arggyaibqxrm1y34b725hs90wvpz5qar"; + IosevkaSS17 = "1m36dk42wjphxj8qj3yg7slrp4v959kswmcx3iywcb0pzhbiwv45"; + IosevkaSS18 = "1l80766wqrc94pd0v2xlhjl80dlb4al0jlnmxscf4lzlqfyw86rz"; + SGr-Iosevka = "0j8frx4vl8vfid79hy0rw71gzcbmlmnj08r399ivcl1dx5cqj6yw"; + SGr-IosevkaCurly = "0g2kcgy51hydv982888yswhrymslhs1ba55qj94iw5h29rwlhifc"; + SGr-IosevkaCurlySlab = "0jkzxg6j60i51nb9fr34yb3ld8wywxvmxivppz03w8savrfi19hb"; + SGr-IosevkaFixed = "1ix78dcb0423slqf7zhhns57my4q6b6196b3khyhsnj2rs8q5c4s"; + SGr-IosevkaFixedCurly = "1dlzdgm916z6zqvnmvh28mh8p8al773hq8rd9kh1i78bph3pj83f"; + SGr-IosevkaFixedCurlySlab = "15xhhxpb3w2ra04iq6lllhiwap5wmshlgh1qq6qb73mhmp7b3gq2"; + SGr-IosevkaFixedSlab = "0i5760gnjd9sf57wvsxlwszwxx29xf250kmlqkc70cqq3c1hx37r"; + SGr-IosevkaFixedSS01 = "00rn66jfkp4k0g064vg1wqk3lwfyn1k8xcw69kz45cyl26rb0bnv"; + SGr-IosevkaFixedSS02 = "19cnypv4wwxbkhcxx9k4jc8m88wn281albn1xlsr5qq4cq9girfc"; + SGr-IosevkaFixedSS03 = "0z4rl8xm9zgz14zkw3d39mc5hcgyjrmxhsndwdi1nf9xqzi9labl"; + SGr-IosevkaFixedSS04 = "0m8jx2g3q2lmh9yh7dc42c63mmvvw4g41s2n8zmbqmlp5z2wvhk5"; + SGr-IosevkaFixedSS05 = "1mb5i0nkbni1sf8hkd7dqpmkric0mpw962cxxa8n5nbh9ysplsk3"; + SGr-IosevkaFixedSS06 = "187yjb4flnylskxhfnns81mcqfnzn2q1r4mjj5hzmj5xx8np1kv5"; + SGr-IosevkaFixedSS07 = "01j4s3y8prcz12mj72lqsbs2w4wp0s2d20j9mhr22ng80ihg79y8"; + SGr-IosevkaFixedSS08 = "1by49m5gixqxwkhp6lfgn45sg9qql086k5f57x6cjn5g0jaagl5k"; + SGr-IosevkaFixedSS09 = "0d9v0jhjqg07xv0nr112lyvpp19w10al6wxvs8y8xvgc7wbaf10g"; + SGr-IosevkaFixedSS10 = "069qvzq87spmy2b99fbim2ag2ab13b94r1xbq688lbww7n8777zq"; + SGr-IosevkaFixedSS11 = "0rlscwcvgjlm07ccyhcxnspnh3xbyqbw5i9kwvi278ndmrmj98gd"; + SGr-IosevkaFixedSS12 = "1j7v0wz8qcmmcwpzlbk3ag254ddb2vvbvz9y8mwwgmmimiyd9x02"; + SGr-IosevkaFixedSS13 = "1izxz1v8r0b87d7243y8znjg74ajbbdlpy946xxp0295fjrkwn48"; + SGr-IosevkaFixedSS14 = "0gla42979n5p0lssyvcvq8xig9gj7wsd24dapkg6nw2qn7xh5nf6"; + SGr-IosevkaFixedSS15 = "181x7wygz3h6224am48jxhh17s377xij3a61n74rkpqdfvqgknyd"; + SGr-IosevkaFixedSS16 = "070a7gnykajr0sy4x9z9qd98z0lfh7nvg9lm1jja5mwq408s3sfi"; + SGr-IosevkaFixedSS17 = "1s1xck9cw33f2hkpn5qjfh0shpszis957k521hq3f4nqac3jmjw1"; + SGr-IosevkaFixedSS18 = "0v2p0c5nibb5xs2h9fdg6a2ns0kc02wk4lx65a9dsmsdxfgmz0j2"; + SGr-IosevkaSlab = "1iai9svsfa8l9gwr6hczz8lx0zxbzd7l711l3c1kwz6gd7ssavs9"; + SGr-IosevkaSS01 = "035pca36gbh860ggvjw4zvl0infaa8knq0r7cx8aqp5f0rprg72y"; + SGr-IosevkaSS02 = "1npk7w828s48gfnn27vh1pjsgb9kwnvyjdznciym989bxn9knhf8"; + SGr-IosevkaSS03 = "0mdkxlvmr5zwczz3w4xq9s9nnryx634q9jc6166p3b7861hkln1b"; + SGr-IosevkaSS04 = "1jifclcjvl0c3iqf98mf83jbg964vfh5dlrbxyzg787s3j1bbl81"; + SGr-IosevkaSS05 = "1xfdl5s7ivx10nppwcialmqn87gd6wgfs1in6pxx0675nmkl1vq9"; + SGr-IosevkaSS06 = "01yabw97bciqwg5pmrdr9qzl7kz1k3yxrza3rlfcmymbjyz2p3jm"; + SGr-IosevkaSS07 = "1p1sipaw95n6f7bazsxphc8y295zn861yd1122sc71f3jb5jamga"; + SGr-IosevkaSS08 = "1y17vimbpwabdzw3kg8nmw2jfaaam4g9wb2bwm612y8xmb421skx"; + SGr-IosevkaSS09 = "0vpl45zx28mirpj4xwzpn06ivdkmdnrfvgfkr9ai7il6rvqjvbqd"; + SGr-IosevkaSS10 = "1kna602l4vh40zcxa8ibdhhzkpf9mprhbycyrgjbq30jw8klgfll"; + SGr-IosevkaSS11 = "16qlnmgvnjg5fvqh7mwpqv0qrwskcp67lxk8qm67dkkaa26b5cms"; + SGr-IosevkaSS12 = "1zzf5rw1ffpg6ig2nngdfqpn7d9mmm60m2mmdnmh56vfhva8pgqf"; + SGr-IosevkaSS13 = "1jwrvi059bdba56lc5hfwc1j2m9wimdax8k5myzc682bj5lj19dy"; + SGr-IosevkaSS14 = "1bhxjp0b2yf3lxrxv8hyawkq789rcia1wh5dmxq0pn6smc5r43xc"; + SGr-IosevkaSS15 = "10cdmndq7nxvsmgipcfd1zz9cxzrs13fym204ylxzh1yhycl52w0"; + SGr-IosevkaSS16 = "1jpzybq0hzz00b30ynpl1lxjdr7j0kq708mb2sv11db9b5w2wcqd"; + SGr-IosevkaSS17 = "00jcagyjfdqvmszra4p32w1mk1md35fgfh53498cv6i8jq3ycz09"; + SGr-IosevkaSS18 = "001sgb1x18k00r989kwsgrn1fsiq0hngfnmd7qxa3lbhh4clwmlc"; + SGr-IosevkaTerm = "1kvgd8n0f8ik4v1wwb4skc6ixys2h4g88vshjv4y6lwsgmz9lbg0"; + SGr-IosevkaTermCurly = "1v461nxq05lxh4k0l19clql2bl15grn1kavbgpf9mcjbnaxv4h4i"; + SGr-IosevkaTermCurlySlab = "07gd8zhvwzjicz4fzxwmhjnganpxzac296nml6p00dav8r0dv093"; + SGr-IosevkaTermSlab = "09dj10xhnfa86pg4dfm2398afjy46z4kcpyjx0gcflkl73k1ka32"; + SGr-IosevkaTermSS01 = "19cca99xsfrw31c04zaym2w6l3krzyc6y8syq3hp03frq4w2w68n"; + SGr-IosevkaTermSS02 = "1zxz3cckxh2wdpzvbx1d87753z49ydfcs8l969qgmqxlqfrd3lwi"; + SGr-IosevkaTermSS03 = "1084sms84r2iacw6r003mdggb3xfv227nwdqc32n93r3bs8babj7"; + SGr-IosevkaTermSS04 = "0jl6w43hqrpn15sb4pf2057dxj572l9p1q00fy1db4y0sc668p8k"; + SGr-IosevkaTermSS05 = "0c41ivq4g8kiiywq8qr8qn6iglnx1csnq8f0kz3574zfnfyg7vis"; + SGr-IosevkaTermSS06 = "17hak7601k6l5acygxkhqk4ig3xm6v1g53kx3dz6v85s0hjmm2xa"; + SGr-IosevkaTermSS07 = "0ymxhdkclsc6fbswgrmwg0z2r9nddpwa12v5z7v9qbgpvwfpbngl"; + SGr-IosevkaTermSS08 = "136vb2ilmll5qrwlrqwaa21f8p4m25vzhdqi8hlfnf09l759sn4d"; + SGr-IosevkaTermSS09 = "0z2lbq8gv99vzwg5536lw17j2ivdzv8p0a5rgqdysnbm0q57w9rx"; + SGr-IosevkaTermSS10 = "040g7yjyb1n2yqjramrcglpb65zaq0hjfj8iy283chyf78h8zw7z"; + SGr-IosevkaTermSS11 = "0fik7zhznizpf2ppc35p2sa0fa49a8acd6ppcy5fmmipffgb0kx6"; + SGr-IosevkaTermSS12 = "0ffmf2wlgy6h642arq06bvy4j2wa88a2xk42w303gg49wccqq2zr"; + SGr-IosevkaTermSS13 = "0vanc6h0dvd829933alkih8pqszhb6lj8c9zhk4r8m22hn81z6ym"; + SGr-IosevkaTermSS14 = "1nacl68g4ikff01wrklckygvanidnzl7svh5dhrg295scv9anmvn"; + SGr-IosevkaTermSS15 = "0kxn01nvpbv0csqy1rm0s9dqn8mnfl3x1yy2c8svgxq8snvk0xm9"; + SGr-IosevkaTermSS16 = "0kq65gpza1jy18z1639wl383ck3zc9fpfprr68aqkywrzcky6rzb"; + SGr-IosevkaTermSS17 = "1q1k6vqibqzzww3fhl70inhgjwwczpl20h0qfwvnvpzz9x5hzh26"; + SGr-IosevkaTermSS18 = "1zbfy657x2vk6f9fbxxcja31i0pyg1afzzx794wa9w2pyd2hcpi7"; } diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/data/fonts/iwona/default.nix index 6a40b20b28e0..6d235d1b2f2b 100644 --- a/pkgs/data/fonts/iwona/default.nix +++ b/pkgs/data/fonts/iwona/default.nix @@ -4,11 +4,12 @@ stdenvNoCC.mkDerivation rec { inherit (src) pname version; src = texlive.pkgs.iwona; + dontUnpack = true; installPhase = '' runHook preInstall - install -Dm644 fonts/opentype/nowacki/iwona/*.otf -t $out/share/fonts/opentype + install -Dm644 $src/fonts/opentype/nowacki/iwona/*.otf -t $out/share/fonts/opentype runHook postInstall ''; diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index a185160d4a3e..17405d7b78e1 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, autoreconfHook, gtk3, adwaita-icon-theme, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenvNoCC.mkDerivation rec { pname = "arc-icon-theme"; @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec { propagatedBuildInputs = [ moka-icon-theme - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 8433d58795be..84cb4fb7c54e 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, adwaita-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ pantheon.elementary-icon-theme - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 096baa49acea..0d528243a865 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -1,20 +1,42 @@ -{ lib, stdenvNoCC, fetchurl }: +{ + lib, + stdenvNoCC, + fetchFromGitLab, + testers, + meson, + pkg-config, + ninja, +}: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "hicolor-icon-theme"; - version = "0.17"; + version = "0.18"; - src = fetchurl { - url = "https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-${version}.tar.xz"; - sha256 = "1n59i3al3zx6p90ff0l43gzpzmlqnzm6hf5cryxqrlbi48sq8x1i"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "xdg"; + repo = "default-icon-theme"; + rev = "v${finalAttrs.version}"; + hash = "sha256-uoB7u/ok7vMxKDl8pINdnV9VsvmsntBcZuz3Q4zGz7M="; }; + nativeBuildInputs = [ + meson + pkg-config + ninja + ]; + setupHook = ./setup-hook.sh; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Default fallback theme used by implementations of the icon theme specification"; - homepage = "https://icon-theme.freedesktop.org/releases/"; + homepage = "https://www.freedesktop.org/wiki/Software/icon-theme/"; + changelog = "https://gitlab.freedesktop.org/xdg/default-icon-theme/-/blob/${finalAttrs.src.rev}/NEWS"; platforms = platforms.unix; license = licenses.gpl2Only; + pkgConfigModules = [ "default-icon-theme" ]; + maintainers = with maintainers; [ jopejoe1 ]; }; -} +}) diff --git a/pkgs/data/icons/humanity-icon-theme/default.nix b/pkgs/data/icons/humanity-icon-theme/default.nix index 87ec255d9d4a..dd52c984b1b5 100644 --- a/pkgs/data/icons/humanity-icon-theme/default.nix +++ b/pkgs/data/icons/humanity-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl, gtk3, gnome, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchurl, gtk3, adwaita-icon-theme, hicolor-icon-theme }: stdenvNoCC.mkDerivation rec { pname = "humanity-icon-theme"; @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index ae5a43eca0b3..d502fb0d6f95 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, gtk3, gnome, gnome-icon-theme, hicolor-icon-theme, jdupes }: +{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, gtk3, adwaita-icon-theme, gnome-icon-theme, hicolor-icon-theme, jdupes }: stdenvNoCC.mkDerivation rec { pname = "paper-icon-theme"; @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/tau-hydrogen/default.nix b/pkgs/data/icons/tau-hydrogen/default.nix index cbd9bf1f663c..e883d97b587e 100644 --- a/pkgs/data/icons/tau-hydrogen/default.nix +++ b/pkgs/data/icons/tau-hydrogen/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tau-hydrogen"; - version = "1.0.14"; + version = "1.0.16"; src = fetchFromGitHub { owner = "tau-OS"; repo = "tau-hydrogen"; rev = finalAttrs.version; - hash = "sha256-8awcowBm0hwoYYm/wtKeqCWRhgXh2rI3UvAlL1tbj6c="; + hash = "sha256-nnQ0lkHtkOjJhF4NSMqjt0deddYjMnHHlANlHoZS2wY="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index b8b239e4fc58..7a332e808701 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -20,7 +20,7 @@ let blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" blacklist); extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings); - srcVersion = "3.98"; + srcVersion = "3.101"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -37,7 +37,7 @@ let owner = "nss-dev"; repo = "nss"; rev = "NSS_${lib.replaceStrings ["."] ["_"] version}_RTM"; - hash = "sha256-0p1HzspxyzhzX46O7ax8tmYiaFEBeqEqEvman4NIiQc="; + hash = "sha256-lO+81zYBBFwqcjh4cd/fpiznHZ9rTJpfDW/yF8phYts="; }; dontBuild = true; diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/data/misc/dbip-country-lite/default.nix index 861a00f3a63b..062c229fe36b 100644 --- a/pkgs/data/misc/dbip-country-lite/default.nix +++ b/pkgs/data/misc/dbip-country-lite/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2024-06"; + version = "2024-07"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-utCjcaJ05Wo2KgEccGbvLYSGc3eW1n2S4qrgWd6rERM="; + hash = "sha256-MEhxTByiRoyxQ6DAKUhJKnG+ISvJN0Q5K4o/DoXkxtk="; }; dontUnpack = true; diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index c8fb95c87720..bfd8f589f9e3 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20240523"; + version = "20240701"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - hash = "sha256-ne/y39KUskzsnw1iBC8EQ62P3GYG+L6pUePlMXCpBsU="; + hash = "sha256-HXOBpy8MRfRzvvpKkvoBCjf8T3srtdH2jgbaRA72kF0="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 898e016c65f4..d4af7cec54cd 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20240624143214"; + version = "20240707162925"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-VaETDDfDrnniMLgm2Z2/SUdIeWfQlJYygpF6Kx++whw="; + hash = "sha256-Cpd66RSbKcEcLeL/ibS6cWnZABJuYCthaaMTkCsbij0="; }; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; meta = with lib; { diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index fa2db6f82251..21de6c9d8145 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "wireless-regdb"; - version = "2024.05.08"; + version = "2024.07.04"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-mu4dhuvrs2O3FL7JQbKCDzHjt/Gkhd3J/L2ZhcfT58Q="; + hash = "sha256-mDKhThviSr/3vjDe48mhr7X9/PR1oNkar+8Dn42F9es="; }; dontBuild = true; diff --git a/pkgs/data/soundfonts/generaluser/default.nix b/pkgs/data/soundfonts/generaluser/default.nix index 87753d61ac0e..f8dd40cd8810 100644 --- a/pkgs/data/soundfonts/generaluser/default.nix +++ b/pkgs/data/soundfonts/generaluser/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://www.schristiancollins.com/generaluser.php"; license = licenses.generaluser; platforms = platforms.all; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/soundfonts/ydp-grand/default.nix b/pkgs/data/soundfonts/ydp-grand/default.nix index 635b445f6115..34f35425410a 100644 --- a/pkgs/data/soundfonts/ydp-grand/default.nix +++ b/pkgs/data/soundfonts/ydp-grand/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = "https://freepats.zenvoid.org/Piano/acoustic-grand-piano.html"; license = licenses.cc-by-30; platforms = platforms.all; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix index ccf899eba630..7b68f8cc490f 100644 --- a/pkgs/data/themes/alacritty-theme/default.nix +++ b/pkgs/data/themes/alacritty-theme/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (self: { pname = "alacritty-theme"; - version = "0-unstable-2024-06-17"; + version = "0-unstable-2024-07-03"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "a4041aeea19d425b63f7ace868917da26aa189bd"; - hash = "sha256-A5Xlu6kqB04pbBWMi2eL+pp6dYi4MzgZdNVKztkJhcg="; + rev = "b5a35e2f6e186f70560a3123c4fbc14b2c99af2f"; + hash = "sha256-60/XiJHeCP06DFjEosTgWJlzV4lfS/Bs24nfRCSQU70="; }; dontConfigure = true; diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 17089285f276..2a737d677b0e 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -5,6 +5,7 @@ , ninja , glib , gnome +, gnome-themes-extra , gtk-engine-murrine , inkscape , cinnamon @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { ]; propagatedUserEnvPkgs = [ - gnome.gnome-themes-extra + gnome-themes-extra gtk-engine-murrine ]; diff --git a/pkgs/data/themes/ayu-theme-gtk/default.nix b/pkgs/data/themes/ayu-theme-gtk/default.nix index 2e8453b097dd..29421c58bff2 100644 --- a/pkgs/data/themes/ayu-theme-gtk/default.nix +++ b/pkgs/data/themes/ayu-theme-gtk/default.nix @@ -2,6 +2,7 @@ , autoreconfHook , fetchFromGitHub , gnome +, gnome-themes-extra , gtk-engine-murrine , gtk3 , inkscape @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { ]; propagatedUserEnvPkgs = [ - gnome.gnome-themes-extra + gnome-themes-extra gtk-engine-murrine ]; diff --git a/pkgs/data/themes/base16-schemes/default.nix b/pkgs/data/themes/base16-schemes/default.nix index b910ba8c6cf6..b8b7da40212e 100644 --- a/pkgs/data/themes/base16-schemes/default.nix +++ b/pkgs/data/themes/base16-schemes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "base16-schemes"; - version = "unstable-2024-01-14"; + version = "unstable-2024-06-21"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "schemes"; - rev = "395074124283df993571f2abb9c713f413b76e6e"; - sha256 = "sha256-9LmwYbtTxNFiP+osqRUbOXghJXpYvyvAwBwW80JMO7s="; + rev = "ef9a4c3c384624694608adebf0993d7a3bed3cf2"; + sha256 = "sha256-9i9IjZcjvinb/214x5YShUDBZBC2189HYs26uGy/Hck="; }; installPhase = '' diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/data/themes/canta/default.nix index 5666eded73f0..8f06327b9706 100644 --- a/pkgs/data/themes/canta/default.nix +++ b/pkgs/data/themes/canta/default.nix @@ -5,7 +5,7 @@ , librsvg , gtk-engine-murrine , gtk3 -, gnome +, adwaita-icon-theme , gnome-icon-theme , numix-icon-theme-circle , hicolor-icon-theme @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme numix-icon-theme-circle hicolor-icon-theme diff --git a/pkgs/data/themes/dracula-qt5-theme/default.nix b/pkgs/data/themes/dracula-qt5-theme/default.nix new file mode 100644 index 000000000000..5a618c9618bc --- /dev/null +++ b/pkgs/data/themes/dracula-qt5-theme/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation { + pname = "dracula-theme"; + version = "unstable-2022-05-21"; + + src = fetchFromGitHub { + owner = "dracula"; + repo = "qt5"; + rev = "7b25ee305365f6e62efb2c7aca3b4635622b778c"; + hash = "sha256-tfUjAb+edbJ+5qar4IxWr4h3Si6MIwnbCrwI2ZdUFAM="; + }; + + installPhase = '' + runHook preInstall + + install -D Dracula.conf $out/share/qt5ct/colors/Dracula.conf + + runHook postInstall + ''; + + meta = with lib; { + description = "Dark theme for qt5"; + homepage = "https://github.com/dracula/qt5"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ vonfry ]; + }; +} diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index d37f698b41d3..efcaa5e3b210 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -2,7 +2,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2024-06-19"; + version = "4.0.0-unstable-2024-06-27"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "91b9c8572d7cfa06b24eee72d415cc8931c04934"; - hash = "sha256-WQsPn5s8xZ/wdVJUJb1aCTAjOskj/qthZ48HHDVIcNk="; + rev = "bc1414a938652d04b9305b1300f5ceefcf3a3d72"; + hash = "sha256-QaMrcUuvHRisa58XaiNos6jpclp0jotFQJ3b375gKMU="; }; propagatedUserEnvPkgs = [ diff --git a/pkgs/data/themes/equilux-theme/default.nix b/pkgs/data/themes/equilux-theme/default.nix index c4773803e41c..3b3af2431dd3 100644 --- a/pkgs/data/themes/equilux-theme/default.nix +++ b/pkgs/data/themes/equilux-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: +{ lib, stdenv, fetchFromGitHub, gnome, gnome-themes-extra, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: stdenv.mkDerivation rec { pname = "equilux-theme"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ glib libxml2 bc ]; - buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ]; + buildInputs = [ gnome-themes-extra gdk-pixbuf librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index f42e532b6491..7ccf0fd68b2f 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -5,6 +5,7 @@ , ninja , sassc , gnome +, gnome-themes-extra , gtk-engine-murrine , gdk-pixbuf , librsvg @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja sassc ]; - buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ]; + buildInputs = [ gnome-themes-extra gdk-pixbuf librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/data/themes/nixos-bgrt-plymouth/default.nix b/pkgs/data/themes/nixos-bgrt-plymouth/default.nix index b6b5be1adda0..be8cb6439a48 100644 --- a/pkgs/data/themes/nixos-bgrt-plymouth/default.nix +++ b/pkgs/data/themes/nixos-bgrt-plymouth/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { description = "BGRT theme with a spinning NixOS logo"; homepage = "https://github.com/helsinki-systems/plymouth-theme-nixos-bgrt"; license = licenses.mit; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/data/themes/qogir-kde/default.nix b/pkgs/data/themes/qogir-kde/default.nix index b3f914ae975b..635548c8872f 100644 --- a/pkgs/data/themes/qogir-kde/default.nix +++ b/pkgs/data/themes/qogir-kde/default.nix @@ -4,18 +4,18 @@ , kdeclarative , plasma-framework , plasma-workspace -, gitUpdater +, unstableGitUpdater }: stdenvNoCC.mkDerivation rec { pname = "qogir-kde"; - version = "unstable-2023-10-20"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "1cfe8da54e6f76d5ce0d2234dcb4f5186431edb3"; - hash = "sha256-Ts8cS7dH8RkfRgWvzDKLCC2G6Hsnvx0NAGstfxMIt+Y="; + rev = "5224dbdeed76c5ed4b7b5ff6d0b48ebe82547228"; + hash = "sha256-qS0bVfweSXv2Sox3cXQ8PfcPD+WA6kwrEoS0ijxWZE8="; }; # Propagate sddm theme dependencies to user env otherwise sddm does @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = unstableGitUpdater { }; meta = with lib; { description = "Flat Design theme for KDE Plasma desktop"; diff --git a/pkgs/data/themes/sddm-sugar-dark/default.nix b/pkgs/data/themes/sddm-sugar-dark/default.nix new file mode 100644 index 000000000000..7cbc1c121e3d --- /dev/null +++ b/pkgs/data/themes/sddm-sugar-dark/default.nix @@ -0,0 +1,40 @@ +{ pkgs, lib, stdenvNoCC, themeConfig ? null }: + +stdenvNoCC.mkDerivation rec { + pname = "sddm-sugar-dark"; + version = "1.2"; + + src = pkgs.fetchFromGitHub { + owner = "MarianArlt"; + repo = "sddm-sugar-dark"; + rev = "v${version}"; + hash = "sha256-C3qB9hFUeuT5+Dos2zFj5SyQegnghpoFV9wHvE9VoD8="; + }; + + dontWrapQtApps = true; + + buildInputs = with pkgs.libsForQt5.qt5; [ qtgraphicaleffects ]; + + installPhase = + let + iniFormat = pkgs.formats.ini { }; + configFile = iniFormat.generate "" { General = themeConfig; }; + + basePath = "$out/share/sddm/themes/sugar-dark"; + in + '' + mkdir -p ${basePath} + cp -r $src/* ${basePath} + '' + lib.optionalString (themeConfig != null) '' + ln -sf ${configFile} ${basePath}/theme.conf.user + ''; + + meta = { + description = "Dark SDDM theme from the sugar family"; + homepage = "https://github.com/${src.owner}/${pname}"; + license = lib.licenses.gpl3; + + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ danid3v ]; + }; +} diff --git a/pkgs/data/themes/sweet/default.nix b/pkgs/data/themes/sweet/default.nix deleted file mode 100644 index 308392a2450b..000000000000 --- a/pkgs/data/themes/sweet/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, stdenvNoCC -, fetchurl -, unzip -, gtk-engine-murrine -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "sweet"; - version = "4.0"; - - srcs = [ - (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-Dark-v40.zip"; - hash = "sha256-w4jN6PSUNCuqeRQ5wInb5deMTtfpKOa7lj9pN+b/0hU="; - }) - (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-Dark.zip"; - hash = "sha256-2hb2FHWyGSowRdUnrWMJENlqRtSr2CrPtDe3DSZlP8M="; - }) - (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-v40.zip"; - hash = "sha256-4B0O9hOI9xtzj2gOX354DxtQyiahK5ezr6q6VBpxOJQ="; - }) - (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue.zip"; - hash = "sha256-8Aw7CsHRflHoeL/DhpxgxDATaAFm+MTMjeZe9Qg8J8o="; - }) - (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-v40.zip"; - hash = "sha256-Ih8/d4qHBAaDDHUIdzw7J6jGu5Zg6KTPffEs+jh0VkM="; - }) - (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar.zip"; - hash = "sha256-WdawPwNRW1uVNFIiP7bSQxvcWQtD/i8b4oLplPbPLyU="; - }) - (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Dark-v40.zip"; - hash = "sha256-5vnTneWP5uRFeL6PjuP61OglbNL6+lLGPHmrLeqyk2w="; - }) - (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Dark.zip"; - hash = "sha256-EmXM2/IG82KKm5npl2KLTryhu7Y/5KLKnPv1JxYm0Z4="; - }) - (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-mars-v40.zip"; - hash = "sha256-5t9NsxmbjDg7Nf/BSnbdZhx1wl6PQxXYxKuhlNnIPO4="; - }) - (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-mars.zip"; - hash = "sha256-ZX7Z9gTMVUjFVtdN+FWuHAkV+Yk8vk7D23gr27efpNM="; - }) - (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-v40.zip"; - hash = "sha256-NHSFgj5iybwzcYw0JyMWijhVXSEvhbMhj1KcvTsHpS4="; - }) - (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet.zip"; - hash = "sha256-R2ULcqjOQ9aPO4c2o5ow81icZGKxA5Qvq7G5XGGC2Og="; - }) - ]; - - nativeBuildInputs = [ unzip ]; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - sourceRoot = "."; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/themes/ - cp -a Sweet* $out/share/themes/ - rm $out/share/themes/*/{LICENSE,README*} - runHook postInstall - ''; - - meta = with lib; { - description = "Light and dark colorful Gtk3.20+ theme"; - homepage = "https://github.com/EliverLara/Sweet"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ fuzen d3vil0p3r ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/data/themes/tokyonight-gtk-theme/default.nix b/pkgs/data/themes/tokyonight-gtk-theme/default.nix deleted file mode 100644 index b56b0aadd3ed..000000000000 --- a/pkgs/data/themes/tokyonight-gtk-theme/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, callPackage -, runCommand -, gtk-engine-murrine -, gnome-themes-extra -}: - -let - prefix = "tokyonight-gtk-theme"; - - packages = lib.mapAttrs' (type: content: { - name = type; - - value = lib.mapAttrs' (variantName: variant: { - name = variantName; - value = callPackage ./generic.nix { inherit prefix type variantName variant; }; - }) content; - }) (lib.importJSON ./variants.json); -in packages // { - # Not using `symlinkJoin` because it's massively inefficient in this case - full = runCommand "${prefix}_full" { - preferLocalBuild = true; - - propagatedUserEnvPkgs = [ - gtk-engine-murrine - gnome-themes-extra - ]; - } '' - mkdir -p $out/share/{icons,themes,${prefix}} - - ${lib.concatStrings (lib.forEach (lib.attrValues (lib.attrsets.mergeAttrsList (lib.attrValues packages))) (variant: - '' - ln -s ${variant}/share/${variant.ptype}/Tokyonight-${variant.pvariant} $out/share/${variant.ptype}/Tokyonight-${variant.pvariant} - ln -s ${variant}/share/${prefix}/LICENSE $out/share/${prefix}/LICENSE 2>/dev/null || true - '' - ))} - ''; -} diff --git a/pkgs/data/themes/tokyonight-gtk-theme/generic.nix b/pkgs/data/themes/tokyonight-gtk-theme/generic.nix deleted file mode 100644 index 1adbf674a586..000000000000 --- a/pkgs/data/themes/tokyonight-gtk-theme/generic.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, writeScript -, gtk-engine-murrine -, gnome-themes-extra -, prefix ? "" -, type ? "" -, variantName ? "" -, variant ? "" -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "${prefix}_${type}-${variantName}"; - version = "unstable-2023-05-31"; - - src = fetchFromGitHub { - owner = "Fausto-Korpsvart"; - repo = "Tokyo-Night-GTK-Theme"; - rev = "e9790345a6231cd6001f1356d578883fac52233a"; - hash = "sha256-Q9UnvmX+GpvqSmTwdjU4hsEsYhA887wPqs5pyqbIhmc="; - }; - - propagatedUserEnvPkgs = [ - gtk-engine-murrine - gnome-themes-extra - ]; - - dontPatch = true; - dontConfigure = true; - dontBuild = true; - dontFixup = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/{${type},${prefix}} - cp -a ${type}/Tokyonight-${variant} $out/share/${type} - cp -a LICENSE $out/share/${prefix} - - runHook postInstall - ''; - - passthru = { - updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl common-updater-scripts tree jq - res="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - -sL "https://api.github.com/repos/${finalAttrs.src.owner}/${finalAttrs.src.repo}/commits/HEAD")" - - rev="$(echo $res | jq '.sha' --raw-output)" - version="unstable-$(echo $res | jq '.commit | .author | .date' --raw-output | sed 's/T.*$//')" - update-source-version ${prefix}-variants.${type}.${variantName} "$version" "$rev" --ignore-same-hash - - commonjq1='.[] .contents .[] | {(.name): .name} | walk(if type=="object" then with_entries(.key|=ascii_downcase) else . end)' - commonjq2='reduce inputs as $in (.; . + $in)' - commontree="-dJ -L 1 --noreport ${finalAttrs.src}" - - echo $(tree $commontree/icons | jq "$commonjq1" | jq "$commonjq2" | jq '{icons: .}') \ - $(tree $commontree/themes | jq "$commonjq1" | jq "$commonjq2" | jq '{themes: .}') | \ - jq 'reduce inputs as $in (.; . + $in)' | sed "s/[tT]okyonight-//g" > \ - "$(git rev-parse --show-toplevel)/pkgs/data/themes/${prefix}/variants.json" - ''; - - # For "full" in default.nix - ptype = type; - pvariant = variant; - }; - - meta = with lib; { - description = "GTK theme based on the Tokyo Night colour palette"; - homepage = "https://www.pling.com/p/1681315"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = with maintainers; [ garaiza-93 Madouura ]; - }; -}) diff --git a/pkgs/data/themes/tokyonight-gtk-theme/variants.json b/pkgs/data/themes/tokyonight-gtk-theme/variants.json deleted file mode 100644 index 6489d9c649de..000000000000 --- a/pkgs/data/themes/tokyonight-gtk-theme/variants.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "icons": { - "dark": "Dark", - "dark-cyan": "Dark-Cyan", - "light": "Light", - "moon": "Moon" - }, - "themes": { - "dark-b": "Dark-B", - "dark-bl": "Dark-BL", - "dark-b-lb": "Dark-B-LB", - "dark-bl-lb": "Dark-BL-LB", - "storm-b": "Storm-B", - "storm-bl": "Storm-BL", - "storm-b-lb": "Storm-B-LB", - "storm-bl-lb": "Storm-BL-LB" - } -} diff --git a/pkgs/data/themes/ubuntu-themes/default.nix b/pkgs/data/themes/ubuntu-themes/default.nix index ea6a9abcb779..8f945c0d7b86 100644 --- a/pkgs/data/themes/ubuntu-themes/default.nix +++ b/pkgs/data/themes/ubuntu-themes/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , gnome-icon-theme -, gnome +, adwaita-icon-theme , gtk-engine-murrine , gtk3 , hicolor-icon-theme @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gnome-icon-theme - gnome.adwaita-icon-theme + adwaita-icon-theme humanity-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/themes/yaru-remix/default.nix b/pkgs/data/themes/yaru-remix/default.nix index 87056583b555..b49236d36e9b 100644 --- a/pkgs/data/themes/yaru-remix/default.nix +++ b/pkgs/data/themes/yaru-remix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, python3, gtk3, gnome }: +{ lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, python3, gtk3, gnome, gnome-themes-extra }: stdenv.mkDerivation rec { pname = "yaru-remix"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; - buildInputs = [ gtk3 gnome.gnome-themes-extra ]; + buildInputs = [ gtk3 gnome-themes-extra ]; dontDropIconThemeCache = true; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index c49a35e85dab..d4b074cf3301 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -8,7 +8,7 @@ , ninja , python3 , gtk3 -, gnome +, gnome-themes-extra , gtk-engine-murrine , humanity-icon-theme , hicolor-icon-theme @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; - buildInputs = [ gtk3 gnome.gnome-themes-extra ]; + buildInputs = [ gtk3 gnome-themes-extra ]; propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/desktops/budgie/budgie-control-center/default.nix index 1fb8d86d410e..015b8ca97083 100644 --- a/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/pkgs/desktops/budgie/budgie-control-center/default.nix @@ -3,7 +3,9 @@ , fetchFromGitHub , substituteAll , accountsservice +, adwaita-icon-theme , budgie-desktop +, cheese , clutter , clutter-gtk , colord @@ -19,6 +21,7 @@ , glibc , gnome , gnome-desktop +, gnome-user-share , gsettings-desktop-schemas , gsound , gtk3 @@ -101,12 +104,12 @@ stdenv.mkDerivation (finalAttrs: { glib glib-networking gnome-desktop - gnome.adwaita-icon-theme - gnome.cheese + adwaita-icon-theme + cheese gnome.gnome-bluetooth_1_0 gnome.gnome-remote-desktop gnome.gnome-settings-daemon - gnome.gnome-user-share + gnome-user-share gnome.mutter gsettings-desktop-schemas gsound diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index 9e4ec9c42a2b..4dc5be53260e 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -33,6 +33,7 @@ , vala , xfce , wrapGAppsHook3 +, zenity }: stdenv.mkDerivation (finalAttrs: { @@ -70,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { gnome-desktop gnome.gnome-settings-daemon gnome.mutter - gnome.zenity + zenity graphene gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/desktops/budgie/budgie-session/default.nix b/pkgs/desktops/budgie/budgie-session/default.nix index 90185f85b1f0..3815af26c21d 100644 --- a/pkgs/desktops/budgie/budgie-session/default.nix +++ b/pkgs/desktops/budgie/budgie-session/default.nix @@ -6,6 +6,7 @@ , ninja , pkg-config , gnome +, adwaita-icon-theme , glib , gtk3 , gsettings-desktop-schemas @@ -67,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { gnome-desktop json-glib xorg.xtrans - gnome.adwaita-icon-theme + adwaita-icon-theme gnome.gnome-settings-daemon gsettings-desktop-schemas systemd diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index df55ba150d5d..c8bac7d9a85a 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "6.2.2"; + version = "6.2.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-iivrPSzmvhImfrOD2Ec6BjbtRpHAQs71N/UDSPoZwTE="; + hash = "sha256-zWSz49ESzuftrE4caTxa+9Zvyz2rdmGgRz2hZO2OWtc="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 78a4f7d94b65..7234d00d9c06 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -2,7 +2,7 @@ , runCommand , nixos-artwork , glib -, gnome +, gnome-terminal , gtk3 , gsettings-desktop-schemas , extraGSettingsOverrides ? "" @@ -36,7 +36,7 @@ let cinnamon-session cinnamon-settings-daemon cinnamon-common - gnome.gnome-terminal + gnome-terminal gsettings-desktop-schemas gtk3 ] ++ extraGSettingsOverridePackages; diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index b4b3d91ffcf3..e74c9e7dc542 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { urls = [ "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20240629131305/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20240707114553/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" ]; - hash = "sha256-NaInP600QQ9sNRaJgM9SNyawZz1H8gwiuZ4lf8KJnIk="; + hash = "sha256-DpRoGTVB1vaif4UNiCEaVO/pyQY8Hc/QG1vmYkVr3Iw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-l-icons/default.nix b/pkgs/desktops/cinnamon/mint-l-icons/default.nix index 6a3956e53ca9..f1333ee44c18 100644 --- a/pkgs/desktops/cinnamon/mint-l-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-l-icons/default.nix @@ -1,7 +1,7 @@ { stdenvNoCC , lib , fetchFromGitHub -, gnome +, adwaita-icon-theme , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { }; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/desktops/cinnamon/mint-l-theme/default.nix b/pkgs/desktops/cinnamon/mint-l-theme/default.nix index a9a8a5bd6850..214ebb999785 100644 --- a/pkgs/desktops/cinnamon/mint-l-theme/default.nix +++ b/pkgs/desktops/cinnamon/mint-l-theme/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-theme"; - version = "1.9.7"; + version = "1.9.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-pgb1lkrBRDYgfrLx0/afEuTz+5gZt/IG1u+dn4V7Spo="; + hash = "sha256-Jql4NJ8jugy0wi5yT+/Mr5fwxLog37w0VvHhxyMvMlk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index e1e22781690b..13db58183cb5 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-pakD7qVlivokFlIBNjibOkneS6WV4BBOBePWSOjVVy0="; + hash = "sha256-mkcIhZRaOUom1Rurz/IO646FSF50efLN6xfesPdyVHc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index 8b045980c44a..85961146d75d 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub , lib , stdenvNoCC -, gnome +, adwaita-icon-theme , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -11,17 +11,17 @@ stdenvNoCC.mkDerivation rec { pname = "mint-x-icons"; - version = "1.6.9"; + version = "1.7.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-J5Osy+VosyBhwiiwELMtjDTf3/J6DpuQ4c9DO06fo+4="; + hash = "sha256-X3aEGz5mr6hL3HhKb69b1/smY+Fh7BIkzdXdOhSkMg0="; }; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme humanity-icon-theme diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index f12800e384b4..09c01f3e9dfd 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub , lib , stdenvNoCC -, gnome +, adwaita-icon-theme , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { }; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index dcf63149e01e..328fe440cde1 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -8,7 +8,6 @@ , desktop-file-utils , egl-wayland , glib -, gnome , gobject-introspection , graphene , gtk3 @@ -36,6 +35,7 @@ , wrapGAppsHook3 , xorgserver , xwayland +, zenity }: stdenv.mkDerivation rec { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - zenity = gnome.zenity; + inherit zenity; }) ]; diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix index 7bf706f83b5f..3f949c1fea5d 100644 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix +++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix @@ -7,7 +7,7 @@ , glib , gtk3 , nemo -, gnome +, file-roller , cinnamon-translations }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/nemo-fileroller.c \ - --replace "file-roller" "${lib.getExe gnome.file-roller}" \ + --replace "file-roller" "${lib.getExe file-roller}" \ --replace "GNOMELOCALEDIR" "${cinnamon-translations}/share/locale" ''; diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 94dacd9be01a..a7e5e3c04272 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "6.2.1"; + version = "6.2.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-c6asFiDpFctNn+ap0cRptdFbjv5blTaJqDuzZ1Je+3I="; + sha256 = "sha256-wyz2pzwJGYMFKoKVqrhLnkJqXG8Qg2+BygpOm2yegpM="; }; patches = [ diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 2ef940122af0..613dbe758f24 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -26,6 +26,7 @@ , gdbm , cyrus_sasl , gnome +, adwaita-icon-theme , librsvg , desktop-file-utils , mtools @@ -90,7 +91,7 @@ stdenv.mkDerivation rec { glib glib-networking gmp - gnome.adwaita-icon-theme + adwaita-icon-theme gtk3 json-glib libapparmor diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 5bdbe12f705a..6a9eb730ec41 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -1,34 +1,35 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, gettext -, pkg-config -, wrapGAppsHook4 -, itstool -, desktop-file-utils -, vala -, libxml2 -, gtk4 -, glib -, sound-theme-freedesktop -, gsettings-desktop-schemas -, gnome-desktop -, geocode-glib_2 -, gnome -, gdk-pixbuf -, geoclue2 -, libgweather -, libadwaita +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + gettext, + pkg-config, + wrapGAppsHook4, + itstool, + desktop-file-utils, + vala, + libxml2, + gtk4, + glib, + gsettings-desktop-schemas, + gnome-desktop, + geocode-glib_2, + gnome, + gdk-pixbuf, + geoclue2, + gst_all_1, + libgweather, + libadwaita, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-clocks"; version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major finalAttrs.version}/gnome-clocks-${finalAttrs.version}.tar.xz"; hash = "sha256-6qPFeM3O+XVOZotWJnCbc/NSZxAjX0tyB20v9JpPmcc="; }; @@ -44,24 +45,24 @@ stdenv.mkDerivation rec { libxml2 ]; - buildInputs = [ - gtk4 - glib - gsettings-desktop-schemas - gdk-pixbuf - gnome-desktop - geocode-glib_2 - geoclue2 - libgweather - libadwaita - ]; - - preFixup = '' - gappsWrapperArgs+=( - # Fallback sound theme - --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share" - ) - ''; + buildInputs = + [ + gtk4 + glib + gsettings-desktop-schemas + gdk-pixbuf + gnome-desktop + geocode-glib_2 + geoclue2 + libgweather + libadwaita + ] + ++ (with gst_all_1; [ + # GStreamer plugins needed for Alarms + gstreamer + gst-plugins-base + gst-plugins-good + ]); doCheck = true; @@ -72,12 +73,21 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { homepage = "https://apps.gnome.org/Clocks/"; - description = "Clock application designed for GNOME 3"; + description = "A simple and elegant clock application for GNOME"; + longDescription = '' + A simple and elegant clock application. It includes world clocks, alarms, + a stopwatch, and timers. + + - Show the time in different cities around the world + - Set alarms to wake you up + - Measure elapsed time with an accurate stopwatch + - Set timers to properly cook your food + ''; mainProgram = "gnome-clocks"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.unix; + maintainers = lib.teams.gnome.members; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/desktops/gnome/apps/gnome-notes/default.nix b/pkgs/desktops/gnome/apps/gnome-notes/default.nix index dd474567196e..eb3e67a47a69 100644 --- a/pkgs/desktops/gnome/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-notes/default.nix @@ -20,6 +20,7 @@ , libhandy , webkitgtk , gnome +, adwaita-icon-theme , libxml2 , gsettings-desktop-schemas , tracker @@ -74,7 +75,7 @@ stdenv.mkDerivation rec { gnome-online-accounts gsettings-desktop-schemas evolution-data-server - gnome.adwaita-icon-theme + adwaita-icon-theme ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index f614094d623b..6f0f2e1d439c 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -4,6 +4,7 @@ , desktop-file-utils , pkg-config , gnome +, adwaita-icon-theme , gtk4 , libadwaita , wrapGAppsHook4 @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { libadwaita gjs libgweather - gnome.adwaita-icon-theme + adwaita-icon-theme geoclue2 gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome/apps/vinagre/default.nix b/pkgs/desktops/gnome/apps/vinagre/default.nix index 72c1f7b3226c..636426ac2f37 100644 --- a/pkgs/desktops/gnome/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome/apps/vinagre/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk3, gnome, vte, libxml2, gtk-vnc, intltool +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk3, gnome, adwaita-icon-theme, vte, libxml2, gtk-vnc, intltool , libsecret, itstool, wrapGAppsHook3, librsvg }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook3 ]; buildInputs = [ - gtk3 vte libxml2 gtk-vnc libsecret gnome.adwaita-icon-theme librsvg + gtk3 vte libxml2 gtk-vnc libsecret adwaita-icon-theme librsvg ]; env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { mainProgram = "vinagre"; homepage = "https://gitlab.gnome.org/Archive/vinagre"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/caribou/default.nix b/pkgs/desktops/gnome/core/caribou/default.nix index b0a74450e81c..ff8af6272799 100644 --- a/pkgs/desktops/gnome/core/caribou/default.nix +++ b/pkgs/desktops/gnome/core/caribou/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { mainProgram = "caribou-preferences"; homepage = "https://gitlab.gnome.org/Archive/caribou"; license = licenses.lgpl21; - maintainers = teams.gnome.members; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix index 526363a61393..6c63a486eef7 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix @@ -3,6 +3,7 @@ , fetchurl , fetchpatch , gnome +, adwaita-icon-theme , meson , ninja , pkg-config @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { udev libnotify libcanberra-gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas ]; @@ -91,7 +92,7 @@ stdenv.mkDerivation rec { homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; description = "Application that let you manage Bluetooth in the GNOME destkop"; mainProgram = "bluetooth-sendto"; - maintainers = teams.gnome.members; + maintainers = [ ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 6602a3795834..8e1683729484 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -68,16 +68,16 @@ , gnome-user-share , gnome-remote-desktop , wrapGAppsHook4 -, xvfb-run +, xorgserver }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "46.2"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-YzXGy4Fk5XTbUh//Yc+j36pV8dtmrjvKAnUKGT4cTz0="; + hash = "sha256-l9xsfR3uGVkU88vIRbaBZLdhFIDYk760EQBsFerkbLk="; }; patches = [ @@ -155,9 +155,10 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ dbus + python3.pkgs.pygobject3 # for test-networkmanager-service.py python3.pkgs.python-dbusmock setxkbmap - xvfb-run + xorgserver # for Xvfb ]; doCheck = true; @@ -167,19 +168,10 @@ stdenv.mkDerivation (finalAttrs: { addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share" ''; - checkPhase = '' - runHook preCheck - - testEnvironment=( - # Basically same as https://github.com/NixOS/nixpkgs/pull/141299 - "ADW_DISABLE_PORTAL=1" - "XDG_DATA_DIRS=${glib.getSchemaDataDirPath gsettings-desktop-schemas}" - ) - - env "''${testEnvironment[@]}" xvfb-run \ - meson test --print-errorlogs - - runHook postCheck + preCheck = '' + # Basically same as https://github.com/NixOS/nixpkgs/pull/141299 + export ADW_DISABLE_PORTAL=1 + export XDG_DATA_DIRS=${glib.getSchemaDataDirPath gsettings-desktop-schemas} ''; postInstall = '' diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 19280b1bff92..2d40503c1d70 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-initial-setup"; - version = "46.2"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-initial-setup/${lib.versions.major finalAttrs.version}/gnome-initial-setup-${finalAttrs.version}.tar.xz"; - hash = "sha256-bHktiSrbYLDeC33oglwUlD0c0nmvT5x2So9UEbYKjyc="; + hash = "sha256-o/AQgp9NTI1J+Dqxz6uCG2GyeA6eC15Wicfv8/hE7T4="; }; patches = [ @@ -90,8 +90,6 @@ stdenv.mkDerivation (finalAttrs: { "-Dvendor-conf-file=${./vendor.conf}" ]; - PKG_CONFIG_SYSTEMD_SYSUSERSDIR = "${placeholder "out"}/lib/sysusers.d"; - passthru = { updateScript = gnome.updateScript { packageName = "gnome-initial-setup"; diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index e7a70f2369e4..b4dde2708d64 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "46.2"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-l0Q+r/5LGmliaIakHSXL6ywUjT/tQ9khFcG30g1SOKs="; + hash = "sha256-CMZlbxHUY560lyqJKej1AkJ9weLqAz4CyZK7Gkx315Q="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index 5d4504b90852..f7aa278fe8cc 100644 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -6,6 +6,7 @@ , ninja , pkg-config , gnome +, adwaita-icon-theme , glib , gtk3 , gsettings-desktop-schemas @@ -69,7 +70,7 @@ stdenv.mkDerivation rec { gnome-desktop json-glib xorg.xtrans - gnome.adwaita-icon-theme + adwaita-icon-theme gnome.gnome-settings-daemon gsettings-desktop-schemas systemd diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 3f91cddc2052..3e2b20bcafcb 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -14,7 +14,6 @@ , networkmanager , gi-docgen , at-spi2-core -, libstartup_notification , unzip , shared-mime-info , libgweather @@ -43,7 +42,6 @@ , gjs , mutter , evolution-data-server-gtk4 -, gtk3 , gtk4 , libadwaita , sassc @@ -59,6 +57,10 @@ , asciidoc , bash-completion , mesa +, libGL +, libXi +, libX11 +, libxml2 }: let @@ -66,13 +68,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "46.2"; + version = "46.3.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-a1hxAcBL+zZKsJzTi12T6+60JUdUyAfPcS+8juP94jg="; + hash = "sha256-575fxu4sxSitJh3HpVyN5aMkEtPWhAoKB14PwSoH/4s="; }; patches = [ @@ -131,13 +133,11 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf librsvg networkmanager - libstartup_notification gjs mutter libpulseaudio evolution-data-server-gtk4 libical - gtk3 gtk4 libadwaita gdm @@ -151,6 +151,10 @@ stdenv.mkDerivation (finalAttrs: { gnome-desktop gnome-settings-daemon mesa + libGL # for egl, required by mutter-clutter + libXi # required by libmutter + libX11 + libxml2 # recording pipewire diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index bca1ea13b5e3..9ddd3da0136f 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -28,6 +28,7 @@ , libxmlb , malcontent , json-glib +, glib-networking , libsecret , valgrind-light , docbook-xsl-nons @@ -45,11 +46,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-software"; - version = "46.2"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz"; - hash = "sha256-5wDLood2T14iVVFOMS4WBVD9v3pdP+FjWLtve2cyuXQ="; + hash = "sha256-nWvB9jfYGytZhYN5BPBe1wdgAUfZrxYLqJEqvy1C8TY="; }; patches = [ @@ -78,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk4 glib + glib-networking packagekit appstream libsoup_3 diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index a53eb5b7cfe3..3fca3696cb1a 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "46.2"; + version = "46.3.1"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-AJuqd/g2JhLKouGMM4obPIqtO1/ilkwv73gk0yEiiYM="; + hash = "sha256-dHpj2jdF8wSwG1U5PZar2qggmDsYi2C0DburPmg8gF8="; }; mesonFlags = [ diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 022021ea6cf7..5cfe889da4aa 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -1,6 +1,11 @@ { config, pkgs, lib }: -lib.makeScope pkgs.newScope (self: with self; { +# NOTE: New packages should generally go to top-level instead of here! +lib.makeScope pkgs.newScope (self: +let + inherit (self) callPackage; +in +{ updateScript = callPackage ./update.nix { }; # Temporary helper until gdk-pixbuf supports multiple cache files. @@ -8,27 +13,15 @@ lib.makeScope pkgs.newScope (self: with self; { _gdkPixbufCacheBuilder_DO_NOT_USE = callPackage ./gdk-pixbuf-cache-builder.nix { }; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; - libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; + libchamplain = pkgs.libchamplain.override { inherit (self) libsoup; }; # ISO installer # installerIso = callPackage ./installer.nix {}; #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { }; - - baobab = callPackage ./core/baobab { }; - caribou = callPackage ./core/caribou { }; - dconf-editor = callPackage ./core/dconf-editor { }; - - epiphany = callPackage ./core/epiphany { }; - - evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests - - evolution-data-server = callPackage ./core/evolution-data-server { }; - gdm = callPackage ./core/gdm { }; gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; @@ -43,20 +36,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-control-center = callPackage ./core/gnome-control-center { }; - gnome-calculator = callPackage ./core/gnome-calculator { }; - - gnome-common = callPackage ./core/gnome-common { }; - - gnome-dictionary = callPackage ./core/gnome-dictionary { }; - - gnome-disk-utility = callPackage ./core/gnome-disk-utility { }; - - gnome-font-viewer = callPackage ./core/gnome-font-viewer { }; - - gnome-keyring = callPackage ./core/gnome-keyring { }; - - libgnome-keyring = callPackage ./core/libgnome-keyring { }; - gnome-initial-setup = callPackage ./core/gnome-initial-setup { }; gnome-online-miners = callPackage ./core/gnome-online-miners { }; @@ -71,8 +50,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; - gnome-screenshot = callPackage ./core/gnome-screenshot { }; - gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; # Using 43 to match Mutter used in Pantheon @@ -80,27 +57,13 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-software = callPackage ./core/gnome-software { }; - gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; - - gnome-terminal = callPackage ./core/gnome-terminal { }; - - gnome-themes-extra = callPackage ./core/gnome-themes-extra { }; - - gnome-user-share = callPackage ./core/gnome-user-share { }; - - gucharmap = callPackage ./core/gucharmap { }; - gvfs = pkgs.gvfs.override { gnomeSupport = true; }; - eog = callPackage ./core/eog { }; - mutter = callPackage ./core/mutter { }; # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided mutter43 = callPackage ./core/mutter/43 { }; - nautilus = callPackage ./core/nautilus { }; - networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = true; }; @@ -127,35 +90,10 @@ lib.makeScope pkgs.newScope (self: with self; { nixos-gsettings-overrides = callPackage ./nixos/gsettings-overrides { }; - rygel = callPackage ./core/rygel { }; - - simple-scan = callPackage ./core/simple-scan { }; - - sushi = callPackage ./core/sushi { }; - - totem = callPackage ./core/totem { }; - - yelp = callPackage ./core/yelp { }; - - yelp-xsl = callPackage ./core/yelp-xsl { }; - - zenity = callPackage ./core/zenity { }; - - #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - accerciser = callPackage ./apps/accerciser { }; - - cheese = callPackage ./apps/cheese { }; - - file-roller = callPackage ./apps/file-roller { }; - - ghex = callPackage ./apps/ghex { }; - gnome-boxes = callPackage ./apps/gnome-boxes { }; - gnome-calendar = callPackage ./apps/gnome-calendar { }; - gnome-characters = callPackage ./apps/gnome-characters { }; gnome-clocks = callPackage ./apps/gnome-clocks { }; @@ -178,14 +116,8 @@ lib.makeScope pkgs.newScope (self: with self; { polari = callPackage ./apps/polari { }; - seahorse = callPackage ./apps/seahorse { }; - vinagre = callPackage ./apps/vinagre { }; -#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ - - devhelp = callPackage ./devtools/devhelp { }; - #### Games aisleriot = callPackage ./games/aisleriot { }; @@ -228,10 +160,6 @@ lib.makeScope pkgs.newScope (self: with self; { #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ - geary = callPackage ./misc/geary { }; - - gitg = callPackage ./misc/gitg { }; - gnome-applets = callPackage ./misc/gnome-applets { }; gnome-flashback = callPackage ./misc/gnome-flashback { }; @@ -240,27 +168,59 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-panel-with-modules = callPackage ./misc/gnome-panel/wrapper.nix { }; - gnome-tweaks = callPackage ./misc/gnome-tweaks { }; - - gpaste = callPackage ./misc/gpaste { }; - metacity = callPackage ./misc/metacity { }; - nautilus-python = callPackage ./misc/nautilus-python { }; - gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; }; - - pomodoro = callPackage ./misc/pomodoro { }; - - gnome-autoar = callPackage ./misc/gnome-autoar { }; - - gnome-packagekit = callPackage ./misc/gnome-packagekit { }; }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. + 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. 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 + 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. + baobab = lib.warn "The ‘gnome.baobab’ was moved to top-level. Please use ‘pkgs.baobab’ directly." pkgs.baobab; # Added on 2024-06-22. + 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. + 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-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-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-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-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-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-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-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-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-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-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. + gpaste = lib.warn "The ‘gnome.gpaste’ was moved to top-level. Please use ‘pkgs.gpaste’ directly." pkgs.gpaste; # Added on 2024-06-22. + gucharmap = lib.warn "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly." pkgs.gucharmap; # Added on 2024-06-22. + nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13. + 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. + 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. + 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. + totem = lib.warn "The ‘gnome.totem’ was moved to top-level. Please use ‘pkgs.totem’ directly." pkgs.totem; # Added on 2024-06-22. + 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/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index 85b4fc5fca00..035531a5f05e 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -1,6 +1,5 @@ { lib , callPackage -, callPackages , config }: let @@ -72,7 +71,7 @@ in rec { # Apply some custom patches for automatically packaged extensions (callPackage ./extensionOverrides.nix {}) # Add all manually packaged extensions - (extensions: extensions // (callPackages ./manuallyPackaged.nix {})) + (extensions: extensions // (import ./manuallyPackaged.nix { inherit callPackage; })) # Map the extension UUIDs to readable names (lib.attrValues) (mapReadableNames) diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index 52b038ccda91..ca96a3831325 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -3,7 +3,7 @@ , easyeffects , gjs , glib -, gnome +, nautilus , gobject-introspection , gsound , hddtemp @@ -107,7 +107,7 @@ super: lib.trivial.pipe super [ util_linux = util-linux; xdg_utils = xdg-utils; src = ./extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch; - nautilus_gsettings_path = "${glib.getSchemaPath gnome.nautilus}"; + nautilus_gsettings_path = "${glib.getSchemaPath nautilus}"; }) ]; })) diff --git a/pkgs/desktops/gnome/games/four-in-a-row/default.nix b/pkgs/desktops/gnome/games/four-in-a-row/default.nix index a866e3797a30..ed862db922fb 100644 --- a/pkgs/desktops/gnome/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome/games/four-in-a-row/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook3 +{ lib, stdenv, fetchurl, pkg-config, gnome, adwaita-icon-theme, gtk3, wrapGAppsHook3 , gettext, meson, gsound, librsvg, itstool, vala , python3, ninja, desktop-file-utils }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook3 gettext meson itstool vala ninja python3 desktop-file-utils ]; - buildInputs = [ gtk3 gsound librsvg gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 gsound librsvg adwaita-icon-theme ]; postPatch = '' chmod +x build-aux/meson_post_install.py diff --git a/pkgs/desktops/gnome/games/gnome-klotski/default.nix b/pkgs/desktops/gnome/games/gnome-klotski/default.nix index 3b976c633e03..c822d0e80c43 100644 --- a/pkgs/desktops/gnome/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome/games/gnome-klotski/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, vala, gnome, gtk3, wrapGAppsHook3, appstream-glib, desktop-file-utils +{ lib, stdenv, fetchurl, pkg-config, vala, gnome, adwaita-icon-theme, gtk3, wrapGAppsHook3, appstream-glib, desktop-file-utils , glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support , meson, ninja, python3 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config vala meson ninja python3 wrapGAppsHook3 gettext itstool libxml2 appstream-glib desktop-file-utils - gnome.adwaita-icon-theme + adwaita-icon-theme ]; buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support ]; diff --git a/pkgs/desktops/gnome/games/gnome-mines/default.nix b/pkgs/desktops/gnome/games/gnome-mines/default.nix index ee9509309e4c..364b24121c5d 100644 --- a/pkgs/desktops/gnome/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mines/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gnome, gtk3, wrapGAppsHook3 +{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gnome, adwaita-icon-theme, gtk3, wrapGAppsHook3 , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meson ninja vala pkg-config gettext itstool python3 libxml2 wrapGAppsHook3 desktop-file-utils ]; - buildInputs = [ gtk3 librsvg gnome.adwaita-icon-theme libgnome-games-support libgee ]; + buildInputs = [ gtk3 librsvg adwaita-icon-theme libgnome-games-support libgee ]; postPatch = '' chmod +x build-aux/meson_post_install.py diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 95941a08cb79..4e7af73c76cd 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "46.2"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-K8wzwpHkTVJEj9saRwqKsJ9TxCMEBPbuCoakir8qNGw="; + hash = "sha256-OKJqwUvlO2w0/9UuxmhSVpFEQHSF4xsvgXkn0hdmUSQ="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/games/gnome-taquin/default.nix b/pkgs/desktops/gnome/games/gnome-taquin/default.nix index 75f68731cb3c..4a7a058491c4 100644 --- a/pkgs/desktops/gnome/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome/games/gnome-taquin/default.nix @@ -4,6 +4,7 @@ , fetchpatch , pkg-config , gnome +, adwaita-icon-theme , gtk3 , wrapGAppsHook3 , librsvg @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { gtk3 librsvg gsound - gnome.adwaita-icon-theme + adwaita-icon-theme ]; passthru = { diff --git a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix index 8c86a4c090a1..628b3bbfe217 100644 --- a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix @@ -4,6 +4,7 @@ , fetchpatch , pkg-config , gnome +, adwaita-icon-theme , gtk3 , wrapGAppsHook3 , libxml2 @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { wrapGAppsHook3 itstool libxml2 - gnome.adwaita-icon-theme + adwaita-icon-theme pkg-config gettext meson diff --git a/pkgs/desktops/gnome/games/iagno/default.nix b/pkgs/desktops/gnome/games/iagno/default.nix index 4dc3e9eabdb7..5d3edfe12170 100644 --- a/pkgs/desktops/gnome/games/iagno/default.nix +++ b/pkgs/desktops/gnome/games/iagno/default.nix @@ -4,6 +4,7 @@ , pkg-config , gtk3 , gnome +, adwaita-icon-theme , gdk-pixbuf , librsvg , wrapGAppsHook3 @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme gdk-pixbuf librsvg gsound diff --git a/pkgs/desktops/gnome/games/lightsoff/default.nix b/pkgs/desktops/gnome/games/lightsoff/default.nix index 1884fe869122..c11c325194c3 100644 --- a/pkgs/desktops/gnome/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome/games/lightsoff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook3 +{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome, adwaita-icon-theme, gdk-pixbuf, librsvg, wrapGAppsHook3 , gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib , meson, ninja, python3 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { vala pkg-config wrapGAppsHook3 itstool gettext appstream-glib libxml2 meson ninja python3 ]; - buildInputs = [ gtk3 gnome.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; + buildInputs = [ gtk3 adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; postPatch = '' chmod +x build-aux/meson_post_install.py diff --git a/pkgs/desktops/gnome/games/quadrapassel/default.nix b/pkgs/desktops/gnome/games/quadrapassel/default.nix index d867ad4f16a3..6fd72f444690 100644 --- a/pkgs/desktops/gnome/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome/games/quadrapassel/default.nix @@ -5,6 +5,7 @@ pkg-config, gtk3, gnome, + adwaita-icon-theme, gdk-pixbuf, librsvg, gsound, @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { vala desktop-file-utils pkg-config - gnome.adwaita-icon-theme + adwaita-icon-theme libxml2 itstool gettext diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix index fac4a1fb5776..1199cbbf6066 100644 --- a/pkgs/desktops/gnome/games/tali/default.nix +++ b/pkgs/desktops/gnome/games/tali/default.nix @@ -5,6 +5,7 @@ pkg-config, gtk3, gnome, + adwaita-icon-theme, gdk-pixbuf, librsvg, libgnome-games-support, @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { python3 desktop-file-utils pkg-config - gnome.adwaita-icon-theme + adwaita-icon-theme libxml2 itstool gettext diff --git a/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix b/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix index e7d18a0d3c0d..c2dc78787de5 100644 --- a/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix @@ -1,7 +1,6 @@ { lib , fetchPypi , buildPythonApplication -, pythonRelaxDepsHook , poetry-core , colorama , packaging @@ -28,7 +27,6 @@ buildPythonApplication rec { gobject-introspection poetry-core wrapGAppsNoGuiHook - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/desktops/gnome/misc/gtkhtml/default.nix b/pkgs/desktops/gnome/misc/gtkhtml/default.nix index 9eb93bc8bc44..34dca7091557 100644 --- a/pkgs/desktops/gnome/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome/misc/gtkhtml/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, gtk3, intltool -, gnome, enchant, isocodes, gsettings-desktop-schemas }: +, gnome, adwaita-icon-theme, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gtkhtml"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config intltool ]; - buildInputs = [ gtk3 gnome.adwaita-icon-theme + buildInputs = [ gtk3 adwaita-icon-theme gsettings-desktop-schemas ]; propagatedBuildInputs = [ enchant isocodes ]; diff --git a/pkgs/desktops/lomiri/applications/lomiri-calculator-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-calculator-app/default.nix new file mode 100644 index 000000000000..0fcfa9dc1bf3 --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri-calculator-app/default.nix @@ -0,0 +1,108 @@ +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + gitUpdater, + nixosTests, + cmake, + gettext, + lomiri-ui-toolkit, + pkg-config, + qqc2-suru-style, + qtbase, + wrapQtAppsHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-calculator-app"; + version = "4.0.2"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/apps/lomiri-calculator-app"; + rev = "v${finalAttrs.version}"; + hash = "sha256-NyLEis+rIx2ELUiGrGCeFX/tlt43UgPBkb9aUs1tkgk="; + }; + + patches = [ + # Remove when version > 4.0.2 + (fetchpatch { + name = "0001-lomiri-calculator-app-Fix-GNUInstallDirs-variable-concatenations.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/commit/0bd6ef6c3470bcecf90a88e1e5568a5ce5ad6d06.patch"; + hash = "sha256-2FCLZ/LY3xTPGDmX+M8LiqlbcNQJu5hulkOf+V+3hWY="; + }) + + # Remove when version > 4.0.2 + # Must apply separately because merge has hunk with changes to new file before hunk that inits said file + (fetchpatch { + name = "0002-lomiri-calculator-app-Migrate-to-C++-app.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/commit/035e5b8000ad1c8149a6b024fa8fed2667fbb659.patch"; + hash = "sha256-2BTFOrH/gjIzXBmnTPMi+mPpUA7e/+6O/E3pdxhjZYQ="; + }) + (fetchpatch { + name = "0003-lomiri-calculator-app-Call-i18n.bindtextdomain.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/commit/7cb5e56958e41a8f7a51e00d81d9b2bc24de32b0.patch"; + hash = "sha256-k/Civ0+SCNDDok9bUdb48FKC+LPlM13ASFP6CbBvBVs="; + }) + ]; + + postPatch = + # We don't want absolute paths in desktop files + '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'ICON ''${LOMIRI-CALCULATOR-APP_DIR}/''${ICON_FILE}' 'ICON ''${APP_HARDCODE}' \ + --replace-fail 'SPLASH ''${LOMIRI-CALCULATOR-APP_DIR}/''${SPLASH_FILE}' 'SPLASH lomiri-app-launch/splash/''${APP_HARDCODE}.svg' + '' + + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'add_subdirectory(tests)' "" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + + # QML + lomiri-ui-toolkit + qqc2-suru-style + ]; + + cmakeFlags = [ + (lib.cmakeBool "CLICK_MODE" false) + (lib.cmakeBool "INSTALL_TESTS" false) + ]; + + # No tests we can actually run (just autopilot) + doCheck = false; + + postInstall = '' + mkdir -p $out/share/{icons/hicolor/scalable/apps,lomiri-app-launch/splash} + + ln -s $out/share/{lomiri-calculator-app,icons/hicolor/scalable/apps}/lomiri-calculator-app.svg + ln -s $out/share/{lomiri-calculator-app/lomiri-calculator-app-splash.svg,lomiri-app-launch/splash/lomiri-calculator-app.svg} + ''; + + passthru = { + tests.vm = nixosTests.lomiri-calculator-app; + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = { + description = "Powerful and easy to use calculator for Ubuntu Touch, with calculations history and formula validation"; + homepage = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app"; + changelog = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/blob/v${finalAttrs.version}/ChangeLog"; + license = lib.licenses.gpl3Only; + mainProgram = "lomiri-calculator-app"; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix new file mode 100644 index 000000000000..6c9fbc474ebd --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix @@ -0,0 +1,221 @@ +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + gitUpdater, + nixosTests, + cmake, + content-hub, + geonames, + gettext, + libusermetrics, + lomiri-sounds, + lomiri-ui-toolkit, + makeWrapper, + pkg-config, + qtbase, + qtdeclarative, + qtmultimedia, + qtpositioning, + qtsystems, + runtimeShell, + u1db-qt, + wrapQtAppsHook, + xvfb-run, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-clock-app"; + version = "4.0.3"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/apps/lomiri-clock-app"; + rev = "v${finalAttrs.version}"; + hash = "sha256-q/hdnwHO97bhL0W3VsdHwjPvGs6GhWbDiVLCx4NiR50="; + }; + + patches = [ + # Fix dispatching to clock app via LUD + # Remove when version > 4.0.3 + (fetchpatch { + name = "0001-lomiri-clock-app-Fix-non-click-lomiri-url-dispatcher-support.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/493888b41489b360415d1a0d0e431754afdee2b0.patch"; + hash = "sha256-sI7YDrWjV0bSAq0vdSvNcWCLhmEEb10T7jd2kYfSfZU="; + }) + + # Fix GNUInstallDirs variables usage + # Remove when https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/merge_requests/215 merged & in release + (fetchpatch { + name = "0002-lomiri-clock-app-Fix-GNUInstallDirs-variable-concatenations-in-CMake.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/33c62d0382f69462de0567628d7a6ef162944e12.patch"; + hash = "sha256-JEoRjc6RugtznNtgJsXz9wnAL/7fkoog40EVl7uu2pc="; + }) + + # Fix installation of splash icon + # Remove when https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/merge_requests/216 merged & in release + (fetchpatch { + name = "0003-lomiri-clock-app-Fix-splash-file-installation-in-non-clock-mode.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/97fd6fd91ee787dfe107bd36bc895f2ff234b5e3.patch"; + hash = "sha256-g9eR6yYgKFDohuZMs1Ub0TwPM2AWbwWLDvZMrT4gMls="; + }) + + # Port from qmlscene to dedicated C++ entry, and apply abunch of fixes that this move enables + # Remove when https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/merge_requests/217 merged & in release + (fetchpatch { + name = "0004-lomiri-clock-app-Migrate-to-C++-app.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/c690d65baf2d28f99364dec2244f8d4ebdb09178.patch"; + hash = "sha256-JCQFlHFAXbgiSGNtEsq/khblhAD/3BdE68Qctn7j5T0="; + }) + (fetchpatch { + name = "0005-lomiri-clock-app-Call-i18n.bindtextdomain-and-fix-app-icon-load.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/0619730ca639228b1c0a3403082a6a13e2fe3ff3.patch"; + hash = "sha256-NQQYvJ141fU2iQ+xzYoNkuuzvqQg1BGZNGq24u8i1is="; + }) + (fetchpatch { + name = "0006-lomiri-clock-app-Pass-through-project-version.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/ae1467fe44813eef2fc6cc4b9d6ddc02edee7640.patch"; + hash = "sha256-E6yk5H+YVH4oSg6AIAJ+Rynu0HFkNomX7sTjM/x37PU="; + }) + (fetchpatch { + name = "0007-lomiri-clock-app-Fix-tests-after-module-changes.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/40cbd7847c4a850184e553ac5b8981672b7deed0.patch"; + hash = "sha256-AA4KRYZNBQ0/Nk65kyzzDFhs/zWO7fb5f2Toy1diPBg="; + }) + + # Don't ignore PATH when looking for qmltestrunner, saves us a patch for hardcoded fallback + # Remove when https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/merge_requests/218 merged & in release + (fetchpatch { + name = "0008-lomiri-clock-app-tests-Drop-NO_DEFAULT_PATH.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/190ef47e2efaaf139920d0556e0522f95479ea95.patch"; + hash = "sha256-jy4E+VfVyRu99eGqbhlYi/xjDgPajozHPSlqEcGVOA4="; + }) + + # Make tests honour BUILD_TESTING + # Remove when https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/merge_requests/219 merged & in release + (fetchpatch { + name = "0009-lomiri-clock-app-tests-Honour-BUILD_TESTING.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/b0ca583238f011e23a99286a1d2b61f2dcd85303.patch"; + hash = "sha256-TyM5Y8BRAqinvZiZ5TEXd5caVesFluPi6iGmTS1wRlI="; + }) + ]; + + postPatch = '' + # Part of 493888b41489b360415d1a0d0e431754afdee2b0 patch, but neither fetchpatch nor fetchpatch2 can handle a rename-only change to a file + # Remove when version > 4.0.3 + mv clock.ubports_clock.url-dispatcher lomiri-clock-app.url-dispatcher + + # QT_IMPORTS_DIR returned by qmake -query is broken + substituteInPlace CMakeLists.txt \ + --replace-fail 'qmake -query QT_INSTALL_QML' 'echo ''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}' \ + + # We don't want absolute paths in desktop files + substituteInPlace lomiri-clock-app.desktop.in.in \ + --replace-fail '@ICON@' 'lomiri-clock-app' \ + --replace-fail '@SPLASH@' 'lomiri-app-launch/splash/lomiri-clock-app.svg' + + # Path to alarm sounds + # TODO maybe change to /run/current-system/sw instead to pick up all installed sounds? + substituteInPlace app/alarm/AlarmSound.qml backend/modules/Alarm/sound.cpp \ + --replace-fail '/usr' '${lomiri-sounds}' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + makeWrapper + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + geonames + qtbase + + # QML + content-hub + libusermetrics + lomiri-ui-toolkit + qtdeclarative + qtmultimedia + qtpositioning + qtsystems + u1db-qt + ]; + + nativeCheckInputs = [ + qtdeclarative # qmltestrunner + xvfb-run + ]; + + dontWrapGApps = true; + + cmakeFlags = [ + (lib.cmakeBool "CLICK_MODE" false) + (lib.cmakeBool "INSTALL_TESTS" false) + (lib.cmakeBool "USE_XVFB" true) + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" ( + lib.concatStringsSep ";" [ + # Exclude tests + "-E" + (lib.strings.escapeShellArg "(${ + lib.concatStringsSep "|" [ + # Runs into ShapeMaterial codepath in lomiri-ui-toolkit which needs OpenGL, see LUITK for details + "^AlarmLabel" + "^AlarmRepeat" + "^AlarmSound" + ] + })") + ] + )) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + preCheck = + let + listToQtVar = suffix: lib.makeSearchPathOutput "bin" suffix; + in + '' + export QT_PLUGIN_PATH=${listToQtVar qtbase.qtPluginPrefix [ qtbase ]} + export QML2_IMPORT_PATH=${ + listToQtVar qtbase.qtQmlPrefix ( + [ + content-hub + lomiri-ui-toolkit + qtmultimedia + u1db-qt + ] + ++ lomiri-ui-toolkit.propagatedBuildInputs + ) + } + ''; + + # Parallelism breaks xvfb-run usage + enableParallelChecking = false; + + postInstall = '' + mkdir -p $out/share/{icons/hicolor/scalable/apps,lomiri-app-launch/splash} + + ln -s $out/share/lomiri-clock-app/clock-app.svg $out/share/icons/hicolor/scalable/apps/lomiri-clock-app.svg + ln -s $out/share/lomiri-clock-app/clock-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-clock-app.svg + ''; + + passthru = { + tests.vm = nixosTests.lomiri-clock-app; + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = { + description = "Simple and easy to use clock for Ubuntu Touch, with time zone support for cities and timer and count down functions"; + homepage = "https://gitlab.com/ubports/development/apps/lomiri-clock-app"; + changelog = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/blob/v${finalAttrs.version}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.lomiri.members; + mainProgram = "lomiri-clock-app"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix index d628da0746fa..8d6b3884ad37 100644 --- a/pkgs/desktops/lomiri/applications/lomiri/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix @@ -208,7 +208,7 @@ stdenv.mkDerivation (finalAttrs: { lomiri-settings-components lomiri-thumbnailer qtmultimedia - # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043 + telephony-service ]; nativeCheckInputs = [ diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 03d8e9451bbb..5cf0fe22caaf 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -9,6 +9,8 @@ let in { #### Core Apps lomiri = callPackage ./applications/lomiri { }; + lomiri-calculator-app = callPackage ./applications/lomiri-calculator-app { }; + lomiri-clock-app = callPackage ./applications/lomiri-clock-app { }; lomiri-filemanager-app = callPackage ./applications/lomiri-filemanager-app { }; lomiri-system-settings-unwrapped = callPackage ./applications/lomiri-system-settings { }; lomiri-system-settings-security-privacy = callPackage ./applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix { }; @@ -51,6 +53,7 @@ let history-service = callPackage ./services/history-service { }; lomiri-download-manager = callPackage ./services/lomiri-download-manager { }; lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { }; + lomiri-polkit-agent = callPackage ./services/lomiri-polkit-agent { }; lomiri-thumbnailer = callPackage ./services/lomiri-thumbnailer { }; lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { }; mediascanner2 = callPackage ./services/mediascanner2 { }; diff --git a/pkgs/desktops/lomiri/services/history-service/default.nix b/pkgs/desktops/lomiri/services/history-service/default.nix index 86866db3ce92..8e386ac5c1a2 100644 --- a/pkgs/desktops/lomiri/services/history-service/default.nix +++ b/pkgs/desktops/lomiri/services/history-service/default.nix @@ -8,7 +8,7 @@ , dbus , dbus-test-runner , dconf -, gnome +, gnome-keyring , libphonenumber , libqtdbustest , pkg-config @@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { dbus dbus-test-runner dconf - gnome.gnome-keyring + gnome-keyring telepathy-mission-control xvfb-run ]; diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix index 6566ec4601d3..fc552881f469 100644 --- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix @@ -101,8 +101,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_DOC" true) # lacks QML docs, needs qdoc: https://github.com/NixOS/nixpkgs/pull/245379 ]; - # Currently broken: https://github.com/NixOS/nixpkgs/pull/314043 - doCheck = false; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; postInstall = '' substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \ diff --git a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix new file mode 100644 index 000000000000..710792e3a813 --- /dev/null +++ b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix @@ -0,0 +1,104 @@ +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + gitUpdater, + cmake, + cmake-extras, + dbus, + dbus-test-runner, + gtest, + libnotify, + pkg-config, + polkit, + properties-cpp, + python3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-polkit-agent"; + version = "0.1"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-polkit-agent"; + rev = finalAttrs.version; + hash = "sha256-nA2jkyNQC1YIMpJkfJt2F97txGUT4UO7+aSgzr7IUU0="; + }; + + patches = [ + # Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/2 merged & in release + (fetchpatch { + name = "0001-lomiri-polkit-agent-Fix-authentication-test-with-libnotify-gteq-0.8.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/commit/415d897735b9005426ec29348a882b9080fcd808.patch"; + hash = "sha256-fAJJ5Bz4P76arhSmiWVa/8S+mb/NqPr65Nm3MkwKtjA="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/9 merged & in release + (fetchpatch { + name = "0002-lomiri-polkit-agent-Make-tests-optional-and-use-BUILD_TESTING.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/commit/908177fa24b79b06161116c3c274357122984d36.patch"; + hash = "sha256-duHx4iNqgAlS649BO1s6D5E2SX9MPRCKb+mit+2cybM="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/10 merged & in release + (fetchpatch { + name = "0003-lomiri-polkit-agent-Explicitly-look-for-properties-cpp.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/commit/08bf36e50025aeefc5ba388d6d0f84d760add9cb.patch"; + hash = "sha256-OFzj/FFXm1fX6+1GY97CON7Nne9wVPmQAxVFpP9rIpU="; + }) + ]; + + postPatch = '' + # Partial application of still-under-discussion https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/8 + substituteInPlace data/lomiri-polkit-agent.service.in \ + --replace-fail 'After=lomiri-full-greeter.service lomiri-full-shell.service lomiri-greeter.service lomiri-shell.service' 'After=graphical-session.target' \ + --replace-fail 'PartOf=' 'PartOf=lomiri.service ' \ + --replace-fail 'WantedBy=' 'WantedBy=lomiri.service ' + + # Workaround to avoid coredump on logout + # https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/issues/1 + substituteInPlace service/main.cpp \ + --replace-fail 'retval.set_value(0);' 'try { retval.set_value(0); } catch (const std::future_error& ex) {}' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + cmake-extras + libnotify + polkit + properties-cpp + ]; + + nativeCheckInputs = [ + dbus + (python3.withPackages (ps: with ps; [ python-dbusmock ])) + ]; + + checkInputs = [ + dbus-test-runner + gtest + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + # Parallelism breaks dbus during tests + enableParallelChecking = false; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "Policy kit agent for the Lomiri desktop"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent"; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/services/telephony-service/default.nix b/pkgs/desktops/lomiri/services/telephony-service/default.nix index 15f6ab167972..a21017c8b784 100644 --- a/pkgs/desktops/lomiri/services/telephony-service/default.nix +++ b/pkgs/desktops/lomiri/services/telephony-service/default.nix @@ -13,7 +13,7 @@ , dconf , gettext , glib -, gnome +, gnome-keyring , history-service , libnotify , libphonenumber @@ -52,10 +52,17 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Remove when https://gitlab.com/ubports/development/core/telephony-service/-/merge_requests/90 merged & in release (fetchpatch { - name = "0001-telephony-service-CMakeLists-Make-tests-optional.patch"; - url = "https://gitlab.com/ubports/development/core/telephony-service/-/commit/9a8297bcf9b34d77ffdae3dfe4ad2636022976fb.patch"; + name = "0001-lomiri-telephony-service-CMakeLists-Make-tests-optional.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/9a8297bcf9b34d77ffdae3dfe4ad2636022976fb.patch"; hash = "sha256-Za4ZGKnw9iz2RP1LzLhKrEJ1vLUufWk8J07LmWDW40E="; }) + + # Remove when version > 0.5.3 + (fetchpatch { + name = "0002-lomiri-telephony-service-Fix-gettext-funcs-in-wrong-namespace.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/18e0ba8e025b097eef1217d97d98ef4a4940fe84.patch"; + hash = "sha256-vOIy+B/OQeccsVn4pXsnr8LYyEapqbebW1I6dBg5u2c="; + }) ]; postPatch = '' @@ -114,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ dbus-test-runner dconf - gnome.gnome-keyring + gnome-keyring telepathy-mission-control xvfb-run ]; @@ -195,7 +202,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Only; maintainers = teams.lomiri.members; platforms = platforms.linux; - # Completely broken until https://github.com/NixOS/nixpkgs/pull/314043 is merged - broken = true; }; }) diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 7006e66d136c..4baa57b6c8c1 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -11,7 +11,7 @@ , libXpresent , libXres , libstartup_notification -, gnome +, zenity , glib , gtk3 , mate-desktop @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { libXres libstartup_notification gtk3 - gnome.zenity + zenity mate-desktop mate-settings-daemon ]; postPatch = '' substituteInPlace src/core/util.c \ - --replace-fail 'argvl[i++] = "zenity"' 'argvl[i++] = "${gnome.zenity}/bin/zenity"' + --replace-fail 'argvl[i++] = "zenity"' 'argvl[i++] = "${zenity}/bin/zenity"' ''; env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 2762c0ce3605..db6edf8df3f0 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -5,7 +5,6 @@ , gettext , itstool , glib -, gnome , gtk-layer-shell , gtk3 , libmateweather @@ -13,6 +12,7 @@ , librsvg , libxml2 , dconf +, dconf-editor , mate-desktop , mate-menus , hicolor-icon-theme @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { gtk3 # See https://github.com/mate-desktop/mate-panel/issues/1402 # This is propagated for mate_panel_applet_settings_new and applet's wrapGAppsHook3 - gnome.dconf-editor + dconf-editor ]; # Needed for Wayland support. diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index f796053cec92..39e95a5fe364 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -18,13 +17,13 @@ stdenv.mkDerivation rec { pname = "elementary-feedback"; - version = "7.1.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "feedback"; rev = version; - sha256 = "sha256-hAObgD2Njg1We0rGEu508khoBo+hj0DQAB7N33CVDiM="; + sha256 = "sha256-BW7el8Fc3VPHE8OSb8BaOa+O82lSgsSK64bQolo9xcA="; }; patches = [ @@ -33,13 +32,6 @@ stdenv.mkDerivation rec { # https://github.com/ximion/appstream/blob/v0.15.2/src/as-pool.c#L117 # https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location ./fix-metadata-path.patch - - # Add support for AppStream 1.0. - # https://github.com/elementary/feedback/pull/102 - (fetchpatch { - url = "https://github.com/elementary/feedback/commit/037b20328f5200a0dac25e6835c0c3f8a7c36f39.patch"; - hash = "sha256-tjUNTCsEBjy/3lzwyIwR4VED57ATiG2CWCmRh7qps+4="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 58a4ba65f1ac..26d3f16a523a 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -98,14 +98,12 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-print-shim = callPackage ./desktop/elementary-print-shim { }; elementary-session-settings = callPackage ./desktop/elementary-session-settings { - inherit (gnome) gnome-session gnome-keyring; + inherit (gnome) gnome-session; }; elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { }; - file-roller-contract = callPackage ./desktop/file-roller-contract { - inherit (gnome) file-roller; - }; + file-roller-contract = callPackage ./desktop/file-roller-contract { }; gala = callPackage ./desktop/gala { }; @@ -236,11 +234,11 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-screenshot-tool = throw "The ‘pantheon.elementary-screenshot-tool’ alias was removed on 2022-02-02, please use ‘pantheon.elementary-screenshot’ directly."; # added 2021-07-21 - evince = pkgs.gnome.evince; # added 2022-03-18 + evince = pkgs.evince; # added 2022-03-18 extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01 - file-roller = pkgs.gnome.file-roller; # added 2022-03-12 + file-roller = pkgs.file-roller; # added 2022-03-12 gnome-bluetooth-contract = throw "pantheon.gnome-bluetooth-contract has been removed, abandoned by upstream."; # added 2022-06-30 diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index f609bf6cc060..14c2244a760a 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -16,7 +16,7 @@ , xfce4-panel , xfconf , curl -, gnome +, zenity , jq , xclip }: @@ -54,7 +54,7 @@ mkXfceDerivation { # For Imgur upload action # https://gitlab.xfce.org/apps/xfce4-screenshooter/-/merge_requests/51 gappsWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ curl gnome.zenity jq xclip ]} + --prefix PATH : ${lib.makeBinPath [ curl zenity jq xclip ]} ) ''; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix index 1fd2fd8dc09e..f4f5108df437 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix @@ -1,7 +1,7 @@ { lib }: let - sources = lib.importJSON ./sources.json; + sources = import ./sources.nix; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix index fcad50017dba..6d5b1b036e5b 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix @@ -2,7 +2,7 @@ let variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; - sources = lib.importJSON ./sources.json; + sources = import ./sources.nix; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix index fdde25bd361d..87beaf8ddaf8 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix @@ -1,7 +1,7 @@ { lib }: let - sources = lib.importJSON ./sources.json; + sources = import ./sources.nix; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix index 6c57b542e65b..e6c000201415 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix @@ -2,7 +2,7 @@ let variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; - sources = lib.importJSON ./sources.json; + sources = import ./sources.nix; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix index 1c776f69e2db..a4d5b1fc432e 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix @@ -1,7 +1,7 @@ { lib }: let - sources = lib.importJSON ./sources.json; + sources = import ./sources.nix; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix index 573fc17b51be..4d357969f0ae 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix @@ -2,7 +2,7 @@ let variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; - sources = lib.importJSON ./sources.json; + sources = import ./sources.nix; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix index 369822fa1ef7..422e5f21e96c 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix @@ -1,7 +1,7 @@ { lib }: let - sources = lib.importJSON ./sources.json; + sources = import ./sources.nix; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix index 52641c690bf0..47bd2a5c9f9f 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix @@ -2,7 +2,7 @@ let variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; - sources = lib.importJSON ./sources.json; + sources = import ./sources.nix; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix index 454e92834bb0..4eef76cb6312 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix @@ -1,7 +1,7 @@ { lib }: let - sources = lib.importJSON ./sources.json; + sources = import ./sources.nix; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix index 3a50ad669c2e..873e0ce3549d 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix @@ -2,7 +2,7 @@ let variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; - sources = lib.importJSON ./sources.json; + sources = import ./sources.nix; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix index d9309d9ce0b0..b79b39902226 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix @@ -1,7 +1,7 @@ { lib }: let - sources = lib.importJSON ./sources.json; + sources = import ./sources.nix; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix index e069a8521d72..b8bb1cbf2bab 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix @@ -2,7 +2,7 @@ let variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; - sources = lib.importJSON ./sources.json; + sources = import ./sources.nix; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.${variant}.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix index 846870869910..56028d7f25e4 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix @@ -1,7 +1,7 @@ { lib }: let - sources = lib.importJSON ./sources.json; + sources = import ./sources.nix; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix index 2b0cac664983..ee8226f6903d 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix @@ -2,7 +2,7 @@ let variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; - sources = lib.importJSON ./sources.json; + sources = import ./sources.nix; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.nix b/pkgs/development/compilers/adoptopenjdk-bin/sources.nix new file mode 100644 index 000000000000..0d5dd3c6cd48 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.nix @@ -0,0 +1 @@ +builtins.fromJSON (builtins.readFile ./sources.json) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index bd59b66f51fa..8542fd52d04f 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,34 +1,18 @@ -{ lib, stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten, +{ lib, stdenv, cmake, python3, fetchFromGitHub, emscripten, gtest, lit, nodejs, filecheck }: stdenv.mkDerivation rec { pname = "binaryen"; - version = "116"; + version = "117"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - hash = "sha256-gMwbWiP+YDCVafQMBWhTuJGWmkYtnhEdn/oofKaUT08="; + hash = "sha256-QYJkrvwcUWbFV5oQdP11JuVmfOTYaFWGQGksboQ1d58="; }; - # FIXME: remove for next release - patches = [ - (fetchpatch { - name = "nodejs-20.patch"; - url = "https://github.com/WebAssembly/binaryen/commit/889422e0c92552ff484659f9b41e777ba7ab35c1.patch"; - hash = "sha256-acM8mytL9nhm4np9tpUbd1X0wJ7y308HV2fvgcAW1lY="; - }) - - # Fix fmin tests on gcc-13: https://github.com/WebAssembly/binaryen/pull/5994 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/WebAssembly/binaryen/commit/1e17dfb695a19d5d41f1f88411fbcbc5f2408c8f.patch"; - hash = "sha256-5JZh15CXkg5XdTG8eRJXPwO+zmymYeFjKbHutRPTmlU="; - }) - ]; - nativeBuildInputs = [ cmake python3 ]; preConfigure = '' diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 125324c96dac..2bb2340261c2 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20231112"; + version = "20240317"; src = fetchurl { url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "sha256-oH1/QZX8cF9sZikP5XpNdfsMepJrgW+uX0OGHhJVbmw="; + sha256 = "sha256-axJQrCHAW90gncUV2bYDezC1VVooTddB/wWRqChIt84="; }; dontUnpack = true; diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 11ece5397166..246cc9ade717 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -18,6 +18,7 @@ assert if type == "sdk" then packages != null else true; , libuuid , zlib , libkrb5 +, openssl , curl , lttng-ust_2_12 , testers @@ -51,6 +52,21 @@ let sigtool = callPackage ./sigtool.nix {}; signAppHost = callPackage ./sign-apphost.nix {}; + hasILCompiler = + lib.versionAtLeast version (if targetRid == "osx-arm64" then "8" else "7"); + + extraTargets = writeText "extra.targets" ('' + + '' + lib.optionalString hasILCompiler '' + + + + '' + lib.optionalString stdenv.isDarwin '' + + '' + '' + + ''); + in mkCommon type rec { inherit pname version; @@ -70,6 +86,7 @@ mkCommon type rec { icu libkrb5 curl + xmlstarlet ] ++ lib.optional stdenv.isLinux lttng-ust_2_12; src = fetchurl ( @@ -79,15 +96,15 @@ mkCommon type rec { sourceRoot = "."; - postPatch = if type == "sdk" && stdenv.isDarwin then '' + postPatch = if type == "sdk" then ('' xmlstarlet ed \ --inplace \ -s //_:Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${signAppHost}" \ + -i \$prev -t attr -n Project -v "${extraTargets}" \ sdk/*/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.targets - + '' + lib.optionalString stdenv.isDarwin '' codesign --remove-signature packs/Microsoft.NETCore.App.Host.osx-*/*/runtimes/osx-*/native/{apphost,singlefilehost} - '' else null; + '') else null; dontPatchELF = true; noDumpEnvVars = true; @@ -135,7 +152,7 @@ mkCommon type rec { ''; passthru = { - inherit icu; + inherit icu hasILCompiler; } // lib.optionalAttrs (type == "sdk") { packages = mkNugetDeps { name = "${pname}-${version}-deps"; diff --git a/pkgs/development/compilers/dotnet/common.nix b/pkgs/development/compilers/dotnet/common.nix index e26fd0e33770..2fea0e2773b1 100644 --- a/pkgs/development/compilers/dotnet/common.nix +++ b/pkgs/development/compilers/dotnet/common.nix @@ -1,12 +1,19 @@ # TODO: switch to stdenvNoCC { stdenv +, stdenvNoCC , lib , writeText , testers , runCommand +, runCommandWith , expect , curl , installShellFiles +, callPackage +, zlib +, swiftPackages +, darwin +, icu }: type: args: stdenv.mkDerivation (finalAttrs: args // { doInstallCheck = true; @@ -43,9 +50,11 @@ mkDotnetTest = { name, + stdenv ? stdenvNoCC, template, usePackageSource ? false, build, + buildInputs ? [], # TODO: use correct runtimes instead of sdk runtime ? finalAttrs.finalPackage, runInputs ? [], @@ -54,19 +63,20 @@ }: let sdk = finalAttrs.finalPackage; - built = runCommand "dotnet-test-${name}" { - buildInputs = [ sdk ]; - # make sure ICU works in a sandbox - propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile + '' - (allow network-inbound (local ip)) - (allow mach-lookup (global-name "com.apple.FSEvents")) - ''; + built = runCommandWith { + name = "dotnet-test-${name}"; + inherit stdenv; + derivationArgs = { + buildInputs = [ sdk ] ++ buildInputs; + # make sure ICU works in a sandbox + propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile; + }; } ('' HOME=$PWD/.home dotnet new nugetconfig dotnet nuget disable source nuget '' + lib.optionalString usePackageSource '' - dotnet nuget add source ${finalAttrs.finalPackage.packages} + dotnet nuget add source ${sdk.packages} '' + '' dotnet new ${template} -n test -o . '' + build); @@ -96,6 +106,8 @@ [[ "$output" =~ Hello,?\ World! ]] && touch "$out" ''; + patchNupkgs = callPackage ./patch-nupkgs.nix {}; + in { version = testers.testVersion ({ package = finalAttrs.finalPackage; @@ -103,7 +115,7 @@ command = "dotnet --info"; }); } - // lib.optionalAttrs (type == "sdk") { + // lib.optionalAttrs (type == "sdk") ({ console = mkDotnetTest { name = "console"; template = "console"; @@ -113,8 +125,8 @@ publish = mkDotnetTest { name = "publish"; template = "console"; - build = "dotnet publish -o $out"; - run = checkConsoleOutput "$src/test"; + build = "dotnet publish -o $out/bin"; + run = checkConsoleOutput "$src/bin/test"; }; self-contained = mkDotnetTest { @@ -130,20 +142,20 @@ name = "single-file"; template = "console"; usePackageSource = true; - build = "dotnet publish --use-current-runtime -p:PublishSingleFile=true -o $out"; + build = "dotnet publish --use-current-runtime -p:PublishSingleFile=true -o $out/bin"; runtime = null; - run = checkConsoleOutput "$src/test"; + run = checkConsoleOutput "$src/bin/test"; }; web = mkDotnetTest { name = "web"; template = "web"; - build = "dotnet publish -o $out"; + build = "dotnet publish -o $out/bin"; runInputs = [ expect curl ]; run = '' expect <<"EOF" set status 1 - spawn $env(src)/test + spawn $env(src)/bin/test proc abort { } { exit 2 } expect_before default abort expect -re {Now listening on: ([^\r]+)\r} { @@ -165,6 +177,30 @@ ''; runAllowNetworking = true; }; - } // args.passthru.tests or {}; + } // lib.optionalAttrs finalAttrs.finalPackage.hasILCompiler { + aot = mkDotnetTest { + name = "aot"; + stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv; + template = "console"; + usePackageSource = true; + buildInputs = + [ patchNupkgs + zlib + ] ++ lib.optional stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ + swiftPackages.swift + Foundation + CryptoKit + GSS + ICU + ]); + build = '' + dotnet restore -p:PublishAot=true + patch-nupkgs .home/.nuget/packages + dotnet publish -p:PublishAot=true -o $out/bin + ''; + runtime = null; + run = checkConsoleOutput "$src/bin/test"; + }; + }) // args.passthru.tests or {}; } // args.passthru or {}; }) diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index 4ce789e00b91..4e82e80a044f 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -37,6 +37,8 @@ in { passthru = { inherit (vmr) icu targetRid; + # ilcompiler is currently broken: https://github.com/dotnet/source-build/issues/1215 + hasILCompiler = false; }; meta = vmr.meta // { diff --git a/pkgs/development/compilers/dotnet/patch-nupkgs.nix b/pkgs/development/compilers/dotnet/patch-nupkgs.nix index 572211b1b378..4fcc53015c90 100644 --- a/pkgs/development/compilers/dotnet/patch-nupkgs.nix +++ b/pkgs/development/compilers/dotnet/patch-nupkgs.nix @@ -24,7 +24,7 @@ let openssl ] ++ lib.optional stdenv.isLinux lttng-ust_2_12); -in writeShellScriptBin "patch-nupkgs" '' +in writeShellScriptBin "patch-nupkgs" ('' set -euo pipefail shopt -s nullglob isELF() { @@ -71,4 +71,16 @@ in writeShellScriptBin "patch-nupkgs" '' touch .nix-patched popd done -'' +'' + lib.optionalString stdenv.isDarwin '' + for x in microsoft.dotnet.ilcompiler/*; do + # .nupkg.metadata is written last, so we know the packages is complete + [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ + && [[ ! -f "$x"/.nix-patched ]] || continue + echo "Patching package $x" + pushd "$x" + sed -i 's: -no_code_signature_warning::g' build/Microsoft.NETCore.Native.targets + sed -i 's:Include="-ld_classic"::g' build/Microsoft.NETCore.Native.Unix.targets + touch .nix-patched + popd + done +'') diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index fbcbd84bf9f6..486ad2636a0e 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -7,46 +7,48 @@ set -Eeuo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" release () { - local content="$1" - local version="$2" + local content="$1" + local version="$2" - jq -r '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content" + jq -r '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content" } release_files () { - local release="$1" - local expr="$2" + local release="$1" + local expr="$2" - jq -r '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" + jq -r '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" } release_platform_attr () { - local release_files="$1" - local platform="$2" - local attr="$3" + local release_files="$1" + local platform="$2" + local attr="$3" - jq -r '.[] | select((.rid == "'"$platform"'") and (.name | contains("composite") | not)) | ."'"$attr"'"' <<< "$release_files" + jq -r '.[] | select((.rid == "'"$platform"'") and (.name | contains("composite") | not)) | ."'"$attr"'"' <<< "$release_files" } platform_sources () { - local release_files="$1" - local platforms=( - "x86_64-linux linux-x64" - "aarch64-linux linux-arm64" - "x86_64-darwin osx-x64" - "aarch64-darwin osx-arm64" - ) + local release_files="$1" + local platforms=( + "x86_64-linux linux-x64" + "aarch64-linux linux-arm64" + "x86_64-darwin osx-x64" + "aarch64-darwin osx-arm64" + ) - echo "srcs = {" - for kv in "${platforms[@]}"; do - local nix_platform=${kv%% *} - local ms_platform=${kv##* } + echo "srcs = {" + local kv + for kv in "${platforms[@]}"; do + local nix_platform=${kv%% *} + local ms_platform=${kv##* } + local url hash - local url=$(release_platform_attr "$release_files" "$ms_platform" url) - local hash=$(release_platform_attr "$release_files" "$ms_platform" hash) + url=$(release_platform_attr "$release_files" "$ms_platform" url) + hash=$(release_platform_attr "$release_files" "$ms_platform" hash) - [[ -z "$url" || -z "$hash" ]] && continue - echo " $nix_platform = { + [[ -z "$url" || -z "$hash" ]] && continue + echo " $nix_platform = { url = \"$url\"; sha512 = \"$hash\"; };" @@ -55,15 +57,13 @@ platform_sources () { } generate_package_list() { - local version pkgs nuget_url - version="$1" + local version="$1" shift - pkgs=( "$@" ) + local pkgs=( "$@" ) nuget_url pkg url hash nuget_url="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')" for pkg in "${pkgs[@]}"; do - local url hash url="${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg" hash="$(nix-prefetch-url "$url")" if [[ -z "$hash" ]]; then @@ -76,8 +76,10 @@ generate_package_list() { } version_older () { - cur_version=$1 - max_version=$2 + local cur_version=$1 + local max_version=$2 + local result + result=$(nix-instantiate -I ../../../../. \ --eval -E "(import ../../../../. {}).lib.versionOlder \"$cur_version\" \"$max_version\"") if [[ "$result" == "true" ]]; then @@ -112,15 +114,15 @@ aspnetcore_packages () { # This should not happend in minor or bugfix updates, but probably happens # with every new major .NET release. local pkgs=( - "Microsoft.AspNetCore.App.Runtime.linux-arm" - "Microsoft.AspNetCore.App.Runtime.linux-arm64" - "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" - "Microsoft.AspNetCore.App.Runtime.linux-musl-x64" - "Microsoft.AspNetCore.App.Runtime.linux-x64" - "Microsoft.AspNetCore.App.Runtime.osx-x64" - "Microsoft.AspNetCore.App.Runtime.win-arm64" - "Microsoft.AspNetCore.App.Runtime.win-x64" - "Microsoft.AspNetCore.App.Runtime.win-x86" + "Microsoft.AspNetCore.App.Runtime.linux-arm" + "Microsoft.AspNetCore.App.Runtime.linux-arm64" + "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" + "Microsoft.AspNetCore.App.Runtime.linux-musl-x64" + "Microsoft.AspNetCore.App.Runtime.linux-x64" + "Microsoft.AspNetCore.App.Runtime.osx-x64" + "Microsoft.AspNetCore.App.Runtime.win-arm64" + "Microsoft.AspNetCore.App.Runtime.win-x64" + "Microsoft.AspNetCore.App.Runtime.win-x86" ) # These packages are currently broken on .NET 8 @@ -133,9 +135,9 @@ aspnetcore_packages () { # Packages that only apply to .NET 6 and up if ! version_older "$version" "6"; then pkgs+=( - "Microsoft.AspNetCore.App.Ref" - "Microsoft.AspNetCore.App.Runtime.linux-musl-arm" - "Microsoft.AspNetCore.App.Runtime.osx-arm64" + "Microsoft.AspNetCore.App.Ref" + "Microsoft.AspNetCore.App.Runtime.linux-musl-arm" + "Microsoft.AspNetCore.App.Runtime.osx-arm64" ) fi @@ -168,102 +170,103 @@ sdk_packages () { # This should not happend in minor or bugfix updates, but probably happens # with every new major .NET release. local pkgs=( - "Microsoft.NETCore.App.Host.linux-arm" - "Microsoft.NETCore.App.Host.linux-arm64" - "Microsoft.NETCore.App.Host.linux-musl-arm64" - "Microsoft.NETCore.App.Host.linux-musl-x64" - "Microsoft.NETCore.App.Host.linux-x64" - "Microsoft.NETCore.App.Host.osx-x64" - "Microsoft.NETCore.App.Host.win-arm64" - "Microsoft.NETCore.App.Host.win-x64" - "Microsoft.NETCore.App.Host.win-x86" - "Microsoft.NETCore.App.Runtime.linux-arm" - "Microsoft.NETCore.App.Runtime.linux-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-x64" - "Microsoft.NETCore.App.Runtime.linux-x64" - "Microsoft.NETCore.App.Runtime.osx-x64" - "Microsoft.NETCore.App.Runtime.win-arm64" - "Microsoft.NETCore.App.Runtime.win-x64" - "Microsoft.NETCore.App.Runtime.win-x86" - "Microsoft.NETCore.DotNetAppHost" - "Microsoft.NETCore.DotNetHost" - "Microsoft.NETCore.DotNetHostPolicy" - "Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHost" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-arm.Microsoft.NETCore.DotNetHost" - "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-x64.Microsoft.NETCore.DotNetHost" - "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.osx-x64.Microsoft.NETCore.DotNetHost" - "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.win-arm64.Microsoft.NETCore.DotNetHost" - "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.win-x64.Microsoft.NETCore.DotNetHost" - "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-x86.Microsoft.NETCore.DotNetAppHost" - "runtime.win-x86.Microsoft.NETCore.DotNetHost" - "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" - "Microsoft.NETCore.App.Host.linux-musl-arm" - "Microsoft.NETCore.App.Host.osx-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-arm" - "Microsoft.NETCore.App.Runtime.osx-arm64" - "Microsoft.NETCore.App.Ref" - "Microsoft.NETCore.App.Runtime.Mono.linux-arm" - "Microsoft.NETCore.App.Runtime.Mono.linux-arm64" - "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64" - "Microsoft.NETCore.App.Runtime.Mono.linux-x64" - "Microsoft.NETCore.App.Runtime.Mono.osx-arm64" - "Microsoft.NETCore.App.Runtime.Mono.osx-x64" - "Microsoft.NETCore.App.Runtime.Mono.win-x64" - "Microsoft.NETCore.App.Runtime.Mono.win-x86" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" - "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHost" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" - "Microsoft.NETCore.App.Crossgen2.linux-musl-arm" - "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64" - "Microsoft.NETCore.App.Crossgen2.linux-musl-x64" - "Microsoft.NETCore.App.Crossgen2.linux-arm" - "Microsoft.NETCore.App.Crossgen2.linux-arm64" - "Microsoft.NETCore.App.Crossgen2.linux-x64" - "Microsoft.NETCore.App.Crossgen2.osx-x64" - "Microsoft.NETCore.App.Crossgen2.osx-arm64" + "Microsoft.NETCore.App.Host.linux-arm" + "Microsoft.NETCore.App.Host.linux-arm64" + "Microsoft.NETCore.App.Host.linux-musl-arm64" + "Microsoft.NETCore.App.Host.linux-musl-x64" + "Microsoft.NETCore.App.Host.linux-x64" + "Microsoft.NETCore.App.Host.osx-x64" + "Microsoft.NETCore.App.Host.win-arm64" + "Microsoft.NETCore.App.Host.win-x64" + "Microsoft.NETCore.App.Host.win-x86" + "Microsoft.NETCore.App.Runtime.linux-arm" + "Microsoft.NETCore.App.Runtime.linux-arm64" + "Microsoft.NETCore.App.Runtime.linux-musl-arm64" + "Microsoft.NETCore.App.Runtime.linux-musl-x64" + "Microsoft.NETCore.App.Runtime.linux-x64" + "Microsoft.NETCore.App.Runtime.osx-x64" + "Microsoft.NETCore.App.Runtime.win-arm64" + "Microsoft.NETCore.App.Runtime.win-x64" + "Microsoft.NETCore.App.Runtime.win-x86" + "Microsoft.NETCore.DotNetAppHost" + "Microsoft.NETCore.DotNetHost" + "Microsoft.NETCore.DotNetHostPolicy" + "Microsoft.NETCore.DotNetHostResolver" + "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" + "runtime.linux-arm64.Microsoft.NETCore.DotNetHost" + "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" + "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" + "runtime.linux-arm.Microsoft.NETCore.DotNetHost" + "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy" + "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver" + "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost" + "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost" + "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver" + "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" + "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost" + "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver" + "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" + "runtime.linux-x64.Microsoft.NETCore.DotNetHost" + "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" + "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" + "runtime.osx-x64.Microsoft.NETCore.DotNetHost" + "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" + "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" + "runtime.win-arm64.Microsoft.NETCore.DotNetHost" + "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" + "runtime.win-x64.Microsoft.NETCore.DotNetAppHost" + "runtime.win-x64.Microsoft.NETCore.DotNetHost" + "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" + "runtime.win-x86.Microsoft.NETCore.DotNetAppHost" + "runtime.win-x86.Microsoft.NETCore.DotNetHost" + "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" + "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" + "Microsoft.NETCore.App.Host.linux-musl-arm" + "Microsoft.NETCore.App.Host.osx-arm64" + "Microsoft.NETCore.App.Runtime.linux-musl-arm" + "Microsoft.NETCore.App.Runtime.osx-arm64" + "Microsoft.NETCore.App.Ref" + "Microsoft.NETCore.App.Runtime.Mono.linux-arm" + "Microsoft.NETCore.App.Runtime.Mono.linux-arm64" + "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64" + "Microsoft.NETCore.App.Runtime.Mono.linux-x64" + "Microsoft.NETCore.App.Runtime.Mono.osx-arm64" + "Microsoft.NETCore.App.Runtime.Mono.osx-x64" + "Microsoft.NETCore.App.Runtime.Mono.win-x64" + "Microsoft.NETCore.App.Runtime.Mono.win-x86" + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" + "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" + "runtime.osx-arm64.Microsoft.NETCore.DotNetHost" + "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" + "Microsoft.NETCore.App.Crossgen2.linux-musl-arm" + "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64" + "Microsoft.NETCore.App.Crossgen2.linux-musl-x64" + "Microsoft.NETCore.App.Crossgen2.linux-arm" + "Microsoft.NETCore.App.Crossgen2.linux-arm64" + "Microsoft.NETCore.App.Crossgen2.linux-x64" + "Microsoft.NETCore.App.Crossgen2.osx-x64" + "Microsoft.NETCore.App.Crossgen2.osx-arm64" ) # These packages were removed on .NET 9 if ! version_older "$version" "9"; then - local newpkgs=() - for pkg in "${pkgs[@]}"; do - [[ "$pkg" = *Microsoft.NETCore.DotNetHost* ]] || newpkgs+=("$pkg") - done - pkgs=("${newpkgs[@]}") + local newpkgs=() + local pkg + for pkg in "${pkgs[@]}"; do + [[ "$pkg" = *Microsoft.NETCore.DotNetHost* ]] || newpkgs+=("$pkg") + done + pkgs=("${newpkgs[@]}") fi # These packages were removed on .NET 8 @@ -282,13 +285,14 @@ sdk_packages () { # Packages that only apply to .NET 7 and up if ! version_older "$version" "7"; then pkgs+=( - "runtime.linux-arm64.Microsoft.DotNet.ILCompiler" - "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler" - "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler" - "runtime.linux-x64.Microsoft.DotNet.ILCompiler" - "runtime.osx-x64.Microsoft.DotNet.ILCompiler" - "runtime.win-arm64.Microsoft.DotNet.ILCompiler" - "runtime.win-x64.Microsoft.DotNet.ILCompiler" + "Microsoft.DotNet.ILCompiler" + "runtime.linux-arm64.Microsoft.DotNet.ILCompiler" + "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler" + "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler" + "runtime.linux-x64.Microsoft.DotNet.ILCompiler" + "runtime.osx-x64.Microsoft.DotNet.ILCompiler" + "runtime.win-arm64.Microsoft.DotNet.ILCompiler" + "runtime.win-x64.Microsoft.DotNet.ILCompiler" ) fi @@ -296,6 +300,7 @@ sdk_packages () { if ! version_older "$version" "8"; then pkgs+=( "Microsoft.NET.ILLink.Tasks" + "runtime.osx-arm64.Microsoft.DotNet.ILCompiler" ) fi @@ -303,74 +308,83 @@ sdk_packages () { } main () { - pname=$(basename "$0") - if [[ ! "$*" =~ ^.*[0-9]{1,}\.[0-9]{1,}.*$ ]]; then - echo "Usage: $pname [sem-versions] + local pname + pname=$(basename "$0") + if [[ ! "$*" =~ ^.*[0-9]{1,}\.[0-9]{1,}.*$ ]]; then + echo "Usage: $pname [sem-versions] Get updated dotnet src (platform - url & sha512) expressions for specified versions Examples: $pname 6.0.14 7.0.201 - specific x.y.z versions $pname 6.0 7.0 - latest x.y versions " >&2 - exit 1 - fi - - for sem_version in "$@"; do - echo "Generating ./versions/${sem_version}.nix" - patch_specified=false - # Check if a patch was specified as an argument. - # If so, generate file for the specific version. - # If only x.y version was provided, get the latest patch - # version of the given x.y version. - if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,} ]]; then - patch_specified=true - elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then - continue + exit 1 fi - # Make sure the x.y version is properly passed to .NET release metadata url. - # Then get the json file and parse it to find the latest patch release. - major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") - content=$(curl -sL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) - major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content") - major_minor_underscore=${major_minor/./_} + for sem_version in "$@"; do + echo "Generating ./versions/${sem_version}.nix" + local patch_specified=false + # Check if a patch was specified as an argument. + # If so, generate file for the specific version. + # If only x.y version was provided, get the latest patch + # version of the given x.y version. + if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,} ]]; then + patch_specified=true + elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then + continue + fi - release_content=$(release "$content" "$major_minor_patch") - aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") - runtime_version=$(jq -r '.runtime.version' <<< "$release_content") - mapfile -t sdk_versions < <(jq -r '.sdks[] | .version' <<< "$release_content" | sort -rn) + # Make sure the x.y version is properly passed to .NET release metadata url. + # Then get the json file and parse it to find the latest patch release. + local major_minor content major_minor_patch + major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") + content=$(curl -sL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) + major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content") + local major_minor_underscore=${major_minor/./_} - # If patch was not specified, check if the package is already the latest version - # If it is, exit early - if [ "$patch_specified" == false ] && [ -f "./versions/${sem_version}.nix" ]; then - current_version=$(nix-instantiate --eval -E "(import ./versions/${sem_version}.nix { \ + local release_content aspnetcore_version runtime_version + release_content=$(release "$content" "$major_minor_patch") + aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") + runtime_version=$(jq -r '.runtime.version' <<< "$release_content") + local -a sdk_versions + mapfile -t sdk_versions < <(jq -r '.sdks[] | .version' <<< "$release_content" | sort -rn) + + # If patch was not specified, check if the package is already the latest version + # If it is, exit early + if [ "$patch_specified" == false ] && [ -f "./versions/${sem_version}.nix" ]; then + local current_version + current_version=$(nix-instantiate --eval -E "(import ./versions/${sem_version}.nix { \ buildAspNetCore = { ... }: {}; \ buildNetSdk = { ... }: {}; \ buildNetRuntime = { ... }: {}; \ }).release_${major_minor_underscore}" | jq -r) - if [[ "$current_version" == "$major_minor_patch" ]]; then - echo "Nothing to update." - continue + if [[ "$current_version" == "$major_minor_patch" ]]; then + echo "Nothing to update." + continue + fi fi - fi - aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" - runtime_files="$(release_files "$release_content" .runtime)" + local aspnetcore_files runtime_files + aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" + runtime_files="$(release_files "$release_content" .runtime)" - channel_version=$(jq -r '."channel-version"' <<< "$content") - support_phase=$(jq -r '."support-phase"' <<< "$content") + local channel_version support_phase + channel_version=$(jq -r '."channel-version"' <<< "$content") + support_phase=$(jq -r '."support-phase"' <<< "$content") - aspnetcore_sources="$(platform_sources "$aspnetcore_files")" - runtime_sources="$(platform_sources "$runtime_files")" + local aspnetcore_sources runtime_sources + aspnetcore_sources="$(platform_sources "$aspnetcore_files")" + runtime_sources="$(platform_sources "$runtime_files")" - sdk_packages="$(sdk_packages "${runtime_version}")" - aspnetcore_packages="$(aspnetcore_packages "${aspnetcore_version}")" + local sdk_packages aspnetcore_packages + sdk_packages="$(sdk_packages "${runtime_version}")" + aspnetcore_packages="$(aspnetcore_packages "${aspnetcore_version}")" - result=$(mktemp) - trap "rm -f $result" TERM INT EXIT + result=$(mktemp) + trap "rm -f $result" TERM INT EXIT - echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk }: + echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk }: # v$channel_version ($support_phase) @@ -392,35 +406,36 @@ in rec { $runtime_sources };" > "${result}" - declare -A feature_bands - unset latest_sdk + local -A feature_bands + unset latest_sdk - for sdk_version in "${sdk_versions[@]}"; do - sdk_base_version=${sdk_version%-*} - feature_band=${sdk_base_version:0:-2}xx - # sometimes one release has e.g. both 8.0.202 and 8.0.203 - [[ ! ${feature_bands[$feature_band]+true} ]] || continue - feature_bands[$feature_band]=$sdk_version - sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")" - sdk_sources="$(platform_sources "$sdk_files")" - sdk_attrname=sdk_${feature_band//./_} - [[ -v latest_sdk ]] || latest_sdk=$sdk_attrname + for sdk_version in "${sdk_versions[@]}"; do + local sdk_base_version=${sdk_version%-*} + local feature_band=${sdk_base_version:0:-2}xx + # sometimes one release has e.g. both 8.0.202 and 8.0.203 + [[ ! ${feature_bands[$feature_band]+true} ]] || continue + feature_bands[$feature_band]=$sdk_version + local sdk_files sdk_sources + sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")" + sdk_sources="$(platform_sources "$sdk_files")" + local sdk_attrname=sdk_${feature_band//./_} + [[ -v latest_sdk ]] || local latest_sdk=$sdk_attrname - echo " + echo " $sdk_attrname = buildNetSdk { version = \"${sdk_version}\"; $sdk_sources inherit packages; };" >> "${result}" - done + done - echo " + echo " sdk_$major_minor_underscore = $latest_sdk; }" >> "${result}" - cp "${result}" "./versions/${sem_version}.nix" - echo "Generated ./versions/${sem_version}.nix" - done + cp "${result}" "./versions/${sem_version}.nix" + echo "Generated ./versions/${sem_version}.nix" + done } main "$@" diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index fac65c6b2dd0..159d9cc23985 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -111,6 +111,7 @@ let (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "18sarln3kbkqc1ab9jnadcqqxs8iicf7jqldxzbjzhdpmf96vwna"; }) (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1vh3ymhv33qysc4vj4gb3g1rgajy4jr4kxfjcsq2myn96aan84i1"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.20"; sha256 = "12w9hlq70ynkrgqbr555lnqmbf67iz3kaci2vi07zsn3mmak3z6j"; }) + (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "0c966243j6m22hy3n922rl64vi6y1l7ljn69bwydm5clyh7zvn0a"; }) (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "11c31fzq4qfxcsz3p6vzdfnaqs29saf1dnmzq7l90p6ylwsblc7f"; }) (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "087q3p57snmvvzzqpxp3vwvi2q21kzlk8qh1w6axrcjdci31xmji"; }) (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1nc8m38jsqai934nn26f6dkl3c0r4sabssjiizcixdyypzlv3hcf"; }) diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix index e88c122e3a8d..b9b24b48a5b2 100644 --- a/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -103,6 +103,7 @@ let (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.6"; sha256 = "1628i25saxmny4k8zzhh6nkz0njlvmi05f1m2sx976flqd3kxr78"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.6"; sha256 = "0fz0a4hm8lf56r5hff4vcz6pfmwfqygddm6cyxj04x63wqd16sl8"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.6"; sha256 = "1bg9d8fcwr7808vbakkgrzry4wf0l7r28xn9hsnh14awsqprngid"; }) + (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "0wvdsmpriwvzf53n8sp7vda0996s8vhv83nis45sz1imwm7gxn4r"; }) (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "0l3pibk6q4hhinf2ki42vcc6kvvi5x4icm8bpcnm9iss6kafchry"; }) (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "19wwim19f1aqscvya85chbycj30ns5cxr2ga5jfrkxbyni9q557m"; }) (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "1bggciasdgh7yr9vjkfq8fjxzg8lbcj4cd16slcr8kkpqy1lj79s"; }) @@ -111,6 +112,7 @@ let (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "0cqm5183as2m3nsl9as00qm9928bani6gflndg0fv73r799k5raz"; }) (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "0yjji845ngsaqxyg2cmngj3vba8v4wyriv0qz4hgn1wbrramml6b"; }) (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.6"; sha256 = "0slfrm65izibsxg505vr8m4k6n2a2kl4iqyyr9xkgr8541g7rrs5"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "07y19lzkfr0i122gqbvfwi87jipjvrw4wrm68z01k4k0yh0mk1lj"; }) ]; in rec { release_8_0 = "8.0.6"; diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix index 2cf73e2a4a7a..d837cbe88624 100644 --- a/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -67,6 +67,7 @@ let (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0hxf3xk6yn8n04fwj9j7c6a70y9apf31aafn2nhd3yykvvf7618d"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "1pw27c0czrrgp0vqnlcz6zhyrhbjbqh14wbcknrcn1smlm6fl77x"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "14k0sd0b6rpngw8s1gz833kq89qghnhszgvk9v2rabncb1qlhanv"; }) + (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "1qmshjgd3wpal5gbsq5ajanissr237bjgfpxg7sp5bqjb20yg4hp"; }) (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "0c2spsh6m236cmpf6c2hafcrr4w2ks433g024cmpa93a3s6dfvcp"; }) (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "0wla1jr95b7hm6wa2yx080wgy8iaqr7r3q83jp3qdnp3k2y0rgpk"; }) (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "00mkrwlx48dis7fg73gxj1c99zs1na4k6y11q1908a674hni8qlx"; }) @@ -75,6 +76,7 @@ let (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "1s8m140xbwc2pmyhrrmgfd4r2lppld26m6x3k1kz9gfn7kk4ayjx"; }) (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "1f9hn43fs25fbzzhrawfjgz56mknsnmhmdgf1f1pqlpfzwb2bvvn"; }) (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-preview.5.24306.7"; sha256 = "0ck2agia8lmhvwvzh73yh2ydkqfz4g21404cv4qxjj28l618cjl5"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "1xdnyrbxdm9acnldinb4xcdk0jy32jx6rgrqwcsqh4a6xzdz7y05"; }) ]; in rec { release_9_0 = "9.0.0-preview.5"; diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 9548f8fe06f8..3bf938b75903 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -23,36 +23,50 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-FMh3VvlY3fUK8fbd0M+aCmlUrmG9YegiOOQ7MOByffc="; }; - patches = [ + # Big pile of backports. + # FIXME: remove all of these after next upstream release. + patches = let + fetchUpstreamPatch = { rev, hash }: fetchpatch { + name = "dtc-${rev}.patch"; + url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=${rev}"; + inherit hash; + }; + in [ # meson: Fix cell overflow tests when running from meson - (fetchpatch { - url = "https://github.com/dgibson/dtc/commit/32174a66efa4ad19fc6a2a6422e4af2ae4f055cb.patch"; - sha256 = "sha256-C7OzwY0zq+2CV3SB5unI7Ill2M3deF7FXeQE3B/Kx2s="; + (fetchUpstreamPatch { + rev = "32174a66efa4ad19fc6a2a6422e4af2ae4f055cb"; + hash = "sha256-C7OzwY0zq+2CV3SB5unI7Ill2M3deF7FXeQE3B/Kx2s="; }) # Use #ifdef NO_VALGRIND - (fetchpatch { - url = "https://github.com/dgibson/dtc/commit/41821821101ad8a9f83746b96b163e5bcbdbe804.patch"; - sha256 = "sha256-7QEFDtap2DWbUGqtyT/RgJZJFldKB8oSubKiCtLZ0w4="; + (fetchUpstreamPatch { + rev = "41821821101ad8a9f83746b96b163e5bcbdbe804"; + hash = "sha256-7QEFDtap2DWbUGqtyT/RgJZJFldKB8oSubKiCtLZ0w4="; }) # dtc: Fix linker options so it also works in Darwin - (fetchpatch { - url = "https://github.com/dgibson/dtc/commit/3acde70714df3623e112cf3ec99fc9b5524220b8.patch"; - sha256 = "sha256-uLXL0Sjcn+bnMuF+A6PjUW1Rq6uNg1dQl58zbeYpP/U="; + (fetchUpstreamPatch { + rev = "71a8b8ef0adf01af4c78c739e04533a35c1dc89c"; + hash = "sha256-uLXL0Sjcn+bnMuF+A6PjUW1Rq6uNg1dQl58zbeYpP/U="; }) # meson: allow disabling tests - (fetchpatch { - url = "https://github.com/dgibson/dtc/commit/35f26d2921b68d97fefbd5a2b6e821a2f02ff65d.patch"; - sha256 = "sha256-cO4f/jJX/pQL7kk4jpKUhsCVESW2ZuWaTr7z3BuvVkw="; + (fetchUpstreamPatch { + rev = "bdc5c8793a13abb8846d115b7923df87605d05bd"; + hash = "sha256-cO4f/jJX/pQL7kk4jpKUhsCVESW2ZuWaTr7z3BuvVkw="; }) - (fetchpatch { - name = "static.patch"; - url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=3fbfdd08afd2a7a25b27433f6f5678c0fe694721"; + # meson: fix installation with meson-python + (fetchUpstreamPatch { + rev = "3fbfdd08afd2a7a25b27433f6f5678c0fe694721"; hash = "sha256-skK8m1s4xkK6x9AqzxiEK+1uMEmS27dBI1CdEXNFTfU="; }) + + # pylibfdt: fix get_mem_rsv for newer Python versions + (fetchUpstreamPatch { + rev = "822123856980f84562406cc7bd1d4d6c2b8bc184"; + hash = "sha256-IJpRgP3pP8Eewx2PNKxhXZdsnomz2AR6oOsun50qAms="; + }) ]; env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; diff --git a/pkgs/development/compilers/elm/packages/elm-test-rs/Cargo.lock b/pkgs/development/compilers/elm/packages/elm-test-rs/Cargo.lock new file mode 100644 index 000000000000..343b0bd02148 --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-test-rs/Cargo.lock @@ -0,0 +1,1026 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203" + +[[package]] +name = "assert_cmd" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e996dc7940838b7ef1096b882e29ec30a3149a3a443cdc8dba19ed382eca1fe2" +dependencies = [ + "bstr", + "doc-comment", + "predicates", + "predicates-core", + "predicates-tree", + "wait-timeout", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "bstr" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +dependencies = [ + "lazy_static", + "memchr", + "regex-automata", +] + +[[package]] +name = "bumpalo" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" + +[[package]] +name = "cc" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chunked_transfer" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "bitflags", + "textwrap", + "unicode-width", +] + +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if 1.0.0", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "elm-test-rs" +version = "3.0.0" +dependencies = [ + "anyhow", + "assert_cmd", + "atty", + "clap", + "dirs-next", + "either", + "fs_extra", + "glob", + "log", + "nom", + "notify", + "num_cpus", + "path-absolutize", + "pathdiff", + "pubgrub", + "pubgrub-dependency-provider-elm", + "regex", + "serde", + "serde_json", + "ureq", + "walkdir", + "which", +] + +[[package]] +name = "filetime" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "winapi 0.3.9", +] + +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding", +] + +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + +[[package]] +name = "fsevent" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" +dependencies = [ + "bitflags", + "fsevent-sys", +] + +[[package]] +name = "fsevent-sys" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" +dependencies = [ + "libc", +] + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "getrandom" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "hermit-abi" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +dependencies = [ + "libc", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "inotify" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" +dependencies = [ + "bitflags", + "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 = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "itertools" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[package]] +name = "js-sys" +version = "0.3.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "matches" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + +[[package]] +name = "memchr" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "mio-extras" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" +dependencies = [ + "lazycell", + "log", + "mio", + "slab", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "net2" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "nom" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" +dependencies = [ + "memchr", + "minimal-lexical", + "version_check", +] + +[[package]] +name = "notify" +version = "4.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" +dependencies = [ + "bitflags", + "filetime", + "fsevent", + "fsevent-sys", + "inotify", + "libc", + "mio", + "mio-extras", + "walkdir", + "winapi 0.3.9", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" + +[[package]] +name = "path-absolutize" +version = "3.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b288298a7a3a7b42539e3181ba590d32f2d91237b0691ed5f103875c754b3bf5" +dependencies = [ + "path-dedot", +] + +[[package]] +name = "path-dedot" +version = "3.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a14ca47b49e6abd75cf68db85e1e161d9f2b675716894a18af0e9add0266b26" +dependencies = [ + "once_cell", +] + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "predicates" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6ce811d0b2e103743eec01db1c50612221f173084ce2f7941053e94b6bb474" +dependencies = [ + "difflib", + "itertools", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" + +[[package]] +name = "predicates-tree" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2" +dependencies = [ + "predicates-core", + "treeline", +] + +[[package]] +name = "proc-macro2" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "pubgrub" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdd14552ad5f5d743a323c10d576f26822a044355d6601f377d813ece46f38fd" +dependencies = [ + "rustc-hash", + "serde", + "thiserror", +] + +[[package]] +name = "pubgrub-dependency-provider-elm" +version = "0.1.0" +source = "git+https://github.com/mpizenberg/pubgrub-dependency-provider-elm?rev=a20a795f0#a20a795f0c165517d748566a5d2febbe90ea8d35" +dependencies = [ + "pubgrub", + "rustc-hash", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +dependencies = [ + "getrandom", + "redox_syscall", +] + +[[package]] +name = "regex" +version = "1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi 0.3.9", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustls" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "serde" +version = "1.0.130" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.130" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "slab" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "syn" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinyvec" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "treeline" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" + +[[package]] +name = "unicode-bidi" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" +dependencies = [ + "matches", +] + +[[package]] +name = "unicode-normalization" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "ureq" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5c448dcb78ec38c7d59ec61f87f70a98ea19171e06c139357e012ee226fec90" +dependencies = [ + "base64", + "chunked_transfer", + "log", + "once_cell", + "rustls", + "url", + "webpki", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +dependencies = [ + "form_urlencoded", + "idna", + "matches", + "percent-encoding", +] + +[[package]] +name = "version_check" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi 0.3.9", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "wasm-bindgen" +version = "0.2.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" + +[[package]] +name = "web-sys" +version = "0.3.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c475786c6f47219345717a043a37ec04cb4bc185e28853adcc4fa0a947eba630" +dependencies = [ + "webpki", +] + +[[package]] +name = "which" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" +dependencies = [ + "either", + "lazy_static", + "libc", +] + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] diff --git a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix index 02f69c2d2f03..a457a422cf85 100644 --- a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix @@ -1,31 +1,50 @@ -{ lib, rustPlatform, fetchurl, openssl, stdenv, darwin }: +{ + lib, + rustPlatform, + fetchFromGitHub, + openssl, + stdenv, + darwin, +}: rustPlatform.buildRustPackage rec { pname = "elm-test-rs"; - version = "2.0"; + version = "3.0"; - src = fetchurl { - url = "https://github.com/mpizenberg/elm-test-rs/archive/v${version}.tar.gz"; - sha256 = "sha256:1manr42w613r9vyji7pxx5gb08jcgkdxv29qqylrqlwxa8d5dcid"; + src = fetchFromGitHub { + owner = "mpizenberg"; + repo = "elm-test-rs"; + rev = "refs/tags/v${version}"; + hash = "sha256-l3RV+j3wAQ88QGNXLILp7YiUpdk7bkN25Y723pDZw48="; }; - buildInputs = lib.optionals (!stdenv.isDarwin) [ - openssl - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - Security - CoreServices - ]); - - cargoSha256 = "sha256:1dpdlzv96kpc25yf5jgsz9qldghyw35x382qpxhkadkn5dryzjvd"; + buildInputs = + lib.optionals (!stdenv.isDarwin) [ openssl ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Security + CoreServices + ] + ); + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "pubgrub-dependency-provider-elm-0.1.0" = "sha256-00J5XZfmuB4/fgB06aaXrRjdmOpOsSwA3dC3Li1m2Cc="; + }; + }; # Tests perform networking and therefore can't work in sandbox doCheck = false; - meta = with lib; { + meta = { description = "Fast and portable executable to run your Elm tests"; mainProgram = "elm-test-rs"; homepage = "https://github.com/mpizenberg/elm-test-rs"; - license = licenses.bsd3; - maintainers = [ maintainers.jpagex ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + jpagex + zupo + ]; }; } diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 9824f1246f34..2919a305e428 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.51"; + version = "3.1.55"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "emscripten-node-modules-${version}"; inherit pname version src; - npmDepsHash = "sha256-N7WbxzKvW6FljY6g3R//9RdNiezhXGEvKPbOSJgdA0g="; + npmDepsHash = "sha256-7tZEZ7NN1jJBHa9G5sRz/ZpWJvgnTJj4i5EvQMsGQH4="; dontBuild = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - hash = "sha256-oXecS6B0u8YLeoybjxLwx5INGj/Kp/8GA6s3A1S0y4k="; + hash = "sha256-3SqbkXI8xn4Zj3bDLCegxslYH5m/PkF6n/pPfm5z5VA="; rev = version; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./0001-emulate-clang-sysroot-include-logic.patch; - resourceDir = "${llvmEnv}/lib/clang/17/"; + resourceDir = "${llvmEnv}/lib/clang/18/"; }) ]; @@ -51,8 +51,8 @@ stdenv.mkDerivation rec { patchShebangs . - # emscripten 3.1.50 requires LLVM tip-of-tree instead of LLVM 17 - sed -i -e "s/EXPECTED_LLVM_VERSION = 18/EXPECTED_LLVM_VERSION = 17.0/g" tools/shared.py + # emscripten 3.1.55 requires LLVM tip-of-tree instead of LLVM 18 + sed -i -e "s/EXPECTED_LLVM_VERSION = 19/EXPECTED_LLVM_VERSION = 18/g" tools/shared.py # fixes cmake support sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix index 3cf038159b32..f7ac2a009658 100644 --- a/pkgs/development/compilers/erg/default.nix +++ b/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.38"; + version = "0.6.39"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-byoOvJ4SsRxFSbF4SwdDPlXNdMhypOgktnj4CkmAZuU="; + hash = "sha256-eVf1pQJ0mIZURRDK2k6boZUs+m6hu6lbWqKYWSNC5ng="; }; - cargoHash = "sha256-QNykB9tXXlEyJupO5hkSN2ZqBZDwi0kl6IPHxkkaUxo="; + cargoHash = "sha256-H7JorE6Psg/rndYpNMiyxOfsifBEi4l4bk4CvhDRFjE="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index a7de840adc8d..adb2974cc2d5 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -84,21 +84,20 @@ in rm -f $out/lib/libgcc_s.so* '' - # TODO(amjoseph): remove the `libgcc_s.so` symlinks below and replace them - # with a `-L${gccForLibs.libgcc}/lib` in cc-wrapper's - # `$out/nix-support/cc-flags`. See also: - # - https://github.com/NixOS/nixpkgs/pull/209870#discussion_r1130614895 - # - https://github.com/NixOS/nixpkgs/pull/209870#discussion_r1130635982 - # - https://github.com/NixOS/nixpkgs/commit/404155c6acfa59456aebe6156b22fe385e7dec6f - # # move `libgcc_s.so` into its own output, `$libgcc` + # We maintain $libgcc/lib/$target/ structure to make sure target + # strip runs over libgcc_s.so and remove debug references to headers: + # https://github.com/NixOS/nixpkgs/issues/316114 + lib.optionalString enableLibGccOutput ('' # move libgcc from lib to its own output (libgcc) - mkdir -p $libgcc/lib - mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/lib/ - mv $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/lib/ - ln -s $libgcc/lib/libgcc_s.so $lib/${targetPlatformSlash}lib/ - ln -s $libgcc/lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/ + mkdir -p $libgcc/${targetPlatformSlash}lib + mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/${targetPlatformSlash}lib/ + mv $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/${targetPlatformSlash}lib/ + ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so $lib/${targetPlatformSlash}lib/ + ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/ + '' + + lib.optionalString (targetPlatformSlash != "") '' + ln -s ${targetPlatformSlash}lib $libgcc/lib '' # # Nixpkgs ordinarily turns dynamic linking into pseudo-static linking: diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 5e017a21fa1f..5eb92fd701da 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -280,7 +280,7 @@ pipe ((callFile ./common/builder.nix {}) ({ libc_dev = stdenv.cc.libc_dev; - hardeningDisable = [ "format" "pie" ] + hardeningDisable = [ "format" "pie" "stackclashprotection" ] ++ optionals (is11 && langAda) [ "fortify3" ]; postPatch = optionalString atLeast7 '' @@ -425,6 +425,9 @@ pipe ((callFile ./common/builder.nix {}) ({ inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD langJava version; isGNU = true; hardeningUnsupportedFlags = optional is48 "stackprotector" + ++ optional ( + (targetPlatform.isAarch64 && !atLeast9) || !atLeast8 + ) "stackclashprotection" ++ optional (!atLeast11) "zerocallusedregs" ++ optionals (!atLeast12) [ "fortify3" "trivialautovarinit" ] ++ optionals (langFortran) [ "fortify" "format" ]; diff --git a/pkgs/development/compilers/gcc/patches/12/lambda-ICE-PR109241.patch b/pkgs/development/compilers/gcc/patches/12/lambda-ICE-PR109241.patch deleted file mode 100644 index a27a8a08d9d5..000000000000 --- a/pkgs/development/compilers/gcc/patches/12/lambda-ICE-PR109241.patch +++ /dev/null @@ -1,77 +0,0 @@ -https://gcc.gnu.org/PR109241 - -Fix ICE on ccache. - -From 396a4e76afec30d2461638f569cae18955eb4ad2 Mon Sep 17 00:00:00 2001 -From: Jason Merrill -Date: Wed, 22 Mar 2023 16:11:47 -0400 -Subject: [PATCH] c++: local class in nested generic lambda [PR109241] - -In this testcase, the tree walk to look for bare parameter packs was -confused by finding a type with no TREE_BINFO. But it should be fine that -it's unset; we already checked for unexpanded packs at parse time. - -I also tried doing the partial instantiation of the local class, which is -probably the long-term direction we want to go, but for stage 4 let's go -with this safer change. - - PR c++/109241 - -gcc/cp/ChangeLog: - - * pt.cc (find_parameter_packs_r): Handle null TREE_BINFO. - -gcc/testsuite/ChangeLog: - - * g++.dg/cpp1y/lambda-generic-local-class2.C: New test. ---- - gcc/cp/pt.cc | 12 ++++++++---- - .../g++.dg/cpp1y/lambda-generic-local-class2.C | 13 +++++++++++++ - 2 files changed, 21 insertions(+), 4 deletions(-) - create mode 100644 gcc/testsuite/g++.dg/cpp1y/lambda-generic-local-class2.C - -diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc -index c7f4a95a723..79bc9c014c8 100644 ---- a/gcc/cp/pt.cc -+++ b/gcc/cp/pt.cc -@@ -4106,10 +4106,14 @@ find_parameter_packs_r (tree *tp, int *walk_subtrees, void* data) - case TAG_DEFN: - t = TREE_TYPE (t); - if (CLASS_TYPE_P (t)) -- /* Local class, need to look through the whole definition. */ -- for (tree bb : BINFO_BASE_BINFOS (TYPE_BINFO (t))) -- cp_walk_tree (&BINFO_TYPE (bb), &find_parameter_packs_r, -- ppd, ppd->visited); -+ { -+ /* Local class, need to look through the whole definition. -+ TYPE_BINFO might be unset for a partial instantiation. */ -+ if (TYPE_BINFO (t)) -+ for (tree bb : BINFO_BASE_BINFOS (TYPE_BINFO (t))) -+ cp_walk_tree (&BINFO_TYPE (bb), &find_parameter_packs_r, -+ ppd, ppd->visited); -+ } - else - /* Enum, look at the values. */ - for (tree l = TYPE_VALUES (t); l; l = TREE_CHAIN (l)) -diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-local-class2.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-local-class2.C -new file mode 100644 -index 00000000000..83856de1f41 ---- /dev/null -+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-local-class2.C -@@ -0,0 +1,13 @@ -+// PR c++/109241 -+// { dg-do compile { target c++14 } } -+// { dg-options "" } no pedantic -+ -+void g() { -+ [](auto) { -+ [](auto) { -+ ({ -+ struct A {}; -+ }); -+ }; -+ }(1); -+} --- -2.40.1 - diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 8f0a499da362..b7da7eb925ee 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -76,7 +76,6 @@ in ++ optional (atLeast12 && langAda) ./gnat-cflags-11.patch ++ optional langFortran (if atLeast12 then ./gcc-12-gfortran-driving.patch else ./gfortran-driving.patch) ++ optional atLeast7 ./ppc-musl.patch -++ optional is12 ./12/lambda-ICE-PR109241.patch # backport ICE fix on ccache code ++ optional (atLeast9 && langD) ./libphobos.patch diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix index 3421152ef12a..317f4f1165e6 100644 --- a/pkgs/development/compilers/gcc/versions.nix +++ b/pkgs/development/compilers/gcc/versions.nix @@ -2,7 +2,7 @@ let majorMinorToVersionMap = { "14" = "14.1.0"; "13" = "13.3.0"; - "12" = "12.3.0"; + "12" = "12.4.0"; "11" = "11.4.0"; "10" = "10.5.0"; "9" = "9.5.0"; @@ -18,11 +18,9 @@ let # TODO(amjoseph): convert older hashes to SRI form srcHashForVersion = version: { - # NOTE: there is no need to remove hashes of obsolete minor - # versions when adding a new minor version. "14.1.0" = "sha256-4oPGVJh6/j3p2AgLwL15U0tcoNaBpzoR/ytdN2dCaEA="; "13.3.0" = "sha256-CEXpYhyVQ6E/SE6UWEpJ/8ASmXDpkUYkI1/B0GGgwIM="; - "12.3.0" = "sha256-lJpdT5nnhkIak7Uysi/6tVeN5zITaZdbka7Jet/ajDs="; + "12.4.0" = "sha256-cE9lJgTMvMsUvavzR4yVEciXiLEss7v/3tNzQZFqkXU="; "11.4.0" = "sha256-Py2yIrAH6KSiPNW6VnJu8I6LHx6yBV7nLBQCzqc6jdk="; "10.5.0" = "sha256-JRCVQ/30bzl8NHtdi3osflaUpaUczkucbh6opxyjB8E="; "9.5.0" = "13ygjmd938m0wmy946pxdhz9i1wq7z4w10l6pvidak0xxxj9yxi7"; diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index 312106f6388c..68fe8a015c87 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.21.11"; + version = "1.21.12"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-Qq7pvytpVsdaetaqPwpRtYIf/qxX9aLnM6LW6uHm2dI="; + hash = "sha256-MOaK8nvB8d8jHjq3Tz0X07jVKgicebyqtXO08bgH7U8="; }; strictDeps = true; diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index d3b8982118ae..dc027c785e56 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -48,11 +48,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.22.3"; + version = "1.22.5"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-gGSO80+QMZPXKlnA3/AZ9fmK4MmqE63gsOy/+ZGnb2g="; + hash = "sha256-rJxyPyJJaa7mJLw0/TTJ4T8qIS11xxyAfeZEu0bhEvY="; }; strictDeps = true; diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 599169116512..eb3fe8004aa6 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -15,12 +15,12 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - hash = "sha256-ZPHOgozuUij9+4YXZTnn1koddQEQZe/yrpb+OPHO+nA="; + hash = "sha256-pBoLgS/9MLMrc98niI+o2JoJ3gpvhyRY2o9GmVc5hIA="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index c7c119a45b8a..43f940a84661 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -364,14 +364,14 @@ let patches = [ (substitute { src = ../common/libcxxabi/wasm.patch; - replacements = [ + substitutions = [ "--replace-fail" "/cmake/" "/llvm/cmake/" ]; }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (substitute { src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - replacements = [ + substitutions = [ "--replace-fail" "/include/" "/libcxx/include/" ]; }) diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix deleted file mode 100644 index ffbbe1deb0d4..000000000000 --- a/pkgs/development/compilers/llvm/13/default.nix +++ /dev/null @@ -1,433 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub, fetchpatch -, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM version's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# LLVM release information; specify one of these but not both: -, gitRelease ? null - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -, officialRelease ? { version = "13.0.1"; sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k"; } - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # candidate = /* optional; if specified, should be: "rcN" */ - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -# By default, we'll try to fetch a release from `github:llvm/llvm-project` -# corresponding to the `gitRelease` or `officialRelease` specified. -# -# You can provide your own LLVM source by specifying this arg but then it's up -# to you to make sure that the LLVM repo given matches the release configuration -# specified. -, monorepoSrc ? null -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -assert - lib.assertMsg - (lib.xor - (gitRelease != null) - (officialRelease != null)) - ("must specify `gitRelease` or `officialRelease`" + - (lib.optionalString (gitRelease != null) " — not both")); -let - monorepoSrc' = monorepoSrc; -in let - metadata = rec { - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - src = monorepoSrc; - }; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata - # Previously monorepoSrc was erroneously not being passed through. - // { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild. - ); - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${metadata.release_version}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - patches = [ - # When cross-compiling we configure llvm-config-native with an approximation - # of the flags used for the normal LLVM build. To avoid the need for building - # a native libLLVM.so (which would fail) we force llvm-config to be linked - # statically against the necessary LLVM components always. - ../common/llvm/llvm-config-link-static.patch - - ./llvm/gnu-install-dirs.patch - - # Fix random compiler crashes: https://bugs.llvm.org/show_bug.cgi?id=50611 - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4764a4f8c920912a2bfd8b0eea57273acfe0d8a8/trunk/no-strict-aliasing-DwarfCompileUnit.patch"; - sha256 = "18l6mrvm2vmwm77ckcnbjvh6ybvn72rhrb799d4qzwac4x2ifl7g"; - stripLen = 1; - }) - - # Fix musl build. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; - relative = "llvm"; - hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; - }) - - # Backport gcc-13 fixes with missing includes. - (fetchpatch { - name = "signals-gcc-13.patch"; - url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; - hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; - stripLen = 1; - }) - (fetchpatch { - name = "base64-gcc-13.patch"; - url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; - hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; - stripLen = 1; - }) - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - # Revert of https://reviews.llvm.org/D100879 - # The malloc alignment assumption is incorrect for jemalloc and causes - # mis-compilation in firefox. - # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 - ./clang/revert-malloc-alignment-assumption.patch - ../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # TODO: lldb/docs/index.rst:155:toctree contains reference to nonexisting document 'design/structureddataplugins' - # lldb-manpages = lowPrio (tools.lldb.override { - # enableManpages = true; - # python3 = pkgs.python3; # don't use python-boot - # }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc - else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - patches = [ - ./lld/gnu-install-dirs.patch - ]; - }; - - lldb = callPackage ../common/lldb.nix { - patches = - let - resourceDirPatch = callPackage - ({ substituteAll, libclang }: substituteAll - { - src = ./lldb/resource-dir.patch; - clangLibDir = "${libclang.lib}/lib"; - }) - { }; - in - [ - ./lldb/procfs.patch - resourceDirPatch - ./lldb/gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./lldb/cpu_subtype_arm64e_replacement.patch; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' - echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' - echo "-lunwind" >> $out/nix-support/cc-ldflags - '' + lib.optionalString stdenv.targetPlatform.isWasm '' - echo "-fno-exceptions" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - echo "-nostdlib++" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = '' - echo "-nostartfiles" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands0 cc; - }; - - clangNoCompilerRtWithLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - }; - - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata - # Previously monorepoSrc was erroneously not being passed through. - // { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild. - ); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - ./compiler-rt/armv7l.patch - # Fix build on armv6l - ../common/compiler-rt/armv6-mcr-dmb.patch - ../common/compiler-rt/armv6-sync-ops-no-thumb.patch - ../common/compiler-rt/armv6-no-ldrexd-strexd.patch - ../common/compiler-rt/armv6-scudo-no-yield.patch - ../common/compiler-rt/armv6-scudo-libatomic.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - ./compiler-rt/armv7l.patch - # Fix build on armv6l - ../common/compiler-rt/armv6-mcr-dmb.patch - ../common/compiler-rt/armv6-sync-ops-no-thumb.patch - ../common/compiler-rt/armv6-no-ldrexd-strexd.patch - ../common/compiler-rt/armv6-scudo-no-yield.patch - ../common/compiler-rt/armv6-scudo-libatomic.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ../common/libcxx { - patches = [ - (substitute { - src = ../common/libcxxabi/wasm.patch; - replacements = [ - "--replace-fail" "/cmake/" "/llvm/cmake/" - ]; - }) - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - (substitute { - src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - replacements = [ - "--replace-fail" "/include/" "/libcxx/include/" - ]; - }) - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - # TODO: remove this, causes LLVM 13 packages rebuild. - inherit (metadata) monorepoSrc; # Preserve bug during #307211 refactor. - }; - - libunwind = callPackage ../common/libunwind { - patches = [ - ./libunwind/gnu-install-dirs.patch - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - openmp = callPackage ../common/openmp { - patches = [ - # Fix cross. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch"; - hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A="; - }) - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix deleted file mode 100644 index 06972af065c9..000000000000 --- a/pkgs/development/compilers/llvm/14/default.nix +++ /dev/null @@ -1,401 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub, fetchpatch -, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM version's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# LLVM release information; specify one of these but not both: -, gitRelease ? null - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -, officialRelease ? { version = "14.0.6"; sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; } - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # candidate = /* optional; if specified, should be: "rcN" */ - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -# By default, we'll try to fetch a release from `github:llvm/llvm-project` -# corresponding to the `gitRelease` or `officialRelease` specified. -# -# You can provide your own LLVM source by specifying this arg but then it's up -# to you to make sure that the LLVM repo given matches the release configuration -# specified. -, monorepoSrc ? null -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -assert - lib.assertMsg - (lib.xor - (gitRelease != null) - (officialRelease != null)) - ("must specify `gitRelease` or `officialRelease`" + - (lib.optionalString (gitRelease != null) " — not both")); -let - monorepoSrc' = monorepoSrc; -in let - - metadata = rec { - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - }; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata); - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${metadata.release_version}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - patches = [ - ./llvm/gnu-install-dirs.patch - - # Fix musl build. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; - relative = "llvm"; - hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; - }) - # fix RuntimeDyld usage on aarch64-linux (e.g. python312Packages.numba tests) - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/2e1b838a889f9793d4bcd5dbfe10db9796b77143.patch"; - relative = "llvm"; - hash = "sha256-Ot45P/iwaR4hkcM3xtLwfryQNgHI6pv6ADjv98tgdZA="; - }) - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - ../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # TODO: lldb/docs/index.rst:155:toctree contains reference to nonexisting document 'design/structureddataplugins' - # lldb-manpages = lowPrio (tools.lldb.override { - # enableManpages = true; - # python3 = pkgs.python3; # don't use python-boot - # }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc - else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - patches = [ - ./lld/gnu-install-dirs.patch - ./lld/fix-root-src-dir.patch - ]; - }; - - lldb = callPackage ../common/lldb.nix { - patches = - let - resourceDirPatch = callPackage - ({ substituteAll, libclang }: substituteAll - { - src = ./lldb/resource-dir.patch; - clangLibDir = "${libclang.lib}/lib"; - }) - { }; - in - [ - ./lldb/procfs.patch - resourceDirPatch - ../common/lldb/gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./lldb/cpu_subtype_arm64e_replacement.patch; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ "-rtlib=compiler-rt" - "-Wno-unused-command-line-argument" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" - ++ lib.optional - (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) - "-lunwind" - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ]; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ]; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = [ "-nostartfiles" ]; - }; - - clangNoCompilerRtWithLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - }; - - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - ./compiler-rt/armv7l.patch - # Fix build on armv6l - ../common/compiler-rt/armv6-mcr-dmb.patch - ../common/compiler-rt/armv6-sync-ops-no-thumb.patch - ../common/compiler-rt/armv6-no-ldrexd-strexd.patch - ../common/compiler-rt/armv6-scudo-no-yield.patch - ../common/compiler-rt/armv6-scudo-libatomic.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - ./compiler-rt/armv7l.patch - # Fix build on armv6l - ../common/compiler-rt/armv6-mcr-dmb.patch - ../common/compiler-rt/armv6-sync-ops-no-thumb.patch - ../common/compiler-rt/armv6-no-ldrexd-strexd.patch - ../common/compiler-rt/armv6-scudo-no-yield.patch - ../common/compiler-rt/armv6-scudo-libatomic.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ../common/libcxx { - patches = [ - (substitute { - src = ../common/libcxxabi/wasm.patch; - replacements = [ - "--replace-fail" "/cmake/" "/llvm/cmake/" - ]; - }) - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - (substitute { - src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - replacements = [ - "--replace-fail" "/include/" "/libcxx/include/" - ]; - }) - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - libunwind = callPackage ../common/libunwind { - patches = [ - ./libunwind/gnu-install-dirs.patch - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - openmp = callPackage ../common/openmp { - patches = [ - ./openmp/gnu-install-dirs.patch - ./openmp/run-lit-directly.patch - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix deleted file mode 100644 index e50e35b2c4eb..000000000000 --- a/pkgs/development/compilers/llvm/15/default.nix +++ /dev/null @@ -1,455 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub, fetchpatch -, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM version's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# LLVM release information; specify one of these but not both: -, gitRelease ? null - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -, officialRelease ? { version = "15.0.7"; sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; } - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # candidate = /* optional; if specified, should be: "rcN" */ - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -# By default, we'll try to fetch a release from `github:llvm/llvm-project` -# corresponding to the `gitRelease` or `officialRelease` specified. -# -# You can provide your own LLVM source by specifying this arg but then it's up -# to you to make sure that the LLVM repo given matches the release configuration -# specified. -, monorepoSrc ? null -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -assert - lib.assertMsg - (lib.xor - (gitRelease != null) - (officialRelease != null)) - ("must specify `gitRelease` or `officialRelease`" + - (lib.optionalString (gitRelease != null) " — not both")); -let - monorepoSrc' = monorepoSrc; -in let - - metadata = rec { - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - }; - - lldbPlugins = lib.makeExtensible (lldbPlugins: let - callPackage = newScope (lldbPlugins // { inherit stdenv; inherit (tools) lldb; }); - in { - llef = callPackage ../common/lldb-plugins/llef.nix {}; - }); - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata); - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${metadata.release_version}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - patches = [ - ./llvm/gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./llvm/lit-shell-script-runner-set-dyld-library-path.patch - - # Fix musl build. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; - relative = "llvm"; - hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; - }) - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - ../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - lldb-manpages = lowPrio (tools.lldb.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc - else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - patches = [ - ./lld/gnu-install-dirs.patch - ]; - }; - - lldb = callPackage ../common/lldb.nix { - patches = - let - resourceDirPatch = callPackage - ({ substituteAll, libclang }: substituteAll - { - src = ./lldb/resource-dir.patch; - clangLibDir = "${libclang.lib}/lib"; - }) - { }; - in - [ - ./lldb/procfs.patch - resourceDirPatch - ../common/lldb/gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./lldb/cpu_subtype_arm64e_replacement.patch; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ "-rtlib=compiler-rt" - "-Wno-unused-command-line-argument" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" - ++ lib.optional - (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) - "-lunwind" - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = - [ - "-nostartfiles" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRtWithLibc = wrapCCWith (rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - } // lib.optionalAttrs stdenv.targetPlatform.isWasm { - nixSupport.cc-cflags = [ "-fno-exceptions" ]; - }); - - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - # `libcxx` requires a fairly modern C++ compiler, - # so: we use the clang from this LLVM package set instead of the regular - # stdenv's compiler. - libcxx = callPackage ../common/libcxx { - patches = [ - # See: - # - https://reviews.llvm.org/D133566 - # - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432 - # !!! Drop in LLVM 16+ - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch"; - hash = "sha256-B07vHmSjy5BhhkGSj3e1E0XmMv5/9+mvC/k70Z29VwY="; - }) - (substitute { - src = ../common/libcxxabi/wasm.patch; - replacements = [ - "--replace-fail" "/cmake/" "/llvm/cmake/" - ]; - }) - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - (substitute { - src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - replacements = [ - "--replace-fail" "/include/" "/libcxx/include/" - ]; - }) - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - libunwind = callPackage ../common/libunwind { - patches = [ - ./libunwind/gnu-install-dirs.patch - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - openmp = callPackage ../common/openmp { - patches = [ - ./openmp/fix-find-tool.patch - ./openmp/gnu-install-dirs.patch - ./openmp/run-lit-directly.patch - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries lldbPlugins; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix deleted file mode 100644 index 80b2424b14cc..000000000000 --- a/pkgs/development/compilers/llvm/16/default.nix +++ /dev/null @@ -1,437 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub -, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM verion's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# LLVM release information; specify one of these but not both: -, gitRelease ? null - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -, officialRelease ? { version = "16.0.6"; sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; } - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # candidate = /* optional; if specified, should be: "rcN" */ - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -# By default, we'll try to fetch a release from `github:llvm/llvm-project` -# corresponding to the `gitRelease` or `officialRelease` specified. -# -# You can provide your own LLVM source by specifying this arg but then it's up -# to you to make sure that the LLVM repo given matches the release configuration -# specified. -, monorepoSrc ? null -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -assert - lib.assertMsg - (lib.xor - (gitRelease != null) - (officialRelease != null)) - ("must specify `gitRelease` or `officialRelease`" + - (lib.optionalString (gitRelease != null) " — not both")); -let - monorepoSrc' = monorepoSrc; -in let - - metadata = rec { - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - }; - - lldbPlugins = lib.makeExtensible (lldbPlugins: let - callPackage = newScope (lldbPlugins // { inherit stdenv; inherit (tools) lldb; }); - in { - llef = callPackage ../common/lldb-plugins/llef.nix {}; - }); - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata); - major = lib.versions.major metadata.release_version; - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${major}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - patches = [ - ./llvm/gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./llvm/lit-shell-script-runner-set-dyld-library-path.patch - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - ../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - lldb-manpages = lowPrio (tools.lldb.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - patches = [ - ./lld/gnu-install-dirs.patch - ./lld/add-table-base.patch - ]; - }; - - mlir = callPackage ../common/mlir {}; - - lldb = callPackage ../common/lldb.nix { - src = callPackage ({ runCommand }: runCommand "lldb-src-${metadata.version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/lldb "$out" - '') { }; - patches = - let - resourceDirPatch = callPackage - ({ substituteAll, libclang }: substituteAll - { - src = ./lldb/resource-dir.patch; - clangLibDir = "${libclang.lib}/lib"; - }) - { }; - in - [ - # FIXME: do we need this? ./procfs.patch - resourceDirPatch - ../common/lldb/gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./lldb/cpu_subtype_arm64e_replacement.patch; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ "-rtlib=compiler-rt" - "-Wno-unused-command-line-argument" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" - ++ lib.optional - (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) - "-lunwind" - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = - [ - "-nostartfiles" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRtWithLibc = wrapCCWith (rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - } // lib.optionalAttrs stdenv.targetPlatform.isWasm { - nixSupport.cc-cflags = [ "-fno-exceptions" ]; - }); - - # Has to be in tools despite mostly being a library, - # because we use a native helper executable from a - # non-cross build in cross builds. - libclc = callPackage ../common/libclc.nix {}; - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid || stdenv.hostPlatform.isDarwin - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - # `libcxx` requires a fairly modern C++ compiler, - # so: we use the clang from this LLVM package set instead of the regular - # stdenv's compiler. - libcxx = callPackage ../common/libcxx { - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - libunwind = callPackage ../common/libunwind { - patches = [ - ./libunwind/gnu-install-dirs.patch - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - openmp = callPackage ../common/openmp { - patches = [ - ./openmp/fix-find-tool.patch - ./openmp/gnu-install-dirs.patch - ./openmp/run-lit-directly.patch - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries lldbPlugins; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/17/default.nix b/pkgs/development/compilers/llvm/17/default.nix deleted file mode 100644 index 84979d24b197..000000000000 --- a/pkgs/development/compilers/llvm/17/default.nix +++ /dev/null @@ -1,426 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub, fetchpatch -, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM verion's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# LLVM release information; specify one of these but not both: -, gitRelease ? null - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -, officialRelease ? { version = "17.0.6"; sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; } - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # candidate = /* optional; if specified, should be: "rcN" */ - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -# By default, we'll try to fetch a release from `github:llvm/llvm-project` -# corresponding to the `gitRelease` or `officialRelease` specified. -# -# You can provide your own LLVM source by specifying this arg but then it's up -# to you to make sure that the LLVM repo given matches the release configuration -# specified. -, monorepoSrc ? null -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -assert - lib.assertMsg - (lib.xor - (gitRelease != null) - (officialRelease != null)) - ("must specify `gitRelease` or `officialRelease`" + - (lib.optionalString (gitRelease != null) " — not both")); -let - monorepoSrc' = monorepoSrc; -in let - - metadata = rec { - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub gitRelease release_version officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - }; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata); - major = lib.versions.major metadata.release_version; - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${major}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - patches = [ - ./llvm/gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./llvm/lit-shell-script-runner-set-dyld-library-path.patch - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - ../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - lldb-manpages = lowPrio (tools.lldb.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - patches = [ - ./lld/gnu-install-dirs.patch - ./lld/add-table-base.patch - ]; - }; - - mlir = callPackage ../common/mlir {}; - - lldb = callPackage ../common/lldb.nix { - src = callPackage ({ runCommand }: runCommand "lldb-src-${metadata.version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/lldb "$out" - '') { }; - patches = - [ - # FIXME: do we need this? ./procfs.patch - ../common/lldb/gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./lldb/cpu_subtype_arm64e_replacement.patch; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ "-rtlib=compiler-rt" - "-Wno-unused-command-line-argument" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" - ++ lib.optional - (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) - "-lunwind" - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = - [ - "-nostartfiles" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRtWithLibc = wrapCCWith (rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - } // lib.optionalAttrs stdenv.targetPlatform.isWasm { - nixSupport.cc-cflags = [ "-fno-exceptions" ]; - }); - - # Has to be in tools despite mostly being a library, - # because we use a native helper executable from a - # non-cross build in cross builds. - libclc = callPackage ../common/libclc.nix {}; - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid || stdenv.hostPlatform.isDarwin - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - # `libcxx` requires a fairly modern C++ compiler, - # so: we use the clang from this LLVM package set instead of the regular - # stdenv's compiler. - libcxx = callPackage ../common/libcxx { - patches = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ - # https://github.com/llvm/llvm-project/issues/64226 - (fetchpatch { - name = "0042-mbstate_t-not-defined.patch"; - url = "https://github.com/macports/macports-ports/raw/acd8acb171f1658596ed1cf25da48d5b932e2d19/lang/llvm-17/files/0042-mbstate_t-not-defined.patch"; - hash = "sha256-jo+DYA6zuSv9OH3A0bYwY5TlkWprup4OKQ7rfK1WHBI="; - }) - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - libunwind = callPackage ../common/libunwind { - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - openmp = callPackage ../common/openmp { - patches = [ - ./openmp/fix-find-tool.patch - ./openmp/gnu-install-dirs.patch - ./openmp/run-lit-directly.patch - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs.patch index e2122ebf603d..eb9f6098d1c9 100644 --- a/pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs.patch @@ -72,8 +72,8 @@ index 230620c37027..dd16cab1835e 100644 + # As noted in the differential above, an alternative solution is to have + # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set + # `CMAKE_INSTALL_RPATH`. -+ set(_build_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath ${extra_libdir}) if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") set_property(TARGET ${name} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-z,origin ") @@ -86,10 +86,10 @@ index 891c9e6d618c..8d963f3b0069 100644 if( APPLE ) - set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "${LLVM_LIBRARY_DIR}") elseif( UNIX ) - set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "${LLVM_LIBRARY_DIR}") endif() list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") diff --git a/pkgs/development/compilers/llvm/18/default.nix b/pkgs/development/compilers/llvm/18/default.nix deleted file mode 100644 index 878f1e3a8e7e..000000000000 --- a/pkgs/development/compilers/llvm/18/default.nix +++ /dev/null @@ -1,414 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub -, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM verion's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# LLVM release information; specify one of these but not both: -, gitRelease ? null - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -, officialRelease ? { version = "18.1.7"; sha256 = "sha256-qBL/1zh2YFabiPAyHehvzDSDfnwnCvyH6nY/pzG757A="; } - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # candidate = /* optional; if specified, should be: "rcN" */ - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -# By default, we'll try to fetch a release from `github:llvm/llvm-project` -# corresponding to the `gitRelease` or `officialRelease` specified. -# -# You can provide your own LLVM source by specifying this arg but then it's up -# to you to make sure that the LLVM repo given matches the release configuration -# specified. -, monorepoSrc ? null -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -assert - lib.assertMsg - (lib.xor - (gitRelease != null) - (officialRelease != null)) - ("must specify `gitRelease` or `officialRelease`" + - (lib.optionalString (gitRelease != null) " — not both")); -let - monorepoSrc' = monorepoSrc; -in let - - metadata = rec { - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub gitRelease release_version officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - }; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata); - major = lib.versions.major metadata.release_version; - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${major}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - patches = [ - ./llvm/gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./llvm/lit-shell-script-runner-set-dyld-library-path.patch - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - ../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - lldb-manpages = lowPrio (tools.lldb.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - patches = [ - ./lld/gnu-install-dirs.patch - ]; - }; - - mlir = callPackage ../common/mlir {}; - - lldb = callPackage ../common/lldb.nix { - src = callPackage ({ runCommand }: runCommand "lldb-src-${metadata.version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/lldb "$out" - '') { }; - patches = - [ - # FIXME: do we need this? ./procfs.patch - ../common/lldb/gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./lldb/cpu_subtype_arm64e_replacement.patch; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ "-rtlib=compiler-rt" - "-Wno-unused-command-line-argument" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" - ++ lib.optional - (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) - "-lunwind" - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = - [ - "-nostartfiles" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRtWithLibc = wrapCCWith (rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - } // lib.optionalAttrs stdenv.targetPlatform.isWasm { - nixSupport.cc-cflags = [ "-fno-exceptions" ]; - }); - - # Has to be in tools despite mostly being a library, - # because we use a native helper executable from a - # non-cross build in cross builds. - libclc = callPackage ../common/libclc.nix {}; - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid || stdenv.hostPlatform.isDarwin - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - # `libcxx` requires a fairly modern C++ compiler, - # so: we use the clang from this LLVM package set instead of the regular - # stdenv's compiler. - libcxx = callPackage ../common/libcxx { - patches = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ - # https://github.com/llvm/llvm-project/issues/64226 - ./libcxx/0001-darwin-10.12-mbstate_t-fix.patch - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - libunwind = callPackage ../common/libunwind { - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - openmp = callPackage ../common/openmp { - patches = [ - ./openmp/fix-find-tool.patch - ./openmp/run-lit-directly.patch - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index dc175e085f0b..922eb8657cee 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -136,16 +136,26 @@ let passthru = { inherit libllvm; isClang = true; - } // (lib.optionalAttrs (lib.versionAtLeast release_version "15") { - hardeningUnsupportedFlags = [ - "fortify3" - ]; hardeningUnsupportedFlagsByTargetPlatform = targetPlatform: - lib.optional (!(targetPlatform.isx86_64 || targetPlatform.isAarch64)) "zerocallusedregs" + [ "fortify3" ] + ++ lib.optional ( + (lib.versionOlder release_version "11") + || (targetPlatform.isAarch64 && (lib.versionOlder release_version "18.1")) + || (targetPlatform.isFreeBSD && (lib.versionOlder release_version "15")) + || !(targetPlatform.isLinux || targetPlatform.isFreeBSD) + || !( + targetPlatform.isx86 + || targetPlatform.isPower64 + || targetPlatform.isS390x + || targetPlatform.isAarch64 + ) + ) "stackclashprotection" + ++ lib.optional ( + (lib.versionOlder release_version "15") + || !(targetPlatform.isx86_64 || targetPlatform.isAarch64) + ) "zerocallusedregs" ++ (finalAttrs.passthru.hardeningUnsupportedFlags or []); - }) // (lib.optionalAttrs (lib.versionOlder release_version "15") { - hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ]; - }); + }; meta = llvm_meta // { homepage = "https://clang.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/common/common-let.nix b/pkgs/development/compilers/llvm/common/common-let.nix index 31360f5b98b9..6ee05b80c446 100644 --- a/pkgs/development/compilers/llvm/common/common-let.nix +++ b/pkgs/development/compilers/llvm/common/common-let.nix @@ -4,7 +4,8 @@ , gitRelease ? null , officialRelease ? null , monorepoSrc' ? null -}: +, version ? null, +}@args: rec { llvm_meta = { @@ -27,11 +28,11 @@ rec { releaseInfo = if gitRelease != null then rec { original = gitRelease; - release_version = original.version; + release_version = args.version or original.version; version = gitRelease.rev-version; } else rec { original = officialRelease; - release_version = original.version; + release_version = args.version or original.version; version = if original ? candidate then "${release_version}-${original.candidate}" diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 23a966ce238f..67f9661cf743 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation ({ '' + (if stdenv.hostPlatform.isFreeBSD then # As per above, but in FreeBSD assert is a macro and simply allowing it to be implicitly declared causes Issues!!!!! '' - substituteInPlace lib/builtins/clear_cache.c lib/builtins/cpu_model.c \ + substituteInPlace lib/builtins/clear_cache.c lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast version "18") "/x86"}.c \ --replace "#include " "#define assert(e) ((e)?(void)0:__assert(__FUNCTION__,__FILE__,__LINE__,#e))" '' else '' substituteInPlace lib/builtins/clear_cache.c \ diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix new file mode 100644 index 000000000000..7e8e65b51c1e --- /dev/null +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -0,0 +1,741 @@ +{ + lowPrio, + newScope, + pkgs, + lib, + stdenv, + preLibcCrossHeaders, + substitute, + substituteAll, + fetchFromGitHub, + fetchpatch, + overrideCC, + wrapCCWith, + wrapBintoolsWith, + buildLlvmTools, # tools, but from the previous stage, for cross + targetLlvmLibraries, # libraries, but from the next stage, for cross + targetLlvm, + # This is the default binutils, but with *this* version of LLD rather + # than the default LLVM version's, if LLD is the choice. We use these for + # the `useLLVM` bootstrapping below. + bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc, + bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools, + darwin, + gitRelease ? null, + officialRelease ? null, + monorepoSrc ? null, + version ? null, + ... +}@args: + +assert lib.assertMsg (lib.xor (gitRelease != null) (officialRelease != null)) ( + "must specify `gitRelease` or `officialRelease`" + + (lib.optionalString (gitRelease != null) " — not both") +); + +let + monorepoSrc' = monorepoSrc; + + metadata = rec { + # Import releaseInfo separately to avoid infinite recursion + inherit + (import ./common-let.nix { + inherit (args) + lib + gitRelease + officialRelease + version + ; + }) + releaseInfo + ; + inherit (releaseInfo) release_version version; + inherit + (import ./common-let.nix { + inherit + lib + fetchFromGitHub + release_version + gitRelease + officialRelease + monorepoSrc' + version + ; + }) + llvm_meta + monorepoSrc + ; + src = monorepoSrc; + versionDir = + (builtins.toString ../.) + + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}"; + getVersionFile = + p: + builtins.path { + name = builtins.baseNameOf p; + path = "${metadata.versionDir}/${p}"; + }; + }; + + lldbPlugins = lib.makeExtensible ( + lldbPlugins: + let + callPackage = newScope ( + lldbPlugins + // { + inherit stdenv; + inherit (tools) lldb; + } + ); + in + { + llef = callPackage ./lldb-plugins/llef.nix { }; + } + ); + + tools = lib.makeExtensible ( + tools: + let + callPackage = newScope ( + tools + // args + // metadata + # Previously monorepoSrc was erroneously not being passed through. + // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild. + ); + clangVersion = + if (lib.versionOlder metadata.release_version "16") then + metadata.release_version + else + lib.versions.major metadata.release_version; + mkExtraBuildCommands0 = cc: '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc.lib}/lib/clang/${clangVersion}/include" "$rsrc" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + ''; + mkExtraBuildCommands = + cc: + mkExtraBuildCommands0 cc + + '' + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + ''; + + bintoolsNoLibc' = if bootBintoolsNoLibc == null then tools.bintoolsNoLibc else bootBintoolsNoLibc; + bintools' = if bootBintools == null then tools.bintools else bootBintools; + in + { + libllvm = callPackage ./llvm { + patches = + lib.optional (lib.versionOlder metadata.release_version "14") ./llvm/llvm-config-link-static.patch + ++ [ (metadata.getVersionFile "llvm/gnu-install-dirs.patch") ] + ++ lib.optionals (lib.versionAtLeast metadata.release_version "15") [ + # Running the tests involves invoking binaries (like `opt`) that depend on + # the LLVM dylibs and reference them by absolute install path (i.e. their + # nix store path). + # + # Because we have not yet run the install phase (we're running these tests + # as part of `checkPhase` instead of `installCheckPhase`) these absolute + # paths do not exist yet; to work around this we point the loader (`ld` on + # unix, `dyld` on macOS) at the `lib` directory which will later become this + # package's `lib` output. + # + # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` + # dir but: + # - this doesn't generalize well to other platforms; `lit` doesn't forward + # `DYLD_LIBRARY_PATH` (macOS): + # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 + # - even if `lit` forwarded this env var, we actually cannot set + # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because + # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for + # "protected processes" (i.e. the python interpreter that runs `lit`): + # https://stackoverflow.com/a/35570229 + # - other LLVM subprojects deal with this issue by having their `lit` + # configuration set these env vars for us; it makes sense to do the same + # for LLVM: + # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 + # + # !!! TODO: look into upstreaming this patch + (metadata.getVersionFile "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch") + + # `lit` has a mode where it executes run lines as a shell script which is + # constructs; this is problematic for macOS because it means that there's + # another process in between `lit` and the binaries being tested. As noted + # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our + # tests fail with dyld errors. + # + # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when + # present in the test configuration. + # + # It's not clear to me why this isn't an issue for LLVM developers running + # on macOS (nothing about this _seems_ nix specific).. + (metadata.getVersionFile "llvm/lit-shell-script-runner-set-dyld-library-path.patch") + ] + ++ + lib.optional (lib.versions.major metadata.release_version == "13") + # Fix random compiler crashes: https://bugs.llvm.org/show_bug.cgi?id=50611 + ( + fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4764a4f8c920912a2bfd8b0eea57273acfe0d8a8/trunk/no-strict-aliasing-DwarfCompileUnit.patch"; + sha256 = "18l6mrvm2vmwm77ckcnbjvh6ybvn72rhrb799d4qzwac4x2ifl7g"; + stripLen = 1; + } + ) + ++ + lib.optional (lib.versionOlder metadata.release_version "16") + # Fix musl build. + ( + fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; + relative = "llvm"; + hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; + } + ) + ++ lib.optionals (lib.versions.major metadata.release_version == "13") [ + # Backport gcc-13 fixes with missing includes. + (fetchpatch { + name = "signals-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; + hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; + stripLen = 1; + }) + (fetchpatch { + name = "base64-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; + hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; + stripLen = 1; + }) + ] + ++ lib.optionals (lib.versions.major metadata.release_version == "14") [ + # fix RuntimeDyld usage on aarch64-linux (e.g. python312Packages.numba tests) + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/2e1b838a889f9793d4bcd5dbfe10db9796b77143.patch"; + relative = "llvm"; + hash = "sha256-Ot45P/iwaR4hkcM3xtLwfryQNgHI6pv6ADjv98tgdZA="; + }) + ] + ++ + lib.optional (lib.versions.major metadata.release_version == "17") + # resolves https://github.com/llvm/llvm-project/issues/75168 + ( + fetchpatch { + name = "fix-fzero-call-used-regs.patch"; + url = "https://github.com/llvm/llvm-project/commit/f800c1f3b207e7bcdc8b4c7192928d9a078242a0.patch"; + stripLen = 1; + hash = "sha256-e8YKrMy2rGcSJGC6er2V66cOnAnI+u1/yImkvsRsmg8="; + } + ); + pollyPatches = + [ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ] + ++ lib.optional (lib.versionAtLeast metadata.release_version "15") + # Just like the `llvm-lit-cfg` patch, but for `polly`. + (metadata.getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch"); + }; + + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm; + + libclang = callPackage ./clang { + patches = + [ + (metadata.getVersionFile "clang/purity.patch") + # https://reviews.llvm.org/D51899 + (metadata.getVersionFile "clang/gnu-install-dirs.patch") + ] + ++ lib.optional (lib.versions.major metadata.release_version == "13") + # Revert of https://reviews.llvm.org/D100879 + # The malloc alignment assumption is incorrect for jemalloc and causes + # mis-compilation in firefox. + # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 + (metadata.getVersionFile "clang/revert-malloc-alignment-assumption.patch") + ++ [ + ./clang/add-nostdlibinc-flag.patch + (substituteAll { + src = + if (lib.versionOlder metadata.release_version "16") then + ./clang/clang-11-15-LLVMgold-path.patch + else + ./clang/clang-at-least-16-LLVMgold-path.patch; + libllvmLibdir = "${tools.libllvm.lib}/lib"; + }) + ] + ++ lib.optional (lib.versions.major metadata.release_version == "18") (fetchpatch { + name = "tweak-tryCaptureVariable-for-unevaluated-lambdas.patch"; + url = "https://github.com/llvm/llvm-project/commit/3d361b225fe89ce1d8c93639f27d689082bd8dad.patch"; + # TreeTransform.h is not affected in LLVM 18. + excludes = [ + "docs/ReleaseNotes.rst" + "lib/Sema/TreeTransform.h" + ]; + stripLen = 1; + hash = "sha256-1NKej08R9SPlbDY/5b0OKUsHjX07i9brR84yXiPwi7E="; + }); + }; + + clang-unwrapped = tools.libclang; + + llvm-manpages = lowPrio ( + tools.libllvm.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + } + ); + + clang-manpages = lowPrio ( + tools.libclang.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + } + ); + + # Wrapper for standalone command line utilities + clang-tools = callPackage ./clang-tools { }; + + # pick clang appropriate for package set we are targeting + clang = + if stdenv.targetPlatform.libc == null then + tools.clangNoLibc + else if stdenv.targetPlatform.useLLVM or false then + tools.clangUseLLVM + else if (pkgs.targetPackages.stdenv or args.stdenv).cc.isGNU then + tools.libstdcxxClang + else + tools.libcxxClang; + + libstdcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. + libcxx = null; + extraPackages = [ targetLlvmLibraries.compiler-rt ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + libcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + extraPackages = [ targetLlvmLibraries.compiler-rt ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + lld = callPackage ./lld { + patches = + [ (metadata.getVersionFile "lld/gnu-install-dirs.patch") ] + ++ lib.optional (lib.versions.major metadata.release_version == "14") ( + metadata.getVersionFile "lld/fix-root-src-dir.patch" + ) + ++ lib.optional ( + lib.versionAtLeast metadata.release_version "16" && lib.versionOlder metadata.release_version "18" + ) (metadata.getVersionFile "lld/add-table-base.patch"); + }; + + lldb = callPackage ./lldb.nix ( + { + patches = + let + resourceDirPatch = callPackage ( + { substituteAll, libclang }: + (substituteAll { + src = metadata.getVersionFile "lldb/resource-dir.patch"; + clangLibDir = "${libclang.lib}/lib"; + }).overrideAttrs + (_: _: { name = "resource-dir.patch"; }) + ) { }; + in + lib.optional (lib.versionOlder metadata.release_version "16") + # FIXME: do we need this after 15? + (metadata.getVersionFile "lldb/procfs.patch") + ++ lib.optional (lib.versionOlder metadata.release_version "17") resourceDirPatch + ++ lib.optional (lib.versionOlder metadata.release_version "14") ( + metadata.getVersionFile "lldb/gnu-install-dirs.patch" + ) + ++ lib.optional (lib.versionAtLeast metadata.release_version "14") ./lldb/gnu-install-dirs.patch + # This is a stopgap solution if/until the macOS SDK used for x86_64 is + # updated. + # + # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` + # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use + # of this preprocessor symbol in `lldb` with its expansion. + # + # See here for some context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + ++ lib.optional ( + stdenv.targetPlatform.isDarwin + && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0" + ) (metadata.getVersionFile "lldb/cpu_subtype_arm64e_replacement.patch"); + } + // lib.optionalAttrs (lib.versions.major metadata.release_version == "16") { + src = callPackage ( + { runCommand }: + runCommand "lldb-src-${metadata.version}" { } '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/lldb "$out" + '' + ) { }; + } + ); + + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + + bintools-unwrapped = callPackage ./bintools.nix { }; + + bintoolsNoLibc = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + libc = preLibcCrossHeaders; + }; + + bintools = wrapBintoolsWith { bintools = tools.bintools-unwrapped; }; + + clangUseLLVM = wrapCCWith ( + rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + bintools = bintools'; + extraPackages = + [ targetLlvmLibraries.compiler-rt ] + ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = + lib.optionalString (lib.versions.major metadata.release_version == "13") ( + '' + echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + + lib.optionalString (!stdenv.targetPlatform.isWasm) '' + echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags + '' + + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' + echo "-lunwind" >> $out/nix-support/cc-ldflags + '' + + lib.optionalString stdenv.targetPlatform.isWasm '' + echo "-fno-exceptions" >> $out/nix-support/cc-cflags + '' + ) + + mkExtraBuildCommands cc; + } + // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") { + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-Wno-unused-command-line-argument" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional ( + !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD + ) "--unwindlib=libunwind" + ++ lib.optional ( + !stdenv.targetPlatform.isWasm + && !stdenv.targetPlatform.isFreeBSD + && stdenv.targetPlatform.useLLVM or false + ) "-lunwind" + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + nixSupport.cc-ldflags = lib.optionals ( + !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD + ) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; + } + ); + + clangNoLibcxx = wrapCCWith ( + rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ targetLlvmLibraries.compiler-rt ]; + extraBuildCommands = + lib.optionalString (lib.versions.major metadata.release_version == "13") '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + echo "-nostdlib++" >> $out/nix-support/cc-cflags + '' + + mkExtraBuildCommands cc; + } + // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") { + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + "-nostdlib++" + ] + ++ lib.optional ( + lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm + ) "-fno-exceptions"; + } + ); + + clangNoLibc = wrapCCWith ( + rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ targetLlvmLibraries.compiler-rt ]; + extraBuildCommands = + lib.optionalString (lib.versions.major metadata.release_version == "13") '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + + mkExtraBuildCommands cc; + } + // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") { + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional ( + lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm + ) "-fno-exceptions"; + } + ); + + clangNoCompilerRt = wrapCCWith ( + rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ ]; + extraBuildCommands = + lib.optionalString (lib.versions.major metadata.release_version == "13") '' + echo "-nostartfiles" >> $out/nix-support/cc-cflags + '' + + mkExtraBuildCommands0 cc; + } + // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") { + nixSupport.cc-cflags = + [ "-nostartfiles" ] + ++ lib.optional ( + lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm + ) "-fno-exceptions"; + } + ); + + clangNoCompilerRtWithLibc = + wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ ]; + extraBuildCommands = mkExtraBuildCommands0 cc; + } + // lib.optionalAttrs ( + lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm + ) { nixSupport.cc-cflags = [ "-fno-exceptions" ]; }; + } + // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "15") { + # TODO: pre-15: lldb/docs/index.rst:155:toctree contains reference to nonexisting document 'design/structureddataplugins' + lldb-manpages = lowPrio ( + tools.lldb.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + } + ); + } + // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "16") { + mlir = callPackage ./mlir { }; + libclc = callPackage ./libclc.nix { }; + } + ); + + libraries = lib.makeExtensible ( + libraries: + let + callPackage = newScope ( + libraries + // buildLlvmTools + // args + // metadata + # Previously monorepoSrc was erroneously not being passed through. + // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild. + ); + + compiler-rtPatches = + lib.optional (lib.versionOlder metadata.release_version "15") ( + metadata.getVersionFile "compiler-rt/codesign.patch" + ) # Revert compiler-rt commit that makes codesign mandatory + ++ [ + (metadata.getVersionFile "compiler-rt/X86-support-extension.patch") # Add support for i486 i586 i686 by reusing i386 config + ] + ++ lib.optional ( + lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18" + ) (metadata.getVersionFile "compiler-rt/gnu-install-dirs.patch") + ++ [ + # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the + # extra `/`. + (metadata.getVersionFile "compiler-rt/normalize-var.patch") + ] + ++ + lib.optional (lib.versionOlder metadata.release_version "18") + # Prevent a compilation error on darwin + (metadata.getVersionFile "compiler-rt/darwin-targetconditionals.patch") + ++ + lib.optional (lib.versionAtLeast metadata.release_version "15") + # See: https://github.com/NixOS/nixpkgs/pull/186575 + ./compiler-rt/darwin-plistbuddy-workaround.patch + ++ + lib.optional (lib.versions.major metadata.release_version == "15") + # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 + ./compiler-rt/armv7l-15.patch + ++ lib.optionals (lib.versionOlder metadata.release_version "15") [ + ./compiler-rt/darwin-plistbuddy-workaround.patch + (metadata.getVersionFile "compiler-rt/armv7l.patch") + # Fix build on armv6l + ./compiler-rt/armv6-mcr-dmb.patch + ./compiler-rt/armv6-sync-ops-no-thumb.patch + ./compiler-rt/armv6-no-ldrexd-strexd.patch + ./compiler-rt/armv6-scudo-no-yield.patch + ./compiler-rt/armv6-scudo-libatomic.patch + ]; + in + { + compiler-rt-libc = callPackage ./compiler-rt { + patches = compiler-rtPatches; + stdenv = + if + stdenv.hostPlatform.useLLVM or false + || ( + lib.versionAtLeast metadata.release_version "16" + && stdenv.hostPlatform.isDarwin + && stdenv.hostPlatform.isStatic + ) + then + overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc + else + args.stdenv; + }; + + compiler-rt-no-libc = callPackage ./compiler-rt { + patches = compiler-rtPatches; + stdenv = + if stdenv.hostPlatform.useLLVM or false then + overrideCC stdenv buildLlvmTools.clangNoCompilerRt + else + stdenv; + }; + + # N.B. condition is safe because without useLLVM both are the same. + compiler-rt = + if + stdenv.hostPlatform.isAndroid + || (lib.versionAtLeast metadata.release_version "16" && stdenv.hostPlatform.isDarwin) + then + libraries.compiler-rt-libc + else + libraries.compiler-rt-no-libc; + + stdenv = overrideCC stdenv buildLlvmTools.clang; + + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; + + libcxx = callPackage ./libcxx ( + { + patches = + lib.optionals (lib.versionOlder metadata.release_version "16") ( + lib.optional (lib.versions.major metadata.release_version == "15") + # See: + # - https://reviews.llvm.org/D133566 + # - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432 + # !!! Drop in LLVM 16+ + ( + fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch"; + hash = "sha256-B07vHmSjy5BhhkGSj3e1E0XmMv5/9+mvC/k70Z29VwY="; + } + ) + ++ [ + (substitute { + src = ./libcxxabi/wasm.patch; + substitutions = [ + "--replace-fail" + "/cmake/" + "/llvm/cmake/" + ]; + }) + ] + ++ lib.optional stdenv.hostPlatform.isMusl (substitute { + src = ./libcxx/libcxx-0001-musl-hacks.patch; + substitutions = [ + "--replace-fail" + "/include/" + "/libcxx/include/" + ]; + }) + ) + ++ + lib.optional + ( + lib.versions.major metadata.release_version == "17" + && stdenv.isDarwin + && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" + ) + # https://github.com/llvm/llvm-project/issues/64226 + ( + fetchpatch { + name = "0042-mbstate_t-not-defined.patch"; + url = "https://github.com/macports/macports-ports/raw/acd8acb171f1658596ed1cf25da48d5b932e2d19/lang/llvm-17/files/0042-mbstate_t-not-defined.patch"; + hash = "sha256-jo+DYA6zuSv9OH3A0bYwY5TlkWprup4OKQ7rfK1WHBI="; + } + ) + ++ + lib.optional + ( + lib.versionAtLeast metadata.release_version "18" + && stdenv.isDarwin + && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" + ) + # https://github.com/llvm/llvm-project/issues/64226 + (metadata.getVersionFile "libcxx/0001-darwin-10.12-mbstate_t-fix.patch"); + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + } + // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { + # TODO: remove this, causes LLVM 13 packages rebuild. + inherit (metadata) monorepoSrc; # Preserve bug during #307211 refactor. + } + ); + + libunwind = callPackage ./libunwind { + patches = lib.optional (lib.versionOlder metadata.release_version "17") ( + metadata.getVersionFile "libunwind/gnu-install-dirs.patch" + ); + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + }; + + openmp = callPackage ./openmp { + patches = + lib.optional (lib.versionAtLeast metadata.release_version "15") ( + metadata.getVersionFile "openmp/fix-find-tool.patch" + ) + ++ lib.optional ( + lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18" + ) (metadata.getVersionFile "openmp/gnu-install-dirs.patch") + ++ lib.optional (lib.versionAtLeast metadata.release_version "14") ( + metadata.getVersionFile "openmp/run-lit-directly.patch" + ) + ++ + lib.optional (lib.versionOlder metadata.release_version "14") + # Fix cross. + ( + fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch"; + hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A="; + } + ); + }; + } + ); + + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; +in +{ + inherit tools libraries lldbPlugins; + inherit (metadata) release_version; +} +// (noExtend libraries) +// (noExtend tools) diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix index b2c23f35f0a1..646d435489c6 100644 --- a/pkgs/development/compilers/llvm/common/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix @@ -13,16 +13,12 @@ , python3 , fixDarwinDylibNames , version -, cxxabi ? null -, libcxxrt +, freebsd +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then freebsd.libcxxrt else null , libunwind , enableShared ? !stdenv.hostPlatform.isStatic }: -# note: our setup using libcxxabi instead of libcxxrt on FreeBSD diverges from -# normal FreeBSD. This may cause issues with binary patching down the line. -# If this becomes an issue, try adding as symlink libcxxrt.so -> libc++abi.so - # external cxxabi is not supported on Darwin as the build will not link libcxx # properly and not re-export the cxxabi symbols into libcxx # https://github.com/NixOS/nixpkgs/issues/166205 @@ -83,9 +79,13 @@ let "-DLIBCXX_HAS_MUSL_LIBC=1" ] ++ lib.optionals (lib.versionAtLeast release_version "18" && !useLLVM && stdenv.hostPlatform.libc == "glibc" && !stdenv.hostPlatform.isStatic) [ "-DLIBCXX_ADDITIONAL_LIBRARIES=gcc_s" + ] ++ lib.optionals (lib.versionAtLeast release_version "18" && stdenv.hostPlatform.isFreeBSD) [ + # Name and documentation claim this is for libc++abi, but its man effect is adding `-lunwind` + # to the libc++.so linker script. We want FreeBSD's so-called libgcc instead of libunwind. + "-DLIBCXXABI_USE_LLVM_UNWINDER=OFF" ] ++ lib.optionals useLLVM [ "-DLIBCXX_USE_COMPILER_RT=ON" - ] ++ lib.optionals (useLLVM && lib.versionAtLeast release_version "16") [ + ] ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isFreeBSD && lib.versionAtLeast release_version "16") [ "-DLIBCXX_ADDITIONAL_LIBRARIES=unwind" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" @@ -93,6 +93,8 @@ let "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ lib.optionals (!enableShared) [ "-DLIBCXX_ENABLE_SHARED=OFF" + ] ++ lib.optionals (cxxabi != null && cxxabi.libName == "cxxrt") [ + "-DLIBCXX_ENABLE_NEW_DELETE_DEFINITIONS=ON" ]; cmakeFlags = [ @@ -122,7 +124,7 @@ stdenv.mkDerivation (rec { ++ lib.optional (cxxabi != null) lndir; buildInputs = [ cxxabi ] - ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm) [ libunwind ]; + ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm && !stdenv.hostPlatform.isFreeBSD) [ libunwind ]; # libc++.so is a linker script which expands to multiple libraries, # libc++.so.1 and libc++abi.so or the external cxxabi. ld-wrapper doesn't diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index 71afcb159a44..064ed4ec5a81 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation (rec { ++ lib.optional ( stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 + && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0" && (lib.versionAtLeast release_version "15") ) ( diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 89ea8f6e7a56..f780c87d0e4b 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -313,7 +313,7 @@ stdenv.mkDerivation (rec { ) ''; - # E.g. mesa.drivers use the build-id as a cache key (see #93946): + # E.g. Mesa uses the build-id as a cache key (see #93946): LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; cmakeBuildType = if debugVersion then "Debug" else "Release"; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix new file mode 100644 index 000000000000..fa6008e807b0 --- /dev/null +++ b/pkgs/development/compilers/llvm/default.nix @@ -0,0 +1,86 @@ +{ + lib, + callPackage, + stdenvAdapters, + buildPackages, + targetPackages, + stdenv, + gcc12Stdenv, + pkgs, + # This is the default binutils, but with *this* version of LLD rather + # than the default LLVM version's, if LLD is the choice. We use these for + # the `useLLVM` bootstrapping below. + bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc, + bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools, + llvmVersions ? { }, +}: +let + versions = { + "13.0.1".officialRelease.sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k"; + "14.0.6".officialRelease.sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; + "15.0.7".officialRelease.sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; + "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; + "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; + "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; + "19.0.0-git".gitRelease = { + rev = "3f83a69bcb2c6b5fa3efbc41d1822e6fa69a6620"; + rev-version = "19.0.0-unstable-2024-07-08"; + sha256 = "sha256-nAKAm2sQrwOT+IKnKTv53O8QBm0iNF/j257OVRwjVXU="; + }; + } // llvmVersions; + + mkPackage = + { + name ? null, + officialRelease ? null, + gitRelease ? null, + monorepoSrc ? null, + version ? null, + }@args: + let + args' = { + name = null; + officialRelease = null; + gitRelease = null; + monorepoSrc = null; + version = null; + } // args; + inherit + (import ./common/common-let.nix { + inherit lib; + inherit (args') gitRelease officialRelease version; + }) + releaseInfo + ; + inherit (releaseInfo) release_version; + attrName = + args.name or (if (gitRelease != null) then "git" else lib.versions.major release_version); + in + callPackage ./common { + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages."llvmPackages_${attrName}".tools; + targetLlvmLibraries = + targetPackages."llvmPackages_${attrName}".libraries or llvmPackages."${attrName}".libraries; + targetLlvm = targetPackages."llvmPackages_${attrName}".llvm or llvmPackages."${attrName}".llvm; + stdenv = + if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then + gcc12Stdenv + else + stdenv; # does not build with gcc13 + inherit bootBintoolsNoLibc bootBintools; + inherit (args') + officialRelease + gitRelease + monorepoSrc + version + ; + }; + + llvmPackages = lib.mapAttrs' ( + version: args: + lib.nameValuePair (if (args ? gitRelease) then "git" else lib.versions.major version) ( + mkPackage (args // { inherit version; }) + ) + ) versions; +in +llvmPackages diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix deleted file mode 100644 index ff76aad22a71..000000000000 --- a/pkgs/development/compilers/llvm/git/default.nix +++ /dev/null @@ -1,419 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub, fetchpatch -, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM verion's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# LLVM release information; specify one of these but not both: -, gitRelease ? { - version = "19.0.0-git"; - rev = "a9ac31910db3975d5e92a6265ab29dafd6a4691d"; - rev-version = "19.0.0-unstable-2024-06-23"; - sha256 = "sha256-MTt2FU84rgu6FqB9aCO6M54VZexoogkdx5RKS1NzSkk="; -} - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "15.0.0-unstable-2022-07-26" */; - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -, officialRelease ? null - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # candidate = /* optional; if specified, should be: "rcN" */ - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -# By default, we'll try to fetch a release from `github:llvm/llvm-project` -# corresponding to the `gitRelease` or `officialRelease` specified. -# -# You can provide your own LLVM source by specifying this arg but then it's up -# to you to make sure that the LLVM repo given matches the release configuration -# specified. -, monorepoSrc ? null -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -assert - lib.assertMsg - (lib.xor - (gitRelease != null) - (officialRelease != null)) - ("must specify `gitRelease` or `officialRelease`" + - (lib.optionalString (gitRelease != null) " — not both")); -let - monorepoSrc' = monorepoSrc; -in let - - metadata = rec { - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub gitRelease release_version officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - }; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata); - major = lib.versions.major metadata.release_version; - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${major}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - patches = [ - ./llvm/gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./llvm/lit-shell-script-runner-set-dyld-library-path.patch - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - ../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - lldb-manpages = lowPrio (tools.lldb.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - patches = [ - ./lld/gnu-install-dirs.patch - ]; - }; - - mlir = callPackage ../common/mlir {}; - - lldb = callPackage ../common/lldb.nix { - src = callPackage ({ runCommand }: runCommand "lldb-src-${metadata.version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/lldb "$out" - '') { }; - patches = - [ - # FIXME: do we need this? ./procfs.patch - ../common/lldb/gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./lldb/cpu_subtype_arm64e_replacement.patch; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ "-rtlib=compiler-rt" - "-Wno-unused-command-line-argument" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" - ++ lib.optional - (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) - "-lunwind" - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = - [ - "-nostartfiles" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRtWithLibc = wrapCCWith (rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - } // lib.optionalAttrs stdenv.targetPlatform.isWasm { - nixSupport.cc-cflags = [ "-fno-exceptions" ]; - }); - - # Has to be in tools despite mostly being a library, - # because we use a native helper executable from a - # non-cross build in cross builds. - libclc = callPackage ../common/libclc.nix {}; - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid || stdenv.hostPlatform.isDarwin - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - # `libcxx` requires a fairly modern C++ compiler, - # so: we use the clang from this LLVM package set instead of the regular - # stdenv's compiler. - libcxx = callPackage ../common/libcxx { - patches = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ - # https://github.com/llvm/llvm-project/issues/64226 - ./libcxx/0001-darwin-10.12-mbstate_t-fix.patch - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - libunwind = callPackage ../common/libunwind { - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - openmp = callPackage ../common/openmp { - patches = [ - ./openmp/fix-find-tool.patch - ./openmp/run-lit-directly.patch - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix deleted file mode 100644 index d8a608508c55..000000000000 --- a/pkgs/development/compilers/odin/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib -, fetchFromGitHub -, llvmPackages -, makeBinaryWrapper -, libiconv -, MacOSX-SDK -, Security -, which -}: - -let - inherit (llvmPackages) stdenv; -in stdenv.mkDerivation rec { - pname = "odin"; - version = "dev-2024-06"; - - src = fetchFromGitHub { - owner = "odin-lang"; - repo = "Odin"; - rev = version; - hash = "sha256-Ba+244L855y+XzLcaf1fgQhHVDv2Q77GPapRAYmCQfg="; - }; - - nativeBuildInputs = [ - makeBinaryWrapper which - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - libiconv - Security - ]; - - LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; - - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace src/linker.cpp \ - --replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK} - '' + '' - substituteInPlace build_odin.sh \ - --replace-fail '-framework System' '-lSystem' - patchShebangs build_odin.sh - ''; - - dontConfigure = true; - - buildFlags = [ - "release" - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp odin $out/bin/odin - - mkdir -p $out/share - cp -r base $out/share/base - cp -r core $out/share/core - cp -r vendor $out/share/vendor - - wrapProgram $out/bin/odin \ - --prefix PATH : ${lib.makeBinPath (with llvmPackages; [ - bintools - llvm - clang - lld - ])} \ - --set-default ODIN_ROOT $out/share - - runHook postInstall - ''; - - meta = with lib; { - description = "Fast, concise, readable, pragmatic and open sourced programming language"; - mainProgram = "odin"; - homepage = "https://odin-lang.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ luc65r astavie znaniye ]; - platforms = platforms.x86_64 ++ [ "aarch64-darwin" ]; - }; -} diff --git a/pkgs/development/compilers/openjdk/21.nix b/pkgs/development/compilers/openjdk/21.nix index 623ac281acf7..160b3da4c8ee 100644 --- a/pkgs/development/compilers/openjdk/21.nix +++ b/pkgs/development/compilers/openjdk/21.nix @@ -14,8 +14,8 @@ let version = { feature = "21"; - interim = ""; - build = "35"; + interim = ".0.3"; + build = "9"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -29,7 +29,7 @@ let owner = "openjdk"; repo = "jdk${version.feature}u"; rev = "jdk-${version.feature}${version.interim}+${version.build}"; - hash = "sha256-fA8nRWBuTL87S8mwapmNfCPPQoI2aKHjbHJ6PDN3khs="; + hash = "sha256-zRN16lrc5gtDlTVIQJRRx103w/VbRkatCLeEc9AXWPE="; }; nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; diff --git a/pkgs/development/compilers/openjdk/info.json b/pkgs/development/compilers/openjdk/info.json index c8f88d7280e4..d4df70b8597f 100644 --- a/pkgs/development/compilers/openjdk/info.json +++ b/pkgs/development/compilers/openjdk/info.json @@ -1,8 +1,8 @@ { "22": { - "version": "22-ga", + "version": "22.0.1-ga", "repo": "jdk22u", - "hash": "sha256-itjvIedPwJl/l3a2gIVpNMs1zkbrjioVqbCj1Z1nCJE=" + "hash": "sha256-wCHgharBnvRSB3dWW8C3e80AZtxyFgP0SS5X1d4LzMc=" }, "21": { "version": "21.0.3-ga", diff --git a/pkgs/development/compilers/openjdk/openjfx/21.nix b/pkgs/development/compilers/openjdk/openjfx/21.nix index d4092a99f363..ee262eb8b950 100644 --- a/pkgs/development/compilers/openjdk/openjfx/21.nix +++ b/pkgs/development/compilers/openjdk/openjfx/21.nix @@ -7,7 +7,7 @@ let major = "21"; - update = ""; + update = ".0.3"; build = "-ga"; repover = "${major}${update}${build}"; gradle_ = (gradle_7.override { @@ -30,9 +30,9 @@ let src = fetchFromGitHub { owner = "openjdk"; - repo = "jfx"; + repo = "jfx21u"; rev = repover; - hash = "sha256-deNAGfnA6gwcAa64l0AWdkX+vJd3ZOfIgAifSl+/m+s="; + hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4="; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index fbd808184156..0b66e0d21a63 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -60,6 +60,6 @@ in stdenv.mkDerivation rec { # under the 3-clause BSD license. The rest is 2-clause BSD license. license = with licenses; [ bsd3 bsd2 ]; platforms = platforms.unix; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 89e68ece7e6b..4f6f0df26222 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - hash = "sha256-aktKJlwXpHpjSFxoz5wZJPGWZIcn4ax5iBP0GQEux78="; + hash = "sha256-rSPYnbZjCoAKJBNCJCKsLBenolOzS78Zm850BJ8mKhA="; }; nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ libpng ]; diff --git a/pkgs/development/compilers/rust/1_78.nix b/pkgs/development/compilers/rust/1_78.nix index 3ce368e8d99f..d81e964fb745 100644 --- a/pkgs/development/compilers/rust/1_78.nix +++ b/pkgs/development/compilers/rust/1_78.nix @@ -49,6 +49,7 @@ import ./default.nix { aarch64-apple-darwin = "415bb2bc198feb0f2d8329e33c57d0890bbd57977d1ae48b17f6c7e1f632eaa7"; powerpc64le-unknown-linux-gnu = "79582acb339bd2d79fef095b977049049ffa04616011f1af1793fb8e98194b19"; riscv64gc-unknown-linux-gnu = "300fe4861e2d1f6e4c4f5e36ae7997beca8a979343a7f661237ab78a37a54648"; + x86_64-unknown-freebsd = "72f49040fc2ed4492cddfaef3b4a9cb28d008f9f5ce5cac50802a5fca910f58c"; }; selectRustPackage = pkgs: pkgs.rust_1_78; diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index d1df1c542e98..10e944515df7 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -35,7 +35,8 @@ rec { nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook; buildInputs = [ bash ] - ++ lib.optionals (!stdenv.isDarwin) [ gcc.cc.lib zlib ] + ++ lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) gcc.cc.lib + ++ lib.optional (!stdenv.isDarwin) zlib ++ lib.optional stdenv.isDarwin Security; postPatch = '' @@ -81,7 +82,7 @@ rec { nativeBuildInputs = [ makeWrapper ] ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; buildInputs = [ bash ] - ++ lib.optional (!stdenv.isDarwin) gcc.cc.lib + ++ lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) gcc.cc.lib ++ lib.optional stdenv.isDarwin Security; postPatch = '' diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index ebf8d900bb3b..54c15406df67 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -19,6 +19,7 @@ PLATFORMS=( aarch64-apple-darwin powerpc64le-unknown-linux-gnu riscv64gc-unknown-linux-gnu + x86_64-unknown-freebsd ) BASEURL=https://static.rust-lang.org/dist VERSION=${1:-} diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index e00ba329ccdc..a68e117658fa 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -58,8 +58,11 @@ in stdenv.mkDerivation (finalAttrs: { NIX_LDFLAGS = toString ( # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' - optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" + # This doesn't apply to cross-building for FreeBSD because the host + # uses libstdc++, but the target (used for building std) uses libc++ + optional (stdenv.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD) "--push-state --as-needed -lstdc++ --pop-state" ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++ -lc++abi" + ++ optional stdenv.isFreeBSD "-rpath ${llvmPackages.libunwind}/lib" ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"); # Increase codegen units to introduce parallelism within the compiler. @@ -103,9 +106,7 @@ in stdenv.mkDerivation (finalAttrs: { stdenv.targetPlatform.rust.rustcTargetSpec # Other targets that don't need any extra dependencies to build. - # Temporarily broken if some global compiler flags are set: - # https://github.com/NixOS/nixpkgs/pull/317273 - ] ++ optionals (!fastCross && !lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] && stdenv.hostPlatform.gcc.thumb or true) [ + ] ++ optionals (!fastCross) [ "wasm32-unknown-unknown" # (build!=target): When cross-building a compiler we need to add @@ -220,6 +221,11 @@ in stdenv.mkDerivation (finalAttrs: { [source.vendored-sources] directory = "vendor" EOF + '' + lib.optionalString (stdenv.isFreeBSD) '' + # lzma-sys bundles an old version of xz that doesn't build + # on modern FreeBSD, use the system one instead + substituteInPlace src/bootstrap/src/core/build_steps/tool.rs \ + --replace 'cargo.env("LZMA_API_STATIC", "1");' ' ' ''; # rustc unfortunately needs cmake to compile llvm-rt but doesn't @@ -297,4 +303,10 @@ in stdenv.mkDerivation (finalAttrs: { "i686-windows" "x86_64-windows" ]; }; +} // lib.optionalAttrs stdenv.cc.isClang { # FIXME: move inside again when rebuilds are OK + hardeningDisable = optionals stdenv.cc.isClang [ + # remove once https://github.com/NixOS/nixpkgs/issues/318674 is + # addressed properly + "zerocallusedregs" + ]; }) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index a2b5cf46b54d..6676a7ce6c2e 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,12 +10,12 @@ let versionMap = { - "2.4.4" = { - sha256 = "sha256-ipMmJ7Px2OlhjxzcIl7csAJFaARpfiyH0UBoN2ShBtU="; - }; "2.4.5" = { sha256 = "sha256-TfaOkMkDGAdkK0t2GYjetb9qG9FSxHI0goNO+nNae9E="; }; + "2.4.6" = { + sha256 = "sha256-pImQeELa4JoXJtYphb96VmcKrqLz7KH7cCO8pnw/MJE="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/development/compilers/silice/default.nix b/pkgs/development/compilers/silice/default.nix index 287862b5f2b8..871219a28dce 100644 --- a/pkgs/development/compilers/silice/default.nix +++ b/pkgs/development/compilers/silice/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchFromGitHub, lib , cmake, pkg-config, openjdk , libuuid, python3 -, silice, yosys, nextpnr, verilator +, glfw +, yosys, nextpnr, verilator , dfu-util, icestorm, trellis +, unstableGitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "silice"; - version = "unstable-2022-08-05"; + version = "0-unstable-2024-06-23"; src = fetchFromGitHub { owner = "sylefeb"; - repo = pname; - rev = "e26662ac757151e5dd8c60c45291b44906b1299f"; - sha256 = "sha256-Q1JdgDlEErutZh0OfxYy5C4aVijFKlf6Hm5Iv+1jsj4="; + repo = "silice"; + rev = "5ba9ef0d03b3c8d4a43efe10acfb51c97d3679ef"; + sha256 = "sha256-LrLUaCpwzaxH02TGyEfARIumPi0s2REc1g79fSxJjFc="; fetchSubmodules = true; }; @@ -21,12 +23,16 @@ stdenv.mkDerivation rec { cmake pkg-config openjdk + glfw ]; buildInputs = [ libuuid ]; propagatedBuildInputs = [ - (python3.withPackages (p: with p; [ edalize ])) + (python3.withPackages (p: [ + p.edalize + p.termcolor + ])) ]; postPatch = '' @@ -36,13 +42,18 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + make install mkdir -p $out cp -ar ../{bin,frameworks,lib} $out/ + + runHook postInstall ''; passthru.tests = let + silice = finalAttrs.finalPackage; testProject = project: stdenv.mkDerivation { name = "${silice.name}-test-${project}"; nativeBuildInputs = [ @@ -54,18 +65,24 @@ stdenv.mkDerivation rec { icestorm trellis ]; - src = "${src}/projects"; + src = "${silice.src}/projects"; sourceRoot = "projects/${project}"; buildPhase = '' - targets=$(cut -d " " -f 2 configs | tr -d '\r') - for target in $targets ; do + targets=() + for target in $(cat configs | tr -d '\r') ; do + [[ $target != Makefile* ]] || continue make $target ARGS="--no_program" + targets+=($target) done + if test "''${#targets[@]}" -eq 0; then + >&2 echo "ERROR: no target found!" + false + fi ''; installPhase = '' mkdir $out - for target in $targets ; do - cp -r BUILD_$target $out/ + for target in "''${targets[@]}" ; do + [[ $target != Makefile* ]] || continue done ''; }; @@ -78,10 +95,17 @@ stdenv.mkDerivation rec { pipeline_sort = testProject "pipeline_sort"; }; - meta = with lib; { + passthru.updateScript = unstableGitUpdater { }; + + meta = { description = "Open source language that simplifies prototyping and writing algorithms on FPGA architectures"; homepage = "https://github.com/sylefeb/Silice"; - license = licenses.bsd2; - maintainers = [ maintainers.astro ]; + license = lib.licenses.bsd2; + mainProgram = "silice"; + maintainers = with lib.maintainers; [ + astro + pbsds + ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 3576735d9dc7..4e164f25e9ee 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -10,7 +10,7 @@ , pkg-config , clang , bintools -, python3 +, python3Packages , git , fetchpatch , makeWrapper @@ -42,6 +42,7 @@ }: let + python3 = python3Packages.python.withPackages (p: [ p.setuptools ]); # python 3.12 compat. inherit (stdenv) hostPlatform targetPlatform; @@ -701,6 +702,7 @@ in stdenv.mkDerivation { maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; license = lib.licenses.asl20; platforms = with lib.platforms; linux ++ darwin; + broken = stdenv.isDarwin; # Swift doesn't support 32-bit Linux, unknown on other platforms. badPlatforms = lib.platforms.i686; timeout = 86400; # 24 hours. diff --git a/pkgs/development/compilers/swift/wrapper/wrapper.sh b/pkgs/development/compilers/swift/wrapper/wrapper.sh index 5836dea39787..5cd5d8da8819 100644 --- a/pkgs/development/compilers/swift/wrapper/wrapper.sh +++ b/pkgs/development/compilers/swift/wrapper/wrapper.sh @@ -252,7 +252,7 @@ for ((i=0; i < ${#extraBefore[@]}; i++));do # TODO: Assumes macOS. extraBefore[i]="${extraBefore[i]/-apple-darwin/-apple-macosx${MACOSX_DEPLOYMENT_TARGET:-11.0}}" ;; - -march=*) + -march=*|-mcpu=*|-mfloat-abi=*|-mfpu=*|-mmode=*|-mthumb|-marm|-mtune=*) [[ i -gt 0 && ${extraBefore[i-1]} == -Xcc ]] && continue extraBefore=( "${extraBefore[@]:0:i}" diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index bb60d6903df1..befb24422936 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -6,10 +6,10 @@ import re import requests import sys -feature_versions = (8, 11, 16, 17, 18, 19, 20, 21) +feature_versions = (8, 11, 16, 17, 18, 19, 20, 21, 22) oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") -impls = ("hotspot") +impls = ("hotspot",) arch_to_nixos = { "x64": ("x86_64",), diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix index 8f6831a7907c..886c92ba2e38 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix @@ -1,11 +1,12 @@ { name-prefix ? "temurin" , brand-name ? "Eclipse Temurin" , sourcePerArch -, knownVulnerabilities ? [] +, knownVulnerabilities ? [ ] }: { swingSupport ? true # not used for now -, lib, stdenv +, lib +, stdenv , fetchurl , setJavaClassPath }: @@ -17,7 +18,8 @@ let (arch: builtins.elem arch validCpuTypes) (builtins.attrNames sourcePerArch); result = stdenv.mkDerivation { - pname = if sourcePerArch.packageType == "jdk" + pname = + if sourcePerArch.packageType == "jdk" then "${name-prefix}-bin" else "${name-prefix}-${sourcePerArch.packageType}-bin"; version = @@ -66,10 +68,11 @@ let license = licenses.gpl2Classpath; sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; description = "${brand-name}, prebuilt OpenJDK binary"; - platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms + platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms maintainers = with maintainers; [ taku0 ]; inherit knownVulnerabilities; mainProgram = "java"; }; }; -in result +in +result diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index 5122b6ed7294..622d1629dbb5 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -2,27 +2,34 @@ let sources = (lib.importJSON ./sources.json).hotspot.mac; - common = opts: callPackage (import ./jdk-darwin-base.nix opts) {}; + common = opts: callPackage (import ./jdk-darwin-base.nix opts) { }; + + EOL = [ "This JDK version has reached End of Life." ]; in { jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; + jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; - jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; + + jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; knownVulnerabilities = EOL; }; jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; - jdk-18 = common { sourcePerArch = sources.jdk.openjdk18; }; - jre-18 = common { sourcePerArch = sources.jre.openjdk18; }; + jdk-18 = common { sourcePerArch = sources.jdk.openjdk18; knownVulnerabilities = EOL; }; + jre-18 = common { sourcePerArch = sources.jre.openjdk18; knownVulnerabilities = EOL; }; - jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; }; - jre-19 = common { sourcePerArch = sources.jre.openjdk19; }; + jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; knownVulnerabilities = EOL; }; + jre-19 = common { sourcePerArch = sources.jre.openjdk19; knownVulnerabilities = EOL; }; - jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; }; - jre-20 = common { sourcePerArch = sources.jre.openjdk20; }; + jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; knownVulnerabilities = EOL; }; + jre-20 = common { sourcePerArch = sources.jre.openjdk20; knownVulnerabilities = EOL; }; jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; + + jdk-22 = common { sourcePerArch = sources.jdk.openjdk22; }; + jre-22 = common { sourcePerArch = sources.jre.openjdk22; }; } diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index ba56518e15a6..9da96aee8d5a 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -1,7 +1,7 @@ { name-prefix ? "temurin" , brand-name ? "Eclipse Temurin" , sourcePerArch -, knownVulnerabilities ? [] +, knownVulnerabilities ? [ ] }: { stdenv @@ -10,18 +10,18 @@ , autoPatchelfHook , makeWrapper , setJavaClassPath -# minimum dependencies + # minimum dependencies , alsa-lib , fontconfig , freetype , libffi , xorg , zlib -# runtime dependencies + # runtime dependencies , cups -# runtime dependencies for GTK+ Look and Feel -# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages -# which should be fixable, this is a no-rebuild workaround for GHC. + # runtime dependencies for GTK+ Look and Feel + # TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages + # which should be fixable, this is a no-rebuild workaround for GHC. , gtkSupport ? !stdenv.targetPlatform.isGhcjs , cairo , glib @@ -33,7 +33,9 @@ let runtimeDependencies = [ cups ] ++ lib.optionals gtkSupport [ - cairo glib gtk3 + cairo + glib + gtk3 ]; runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies; validCpuTypes = builtins.attrNames lib.systems.parse.cpuTypes; @@ -41,7 +43,8 @@ let (arch: builtins.elem arch validCpuTypes) (builtins.attrNames sourcePerArch); result = stdenv.mkDerivation { - pname = if sourcePerArch.packageType == "jdk" + pname = + if sourcePerArch.packageType == "jdk" then "${name-prefix}-bin" else "${name-prefix}-${sourcePerArch.packageType}-bin"; @@ -123,10 +126,11 @@ let license = licenses.gpl2Classpath; sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; description = "${brand-name}, prebuilt OpenJDK binary"; - platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms + platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms maintainers = with maintainers; [ taku0 ]; inherit knownVulnerabilities; mainProgram = "java"; }; }; -in result +in +result diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index 87a00a373916..2a38e3472d53 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -3,27 +3,34 @@ let variant = if stdenv.hostPlatform.isMusl then "alpine-linux" else "linux"; sources = (lib.importJSON ./sources.json).hotspot.${variant}; - common = opts: callPackage (import ./jdk-linux-base.nix opts) {}; + common = opts: callPackage (import ./jdk-linux-base.nix opts) { }; + + EOL = [ "This JDK version has reached End of Life." ]; in { jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; + jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; - jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; + + jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; knownVulnerabilities = EOL; }; jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; - jdk-18 = common { sourcePerArch = sources.jdk.openjdk18; }; - jre-18 = common { sourcePerArch = sources.jre.openjdk18; }; + jdk-18 = common { sourcePerArch = sources.jdk.openjdk18; knownVulnerabilities = EOL; }; + jre-18 = common { sourcePerArch = sources.jre.openjdk18; knownVulnerabilities = EOL; }; - jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; }; - jre-19 = common { sourcePerArch = sources.jre.openjdk19; }; + jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; knownVulnerabilities = EOL; }; + jre-19 = common { sourcePerArch = sources.jre.openjdk19; knownVulnerabilities = EOL; }; - jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; }; - jre-20 = common { sourcePerArch = sources.jre.openjdk20; }; + jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; knownVulnerabilities = EOL; }; + jre-20 = common { sourcePerArch = sources.jre.openjdk20; knownVulnerabilities = EOL; }; jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; + + jdk-22 = common { sourcePerArch = sources.jdk.openjdk22; }; + jre-22 = common { sourcePerArch = sources.jre.openjdk22; }; } diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index 00a0e72997ec..fe24b9f5199c 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -7,9 +7,9 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "d5e2235d3707526f7c9ba3f0dc194e60d5dec33eceff2a2dcf9d874464cc0e9e", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.21_9.tar.gz", - "version": "11.0.21" + "sha256": "b45c467be52fe11ffd9bf69b3a035068134b305053874de4f3b3c5e5e1419659", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" } }, "openjdk16": { @@ -27,9 +27,9 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "c2a571a56e5bd3f30956b17b048880078c7801ed9e8754af6d1e38b9176059a9", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.9_9.tar.gz", - "version": "17.0.9" + "sha256": "839326b5b4b3e4ac2edc3b685c8ab550f9b6d267eddf966323c801cb21e3e018", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" } }, "openjdk18": { @@ -64,28 +64,44 @@ }, "openjdk21": { "aarch64": { - "build": "12", - "sha256": "77006c0a753808c2a6662007906eb6eb230f2fb6eb9d201a39cc46113e68f82c", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.1_12.tar.gz", - "version": "21.0.1" + "build": "9", + "sha256": "0f68a9122054149861f6ce9d1b1c176bbe30dd76b36b74c916ba897c12e9d970", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.3_9.tar.gz", + "version": "21.0.3" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "12", - "sha256": "422f23f5109056cacb9227247bebf8532e2dc3c9d505e71637ba610569d6b3ff", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.1_12.tar.gz", - "version": "21.0.1" + "build": "9", + "sha256": "8e861638bf6b08c6d5837de6dc929930550928ec5fcc81b9fa7e8296afd0f9c0", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.3_9.tar.gz", + "version": "21.0.3" + } + }, + "openjdk22": { + "aarch64": { + "build": "8", + "sha256": "86a7b47c9277f2fd063ec910616b3676d86553ab7d23aa3bd365e51a57be1dc5", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_aarch64_alpine-linux_hotspot_22.0.1_8.tar.gz", + "version": "22.0.1" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "d226e44b3513942db855df9a8737d848f64069848970d4cfd35ee3c38f2525c1", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_alpine-linux_hotspot_22.0.1_8.tar.gz", + "version": "22.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "5", - "sha256": "6cf2d4925c387c4cdc0bf2e71de3690527141b5244695d0b3109ce83a8512235", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u382b05.tar.gz", - "version": "8.0.382" + "build": "8", + "sha256": "409091665e5f8cf678938bbbc0d377122ef8bad7b1c97a0f809da054db956e51", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u412b08.tar.gz", + "version": "8.0.412" } } }, @@ -95,9 +111,9 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "6a3d1759bdf91433411d37ca2ad1505a7f214c1401797834e9884165c2457368", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.21_9.tar.gz", - "version": "11.0.21" + "sha256": "6972a6251bc88d6fbb64a188557cf165f1c415ded550d2a280bbcbc4272caff1", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" } }, "openjdk17": { @@ -105,9 +121,9 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "70e5d108f51ae7c7b2435d063652df058723e303a18b4f72f17f75c5320052d3", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.9_9.tar.gz", - "version": "17.0.9" + "sha256": "b5dffd0be08c464d9c3903e2947508c1a5c21804ea1cff5556991a2a47d617d8", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" } }, "openjdk18": { @@ -142,28 +158,44 @@ }, "openjdk21": { "aarch64": { - "build": "12", - "sha256": "2898ea1ddf6f70f09b09cf99d928f6d4c862f78f81104f5dce3e44a832b8444a", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.1_12.tar.gz", - "version": "21.0.1" + "build": "9", + "sha256": "54e8618da373258654fe788d509f087d3612de9e080eb6831601069dbc8a4b2b", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.3_9.tar.gz", + "version": "21.0.3" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "12", - "sha256": "a8fcc43927664ba191c9a77d1013f1f32fec1acc22fe6f0c29d687221f2cc95d", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.1_12.tar.gz", - "version": "21.0.1" + "build": "9", + "sha256": "b3e7170deab11a7089fe8e14f9f398424fd86db085f745dad212f6cfc4121df6", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.3_9.tar.gz", + "version": "21.0.3" + } + }, + "openjdk22": { + "aarch64": { + "build": "8", + "sha256": "6cac56dde6793d887deea101cfff283dc5f285e1118c21cbd1c4cb69f1072e55", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_aarch64_alpine-linux_hotspot_22.0.1_8.tar.gz", + "version": "22.0.1" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "e7c26ad00e3ded356b8c4b20b184ccf5bd63ccdccabde8d4a892389f178f1d5b", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_alpine-linux_hotspot_22.0.1_8.tar.gz", + "version": "22.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "5", - "sha256": "7040d865493f13204194c5a1add63e22516b1fa4481264baa6a5b2614a275a0e", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u382b05.tar.gz", - "version": "8.0.382" + "build": "8", + "sha256": "c82962d7378d1fd415db594fce6ec047939e9fab5301fa4407cd7faea9ea7e31", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u412b08.tar.gz", + "version": "8.0.412" } } } @@ -173,35 +205,35 @@ "openjdk11": { "aarch64": { "build": "9", - "sha256": "8c3146035b99c55ab26a2982f4b9abd2bf600582361cf9c732539f713d271faf", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.21_9.tar.gz", - "version": "11.0.21" + "sha256": "e00476a7be3c4adfa9b3d55d30768967fd246a8352e518894e183fa444d4d3ce", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" }, "armv6l": { - "build": "1", - "sha256": "e83674aee238ebb5f359b9395b3c5e3fad5b645846095494662802d2f0fd01c9", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.20.1_1.tar.gz", - "version": "11.0.20" + "build": "9", + "sha256": "8077edc07a57d846c3d11286a7caf05ed6ca6d6c1234bf0e03611f18e187f075", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" }, "armv7l": { - "build": "1", - "sha256": "e83674aee238ebb5f359b9395b3c5e3fad5b645846095494662802d2f0fd01c9", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.20.1_1.tar.gz", - "version": "11.0.20" + "build": "9", + "sha256": "8077edc07a57d846c3d11286a7caf05ed6ca6d6c1234bf0e03611f18e187f075", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" }, "packageType": "jdk", "powerpc64le": { "build": "9", - "sha256": "262ff98d6d88a7c7cc522cb4ec4129491a0eb04f5b17dcca0da57cfcdcf3830d", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.21_9.tar.gz", - "version": "11.0.21" + "sha256": "f56068bb64c6bf858894f75c2bc261f54db32932422eb07527f36ae40046e9a0", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" }, "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "60ea98daa09834fdd3162ca91ddc8d92a155ab3121204f6f643176ee0c2d0d5e", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.21_9.tar.gz", - "version": "11.0.21" + "sha256": "23e47ea7a3015be3240f21185fd902adebdcf76530757c9b482c7eb5bd3417c2", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" } }, "openjdk16": { @@ -241,35 +273,35 @@ "openjdk17": { "aarch64": { "build": "9", - "sha256": "e2c5e26f8572544b201bc22a9b28f2b1a3147ab69be111cea07c7f52af252e75", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.9_9.tar.gz", - "version": "17.0.9" + "sha256": "a900acf3ae56b000afc35468a083b6d6fd695abec87a8abdb02743d5c72f6d6d", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" }, "armv6l": { - "build": "1", - "sha256": "b1f1d8b7fcb159a0a8029b6c3106d1d16207cecbb2047f9a4be2a64d29897da5", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.8.1_1.tar.gz", - "version": "17.0.8" + "build": "9", + "sha256": "9b5c375ed7ce654083c6c1137d8daadebaf8657650576115f0deafab00d0f1d7", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_arm_linux_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" }, "armv7l": { - "build": "1", - "sha256": "b1f1d8b7fcb159a0a8029b6c3106d1d16207cecbb2047f9a4be2a64d29897da5", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.8.1_1.tar.gz", - "version": "17.0.8" + "build": "9", + "sha256": "9b5c375ed7ce654083c6c1137d8daadebaf8657650576115f0deafab00d0f1d7", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_arm_linux_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" }, "packageType": "jdk", "powerpc64le": { "build": "9", - "sha256": "3ae4b254d5b720f94f986481e787fbd67f0667571140ba2e2ae5020ceddbc826", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.9_9.tar.gz", - "version": "17.0.9" + "sha256": "44bdd662c3b832cfe0b808362866b8d7a700dd60e6e39716dee97211d35c230f", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" }, "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "7b175dbe0d6e3c9c23b6ed96449b018308d8fc94a5ecd9c0df8b8bc376c3c18a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz", - "version": "17.0.9" + "sha256": "aa7fb6bb342319d227a838af5c363bfa1b4a670c209372f9e6585bd79da6220c", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" } }, "openjdk18": { @@ -364,58 +396,80 @@ }, "openjdk21": { "aarch64": { - "build": "12", - "sha256": "e184dc29a6712c1f78754ab36fb48866583665fa345324f1a79e569c064f95e9", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.1_12.tar.gz", - "version": "21.0.1" + "build": "9", + "sha256": "7d3ab0e8eba95bd682cfda8041c6cb6fa21e09d0d9131316fd7c96c78969de31", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz", + "version": "21.0.3" }, "packageType": "jdk", "powerpc64le": { - "build": "12", - "sha256": "9574828ef3d735a25404ced82e09bf20e1614f7d6403956002de9cfbfcb8638f", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.1_12.tar.gz", - "version": "21.0.1" + "build": "9", + "sha256": "9a1079d7f0fc72951fdc9a0029e49a15f6ba114683aee626f882ee2c761f1d57", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.3_9.tar.gz", + "version": "21.0.3" }, "vmType": "hotspot", "x86_64": { - "build": "12", - "sha256": "1a6fa8abda4c5caed915cfbeeb176e7fbd12eb6b222f26e290ee45808b529aa1", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz", - "version": "21.0.1" + "build": "9", + "sha256": "fffa52c22d797b715a962e6c8d11ec7d79b90dd819b5bc51d62137ea4b22a340", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz", + "version": "21.0.3" + } + }, + "openjdk22": { + "aarch64": { + "build": "8", + "sha256": "d8488fa1e4e8c1e318cef4c0fc3842a7f15a4cf52b27054663bb94471f54b3fa", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_aarch64_linux_hotspot_22.0.1_8.tar.gz", + "version": "22.0.1" + }, + "packageType": "jdk", + "powerpc64le": { + "build": "8", + "sha256": "4113606ba65044a3cbd7678e1c0d41881d24a2441c8ab8b658b4ac58da624de5", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_ppc64le_linux_hotspot_22.0.1_8.tar.gz", + "version": "22.0.1" + }, + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "e59c6bf801cc023a1ea78eceb5e6756277f1564cd0a421ea984efe6cb96cfcf8", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_linux_hotspot_22.0.1_8.tar.gz", + "version": "22.0.1" } }, "openjdk8": { "aarch64": { "build": "8", - "sha256": "70636c2fa4927913e9e869d471607a99d3a521c1fa3f3687b889c2acba67c493", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u392b08.tar.gz", - "version": "8.0.392" + "sha256": "3504d748a93f23cac8c060bd33231bd51e90dcb620f38dadc6239b6cd2a5011c", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u412b08.tar.gz", + "version": "8.0.412" }, "armv6l": { - "build": "5", - "sha256": "5d805ff157f272acf0f7d192f21af4a3b68c840333ca95568e4e07142efc369d", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u382b05.tar.gz", - "version": "8.0.382" + "build": "8", + "sha256": "be4aff6fa7bf6515f16f93dcaf9fdc61853fe1ef0d25b08a1bb1cf6e3d047391", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz", + "version": "8.0.412" }, "armv7l": { - "build": "5", - "sha256": "5d805ff157f272acf0f7d192f21af4a3b68c840333ca95568e4e07142efc369d", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u382b05.tar.gz", - "version": "8.0.382" + "build": "8", + "sha256": "be4aff6fa7bf6515f16f93dcaf9fdc61853fe1ef0d25b08a1bb1cf6e3d047391", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz", + "version": "8.0.412" }, "packageType": "jdk", "powerpc64le": { "build": "8", - "sha256": "9d9813d2840360ffdbc449c45e71124e8170c31a3b6cce9151fbb31352064406", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u392b08.tar.gz", - "version": "8.0.392" + "sha256": "6b7ed7996788075e182dd33349288346240fbce540e50fd77aecfc309a5ada19", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u412b08.tar.gz", + "version": "8.0.412" }, "vmType": "hotspot", "x86_64": { "build": "8", - "sha256": "15d091e22aa0cad12a241acff8c1634e7228b9740f8d19634250aa6fe0c19a33", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u392b08.tar.gz", - "version": "8.0.392" + "sha256": "b9884a96f78543276a6399c3eb8c2fd8a80e6b432ea50e87d3d12d495d1d2808", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u412b08.tar.gz", + "version": "8.0.412" } } }, @@ -423,69 +477,69 @@ "openjdk11": { "aarch64": { "build": "9", - "sha256": "8dc527e5c5da62f80ad3b6a2cd7b1789f745b1d90d5e83faba45f7a1d0b6cab8", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.21_9.tar.gz", - "version": "11.0.21" + "sha256": "7290ace47a030d89ea023c28e7aa555c9da72b4194f73b39ec9d058011bf06dd", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" }, "armv6l": { - "build": "1", - "sha256": "2fc1cc935897312c0bc2515b2e7ea1fa3b267e77305a1b51a8c3917d92af380f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.20.1_1.tar.gz", - "version": "11.0.20" + "build": "9", + "sha256": "025f994549708f7291ce3b0fa7c41f7e78ec3af3eae3f85fffe9c5fa4a54889f", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" }, "armv7l": { - "build": "1", - "sha256": "2fc1cc935897312c0bc2515b2e7ea1fa3b267e77305a1b51a8c3917d92af380f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.20.1_1.tar.gz", - "version": "11.0.20" + "build": "9", + "sha256": "025f994549708f7291ce3b0fa7c41f7e78ec3af3eae3f85fffe9c5fa4a54889f", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" }, "packageType": "jre", "powerpc64le": { "build": "9", - "sha256": "286e37ce06316185377eea847d2aa9f1523b9f1428684e59e772f2f6055e89b9", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.21_9.tar.gz", - "version": "11.0.21" + "sha256": "3b3fbd324620fd914bd8462e292124493fcf846fd69195c4b9a231131dc68d5f", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" }, "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "156861bb901ef18759e05f6f008595220c7d1318a46758531b957b0c950ef2c3", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.21_9.tar.gz", - "version": "11.0.21" + "sha256": "786a72296189ba8e43999532aa73730d87ec1fce558eb3c4e98b611b423375e3", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" } }, "openjdk17": { "aarch64": { "build": "9", - "sha256": "05b192f81ed478178ba953a2a779b67fc5a810acadb633ad69f8c4412399edb8", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.9_9.tar.gz", - "version": "17.0.9" + "sha256": "ccfa23c25790475c84df983cc5f729b94c04d9ea9863912deb15c6266782cf16", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" }, "armv6l": { - "build": "1", - "sha256": "8af898c5d356f0b2cee2db67ff9c8e7a8e738c0f6b3a61c383150b3168b9ea58", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.8.1_1.tar.gz", - "version": "17.0.8" + "build": "9", + "sha256": "2e06401aa3aa7a825d73a6af8e9462449b1a86e7705b793dc8ec90423b602ee2", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_arm_linux_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" }, "armv7l": { - "build": "1", - "sha256": "8af898c5d356f0b2cee2db67ff9c8e7a8e738c0f6b3a61c383150b3168b9ea58", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.8.1_1.tar.gz", - "version": "17.0.8" + "build": "9", + "sha256": "2e06401aa3aa7a825d73a6af8e9462449b1a86e7705b793dc8ec90423b602ee2", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_arm_linux_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" }, "packageType": "jre", "powerpc64le": { "build": "9", - "sha256": "79c85ecf1320c67b828310167e1ced62e402bc86a5d47ca9cc7bfa3b708cb07a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.9_9.tar.gz", - "version": "17.0.9" + "sha256": "884b5cb817e50010b4d0a3252afb6a80db18995af19bbd16a37348b2c37949bc", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" }, "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "c37f729200b572884b8f8e157852c739be728d61d9a1da0f920104876d324733", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.9_9.tar.gz", - "version": "17.0.9" + "sha256": "bcb1b7b8ad68c93093f09b591b7cb17161d39891f7d29d33a586f5a328603707", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" } }, "openjdk18": { @@ -580,58 +634,80 @@ }, "openjdk21": { "aarch64": { - "build": "12", - "sha256": "4582c4cc0c6d498ba7a23fdb0a5179c9d9c0d7a26f2ee8610468d5c2954fcf2f", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.1_12.tar.gz", - "version": "21.0.1" + "build": "9", + "sha256": "c7c31bc6f5ab4c4b6f4559e11c2fa9541ae6757ab8da6dd85c29163913bd9238", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.3_9.tar.gz", + "version": "21.0.3" }, "packageType": "jre", "powerpc64le": { - "build": "12", - "sha256": "05cc9b7bfbe246c27d307783b3d5095797be747184b168018ae3f7cc55608db2", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.1_12.tar.gz", - "version": "21.0.1" + "build": "9", + "sha256": "aa628c6accc9d075b7b0f2bff6487f8ca0b8f057af31842a85fc8b363e1e10f3", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.3_9.tar.gz", + "version": "21.0.3" }, "vmType": "hotspot", "x86_64": { - "build": "12", - "sha256": "277f4084bee875f127a978253cfbaad09c08df597feaf5ccc82d2206962279a3", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_linux_hotspot_21.0.1_12.tar.gz", - "version": "21.0.1" + "build": "9", + "sha256": "f1af100c4afca2035f446967323230150cfe5872b5a664d98c86963e5c066e0d", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz", + "version": "21.0.3" + } + }, + "openjdk22": { + "aarch64": { + "build": "8", + "sha256": "8e5996a2bbae2da9797cff5a62cb2080965e08fd66de24673b29a8e481ec769e", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_aarch64_linux_hotspot_22.0.1_8.tar.gz", + "version": "22.0.1" + }, + "packageType": "jre", + "powerpc64le": { + "build": "8", + "sha256": "7df4a10fab324181a6c9e8b1e2a45042b8d30490f0fdb937a536f6cd17c907ef", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_ppc64le_linux_hotspot_22.0.1_8.tar.gz", + "version": "22.0.1" + }, + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "154dbc7975cf765c59bdaa1e693d6c8b009635c9a182d6d6d9f0cfbec5317b4c", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_linux_hotspot_22.0.1_8.tar.gz", + "version": "22.0.1" } }, "openjdk8": { "aarch64": { "build": "8", - "sha256": "37b997f12cd572da979283fccafec9ba903041a209605b50fcb46cc34f1a9917", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_aarch64_linux_hotspot_8u392b08.tar.gz", - "version": "8.0.392" + "sha256": "17550a6a4ddf71ac81ba8f276467bc58f036c123c0f1bafcafd69f70e3e49cf5", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_aarch64_linux_hotspot_8u412b08.tar.gz", + "version": "8.0.412" }, "armv6l": { - "build": "5", - "sha256": "b92fb3972372b5d1f9fb51815def903105722b747f680b7ecf2ba2ba863ab156", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jre_arm_linux_hotspot_8u382b05.tar.gz", - "version": "8.0.382" + "build": "8", + "sha256": "1a6b470ac83b241223447a1e6cb55c4a8f78af0146b9387e9842625041226654", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_arm_linux_hotspot_8u412b08.tar.gz", + "version": "8.0.412" }, "armv7l": { - "build": "5", - "sha256": "b92fb3972372b5d1f9fb51815def903105722b747f680b7ecf2ba2ba863ab156", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jre_arm_linux_hotspot_8u382b05.tar.gz", - "version": "8.0.382" + "build": "8", + "sha256": "1a6b470ac83b241223447a1e6cb55c4a8f78af0146b9387e9842625041226654", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_arm_linux_hotspot_8u412b08.tar.gz", + "version": "8.0.412" }, "packageType": "jre", "powerpc64le": { "build": "8", - "sha256": "0ecb0aeb54fb9d3c9e1a7ea411490127e8e298d93219fafc4dd6051a5b74671f", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u392b08.tar.gz", - "version": "8.0.392" + "sha256": "d3157230c01b320e47ad6df650e83b15f8f76294d0df9f1c03867d07fe2883c9", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u412b08.tar.gz", + "version": "8.0.412" }, "vmType": "hotspot", "x86_64": { "build": "8", - "sha256": "91d31027da0d985be3549714389593d9e0da3da5057d87e3831c7c538b9a2a0f", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_x64_linux_hotspot_8u392b08.tar.gz", - "version": "8.0.392" + "sha256": "a8d994332a2ff15d48bf04405c3b2f6bd331a928dd96639b15e62891f7172363", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_x64_linux_hotspot_8u412b08.tar.gz", + "version": "8.0.412" } } } @@ -641,17 +717,17 @@ "openjdk11": { "aarch64": { "build": "9", - "sha256": "3be236f2cf9612cd38cd6b7cfa4b8eef642a88beab0cd37c6ccf1766d755b4cc", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.21_9.tar.gz", - "version": "11.0.21" + "sha256": "49122443bdeab2c9f468bd400f58f85a9ea462846faa79084fd6fd786d9b492d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "39e30e333d01f70765f0fdc57332bc2c5ae101392bcc315ef06f472d80d8e2d7", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.21_9.tar.gz", - "version": "11.0.21" + "sha256": "4dbd21d9a0311d321f5886eda50c3086026ed61d02e1a85f7b8c2e9ad557bf03", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" } }, "openjdk16": { @@ -667,17 +743,17 @@ "openjdk17": { "aarch64": { "build": "9", - "sha256": "823777266415347983bbd87ccd8136537242ff27e62f307b7e8521494c665f0d", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.9_9.tar.gz", - "version": "17.0.9" + "sha256": "09a162c58dd801f7cfacd87e99703ed11fb439adc71cfa14ceb2d3194eaca01c", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "c69b37ea72136df49ce54972408803584b49b2c91b0fbc876d7125e963c7db37", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_mac_hotspot_17.0.9_9.tar.gz", - "version": "17.0.9" + "sha256": "f8b96724618f4df557c47f11048d1084e98ed3eb87f0dbd5b84f768a80c3348e", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_mac_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" } }, "openjdk18": { @@ -730,18 +806,34 @@ }, "openjdk21": { "aarch64": { - "build": "12", - "sha256": "0d29257c9bcb5f20f5c4643ef9437f36b10376863eddaf6248d09093796c6b30", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.1_12.tar.gz", - "version": "21.0.1" + "build": "9", + "sha256": "b6be6a9568be83695ec6b7cb977f4902f7be47d74494c290bc2a5c3c951e254f", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.3_9.tar.gz", + "version": "21.0.3" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "12", - "sha256": "35f3cbc86d7ff0a01facefd741d5cfb675867e0a5ec137f62ba071d2511a45c9", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_mac_hotspot_21.0.1_12.tar.gz", - "version": "21.0.1" + "build": "9", + "sha256": "f777103aab94330d14a29bd99f3a26d60abbab8e2c375cec9602746096721a7c", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_mac_hotspot_21.0.3_9.tar.gz", + "version": "21.0.3" + } + }, + "openjdk22": { + "aarch64": { + "build": "8", + "sha256": "80d6fa75e87280202ae7660139870fe50f07fca9dc6c4fbd3f2837cbd70ec902", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_aarch64_mac_hotspot_22.0.1_8.tar.gz", + "version": "22.0.1" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "9445952d4487451af024a9a3f56373df76fbd928d9ff9186988aa27be2e4f10c", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_mac_hotspot_22.0.1_8.tar.gz", + "version": "22.0.1" } }, "openjdk8": { @@ -749,9 +841,9 @@ "vmType": "hotspot", "x86_64": { "build": "8", - "sha256": "d152f5b2ed8473ee0eb29c7ee134958d75ea86c8ccbafb5ee04a5545dd76108f", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u392b08.tar.gz", - "version": "8.0.392" + "sha256": "fd62491f7634c1cbed7557d6b21db7ef4818fbc0e63e678110d9d92cbea4ad8c", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u412b08.tar.gz", + "version": "8.0.412" } } }, @@ -759,33 +851,33 @@ "openjdk11": { "aarch64": { "build": "9", - "sha256": "bcac3231195a95cac397a35410bfa3f0945ec03e5194e7b0c1d0e785a48f8b76", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.21_9.tar.gz", - "version": "11.0.21" + "sha256": "8ecc59f0bda845717cecbc6025c4c7fcc26d6ffe48824b8f7a5db024216c5fb4", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "43d29affe994a09de31bf2fb6f8ab6d6792ba4267b9a2feacaa1f6e042481b9b", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.21_9.tar.gz", - "version": "11.0.21" + "sha256": "9855769dddc3f3b5a1fb530ce953025b1f7b3fac861628849b417676b1310b1f", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.23_9.tar.gz", + "version": "11.0.23" } }, "openjdk17": { "aarch64": { "build": "9", - "sha256": "89831d03b7cd9922bd178f1a9c8544a36c54d52295366db4e6628454b01acaef", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.9_9.tar.gz", - "version": "17.0.9" + "sha256": "003d3e0a65a2f0633b8bfed42be133724b490acb323c174c708d3a446d5fc660", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "ba214f2217dc134e94432085cff4fc5a97e964ffc211d343725fd535f3cd98a0", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_mac_hotspot_17.0.9_9.tar.gz", - "version": "17.0.9" + "sha256": "232c40bebd6ddbb673862e86e7e6e09bcfe399e5a53c8a6b77bf1ceab8edefd0", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_mac_hotspot_17.0.11_9.tar.gz", + "version": "17.0.11" } }, "openjdk18": { @@ -838,18 +930,34 @@ }, "openjdk21": { "aarch64": { - "build": "12", - "sha256": "bc384961d3a866198b1055a80fdff7fb6946aa6823b3ce624cc8c3125a26bed5", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.1_12.tar.gz", - "version": "21.0.1" + "build": "9", + "sha256": "8df56361b834c4681ef304ae9dc8406ce3d79c8572d2d6c2fefcbea55be7d86b", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.3_9.tar.gz", + "version": "21.0.3" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "12", - "sha256": "c21a2648ec21bc4701acfb6b7a1fd90aca001db1efb8454e2980d4c8dcd9e310", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_mac_hotspot_21.0.1_12.tar.gz", - "version": "21.0.1" + "build": "9", + "sha256": "d7fc89c196ed03deb8a98f6599e1b2e78859ec8ec752142549cd3710f3e1a025", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_mac_hotspot_21.0.3_9.tar.gz", + "version": "21.0.3" + } + }, + "openjdk22": { + "aarch64": { + "build": "8", + "sha256": "73a8a0270534db7b4760399f41c573fd1cff5f86f4e68b08988afee0df814889", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_aarch64_mac_hotspot_22.0.1_8.tar.gz", + "version": "22.0.1" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "d21e84edc1d7cc58fc04bcd9a214b71bf85e8ea348f8659197be3383afcb2b9a", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_mac_hotspot_22.0.1_8.tar.gz", + "version": "22.0.1" } }, "openjdk8": { @@ -857,9 +965,9 @@ "vmType": "hotspot", "x86_64": { "build": "8", - "sha256": "f1f15920ed299e10c789aef6274d88d45eb21b72f9a7b0d246a352107e344e6a", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_x64_mac_hotspot_8u392b08.tar.gz", - "version": "8.0.392" + "sha256": "1237e4f4238211d9137eec838e5d7cabdc9d93d41001cf41f6de3a4eb90884ef", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_x64_mac_hotspot_8u412b08.tar.gz", + "version": "8.0.412" } } } diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/development/compilers/typescript/default.nix index 4eca8e576c2c..eb12388f84c0 100644 --- a/pkgs/development/compilers/typescript/default.nix +++ b/pkgs/development/compilers/typescript/default.nix @@ -2,20 +2,20 @@ buildNpmPackage rec { pname = "typescript"; - version = "5.5.2"; + version = "5.5.3"; src = fetchFromGitHub { owner = "microsoft"; repo = "TypeScript"; rev = "v${version}"; - hash = "sha256-2BgMzOW9DIIncujAVJ/C8L9aMwDkNaj47cV2JSxCPrw="; + hash = "sha256-2yfF14hR/avl67cOwo+Gr95w2jf+7KYlsMrlBTAKswM="; }; patches = [ ./disable-dprint-dstBundler.patch ]; - npmDepsHash = "sha256-/WQgSoklW1szgJ/5iN0Dg+L7BMByvyc+KcvYiQNjGEw="; + npmDepsHash = "sha256-YihnUZgM+74EmImalyTFtp9xyiOOfjZVohDfpcvlSEg="; passthru.tests = { version = testers.testVersion { diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 078cb7dac925..b0a8b02ae49a 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -9,7 +9,6 @@ , pycryptodome , pytest-runner , pythonOlder -, pythonRelaxDepsHook , recommonmark , setuptools-scm , sphinx @@ -50,7 +49,6 @@ buildPythonPackage rec { # ever since https://github.com/vyperlang/vyper/pull/2816 git - pythonRelaxDepsHook pytest-runner setuptools-scm ]; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index fe577a149d71..c9db564c1941 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -10,14 +10,15 @@ let { case = "8.16"; out = { version = "1.17.0"; };} { case = "8.17"; out = { version = "1.17.0"; };} { case = "8.18"; out = { version = "1.18.1"; };} - { case = "8.19"; out = { version = "1.18.1"; };} + { case = "8.20"; out = { version = "1.19.2"; };} ] {} ); -in mkCoqDerivation { +in (mkCoqDerivation { pname = "elpi"; repo = "coq-elpi"; owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.20"; out = "2.2.0"; } { case = "8.19"; out = "2.0.1"; } { case = "8.18"; out = "2.0.0"; } { case = "8.17"; out = "1.18.0"; } @@ -28,6 +29,7 @@ in mkCoqDerivation { { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."2.2.0".sha256 = "sha256-rADEoqTXM7/TyYkUKsmCFfj6fjpWdnZEOK++5oLfC/I="; release."2.0.1".sha256 = "sha256-cuoPsEJ+JRLVc9Golt2rJj4P7lKltTrrmQijjoViooc="; release."2.0.0".sha256 = "sha256-A/cH324M21k3SZ7+YWXtaYEbu6dZQq3K0cb1RMKjbsM="; release."1.19.0".sha256 = "sha256-kGoo61nJxeG/BqV+iQaV3iinwPStND+7+fYMxFkiKrQ="; @@ -67,6 +69,7 @@ in mkCoqDerivation { buildFlags = [ "OCAMLWARN=" ]; mlPlugin = true; + useDuneifVersion = v: lib.versions.isGe "2.2.0" v || v == "dev"; propagatedBuildInputs = [ coq.ocamlPackages.findlib elpi ]; meta = { @@ -74,4 +77,9 @@ in mkCoqDerivation { maintainers = [ lib.maintainers.cohencyril ]; license = lib.licenses.lgpl21Plus; }; -} +}).overrideAttrs (o: + lib.optionalAttrs (o.version != null + && (o.version == "dev" || lib.versions.isGe "2.2.0" o.version)) + { + propagatedBuildInputs = o.propagatedBuildInputs ++ [ coq.ocamlPackages.ppx_optcomp ]; + }) diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index 60926e712ad7..a0598d0bac83 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -8,7 +8,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "2.0.1"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "2.0.1"; } { cases = [ (range "8.16" "8.17") (isGe "2.0.0") ]; out = "2.0.0"; } { cases = [ (range "8.15" "8.18") (range "1.15.0" "1.18.0") ]; out = "1.1.3"; } { cases = [ (range "8.13" "8.17") (range "1.13.0" "1.18.0") ]; out = "1.1.1"; } diff --git a/pkgs/development/coq-modules/coqide/default.nix b/pkgs/development/coq-modules/coqide/default.nix index a4b85cdd7fbb..fcc0e2a81dd4 100644 --- a/pkgs/development/coq-modules/coqide/default.nix +++ b/pkgs/development/coq-modules/coqide/default.nix @@ -3,7 +3,7 @@ , copyDesktopItems , wrapGAppsHook3 , glib -, gnome +, adwaita-icon-theme , mkCoqDerivation , coq , version ? null }: @@ -29,7 +29,7 @@ mkCoqDerivation rec { wrapGAppsHook3 coq.ocamlPackages.lablgtk3-sourceview3 glib - gnome.adwaita-icon-theme + adwaita-icon-theme ]; buildPhase = '' diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index 23e74f825cb2..6998ec445989 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ - { cases = [(range "8.17" "8.19") (isGe "2.0.0")] ; out = "0.2.0"; } + { cases = [(range "8.17" "8.20") (isGe "2.0.0")] ; out = "0.2.0"; } { cases = [(range "8.11" "8.20") (isLe "2.0.0")] ; out = "0.1.1"; } ] null; diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index 57e7caa03833..ba84b953490d 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -9,7 +9,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ - { cases = [(range "8.17" "8.19") (isGe "2.0.0") ]; out = "0.4.0"; } + { cases = [(range "8.17" "8.20") (isGe "2.0.0") ]; out = "0.4.0"; } { cases = [(range "8.11" "8.20") (range "1.12.0" "1.19.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index 6554b811f4b9..94e868c8ebf1 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -14,7 +14,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [ - { cases = [ (isGe "8.16") (range "2.0.0" "2.2.0") ]; out = "0.9.4"; } + { cases = [ (range "8.16" "8.19") (range "2.0.0" "2.2.0") ]; out = "0.9.4"; } { cases = [ (range "8.16" "8.18") (range "2.0.0" "2.1.0" ) ]; out = "0.9.3"; } { cases = [ (range "8.14" "8.18") (range "1.13.0" "1.18.0") ]; out = "0.9.2"; } { cases = [ (range "8.14" "8.16") (range "1.13.0" "1.14.0") ]; out = "0.9.1"; } diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index d229f89875b4..aee4d65b7cfa 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,7 +5,7 @@ let hb = mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.18" "8.19"; out = "1.7.0"; } + { case = range "8.18" "8.20"; out = "1.7.0"; } { case = range "8.16" "8.18"; out = "1.6.0"; } { case = range "8.15" "8.18"; out = "1.5.0"; } { case = range "8.15" "8.17"; out = "1.4.0"; } diff --git a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index d913b34f0f79..3e071850e8ef 100644 --- a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -9,7 +9,7 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "1.2.3"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "1.2.3"; } { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "1.2.2"; } { cases = [ (range "8.16" "8.19") (isGe "1.15") ]; out = "1.1.1"; } { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; } diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 97e8a7698a90..afbd3bd8046b 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -32,7 +32,7 @@ let defaultVersion = let inherit (lib.versions) range; in lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.17" "8.19") (range "2.0.0" "2.2.0") ]; out = "1.1.0"; } + { cases = [ (range "8.17" "8.20") (range "2.0.0" "2.2.0") ]; out = "1.1.0"; } { cases = [ (range "8.17" "8.19") (range "1.17.0" "1.19.0") ]; out = "0.7.0"; } { cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.7"; } { cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.6"; } diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index d910cfa8d055..66d237c0a53d 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -7,7 +7,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "2.1.0"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "2.1.0"; } { cases = [ (range "8.16" "8.18") (range "2.0" "2.1") ]; out = "2.0.0"; } { cases = [ (range "8.13" "8.20") (range "1.12" "1.19") ]; out = "1.5.2"; } { cases = [ (isGe "8.10") (range "1.11" "1.17") ]; out = "1.5.1"; } diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix index cdd913f6d82b..f4a2387ee8cc 100644 --- a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix +++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix @@ -7,7 +7,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [ - { cases = [ (isGe "8.17") (isGe "1.0") ]; out = "0.7.1"; } + { cases = [ (range "8.17" "8.19") (isGe "1.0") ]; out = "0.7.1"; } { cases = [ (isGe "8.17") (range "0.6.6" "0.7.0") ]; out = "0.6.1"; } { cases = [ (range "8.17" "8.18") (range "0.6.0" "0.6.7") ]; out = "0.5.2"; } { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.5") ]; out = "0.5.1"; } diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index ccac363bf2b2..987990429f37 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -8,6 +8,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; release = { + "2.0.1".sha256 = "sha256-tQTI3PCl0q1vWpps28oATlzOI8TpVQh1jhTwVmhaZic="; "2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8="; "1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4="; "1.1.3".sha256 = "1vwmmnzy8i4f203i2s60dn9i0kr27lsmwlqlyyzdpsghvbr8h5b7"; @@ -20,7 +21,8 @@ mkCoqDerivation { }; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; } + { cases = [ (isGe "8.17") (isGe "2.0.0") ]; out = "2.0.1"; } + { cases = [ (range "8.16" "8.19") (range "2.0.0" "2.2.0") ]; out = "2.0.0"; } { cases = [ (range "8.13" "8.19") (range "1.13.0" "1.19.0") ]; out = "1.1.4"; } { cases = [ (isGe "8.13") (range "1.12.0" "1.18.0") ]; out = "1.1.3"; } { cases = [ (isGe "8.10") (range "1.12.0" "1.18.0") ]; out = "1.1.2"; } diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 38c29f25faa0..819512466830 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-ssreflect.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.0.2"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "1.0.2"; } { cases = [ (range "8.12" "8.18") (range "1.12.0" "1.17.0") ]; out = "1.0.1"; } { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.17.0") ]; out = "1.0.0"; } ] null; diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index d6a91944053e..df7a7e27c93d 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -29,7 +29,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "3.2"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "3.2"; } { cases = [ (range "8.12" "8.20") (range "1.12" "1.19") ]; out = "2.4"; } ] null; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index b65d54bc3360..84f5e718ed05 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -9,7 +9,7 @@ mkCoqDerivation rec { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; } { cases = [ (range "8.13" "8.20") (range "1.12" "1.19.0") ]; out = "1.3.0+1.12+8.13"; } { cases = [ (range "8.13" "8.16") (range "1.12" "1.17.0") ]; out = "1.1.0+1.12+8.13"; } ] null; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 242841b8fa17..51accc11d249 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -23,7 +23,7 @@ let { case = range "8.19" "8.20"; out = "1.19.0"; } { case = range "8.17" "8.18"; out = "1.18.0"; } { case = range "8.15" "8.18"; out = "1.17.0"; } - { case = range "8.16" "8.19"; out = "2.2.0"; } + { case = range "8.16" "8.20"; out = "2.2.0"; } { case = range "8.16" "8.18"; out = "2.1.0"; } { case = range "8.16" "8.18"; out = "2.0.0"; } { case = range "8.13" "8.18"; out = "1.16.0"; } diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 4326aa9ba224..89297a6fd0ea 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -9,7 +9,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.17" "8.19") (isGe "2.1.0") ]; out = "2.2.0"; } + { cases = [ (range "8.17" "8.20") (isGe "2.1.0") ]; out = "2.2.0"; } { cases = [ (range "8.16" "8.18") "2.1.0" ]; out = "2.1.0"; } { cases = [ (range "8.16" "8.18") "2.0.0" ]; out = "2.0.0"; } { cases = [ (isGe "8.15") (range "1.15.0" "1.19.0") ]; out = "1.6.0"; } diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix index f1ec4d0fed27..942ba1dc18bd 100644 --- a/pkgs/development/coq-modules/smtcoq/default.nix +++ b/pkgs/development/coq-modules/smtcoq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, mkCoqDerivation, coq, trakt, veriT, zchaff, fetchurl, cvc5, version ? null }: +{ lib, stdenv, pkgs, mkCoqDerivation, coq, veriT, zchaff, fetchurl, cvc5, version ? null }: let # version of veriT that works with SMTCoq @@ -15,6 +15,13 @@ mkCoqDerivation { pname = "smtcoq"; owner = "smtcoq"; + release."SMTCoq-2.2+8.19".sha256 = "sha256-9Wv8AXRRyOHG/cjA/V9tSK55R/bofDMLTkDpuwYWkks="; + release."SMTCoq-2.2+8.18".sha256 = "sha256-1iJAruI5Qn9nTZcUDjk8t/1Q+eFkYLOe9Ee0DmK03w8="; + release."SMTCoq-2.2+8.17".sha256 = "sha256-kaodsyVUl1+QQagzoBTIjxbdD4X3IaaH0x2AsVUL+Z0="; + release."SMTCoq-2.2+8.16".sha256 = "sha256-Hwm8IFlw97YiOY6H63HyJlwIXvQHr9lqc1+PgTnBtkw="; + release."SMTCoq-2.2+8.15".sha256 = "sha256-+GYOasJ32KJyOfqJlTtFmsJ2exd6gdueKwHdeMPErTo="; + release."SMTCoq-2.2+8.14".sha256 = "sha256-jqnF33E/4CqR1HSrLmUmLVCKslw9h3bbWi4YFmFYrhY="; + release."SMTCoq-2.2+8.13".sha256 = "sha256-AVpKU/SLaLYnCnx6GOEPGJjwbRrp28Fs5O50kJqdclI="; release."SMTCoq-2.1+8.16".rev = "4996c00b455bfe98400e96c954839ceea93efdf7"; release."SMTCoq-2.1+8.16".sha256 = "sha256-k53e+frUjwq+ZZKbbOKd/EfVC40QeAzB2nCsGkCKnHA="; release."SMTCoq-2.1+8.14".rev = "e11d9b424b0113f32265bcef0ddc962361da4dae"; @@ -22,14 +29,20 @@ mkCoqDerivation { release."SMTCoq-2.1+8.13".rev = "d02269c43739f4559d83873563ca00daad9faaf1"; release."SMTCoq-2.1+8.13".sha256 = "sha256-VZetGghdr5uJWDwZWSlhYScoNEoRHIbwqwJKSQyfKKg="; + releaseRev = v: v; + inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = isEq "8.16"; out = "SMTCoq-2.1+8.16"; } - { case = isEq "8.14"; out = "SMTCoq-2.1+8.14"; } - { case = isEq "8.13"; out = "SMTCoq-2.1+8.13"; } + { case = isEq "8.19"; out = "SMTCoq-2.2+8.19"; } + { case = isEq "8.18"; out = "SMTCoq-2.2+8.18"; } + { case = isEq "8.17"; out = "SMTCoq-2.2+8.17"; } + { case = isEq "8.16"; out = "SMTCoq-2.2+8.16"; } + { case = isEq "8.15"; out = "SMTCoq-2.2+8.15"; } + { case = isEq "8.14"; out = "SMTCoq-2.2+8.14"; } + { case = isEq "8.13"; out = "SMTCoq-2.2+8.13"; } ] null; - propagatedBuildInputs = [ trakt cvc5 veriT' zchaff ] ++ (with coq.ocamlPackages; [ num zarith ]); + propagatedBuildInputs = [ cvc5 veriT' zchaff ] ++ (with coq.ocamlPackages; [ findlib num zarith ]); mlPlugin = true; nativeBuildInputs = (with pkgs; [ gnumake42 ]) ++ (with coq.ocamlPackages; [ ocamlbuild ]); diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index e79bd4f60f8d..565f83da06d6 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -1,4 +1,4 @@ -{ metaFetch, mkCoqDerivation, coq, lib, glib, gnome, wrapGAppsHook3, +{ metaFetch, mkCoqDerivation, coq, lib, glib, adwaita-icon-theme, wrapGAppsHook3, version ? null }: let ocamlPackages = coq.ocamlPackages; @@ -21,7 +21,7 @@ ocamlPackages.buildDunePackage { src = "${fetched.src}/language-server"; nativeBuildInputs = [ coq ]; buildInputs = - [ coq glib gnome.adwaita-icon-theme wrapGAppsHook3 ] ++ + [ coq glib adwaita-icon-theme wrapGAppsHook3 ] ++ (with ocamlPackages; [ findlib lablgtk3-sourceview3 yojson zarith ppx_inline_test ppx_assert ppx_sexp_conv ppx_deriving ppx_import sexplib diff --git a/pkgs/development/cuda-modules/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix index 5d23d8f7f2a1..46e4401f6a26 100644 --- a/pkgs/development/cuda-modules/cuda/overrides.nix +++ b/pkgs/development/cuda-modules/cuda/overrides.nix @@ -44,7 +44,7 @@ filterAndCreateOverrides { }: prevAttrs: { buildInputs = prevAttrs.buildInputs ++ [ - libcublas.lib + libcublas numactl rdma-core ]; @@ -66,17 +66,17 @@ filterAndCreateOverrides { buildInputs = prevAttrs.buildInputs # Always depends on this - ++ [ libcublas.lib ] + ++ [ libcublas ] # Dependency from 12.0 and on - ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink.lib ] + ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink ] # Dependency from 12.1 and on - ++ lib.lists.optionals (cudaAtLeast "12.1") [ libcusparse.lib ]; + ++ lib.lists.optionals (cudaAtLeast "12.1") [ libcusparse ]; brokenConditions = prevAttrs.brokenConditions // { "libnvjitlink missing (CUDA >= 12.0)" = - !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink.lib != null)); + !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink != null)); "libcusparse missing (CUDA >= 12.1)" = - !(cudaAtLeast "12.1" -> (libcusparse != null && libcusparse.lib != null)); + !(cudaAtLeast "12.1" -> (libcusparse != null && libcusparse != null)); }; }; @@ -90,16 +90,16 @@ filterAndCreateOverrides { buildInputs = prevAttrs.buildInputs # Dependency from 12.0 and on - ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink.lib ]; + ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink ]; brokenConditions = prevAttrs.brokenConditions // { "libnvjitlink missing (CUDA >= 12.0)" = - !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink.lib != null)); + !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink != null)); }; }; # TODO(@connorbaker): cuda_cudart.dev depends on crt/host_config.h, which is from - # cuda_nvcc.dev. It would be nice to be able to encode that. + # (getDev cuda_nvcc). It would be nice to be able to encode that. cuda_cudart = { addDriverRunpath, lib }: prevAttrs: { @@ -166,13 +166,17 @@ filterAndCreateOverrides { }; cuda_nvcc = - { - backendStdenv, - cuda_cudart, - lib, - setupCudaHook, - }: + { backendStdenv, setupCudaHook }: prevAttrs: { + # Merge "bin" and "dev" into "out" to avoid circular references + outputs = builtins.filter ( + x: + !(builtins.elem x [ + "dev" + "bin" + ]) + ) prevAttrs.outputs; + # Patch the nvcc.profile. # Syntax: # - `=` for assignment, @@ -230,12 +234,11 @@ filterAndCreateOverrides { }; }; - cuda_nvprof = - { cuda_cupti }: prevAttrs: { buildInputs = prevAttrs.buildInputs ++ [ cuda_cupti.lib ]; }; + cuda_nvprof = { cuda_cupti }: prevAttrs: { buildInputs = prevAttrs.buildInputs ++ [ cuda_cupti ]; }; cuda_demo_suite = { - freeglut, + libglut, libcufft, libcurand, libGLU, @@ -244,9 +247,9 @@ filterAndCreateOverrides { }: prevAttrs: { buildInputs = prevAttrs.buildInputs ++ [ - freeglut - libcufft.lib - libcurand.lib + libglut + libcufft + libcurand libGLU libglvnd mesa diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix index 24e41d331895..d2f8e2ce3fdf 100644 --- a/pkgs/development/cuda-modules/cudatoolkit/default.nix +++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix @@ -35,7 +35,7 @@ wayland, xorg, zlib, - freeglut, + libglut, libGLU, libsForQt5, libtiff, @@ -85,7 +85,7 @@ backendStdenv.mkDerivation rec { buildInputs = lib.optionals (lib.versionOlder version "11") [ libsForQt5.qt5.qtwebengine - freeglut + libglut libGLU ] ++ [ diff --git a/pkgs/development/cuda-modules/cutensor/extension.nix b/pkgs/development/cuda-modules/cutensor/extension.nix index 5fdf356df916..4688b57ce551 100644 --- a/pkgs/development/cuda-modules/cutensor/extension.nix +++ b/pkgs/development/cuda-modules/cutensor/extension.nix @@ -140,7 +140,7 @@ let maintainers = prevAttrs.meta.maintainers ++ [ lib.maintainers.obsidian-systems-maintenance ]; license = lib.licenses.unfreeRedistributable // { shortName = "cuTENSOR EULA"; - name = "cuTENSOR SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS"; + fullName = "cuTENSOR SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS"; url = "https://docs.nvidia.com/cuda/cutensor/license.html"; }; }; diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix index 006abb456cdc..4af16c8921cb 100644 --- a/pkgs/development/cuda-modules/generic-builders/manifest.nix +++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix @@ -290,42 +290,23 @@ backendStdenv.mkDerivation (finalAttrs: { "libcuda.so.*" ]; - # The out output leverages the same functionality which backs the `symlinkJoin` function in - # Nixpkgs: - # https://github.com/NixOS/nixpkgs/blob/d8b2a92df48f9b08d68b0132ce7adfbdbc1fbfac/pkgs/build-support/trivial-builders/default.nix#L510 - # - # That should allow us to emulate "fat" default outputs without having to actually create them. - # - # It is important that this run after the autoPatchelfHook, otherwise the symlinks in out will reference libraries in lib, creating a circular dependency. - postPhases = [ "postPatchelf" ]; + # _multioutPropagateDev() currently expects a space-separated string rather than an array + preFixup = '' + export propagatedBuildOutputs="''${propagatedBuildOutputs[@]}" + ''; - # For each output, create a symlink to it in the out output. - # NOTE: We must recreate the out output here, because the setup hook will have deleted it if it was empty. + # Propagate all outputs, including `static` + propagatedBuildOutputs = builtins.filter (x: x != "dev") finalAttrs.outputs; + + # Kept in case overrides assume postPhases have already been defined + postPhases = [ "postPatchelf" ]; postPatchelf = '' - mkdir -p "$out" - for output in $(getAllOutputNames); do - if [[ "$output" != "out" ]]; then - ${meta.getExe lndir} "''${!output}" "$out" - fi - done + true ''; # Make the CUDA-patched stdenv available passthru.stdenv = backendStdenv; - # Setting propagatedBuildInputs to false will prevent outputs known to the multiple-outputs - # from depending on `out` by default. - # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L196 - # Indeed, we want to do the opposite -- fat "out" outputs that contain all the other outputs. - propagatedBuildOutputs = false; - - # By default, if the dev output exists it just uses that. - # However, because we disabled propagatedBuildOutputs, dev doesn't contain libraries or - # anything of the sort. To remedy this, we set outputSpecified to true, and use - # outputsToInstall, which tells Nix which outputs to use when the package name is used - # unqualified (that is, without an explicit output). - outputSpecified = true; - meta = { description = "${redistribRelease.name}. By downloading and using the packages you accept the terms and conditions of the ${finalAttrs.meta.license.shortName}"; sourceProvenance = [ sourceTypes.binaryNativeCode ]; @@ -343,8 +324,5 @@ backendStdenv.mkDerivation (finalAttrs: { lists.optionals isBadPlatform finalAttrs.meta.platforms; license = licenses.unfree; maintainers = teams.cuda.members; - # Force the use of the default, fat output by default (even though `dev` exists, which - # causes Nix to prefer that output over the others if outputSpecified isn't set). - outputsToInstall = [ "out" ]; }; }) diff --git a/pkgs/development/cuda-modules/nccl-tests/default.nix b/pkgs/development/cuda-modules/nccl-tests/default.nix index e1f4eed7fae4..84575234a769 100644 --- a/pkgs/development/cuda-modules/nccl-tests/default.nix +++ b/pkgs/development/cuda-modules/nccl-tests/default.nix @@ -45,11 +45,11 @@ backendStdenv.mkDerivation (finalAttrs: { [ nccl ] ++ lib.optionals (lib.versionOlder cudaVersion "11.4") [ cudatoolkit ] ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [ - cuda_nvcc.dev # crt/host_config.h + cuda_nvcc # crt/host_config.h cuda_cudart ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ - cuda_cccl.dev # + cuda_cccl # ] ++ lib.optionals mpiSupport [ mpi ]; diff --git a/pkgs/development/cuda-modules/nccl/default.nix b/pkgs/development/cuda-modules/nccl/default.nix index dd767d2781f0..e838bac3abc3 100644 --- a/pkgs/development/cuda-modules/nccl/default.nix +++ b/pkgs/development/cuda-modules/nccl/default.nix @@ -54,7 +54,7 @@ backendStdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals (cudaOlder "11.4") [ cudatoolkit ] ++ lib.optionals (cudaAtLeast "11.4") [ - cuda_nvcc.dev # crt/host_config.h + cuda_nvcc # crt/host_config.h cuda_cudart ] # NOTE: CUDA versions in Nixpkgs only use a major and minor version. When we do comparisons diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix index 8c5ec833c46f..9e1325a43457 100644 --- a/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/pkgs/development/embedded/arduino/arduino-cli/default.nix @@ -4,13 +4,13 @@ let pkg = buildGoModule rec { pname = "arduino-cli"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "arduino"; repo = pname; rev = "v${version}"; - hash = "sha256-3VXc0Ksv6swmKEClNF5RRjX68RFLg2IRdBwcVgI5Syo="; + hash = "sha256-lRCkUF0BBX0nej/HxfV9u8NIuA5W0aBKP2xPR8C61NY="; }; nativeBuildInputs = [ @@ -67,8 +67,8 @@ let description = "Arduino from the command line"; mainProgram = "arduino-cli"; changelog = "https://github.com/arduino/arduino-cli/releases/tag/${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ryantm ]; + license = [ licenses.gpl3Only licenses.asl20 ]; + maintainers = with maintainers; [ ryantm sfrijters ]; }; }; diff --git a/pkgs/development/embedded/fpga/apio/default.nix b/pkgs/development/embedded/fpga/apio/default.nix index 47ff562958ec..ef153b96ca49 100644 --- a/pkgs/development/embedded/fpga/apio/default.nix +++ b/pkgs/development/embedded/fpga/apio/default.nix @@ -16,26 +16,27 @@ buildPythonApplication rec { pname = "apio"; - version = "0.8.1"; - format = "pyproject"; + version = "0.9.5"; + + pyproject = true; src = fetchFromGitHub { owner = "FPGAwars"; repo = "apio"; rev = "v${version}"; - sha256 = "sha256-04qAGTzusMT3GsaRxDoXNJK1Mslzxu+ugQclBJx8xzE="; + hash = "sha256-VU4tOszGkw20DWW2SerFsnjFiSkrSwqBcwosGnHJfU8="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'scons==4.2.0' 'scons' \ - --replace '==' '>=' + --replace-fail 'scons==4.2.0' 'scons' \ + --replace-fail '==' '>=' - substituteInPlace apio/managers/scons.py --replace \ + substituteInPlace apio/managers/scons.py --replace-fail \ 'return "tinyprog --libusb --program"' \ 'return "${tinyprog}/bin/tinyprog --libusb --program"' - substituteInPlace apio/util.py --replace \ - '_command = join(get_bin_dir(), "tinyprog")' \ + substituteInPlace apio/util.py --replace-fail \ + '_command = apio_bin_dir / "tinyprog"' \ '_command = "${tinyprog}/bin/tinyprog"' # semantic-version seems to not support version numbers like the one of tinyprog in Nixpkgs (1.0.24.dev114+gxxxxxxx). @@ -43,7 +44,7 @@ buildPythonApplication rec { # This leads to an error like "Error: Invalid version string: '1.0.24.dev114+g97f6353'" # when executing "apio upload" for a TinyFPGA. # Replace the dot with a dash to work around this problem. - substituteInPlace apio/managers/scons.py --replace \ + substituteInPlace apio/managers/scons.py --replace-fail \ 'version = semantic_version.Version(pkg_version)' \ 'version = semantic_version.Version(pkg_version.replace(".dev", "-dev"))' ''; @@ -69,8 +70,15 @@ buildPythonApplication rec { pytestCheckHook ]; + disabledTestPaths = [ + # This test fails and is also not executed in upstream's CI + "test2" + ]; + pytestFlagsArray = [ "--offline" ]; + strictDeps = true; + meta = with lib; { description = "Open source ecosystem for open FPGA boards"; mainProgram = "apio"; diff --git a/pkgs/development/embedded/openocd/default.nix b/pkgs/development/embedded/openocd/default.nix index 5efd11c65f98..366d1ed832c2 100644 --- a/pkgs/development/embedded/openocd/default.nix +++ b/pkgs/development/embedded/openocd/default.nix @@ -3,6 +3,7 @@ , fetchurl , pkg-config , hidapi +, tcl , jimtcl , libjaylink , libusb1 @@ -12,8 +13,12 @@ # Allow selection the hardware targets (SBCs, JTAG Programmers, JTAG Adapters) , extraHardwareSupport ? [] -}: +}: let + isWindows = stdenv.hostPlatform.isWindows; + notWindows = !isWindows; + +in stdenv.mkDerivation rec { pname = "openocd"; version = "0.12.0"; @@ -22,23 +27,24 @@ stdenv.mkDerivation rec { sha256 = "sha256-ryVHiL6Yhh8r2RA/5uYKd07Jaow3R0Tu+Rl/YEMHWvo="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config tcl ]; - buildInputs = [ hidapi jimtcl libftdi1 libjaylink libusb1 ] + buildInputs = [ libusb1 ] + ++ lib.optionals notWindows [ hidapi jimtcl libftdi1 libjaylink ] ++ # tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/ lib.optional stdenv.isLinux libgpiod_1; configureFlags = [ "--disable-werror" - "--disable-internal-jimtcl" - "--disable-internal-libjaylink" "--enable-jtag_vpi" - "--enable-buspirate" "--enable-remote-bitbang" - (lib.enableFeature enableFtdi "ftdi") + (lib.enableFeature notWindows "buspirate") + (lib.enableFeature (notWindows && enableFtdi) "ftdi") (lib.enableFeature stdenv.isLinux "linuxgpiod") (lib.enableFeature stdenv.isLinux "sysfsgpio") + (lib.enableFeature isWindows "internal-jimtcl") + (lib.enableFeature isWindows "internal-libjaylink") ] ++ map (hardware: "--enable-${hardware}") extraHardwareSupport ; @@ -75,6 +81,6 @@ stdenv.mkDerivation rec { homepage = "https://openocd.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ bjornfor prusnak ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index 9013f39ad424..f2ebeba39361 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -46,11 +46,13 @@ with python3Packages; buildPythonApplication rec { postPatch = '' # Disable update checks at runtime substituteInPlace platformio/maintenance.py --replace-fail ' check_platformio_upgrade()' "" + + # Remove filterwarnings which fails on new deprecations in Python 3.12 for 3.14 + rm tox.ini ''; nativeBuildInputs = [ installShellFiles - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix index ba65d94a292d..8127385a79d5 100644 --- a/pkgs/development/embedded/svdtools/default.nix +++ b/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.3.14"; + version = "0.3.15"; src = fetchCrate { inherit version pname; - hash = "sha256-sTogOCpcfJHy+e3T4pEvclCddCUX+RHCQ238oz5bAEo="; + hash = "sha256-P4XwIJnXnIQcp/l8GR7Mx8ybn1GdtiXVpQcky1JYVuU="; }; - cargoHash = "sha256-lRSt46yxFWSlhU6Pns3PCLJ4c6Fvi4EbOIqVx9IoPCc="; + cargoHash = "sha256-dBqbZWVTrIj2ji7JmLnlglvt4GkKef48kcl/V54thaQ="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 706bd2dfecf2..8f20b0f5bdde 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -443,7 +443,7 @@ self: super: builtins.intersectAttrs super { # Tries to run GUI in tests leksah = dontCheck (overrideCabal (drv: { executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [ - gnome.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... + adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... wrapGAppsHook3 # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]); diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2e81440fca77..3f82461c4f1c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -126016,22 +126016,21 @@ self: { }) {}; "gnome-keyring" = callPackage - ({ mkDerivation, base, bytestring, c2hs, gnome-keyring - , libgnome-keyring, text, time + ({ mkDerivation, base, bytestring, c2hs, libgnome-keyring + , text, time }: mkDerivation { pname = "gnome-keyring"; version = "0.3.1.1"; sha256 = "044bbgy8cssi1jc8wwb0kvxpw6d7pwxackkzvw7p9r8ybmgv4d0b"; libraryHaskellDepends = [ base bytestring text time ]; - librarySystemDepends = [ gnome-keyring ]; + librarySystemDepends = [ libgnome-keyring ]; libraryPkgconfigDepends = [ libgnome-keyring ]; libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs.gnome) gnome-keyring; - inherit (pkgs) libgnome-keyring;}; + }) {inherit (pkgs) libgnome-keyring;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome-vfs diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index 492091ef35fc..8d09dcf5bea1 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -292,7 +292,7 @@ rec { */ justStaticExecutables = overrideCabal (drv: { enableSharedExecutables = false; - enableLibraryProfiling = false; + enableLibraryProfiling = drv.enableExecutableProfiling or false; isLibrary = false; doHaddock = false; postFixup = drv.postFixup or "" + '' diff --git a/pkgs/development/interpreters/elixir/1.17.nix b/pkgs/development/interpreters/elixir/1.17.nix index 32b09d76384e..ac1ddc8134b5 100644 --- a/pkgs/development/interpreters/elixir/1.17.nix +++ b/pkgs/development/interpreters/elixir/1.17.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation { - version = "1.17.1"; - sha256 = "sha256-a7A+426uuo3bUjggkglY1lqHmSbZNpjPaFpQUXYtW9k="; - # https://hexdocs.pm/elixir/1.17.1/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp + version = "1.17.2"; + sha256 = "sha256-8rb2f4CvJzio3QgoxvCv1iz8HooXze0tWUJ4Sc13dxg="; + # https://hexdocs.pm/elixir/1.17.2/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "25"; escriptPath = "lib/elixir/scripts/generate_app.escript"; } diff --git a/pkgs/development/interpreters/femtolisp/default.nix b/pkgs/development/interpreters/femtolisp/default.nix index 33066d97ef64..7bf0ea7c7540 100644 --- a/pkgs/development/interpreters/femtolisp/default.nix +++ b/pkgs/development/interpreters/femtolisp/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "femtolisp"; - version = "0-unstable-2023-07-12"; + version = "0-unstable-2024-06-18"; src = fetchFromSourcehut { owner = "~ft"; repo = "femtolisp"; - rev = "b3a21a0ff408e559639f6c31e1a2ab970787567f"; - hash = "sha256-PE/xYhfhn0xv/kJWsS07fOF2n5sXP666vy7OVaNxc7Y="; + rev = "ee58f398fec62d3096b0e01da51a3969ed37a32d"; + hash = "sha256-pfPD9TNLmrqhvJS/aVVmziMVApsiU5v1nAMqU+Kduzw="; }; strictDeps = true; diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 883f3df647ef..d854643bb2fe 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnu-apl"; - version = "1.8"; + version = "1.9"; src = fetchurl { url = "mirror://gnu/apl/apl-${version}.tar.gz"; - sha256 = "1jxvv2h3y1am1fw6r5sn3say1n0dj8shmscbybl0qhqdia2lqkql"; + sha256 = "sha256-KRhn8bGTdpOrtXvn2aN2GLA3bj4nCVdIVKe75Suyjrg="; }; buildInputs = [ readline gettext ncurses ]; diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index fb788377107e..7eb0f1abc4cf 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -26,11 +26,11 @@ let in builder rec { pname = "guile"; - version = "3.0.9"; + version = "3.0.10"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-GiYlrHKyNm6VeS8/51j9Lfd1tARKkKSpeHMm5mwNdQ0="; + sha256 = "sha256-vXFoUX/VJjM0RtT3q4FlJ5JWNAlPvTcyLhfiuNjnY4g="; }; outputs = [ "out" "dev" "info" ]; @@ -74,7 +74,6 @@ builder rec { patches = [ ./eai_system.patch - ./guile-hurd-posix-spawn.patch ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch ++ lib.optional stdenv.isDarwin (fetchpatch { diff --git a/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch b/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch deleted file mode 100644 index 7cf600b4c2aa..000000000000 --- a/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix , which affects GNU/Hurd. - -diff --git a/libguile/posix.c b/libguile/posix.c -index 3a8be94e4..f5fdc544c 100644 ---- a/libguile/posix.c -+++ b/libguile/posix.c -@@ -1326,7 +1326,14 @@ static void - close_inherited_fds_slow (posix_spawn_file_actions_t *actions, int max_fd) - { - while (--max_fd > 2) -- posix_spawn_file_actions_addclose (actions, max_fd); -+ { -+ /* Adding invalid file descriptors to an 'addclose' action leads -+ to 'posix_spawn' failures on some operating systems: -+ . Hence the extra check. */ -+ int flags = fcntl (max_fd, F_GETFD, NULL); -+ if ((flags >= 0) && ((flags & FD_CLOEXEC) == 0)) -+ posix_spawn_file_actions_addclose (actions, max_fd); -+ } - } - - static void - -Fix . - -diff --git a/test-suite/tests/posix.test b/test-suite/tests/posix.test -index f20e04453..d5cf47cda 100644 ---- a/test-suite/tests/posix.test -+++ b/test-suite/tests/posix.test -@@ -431,7 +431,13 @@ - (let ((str (get-string-all (car input+output)))) - (close-port (car input+output)) - (waitpid pid) -- str))) -+ -+ ;; On GNU/Hurd, the exec server prepends 'LD_ORIGIN_PATH' for -+ ;; every program: . Strip it. -+ (if (and (string=? "GNU" (utsname:sysname (uname))) -+ (string-prefix? "LD_ORIGIN_PATH=" str)) -+ (string-drop str (+ 1 (string-index str #\newline))) -+ str)))) - - (pass-if-equal "ls /proc/self/fd" - "0\n1\n2\n3\n" ;fourth FD is for /proc/self/fd diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 8a6de1f094d2..64e5b7c4d827 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, sqlite, gmp, libffi, cairo, ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile, - libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl, + libxml2, libglut, libsamplerate, pcre, libevent, libedit, yajl, python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached }: @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ zlib sqlite gmp libffi cairo ncurses freetype libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2 - freeglut libsamplerate pcre libevent libedit yajl + libglut libsamplerate pcre libevent libedit yajl glfw openssl libpthreadstubs libXdmcp libmemcached python3 ]; diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index ced244e29780..aa0d2ebe593d 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "1.3.5"; + version = "1.4.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-aBZ0KlXWKAF70xFxc+WWXucLPnxyaCxu97IYkPuKcCA="; + sha256 = "sha256-Y7FaW3V80mXp3l87srTLyhF45MlNH7QUZ5hrTudPtDU="; }; - vendorHash = "sha256-k17BthjOjZs0WB88AVVIM00HcSZl2S5u8n9eB2NFdrk="; + vendorHash = "sha256-t/28kTJVgVoe7DgGzNgA1sYKoA6oNC46AeJSrW/JetU="; doCheck = false; diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index 6f3342d057bd..55bd577e46d1 100644 --- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -132,6 +132,8 @@ let generatedConfig = luaLib.generateLuarocksConfig { externalDeps = lib.unique (self.externalDeps ++ externalDepsGenerated); + local_cache = ""; + # Filter out the lua derivation itself from the Lua module dependency # closure, as it doesn't have a rock tree :) # luaLib.hasLuaModule diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 7775fa5c8493..497307d57b3f 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: LuaCPathSearchPaths = luaPackages.luaLib.luaCPathList; setupHook = builtins.toFile "lua-setup-hook" '' source @out@/nix-support/utils.sh - addEnvHooks "$hostOffset" addToLuaPath + addEnvHooks "$hostOffset" luaEnvHook ''; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/lua-5/tests/default.nix b/pkgs/development/interpreters/lua-5/tests/default.nix index c95d11aefc96..768f07cb8400 100644 --- a/pkgs/development/interpreters/lua-5/tests/default.nix +++ b/pkgs/development/interpreters/lua-5/tests/default.nix @@ -96,4 +96,17 @@ in touch $out ''); + + + /* + Check that a lua package's propagatedBuildInputs end up in LUA_PATH + */ + checkPropagatedBuildInputs = pkgs.runCommandLocal "test-${lua.name}-setup-hook" ({ + # lua-curl is a propagatedBuildInput of rest-nvim has + buildInputs = [ lua.pkgs.rest-nvim ]; + }) ('' + ${lua}/bin/lua -e "require'cURL'" + touch $out + ''); + }) diff --git a/pkgs/development/interpreters/lua-5/utils.sh b/pkgs/development/interpreters/lua-5/utils.sh index 5491f8f7ad2d..2365af08dc9c 100644 --- a/pkgs/development/interpreters/lua-5/utils.sh +++ b/pkgs/development/interpreters/lua-5/utils.sh @@ -1,4 +1,8 @@ -#!/bin/sh +#!/bin/bash + +declare -gA luaPathsSeen=() + +# shellcheck disable=SC2164,SC2041 nix_print() { if [ ${NIX_DEBUG:-0} -ge $1 ]; then echo "$2" @@ -33,10 +37,16 @@ addToLuaSearchPathWithCustomDelimiter() { shopt -u globstar } +# used in setup Hooks to load LUA_PATH and LUA_CPATH +# luaEnvHook +luaEnvHook() { + _addToLuaPath "$1" +} + addToLuaPath() { local dir="$1" - if [[ ! -d "$dir" ]]; then + if [ ! -d "$dir" ]; then nix_debug "$dir not a directory abort" return 0 fi @@ -52,3 +62,74 @@ addToLuaPath() { cd - >/dev/null } + +_addToLuaPath() { + local dir="$1" + + echo "_addToLuaPath called for dir $dir" + + if [[ ! -d "$dir" ]]; then + nix_debug "$dir not a directory abort" + return 0 + fi + +# set -x + # if [ -n "${pythonPathsSeen[$dir]}" ]; then return; fi + if [[ -n "${luaPathsSeen[$dir]:-}" ]]; then + # if [ -n "${luaPathsSeen[$dir]}" ]; then + echo "$dir already parsed" + return + fi + + luaPathsSeen["$dir"]=true + + # shellcheck disable=SC2164 + cd "$dir" + for pattern in @luapathsearchpaths@; do + addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern" + done + + # LUA_CPATH + for pattern in @luacpathsearchpaths@; do + addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern" + done + + cd - >/dev/null + + addToSearchPath program_PATH "$dir"/bin + + # Inspect the propagated inputs (if they exist) and recur on them. + local prop="$dir/nix-support/propagated-build-inputs" + if [ -e "$prop" ]; then + local new_path + for new_path in $(cat $prop); do + echo "newpath: $new_path" + _addToLuaPath "$new_path" + done + fi + +} + +# Builds environment variables like LUA_PATH and PATH walking through closure +# of dependencies. +buildLuaPath() { + local luaPath="$1" + local path + + echo "BUILD_LUA_PATH" + +# # set -x +# # Create an empty table of paths (see doc on loadFromPropagatedInputs +# # for how this is used). Build up the program_PATH and program_LUA_PATH +# # variables. + # declare -gA luaPathsSeen=() +# # shellcheck disable=SC2034 + program_PATH= + luaPathsSeen["@lua@"]=1 +# addToSearchPath program_PATH @lua@/bin + for path in $luaPath; do + _addToLuaPath "$path" + done +} + + diff --git a/pkgs/development/interpreters/lua-5/wrap.sh b/pkgs/development/interpreters/lua-5/wrap.sh index 7d59cf609577..f6868e6faac5 100644 --- a/pkgs/development/interpreters/lua-5/wrap.sh +++ b/pkgs/development/interpreters/lua-5/wrap.sh @@ -9,24 +9,6 @@ wrapLuaPrograms() { wrapLuaProgramsIn "$out/bin" "$out $luaPath" } -# Builds environment variables like LUA_PATH and PATH walking through closure -# of dependencies. -buildLuaPath() { - local luaPath="$1" - local path - - # Create an empty table of paths (see doc on loadFromPropagatedInputs - # for how this is used). Build up the program_PATH and program_LUA_PATH - # variables. - declare -A luaPathsSeen=() - program_PATH= - luaPathsSeen["@lua@"]=1 - addToSearchPath program_PATH @lua@/bin - for path in $luaPath; do - addToLuaPath "$path" - done -} - # with an executable shell script which will set some environment variables # and then call into the original binary (which has been given a .wrapped suffix). # luaPath is a list of directories @@ -47,7 +29,6 @@ wrapLuaProgramsIn() { # Find all regular files in the output directory that are executable. find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do # Rewrite "#! .../env lua" to "#! /nix/store/.../lua". - # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which # Lua to use besides one with this hook anyway. if head -n1 "$f" | grep -q '#!.*/env.*\(lua\)'; then sed -i "$f" -e "1 s^.*/env[ ]*\(lua\)[^ ]*^#! @executable@^" @@ -73,28 +54,3 @@ wrapLuaProgramsIn() { done } - -# Adds the lib and bin directories to the LUA_PATH and PATH variables, -# respectively. Recurses on any paths declared in -# `propagated-native-build-inputs`, while avoiding duplicating paths by -# flagging the directories it has visited in `luaPathsSeen`. -loadFromPropagatedInputs() { - local dir="$1" - # Stop if we've already visited here. - if [ -n "${luaPathsSeen[$dir]}" ]; then - return - fi - luaPathsSeen[$dir]=1 - - addToLuaPath "$dir" - addToSearchPath program_PATH $dir/bin - - # Inspect the propagated inputs (if they exist) and recur on them. - local prop="$dir/nix-support/propagated-native-build-inputs" - if [ -e "$prop" ]; then - local new_path - for new_path in $(cat $prop); do - loadFromPropagatedInputs "$new_path" - done - fi -} diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix index 07ea75605c0f..6eb94b60360b 100644 --- a/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -30,7 +30,7 @@ let fi mkdir -p "$out/bin" - addToLuaPath "$out" + buildLuaPath "$out" # take every binary from lua packages and put them into the env for path in ${lib.concatStringsSep " " paths}; do diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 3b98e8c79014..25f3332b2602 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { setupHook = builtins.toFile "lua-setup-hook" '' source @out@/nix-support/utils.sh - addEnvHooks "$hostOffset" addToLuaPath + addEnvHooks "$hostOffset" luaEnvHook ''; # copied from python diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index e50bdfd13741..d3e051e96bb2 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.20"; - hash = "sha256-Xexvphx7nEeqHXZma+ZR8mQu0rz2zYY4xX41cc4qrGE="; + version = "8.2.21"; + hash = "sha256-+Ydv59TZbUGs7RmbWKH3rntmVd3JJnMTX+3tf2k5138="; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index ae4ad6e949b1..53c720a01346 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.3.8"; - hash = "sha256-9KbLAFrhF6uobCBEkyz1Y4maLpd6wJeBqnSyFh3cVjs="; + version = "8.3.9"; + hash = "sha256-lu3G2Ct1A6ZlBUH8R3q9VFbfKN+qjJOI/54x2f4eMRI="; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch b/pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch new file mode 100644 index 000000000000..a978413a676a --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch @@ -0,0 +1,53 @@ +From 04bfb877c8ccbd431dcae429abb487c1e3390801 Mon Sep 17 00:00:00 2001 +From: Yureka +Date: Sun, 30 Jun 2024 09:37:49 +0200 +Subject: [PATCH] Fix build with _PY_SHORT_FLOAT_REPR == 0 + +--- + Include/internal/pycore_dtoa.h | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/Include/internal/pycore_dtoa.h b/Include/internal/pycore_dtoa.h +index 4d9681d59a..899d413b05 100644 +--- a/Include/internal/pycore_dtoa.h ++++ b/Include/internal/pycore_dtoa.h +@@ -11,8 +11,6 @@ extern "C" { + #include "pycore_pymath.h" // _PY_SHORT_FLOAT_REPR + + +-#if _PY_SHORT_FLOAT_REPR == 1 +- + typedef uint32_t ULong; + + struct +@@ -22,15 +20,15 @@ Bigint { + ULong x[1]; + }; + +-#ifdef Py_USING_MEMORY_DEBUGGER ++#if defined(Py_USING_MEMORY_DEBUGGER) || _PY_SHORT_FLOAT_REPR == 0 + + struct _dtoa_state { + int _not_used; + }; +-#define _dtoa_interp_state_INIT(INTERP) \ ++#define _dtoa_state_INIT(INTERP) \ + {0} + +-#else // !Py_USING_MEMORY_DEBUGGER ++#else // !Py_USING_MEMORY_DEBUGGER && _PY_SHORT_FLOAT_REPR != 0 + + /* The size of the Bigint freelist */ + #define Bigint_Kmax 7 +@@ -65,8 +63,6 @@ PyAPI_FUNC(char *) _Py_dg_dtoa(double d, int mode, int ndigits, + int *decpt, int *sign, char **rve); + PyAPI_FUNC(void) _Py_dg_freedtoa(char *s); + +-#endif // _PY_SHORT_FLOAT_REPR == 1 +- + #ifdef __cplusplus + } + #endif +-- +2.45.1 + diff --git a/pkgs/development/interpreters/python/cpython/3.13/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch b/pkgs/development/interpreters/python/cpython/3.13/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch new file mode 100644 index 000000000000..1c9f8b1c4335 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.13/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch @@ -0,0 +1,53 @@ +From 94d8a9efe6ec86a6e5b4806dbfb82ac926286456 Mon Sep 17 00:00:00 2001 +From: Yureka +Date: Sun, 30 Jun 2024 09:45:58 +0200 +Subject: [PATCH] Fix build with _PY_SHORT_FLOAT_REPR == 0 + +--- + Include/internal/pycore_dtoa.h | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/Include/internal/pycore_dtoa.h b/Include/internal/pycore_dtoa.h +index c5cfdf4ce8..e4222c5267 100644 +--- a/Include/internal/pycore_dtoa.h ++++ b/Include/internal/pycore_dtoa.h +@@ -11,8 +11,6 @@ extern "C" { + #include "pycore_pymath.h" // _PY_SHORT_FLOAT_REPR + + +-#if _PY_SHORT_FLOAT_REPR == 1 +- + typedef uint32_t ULong; + + struct +@@ -22,15 +20,15 @@ Bigint { + ULong x[1]; + }; + +-#ifdef Py_USING_MEMORY_DEBUGGER ++#if defined(Py_USING_MEMORY_DEBUGGER) || _PY_SHORT_FLOAT_REPR == 0 + + struct _dtoa_state { + int _not_used; + }; +-#define _dtoa_interp_state_INIT(INTERP) \ ++#define _dtoa_state_INIT(INTERP) \ + {0} + +-#else // !Py_USING_MEMORY_DEBUGGER ++#else // !Py_USING_MEMORY_DEBUGGER && _PY_SHORT_FLOAT_REPR != 0 + + /* The size of the Bigint freelist */ + #define Bigint_Kmax 7 +@@ -66,8 +64,6 @@ extern char* _Py_dg_dtoa(double d, int mode, int ndigits, + int *decpt, int *sign, char **rve); + extern void _Py_dg_freedtoa(char *s); + +-#endif // _PY_SHORT_FLOAT_REPR == 1 +- + + extern PyStatus _PyDtoa_Init(PyInterpreterState *interp); + extern void _PyDtoa_Fini(PyInterpreterState *interp); +-- +2.45.1 + diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index ab5960b5ea61..5a1172786147 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -367,7 +367,18 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { }; in [ "${mingw-patch}/*.patch" - ]); + ]) ++ optionals (pythonAtLeast "3.12" && (stdenv.hostPlatform != stdenv.buildPlatform) && ( + stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV + )) [ + # backport fix for various platforms; armv7l, riscv64 + # https://github.com/python/cpython/pull/121178 + ( + if (pythonAtLeast "3.13") then + ./3.13/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch + else + ./3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch + ) + ]; postPatch = optionalString (!stdenv.hostPlatform.isWindows) '' substituteInPlace Lib/subprocess.py \ @@ -417,6 +428,9 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { (enableFeature enableGIL "gil") ] ++ optionals enableOptimizations [ "--enable-optimizations" + ] ++ optionals (stdenv.isDarwin && configd == null) [ + # Make conditional on Darwin for now to avoid causing Linux rebuilds. + "py_cv_module__scproxy=n/a" ] ++ optionals (sqlite != null) [ "--enable-loadable-sqlite-extensions" ] ++ optionals (libxcrypt != null) [ diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 08e017fb06e8..c406780e83fc 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -16,14 +16,14 @@ passthruFun = import ./passthrufun.nix args; sources = { - python311 = { + python312 = { sourceVersion = { major = "3"; - minor = "11"; - patch = "9"; + minor = "12"; + patch = "4"; suffix = ""; }; - hash = "sha256-mx6JZSP8UQaREmyGRAbZNgo9Hphqy9pZzaV7Wr2kW4c="; + hash = "sha256-9tQZpth0OrJnAIAbSQjSbZfouYbhT5XeMbMt4rDnlVQ="; }; }; @@ -68,25 +68,25 @@ in { inherit passthruFun; }; - python311 = callPackage ./cpython ({ + python311 = callPackage ./cpython { self = __splicedPackages.python311; - inherit (darwin) configd; - inherit passthruFun; - } // sources.python311); - - python312 = callPackage ./cpython { - self = __splicedPackages.python312; sourceVersion = { major = "3"; - minor = "12"; - patch = "3"; + minor = "11"; + patch = "9"; suffix = ""; }; - hash = "sha256-Vr/vH9/BIhzmcg5DpmHj60F4XdkUzplpjYx4lq9L2qE="; + hash = "sha256-mx6JZSP8UQaREmyGRAbZNgo9Hphqy9pZzaV7Wr2kW4c="; inherit (darwin) configd; inherit passthruFun; }; + python312 = callPackage ./cpython ({ + self = __splicedPackages.python312; + inherit (darwin) configd; + inherit passthruFun; + } // sources.python312); + python313 = callPackage ./cpython { self = __splicedPackages.python313; sourceVersion = { @@ -123,7 +123,7 @@ in { enableOptimizations = false; enableLTO = false; mimetypesSupport = false; - } // sources.python311)).overrideAttrs(old: { + } // sources.python312)).overrideAttrs(old: { # TODO(@Artturin): Add this to the main cpython expr strictDeps = true; pname = "python3-minimal"; diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh index 7172ac498545..b65d6e745247 100644 --- a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh @@ -6,8 +6,13 @@ pythonImportsCheckPhase () { if [ -n "$pythonImportsCheck" ]; then echo "Check whether the following modules can be imported: $pythonImportsCheck" - export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" - ( cd $out && eval "@pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ[\"pythonImportsCheck\"].split()))'" ) + pythonImportsCheckOutput=$out + if [ -n "$python" ]; then + echo "Using python specific output \$python for imports check" + pythonImportsCheckOutput=$python + fi + export PYTHONPATH="$pythonImportsCheckOutput/@pythonSitePackages@:$PYTHONPATH" + ( cd $pythonImportsCheckOutput && eval "@pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ[\"pythonImportsCheck\"].split()))'" ) fi } diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 4c45d9603be8..0d6ab2224991 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -17,6 +17,7 @@ , pythonImportsCheckHook , pythonNamespacesHook , pythonOutputDistHook +, pythonRelaxDepsHook , pythonRemoveBinBytecodeHook , pythonRemoveTestsDirHook , pythonRuntimeDepsCheckHook @@ -144,7 +145,7 @@ in , meta ? {} -, doCheck ? config.doCheckByDefault or false +, doCheck ? true , disabledTestPaths ? [] @@ -252,6 +253,8 @@ let # because the hook that checks for conflicts uses setuptools. # pythonCatchConflictsHook + ] ++ optionals (attrs ? pythonRelaxDeps || attrs ? pythonRemoveDeps) [ + pythonRelaxDepsHook ] ++ optionals removeBinBytecode [ pythonRemoveBinBytecodeHook ] ++ optionals (hasSuffix "zip" (attrs.src.name or "")) [ diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index 1a6f9c784cf6..d0d8a9d0dca8 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -92,7 +92,7 @@ , passthru ? {} -, doCheck ? config.doCheckByDefault or false +, doCheck ? true , disabledTestPaths ? [] diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index fbc096502fa7..555d15b8ca4d 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -319,14 +319,17 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t tag_url = str(release["tarball_url"]).replace( "tarball", "tarball/refs/tags" ) - hash = ( - subprocess.check_output( - ["nix-prefetch-url", "--type", "sha256", "--unpack", tag_url], - stderr=subprocess.DEVNULL, + try: + hash = ( + subprocess.check_output( + ["nix-prefetch-url", "--type", "sha256", "--unpack", tag_url], + stderr=subprocess.DEVNULL, + ) + .decode("utf-8") + .strip() ) - .decode("utf-8") - .strip() - ) + except subprocess.CalledProcessError: + raise ValueError("nix-prefetch-url failed") return version, hash, prefix diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index bb0b8bcdcae8..8ea91a46dd57 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2024.01"; + version = "2024.06"; src = fetchFromGitHub { owner = "rakudo"; repo = "rakudo"; rev = version; - hash = "sha256-E4YwLds0eoh8PxcACntynQKeg8lRIsEy+JOiv8nF2t0="; + hash = "sha256-6XWfM7KJB+lMf/YFLaQ71DMa8owZtjjuMEyWY++CJnM="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index dbe678079f02..704d75b73bbc 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2024.01"; + version = "2024.06"; src = fetchFromGitHub { owner = "moarvm"; repo = "moarvm"; rev = version; - hash = "sha256-vU1fhR6pKz2qnznrJ/mknt9DVx+I1kLaPStXKQvp59g="; + hash = "sha256-y+xtJ4YbzPr1168tu+148Co7Ke/iC68aOQBwTINlp2Y="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 75d4964d15b9..fafc53267dd8 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2024.01"; + version = "2024.06"; src = fetchFromGitHub { owner = "raku"; repo = "nqp"; rev = version; - hash = "sha256-vcGj+PKCpCRLyjS158+U42BppJ0Yl53srZCde+fng0c="; + hash = "sha256-FqZPUtzlS+ZSlyuCFMWHofLXPuXCWAT6Oak0g3o8cgM="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rune/default.nix b/pkgs/development/interpreters/rune/default.nix index 93a102da07d1..e6bdf5ea059d 100644 --- a/pkgs/development/interpreters/rune/default.nix +++ b/pkgs/development/interpreters/rune/default.nix @@ -7,15 +7,15 @@ rustPlatform.buildRustPackage rec { pname = "rune"; - version = "0.13.2"; + version = "0.13.3"; src = fetchCrate { pname = "rune-cli"; inherit version; - hash = "sha256-Xk4gUBxDdnW2AIEvMaEjzVsqCQFK9B/Wyg7RpJ/hbrA="; + hash = "sha256-nrHduxHSX31nwqcBbgPT4WH64LXTruScocpqex4zxf4="; }; - cargoHash = "sha256-hpJ++mzP2QFE/iHZQvcjT03xPnyPYw7EgsL8NwxrZVQ="; + cargoHash = "sha256-EjUzXb2r6lKV1fBL7KdseC9vmW2L0AjpowYo4j8Xpv8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 79cad7fe6447..b69658ff03c7 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -71,7 +71,7 @@ mkDerivation rec { description = "Programming language for real time audio synthesis"; homepage = "https://supercollider.github.io"; changelog = "https://github.com/supercollider/supercollider/blob/Version-${version}/CHANGELOG.md"; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix index 2881922aa1b2..492033c52c70 100644 --- a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix +++ b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Community plugins for SuperCollider"; homepage = "https://supercollider.github.io/sc3-plugins/"; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 4b855186bc31..b021c43ab9d7 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FxbODuIWGHdhGAt6EFDwrashmYFy+ldkfUucUkLzyms="; + hash = "sha256-k0XyVdSbb0sP4CwU6q0yiY+Ki6don742hCmL0zaj1tQ="; }; - cargoHash = "sha256-ZPYqMXzX7yMaNrFUKuvUPyfQovd/E5/3T3n535oD+Tw="; + cargoHash = "sha256-5OxBrYCNBBr7d+wdnJma/RJ3P9vc+nRVrzFGu8UmPWc="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/development/julia-modules/depot.nix b/pkgs/development/julia-modules/depot.nix index c2189ebaf94c..017bc19acd50 100644 --- a/pkgs/development/julia-modules/depot.nix +++ b/pkgs/development/julia-modules/depot.nix @@ -56,6 +56,7 @@ runCommand "julia-depot" { # See https://github.com/NixOS/nixpkgs/issues/315890 git config --global --add safe.directory '*' + # Tell Julia to use the Git binary we provide, rather than internal libgit2. export JULIA_PKG_USE_CLI_GIT="true" # At time of writing, this appears to be the only way to turn precompiling's diff --git a/pkgs/development/julia-modules/package-closure.nix b/pkgs/development/julia-modules/package-closure.nix index d1138394e993..bb0b08b33e41 100644 --- a/pkgs/development/julia-modules/package-closure.nix +++ b/pkgs/development/julia-modules/package-closure.nix @@ -42,8 +42,9 @@ let resolveCode1_8 = '' import Pkg.API: handle_package_input! - import Pkg.Types: PRESERVE_NONE, project_deps_resolve!, registry_resolve!, stdlib_resolve!, ensure_resolved + import Pkg.Types: PRESERVE_NONE, UUID, VersionSpec, project_deps_resolve!, registry_resolve!, stdlib_resolve!, ensure_resolved import Pkg.Operations: _resolve, assert_can_add, update_package_add + import TOML foreach(handle_package_input!, pkgs) @@ -54,6 +55,18 @@ let for pkg in pkgs if pkg.name in keys(overrides) pkg.path = overrides[pkg.name] + + # Try to read the UUID from $(pkg.path)/Project.toml. If successful, put the package into ctx.env.project.deps. + # This is necessary for the ensure_resolved call below to succeed, and will allow us to use an override even + # if it does not appear in the registry. + # See https://github.com/NixOS/nixpkgs/issues/279853 + project_toml = joinpath(pkg.path, "Project.toml") + if isfile(project_toml) + toml_data = TOML.parsefile(project_toml) + if haskey(toml_data, "uuid") + ctx.env.project.deps[pkg.name] = UUID(toml_data["uuid"]) + end + end end end diff --git a/pkgs/development/julia-modules/python/minimal_registry.py b/pkgs/development/julia-modules/python/minimal_registry.py index c9527f0ef809..bdab0716ef89 100755 --- a/pkgs/development/julia-modules/python/minimal_registry.py +++ b/pkgs/development/julia-modules/python/minimal_registry.py @@ -56,7 +56,8 @@ for (uuid, versions) in uuid_to_versions.items(): # Write nothing in Compat.toml, because we've already resolved everything with open(out_path / path / Path("Deps.toml"), "w") as f: f.write('["%s"]\n' % info["version"]) - toml.dump(project["deps"], f) + if "deps" in project: + toml.dump(project["deps"], f) with open(out_path / path / Path("Versions.toml"), "w") as f: f.write('["%s"]\n' % info["version"]) f.write('git-tree-sha1 = "%s"\n' % info["treehash"]) @@ -75,7 +76,7 @@ for (uuid, versions) in uuid_to_versions.items(): os.makedirs(out_path / path) # Copy some files to the minimal repo unchanged - for f in ["Compat.toml", "Deps.toml"]: + for f in ["Compat.toml", "Deps.toml", "WeakCompat.toml", "WeakDeps.toml"]: if (registry_path / path / f).exists(): shutil.copy2(registry_path / path / f, out_path / path) diff --git a/pkgs/development/julia-modules/registry.nix b/pkgs/development/julia-modules/registry.nix index 71d0a2733e8c..6daca3d17b42 100644 --- a/pkgs/development/julia-modules/registry.nix +++ b/pkgs/development/julia-modules/registry.nix @@ -3,7 +3,7 @@ fetchFromGitHub { owner = "CodeDownIO"; repo = "General"; - rev = "de80ad56e87f222ca6a7a517c69039d35437ab42"; - sha256 = "0pz1jmmcb2vn854w8w0zlpnihi470649cd8djh1wzgq2i2fy83bl"; - # date = "2023-12-22T03:28:12+00:00"; + rev = "998c6da1553dc0776dfff314d2f1bd5af488ed71"; + sha256 = "sha256-57RiIPTu9895mdk3oSfo7I3PYw7G0BfJG1u+mYkJeLk="; + # date = "2024-07-01T12:22:35+00:00"; } diff --git a/pkgs/development/julia-modules/tests/julia-top-n/app/Main.hs b/pkgs/development/julia-modules/tests/julia-top-n/app/Main.hs index 55f5fd3cfeef..c8d935a608b8 100644 --- a/pkgs/development/julia-modules/tests/julia-top-n/app/Main.hs +++ b/pkgs/development/julia-modules/tests/julia-top-n/app/Main.hs @@ -5,6 +5,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE QuasiQuotes #-} +{-# LANGUAGE RankNTypes #-} {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ViewPatterns #-} @@ -19,7 +20,7 @@ import qualified Data.Aeson.KeyMap as HM import qualified Data.ByteString.Lazy.Char8 as BL8 import qualified Data.List as L import Data.String.Interpolate -import Data.Text as T +import Data.Text as T hiding (count) import qualified Data.Vector as V import qualified Data.Yaml as Yaml import GHC.Generics @@ -60,34 +61,55 @@ julia = Label main :: IO () main = do clo <- parseCommandLineArgs argsParser (return ()) - let Args {..} = optUserOptions clo + let args@(Args {..}) = optUserOptions clo namesAndCounts :: [NameAndCount] <- Yaml.decodeFileEither countFilePath >>= \case Left err -> throwIO $ userError ("Couldn't decode names and counts YAML file: " <> show err) Right x -> pure x - runSandwichWithCommandLineArgs' defaultOptions argsParser $ + runSandwichWithCommandLineArgs' defaultOptions argsParser $ do + miscTests args + describe ("Building environments for top " <> show topN <> " Julia packages") $ parallelN parallelism $ forM_ (L.take topN namesAndCounts) $ \(NameAndCount {..}) -> - introduce' (defaultNodeOptions { nodeOptionsVisibilityThreshold = 0 }) (T.unpack name) julia (newMVar Nothing) (const $ return ()) $ do - it "Builds" $ do - let cp = proc "nix" ["build", "--impure", "--no-link", "--json", "--expr" - , [i|with import ../../../../. {}; #{juliaAttr}.withPackages ["#{name}"]|] - ] - output <- readCreateProcessWithLogging cp "" - juliaPath <- case A.eitherDecode (BL8.pack output) of - Right (A.Array ((V.!? 0) -> Just (A.Object (aesonLookup "outputs" -> Just (A.Object (aesonLookup "out" -> Just (A.String t))))))) -> pure (JuliaPath ((T.unpack t) "bin" "julia")) - x -> expectationFailure ("Couldn't parse output: " <> show x) + testExpr args name [i|#{juliaAttr}.withPackages ["#{name}"]|] - getContext julia >>= flip modifyMVar_ (const $ return (Just juliaPath)) +miscTests :: Args -> SpecFree ctx IO () +miscTests args@(Args {..}) = describe "Misc tests" $ do + describe "works for a package outside the General registry" $ do + testExpr args "HelloWorld" [iii|(#{juliaAttr}.withPackages.override { + packageOverrides = { + "HelloWorld" = pkgs.fetchFromGitHub { + owner = "codedownio"; + repo = "HelloWorld.jl"; + rev = "9b41c55df76eb87830dd3bd0b5601ee2582a37c6"; + sha256 = "sha256-G+xpMRb0RopW/xWA8KCFF/S8wuHTQbpj0qwm9CihfSc="; + }; + }; + }) [ "HelloWorld" ]|] - it "Uses" $ do - getContext julia >>= readMVar >>= \case - Nothing -> expectationFailure "Build step failed." - Just (JuliaPath juliaPath) -> do - let cp = proc juliaPath ["-e", "using " <> T.unpack name] - createProcessWithLogging cp >>= waitForProcess >>= (`shouldBe` ExitSuccess) +-- * Low-level -aesonLookup :: Text -> HM.KeyMap v -> Maybe v -aesonLookup = HM.lookup . A.fromText +testExpr :: Args -> Text -> String -> SpecFree ctx IO () +testExpr _args name expr = do + introduce' (defaultNodeOptions { nodeOptionsVisibilityThreshold = 0 }) (T.unpack name) julia (newMVar Nothing) (const $ return ()) $ do + it "Builds" $ do + let cp = proc "nix" ["build", "--impure", "--no-link", "--json", "--expr", [i|with import ../../../../. {}; #{expr}|]] + output <- readCreateProcessWithLogging cp "" + juliaPath <- case A.eitherDecode (BL8.pack output) of + Right (A.Array ((V.!? 0) -> Just (A.Object (aesonLookup "outputs" -> Just (A.Object (aesonLookup "out" -> Just (A.String t))))))) -> pure (JuliaPath ((T.unpack t) "bin" "julia")) + x -> expectationFailure ("Couldn't parse output: " <> show x) + + getContext julia >>= flip modifyMVar_ (const $ return (Just juliaPath)) + + it "Uses" $ do + getContext julia >>= readMVar >>= \case + Nothing -> expectationFailure "Build step failed." + Just (JuliaPath juliaPath) -> do + let cp = proc juliaPath ["-e", "using " <> T.unpack name] + createProcessWithLogging cp >>= waitForProcess >>= (`shouldBe` ExitSuccess) + + where + aesonLookup :: Text -> HM.KeyMap v -> Maybe v + aesonLookup = HM.lookup . A.fromText diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 91903c9f6851..816afa176754 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -58,13 +58,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.30.3"; + version = "2.30.4"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-ycY/AkWulV3vAu/+vKw+j/b6jTZWjqKjIgjRwqNHFl8="; + hash = "sha256-RhqbmS+mPVlXlo4/jrqPqtyGzvfaPTozlUEeAjHUBoA="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/development/libraries/SDL_compat/default.nix index 3c3df10f9167..8b0cd67f79c4 100644 --- a/pkgs/development/libraries/SDL_compat/default.nix +++ b/pkgs/development/libraries/SDL_compat/default.nix @@ -9,7 +9,6 @@ , autoSignDarwinBinariesHook , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported -, libGL , libGLU }: @@ -33,7 +32,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ SDL2 ] ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ] - ++ optionals openglSupport [ libGL libGLU ]; + ++ optionals openglSupport [ libGLU ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/agda/generics/default.nix b/pkgs/development/libraries/agda/generics/default.nix new file mode 100644 index 000000000000..12815a3617bc --- /dev/null +++ b/pkgs/development/libraries/agda/generics/default.nix @@ -0,0 +1,28 @@ +{ lib, mkDerivation, fetchFromGitHub, standard-library }: + +mkDerivation rec { + pname = "generics"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "flupe"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-B1eT6F0Dp2zto50ulf+K/KYMlMp8Pgc/tO9qkcqn+O8="; + }; + + buildInputs = [ + standard-library + ]; + + # everythingFile = "./README.agda"; + + meta = with lib; { + description = + "Library for datatype-generic programming in Agda"; + homepage = src.meta.homepage; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ turion ]; + }; +} diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 87df1e7f6aec..53051eb2a310 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "assimp"; - version = "5.4.1"; + version = "5.4.2"; outputs = [ "out" "lib" "dev" ]; src = fetchFromGitHub { owner = "assimp"; repo = "assimp"; rev = "v${version}"; - hash = "sha256-F3aaEaHZyOLES6zOYqHRG0BtaKk9d/bAHCtal6FsIWc="; + hash = "sha256-4KpqH3rSNSTAXMFPWAvGTZA4jzKIChHFdtW97sK2EyY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 6702eb91c9b1..a3e4a120e9ad 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, alsa-lib, fftw, libjack2, libsamplerate -, libsndfile, pkg-config, python3, wafHook +, libsndfile, pkg-config, python311, wafHook }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"; }; - nativeBuildInputs = [ pkg-config python3 wafHook ]; + nativeBuildInputs = [ pkg-config python311 wafHook ]; buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ]; strictDeps = true; diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index 0f4c3509244d..8e32ae89502b 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.7"; + version = "0.7.8"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-WMaiiXISaCim9ljghK7nqo+L/bdaC9DjRcf/Km2e8Iw="; + hash = "sha256-h3eMgEaiJsbL+xFPTI4+J8Eht7PczOXLfeRYmSUCdMw="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 6214b65189d3..df63737474eb 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,20 +1,68 @@ -{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom -, wafHook -, withQt5 ? true, qt5 ? null +{ + stdenv, + lib, + fetchFromGitLab, + + # build time + pkg-config, + meson, + ninja, + + # runtime + lv2, + + # options + withGtk2 ? false, + gtk2, + withGtk3 ? true, + gtk3, + withQt5 ? true, + qt5, + withX11 ? !stdenv.isDarwin, }: +let + inherit (lib) mesonEnable; +in + stdenv.mkDerivation rec { pname = "suil"; - version = "0.10.6"; + version = "0.10.20"; - src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06"; + src = fetchFromGitLab { + owner = "lv2"; + repo = "suil"; + rev = "v${version}"; + hash = "sha256-rP8tq+zmHrAZeuNttakPPfraFXNvnwqbhtt+LtTNV/k="; }; - nativeBuildInputs = [ pkg-config wafHook python3 ]; - buildInputs = [ gtk2 lv2 serd sord sratom ] - ++ lib.optionals withQt5 (with qt5; [ qtbase qttools ]); + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + mesonFlags = [ + # docs require sphinxygen + (mesonEnable "docs" false) + (mesonEnable "gtk2" withGtk2) + (mesonEnable "gtk3" withGtk3) + (mesonEnable "qt5" withQt5) + (mesonEnable "x11" withX11) + ]; + + buildInputs = + [ lv2 ] + ++ lib.optionals withGtk2 [ gtk2 ] + ++ lib.optionals withGtk3 [ gtk3 ] + ++ lib.optionals withQt5 ( + with qt5; + [ + qtbase + qttools + ] + ++ lib.optionals withX11 [ qtx11extras ] + ); dontWrapQtApps = true; diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix index 198d94dbee7e..6f64f869249c 100644 --- a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix +++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ]; - enableParallelBuilding = true; + # build is susceptible to race conditions: https://github.com/vamp-plugins/vamp-plugin-sdk/issues/12 + enableParallelBuilding = false; makeFlags = [ "AR:=$(AR)" "RANLIB:=$(RANLIB)" diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 8b1195442963..ce9a3d118973 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -2,7 +2,7 @@ , lib , autoreconfHook , gitUpdater -, gnome +, gnome-common , which , fetchgit , libgtop @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { autoreconfHook dbus docbook_xsl - gnome.gnome-common + gnome-common gobject-introspection gtk-doc pkg-config diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index c2611a8b8dff..2008cab52ac3 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -4,7 +4,7 @@ , cmake , libGLU , libGL -, freeglut +, libglut , libX11 , libXcursor , libXinerama @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libGLU libGL - freeglut + libglut libX11 libXcursor libXinerama diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index dc0e1d304eea..5ba9186dcac9 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -4,7 +4,7 @@ , cmake , libGLU , libGL -, freeglut +, libglut , Cocoa , OpenGL }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] + buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL libglut ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; postPatch = '' diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index 7d601e857001..c5f6f3a436d2 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut +{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, libglut , Cocoa, OpenGL }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] + buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL libglut ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; patches = [ ./gwen-narrowing.patch ]; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 3879878e4779..500b868edc07 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.19.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - hash = "sha256-Nb/BF/+xDWV/6iPo3o/NO6EtIaAW+yGFj06AO2baFfc="; + hash = "sha256-woyl6HcUGOB3WWiNVMrmrpDAePFTzNtqK9V4UOzDb50="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index 6211a801d0f9..3ad9c33bb3cf 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.9.2"; + version = "0.9.4"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-jaG+XGbSx5SaNhGFWLh+1WTB+ya3c5tBZYs9xKIRafI="; + sha256 = "sha256-VQgnc3DSZoY1ounc9fj3Mju52noI0JZ7ck8FqWpEgY8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 1cb32dc8ee4b..a0b34f0aa30f 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, freeglut, libGLU, libGL, glfw2, glew, libX11, xorgproto +{ lib, stdenv, fetchurl, cmake, libglut, libGLU, libGL, glfw2, glew, libX11, xorgproto , libXi, libXmu, fetchpatch, libXrandr }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = - [ freeglut libGLU libGL glfw2 glew libX11 xorgproto libXi libXmu libXrandr ]; + [ libglut libGLU libGL glfw2 glew libX11 xorgproto libXi libXmu libXrandr ]; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index bc738ae976c9..93fcbf42c050 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.24.9"; + version = "5.25.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-L0F9CkA/yWl7YfJtSBvSGSLTh2g7loIlpZMiC/ACU2k="; + sha256 = "sha256-ECTtKx/N5MfWwYSwOycs6FXxDR56DT9tkdRxrhX4fVU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix index 2b98aca1d66d..b26e630f1eae 100644 --- a/pkgs/development/libraries/crossguid/default.nix +++ b/pkgs/development/libraries/crossguid/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Lightweight cross platform C++ GUID/UUID library"; license = licenses.mit; homepage = "https://github.com/graeme-hill/crossguid"; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/ctypes_sh/default.nix b/pkgs/development/libraries/ctypes_sh/default.nix index 56b463087f3d..f3c78567efc1 100644 --- a/pkgs/development/libraries/ctypes_sh/default.nix +++ b/pkgs/development/libraries/ctypes_sh/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mainProgram = "ctypes.sh"; homepage = "https://github.com/taviso/ctypes.sh"; license = licenses.mit; - maintainers = with maintainers; [ tadeokondrak ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/pkgs/development/libraries/discord-rpc/default.nix index 213096f5abf1..4fa74b57404c 100644 --- a/pkgs/development/libraries/discord-rpc/default.nix +++ b/pkgs/development/libraries/discord-rpc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Official library to interface with the Discord client"; homepage = "https://github.com/discordapp/discord-rpc"; license = licenses.mit; - maintainers = with maintainers; [ tadeokondrak ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index e7915ad65214..cf120405a5fa 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -57,23 +57,13 @@ ] ++ lib.optionals guiSupport [ libX11 ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_cudart.dev - cuda_cudart.lib - cuda_cudart.static - cuda_nvcc.dev - libcublas.dev - libcublas.lib - libcublas.static - libcurand.dev - libcurand.lib - libcurand.static - libcusolver.dev - libcusolver.lib - libcusolver.static - cudnn.dev - cudnn.lib - cudnn.static - cuda_cccl.dev + cuda_cudart + cuda_nvcc + libcublas + libcurand + libcusolver + cudnn + cuda_cccl ]); passthru = { diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 1597375cf769..21c18dde6e33 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.35.0"; + version = "2.36.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - hash = "sha256-FoiPtmebHiQfULafMArFASSjGSNCri6pA9diG2ZOeeo="; + hash = "sha256-2nQUOmSyvuol6ifGOHW8jsKU5p5b0Ih4AgQOsEFR15o="; }; postPatch = '' diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 2fa7aec062f3..69cab2ca5b61 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -9,8 +9,18 @@ , hspell , nuspell , unittest-cpp + +, withHspell ? true +, withAspell ? true +, withHunspell ? true +, withNuspell ? true +, withAppleSpell ? stdenv.isDarwin + +, Cocoa }: +assert withAppleSpell -> stdenv.isDarwin; + stdenv.mkDerivation rec { pname = "enchant"; version = "2.6.9"; @@ -31,8 +41,12 @@ stdenv.mkDerivation rec { buildInputs = [ glib + ] ++ lib.optionals withHunspell [ hunspell + ] ++ lib.optionals withNuspell [ nuspell + ] ++ lib.optionals withAppleSpell [ + Cocoa ]; checkInputs = [ @@ -40,8 +54,9 @@ stdenv.mkDerivation rec { ]; # libtool puts these to .la files - propagatedBuildInputs = [ + propagatedBuildInputs = lib.optionals withHspell [ hspell + ] ++ lib.optionals withAspell [ aspell ]; @@ -51,10 +66,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-relocatable" # needed for tests - "--with-aspell" - "--with-hspell" - "--with-hunspell" - "--with-nuspell" + (lib.withFeature withAspell "aspell") + (lib.withFeature withHspell "hspell") + (lib.withFeature withHunspell "hunspell") + (lib.withFeature withNuspell "nuspell") + (lib.withFeature withAppleSpell "applespell") ]; meta = with lib; { diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index b32bffb2b575..1591b8021501 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.28.2"; + version = "0.28.3"; outputs = [ "out" "lib" "dev" "doc" "man" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - hash = "sha256-0TgvIiuHMeohStIwmHOq4yvTj2H07wyx4w3iIdkrLTc="; + hash = "sha256-KD3kkIQXPcjCVZZrmbn93xYbJ8ryG0mLFbkO5AVqnTw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 41775b0a9a53..aef6f10febe2 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "24.06"; + version = "24.07"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-na2aTcxrS8vHTw80zCAefY8zEQ9EMD/iTQp9l4wkIrI="; + sha256 = "sha256-2J03W2jyQKD1QYRJoOZlIKElsZNqPMQ1AxAoFhWz1eU="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/fcgi/gcc-4.4.diff b/pkgs/development/libraries/fcgi/gcc-4.4.diff deleted file mode 100644 index c6806c12c067..000000000000 --- a/pkgs/development/libraries/fcgi/gcc-4.4.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libfcgi/fcgio.cpp b/libfcgi/fcgio.cpp -index 95e28ca..a7eda0e 100644 ---- a/libfcgi/fcgio.cpp -+++ b/libfcgi/fcgio.cpp -@@ -23,6 +23,7 @@ - #endif - - #include -+#include - #include "fcgio.h" - - using std::streambuf; diff --git a/pkgs/development/libraries/ffmpeg/5.1.4-CVE-2023-49502.patch b/pkgs/development/libraries/ffmpeg/5.1.4-CVE-2023-49502.patch new file mode 100644 index 000000000000..ca8b8b4d15bd --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/5.1.4-CVE-2023-49502.patch @@ -0,0 +1,26 @@ +Based on upstream 737ede405b11a37fdd61d19cf25df296a0cb0b75, with cuda and +vulkan implementations removed, bwdif adjusted to apply to 5.1.4 + +diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c +index 65c617ebb3..35c864f71e 100644 +--- a/libavfilter/vf_bwdif.c ++++ b/libavfilter/vf_bwdif.c +@@ -333,13 +333,14 @@ static int config_props(AVFilterLink *link) + if(yadif->mode&1) + link->frame_rate = av_mul_q(link->src->inputs[0]->frame_rate, (AVRational){2,1}); + +- if (link->w < 3 || link->h < 4) { +- av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or 4 lines is not supported\n"); ++ yadif->csp = av_pix_fmt_desc_get(link->format); ++ yadif->filter = filter; ++ ++ if (AV_CEIL_RSHIFT(link->w, yadif->csp->log2_chroma_w) < 3 || AV_CEIL_RSHIFT(link->h, yadif->csp->log2_chroma_h) < 4) { ++ av_log(ctx, AV_LOG_ERROR, "Video with planes less than 3 columns or 4 lines is not supported\n"); + return AVERROR(EINVAL); + } + +- yadif->csp = av_pix_fmt_desc_get(link->format); +- yadif->filter = filter; + if (yadif->csp->comp[0].depth > 8) { + s->filter_intra = filter_intra_16bit; + s->filter_line = filter_line_c_16bit; diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 5bd9171275be..88b5564ecba4 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -12,6 +12,7 @@ let CoreImage VideoToolbox ; + inherit (darwin) xcode; } // (initArgs // { inherit ffmpegVariant; }) ); diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 7496cb4de0e7..6d54d63c6ca8 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -73,6 +73,7 @@ , withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding , withLadspa ? withFullDeps # LADSPA audio filtering , withLzma ? withHeadlessDeps # xz-utils +, withMetal ? false # Unfree and requires manual downloading of files , withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx , withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder @@ -106,6 +107,7 @@ , withSvtav1 ? withHeadlessDeps && !stdenv.isAarch64 && !stdenv.hostPlatform.isMinGW # AV1 encoder/decoder (focused on speed and correctness) , withTensorflow ? false # Tensorflow dnn backend support (Increases closure size by ~390 MiB) , withTheora ? withHeadlessDeps # Theora encoder +, withTwolame ? withFullDeps # MP2 encoding , withV4l2 ? withHeadlessDeps && stdenv.isLinux # Video 4 Linux support , withV4l2M2m ? withV4l2 , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration @@ -288,6 +290,7 @@ , quirc , rav1e , rtmpdump +, twolame , samba , SDL2 , shaderc @@ -317,6 +320,7 @@ , AVFoundation , CoreImage , VideoToolbox +, xcode # unfree contains metalcc and metallib /* * Testing */ @@ -395,22 +399,22 @@ stdenv.mkDerivation (finalAttrs: { --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 ''; - patches = map (patch: fetchpatch2 patch) ([ ] + patches = [] ++ optionals (versionOlder version "5") [ - { + (fetchpatch2 { name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135"; hash = "sha256-agJgzIzrBTQBAypuCmGXXFo7vw6Iodw5Ny5O5QCKCn8="; - } - { + }) + (fetchpatch2 { # Backport fix for binutils-2.41. name = "binutils-2.41.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb"; hash = "sha256-vLSltvZVMcQ0CnkU0A29x6fJSywE8/aU+Mp9os8DZYY="; - } + }) # The upstream patch isn’t for ffmpeg 4, but it will apply with a few tweaks. # Fixes a crash when built with clang 16 due to UB in ff_seek_frame_binary. - { + (fetchpatch2 { name = "utils-fix_crash_in_ff_seek_frame_binary.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/ab792634197e364ca1bb194f9abe36836e42f12d"; hash = "sha256-vqqVACjbCcGL9Qvmg1QArSKqVmOqr8BEr+OxTBDt6mA="; @@ -419,60 +423,96 @@ stdenv.mkDerivation (finalAttrs: { --replace libavformat/seek.c libavformat/utils.c \ --replace 'const AVInputFormat *const ' 'const AVInputFormat *' ''; - } + }) ] - ++ (lib.optionals (lib.versionAtLeast version "5" && lib.versionOlder version "6") [ - { + ++ optionals (lib.versionAtLeast version "5" && lib.versionOlder version "6") [ + (fetchpatch2 { name = "fix_build_failure_due_to_libjxl_version_to_new"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/75b1a555a70c178a9166629e43ec2f6250219eb2"; hash = "sha256-+2kzfPJf5piim+DqEgDuVEEX5HLwRsxq0dWONJ4ACrU="; - } - { + }) + (fetchpatch2 { name = "5.x-CVE-2024-31585.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/8711cea3841fc385cccb1e7255176479e865cd4d"; hash = "sha256-WT+ly/l04yM/tRVbhkESA3sDDjwvtd/Cg2y8tQo4ApI="; - } - { + }) + (fetchpatch2 { name = "CVE-2024-31582.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/99debe5f823f45a482e1dc08de35879aa9c74bd2"; hash = "sha256-+CQ9FXR6Vr/AmsbXFiCUXZcxKj1s8nInEdke/Oc/kUA="; - } - { + }) + (fetchpatch2 { name = "CVE-2024-31578.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/3bb00c0a420c3ce83c6fafee30270d69622ccad7"; hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q="; - } - ]) - ++ (lib.optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [ - { # this can be removed post 6.1 + }) + ./5.1.4-CVE-2023-49502.patch + (fetchpatch2 { + name = "CVE-2023-50008.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/5f87a68cf70dafeab2fb89b42e41a4c29053b89b"; + hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y="; + }) + (fetchpatch2 { + name = "CVE-2023-51793.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/8b8b4bdef311f88c0075a06a25320187aff00bf2"; + hash = "sha256-e7oGyOfUXuA8XK3vfygNtFlHpHl92O2KSLAo50sNJ5o="; + }) + (fetchpatch2 { + name = "CVE-2023-51796.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e01a55c5283b82667dad347331816a5e20869ce9"; + hash = "sha256-m4rq+UFG3nXdgOJ3S6XcruMZ+CPw+twmy2HFv3cnvJc="; + }) + ] + ++ optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [ + (fetchpatch2 { # this can be removed post 6.1 name = "fix_build_failure_due_to_PropertyKey_EncoderID"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475"; hash = "sha256-sxRXKKgUak5vsQTiV7ge8vp+N22CdTIvuczNgVRP72c="; - } - { + }) + (fetchpatch2 { name = "fix_vulkan_av1"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e06ce6d2b45edac4a2df04f304e18d4727417d24"; hash = "sha256-73mlX1rdJrguw7OXaSItfHtI7gflDrFj+7SepVvvUIg="; - } - { + }) + (fetchpatch2 { name = "CVE-2024-31582.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/99debe5f823f45a482e1dc08de35879aa9c74bd2"; hash = "sha256-+CQ9FXR6Vr/AmsbXFiCUXZcxKj1s8nInEdke/Oc/kUA="; - } - { + }) + (fetchpatch2 { name = "CVE-2024-31578.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/3bb00c0a420c3ce83c6fafee30270d69622ccad7"; hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q="; - } - ]) - ++ (lib.optionals (lib.versionAtLeast version "7.0" && lib.versionOlder version "7.0.1") [ - { + }) + (fetchpatch2 { + name = "CVE-2023-49501.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/4adb93dff05dd947878c67784d98c9a4e13b57a7"; + hash = "sha256-7cwktto3fPMDGvCZCVtB01X8Q9S/4V4bDLUICSNfGgw="; + }) + (fetchpatch2 { + name = "CVE-2023-49502.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/737ede405b11a37fdd61d19cf25df296a0cb0b75"; + hash = "sha256-mpSJwR9TX5ENjjCKvzuM/9e1Aj/AOiQW0+72oOMl9v8="; + }) + (fetchpatch2 { + name = "CVE-2023-50007.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/b1942734c7cbcdc9034034373abcc9ecb9644c47"; + hash = "sha256-v0hNcqBtm8GCGAU9UbRUCE0slodOjZCHrkS8e4TrVcQ="; + }) + (fetchpatch2 { + name = "CVE-2023-50008.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/5f87a68cf70dafeab2fb89b42e41a4c29053b89b"; + hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y="; + }) + ] + ++ optionals (lib.versionAtLeast version "7.0" && lib.versionOlder version "7.0.1") [ + (fetchpatch2 { # Will likely be obsolete in >7.0 name = "fate_avoid_dependency_on_samples"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/7b7b7819bd21cc92ac07f6696b0e7f26fa8f9834"; hash = "sha256-TKI289XqtG86Sj9s7mVYvmkjAuRXeK+2cYYEDkg6u6I="; - } - ])); + }) + ]; configurePlatforms = []; setOutputFlags = false; # Only accepts some of them @@ -605,6 +645,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ [ (enableFeature withLadspa "ladspa") (enableFeature withLzma "lzma") + ] ++ optionals (versionAtLeast version "5.0") [ + (enableFeature withMetal "metal") + ] ++ [ (enableFeature withMfx "libmfx") (enableFeature withModplug "libmodplug") (enableFeature withMp3lame "libmp3lame") @@ -643,6 +686,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withSvtav1 "libsvtav1") (enableFeature withTensorflow "libtensorflow") (enableFeature withTheora "libtheora") + (enableFeature withTwolame "libtwolame") (enableFeature withV4l2 "libv4l2") (enableFeature withV4l2M2m "v4l2-m2m") (enableFeature withVaapi "vaapi") @@ -689,6 +733,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ optionals stdenv.cc.isClang [ "--cc=clang" "--cxx=clang++" + ] ++ optionals withMetal [ + "--metalcc=${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metal" + "--metallib=${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metallib" ]; # ffmpeg embeds the configureFlags verbatim in its binaries and because we @@ -697,7 +744,8 @@ stdenv.mkDerivation (finalAttrs: { # such references except for data. postConfigure = let toStrip = map placeholder (lib.remove "data" finalAttrs.outputs) # We want to keep references to the data dir. - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.stdenv.cc; + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.stdenv.cc + ++ lib.optional withMetal xcode; in "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${o}") toStrip)} config.h"; @@ -774,6 +822,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withSvtav1 [ svt-av1 ] ++ optionals withTensorflow [ libtensorflow ] ++ optionals withTheora [ libtheora ] + ++ optionals withTwolame [ twolame ] ++ optionals withV4l2 [ libv4l ] ++ optionals withVaapi [ (if withSmallDeps then libva else libva-minimal) ] ++ optionals withVdpau [ libvdpau ] @@ -882,4 +931,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ atemu arthsmn jopejoe1 ]; mainProgram = "ffmpeg"; }; +} // lib.optionalAttrs withCudaLLVM { + # remove once https://github.com/NixOS/nixpkgs/issues/318674 is addressed properly + hardeningDisable = [ "zerocallusedregs" ]; }) diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 1afdd23923dd..54ffad6fc395 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "FFmpeg based source library for easy frame accurate access"; mainProgram = "ffmsindex"; license = licenses.mit; - maintainers = with maintainers; [ tadeokondrak ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix deleted file mode 100644 index 8573c862726e..000000000000 --- a/pkgs/development/libraries/flite/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, alsa-lib -, fetchpatch -, libpulseaudio -, audioBackend ? "pulseaudio" -}: - -assert lib.assertOneOf "audioBackend" audioBackend [ "alsa" "pulseaudio" ]; - -stdenv.mkDerivation rec { - pname = "flite"; - version = "2.2"; - - src = fetchFromGitHub { - owner = "festvox"; - repo = "flite"; - rev = "v${version}"; - sha256 = "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf"; - }; - - buildInputs = lib.optional (stdenv.isLinux && audioBackend == "alsa") alsa-lib - ++ lib.optional (stdenv.isLinux && audioBackend == "pulseaudio") libpulseaudio; - - # https://github.com/festvox/flite/pull/60. - # Replaces `ar` with `$(AR)` in config/common_make_rules. - # Improves cross-compilation compatibility. - patches = [ - (fetchpatch { - url = "https://github.com/festvox/flite/commit/54c65164840777326bbb83517568e38a128122ef.patch"; - sha256 = "sha256-hvKzdX7adiqd9D+9DbnfNdqEULg1Hhqe1xElYxNM1B8="; - }) - ]; - - configureFlags = [ - "--enable-shared" - ] ++ lib.optionals stdenv.isLinux [ "--with-audio=${audioBackend}" ]; - - # main/Makefile creates and removes 'flite_voice_list.c' from multiple targets: - # make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop - enableParallelBuilding = false; - - meta = with lib; { - description = "Small, fast run-time speech synthesis engine"; - homepage = "http://www.festvox.org/flite/"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ getchoo ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 2715e2c80ca4..6286155d8efb 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -6,13 +6,11 @@ , libtiff , zlib , bzip2 -, libGL -, libGLU +, mesa_glu , libXcursor , libXext , libXrandr , libXft -, CoreServices }: stdenv.mkDerivation rec { @@ -24,8 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-bu+IEqNkv9OAf96dPYre3CP759pjalVIbYyc3QSQW2w="; }; - buildInputs = [ libpng libjpeg libtiff zlib bzip2 libGL libGLU libXcursor libXext libXrandr libXft ] - ++ lib.optional stdenv.isDarwin CoreServices; + buildInputs = [ libpng libjpeg libtiff zlib bzip2 mesa_glu libXcursor libXext libXrandr libXft ]; doCheck = true; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 69c3b65e4a51..8e79b3e57dea 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libICE, libXext, libXi, libXrandr, libXxf86vm, libGL, libGLU, cmake +{ lib, stdenv, fetchurl, libICE, libXext, libXi, libXrandr, libXxf86vm, libGLX, libGLU, cmake , testers }: @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ libICE libXext libXi libXrandr libXxf86vm libGL libGLU ]; + buildInputs = [ libICE libXext libXi libXrandr libXxf86vm libGLU ]; cmakeFlags = lib.optionals stdenv.isDarwin [ - "-DOPENGL_INCLUDE_DIR=${libGL}/include" - "-DOPENGL_gl_LIBRARY:FILEPATH=${libGL}/lib/libGL.dylib" + "-DOPENGL_INCLUDE_DIR=${libGLX.dev}/include" + "-DOPENGL_gl_LIBRARY:FILEPATH=${libGLX}/lib/libGL.dylib" "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib" "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 387fac6d84ad..b537bea33777 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkg-config, freeglut, libGLU, libGL, libXi, libXmu +{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkg-config, libglut, libGLU, libGL, libXi, libXmu , GLUT, Cocoa }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Lb5mrl9jiI1Z9UOAlP+bBPNoKNxm5VSrFZRvifEfhoU="; }; - buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ] + buildInputs = [ libusb1 libglut libGLU libGL libXi libXmu ] ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index d6c38b555dd6..bcc5e8dacfe9 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.17"; + version = "1.4.19"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-P3CoRV6zopAtQDmtkbk0o0jKHu4jpKkqPeCCSQWn0aI="; + hash = "sha256-kK65g8NLMT+dxJTaAFviJNToS9EZ/rKlsey3OpQon5U="; }; buildInputs = [ diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index d23cd352360b..768c2185a158 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "fribidi"; - version = "1.0.13"; + version = "1.0.14"; outputs = [ "out" "dev" "devdoc" ]; # NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. src = fetchurl { url = with finalAttrs; "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-f6FsgMgb1iL3sZjTE1baE5zDGKY/x3YSF69BMJA/VKI="; + sha256 = "sha256-dq4gSnAnZSrDmBufpYF8CDuiMRQ0AoTFjnVrJZzSJZo="; }; postPatch = '' diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index b6554979c7ee..d1fb07167e13 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , doxygen -, freeglut +, libglut , freetype , libGL , libGLU @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ] else [ libGL libGLU - freeglut + libglut ]); configureFlags = [ diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index f8bf3f7c075a..611b547b101a 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -2,7 +2,6 @@ , stdenv , callPackage , fetchFromGitHub -, fetchpatch , useMinimalFeatures ? false , useTiledb ? (!useMinimalFeatures) && !(stdenv.isDarwin && stdenv.isx86_64) @@ -80,23 +79,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-xEekgF9GzsPYkwk7Nny9b1DMLTxBqTSdudYxaz4jl/c="; + hash = "sha256-WCTQHUU2WYYiliwCJ4PsbvJIOar9LmvXn/i5jJzTCtM="; }; - patches = [ - # HDF5: add support for libhdf5 >= 1.14.4.2 when built with Float16 - (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/16ade8253f26200246abb5ab24d17e18216e7a11.patch"; - sha256 = "sha256-N6YqfcOUWeaJXVE9RUo1dzulxqIY5Q/UygPnZHau3Lc="; - }) - ]; - nativeBuildInputs = [ bison cmake diff --git a/pkgs/development/libraries/gdk-pixbuf/xlib.nix b/pkgs/development/libraries/gdk-pixbuf/xlib.nix index dd498bb9aeac..0e0e2108da8d 100644 --- a/pkgs/development/libraries/gdk-pixbuf/xlib.nix +++ b/pkgs/development/libraries/gdk-pixbuf/xlib.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Deprecated API for integrating GdkPixbuf with Xlib data types"; homepage = "https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib"; - maintainers = teams.gnome.members; + maintainers = [ ]; license = licenses.lgpl21Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 9753f78ec83e..c560a3fc10e9 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.14.2"; + version = "0.14.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Kgyc9I++izQ1AIhm/9QLjt2wZn0iErQjlv32iOk84L4="; + sha256 = "IeZNLFbpszPUT+8/KkslZT2SLEGazZcvqW+raVIX4sg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index dfc9e36488f8..f1d67c8c8855 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -6,7 +6,7 @@ , libpng , libGL , libGLU -, freeglut +, libglut , darwin }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!stdenv.isDarwin) [ libGL libGLU - freeglut + libglut ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.OpenGL ]; diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix index c0934e7d18f9..541fb7c14ebb 100644 --- a/pkgs/development/libraries/gl3w/default.nix +++ b/pkgs/development/libraries/gl3w/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Simple OpenGL core profile loading"; homepage = "https://github.com/skaslev/gl3w"; license = licenses.unlicense; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix index 79be821faaec..f9ef65197bd5 100644 --- a/pkgs/development/libraries/gle/default.nix +++ b/pkgs/development/libraries/gle/default.nix @@ -1,8 +1,8 @@ -{lib, stdenv, fetchurl, freeglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}: +{lib, stdenv, fetchurl, libglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}: stdenv.mkDerivation rec { pname = "gle"; version = "3.1.0"; - buildInputs = [libGLU libGL freeglut libX11 libXt libXmu libXi libXext]; + buildInputs = [libGLU libGL libglut libX11 libXt libXmu libXi libXext]; src = fetchurl { urls = [ "mirror://sourceforge/project/gle/gle/gle-${version}/gle-${version}.tar.gz" diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 67d5a0095148..7ca694827301 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext -, Carbon, Cocoa, Kernel, OpenGL, fixDarwinDylibNames +, Carbon, Cocoa, Kernel, fixDarwinDylibNames , extra-cmake-modules, wayland , wayland-scanner, wayland-protocols, libxkbcommon }: @@ -19,9 +19,7 @@ stdenv.mkDerivation rec { # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) patches = ./x11.patch; - propagatedBuildInputs = - lib.optionals stdenv.isDarwin [ OpenGL ] - ++ lib.optionals stdenv.isLinux [ libGL ]; + propagatedBuildInputs = [ libGL ]; nativeBuildInputs = [ cmake extra-cmake-modules ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index a60ba9fae6bf..47ca3f35b218 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -61,28 +61,24 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.80.2"; + version = "2.80.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-uc+296W9WzEjj9XVbfImst2l6jdhFHW/ifag+UAP6L0="; + hash = "sha256-OUeg6t3Q82E9AjC7JG0MaeRhQsGQIvXEsbLjy6I21Bc="; }; patches = lib.optionals stdenv.isDarwin [ ./darwin-compilation.patch + # FIXME: remove when https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4088 is merged and is in the tagged release + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/9d0988ca62ee96e09aa76abbd65ff192cfce6858.patch"; + hash = "sha256-JrR3Ba6L+3M0Nt8DgHmPG8uKtx7hOgUp7np08ATIzjA="; + }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch ] ++ [ - # Fix double-free & segfault issues on menu and dbus connection action group export failures - # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4073 - # Remove when version > 2.80.2 - (fetchpatch { - name = "GLib-Fix-memory-problems-on-gmenuexporter-and-gactiongroupexporter-error-paths.patch"; - url = "https://gitlab.gnome.org/GNOME/glib/-/commit/b9490a499a004618c883f180b1081a166ff1a86b.patch"; - hash = "sha256-c6uZ9NEhg26/2RdgjQ4s5ErCDm5HH6T/tfJXTwh/H6o="; - }) - # This patch lets GLib's GDesktopAppInfo API watch and notice changes # to the Nix user and system profiles. That way, the list of available # applications shown by the desktop environment is immediately updated @@ -124,6 +120,15 @@ stdenv.mkDerivation (finalAttrs: { # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out) # * gio-launch-desktop ./split-dev-programs.patch + + # Tell Meson to install gdb scripts next to the lib + # GDB only looks there and in ${gdb}/share/gdb/auto-load, + # and by default meson installs in to $out/share/gdb/auto-load + # which does not help + ./gdb_script.patch + + # glib assumes that `RTLD_LOCAL` is defined to `0`, which is true on Linux and FreeBSD but not on Darwin. + ./gmodule-rtld_local.patch ]; outputs = [ "bin" "out" "dev" "devdoc" ]; @@ -221,6 +226,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' moveToOutput "share/glib-2.0" "$dev" + moveToOutput "share/glib-2.0/gdb" "$out" substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev" sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" diff --git a/pkgs/development/libraries/glib/gdb_script.patch b/pkgs/development/libraries/glib/gdb_script.patch new file mode 100644 index 000000000000..c1e5d22e085b --- /dev/null +++ b/pkgs/development/libraries/glib/gdb_script.patch @@ -0,0 +1,23 @@ +diff --git a/glib/meson.build b/glib/meson.build +index b2dd569e1..b013991a1 100644 +--- a/glib/meson.build ++++ b/glib/meson.build +@@ -541,7 +540,7 @@ configure_file( + input: 'libglib-gdb.py.in', + output: 'libglib-2.0.so.@0@-gdb.py'.format(library_version), + configuration: gdb_conf, +- install_dir: gdb_install_dir, ++ install_dir: glib_libdir, + install_tag: 'devel', + install: gdb_install, + ) +diff --git a/gobject/meson.build b/gobject/meson.build +@@ -185,7 +184,7 @@ configure_file( + input: 'libgobject-gdb.py.in', + output: 'libgobject-2.0.so.@0@-gdb.py'.format(library_version), + configuration: gdb_conf, +- install_dir: gdb_install_dir, ++ install_dir: glib_libdir, + install_tag: 'devel', + install: gdb_install, + ) diff --git a/pkgs/development/libraries/glib/gmodule-rtld_local.patch b/pkgs/development/libraries/glib/gmodule-rtld_local.patch new file mode 100644 index 000000000000..abbf19d70b20 --- /dev/null +++ b/pkgs/development/libraries/glib/gmodule-rtld_local.patch @@ -0,0 +1,13 @@ +diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c +index 6d1c5fab7..b21773bca 100644 +--- a/gmodule/gmodule-dl.c ++++ b/gmodule/gmodule-dl.c +@@ -136,7 +136,7 @@ _g_module_open (const gchar *file_name, + + lock_dlerror (); + handle = dlopen (file_name, +- (bind_local ? 0 : RTLD_GLOBAL) | (bind_lazy ? RTLD_LAZY : RTLD_NOW)); ++ (bind_local ? RTLD_LOCAL : RTLD_GLOBAL) | (bind_lazy ? RTLD_LAZY : RTLD_NOW)); + if (!handle) + { + const gchar *message = fetch_dlerror (TRUE); diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 417d70d621b6..3894db5ab9c8 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,61 +1,40 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake }: stdenv.mkDerivation rec { - version = "0.9.9.8"; + version = "1.0.1"; pname = "glm"; src = fetchFromGitHub { owner = "g-truc"; repo = pname; rev = version; - sha256 = "sha256-F//+3L5Ozrw6s7t4LrcUmO7sN30ZSESdrPAYX57zgr8="; + sha256 = "sha256-GnGyzNRpzuguc3yYbEFtYLvG+KiCtRAktiN+NvbOICE="; }; - # (https://github.com/g-truc/glm/pull/986 wasn't enough, and -Werror is used) - # (https://github.com/g-truc/glm/pull/1055 neither) - patches = [ - (fetchpatch { - name = "glm-0.9.9.8-clang.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/glm/files/glm-0.9.9.8-clang.patch?id=79476d4b145a4a6b0cbc0e73a6cefb5d584bf8fa"; - hash = "sha256-D8O+qofnGUEaH5nQGdNddwHyr5FhPQa/lOup4z4SFgY="; - }) - ]; - outputs = [ "out" "doc" ]; nativeBuildInputs = [ cmake ]; - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823 - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") "-fno-ipa-modref"; + env.NIX_CFLAGS_COMPILE = + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823 + if (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") then "-fno-ipa-modref" + # Fix compilation errors on darwin + else if (stdenv.cc.isClang) then "-Wno-error" + else ""; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=OFF" - "-DBUILD_STATIC_LIBS=OFF" - "-DGLM_TEST_ENABLE=${if doCheck then "ON" else "OFF"}" + (lib.cmakeBool "BUILD_SHARED_LIBS" false) + (lib.cmakeBool "BUILD_STATIC_LIBS" false) + (lib.cmakeBool "GLM_TEST_ENABLE" doCheck) ]; doCheck = true; - installPhase = '' - runHook preInstall - - # Install header-only library - mkdir -p $out/include - cp -rv ../glm $out/include - rm $out/include/glm/CMakeLists.txt - rm $out/include/glm/detail/*.cpp - - # Install CMake files - mkdir -p $out/lib - cp -rv ../cmake $out/lib - substituteInPlace $out/lib/cmake/glm/glmConfig.cmake \ - --replace 'GLM_INCLUDE_DIRS ''${_IMPORT_PREFIX}' "GLM_INCLUDE_DIRS $out/include" - + postInstall = '' # Install pkg-config file mkdir -p $out/lib/pkgconfig substituteAll ${./glm.pc.in} $out/lib/pkgconfig/glm.pc @@ -64,8 +43,6 @@ stdenv.mkDerivation rec { mkdir -p $doc/share/doc/glm cp -rv ../doc/api $doc/share/doc/glm/html cp -v ../doc/manual.pdf $doc/share/doc/glm - - runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/development/libraries/glui/default.nix index 716c998b9c99..f3999bfb439b 100644 --- a/pkgs/development/libraries/glui/default.nix +++ b/pkgs/development/libraries/glui/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, freeglut +, libglut , libGL , libGLU , libX11 @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "0qg2y8w95s03zay1qsqs8pqxxlg6l9kwm7rrs1qmx0h22sxb360i"; }; - buildInputs = [ freeglut libGLU libGL libXmu libXext libX11 libXi ]; + buildInputs = [ libglut libGLU libGL libXmu libXext libX11 libXi ]; installPhase = '' mkdir -p "$out"/{bin,lib,share/glui/doc,include} diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 25d6c85aa328..1fea5408ef2a 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation rec { - version = "3.2.14"; + version = "3.2.15"; pname = "gmime"; src = fetchurl { # https://github.com/jstedfast/gmime/releases url = "https://github.com/jstedfast/gmime/releases/download/${version}/gmime-${version}.tar.xz"; - sha256 = "sha256-pes91nX3LlRci8HNEhB+Sq0ursGQXre0ATzbH75eIxc="; + sha256 = "sha256-hM0qSBonlw7Dm1yV9y2wJnIpBKLM8/29V7KAzy0CtcQ="; }; outputs = [ diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 43ce34ec2ed4..4b5df003dcf7 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.50.2"; + version = "3.50.3"; outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-3xatl10TnGv8TrsuyLuDJyl6eR7yvwuXfHgHavX6qY4="; + hash = "sha256-5xSmfRccVxRDYet07oKhexXQqCIo/xiM+ScE9WJsopQ="; }; mesonFlags = [ diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 9aba5156bef2..1a205a6c04cb 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -33,6 +33,7 @@ let pythonModules = pp: [ pp.mako pp.markdown + pp.setuptools ]; # https://discourse.gnome.org/t/dealing-with-glib-and-gobject-introspection-circular-dependency/18701 diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 91639c441b48..b203eab08965 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -372,6 +372,6 @@ stdenv.mkDerivation rec { ''; license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ matthewbauer lilyinstarlight ]; + maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index f48fe22f5000..930cdd79b732 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -172,6 +172,6 @@ stdenv.mkDerivation (finalAttrs: { "gstreamer-video-1.0" ]; platforms = platforms.unix; - maintainers = with maintainers; [ matthewbauer lilyinstarlight ]; + maintainers = with maintainers; [ matthewbauer ]; }; }) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 3136b6f88675..a6f0cee7d7db 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -123,6 +123,6 @@ stdenv.mkDerivation (finalAttrs: { "gstreamer-controller-1.0" ]; platforms = platforms.unix; - maintainers = with maintainers; [ ttuegel matthewbauer lilyinstarlight ]; + maintainers = with maintainers; [ ttuegel matthewbauer ]; }; }) diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 44a79bb2c998..41e3e1cba97d 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 79ece373b57d..cf15a4c40626 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index bd301e7b45c2..40c9cbc769c0 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -68,6 +68,8 @@ stdenv.mkDerivation rec { }; patches = [ + # Reenable dynamic loading of libsoup on Darwin and use a different approach to do it. + ./souploader-darwin.diff # dlopen libsoup_3 with an absolute path (substituteAll { src = ./souploader.diff; @@ -215,6 +217,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ matthewbauer lilyinstarlight ]; + maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/development/libraries/gstreamer/good/souploader-darwin.diff b/pkgs/development/libraries/gstreamer/good/souploader-darwin.diff new file mode 100644 index 000000000000..40dea3a764ac --- /dev/null +++ b/pkgs/development/libraries/gstreamer/good/souploader-darwin.diff @@ -0,0 +1,128 @@ +diff --git a/ext/adaptivedemux2/meson.build b/ext/adaptivedemux2/meson.build +index 711b38a2a9..67a789f664 100644 +--- a/ext/adaptivedemux2/meson.build ++++ b/ext/adaptivedemux2/meson.build +@@ -82,7 +82,7 @@ soup_link_args = [] + soup_link_deps = [] + + default_library = get_option('default_library') +-if host_system != 'linux' or default_library in ['static', 'both'] ++if default_library in ['static', 'both'] + if soup_ver_opt in ['auto', '3'] + libsoup3_dep = dependency('libsoup-3.0', allow_fallback: true, + required: soup_ver_opt == '3' and soup_opt.enabled()) +@@ -120,7 +120,7 @@ adaptive_deps = [gmodule_dep, gst_dep, gsttag_dep, gstnet_dep, gstbase_dep, gstp + adaptive_args = [gst_plugins_good_args, soup_loader_args, hls_cargs, + '-DGST_ISOFF_API=G_GNUC_INTERNAL'] + +-if host_system != 'linux' ++if false + adaptivedemux2 = library('gstadaptivedemux2', + c_args: [adaptive_args, soup_link_args], + dependencies: [adaptive_deps, soup_link_deps], +diff --git a/ext/soup/gstsouploader.c b/ext/soup/gstsouploader.c +index 9192e4dac5..8082b2614d 100644 +--- a/ext/soup/gstsouploader.c ++++ b/ext/soup/gstsouploader.c +@@ -34,12 +34,18 @@ GST_DEBUG_CATEGORY (gst_soup_debug); + + #ifndef LINK_SOUP + +-#if defined(__APPLE__) || defined(G_OS_WIN32) +-#error "dlopen of libsoup is only supported on Linux" ++#if defined(G_OS_WIN32) ++#error "dlopen of libsoup is only supported on Darwin and Linux" + #endif + ++#if defined(__APPLE__) ++#define LIBSOUP_3_SONAME "libsoup-3.0.0.dylib" ++#define LIBSOUP_2_SONAME "libsoup-2.4.1.dylib" ++#define LIBSOUP_COMMON_SYMBOL "soup_get_major_version" ++#else + #define LIBSOUP_3_SONAME "libsoup-3.0.so.0" + #define LIBSOUP_2_SONAME "libsoup-2.4.so.1" ++#endif + + #define LOAD_SYMBOL(name) G_STMT_START { \ + if (!g_module_symbol (module, G_STRINGIFY (name), (gpointer *) &G_PASTE (vtable->_, name))) { \ +@@ -156,7 +162,46 @@ gst_soup_load_library (void) + GST_DEBUG_CATEGORY_INIT (gst_soup_debug, "soup", 0, "soup"); + #endif + +-#ifdef HAVE_RTLD_NOLOAD ++#if defined(__APPLE__) ++ g_autofree gchar* libsoup_path = NULL; ++ { ++ /* In order to avoid causing conflicts we detect if libsoup 2 or 3 is loaded already. ++ * Darwin has to probe by checking for symbols because `dlopen` called with a dylib ++ * basename will try to locate it via the process’s rpath stack (and not find it). */ ++ ++ gpointer func = NULL; ++ Dl_info info = { 0 }; ++ ++ GModule* module = g_module_open (NULL, 0); ++ if (g_module_symbol (module, LIBSOUP_COMMON_SYMBOL, &func) ++ && dladdr (func, &info) && info.dli_sname) { ++ libsoup_path = g_strndup(info.dli_fname, PATH_MAX - 1); ++ g_autofree gchar* image_name = g_path_get_basename (libsoup_path); ++ ++ /* Make sure `libsoup_path` points to a dylib that actually exists and ++ * contains the libsoup symbol that was queried. */ ++ gpointer handle = dlopen (libsoup_path, RTLD_NOW | RTLD_NOLOAD); ++ gboolean has_symbol = dlsym (handle, LIBSOUP_COMMON_SYMBOL) != NULL; ++ if (handle && has_symbol && g_str_equal (image_name, LIBSOUP_3_SONAME)) { ++ libsoup_sonames[0] = libsoup_path; ++ GST_DEBUG ("LibSoup 3 found"); ++ } else if (handle && has_symbol && g_str_equal (image_name, LIBSOUP_2_SONAME)) { ++ libsoup_sonames[0] = libsoup_path; ++ GST_DEBUG ("LibSoup 2 found"); ++ } else { ++ g_clear_pointer (&libsoup_path, g_free); ++ } ++ g_clear_pointer (&handle, dlclose); ++ } ++ g_module_close (module); ++ ++ if (!libsoup_sonames[0]) { ++ GST_DEBUG ("Trying all libsoups"); ++ libsoup_sonames[0] = LIBSOUP_3_SONAME; ++ libsoup_sonames[1] = LIBSOUP_2_SONAME; ++ } ++ } ++#elif defined(HAVE_RTLD_NOLOAD) + { + gpointer handle = NULL; + +diff --git a/ext/soup/meson.build b/ext/soup/meson.build +index aaa01dbcf6..83b7cf3fbf 100644 +--- a/ext/soup/meson.build ++++ b/ext/soup/meson.build +@@ -20,8 +20,8 @@ soup_link_deps = [] + libsoup2_dep = disabler() + libsoup3_dep = disabler() + default_library = get_option('default_library') +-soup_lookup_dep = get_option('soup-lookup-dep') and host_system == 'linux' +-if host_system != 'linux' or default_library in ['static', 'both'] or soup_lookup_dep ++soup_lookup_dep = get_option('soup-lookup-dep') ++if default_library in ['static', 'both'] or soup_lookup_dep + if soup_ver_opt in ['auto', '3'] + libsoup3_dep = dependency('libsoup-3.0', allow_fallback: true, + required: soup_ver_opt == '3' and soup_opt.enabled()) +@@ -33,7 +33,7 @@ if host_system != 'linux' or default_library in ['static', 'both'] or soup_looku + endif + endif + +-if host_system != 'linux' or default_library in ['static', 'both'] ++if default_library in ['static', 'both'] + if libsoup3_dep.found() + soup_link_deps += libsoup3_dep + soup_link_args += '-DLINK_SOUP=3' +@@ -60,7 +60,7 @@ soup_library_kwargs = { + soup_library_deps = [gst_dep, gstbase_dep, gsttag_dep, gmodule_dep, gio_dep, libdl_dep] + soup_library_c_args = gst_plugins_good_args + +-if host_system != 'linux' ++if false + gstsouphttpsrc = library('gstsoup', + c_args : soup_library_c_args + soup_link_args, + dependencies : soup_library_deps + soup_link_deps, diff --git a/pkgs/development/libraries/gstreamer/good/souploader.diff b/pkgs/development/libraries/gstreamer/good/souploader.diff index 8662207de8f2..49917cad91de 100644 --- a/pkgs/development/libraries/gstreamer/good/souploader.diff +++ b/pkgs/development/libraries/gstreamer/good/souploader.diff @@ -1,8 +1,17 @@ diff --git a/ext/soup/gstsouploader.c b/ext/soup/gstsouploader.c -index 85048ce303..d7d818cf95 100644 +index 85a033668e..8082b2614d 100644 --- a/ext/soup/gstsouploader.c +++ b/ext/soup/gstsouploader.c -@@ -181,7 +181,7 @@ gst_soup_load_library (void) +@@ -197,7 +197,7 @@ gst_soup_load_library (void) + + if (!libsoup_sonames[0]) { + GST_DEBUG ("Trying all libsoups"); +- libsoup_sonames[0] = LIBSOUP_3_SONAME; ++ libsoup_sonames[0] = "@nixLibSoup3Path@/" LIBSOUP_3_SONAME; + libsoup_sonames[1] = LIBSOUP_2_SONAME; + } + } +@@ -216,7 +216,7 @@ gst_soup_load_library (void) GST_DEBUG ("LibSoup 2 found"); } else { GST_DEBUG ("Trying all libsoups"); diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 872627009e21..e3065437f5d8 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index d4afb8ce7618..4c0d8bffb35a 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -258,6 +258,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"; license = with licenses; [ mpl20 asl20 mit lgpl21Plus ]; platforms = platforms.unix; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; }) diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index db56d895f787..b6d2b6464e41 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ bkchr lilyinstarlight ]; + maintainers = with maintainers; [ bkchr ]; }; } diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 0b39bad01020..6f8ac715af50 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -91,6 +91,6 @@ stdenv.mkDerivation rec { ''; license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ matthewbauer lilyinstarlight ]; + maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index cdad2eaf232d..62f11a580c21 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -86,6 +86,6 @@ stdenv.mkDerivation rec { homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/hamlib/4.nix b/pkgs/development/libraries/hamlib/4.nix index 8fde56729e83..168a0477b2f8 100644 --- a/pkgs/development/libraries/hamlib/4.nix +++ b/pkgs/development/libraries/hamlib/4.nix @@ -5,7 +5,7 @@ , swig , gd , ncurses -, python3 +, python311 , libxml2 , tcl , libusb-compat-0_1 @@ -17,7 +17,9 @@ , tclBindings ? true , perlBindings ? true }: - +let + python3 = python311; # needs distutils and imp +in stdenv.mkDerivation rec { pname = "hamlib"; version = "4.5.5"; diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 9250a66c219e..2b7f05bcdef0 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -5,7 +5,7 @@ , swig , gd , ncurses -, python3 +, python311 , libxml2 , tcl , libusb-compat-0_1 @@ -18,7 +18,9 @@ , perlBindings ? stdenv.buildPlatform == stdenv.hostPlatform , buildPackages }: - +let + python3 = python311; # needs distutils and imp +in stdenv.mkDerivation rec { pname = "hamlib"; version = "3.3"; diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index dfba7f4e1171..5f698794abf3 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: { "hidapi-hidraw" "hidapi-libusb" ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; }) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 38550115bfb0..f2316ab657a1 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "hwloc"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - sha256 = "sha256-A5A7h8rV23K9APeSbWpTdEsQxcaiOMa2hRDn3BVg5Pk="; + sha256 = "sha256-BM37/60iXOFfZhhPD0FBMn2r8ojRCouE0T9Rest4cMY="; }; configureFlags = [ diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 0e77aebd1486..4f1e0e4172bb 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, testers, buildPackages }: +{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, testers, buildPackages, updateAutotoolsGnuConfigScriptsHook }: let make-icu = (import ./make-icu.nix) { - inherit stdenv lib buildPackages fetchurl fixDarwinDylibNames testers; + inherit stdenv lib buildPackages fetchurl fixDarwinDylibNames testers updateAutotoolsGnuConfigScriptsHook; }; in { diff --git a/pkgs/development/libraries/icu/make-icu.nix b/pkgs/development/libraries/icu/make-icu.nix index 3e65e80ef7c4..575f184c163f 100644 --- a/pkgs/development/libraries/icu/make-icu.nix +++ b/pkgs/development/libraries/icu/make-icu.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, fixDarwinDylibNames, testers }: +{ stdenv, lib, buildPackages, fetchurl, fixDarwinDylibNames, testers, updateAutotoolsGnuConfigScriptsHook }: { version, hash, patches ? [], patchFlags ? [], withStatic ? stdenv.hostPlatform.isStatic }: @@ -64,9 +64,11 @@ let outputs = [ "out" "dev" ] ++ lib.optional withStatic "static"; outputBin = "dev"; - # FIXME: This fixes dylib references in the dylibs themselves, but - # not in the programs in $out/bin. - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ] ++ + # FIXME: This fixes dylib references in the dylibs themselves, but + # not in the programs in $out/bin. + lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + # remove dependency on bootstrap-tools in early stdenv build postInstall = lib.optionalString withStatic '' diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index c55f3ee18661..1e3d2e4923d9 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation (finalAttrs: { pname = "igraph"; - version = "0.10.12"; + version = "0.10.13"; src = fetchFromGitHub { owner = "igraph"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-ITXkdCyUtuFhgHHmy3P4ZX6GgzyxVUYz4knCCPHGClc="; + hash = "sha256-c5yZI5AfaO/NFyy88efu1COb+T2r1LpHhUTfilw2H1U="; }; postPatch = '' diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 2cfce8ed2040..f685a571de0c 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.20"; + version = "22.4.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-AqHzWm0ZWCJK0gMXxxBSHemKx3U1fOXCUGo/ORny2hI="; + sha256 = "sha256-z8FPSqWlSubtt+gurntWnkeKsdO2B+KZXTv2Y+TL7t4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/irrlichtmt/default.nix b/pkgs/development/libraries/irrlichtmt/default.nix index 8787fd390efd..538858904291 100644 --- a/pkgs/development/libraries/irrlichtmt/default.nix +++ b/pkgs/development/libraries/irrlichtmt/default.nix @@ -32,13 +32,14 @@ stdenv.mkDerivation (finalAttrs: { libpng libjpeg libGL + ] ++ (if stdenv.hostPlatform.isDarwin then [ + Cocoa + Kernel + ] else [ libX11 libXi libXext - ] ++ lib.optionals stdenv.isDarwin [ - Cocoa - Kernel - ]; + ]); outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index c4f9bf977302..b4aaed007895 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.7.2"; + version = "2.7.3"; underscoreMajMin = lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "sha256-/7NZy+ZroxeTF7av22LNJ0dlMzvTAWfOMypLLYWXWBI="; + sha256 = "sha256-0+3uhZ9/xYI34QiGSnFzPv9WE9ktxlUI36M1vAxbHpQ="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index de197b7966ef..87d5f02230e8 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lombok"; - version = "1.18.32"; + version = "1.18.34"; src = fetchurl { url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-l1dGdOKiX1Z6MTc2rOAN+Hh9RD3jFkB9V/yHfZ8Zpl0="; + sha256 = "sha256-wn1rKv9WJB0bB/y8xrGDcJ5rQyyA9zdO6x2CPobUuBo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 17dfd7385e12..5469266d0c12 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -1,46 +1,92 @@ -{ lib, stdenv, fetchurl, unzip, jre, jre8 }: +{ lib +, stdenv +, fetchurl +, unzip +, jre +, jre8 +, genericUpdater +, writeShellScript +, common-updater-scripts +, gnused +}: let + inherit (lib.versions) major majorMinor splitVersion; + inherit (lib.strings) concatStringsSep versionAtLeast; + common = { pname, version, src, description, java ? jre - , prog ? null, jar ? null, license ? lib.licenses.mpl20 }: - stdenv.mkDerivation { - name = "${pname}-${version}"; + , prog ? null, jar ? null, license ? lib.licenses.mpl20 + , updateScript ? null }: + stdenv.mkDerivation (finalAttrs: let + mainProgram = if prog == null then pname else prog; + jar' = if jar == null then pname else jar; + in { inherit pname version src; nativeBuildInputs = [ unzip ]; - buildCommand = let - prog' = if prog == null then pname else prog; - jar' = if jar == null then pname else jar; - in '' + buildCommand = '' unzip $src -d $out mkdir -p $out/bin $out/share $out/share/java cp -s "$out"/*.jar "$out/share/java/" # */ rm -rf $out/notices mv $out/doc $out/share - cat > $out/bin/${prog'} < $out/bin/${mainProgram} < "$out/jars/swt.jar" - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://www.eclipse.org/swt/"; - description = '' - A widget toolkit for Java to access the user-interface facilities of - the operating systems on which it is implemented. - ''; - license = licenses.epl10; - maintainers = with maintainers; [ bb010g ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 2efbf85d47c7..38b1dafa0066 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome-common , gtk-doc, gtk2, lua, gobject-introspection }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoconf automake gobject-introspection ]; buildInputs = [ - libtool gnome.gnome-common gtk-doc gtk2 + libtool gnome-common gtk-doc gtk2 lua ]; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index e7bbd2b131d5..3ee266ee3a18 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome-common , gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { automake libtool pkg-config - gnome.gnome-common + gnome-common gtk-doc gobject-introspection ]; diff --git a/pkgs/development/libraries/kronosnet/default.nix b/pkgs/development/libraries/kronosnet/default.nix index bff25956f7a9..dc73e71111c4 100644 --- a/pkgs/development/libraries/kronosnet/default.nix +++ b/pkgs/development/libraries/kronosnet/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "kronosnet"; - version = "1.28"; + version = "1.29"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-HxdZy2TiQT7pWyhaSq4YJAcqjykzWy1aI3gEZrlbghQ="; + sha256 = "sha256-GRjoNNF9jW2uNQAJjOM9TQtq9rS+12s94LhCXQr5aoQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix index 40eb4bd10d36..fe3a88dc711c 100644 --- a/pkgs/development/libraries/l-smash/default.nix +++ b/pkgs/development/libraries/l-smash/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "http://l-smash.github.io/l-smash/"; description = "MP4 container utilities"; license = licenses.isc; - maintainers = with maintainers; [ tadeokondrak ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index db99f73cd796..7805764fc0d7 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.17.6"; + version = "1.17.17"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-vtijha0nXHEp5oLnmdtbD80Qa2dgMykZXhQ2yfbk+mY="; + hash = "sha256-+8bIY/90dXsCdCMeoxL1+OK2Yhl4XNRI3RPuPouGWHc="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 449176cfd9e5..cfb86575f52d 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -13,6 +13,7 @@ , glib , gtk4 , gnome +, adwaita-icon-theme , gsettings-desktop-schemas , desktop-file-utils , xvfb-run @@ -23,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.5.1"; + version = "1.5.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -33,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; rev = finalAttrs.version; - hash = "sha256-dH0VPIt6SGTDcb1I72cKnNlyqZ3dptvKmMDjOd17BfA="; + hash = "sha256-0Zu6knxP6GiqJMtwd8uRN72Lf7JfwB6JWjS1ggeANPM="; }; depsBuildBuild = [ @@ -70,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeCheckInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme ] ++ lib.optionals (!stdenv.isDarwin) [ xvfb-run ]; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index ad94f55ccb6d..cf8f4c85e0c6 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -11,11 +11,11 @@ assert fontconfigSupport -> fontconfig != null; stdenv.mkDerivation rec { pname = "libass"; - version = "0.17.1"; + version = "0.17.2"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-8NoLv7pHbBauPhz9hiJW0wkVkR96uqGxbOYu5lMZJ4Q="; + sha256 = "sha256-6CYbUdZrqTP+mSSMb92HZ+2WxaflNjyDmSxzWiwvv3Q="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix index cc6a340355ba..94c414a08356 100644 --- a/pkgs/development/libraries/libdatachannel/default.nix +++ b/pkgs/development/libraries/libdatachannel/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = "libdatachannel"; rev = "v${version}"; - hash = "sha256-sTdA4kCIdY3l/YUNKbXzRDS1O0AFx90k94W3cJpfLIY="; + hash = "sha256-3fax57oaJvOgbTDPCiiUdtsfAGhICfPkuMihawq06SA="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index 9ca5581b3bff..afd53588a336 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-U3zreN087ycaGD9KF2GR0c7PhfAlUg5r03WLDhnmYJ8="; }; + hardeningDisable = [ + # "sorry, unimplemented: __builtin_clear_padding not supported for variable length aggregates" + "trivialautovarinit" + ]; + buildInputs = [ libusb1 ] ++ lib.optional stdenv.isLinux libraw1394 ++ lib.optional stdenv.isDarwin CoreServices; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 879120388146..31e36be121b5 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.120"; + version = "2.4.121"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-O/VTY/dsclCUZEGrUdOmzArlGAVcD/AXMkq3bN77Mno="; + hash = "sha256-kJCEpQXXY4iH9ZC3B5Gzu9kGnHEMlI9dHxzm0IDN/Ks="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libeatmydata/LFS64.patch b/pkgs/development/libraries/libeatmydata/LFS64.patch new file mode 100644 index 000000000000..2a8ab5e08893 --- /dev/null +++ b/pkgs/development/libraries/libeatmydata/LFS64.patch @@ -0,0 +1,70 @@ +From 59f04ad8730034a205a1a792662d4b5dc2006b7c Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Mon, 13 May 2024 09:53:23 +0200 +Subject: [PATCH] Fix sync_file_range() with musl 1.2.4 + +musl 1.2.4 has removed the transitional LFS off64_t type. +sync_file_range is declared with off_t in musl, which is always 64 +bits. + +This assumes that the same is true of any other libc which doesn't +provide off64_t. If it's not, gcc will produce an error due to the +conflicting types of sync_file_range(), so it will be caught and can +be fixed. +--- + configure.ac | 2 ++ + libeatmydata/libeatmydata.c | 11 +++++++++-- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4d101ba..f3c4a69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -37,6 +37,8 @@ AC_CHECK_HEADERS_ONCE(pthread.h) + AC_CHECK_SIZEOF(mode_t) + AC_CHECK_SIZEOF(int) + ++AC_CHECK_TYPES([off64_t]) ++ + AC_CHECK_TYPE(pthread_barrier_t,,,[ + #ifdef HAVE_PTHREAD_H + #include +diff --git a/libeatmydata/libeatmydata.c b/libeatmydata/libeatmydata.c +index 134afcd..0015f1f 100644 +--- a/libeatmydata/libeatmydata.c ++++ b/libeatmydata/libeatmydata.c +@@ -35,6 +35,12 @@ + #define CHECK_FILE "/tmp/eatmydata" + */ + ++#ifdef HAVE_OFF64_T ++typedef off64_t sync_file_range_off; ++#else ++typedef off_t sync_file_range_off; ++#endif ++ + typedef int (*libc_open_t)(const char*, int, ...); + #ifdef HAVE_OPEN64 + typedef int (*libc_open64_t)(const char*, int, ...); +@@ -44,7 +50,7 @@ typedef int (*libc_sync_t)(void); + typedef int (*libc_fdatasync_t)(int); + typedef int (*libc_msync_t)(void*, size_t, int); + #ifdef HAVE_SYNC_FILE_RANGE +-typedef int (*libc_sync_file_range_t)(int, off64_t, off64_t, unsigned int); ++typedef int (*libc_sync_file_range_t)(int, sync_file_range_off, sync_file_range_off, unsigned int); + #endif + #ifdef HAVE_SYNCFS + typedef int (*libc_syncfs_t)(int); +@@ -259,7 +265,8 @@ int LIBEATMYDATA_API msync(void *addr, size_t length, int flags) + } + + #ifdef HAVE_SYNC_FILE_RANGE +-int LIBEATMYDATA_API sync_file_range(int fd, off64_t offset, off64_t nbytes, ++int LIBEATMYDATA_API sync_file_range(int fd, sync_file_range_off offset, ++ sync_file_range_off nbytes, + unsigned int flags) + { + if (eatmydata_is_hungry()) { +-- +2.45.1 + diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 2a76731829a7..f315e32f02d9 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-0lrYDW51/KSr809whGwg9FYhzcLRfmoxipIgrK1zFCc="; }; + patches = [ + # https://github.com/stewartsmith/libeatmydata/pull/36 + ./LFS64.patch + ]; + postPatch = '' patchShebangs . ''; diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index c9a1d09172a9..11cc35b2e509 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -2,6 +2,7 @@ , lib , fetchurl , autoreconfHook +, gnome-common , pkg-config , intltool , gtk-doc @@ -32,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook - gnome.gnome-common + gnome-common pkg-config intltool gtk-doc diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index ff9784064432..983395f33b4b 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, findutils, fixDarwinDylibNames +, updateAutotoolsGnuConfigScriptsHook , sslSupport ? true, openssl , fetchpatch }: @@ -36,7 +37,8 @@ stdenv.mkDerivation rec { ++ lib.optional sslSupport "openssl" ; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = lib.optional sslSupport openssl ++ lib.optional stdenv.isCygwin findutils; diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 9dc2f368e2cd..c7915ae676ef 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "libfive"; - version = "0-unstable-2024-03-28"; + version = "0-unstable-2024-06-23"; src = fetchFromGitHub { owner = "libfive"; repo = "libfive"; - rev = "4c59b11667bbe8be9802f59697fa64bbfe1ea82d"; - hash = "sha256-scYSprozfC537vAXhMfWswyS3xivpoURWPhplH7yHIg="; + rev = "302553e6aa6ca3cb13b2a149f57b6182ce2406dd"; + hash = "sha256-8J0Pe3lmZCg2YFffmIynxW35w4mHl5cSlLSenm50CWg="; }; nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config python.pkgs.pythonImportsCheckHook ]; @@ -96,7 +96,9 @@ stdenv.mkDerivation { "libfive.stdlib" ]; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagFormat = ""; + }; meta = with lib; { description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile"; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 116f1dca1bbb..5d579cf8cb33 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -21,12 +21,12 @@ let in stdenv.mkDerivation rec { pname = "libftdi"; - version = "1.5"; + version = "1.5-unstable-2023-12-21"; src = fetchgit { url = "git://developer.intra2net.com/libftdi"; - rev = "v${version}"; - sha256 = "0vipg3y0kbbzjhxky6hfyxy42mpqhvwn1r010zr5givcfp8ghq26"; + rev = "de9f01ece34d2fe6e842e0250a38f4b16eda2429"; + hash = "sha256-U37M5P7itTF1262oW+txbKxcw2lhYHAwy1ML51SDVMs="; }; strictDeps = true; diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix deleted file mode 100644 index f31f26539a55..000000000000 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libgnome-keyring"; - version = "2.32.0"; - - src = let - inherit (finalAttrs) pname version; - in fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; - }; - - outputs = [ "out" "dev" ]; - - strictDeps = true; - propagatedBuildInputs = [ glib dbus libgcrypt ]; - nativeBuildInputs = [ pkg-config intltool ]; - - configureFlags = [ - # not ideal to use -config scripts but it's not possible switch it to pkg-config - # binaries in dev have a for build shebang - "LIBGCRYPT_CONFIG=${lib.getExe' (lib.getDev libgcrypt) "libgcrypt-config"}" - ]; - - postPatch = '' - # uses pkg-config in some places and uses the correct $PKG_CONFIG in some - # it's an ancient library so it has very old configure scripts and m4 - substituteInPlace ./configure \ - --replace "pkg-config" "$PKG_CONFIG" - ''; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = { - pkgConfigModules = [ "gnome-keyring-1" ]; - inherit (glib.meta) platforms maintainers; - homepage = "https://gitlab.gnome.org/Archive/libgnome-keyring"; - license = with lib.licenses; [ gpl2 lgpl2 ]; - }; -}) diff --git a/pkgs/development/libraries/libhwy/default.nix b/pkgs/development/libraries/libhwy/default.nix index 664378d42b6d..7bf78ec875e2 100644 --- a/pkgs/development/libraries/libhwy/default.nix +++ b/pkgs/development/libraries/libhwy/default.nix @@ -27,6 +27,12 @@ stdenv.mkDerivation rec { hash = "sha256-ileSNYddOt1F5rooRB0fXT20WkVlnG+gP5w7qJdBuww="; }); + hardeningDisable = lib.optionals stdenv.hostPlatform.isAarch64 [ + # aarch64-specific code gets: + # __builtin_clear_padding not supported for variable length aggregates + "trivialautovarinit" + ]; + nativeBuildInputs = [ cmake ninja ]; # Required for case-insensitive filesystems ("BUILD" exists) diff --git a/pkgs/development/libraries/libimobiledevice-glue/default.nix b/pkgs/development/libraries/libimobiledevice-glue/default.nix index f85c559593d1..13a2e83d0473 100644 --- a/pkgs/development/libraries/libimobiledevice-glue/default.nix +++ b/pkgs/development/libraries/libimobiledevice-glue/default.nix @@ -4,21 +4,24 @@ , autoreconfHook , pkg-config , libplist +, nix-update-script }: stdenv.mkDerivation rec { pname = "libimobiledevice-glue"; - version = "1.2.0"; - - outputs = [ "out" "dev" ]; + version = "1.3.0"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; rev = version; - hash = "sha256-Rfs1i1Tt8uf3WfR+cDlF4L75nFHg9VypjMhHt0TgkyQ="; + hash = "sha256-+poCrn2YHeH8RQCfWDdnlmJB4Nf+unWUVwn7YwILHIs="; }; + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -28,9 +31,9 @@ stdenv.mkDerivation rec { libplist ]; - preAutoreconf = '' - export RELEASE_VERSION=${version} - ''; + outputs = [ "out" "dev" ]; + + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/libimobiledevice/libimobiledevice-glue"; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 59ee89c95422..0e81f32bebf8 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -12,31 +12,36 @@ , libimobiledevice-glue , SystemConfiguration , CoreFoundation +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "libimobiledevice"; - version = "1.3.0+date=2023-04-30"; - - outputs = [ "out" "dev" ]; + version = "1.3.0-unstable-2024-05-20"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "860ffb707af3af94467d2ece4ad258dda957c6cd"; - hash = "sha256-mIsB+EaGJlGMOpz3OLrs0nAmhOY1BwMs83saFBaejwc="; + rev = "9ccc52222c287b35e41625cc282fb882544676c6"; + hash = "sha256-pNvtDGUlifp10V59Kah4q87TvLrcptrCJURHo+Y+hs4="; }; patches = [ - # Pull upstream fix for clang-16 and upcoming gcc-14 support: - # https://github.com/libimobiledevice/libimobiledevice/pull/1444 + # Fix gcc-14 and clang-16 build: + # https://github.com/libimobiledevice/libimobiledevice/pull/1569 (fetchpatch { - name = "usleep-decl.patch"; - url = "https://github.com/libimobiledevice/libimobiledevice/commit/db623184c0aa09c27697f5a2e81025db223075d5.patch"; - hash = "sha256-TgdgBkEDXzQDSgJxcZc+pZncfmBVXarhHOByGFs6p0Q="; + name = "fime.h.patch"; + url = "https://github.com/libimobiledevice/libimobiledevice/commit/92256c2ae2422dac45d8648a63517598bdd89883.patch"; + hash = "sha256-sB+wEFuXFoQnuf7ntWfvYuCgWfYbmlPL7EjW0L0F74o="; }) ]; + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + + configureFlags = [ "--without-cython" ]; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -54,11 +59,12 @@ stdenv.mkDerivation rec { CoreFoundation ]; - preAutoreconf = '' - export RELEASE_VERSION=${version} - ''; - configureFlags = [ "--without-cython" ]; + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + + passthru.updateScript = unstableGitUpdater { }; meta = with lib; { homepage = "https://github.com/libimobiledevice/libimobiledevice"; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index f0005969bbcf..4f7e652e9bb8 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.25.0"; + version = "1.26.0"; outputs = [ "bin" "out" "dev" ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { owner = "libinput"; repo = "libinput"; rev = version; - hash = "sha256-c2FU5OW+CIgtYTQy+bwIbaw3SP1pVxaLokhO+ag5/1s="; + hash = "sha256-mlxw4OUjaAdgRLFfPKMZDMOWosW9yKAkzDccwuLGCwQ="; }; patches = [ diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index 9549edc2caeb..de0e20d93ff2 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation rec { pname = "libkrun"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "containers"; repo = "libkrun"; rev = "refs/tags/v${version}"; - hash = "sha256-R8JofaoqEM6IL4mr10kOWH0GfqwuyG2qkFjGR1+0fXw="; + hash = "sha256-LIp2/794gbHPweBJcHCjbF0m+bJAs0SPF7WivW7fxLI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-gPWTFl5YrlWDBXyksc9TidOzQf42bSJ05pdqtErk844="; + hash = "sha256-g4ceYi16mjEgvWTAQEW8ShT/e5IKnlgLgk49Mg0N2fQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 8d2a4044458e..693e1874bdf0 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation (finalAttrs: { pkg-config gettext python3 + python3.pkgs.build + python3.pkgs.installer + python3.pkgs.setuptools + python3.pkgs.wheel # Docs, man, info texinfo help2man @@ -58,7 +62,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' pushd python - python setup.py install --prefix="$out" --optimize=1 + python -m build --no-isolation --outdir dist/ --wheel + python -m installer --prefix $out dist/*.whl popd ''; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index a5a1983e615e..fb4207060033 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.3.0"; + version = "8.4.0"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - hash = "sha256-oXvx+tErGrF/X2x3ZiifuHIA6RlFMjTD7BZk13NL6Pg="; + hash = "sha256-VAs9O00g7Pn5AL9Vu6hwcY5QZy9U+izbEkrfOFeWzos="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/development/libraries/libopenshot-audio/default.nix index 005422295236..236b3026068f 100644 --- a/pkgs/development/libraries/libopenshot-audio/default.nix +++ b/pkgs/development/libraries/libopenshot-audio/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libopenshot-audio"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; rev = "v${finalAttrs.version}"; - hash = "sha256-PLpB9sy9xehipN5S9okCHm1mPm5MaZMVaFqCBvFUiTw="; + hash = "sha256-9iHeVMoyzTQae/PVYJqON0qOPo3SJlhrqbcp2u1Y8MA="; }; patches = [ diff --git a/pkgs/development/libraries/libopenshot/default.nix b/pkgs/development/libraries/libopenshot/default.nix index 4622dabb2983..0d83fa659e53 100644 --- a/pkgs/development/libraries/libopenshot/default.nix +++ b/pkgs/development/libraries/libopenshot/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libopenshot"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${finalAttrs.version}"; - hash = "sha256-axFGNq+Kg8atlaSlG8EKvxj/FwLfpDR8/e4otmnyosM="; + hash = "sha256-9X2UIRDD+1kNLbV8AnnPabdO2M0OfTDxQ7xyZtsE10k="; }; patches = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/libpam-wrapper/default.nix b/pkgs/development/libraries/libpam-wrapper/default.nix index 0701ae0fc55f..6ea6229f4dda 100644 --- a/pkgs/development/libraries/libpam-wrapper/default.nix +++ b/pkgs/development/libraries/libpam-wrapper/default.nix @@ -1,23 +1,34 @@ -{ lib, stdenv -, fetchgit -, cmake -, linux-pam -, enablePython ? false -, python ? null +{ + lib, + stdenv, + fetchgit, + cmake, + linux-pam, + substituteAll, + enablePython ? false, + python ? null, }: assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "libpam-wrapper"; - version = "1.1.3"; + version = "1.1.5"; src = fetchgit { url = "git://git.samba.org/pam_wrapper.git"; rev = "pam_wrapper-${version}"; - sha256 = "00mqhsashx7njrvxz085d0b88nizhdy7m3x17ip5yhvwsl63km6p"; + hash = "sha256-AtfkiCUvCxUfll6lOlbMyy5AhS5R2BGF1+ecC1VuwzM="; }; + patches = [ + (substituteAll { + src = ./python.patch; + siteDir = lib.optionalString enablePython python.sitePackages; + includeDir = lib.optionalString enablePython "include/${python.libPrefix}"; + }) + ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals enablePython [ python ]; # We must use linux-pam, using openpam will result in broken fprintd. diff --git a/pkgs/development/libraries/libpam-wrapper/python.patch b/pkgs/development/libraries/libpam-wrapper/python.patch new file mode 100644 index 000000000000..0ddb05d26fa9 --- /dev/null +++ b/pkgs/development/libraries/libpam-wrapper/python.patch @@ -0,0 +1,38 @@ +diff --git a/cmake/Modules/FindPythonSiteLibs.cmake b/cmake/Modules/FindPythonSiteLibs.cmake +index ab2931e..08e2c98 100644 +--- a/cmake/Modules/FindPythonSiteLibs.cmake ++++ b/cmake/Modules/FindPythonSiteLibs.cmake +@@ -27,30 +27,9 @@ + + if (PYTHON_EXECUTABLE) + ### PYTHON_SITELIB +- execute_process( +- COMMAND +- ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix=''))" +- OUTPUT_VARIABLE +- PYTHON_SITELIB_OUTPUT_VARIABLE +- RESULT_VARIABLE +- PYTHON_SITELIB_RESULT_VARIABLE +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ) +- if (NOT PYTHON_SITELIB_RESULT_VARIABLE) +- file(TO_CMAKE_PATH "${PYTHON_SITELIB_OUTPUT_VARIABLE}" PYTHON_SITELIB) +- endif () ++ file(TO_CMAKE_PATH "@siteDir@" PYTHON_SITELIB) ++ + + ### PYTHON_SITEINC +- execute_process( +- COMMAND +- ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc(plat_specific=True, prefix=''))" +- OUTPUT_VARIABLE +- PYTHON_SITEINC_OUTPUT_VARIABLE +- RESULT_VARIABLE +- PYTHON_SITEINC_RESULT_VARIABLE +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ) +- if (NOT PYTHON_SITEINC_RESULT_VARIABLE) +- file(TO_CMAKE_PATH "${PYTHON_SITEINC_OUTPUT_VARIABLE}" PYTHON_SITEINC) +- endif () ++ file(TO_CMAKE_PATH "@includeDir@" PYTHON_SITEINC) + endif (PYTHON_EXECUTABLE) diff --git a/pkgs/development/libraries/libpeas/2.x.nix b/pkgs/development/libraries/libpeas/2.x.nix index e2d1bf0f8231..f223231eaf0b 100644 --- a/pkgs/development/libraries/libpeas/2.x.nix +++ b/pkgs/development/libraries/libpeas/2.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libpeas"; - version = "2.0.2"; + version = "2.0.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-8w3/7WPKL0BHe0DhccCjH4DZFCW6Hh5HMg7mQlSA7MM="; + hash = "sha256-OeO1B8KdLQHfE0XpszgP16nQrrWy5lfTjmwr6lAj5fA="; }; patches = [ diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index 3a46a88f880b..9e1c6e94ee12 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libphonenumber"; - version = "8.13.39"; + version = "8.13.40"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; rev = "v${finalAttrs.version}"; - hash = "sha256-NfKdOTb/P7RXyvSiTZ/15alw9sBjqoGSOys/kcIXGWg="; + hash = "sha256-3I+/oLJVbgOA+o8jHhOuHhD+0s7sgOghnW7DTMCllBU="; }; patches = [ diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 5759d9bed505..c8f678ccbb9f 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { homepage = "https://code.videolan.org/videolan/libplacebo"; changelog = "https://code.videolan.org/videolan/libplacebo/-/tags/v${version}"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ primeos tadeokondrak ]; + maintainers = with maintainers; [ primeos ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix index 9ce3241e8fbb..a8a8c3e77e08 100644 --- a/pkgs/development/libraries/libslirp/default.nix +++ b/pkgs/development/libraries/libslirp/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-avUbgXPPV3IhUwZyARxCvctbVlLqDKWmMhAjdVBA3jY="; + sha256 = "sha256-t2LpOPx+S2iABQv3+xFdHj/FjWns40cNKToDKMZhAuw="; }; separateDebugInfo = true; diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index dc282886b963..fae57569067a 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , pkg-config -, freeglut +, libglut , lapack , libusb1 , blas @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - freeglut + libglut lapack libusb1 blas diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix index a88b427e3349..0406c3dbafb1 100644 --- a/pkgs/development/libraries/libthai/default.nix +++ b/pkgs/development/libraries/libthai/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Set of Thai language support routines"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; pkgConfigModules = [ "libthai" ]; }; } diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index f1e5c7da1803..b66c8c288bc8 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , nix-update-script , autoreconfHook @@ -43,6 +44,15 @@ stdenv.mkDerivation (finalAttrs: { # libc++abi 11 has an `#include `, this picks up files name # `version` in the project's include paths ./rename-version.patch + # Fix static linking of `libtiff` via `pkg-config` not working + # because `libtiff` does not declare `Lerc` dependency. + # nixpkgs has `lerc` >= 4 which provides a `.pc` file. + # TODO: Close when https://gitlab.com/libtiff/libtiff/-/merge_requests/633 is merged and available + (fetchpatch { + name = "libtiff-4.pc-Fix-Requires.private-missing-Lerc.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/ea882c3c240c14a897b9be38d815cc1893aafa59.patch"; + hash = "sha256-C0xA3k1sgKmGJjEnyG9UxhXqYBYShKUDQsyjhbEDJbQ="; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 118d143e2cd5..55c284987a9b 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -25,10 +25,13 @@ in stdenv.mkDerivation { buildInputs = [ boostPython openssl zlib python ncurses ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + patches = [ + # provide distutils alternative for python 3.12 + ./distutils.patch + ]; + # https://github.com/arvidn/libtorrent/issues/6865 postPatch = '' - substituteInPlace cmake/Modules/GeneratePkgConfig.cmake \ - --replace @CMAKE_INSTALL_PREFIX@/'$<'1: '$<'1: substituteInPlace cmake/Modules/GeneratePkgConfig/target-compile-settings.cmake.in \ --replace 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")' \ 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@") diff --git a/pkgs/development/libraries/libtorrent-rasterbar/distutils.patch b/pkgs/development/libraries/libtorrent-rasterbar/distutils.patch new file mode 100644 index 000000000000..57c90b69808c --- /dev/null +++ b/pkgs/development/libraries/libtorrent-rasterbar/distutils.patch @@ -0,0 +1,20 @@ +diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt +index 2f4de4854..a68d547e6 100644 +--- a/bindings/python/CMakeLists.txt ++++ b/bindings/python/CMakeLists.txt +@@ -95,8 +95,13 @@ if (python-install-system-dir) + else() + execute_process( + COMMAND "${Python3_EXECUTABLE}" -c [=[ +-import distutils.sysconfig +-print(distutils.sysconfig.get_python_lib(prefix='', plat_specific=True)) ++try: ++ import distutils.sysconfig ++ print(distutils.sysconfig.get_python_lib(prefix='', plat_specific=True)) ++except ModuleNotFoundError: ++ import os, sys ++ version = f"{sys.version_info.major}.{sys.version_info.minor}" ++ print(os.sep.join(["lib", f"python{version}", "site-packages"])) + ]=] + OUTPUT_VARIABLE _PYTHON3_SITE_ARCH + OUTPUT_STRIP_TRAILING_WHITESPACE diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 51eb5558d626..e865873c2851 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libiconv }: +{ fetchurl, lib, stdenv, libiconv, updateAutotoolsGnuConfigScriptsHook }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { strictDeps = true; propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; configureFlags = [ "--with-libiconv-prefix=${libiconv}" diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index a42aab3d59e8..95df981d02e7 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -1,44 +1,66 @@ -{ lib, stdenv, fetchgit }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "liburing"; - version = "2.5"; + version = "2.6"; - src = fetchgit { - url = "http://git.kernel.dk/${pname}"; - rev = "liburing-${version}"; - sha256 = "sha256-hPyEZ0P1rfos53OCNd2OYFiqmv6TgpWaj5/xPLccCvM="; + src = fetchFromGitHub { + owner = "axboe"; + repo = "liburing"; + rev = "refs/tags/liburing-${version}"; + hash = "sha256-UOhnFT4UKZmPchKxew3vYeKH2oETDVylE1RmJ2hnLq0="; }; separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. setOutputFlags = false; + dontDisableStatic = true; + dontAddStaticConfigureFlags = true; configureFlags = [ "--includedir=${placeholder "dev"}/include" "--mandir=${placeholder "man"}/share/man" ]; - # Doesn't recognize platform flags - configurePlatforms = []; + # mysterious link failure + hardeningDisable = [ "trivialautovarinit" ]; - outputs = [ "out" "bin" "dev" "man" ]; + # Doesn't recognize platform flags + configurePlatforms = [ ]; + + outputs = [ + "out" + "bin" + "dev" + "man" + ]; postInstall = '' - # Copy the examples into $bin. Most reverse dependency of this package should - # reference only the $out output - mkdir -p $bin/bin - cp ./examples/io_uring-cp examples/io_uring-test $bin/bin - cp ./examples/link-cp $bin/bin/io_uring-link-cp - '' + lib.optionalString stdenv.hostPlatform.isGnu '' - cp ./examples/ucontext-cp $bin/bin/io_uring-ucontext-cp + # Always builds both static and dynamic libraries, so we need to remove the + # libraries that don't match stdenv type. + rm $out/lib/liburing*${ + if stdenv.hostPlatform.isStatic then ".so*" else ".a" + } + + # Copy the examples into $bin. Most reverse dependency of + # this package should reference only the $out output + for file in $(find ./examples -executable -type f); do + install -Dm555 -t "$bin/bin" "$file" + done ''; meta = with lib; { description = "Userspace library for the Linux io_uring API"; - homepage = "https://git.kernel.dk/cgit/liburing/"; - license = licenses.lgpl21; - platforms = platforms.linux; - maintainers = with maintainers; [ thoughtpolice nickcao ]; + homepage = "https://github.com/axboe/liburing"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ + thoughtpolice + nickcao + ]; }; } diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix index 63be647f015a..1a9c7309e542 100644 --- a/pkgs/development/libraries/libva/1.nix +++ b/pkgs/development/libraries/libva/1.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # TODO: share libs between minimal and !minimal - perhaps just symlink them # Add FHS paths for non-NixOS applications. - configureFlags = [ "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] + configureFlags = lib.optionals stdenv.isLinux [ "--with-drivers-path=${mesa.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index eceba4ac8ebf..aad42d7e51f8 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libX11 libXext libXfixes wayland libffi libGL ]; - mesonFlags = [ + mesonFlags = lib.optionals stdenv.isLinux [ # Add FHS and Debian paths for non-NixOS applications - "-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/i386-linux-gnu/dri" + "-Ddriverdir=${mesa.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/i386-linux-gnu/dri" ]; passthru.tests = { diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 906a3c59234a..8c1c3b7c5e9c 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ xorg.libX11 ]; - mesonFlags = lib.optionals stdenv.isLinux - [ "-Dmoduledir=${mesa.drivers.driverLink}/lib/vdpau" ]; + mesonFlags = lib.optionals stdenv.isLinux [ "-Dmoduledir=${mesa.driverLink}/lib/vdpau" ]; NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lX11"; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 097f19a29366..63cc42bd706f 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -115,13 +115,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # # SysVirt in - version = "10.4.0"; + version = "10.5.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-grQyILVy0IYbbz/Wau8QRfCub7j+5nhnkfs2tprfpO0="; + hash = "sha256-Nku4l1f34NOUr23KWDH9uZu72OgMK3KfYjsRRbuTvf8="; fetchSubmodules = true; }; @@ -163,6 +163,7 @@ stdenv.mkDerivation rec { sed -i '/qemuhotplugtest/d' tests/meson.build sed -i '/qemuvhostusertest/d' tests/meson.build sed -i '/qemuxml2xmltest/d' tests/meson.build + sed -i '/domaincapstest/d' tests/meson.build ''; strictDeps = true; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 5f5fc710d14d..f028a1ca7333 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -36,6 +36,10 @@ , experimentalSpatialSvcSupport ? false # Spatial scalable video coding , experimentalFpMbStatsSupport ? false , experimentalEmulateHardwareSupport ? false + +# for passthru.tests +, ffmpeg +, gst_all_1 }: let @@ -89,13 +93,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { pname = "libvpx"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - hash = "sha256-duU1exUg7JiKCtZfNxyb/y40hxsXeTIMShf9YounTWA="; + hash = "sha256-Pfg7g4y/dqn2VKDQU1LnTJQSj1Tont9/8Je6ShDb2GQ="; }; postPatch = '' @@ -198,6 +202,11 @@ stdenv.mkDerivation rec { postInstall = ''moveToOutput bin "$bin" ''; + passthru.tests = { + inherit (gst_all_1) gst-plugins-good; + ffmpeg = ffmpeg.override { withVpx = true; }; + }; + meta = with lib; { description = "WebM VP8/VP9 codec SDK"; homepage = "https://www.webmproject.org/"; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 58c9b7c7f666..22aab5c66944 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -8,14 +8,13 @@ , udev , libevdev , libgudev -, libxml2 , python3 , valgrind }: stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.11.0"; + version = "2.12.2"; outputs = [ "out" "dev" ]; @@ -23,7 +22,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - hash = "sha256-TQOe954Zos3VpAG5M/O5je9dr8d4gOXIwy4xl3o+e1g="; + hash = "sha256-dxnXh+O/8q8ShsPbpqvaBPNQR6lJBphBolYTmcJEF/0="; }; postPatch = '' @@ -53,10 +52,6 @@ stdenv.mkDerivation rec { "-Dtests=${if doCheck then "enabled" else "disabled"}" ]; - checkInputs = [ - libxml2 - ]; - nativeCheckInputs = [ valgrind (python3.withPackages (ps: with ps; [ diff --git a/pkgs/development/libraries/libwacom/surface.nix b/pkgs/development/libraries/libwacom/surface.nix index 54f5c424fda3..0d6ec49a6a5b 100644 --- a/pkgs/development/libraries/libwacom/surface.nix +++ b/pkgs/development/libraries/libwacom/surface.nix @@ -7,8 +7,8 @@ let libwacom-surface = fetchFromGitHub { owner = "linux-surface"; repo = "libwacom-surface"; - rev = "v2.10.0-1"; - hash = "sha256-5/9X20veXazXEdSDGY5aMGQixulqMlC5Av0NGOF9m98="; + rev = "v2.12.0-1"; + hash = "sha256-z/qNXbe89/0GIDj0BDQY6xdjHKA9chAPpviHPtBLjFM="; }; in libwacom.overrideAttrs (old: { pname = "libwacom-surface"; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 2662d4e94008..184a48adf0dd 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool , threadingSupport ? true # multi-threading -, openglSupport ? false, freeglut, libGL, libGLU # OpenGL (required for vwebp) +, openglSupport ? false, libglut, libGL, libGLU # OpenGL (required for vwebp) , pngSupport ? true, libpng # PNG image format , jpegSupport ? true, libjpeg # JPEG image format , tiffSupport ? true, libtiff # TIFF image format @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libtool ]; buildInputs = [ ] - ++ lib.optionals openglSupport [ freeglut libGL libGLU ] + ++ lib.optionals openglSupport [ libglut libGL libGLU ] ++ lib.optionals pngSupport [ libpng ] ++ lib.optionals jpegSupport [ libjpeg ] ++ lib.optionals tiffSupport [ libtiff ] diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 7c635eb98b69..6994398eaa90 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -13,7 +13,7 @@ , libX11 # To enable the "interactive-wayland" subcommand of xkbcli. This is the # wayland equivalent of `xev` on X11. -, xorgserver # for Xvfb in tests +, xorg , withWaylandTools ? stdenv.isLinux , wayland , wayland-protocols @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" "doc" ]; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config bison doxygen xorgserver ] + nativeBuildInputs = [ meson ninja pkg-config bison doxygen xorg.xvfb ] ++ lib.optional withWaylandTools wayland-scanner; buildInputs = [ xkeyboard_config libxcb libxml2 ] ++ lib.optionals withWaylandTools [ wayland wayland-protocols ]; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 1938c523006b..df04c749d07e 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -15,16 +15,16 @@ , gnome }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libxslt"; - version = "1.1.39"; + version = "1.1.41"; outputs = [ "bin" "dev" "out" "doc" "devdoc" ] ++ lib.optional pythonSupport "py"; outputMan = "bin"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-KiCtYhFIM5sHWcTU6WcZNi3uZMmgltu6YlugU4RjSfA="; + url = "mirror://gnome/sources/libxslt/${lib.versions.majorMinor finalAttrs.version}/libxslt-${finalAttrs.version}.tar.xz"; + hash = "sha256-OtOSr5ERW3dA97UNIozBxfwTr8HafxbLAhORejf3G9o="; }; strictDeps = true; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { inherit pythonSupport; updateScript = gnome.updateScript { - packageName = pname; + packageName = "libxslt"; versionPolicy = "none"; }; }; @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ eelco jtojnar ]; broken = pythonSupport && !libxml2.pythonSupport; # see #73102 for why this is not an assert }; -} +}) diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 43f9065dfa61..cb7038d5355c 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; homepage = "https://gitlab.gnome.org/Archive/libzapojit"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index bcff20f1847c..138e7f247c13 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , meson, ninja -, pkg-config, libGL, ApplicationServices +, pkg-config, libGLX , testers , gitUpdater }: @@ -17,8 +17,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ meson ninja pkg-config ]; - propagatedBuildInputs = [ libGL ] - ++ lib.optional stdenv.isDarwin ApplicationServices; + propagatedBuildInputs = [ libGLX ]; outputs = [ "out" "dev" ]; @@ -35,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { # No nicer place to find latest release. url = "https://gitlab.freedesktop.org/mesa/glu"; - rev-prefix = "glu-"; + rev-prefix = "glu-"; }; }; diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix new file mode 100644 index 000000000000..b42403d10aee --- /dev/null +++ b/pkgs/development/libraries/mesa/common.nix @@ -0,0 +1,31 @@ +{ lib, fetchurl }: +rec { + pname = "mesa"; + version = "24.1.2"; + + src = fetchurl { + urls = [ + "https://archive.mesa3d.org/mesa-${version}.tar.xz" + "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" + ]; + hash = "sha256-osWEyNV9O9i6EXkKbprjcT+IId+WwFm3ivsp3Zdcn0U="; + }; + + meta = { + description = "Open source 3D graphics library"; + longDescription = '' + The Mesa project began as an open-source implementation of the OpenGL + specification - a system for rendering interactive 3D graphics. Over the + years the project has grown to implement more graphics APIs, including + OpenGL ES (versions 1, 2, 3), OpenCL, OpenMAX, VDPAU, VA API, XvMC, and + Vulkan. A variety of device drivers allows the Mesa libraries to be used + in many different environments ranging from software emulation to + complete hardware acceleration for modern GPUs. + ''; + homepage = "https://www.mesa3d.org/"; + changelog = "https://www.mesa3d.org/relnotes/${version}.html"; + license = with lib.licenses; [ mit ]; # X11 variant, in most files + platforms = lib.platforms.mesaPlatforms; + maintainers = with lib.maintainers; [ primeos vcunat ]; # Help is welcome :) + }; +} diff --git a/pkgs/development/libraries/mesa/darwin.nix b/pkgs/development/libraries/mesa/darwin.nix new file mode 100644 index 000000000000..aeeb8ab7648b --- /dev/null +++ b/pkgs/development/libraries/mesa/darwin.nix @@ -0,0 +1,53 @@ +# The Darwin build of Mesa is different enough that we just give it an entire separate expression. +{ + lib, + stdenv, + fetchurl, + bison, + flex, + meson, + ninja, + pkg-config, + python3Packages, + Xplugin, + xorg, + zlib, +}: +let + common = import ./common.nix { inherit lib fetchurl; }; +in stdenv.mkDerivation { + inherit (common) pname version src meta; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + bison + flex + meson + ninja + pkg-config + python3Packages.packaging + python3Packages.python + python3Packages.mako + ]; + + buildInputs = [ + Xplugin + xorg.libX11 + xorg.libXext + xorg.libXfixes + zlib + ]; + + mesonAutoFeatures = "disabled"; + + mesonFlags = [ + "--sysconfdir=/etc" + "--datadir=${placeholder "out"}/share" + (lib.mesonEnable "glvnd" false) + (lib.mesonEnable "shared-glapi" true) + ]; + + # Don't need this on Darwin. + passthru.llvmpipeHook = null; +} diff --git a/pkgs/development/libraries/mesa/darwin.patch b/pkgs/development/libraries/mesa/darwin.patch deleted file mode 100644 index 4649e09afb5f..000000000000 --- a/pkgs/development/libraries/mesa/darwin.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/glx/glxext.c b/src/glx/glxext.c -index 8770863eb7c..537f0af112c 100644 ---- a/src/glx/glxext.c -+++ b/src/glx/glxext.c -@@ -886,10 +886,11 @@ __glXInitialize(Display * dpy) - Bool zink = False; - Bool try_zink = False; - -+ const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE"); -+ - #if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE)) - Bool glx_direct = !debug_get_bool_option("LIBGL_ALWAYS_INDIRECT", false); - Bool glx_accel = !debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false); -- const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE"); - - zink = env && !strcmp(env, "zink"); - try_zink = False; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index af5baf1bc3a5..43aa88034168 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,6 +1,4 @@ { lib -, OpenGL -, Xplugin , bison , buildPackages , directx-headers @@ -14,7 +12,6 @@ , intltool , jdupes , libdrm -, libffi , libglvnd , libomxil-bellagio , libunwind @@ -24,7 +21,6 @@ , lm_sensors , meson , ninja -, openssl , pkg-config , python3Packages , rust-bindgen @@ -42,19 +38,9 @@ , xcbutilkeysyms , xorg , zstd -, withValgrind ? - lib.meta.availableOn stdenv.hostPlatform valgrind-light - && !valgrind-light.meta.broken -, withLibunwind ? lib.meta.availableOn stdenv.hostPlatform libunwind -, enableGalliumNine ? stdenv.isLinux -, enableOSMesa ? stdenv.isLinux -, enableOpenCL ? stdenv.isLinux && stdenv.isx86_64 -, enableTeflon ? stdenv.isLinux && stdenv.isAarch64 # currently only supports aarch64 SoCs, may change in the future , enablePatentEncumberedCodecs ? true -, galliumDrivers ? - if stdenv.isLinux - then [ +, galliumDrivers ? [ "d3d12" # WSL emulated GPU (aka Dozen) "iris" # new Intel (Broadwell+) "kmsro" # special "render only" driver for GPUs without a display controller @@ -79,10 +65,7 @@ "crocus" # Intel legacy, x86 only "i915" # Intel extra legacy, x86 only ] - else [ "auto" ] -, vulkanDrivers ? - if stdenv.isLinux - then [ +, vulkanDrivers ? [ "amd" # AMD (aka RADV) "intel" # new Intel (aka ANV) "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) @@ -100,32 +83,20 @@ ] ++ lib.optionals stdenv.hostPlatform.isx86 [ "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) ] - else [ "auto" ] -, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] -, vulkanLayers ? lib.optionals (!stdenv.isDarwin) [ # No Vulkan support on Darwin - "device-select" - "overlay" - "intel-nullhw" -] +, eglPlatforms ? [ "x11" "wayland" ] +, vulkanLayers ? [ + "device-select" + "overlay" + "intel-nullhw" + ] +, mesa +, makeSetupHook }: # When updating this package, please verify at least these build (assuming x86_64-linux): # nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa let - version = "24.1.1"; - hash = "sha256-ADiCbG9+iNkLTOb3GRkvpYyn3t9O3KoRdM972SDvieo="; - - # Release calendar: https://www.mesa3d.org/release-calendar.html - # Release frequency: https://www.mesa3d.org/releasing.html#schedule - branch = lib.versions.major version; - - withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; - - haveWayland = lib.elem "wayland" eglPlatforms; - haveZink = lib.elem "zink" galliumDrivers; - haveDozen = (lib.elem "d3d12" galliumDrivers) || (lib.elem "microsoft-experimental" vulkanDrivers); - rustDeps = [ { pname = "paste"; @@ -162,28 +133,13 @@ let copyRustDeps = lib.concatStringsSep "\n" (builtins.map copyRustDep rustDeps); needNativeCLC = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; -self = stdenv.mkDerivation { - pname = "mesa"; - inherit version; - src = fetchurl { - urls = [ - "https://archive.mesa3d.org/mesa-${version}.tar.xz" - "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" - "ftp://ftp.freedesktop.org/pub/mesa/mesa-${version}.tar.xz" - "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" - "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" - ]; - inherit hash; - }; + common = import ./common.nix { inherit lib fetchurl; }; +in stdenv.mkDerivation { + inherit (common) pname version src meta; patches = [ ./opencl.patch - ] ++ lib.optionals stdenv.isDarwin [ - # Reorder things to make it build on Darwin again - # Submitted upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29592 - # FIXME: remove when merged or otherwise addressed - ./darwin.patch ]; postPatch = '' @@ -201,16 +157,7 @@ self = stdenv.mkDerivation { ''; outputs = [ - "out" "dev" "drivers" - ] ++ lib.optionals enableOSMesa [ - "osmesa" - ] ++ lib.optionals stdenv.isLinux [ - "driversdev" - ] ++ lib.optionals enableTeflon [ - "teflon" - ] ++ lib.optionals enableOpenCL [ - "opencl" - ] ++ lib.optionals haveDozen [ + "out" "dev" "drivers" "driversdev" "opencl" "teflon" "osmesa" # the Dozen drivers depend on libspirv2dxil, but link it statically, and # libspirv2dxil itself is pretty chonky, so relocate it to its own output in # case anything wants to use it at some point @@ -228,69 +175,49 @@ self = stdenv.mkDerivation { mesonFlags = [ "--sysconfdir=/etc" - "--datadir=${placeholder "drivers"}/share" # Vendor files - - # Don't build in debug mode - # https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/meson.html#L327 - (lib.mesonBool "b_ndebug" true) - - (lib.mesonOption "dri-search-path" "${libglvnd.driverLink}/lib/dri") + "--datadir=${placeholder "drivers"}/share" + # What to build (lib.mesonOption "platforms" (lib.concatStringsSep "," eglPlatforms)) (lib.mesonOption "gallium-drivers" (lib.concatStringsSep "," galliumDrivers)) (lib.mesonOption "vulkan-drivers" (lib.concatStringsSep "," vulkanDrivers)) + (lib.mesonOption "vulkan-layers" (builtins.concatStringsSep "," vulkanLayers)) + # Make sure we know where to find all the drivers (lib.mesonOption "dri-drivers-path" "${placeholder "drivers"}/lib/dri") (lib.mesonOption "vdpau-libs-path" "${placeholder "drivers"}/lib/vdpau") (lib.mesonOption "omx-libs-path" "${placeholder "drivers"}/lib/bellagio") (lib.mesonOption "va-libs-path" "${placeholder "drivers"}/lib/dri") (lib.mesonOption "d3d-drivers-path" "${placeholder "drivers"}/lib/d3d") - (lib.mesonBool "gallium-nine" enableGalliumNine) # Direct3D in Wine - (lib.mesonBool "osmesa" enableOSMesa) # used by wine - (lib.mesonBool "teflon" enableTeflon) # TensorFlow frontend - (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) - - # To enable non-mesa gbm backends to be found (e.g. Nvidia) + # Set search paths for non-Mesa drivers (e.g. Nvidia) + (lib.mesonOption "dri-search-path" "${libglvnd.driverLink}/lib/dri") (lib.mesonOption "gbm-backends-path" "${libglvnd.driverLink}/lib/gbm:${placeholder "out"}/lib/gbm") - # meson auto_features enables these features, but we do not want them - (lib.mesonEnable "android-libbacktrace" false) - ] ++ lib.optionals stdenv.isLinux [ + # Enable glvnd for dynamic libGL dispatch (lib.mesonEnable "glvnd" true) + + (lib.mesonBool "gallium-nine" true) # Direct3D in Wine + (lib.mesonBool "osmesa" true) # used by wine + (lib.mesonBool "teflon" true) # TensorFlow frontend + + # Enable Intel RT stuff when available (lib.mesonBool "install-intel-clc" true) (lib.mesonEnable "intel-rt" stdenv.isx86_64) (lib.mesonOption "clang-libdir" "${llvmPackages.clang-unwrapped.lib}/lib") - ] ++ lib.optionals stdenv.isDarwin [ - # Disable features that are explicitly unsupported on the platform - (lib.mesonEnable "gbm" false) - (lib.mesonEnable "xlib-lease" false) - (lib.mesonEnable "egl" false) - (lib.mesonEnable "gallium-vdpau" false) - (lib.mesonEnable "gallium-va" false) - (lib.mesonEnable "gallium-xa" false) - (lib.mesonEnable "lmsensors" false) - # Don’t build with glvnd support to make sure Mesa builds libGL on Darwin - (lib.mesonEnable "glvnd" false) - # This gets enabled by mesonAutoFeatures and fails on aarch64-darwin, - # which makes no sense because Darwin has neither Intel nor RT, but OK - (lib.mesonEnable "intel-rt" false) - ] ++ lib.optionals enableOpenCL [ + # Clover, old OpenCL frontend (lib.mesonOption "gallium-opencl" "icd") (lib.mesonBool "opencl-spirv" true) # Rusticl, new OpenCL frontend (lib.mesonBool "gallium-rusticl" true) - ] ++ lib.optionals (!withValgrind) [ - (lib.mesonEnable "valgrind" false) - ] ++ lib.optionals (!withLibunwind) [ - (lib.mesonEnable "libunwind" false) - ] - ++ lib.optionals enablePatentEncumberedCodecs [ + + # meson auto_features enables this, but we do not want it + (lib.mesonEnable "android-libbacktrace" false) + (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) + ] ++ lib.optionals enablePatentEncumberedCodecs [ (lib.mesonOption "video-codecs" "all") - ] ++ lib.optionals (vulkanLayers != []) [ - (lib.mesonOption "vulkan-layers" (builtins.concatStringsSep "," vulkanLayers)) ] ++ lib.optionals needNativeCLC [ (lib.mesonOption "intel-clc" "system") ]; @@ -298,61 +225,41 @@ self = stdenv.mkDerivation { strictDeps = true; buildInputs = with xorg; [ + directx-headers + elfutils expat glslang - libffi libglvnd + libomxil-bellagio + libunwind + libva-minimal libvdpau - llvmPackages.libllvm - openssl - zstd - ] ++ (with xorg; [ libX11 + libxcb libXext libXfixes libXrandr - libXt - libXvMC - libpthreadstubs - libxcb libxshmfence - xcbutilkeysyms - xorgproto - ]) ++ lib.optionals withLibunwind [ - libunwind - ] ++ [ - python3Packages.python # for shebang - ] ++ lib.optionals haveWayland [ - wayland - wayland-protocols - ] ++ lib.optionals stdenv.isLinux [ - libomxil-bellagio - libva-minimal + libXxf86vm + llvmPackages.clang llvmPackages.clang-unwrapped llvmPackages.libclc + llvmPackages.libllvm lm_sensors + python3Packages.python # for shebang spirv-llvm-translator udev - ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ - elfutils - ] ++ lib.optionals enableOpenCL [ - llvmPackages.clang - ] ++ lib.optionals withValgrind [ valgrind-light - ] ++ lib.optionals haveZink [ vulkan-loader - ] ++ lib.optionals haveDozen [ - directx-headers + wayland + wayland-protocols + xcbutilkeysyms + xorgproto + zstd ]; depsBuildBuild = [ pkg-config - ] ++ lib.optionals (!stdenv.isDarwin) [ - # Adding this unconditionally makes x86_64-darwin pick up an older - # toolchain, as we explicitly call Mesa with 11.0 stdenv, but buildPackages - # is still 10.something, and Mesa can't build with that. - # FIXME: figure this out, or figure out how to get rid of Mesa on Darwin, - # whichever is easier. buildPackages.stdenv.cc ]; @@ -365,6 +272,7 @@ self = stdenv.mkDerivation { flex file python3Packages.python + python3Packages.packaging python3Packages.pycparser python3Packages.mako python3Packages.ply @@ -374,7 +282,6 @@ self = stdenv.mkDerivation { rust-bindgen rust-cbindgen rustPlatform.bindgenHook - ] ++ lib.optionals haveWayland [ wayland-scanner ] ++ lib.optionals needNativeCLC [ buildPackages.mesa.driversdev @@ -384,74 +291,48 @@ self = stdenv.mkDerivation { buildPackages.mesa.driversdev ]; - propagatedBuildInputs = (with xorg; [ - libXdamage - libXxf86vm - ]) ++ lib.optionals withLibdrm [ - libdrm - ] ++ lib.optionals stdenv.isDarwin [ - OpenGL - Xplugin - ]; + propagatedBuildInputs = [ libdrm ]; doCheck = false; postInstall = '' - # Some installs don't have any drivers so this directory is never created. - mkdir -p $drivers $osmesa - '' + lib.optionalString stdenv.isLinux '' - mkdir -p $drivers/lib + # Move driver-related bits to $drivers + moveToOutput "lib/lib*_mesa*" $drivers + moveToOutput "lib/libpowervr_rogue*" $drivers + moveToOutput "lib/libxatracker*" $drivers + moveToOutput "lib/libvulkan_*" $drivers - if [ -n "$(shopt -s nullglob; echo "$out/lib/libxatracker"*)" -o -n "$(shopt -s nullglob; echo "$out/lib/libvulkan_"*)" ]; then - # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM - mv -t $drivers/lib \ - $out/lib/libpowervr_rogue* \ - $out/lib/libxatracker* \ - $out/lib/libvulkan_* - fi - - if [ -n "$(shopt -s nullglob; echo "$out"/lib/lib*_mesa*)" ]; then - # Move other drivers to a separate output - mv -t $drivers/lib $out/lib/lib*_mesa* - fi - - # Update search path used by glvnd + # Update search path used by glvnd (it's pointing to $out but drivers are in $drivers) for js in $drivers/share/glvnd/egl_vendor.d/*.json; do - substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" + substituteInPlace "$js" --replace-fail '"libEGL_' '"'"$drivers/lib/libEGL_" done - # Update search path used by Vulkan (it's pointing to $out but - # drivers are in $drivers) + # And same for Vulkan for js in $drivers/share/vulkan/icd.d/*.json; do - substituteInPlace "$js" --replace "$out" "$drivers" + substituteInPlace "$js" --replace-fail "$out" "$drivers" done - '' + lib.optionalString enableOpenCL '' - # Move OpenCL stuff - mkdir -p $opencl/lib - mv -t "$opencl/lib/" \ - $out/lib/gallium-pipe \ - $out/lib/lib*OpenCL* - # We construct our own .icd files that contain absolute paths. - mkdir -p $opencl/etc/OpenCL/vendors/ - echo $opencl/lib/libMesaOpenCL.so > $opencl/etc/OpenCL/vendors/mesa.icd - echo $opencl/lib/libRusticlOpenCL.so > $opencl/etc/OpenCL/vendors/rusticl.icd - '' + lib.optionalString enableOSMesa '' - # move libOSMesa to $osmesa, as it's relatively big - mkdir -p $osmesa/lib - mv -t $osmesa/lib/ $out/lib/libOSMesa* - '' + lib.optionalString (vulkanLayers != []) '' - mv -t $drivers/lib $out/lib/libVkLayer* + # Move Vulkan layers to $drivers and update manifests + moveToOutput "lib/libVkLayer*" $drivers for js in $drivers/share/vulkan/{im,ex}plicit_layer.d/*.json; do substituteInPlace "$js" --replace '"libVkLayer_' '"'"$drivers/lib/libVkLayer_" done - '' + lib.optionalString haveDozen '' - mkdir -p $spirv2dxil/{bin,lib} - mv -t $spirv2dxil/lib $out/lib/libspirv_to_dxil* - mv -t $spirv2dxil/bin $out/bin/spirv2dxil + + # Construct our own .icd files that contain absolute paths. + mkdir -p $opencl/etc/OpenCL/vendors/ + echo $opencl/lib/libMesaOpenCL.so > $opencl/etc/OpenCL/vendors/mesa.icd + echo $opencl/lib/libRusticlOpenCL.so > $opencl/etc/OpenCL/vendors/rusticl.icd + + moveToOutput bin/intel_clc $driversdev + moveToOutput lib/gallium-pipe $opencl + moveToOutput "lib/lib*OpenCL*" $opencl + moveToOutput "lib/libOSMesa*" $osmesa + moveToOutput bin/spirv2dxil $spirv2dxil + moveToOutput "lib/libspirv_to_dxil*" $spirv2dxil + moveToOutput lib/libteflon.so $teflon ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = '' # set the default search path for DRI drivers; used e.g. by X server for pc in lib/pkgconfig/{dri,d3d}.pc; do [ -f "$dev/$pc" ] && substituteInPlace "$dev/$pc" --replace "$drivers" "${libglvnd.driverLink}" @@ -471,8 +352,6 @@ self = stdenv.mkDerivation { fi done - moveToOutput bin/intel_clc $driversdev - # Don't depend on build python patchShebangs --host --update $out/bin/* @@ -486,59 +365,31 @@ self = stdenv.mkDerivation { patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib" fi done - # add RPATH here so Zink can find libvulkan.so - ${lib.optionalString haveZink '' - patchelf --add-rpath ${vulkan-loader}/lib $drivers/lib/dri/zink_dri.so - ''} - ${lib.optionalString enableTeflon '' - moveToOutput lib/libteflon.so $teflon - ''} + # add RPATH here so Zink can find libvulkan.so + patchelf --add-rpath ${vulkan-loader}/lib $drivers/lib/dri/zink_dri.so ''; - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals stdenv.isDarwin [ - "-fno-common" - ] ++ lib.optionals enableOpenCL [ - "-UPIPE_SEARCH_DIR" - "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\"" + env.NIX_CFLAGS_COMPILE = toString ([ + "-UPIPE_SEARCH_DIR" + "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\"" ]); passthru = { inherit (libglvnd) driverLink; inherit llvmPackages; - libdrm = if withLibdrm then libdrm else null; - - tests = lib.optionalAttrs stdenv.isLinux { - devDoesNotDependOnLLVM = stdenv.mkDerivation { - name = "mesa-dev-does-not-depend-on-llvm"; - buildCommand = '' - echo ${self.dev} >>$out - ''; - disallowedRequisites = [ llvmPackages.llvm self.drivers ]; - }; + tests.devDoesNotDependOnLLVM = stdenv.mkDerivation { + name = "mesa-dev-does-not-depend-on-llvm"; + buildCommand = '' + echo ${mesa.dev} >>$out + ''; + disallowedRequisites = [ llvmPackages.llvm mesa.drivers ]; }; - }; - meta = { - description = "Open source 3D graphics library"; - longDescription = '' - The Mesa project began as an open-source implementation of the OpenGL - specification - a system for rendering interactive 3D graphics. Over the - years the project has grown to implement more graphics APIs, including - OpenGL ES (versions 1, 2, 3), OpenCL, OpenMAX, VDPAU, VA API, XvMC, and - Vulkan. A variety of device drivers allows the Mesa libraries to be used - in many different environments ranging from software emulation to - complete hardware acceleration for modern GPUs. - ''; - homepage = "https://www.mesa3d.org/"; - changelog = "https://www.mesa3d.org/relnotes/${version}.html"; - license = with lib.licenses; [ mit ]; # X11 variant, in most files - platforms = lib.platforms.mesaPlatforms; - badPlatforms = []; # Load bearing for libGL meta on Darwin. - maintainers = with lib.maintainers; [ primeos vcunat ]; # Help is welcome :) + llvmpipeHook = makeSetupHook { + name = "llvmpipe-hook"; + substitutions.drivers = mesa.drivers; + } ./llvmpipe-hook.sh; }; -}; - -in self +} diff --git a/pkgs/development/libraries/mesa/llvmpipe-hook.sh b/pkgs/development/libraries/mesa/llvmpipe-hook.sh new file mode 100644 index 000000000000..6217182b15e8 --- /dev/null +++ b/pkgs/development/libraries/mesa/llvmpipe-hook.sh @@ -0,0 +1,14 @@ +# shellcheck shell=bash + +# https://docs.mesa3d.org/envvars.html +export LIBGL_ALWAYS_SOFTWARE=true +export LIBGL_DRIVERS_PATH=@drivers@/lib/dri + +# https://github.com/NVIDIA/libglvnd/blob/master/src/EGL/icd_enumeration.md +export __EGL_VENDOR_LIBRARY_FILENAMES=@drivers@/share/glvnd/egl_vendor.d/50_mesa.json + +# https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md +# glob because the filenames contain an architecture suffix +# echo is needed to force-expand the glob +VK_DRIVER_FILES="$(echo @drivers@/share/vulkan/icd.d/lvp_icd.*.json)" +export VK_DRIVER_FILES diff --git a/pkgs/development/libraries/mesa/stubs.nix b/pkgs/development/libraries/mesa/stubs.nix deleted file mode 100644 index f9c462e9b326..000000000000 --- a/pkgs/development/libraries/mesa/stubs.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv -, libglvnd -, mesa -, OpenGL -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libGL"; - inherit (if stdenv.hostPlatform.isDarwin then mesa else libglvnd) version; - outputs = [ "out" "dev" ]; - - # On macOS, libglvnd is not supported, so we just use what mesa - # build. We need to also include OpenGL.framework, and some - # extra tricks to go along with. We add mesa’s libGLX to support - # the X extensions to OpenGL. - buildCommand = if stdenv.hostPlatform.isDarwin then '' - mkdir -p $out/nix-support $dev - echo ${OpenGL} >> $out/nix-support/propagated-build-inputs - ln -s ${mesa.out}/lib $out/lib - - mkdir -p $dev/lib/pkgconfig $dev/nix-support - echo "$out" > $dev/nix-support/propagated-build-inputs - ln -s ${mesa.dev}/include $dev/include - - cat <$dev/lib/pkgconfig/gl.pc - Name: gl - Description: gl library - Version: ${mesa.version} - Libs: -L${mesa.out}/lib -lGL - Cflags: -I${mesa.dev}/include - EOF - - cat <$dev/lib/pkgconfig/glesv1_cm.pc - Name: glesv1_cm - Description: glesv1_cm library - Version: ${mesa.version} - Libs: -L${mesa.out}/lib -lGLESv1_CM - Cflags: -I${mesa.dev}/include - EOF - - cat <$dev/lib/pkgconfig/glesv2.pc - Name: glesv2 - Description: glesv2 library - Version: ${mesa.version} - Libs: -L${mesa.out}/lib -lGLESv2 - Cflags: -I${mesa.dev}/include - EOF - '' - - # Otherwise, setup gl stubs to use libglvnd. - else '' - mkdir -p $out/nix-support - ln -s ${libglvnd.out}/lib $out/lib - - mkdir -p $dev/{,lib/pkgconfig,nix-support} - echo "$out ${libglvnd} ${libglvnd.dev}" > $dev/nix-support/propagated-build-inputs - ln -s ${libglvnd.dev}/include $dev/include - - genPkgConfig() { - local name="$1" - local lib="$2" - - cat <$dev/lib/pkgconfig/$name.pc - Name: $name - Description: $lib library - Version: ${libglvnd.version} - Libs: -L${libglvnd.out}/lib -l$lib - Cflags: -I${libglvnd.dev}/include - EOF - } - - genPkgConfig gl GL - genPkgConfig egl EGL - genPkgConfig glesv1_cm GLESv1_CM - genPkgConfig glesv2 GLESv2 - ''; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = { - description = "Stub bindings using " + (if stdenv.hostPlatform.isDarwin then "mesa" else "libglvnd"); - pkgConfigModules = [ "gl" "egl" "glesv1_cm" "glesv2" ]; - } // { - inherit (if stdenv.hostPlatform.isDarwin then mesa.meta else libglvnd.meta) - homepage license platforms badPlatforms; - }; -}) diff --git a/pkgs/development/libraries/meshoptimizer/default.nix b/pkgs/development/libraries/meshoptimizer/default.nix index 2c4617d15fc6..c632932e5a53 100644 --- a/pkgs/development/libraries/meshoptimizer/default.nix +++ b/pkgs/development/libraries/meshoptimizer/default.nix @@ -9,12 +9,12 @@ let }; in stdenv.mkDerivation rec { pname = "meshoptimizer"; - version = "0.20"; + version = "0.21"; src = fetchFromGitHub { owner = "zeux"; repo = "meshoptimizer"; rev = "v${version}"; - hash = "sha256-QCxpM2g8WtYSZHkBzLTJNQ/oHb5j/n9rjaVmZJcCZIA="; + hash = "sha256-G8rR4Ff3mVxTPD1etI82fYwFawsjrLvwWuEuib+dUBU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index af397eb3c5c2..e70269bc8d28 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -36,6 +36,7 @@ , enableSDL2 ? true , SDL2 , gitUpdater +, libarchive }: stdenv.mkDerivation rec { @@ -46,7 +47,11 @@ stdenv.mkDerivation rec { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - hash = "sha256-nQ9uRip6i9+/MziU4gQq1ah712J6f94cFQWTDYRjzyE="; + hash = "sha256-rs02V6+9jMF0S78rCCXcDn3gzghqnOtWEHMo/491JxA="; + # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate. + # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on + # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545 + fetchSubmodules = true; }; nativeBuildInputs = [ @@ -90,6 +95,7 @@ stdenv.mkDerivation rec { qt.qtbase qt.qtsvg (qt.qt5compat or null) + libarchive ] ++ lib.optionals enableSDL1 [ SDL ] ++ lib.optionals enableSDL2 [ @@ -106,6 +112,7 @@ stdenv.mkDerivation rec { "-DSWIG_PYTHON=ON" ] ++ lib.optionals (qt != null) [ "-DMOD_QT${lib.versions.major qt.qtbase.version}=ON" + "-DMOD_GLAXNIMATE${if lib.versions.major qt.qtbase.version == "5" then "" else "_QT6"}=ON" ]; preFixup = '' diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 9ab45a77ff3b..73e93398626c 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.27.3"; + version = "1.27.4"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-j/Z1fwP7Lt1izRmSxAqnWDX7ehD7QQWXERUIdyPpwMU="; + hash = "sha256-67bAiu40VQDtTJPlg6wOxQs4nyLZQ8aJJ5WJ1J9NNlw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index bb7f9f5807d6..a4716a47bb1b 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -21,11 +21,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "sha256-IzMbIpnyh8NBlyftwt+JItfnq7uf0Kx04DuZZvmtQtc="; + sha256 = "sha256-iD9bs66r9ifLhJLKAqA7GR0Jg2u+D1mdhQg1EXl4HUE="; }; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index baae6b953f9b..708babff635d 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nco"; - version = "5.2.5"; + version = "5.2.6"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-QGHmet7Tbuyue48hjtqdl6F2PzQLuWAVwW4xvPEI3NU="; + hash = "sha256-v4kK1+tn/pgY2vz5BYzCBKfvLe5hti0ofUChUvQ++JU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 3a1297f89763..0791a05e338e 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl }: callPackage ./generic.nix rec { - version = "3.9.1"; + version = "3.10"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - hash = "sha256-zP7/mBsMpxu9b7ywVPQHxg/7ZEOJpb6A1nFtW1UMbOM="; + hash = "sha256-tMUYrbF05ITLSs6lQRjwI4DHEzdx5+m+uYoHhxlO5Hw="; }; } diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 3f45d2e39c79..63a7d2c879ed 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.101"; - hash = "sha256-lO+81zYBBFwqcjh4cd/fpiznHZ9rTJpfDW/yF8phYts="; + version = "3.101.1"; + hash = "sha256-KcRiOUbdFnH618MFM6uxmRn+/Jn4QMHtv1BELXrCAX4="; } diff --git a/pkgs/development/libraries/nsync/default.nix b/pkgs/development/libraries/nsync/default.nix index e188e8a0e01d..8df7bd605992 100644 --- a/pkgs/development/libraries/nsync/default.nix +++ b/pkgs/development/libraries/nsync/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nsync"; - version = "1.28.1"; + version = "1.29.2"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = version; - hash = "sha256-PAUgT1SoMiPMA4MH8zHxBtTFdg8Jn6H+w0HA64i2vPk="; + hash = "sha256-RAwrS8Vz5fZwZRvF4OQfn8Ls11S8OIV2TmJpNrBE4MI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 867843df8068..b2bd4de93f03 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2_3 }: +{ lib, stdenv, fetchFromGitHub, cmake, pandoc, pkg-config, icu, catch2_3 }: stdenv.mkDerivation rec { pname = "nuspell"; - version = "5.1.4"; + version = "5.1.6"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - hash = "sha256-KteLH031QP8MunQXsodzsPhD/YN9n3O7b2kb/1mFQRY="; + hash = "sha256-U/lHSxpKsBnamf4ikE2aIjEPSU5fxjtuSmhZR0jxMAI="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pandoc pkg-config ]; buildInputs = [ catch2_3 ]; propagatedBuildInputs = [ icu ]; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 93db5470b0f7..a77529a42704 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -12,7 +12,7 @@ , pugixml , zziplib # linux -, freeglut +, libglut , libGL , libGLU , libICE @@ -75,7 +75,7 @@ let pugixml zziplib ] ++ lib.optionals stdenv.isLinux [ - freeglut + libglut libGL libGLU libICE diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index d5270b655ca1..3e9302e025f2 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , expat , yaml-cpp @@ -10,7 +9,7 @@ , minizip-ng # Only required on Linux , glew -, freeglut +, libglut # Only required on Darwin , Carbon , GLUT @@ -26,22 +25,16 @@ stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "sha256-E4TmMEFzI3nKqiDFaAkNx44uo84sacvZqjbfWe3A8fE="; + hash = "sha256-CSD3AZ36tmC/cYSdPsdDYx894+jd9GkGkhYJ767QY8A="; }; patches = [ - (fetchpatch { - # Taken from https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1891. - name = "opencolorio-yaml-cpp-8.0-compat.patch"; - url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/e99b4afcf0408d8ec56fdf2b9380327c9284db00.patch"; - sha256 = "sha256-7eIvVWKcpE0lmuYdNqFQFHkW/sSSzQ//LNIMOC28KZg="; - }) # Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200. # Needed for zlib >= 1.3 && cmake < 3.27.4. ./broken-cmake-zlib-version.patch @@ -64,7 +57,7 @@ stdenv.mkDerivation rec { pystring imath minizip-ng - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glew libglut ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ] ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ] ++ lib.optionals buildApps [ @@ -75,7 +68,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" "-DOCIO_USE_SSE2NEON=OFF" - # GPU test fails with: freeglut (GPU tests): failed to open display '' + # GPU test fails with: libglut (GPU tests): failed to open display '' "-DOCIO_BUILD_GPU_TESTS=OFF" "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include/minizip-ng" ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index a2675b2d79dc..6ac83dfa7d92 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11 +{lib, stdenv, fetchurl, libGLU, libGL, libglut, glew, libXmu, libXext, libX11 , qmake, GLUT, fixDarwinDylibNames }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ glew ] - ++ lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ] + ++ lib.optionals stdenv.isLinux [ libGLU libGL libglut libXmu libXext libX11 ] ++ lib.optional stdenv.isDarwin GLUT; doCheck = false; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index a4961163c9ad..e2509ca5199a 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -372,28 +372,19 @@ effectiveStdenv.mkDerivation { doxygen graphviz-nox ] ++ lib.optionals enableCuda (with cudaPackages; [ - cuda_cudart.lib - cuda_cudart.dev - cuda_cccl.dev # - libnpp.dev # npp.h - libnpp.lib - libnpp.static + cuda_cudart + cuda_cccl # + libnpp # npp.h nvidia-optical-flow-sdk ] ++ lib.optionals enableCublas [ # May start using the default $out instead once # https://github.com/NixOS/nixpkgs/issues/271792 # has been addressed - libcublas.static - libcublas.lib - libcublas.dev # cublas_v2.h + libcublas # cublas_v2.h ] ++ lib.optionals enableCudnn [ - cudnn.dev # cudnn.h - cudnn.lib - cudnn.static + cudnn # cudnn.h ] ++ lib.optionals enableCufft [ - libcufft.dev # cufft.h - libcufft.lib - libcufft.static + libcufft # cufft.h ]); propagatedBuildInputs = lib.optionals enablePython [ pythonPackages.numpy ]; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 8c54c13c9139..59f2d21d4c48 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { # TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build # https://github.com/openucx/ucx # https://www.open-mpi.org/faq/?category=buildcuda - ++ lib.optionals cudaSupport [ "--with-cuda=${cudaPackages.cuda_cudart}" "--enable-dlopen" ] + ++ lib.optionals cudaSupport [ "--with-cuda=${lib.getDev cudaPackages.cuda_cudart}" "--enable-dlopen" ] ++ lib.optionals fabricSupport [ "--with-psm2=${lib.getDev libpsm2}" "--with-libfabric=${lib.getDev libfabric}" ] ; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 981ab14ddcaa..6c87feaab882 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -276,8 +276,8 @@ in { }; openssl_3 = common { - version = "3.0.13"; - hash = "sha256-iFJXU/edO+wn0vp8ZqoLkrOqlJja/ZPXz6SzeAza4xM="; + version = "3.0.14"; + hash = "sha256-7soDXU3U6E/CWEbZUtpil0hK+gZQpvhMaC453zpBI8o="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -299,8 +299,8 @@ in { }; openssl_3_2 = common { - version = "3.2.1"; - hash = "sha256-g8cyn+UshQZ3115dCwyiRTCbl+jsvP3B39xKufrDWzk="; + version = "3.2.2"; + hash = "sha256-GXFJwY2enyksQ/BACsq6EuX1LKz+BQ89GZJ36nOOwuc="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -322,8 +322,8 @@ in { }; openssl_3_3 = common { - version = "3.3.0"; - hash = "sha256-U+ZrBDMipgar8Ah+dpmg4DOjf6E/65dC3zXDozsY+wI="; + version = "3.3.1"; + hash = "sha256-d3zVlihMiDN1oqehG/XSeG/FQTJV76sgxQ1v/m0CC34="; patches = [ ./3.0/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index f153d7f2f18b..710d985ee346 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.1.37"; + version = "1.1.38"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-J9IfhTFFSY+rK0DqFdXtINo7nlGUcy2Lljq81T417qc="; + sha256 = "sha256-nM/c6fvjprQ5GQO4F13cOigi4xATgRTq+ebEwyv58gg="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 9fa4bf10f47f..1a13f6d48bb3 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, gnome, gtk3, gobject-introspection, pkg-config, lib, stdenv }: +{ cairo, fetchzip, glib, gnome, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv }: stdenv.mkDerivation rec { pname = "osm-gps-map"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkg-config gobject-introspection ]; + nativeBuildInputs = [ pkg-config gobject-introspection gnome-common ]; buildInputs = [ cairo glib - gnome.gnome-common gtk3 gnome.libsoup + gtk3 gnome.libsoup ]; meta = with lib; { diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index 75817ff568f7..a567612fae4f 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , unzip , cmake -, freeglut +, libglut , libGLU , libGL , zlib @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.GLUT ] ++ lib.optionals (!stdenv.isDarwin) [ - freeglut + libglut libGLU libGL ]; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 3450f910effe..a61a13590d16 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -7,30 +7,20 @@ stdenv.mkDerivation rec { pname = "pcre2"; - version = "10.43"; + version = "10.44"; src = fetchurl { url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2"; - hash = "sha256-4qU5hP8LB9/bWuRIa7ubIcyo598kNAlsyb8bcow1C8s="; + hash = "sha256-008C4RPPcZOh6/J3DTrFJwiNSF1OBH7RDl0hfG713pY="; }; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - postPatch = '' - # Fix jit autodetection: - # https://github.com/PCRE2Project/pcre2/pull/396 - # Applying manually to avoid fetchpatch and autoreconfHook. - # TODO: remove once 10.44 is released - substituteInPlace configure --replace-fail \ - '#include "src/sljit/sljitConfigInternal.h"' \ - '#include "src/sljit/sljitConfigCPU.h"' - ''; - configureFlags = [ "--enable-pcre2-16" "--enable-pcre2-32" # only enable jit on supported platforms which excludes Apple Silicon, see https://github.com/zherczeg/sljit/issues/51 - "--enable-jit=${if stdenv.hostPlatform.isS390x || stdenv.hostPlatform.isLoongArch64 then "no" else "auto"}" + "--enable-jit=${if stdenv.hostPlatform.isS390x then "no" else "auto"}" ] # fix pcre jit in systemd units that set MemoryDenyWriteExecute=true like gitea ++ lib.optional withJitSealloc "--enable-jit-sealloc"; diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix index 53a3d080f541..3eef51bbbd8a 100644 --- a/pkgs/development/libraries/pdfhummus/default.nix +++ b/pkgs/development/libraries/pdfhummus/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.6.5"; + version = "4.6.6"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-0k753wogNW8oW//mlVWxGLt8VIO+29f0C4CJ+rGprvw="; + hash = "sha256-JPL5+GoL4zvHgStgTV9pJBPsQtAeE2DJe02YrZEtdJ8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 569a0b3e6923..7349c708e3d9 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -3,8 +3,8 @@ , enableQT ? false # deprecated name , enableQt ? enableQT , enableXM ? false -, mesa -, enableOpenGLX11 ? !mesa.meta.broken +, libGLX +, enableOpenGLX11 ? !libGLX.meta.broken , enablePython ? false , enableRaytracerX11 ? false @@ -77,8 +77,8 @@ stdenv.mkDerivation rec { "-DGEANT4_USE_SYSTEM_ZLIB=ON" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" ] ++ lib.optionals (enableOpenGLX11 && stdenv.isDarwin) [ - "-DXQuartzGL_INCLUDE_DIR=${libGL.dev}/include" - "-DXQuartzGL_gl_LIBRARY=${libGL}/lib/libGL.dylib" + "-DXQuartzGL_INCLUDE_DIR=${libGLX.dev}/include" + "-DXQuartzGL_gl_LIBRARY=${libGLX}/lib/libGL.dylib" ] ++ lib.optionals (enableMultiThreading && enablePython) [ "-DGEANT4_BUILD_TLS_MODEL=global-dynamic" ] ++ lib.optionals enableInventor [ diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index c3532d93683d..49dc2f4dd5d2 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -75,7 +75,7 @@ assert ldacbtSupport -> bluezSupport; stdenv.mkDerivation(finalAttrs: { pname = "pipewire"; - version = "1.0.7"; + version = "1.2.0"; outputs = [ "out" @@ -91,7 +91,7 @@ stdenv.mkDerivation(finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-YzI+hkX1ZdeTfxuKaw5P9OYPtkWtUg9cNo32wLCgjNU="; + sha256 = "sha256-hjjiH7+JoyRTcdbPDvkUEpO72b5p8CbTD6Un/vZrHL8="; }; patches = [ @@ -185,6 +185,7 @@ stdenv.mkDerivation(finalAttrs: { (lib.mesonBool "rlimits-install" false) # installs to /etc, we won't use this anyway (lib.mesonEnable "compress-offload" true) (lib.mesonEnable "man" true) + (lib.mesonEnable "snap" false) # we don't currently have a working snapd ]; # Fontconfig error: Cannot load default config file diff --git a/pkgs/development/libraries/platform-folders/default.nix b/pkgs/development/libraries/platform-folders/default.nix index 242bbe7770e4..3a9780a960eb 100644 --- a/pkgs/development/libraries/platform-folders/default.nix +++ b/pkgs/development/libraries/platform-folders/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "C++ library to look for standard platform directories so that you do not need to write platform-specific code"; homepage = "https://github.com/sago007/PlatformFolders"; license = licenses.mit; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index c7349c369305..de93d6944c93 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, stdenv, libGLU, libGL, freeglut, SDL +{ fetchurl, fetchpatch, lib, stdenv, libGLU, libGL, libglut, SDL , libXi, libSM, libXmu, libXext, libX11 }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - libGLU libGL freeglut SDL + libGLU libGL libglut SDL # The following libs ought to be propagated build inputs of Mesa. libXi libSM libXmu libXext libX11 diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 17ab3f100b81..8eeb31e96c48 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchFromGitLab +, fetchpatch , cairo , cmake , boost @@ -55,6 +56,15 @@ stdenv.mkDerivation (finalAttrs: rec { hash = "sha256-GRh6P90F8z59YExHmcGD3lygEYZAyIs3DdzzE2NDIi4="; }; + patches = [ + (fetchpatch { + # https://access.redhat.com/security/cve/CVE-2024-6239 + name = "CVE-2024-6239.patch"; + url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/0554731052d1a97745cb179ab0d45620589dd9c4.patch"; + hash = "sha256-I78wJ4l1DSh+x/e00ZL8uvrGdBH+ufp+EDm0A1XWyCU="; + }) + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/development/libraries/py3c/default.nix b/pkgs/development/libraries/py3c/default.nix index 11ccba4c9ee3..32e7d1249118 100644 --- a/pkgs/development/libraries/py3c/default.nix +++ b/pkgs/development/libraries/py3c/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python311 }: stdenv.mkDerivation rec { pname = "py3c"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; nativeCheckInputs = [ - python3 + python311 ]; checkTarget = "test-python"; diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 404aa4921c4e..10db26a03984 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "python-qt"; - version = "3.5.2"; + version = "3.5.4"; src = fetchFromGitHub { owner = "MeVisLab"; repo = "pythonqt"; rev = "v${finalAttrs.version}"; - hash = "sha256-Mpi1pAPS/UuzaBK7I1kI0HlS3dphcKiVXIPuJwdEDXM="; + hash = "sha256-uzOSm1Zcm5La0mDAbJko5YtxJ4WesPr9lRas+cwhNH4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index e3772dbb2787..b2858944ef7c 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "11.9.0"; + version = "11.9.1"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${version}"; - hash = "sha256-HD7+2TBDLBIt+VaPO5WgnDjNZOj8naltFmYdYzOIn+4="; + hash = "sha256-DhrOKjUPgNo61db8av0OTfM8mCNebQocQWtTWdt002s="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index dabb77ea0c85..9073bcb6f9e5 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -36,14 +36,6 @@ let ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch ./qtbase.patch.d/0014-aarch64-darwin.patch - - # Fix typo that breaks build on Darwin - # FIXME: remove this once merged upstream - # See: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/325 - (fetchpatch { - url = "https://invent.kde.org/qt/qt/qtbase/-/commit/e84c0df50f51c61aa49b47823582b0f8de406e3d.patch"; - hash = "sha256-d1RIY03E71aMzOOVtcIaMeariki/72QRekUne6P2D3M="; - }) ] ++ [ ./qtbase.patch.d/0003-qtbase-mkspecs.patch ./qtbase.patch.d/0004-qtbase-replace-libdir.patch diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index f3281a17170e..96c3621307c6 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -16,8 +16,8 @@ }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "0e1ff2f06ddac7c32c5a5e0b65e402c9332e56f8", - "sha256": "1pfby0ilkikq8802diaslnkxw8qzbp4r0f80v696wfynn973mhdd" + "rev": "2b9835f5c9bcfe3105b60a8dd33c1db7d8611378", + "sha256": "1yms1r42yps06bg8gjbzb5y7x03ks11vg97s2j7r1aplp7kjf7wm" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index d92287feb151..7f3079d5add5 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -152,8 +152,8 @@ stdenv.mkDerivation (finalAttrs: ({ --replace "/System/Library/Frameworks/AGL.framework/" "${AGL}/Library/Frameworks/AGL.framework/" '' else lib.optionalString libGLSupported '' sed -i mkspecs/common/linux.conf \ - -e "/^QMAKE_INCDIR_OPENGL/ s|$|${libGL.dev or libGL}/include|" \ - -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${libGL.out}/lib|" + -e "/^QMAKE_INCDIR_OPENGL/ s|$|${lib.getDev libGL}/include|" \ + -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${lib.getLib libGL}/lib|" '' + lib.optionalString (stdenv.hostPlatform.isx86_32 && stdenv.cc.isGNU) '' sed -i mkspecs/common/gcc-base-unix.conf \ -e "/^QMAKE_LFLAGS_SHLIB/ s/-shared/-shared -static-libgcc/" diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index b2715fbe7502..73920c1646b9 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -1,5 +1,6 @@ { qtModule , qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel +, fetchpatch , bison, flex, git, gperf, ninja, pkg-config, python, which , nodejs, perl @@ -81,6 +82,21 @@ qtModule ({ ( cd src/3rdparty/chromium; + patch -p2 < ${ + (fetchpatch { # support for building with python 3.12 + name = "python312-imp.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtwebengine-chromium.git;a=patch;h=3664134f749f4851a14ab1953a9ee460a1fe0b68"; + hash = "sha256-XY0dEdeuOTRMR7onmuNg1Axld8+pquKAzOfDAGSIzI4="; + }) + } + patch -p1 < ${ + (fetchpatch { # support for building with python 3.12 + name = "python312-six.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/6b0c0e76e0934db2f84be40cb5978cee47266e78/python3.12-six.patch"; + hash = "sha256-YgP9Sq5+zTC+U7+0hQjZokwb+fytk0UEIJztUXFhTkI="; + }) + } + # Manually fix unsupported shebangs substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index b5f1c71fdd75..82b683d53463 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -4,6 +4,7 @@ , wayland , pkg-config , libdrm +, fetchpatch }: qtModule { @@ -11,4 +12,13 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; + + patches = [ + # Included in qtwayland 6.7.3 + # Fixes https://bugs.kde.org/show_bug.cgi?id=489259 + (fetchpatch { + url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/92bcb8f6b7a852c7a5d662fc34de561692a7a454.diff"; + sha256 = "sha256-XgGO8VnmQHLhUxTGf9CniwkCr5FsFiuUbnVP0NLNekI="; + }) + ]; } diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 4cf38eda39ca..e90f7f8f4b5a 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.4.557"; + version = "1.5.53"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-RcEkmPMcfNGDmu2bQwUHvlHgM/ySQQwDgf/NpTQMxcI="; + sha256 = "sha256-6/gq1yD4almO+CUY5xVnhWCjmu3teiJEGE7ONE1Zk8A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 0a2967d0fcb1..ad5a525456c9 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "rapidfuzz"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-urMdK+6ORHRgisppb700jaQpxLXAvXVjd8WDN7Zky3A="; + hash = "sha256-8s2Jd1fI8iNmFyMbCEaGZdpqvYFB1tVNZ41ICLN4AeI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rapidyaml/default.nix b/pkgs/development/libraries/rapidyaml/default.nix index a51b675bd918..2af9968c842c 100644 --- a/pkgs/development/libraries/rapidyaml/default.nix +++ b/pkgs/development/libraries/rapidyaml/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Library to parse and emit YAML, and do it fast"; homepage = "https://github.com/biojppm/rapidyaml"; license = licenses.mit; - maintainers = with maintainers; [ martfont ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index 2310ce33ea4f..09d2f7539f15 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,61 +1,61 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, ninja -, chromium -, grpc -, haskellPackages -, mercurial -, python3Packages -, abseil-cpp +{ + abseil-cpp, + chromium, + cmake, + fetchFromGitHub, + gbenchmark, + grpc, + gtest, + haskellPackages, + icu, + lib, + mercurial, + ninja, + python3Packages, + stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "re2"; - version = "2024-05-01"; + version = "2024-06-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; - rev = version; - hash = "sha256-p4MdHjTk0SQsBPVkEy+EceAN/QTyzBDe7Pd1hJwOs3A="; + rev = finalAttrs.version; + hash = "sha256-iQETsjdIFcYM5I/W8ytvV3z/4va6TaZ/+KkSjb8CtF0="; }; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + ]; - propagatedBuildInputs = [ abseil-cpp ]; + buildInputs = lib.optionals finalAttrs.doCheck [ + gbenchmark + gtest + ]; - postPatch = '' - substituteInPlace re2Config.cmake.in \ - --replace "\''${PACKAGE_PREFIX_DIR}/" "" - ''; + propagatedBuildInputs = [ + abseil-cpp + icu + ]; - # Needed for case-insensitive filesystems (i.e. MacOS) because a file named - # BUILD already exists. - cmakeBuildDir = "build_dir"; - - cmakeFlags = lib.optional (!stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS:BOOL=ON"; - - # This installs a pkg-config definition. - postInstall = '' - pushd "$src" - make common-install prefix="$dev" SED_INPLACE="sed -i" - popd - ''; + cmakeFlags = [ + (lib.cmakeBool "RE2_BUILD_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "RE2_USE_ICU" true) + ] ++ lib.optional (!stdenv.hostPlatform.isStatic) (lib.cmakeBool "BUILD_SHARED_LIBS" true); doCheck = true; passthru.tests = { - inherit - chromium - grpc - mercurial; - inherit (python3Packages) - fb-re2 - google-re2; + inherit chromium grpc mercurial; + inherit (python3Packages) fb-re2 google-re2; haskell-re2 = haskellPackages.re2; }; @@ -68,7 +68,10 @@ stdenv.mkDerivation rec { ''; license = licenses.bsd3; homepage = "https://github.com/google/re2"; - maintainers = with maintainers; [ azahi networkexception ]; + maintainers = with maintainers; [ + azahi + networkexception + ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index af52b6a9fa7c..2c70046108da 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -11,26 +11,31 @@ , windows , enableJemalloc ? false , jemalloc +, enableLiburing ? true +, liburing , enableShared ? !stdenv.hostPlatform.isStatic , sse42Support ? stdenv.hostPlatform.sse4_2Support }: stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "9.2.1"; + version = "9.3.1"; src = fetchFromGitHub { owner = "facebook"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-Zifn5Gu/4h6TaEqSaWQ2mFdryeAarqbHWW3fKUGGFac="; + hash = "sha256-bTUzh7ch14TDcm6GkfhA5I/qUVmUm+RE5d2HMZ3zaNc="; }; + patches = [ ./fix-findliburing.patch ]; + nativeBuildInputs = [ cmake ninja ]; propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ]; buildInputs = lib.optional enableJemalloc jemalloc + ++ lib.optional enableLiburing liburing ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads; outputs = [ @@ -45,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DPORTABLE=1" "-DWITH_JEMALLOC=${if enableJemalloc then "1" else "0"}" + "-DWITH_LIBURING=${if enableLiburing then "1" else "0"}" "-DWITH_JNI=0" "-DWITH_BENCHMARK_TOOLS=0" "-DWITH_TESTS=1" diff --git a/pkgs/development/libraries/rocksdb/fix-findliburing.patch b/pkgs/development/libraries/rocksdb/fix-findliburing.patch new file mode 100644 index 000000000000..c546577813ce --- /dev/null +++ b/pkgs/development/libraries/rocksdb/fix-findliburing.patch @@ -0,0 +1,29 @@ +From 23432b7958ecea64b49ba680767ea5dc696768c9 Mon Sep 17 00:00:00 2001 +From: Benjamin Lee +Date: Sun, 26 May 2024 17:17:01 -0700 +Subject: [PATCH] fix findliburing + +`find_package(... NAMES lib*)` is basically always wrong. The previous +code was just hardcoding the static library path to work around the fact +that this doesn't work. This breaks the build when only dynamic liburing +builds are available. +--- + cmake/modules/Finduring.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/Finduring.cmake b/cmake/modules/Finduring.cmake +index 8cb14cb27..87f2df474 100644 +--- a/cmake/modules/Finduring.cmake ++++ b/cmake/modules/Finduring.cmake +@@ -7,7 +7,7 @@ + find_path(uring_INCLUDE_DIR + NAMES liburing.h) + find_library(uring_LIBRARIES +- NAMES liburing.a liburing) ++ NAMES uring) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(uring +-- +2.44.0 + diff --git a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix index 8c6eb60d1d2b..3591a86dbb70 100644 --- a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix +++ b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "stellarsolver"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "rlancaste"; repo = pname; rev = version; - sha256 = "sha256-0bFGHlkZnAZlnxlj8tY3s9yTWgkNtSsPFfudB3uvyOA="; + sha256 = "sha256-6WDiHaBhi9POtXynGU/eTeuqZSK81JJeuZv4SxOeVoE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/biology/bicgl/default.nix b/pkgs/development/libraries/science/biology/bicgl/default.nix index 07d64fbd97ed..89f4220f92f4 100644 --- a/pkgs/development/libraries/science/biology/bicgl/default.nix +++ b/pkgs/development/libraries/science/biology/bicgl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu, GLUT }: +{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, libGLU, libglut }: stdenv.mkDerivation rec { pname = "bicgl"; @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libminc bicpl mesa_glu ] - ++ lib.optionals stdenv.isDarwin [ GLUT ] - ++ lib.optionals stdenv.isLinux [ freeglut ]; + buildInputs = [ libminc bicpl libGLU libglut ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index ce02474eeb1e..979f3589b330 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { eigen fltk itk - libGLU.dev + libGLU python3 tbb vtk diff --git a/pkgs/development/libraries/science/math/clblast/default.nix b/pkgs/development/libraries/science/math/clblast/default.nix index a7c8d8faee4c..3bf38086ca2f 100644 --- a/pkgs/development/libraries/science/math/clblast/default.nix +++ b/pkgs/development/libraries/science/math/clblast/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clblast"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "CNugteren"; repo = "CLBlast"; rev = version; - hash = "sha256-S25g25Il6rzkpU9IqOFDDeEr3uYyt/uewZZAl09YSts="; + hash = "sha256-fzenYFCAQ0B2NQgh5OaErv/yNEzjznB6ogRapqfL6P4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 5af73735fdf6..1dfe81442788 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -33,19 +33,15 @@ let stdenv = if cudaSupport then backendStdenv else inputs.stdenv; - cudaJoined = symlinkJoin { - name = "cuda-packages-unsplit"; - paths = with cudaPackages; [ - cuda_cudart # cuda_runtime.h - libcublas - libcurand - cuda_cccl - ] ++ lib.optionals (cudaPackages ? cuda_profiler_api) [ - cuda_profiler_api # cuda_profiler_api.h - ] ++ lib.optionals (!(cudaPackages ? cuda_profiler_api)) [ - cuda_nvprof # cuda_profiler_api.h - ]; - }; + cudaComponents = with cudaPackages; [ + cuda_cudart # cuda_runtime.h + libcublas + libcurand + cuda_cccl + + # cuda_profiler_api.h + (cudaPackages.cuda_profiler_api or cudaPackages.cuda_nvprof) + ]; in stdenv.mkDerivation { inherit pname version; @@ -68,9 +64,7 @@ stdenv.mkDerivation { pythonPackages.wheel ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp - ] ++ lib.optionals cudaSupport [ - cudaJoined - ]; + ] ++ lib.optionals cudaSupport cudaComponents; propagatedBuildInputs = lib.optionals pythonSupport [ pythonPackages.numpy @@ -93,7 +87,6 @@ stdenv.mkDerivation { "-DFAISS_OPT_LEVEL=${optLevel}" ] ++ lib.optionals cudaSupport [ "-DCMAKE_CUDA_ARCHITECTURES=${flags.cmakeCudaArchitecturesString}" - "-DCUDAToolkit_INCLUDE_DIR=${cudaJoined}/include" ]; buildFlags = [ diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index a675142f361d..08dac598f7d9 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -134,19 +134,15 @@ stdenv.mkDerivation { blas python3 ] ++ lists.optionals cudaSupport (with effectiveCudaPackages; [ - cuda_cudart.dev # cuda_runtime.h - cuda_cudart.lib # cudart - cuda_cudart.static # cudart_static - libcublas.dev # cublas_v2.h - libcublas.lib # cublas - libcusparse.dev # cusparse.h - libcusparse.lib # cusparse + cuda_cudart # cuda_runtime.h + libcublas # cublas_v2.h + libcusparse # cusparse.h ] ++ lists.optionals (cudaOlder "11.8") [ - cuda_nvprof.dev # + cuda_nvprof # ] ++ lists.optionals (cudaAtLeast "11.8") [ - cuda_profiler_api.dev # + cuda_profiler_api # ] ++ lists.optionals (cudaAtLeast "12.0") [ - cuda_cccl.dev # + cuda_cccl # ]) ++ lists.optionals rocmSupport [ rocmPackages.clr rocmPackages.hipblas diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 842bc3af9834..e36c92d60b67 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -181,6 +181,10 @@ stdenv.mkDerivation rec { "strictoverflow" # don't interfere with dynamic target detection "relro" "bindnow" + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + # "__builtin_clear_padding not supported for variable length aggregates" + # in aarch64-specific code + "trivialautovarinit" ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix deleted file mode 100644 index c07250c660a3..000000000000 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ lib -, stdenv -, fetchurl -, darwin -, gfortran -, python3 -, blas -, lapack -, mpiSupport ? true -, mpi # generic mpi dependency -, openssh # required for openmpi tests -, petsc-withp4est ? false -, p4est -, zlib # propagated by p4est but required by petsc -, petsc-optimized ? false -, petsc-scalar-type ? "real" -, petsc-precision ? "double" -}: - -# This version of PETSc does not support a non-MPI p4est build -assert petsc-withp4est -> p4est.mpiSupport; - -stdenv.mkDerivation rec { - pname = "petsc"; - version = "3.19.4"; - - src = fetchurl { - url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "sha256-fJQbcb5Sw7dkIU5JLfYBCdEvl/fYVMl6RN8MTZWLOQY="; - }; - - inherit mpiSupport; - withp4est = petsc-withp4est; - - strictDeps = true; - nativeBuildInputs = [ python3 gfortran ] - ++ lib.optional mpiSupport mpi - ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh - ; - buildInputs = [ blas lapack ] - ++ lib.optional withp4est p4est - ; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace config/install.py \ - --replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool - ''; - - # Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr): - # [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery. - # [1684747490.391106] [localhost:14258:0] tcp_iface.c:837 UCX ERROR opendir(/sys/class/net) failed: No such file or directory - # These messages contaminate test output, which makes the quicktest suite to fail. The patch adds filtering for these messages. - patches = [ ./filter_mpi_warnings.patch ]; - - preConfigure = '' - patchShebangs ./lib/petsc/bin - configureFlagsArray=( - $configureFlagsArray - ${if !mpiSupport then '' - "--with-mpi=0" - '' else '' - "--CC=mpicc" - "--with-cxx=mpicxx" - "--with-fc=mpif90" - "--with-mpi=1" - ''} - ${lib.optionalString withp4est '' - "--with-p4est=1" - "--with-zlib-include=${zlib.dev}/include" - "--with-zlib-lib=-L${zlib}/lib -lz" - ''} - "--with-blas=1" - "--with-lapack=1" - "--with-scalar-type=${petsc-scalar-type}" - "--with-precision=${petsc-precision}" - ${lib.optionalString petsc-optimized '' - "--with-debugging=0" - COPTFLAGS='-g -O3' - FOPTFLAGS='-g -O3' - CXXOPTFLAGS='-g -O3' - ''} - ) - ''; - - configureScript = "python ./configure"; - - enableParallelBuilding = true; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - - meta = with lib; { - description = "Portable Extensible Toolkit for Scientific computation"; - homepage = "https://www.mcs.anl.gov/petsc/index.html"; - license = licenses.bsd2; - maintainers = with maintainers; [ cburstedde ]; - }; -} diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index fcfd9b56a1b1..43623e8604b9 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -36,17 +36,15 @@ stdenv.mkDerivation rec { buildInputs = assert (blas.isILP64 == lapack.isILP64); [ blas lapack metis - gfortran.cc.lib + (lib.getLib gfortran.cc) gmp mpfr ] ++ lib.optionals stdenv.cc.isClang [ openmp ] ++ lib.optionals enableCuda [ - cudaPackages.cuda_cudart.dev - cudaPackages.cuda_cudart.lib - cudaPackages.cuda_cccl.dev - cudaPackages.libcublas.dev - cudaPackages.libcublas.lib + cudaPackages.cuda_cudart + cudaPackages.cuda_cccl + cudaPackages.libcublas ]; preConfigure = '' @@ -63,8 +61,8 @@ stdenv.mkDerivation rec { "CFLAGS=-DBLAS64" ] ++ lib.optionals enableCuda [ "CUDA_PATH=${cudaPackages.cuda_nvcc}" - "CUDART_LIB=${cudaPackages.cuda_cudart.lib}/lib/libcudart.so" - "CUBLAS_LIB=${cudaPackages.libcublas.lib}/lib/libcublas.so" + "CUDART_LIB=${lib.getLib cudaPackages.cuda_cudart}/lib/libcudart.so" + "CUBLAS_LIB=${lib.getLib cudaPackages.libcublas}/lib/libcublas.so" ] ++ lib.optionals stdenv.isDarwin [ # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.13.0/SuiteSparse_config/SuiteSparse_config.mk#L368 diff --git a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix index e9367d416e32..e20365b215dc 100644 --- a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix +++ b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix @@ -14,15 +14,15 @@ inherit (cudaPackages) backendStdenv flags; cuda-common-redist = with cudaPackages; [ - cuda_cudart.dev # cuda_runtime.h - cuda_cudart.lib - cuda_cccl.dev # - libcublas.dev # cublas_v2.h - libcublas.lib - libcusolver.dev # cusolverDn.h - libcusolver.lib - libcusparse.dev # cusparse.h - libcusparse.lib + (lib.getDev cuda_cudart) # cuda_runtime.h + (lib.getLib cuda_cudart) + (lib.getDev cuda_cccl) # + (lib.getDev libcublas) # cublas_v2.h + (lib.getLib libcublas) + (lib.getDev libcusolver) # cusolverDn.h + (lib.getLib libcusolver) + (lib.getDev libcusparse) # cusparse.h + (lib.getLib libcusparse) ]; cuda-native-redist = symlinkJoin { diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 4d15113f3c9a..8ef7308764b3 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.9.4"; + version = "3.9.5"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-iTlIdLNOr1rRBnCwnI34e2RLL18Fmc/kRSMdZcOLp98="; + sha256 = "sha256-OCEHfjyWLxjThe1nrXIexMa4rI7RWt+3qnQErxHc7CU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index c66dfb3fdcc8..416274e1c545 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi +{ lib, stdenv, fetchurl, plib, libglut, xorgproto, libX11, libXext, libXi , libICE, libSM, libXt, libXmu, libGLU, libGL, boost179, zlib, libjpeg, freealut , openscenegraph, openal, expat, cmake, apr, xz , curl @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ plib freeglut xorgproto libX11 libXext libXi + buildInputs = [ plib libglut xorgproto libX11 libXext libXi libICE libSM libXt libXmu libGLU libGL boost179 zlib libjpeg freealut openscenegraph openal expat apr curl xz ]; diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 869c56ed7300..21785e251841 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "snappy"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "google"; repo = "snappy"; rev = version; - hash = "sha256-mpEeUoJs+lGlqh1m6Mmr8UnbtQDn/8kfkeQdFwo2rQ0="; + hash = "sha256-IzKzrMDjh+Weor+OrKdX62cAKYTdDXgldxCgNE2/8vk="; }; patches = [ diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index d73c521997a0..475a92e79c3e 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "socket_wrapper"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "mirror://samba/cwrap/socket_wrapper-${version}.tar.gz"; - sha256 = "sha256-CgjsJJ3Z/7s7FtV3s1LVc1YfV77uw1lhgqxuyORrmrY="; + sha256 = "sha256-CWz7TqucebUtss51JsVeUI8GZb/qxsS8ZqPIMh2HU1g="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index f9255e3df595..6aa91db83549 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "spdlog"; - version = "1.13.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; rev = "v${version}"; - hash = "sha256-3n8BnjZ7uMH8quoiT60yTU7poyOtoEmzNMOLa1+r7X0="; + hash = "sha256-F7khXbMilbh5b+eKnzcB0fPPWQqUHqAYPWJb83OnUKQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index d53d15a3f71a..6a6752c3eb93 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "6.7.0"; + version = "7.1.1"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-XxE6FWSp0tmP+VJJ9IcaTIFaBdu5uIZqgrE6sVjDets="; + hash = "sha256-6n1u37UkSN39wexI+JpyH+bAolnBD471b2D83th6lLs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/development/libraries/tagparser/default.nix index c0f6f3fd42b4..0a2637d90648 100644 --- a/pkgs/development/libraries/tagparser/default.nix +++ b/pkgs/development/libraries/tagparser/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "tagparser"; - version = "12.1.0"; + version = "12.2.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - hash = "sha256-83Xxj1CQsghbAsQ/3GKIYCz9lBNEBvLlx1iOKbszn8A="; + hash = "sha256-Plq6iimXStrveSw+SfzuXUuLlQ06ugO21e97fXivqYk="; }; nativeBuildInputs = [ cmake ]; @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { description = "C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags"; license = licenses.gpl2; maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/development/libraries/taskflow/default.nix index 3c31d152fc70..cdb5303f1a11 100644 --- a/pkgs/development/libraries/taskflow/default.nix +++ b/pkgs/development/libraries/taskflow/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "taskflow"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; rev = "v${version}"; - hash = "sha256-Iy9BhkyJa2nFxwVXb4LAlgVAHnu+58Ago2eEgAIlZ7M="; + hash = "sha256-q2IYhG84hPIZhuogWf6ojDG9S9ZyuJz9s14kQyIc6t0="; }; patches = [ diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 3d0a9d8a7874..7995a3fe1699 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { cmake flex pkg-config + python3 + python3.pkgs.setuptools ]; buildInputs = [ @@ -54,6 +56,11 @@ stdenv.mkDerivation rec { --replace "'FastbinaryTest.py'," "" \ --replace "'TestEof.py'," "" \ --replace "'TestFrozen.py'," "" + + # these functions are removed in Python3.12 + substituteInPlace test/py/SerializationTest.py \ + --replace-fail "assertEquals" "assertEqual" \ + --replace-fail "assertNotEquals" "assertNotEqual" ''; preConfigure = '' diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 464ea6e374c3..8f134cd594e3 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { LDFLAGS = lib.optionals enableCuda [ # Fake libnvidia-ml.so (the real one is deployed impurely) - "-L${cudaPackages.cuda_nvml_dev}/lib/stubs" + "-L${lib.getLib cudaPackages.cuda_nvml_dev}/lib/stubs" ]; configureFlags = [ diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index bf21723875bf..79d3feca5245 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { homepage = "http://www.vapoursynth.com/"; license = licenses.lgpl21; platforms = platforms.x86_64; - maintainers = with maintainers; [ rnhmjoj sbruder tadeokondrak ]; + maintainers = with maintainers; [ rnhmjoj sbruder ]; mainProgram = "vspipe"; }; } diff --git a/pkgs/development/libraries/vapoursynth/editor.nix b/pkgs/development/libraries/vapoursynth/editor.nix index 2b4b1d5767b1..88fa1d763f01 100644 --- a/pkgs/development/libraries/vapoursynth/editor.nix +++ b/pkgs/development/libraries/vapoursynth/editor.nix @@ -37,7 +37,7 @@ let description = "Cross-platform editor for VapourSynth scripts"; homepage = "https://github.com/YomikoR/VapourSynth-Editor"; license = licenses.mit; - maintainers = with maintainers; [ tadeokondrak ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; }; diff --git a/pkgs/development/libraries/wapp/default.nix b/pkgs/development/libraries/wapp/default.nix index fd98f419da9a..9543b49af3b9 100644 --- a/pkgs/development/libraries/wapp/default.nix +++ b/pkgs/development/libraries/wapp/default.nix @@ -2,11 +2,11 @@ tcl.mkTclDerivation { pname = "wapp"; - version = "unstable-2023-05-05"; + version = "0-unstable-2024-05-23"; src = fetchurl { - url = "https://wapp.tcl-lang.org/home/raw/72d0d081e3e6a4aea91ddf429a85cbdf40f9a32d46cccfe81bb75ee50e6cf9cf?at=wapp.tcldir?ci=9d3368116c59ef16"; - hash = "sha256-poG7dvaiOXMi4oWMQ5t3v7SYEqZLUY/TsWXrTL62xd0="; + url = "https://wapp.tcl-lang.org/home/raw/98f23b2160bafc41f34be8e5d8ec414c53d33412eb2f724a07f2476eaf04ac6f?at=wapp.tcl"; + hash = "sha256-A+Ml5h5C+OMoDQtAoB9lHgYEK1A7qHExT3p46PHRTYg="; }; dontUnpack = true; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 98c28ca67997..2b80e05f0d4d 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -151,7 +151,11 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.isDarwin [ libedit readline - ] ++ lib.optional (stdenv.isDarwin && !stdenv.isAarch64) ( + ] ++ lib.optional (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") ( + # this can likely be removed as: + # "libproc.h is included in the 10.12 SDK Libsystem and should be identical to this one." + # but the package is marked broken on darwin so unable to test + # Pull a header that contains a definition of proc_pid_rusage(). # (We pick just that one because using the other headers from `sdk` is not # compatible with our C++ standard library. This header is already in diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 0e9011778d2d..687a51832f96 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -21,7 +21,7 @@ , seatd , vulkan-loader , glslang -, libliftoff_0_4 +, libliftoff , libdisplay-info , nixosTests @@ -132,7 +132,7 @@ rec { ]; extraBuildInputs = [ ffmpeg - libliftoff_0_4 + libliftoff libdisplay-info ]; }; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index cfd6b99412a1..23970be58d08 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -60,6 +60,9 @@ stdenv.mkDerivation (finalAttrs: { "--enable-armasm=inline" ] ++ extraConfigureFlags; + # Breaks tls13 tests on aarch64-darwin. + hardeningDisable = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "zerocallusedregs" ]; + # LTO should help with the C implementations. env.NIX_CFLAGS_COMPILE = lib.optionalString enableLto "-flto"; env.NIX_LDFLAGS_COMPILE = lib.optionalString enableLto "-flto"; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 91e8a435db80..e46599634d17 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { homepage = "http://www.videolan.org/developers/x264.html"; license = licenses.gpl2Plus; platforms = platforms.unix ++ platforms.windows; - maintainers = with maintainers; [ tadeokondrak ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index fdcad63a279f..a118c51ff136 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { homepage = "https://www.openzim.org/wiki/Zimlib"; license = licenses.gpl2; maintainers = with maintainers; [ greg ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/zlib-ng/default.nix b/pkgs/development/libraries/zlib-ng/default.nix index c4d2aa2c5334..c6fa9cb2a2ac 100644 --- a/pkgs/development/libraries/zlib-ng/default.nix +++ b/pkgs/development/libraries/zlib-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - hash = "sha256-Auu7DS4qNm9/8t/nCjEJBaXfPPxA18oZr2qqybVY4Es="; + hash = "sha256-fNebnLeME0HXUx8M7YfTT0aMJQggEmMs9EbJFWL1zC4="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 143d82b53b59..87103e5ff3f5 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -430,7 +430,7 @@ let pkgs.gsettings-desktop-schemas pkgs.glib pkgs.gtk3 # needed for XDG_ICON_DIRS - pkgs.gnome.adwaita-icon-theme + pkgs.adwaita-icon-theme ]; # This patch removes the :build-operation component from the nyxt/gi-gtk-application system. diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index a745bfd4fe20..595e08dd6a94 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -140,7 +140,7 @@ let nativeLibs = [ pkgs.libGLU ]; }); cl-glut = super.cl-glut.overrideLispAttrs (o: { - nativeLibs = [ pkgs.freeglut ]; + nativeLibs = [ pkgs.libglut ]; }); cl-glfw = super.cl-glfw.overrideLispAttrs (o: { nativeLibs = [ pkgs.glfw ]; diff --git a/pkgs/development/lua-modules/aliases.nix b/pkgs/development/lua-modules/aliases.nix index 168cb66f8c9b..efa9a1e423cd 100644 --- a/pkgs/development/lua-modules/aliases.nix +++ b/pkgs/development/lua-modules/aliases.nix @@ -43,4 +43,5 @@ mapAliases { cyrussasl = throw "cyrussasl was removed because broken and unmaintained "; # added 2023-10-18 nlua-nvim = throw "nlua-nvim was removed, use neodev-nvim instead"; # added 2023-12-16 nvim-client = throw "nvim-client was removed because it is now part of neovim"; # added 2023-12-17 + toml = throw "toml was removed because broken. You can use toml-edit instead"; # added 2024-06-25 } diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d159c09a6480..5a2498585da7 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -11,7 +11,7 @@ buildLuarocksPackage { pname = "alt-getopt"; version = "0.8.0-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/alt-getopt-0.8.0-1.rockspec"; + url = "mirror://luarocks/alt-getopt-0.8.0-1.rockspec"; sha256 = "17yxi1lsrbkmwzcn1x48x8758d7v1frsz1bmnpqfv4vfnlh0x210"; }).outPath; src = fetchFromGitHub { @@ -49,6 +49,7 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/kikito/ansicolors.lua"; description = "Library for color Manipulation."; + maintainers = with lib.maintainers; [ Freed-Wu ]; license.fullName = "MIT "; }; }) {}; @@ -58,7 +59,7 @@ buildLuarocksPackage { pname = "argparse"; version = "0.7.1-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/argparse-0.7.1-1.rockspec"; + url = "mirror://luarocks/argparse-0.7.1-1.rockspec"; sha256 = "116iaczq6glzzin6qqa2zn7i22hdyzzsq6mzjiqnz6x1qmi0hig8"; }).outPath; src = fetchzip { @@ -170,6 +171,30 @@ buildLuarocksPackage { }; }) {}; +busted-htest = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: +buildLuarocksPackage { + pname = "busted-htest"; + version = "1.0.0-2"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/busted-htest-1.0.0-2.rockspec"; + sha256 = "10d2pbh2rfy4ygp40h8br4w5j1z5syq5pn6knd4bbnacmswnmcdl"; + }).outPath; + src = fetchFromGitHub { + owner = "hishamhm"; + repo = "busted-htest"; + rev = "1.0.0"; + hash = "sha256-tGAQUSeDt+OV/TBAJo/JFdyeBRRZaIQEJG+SKcCaQhs="; + }; + + + meta = { + homepage = "https://github.com/hishamhm/busted-htest"; + description = "A pretty output handler for Busted"; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "MIT"; + }; +}) {}; + cassowary = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, penlight }: buildLuarocksPackage { pname = "cassowary"; @@ -225,14 +250,14 @@ buildLuarocksPackage { commons-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "commons.nvim"; - version = "15.0.2-1"; + version = "18.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/commons.nvim-15.0.2-1.rockspec"; - sha256 = "1n78bgp9y2smnhkjkdvn2c6lq6071k9dml4j6r7hk462hxsbjsqn"; + url = "mirror://luarocks/commons.nvim-18.0.0-1.rockspec"; + sha256 = "073cmh0a1kqzw71ckir8rk6nrhi14rc96vmxzhl4zbfyr3ji05r7"; }).outPath; src = fetchzip { - url = "https://github.com/linrongbin16/commons.nvim/archive/cc17fd28c5f171c5d55f75d668b812e2d70b4cf3.zip"; - sha256 = "0w5z03r59jy3zb653dwp9c6fq8ivjj1j2ksnsx95wlmj1mx04ixi"; + url = "https://github.com/linrongbin16/commons.nvim/archive/75407685b543cdb2263e92366bc4f3c828f4ad69.zip"; + sha256 = "0zm0kjch5rzdkv6faksw16lmhxkil2sdhfl7xvdyc0z830d1k2km"; }; disabled = luaOlder "5.1"; @@ -349,8 +374,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "teal-language"; repo = "cyan"; - rev = "51649e4a814c05deaf5dde929ba82803f5170bbc"; - hash = "sha256-83F2hFAXHLg4l5O0+j3zbwTv0TaCWEfWErO9C0V9W04="; + rev = "992e573ca58e55ae33c420ea0f620b2daf5fa9c0"; + hash = "sha256-vuRB+0gmwUmFnt+A6m6aa0c54dPZSY4EohHjTcRQRZs="; }; propagatedBuildInputs = [ argparse luafilesystem tl ]; @@ -390,14 +415,14 @@ buildLuarocksPackage { dkjson = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "dkjson"; - version = "2.7-1"; + version = "2.8-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/dkjson-2.7-1.rockspec"; - sha256 = "0kgrgyn848hadsfhf2wccamgdpjs1cz7424fjp9vfqzjbwa06lxd"; + url = "mirror://luarocks/dkjson-2.8-1.rockspec"; + sha256 = "060410qpbsvmw2kwbkwh5ivcpnqqcbmcj4dxhf8hvjgvwljsrdka"; }).outPath; src = fetchurl { - url = "http://dkolf.de/dkjson-lua/dkjson-2.7.tar.gz"; - sha256 = "sha256-TFGmIQLy9r23Z3fx23NgUJtKARaANYi06CVfQ1ryOVw="; + url = "http://dkolf.de/dkjson-lua/dkjson-2.8.tar.gz"; + hash = "sha256-JOjNO+uRwchh63uz+8m9QYu/+a1KpdBHGBYlgjajFTI="; }; disabled = luaOlder "5.1" || luaAtLeast "5.5"; @@ -435,14 +460,14 @@ buildLuarocksPackage { fidget-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fidget.nvim"; - version = "1.1.0-1"; + version = "1.4.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fidget.nvim-1.1.0-1.rockspec"; - sha256 = "0pgjbsqp6bs9kwi0qphihwhl47j1lzdgg3xfa6msikrcf8d7j0hf"; + url = "mirror://luarocks/fidget.nvim-1.4.1-1.rockspec"; + sha256 = "1dfhwa6dgca88h6p9h75qlkcx3qsl8g4aflvndd7vjcimlnfiqqd"; }).outPath; src = fetchzip { - url = "https://github.com/j-hui/fidget.nvim/archive/300018af4abd00610a345e382ca1f4b7ba420f77.zip"; - sha256 = "0bwjcqkb735wqnzc8rngvpq1b2rxgc7m0arjypvnvzsxw6wd1f61"; + url = "https://github.com/j-hui/fidget.nvim/archive/1ba38e4cbb24683973e00c2e36f53ae64da38ef5.zip"; + sha256 = "0g0z1g1nmrjmg9298vg2ski6m41f1yhpas8kr9mi8pa6ibk4m63x"; }; disabled = luaOlder "5.1"; @@ -460,7 +485,7 @@ buildLuarocksPackage { pname = "fifo"; version = "0.2-0"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/fifo-0.2-0.rockspec"; + url = "mirror://luarocks/fifo-0.2-0.rockspec"; sha256 = "0vr9apmai2cyra2n573nr3dyk929gzcs4nm1096jdxcixmvh2ymq"; }).outPath; src = fetchzip { @@ -528,14 +553,14 @@ buildLuarocksPackage { fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.1243-1"; + version = "0.0.1349-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.1243-1.rockspec"; - sha256 = "1qg36v2gx36k313jisxyf6yjywzqngak2qcx211hd2wzxdnsaxdb"; + url = "mirror://luarocks/fzf-lua-0.0.1349-1.rockspec"; + sha256 = "0v9frrq896d3k3xvz0ch51r2chrw4kalp5d2jb365wpnk4zda1lj"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/9a0912d171940e8701d1f65d5ee2b23b810720c1.zip"; - sha256 = "0xzgpng4r9paza87fnxc3cfn331g1pmcayv1vky7jmriy5xsrxh6"; + url = "https://github.com/ibhagwan/fzf-lua/archive/1ec6eeda11c3a3dcd544e1c61ad4b8c9b49903c4.zip"; + sha256 = "0iw3khl164qvypm7v591gyncjfpmwx6wy45a80zz922iiifgjfgd"; }; disabled = luaOlder "5.1"; @@ -579,8 +604,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "035da036e68e509ed158414416c827d022d914bd"; - hash = "sha256-UK3DyvrQ0kLm9wrMQ6tLDoDunoThbY/Yfjn+eCZpuMw="; + rev = "17e8fd66182c9ad79dc129451ad015af3d27529c"; + hash = "sha256-Mq3NC/DpEEOZlgKctjQqa1RMJHVSAy6jfL4IitObgzs="; }; disabled = lua.luaversion != "5.1"; @@ -595,14 +620,14 @@ buildLuarocksPackage { haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "3.1.8-1"; + version = "3.1.10-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-3.1.8-1.rockspec"; - sha256 = "1jhms5gpah8lk0mn1gx127afmihyaq1fj8qrd6a8yh3wy12k1qxc"; + url = "mirror://luarocks/haskell-tools.nvim-3.1.10-1.rockspec"; + sha256 = "0s7haq3l29b26x9yj88j4xh70gm9bnnqn4q7qnkrwand3bj9m48q"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.1.8.zip"; - sha256 = "14nk6jyq2y4q93ij56bdjy17h3jlmjwsspw3l6ahvjsl6yg1lv75"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.1.10.zip"; + sha256 = "1cxfv2f4vvkqmx1k936k476mxsy1yn85blg0qyfsjfagca25ymmv"; }; disabled = luaOlder "5.1"; @@ -642,14 +667,14 @@ buildLuarocksPackage { image-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, magick }: buildLuarocksPackage { pname = "image.nvim"; - version = "1.2.0-1"; + version = "1.3.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/image.nvim-1.2.0-1.rockspec"; - sha256 = "0732fk2p2v9f72689jms4pdjsx9m7vdi1ib65jfz7q4lv9pdx508"; + url = "mirror://luarocks/image.nvim-1.3.0-1.rockspec"; + sha256 = "1ls3v5xcgmqmscqk5prpj0q9sy0946rfb2dfva5f1axb5x4jbvj9"; }).outPath; src = fetchzip { - url = "https://github.com/3rd/image.nvim/archive/v1.2.0.zip"; - sha256 = "1v4db60yykjajabmf12zjcg47bb814scjrig0wvn4yc11isinymg"; + url = "https://github.com/3rd/image.nvim/archive/v1.3.0.zip"; + sha256 = "0fbc3wvzsck8bbz8jz5piy68w1xmq5cnhaj1lw91d8hkyjryrznr"; }; disabled = luaOlder "5.1"; @@ -1108,7 +1133,7 @@ buildLuarocksPackage { pname = "lua-ffi-zlib"; version = "0.6-0"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-ffi-zlib-0.6-0.rockspec"; + url = "mirror://luarocks/lua-ffi-zlib-0.6-0.rockspec"; sha256 = "060sac715f1ris13fjv6gwqm0lk6by0a2zhldxd8hdrc0jss8p34"; }).outPath; src = fetchFromGitHub { @@ -1153,7 +1178,7 @@ buildLuarocksPackage { pname = "lua-lsp"; version = "0.1.0-2"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-lsp-0.1.0-2.rockspec"; + url = "mirror://luarocks/lua-lsp-0.1.0-2.rockspec"; sha256 = "19jsz00qlgbyims6cg8i40la7v8kr7zsxrrr3dg0kdg0i36xqs6c"; }).outPath; src = fetchFromGitHub { @@ -1198,16 +1223,16 @@ buildLuarocksPackage { lua-protobuf = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-protobuf"; - version = "0.5.1-1"; + version = "0.5.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-protobuf-0.5.1-1.rockspec"; - sha256 = "1ljn0xwrhcr49k4fzrh0g1q13j16sa6h3wd5q62995q4jlrmnhja"; + url = "mirror://luarocks/lua-protobuf-0.5.2-1.rockspec"; + sha256 = "0vi916qn0rbc2xhlf766vja403hwikkglza879yxm77j4n7ywrqb"; }).outPath; src = fetchFromGitHub { owner = "starwing"; repo = "lua-protobuf"; - rev = "0.5.1"; - hash = "sha256-Di4fahYlTFfJ2xM6KMs5BY44JV7IKBxxR345uk8X9W8="; + rev = "0.5.2"; + hash = "sha256-8x6FbaSUcwI1HiVvCr/726CgQSUxkUWqTNJH9pRLbJ0="; }; disabled = luaOlder "5.1"; @@ -1297,16 +1322,16 @@ buildLuarocksPackage { lua-resty-openssl = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "1.3.1-1"; + version = "1.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openssl-1.3.1-1.rockspec"; - sha256 = "1rqsmsnnnz78yb0x2xf7764l3rk54ngk3adm6an4g7dm5kryv33f"; + url = "mirror://luarocks/lua-resty-openssl-1.4.0-1.rockspec"; + sha256 = "027fqpbhq0ygh9z7za2hv7wm6ylll8km4czvjfclscm4p55bj10q"; }).outPath; src = fetchFromGitHub { owner = "fffonion"; repo = "lua-resty-openssl"; - rev = "1.3.1"; - hash = "sha256-4h6oIdiMyW9enJToUBtRuUdnKSyWuFFxIDvj4dFRKDs="; + rev = "1.4.0"; + hash = "sha256-gmsKpt42hgjqhzibYXbdWyj2MqOyC8FlhMY7xiXdtFQ="; }; @@ -1553,16 +1578,16 @@ buildLuarocksPackage { luacheck = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luacheck"; - version = "1.1.2-1"; + version = "1.2.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luacheck-1.1.2-1.rockspec"; - sha256 = "11p7kf7v1b5rhi3m57g2zqwzmnnp79v76gh13b0fg2c78ljkq1k9"; + url = "mirror://luarocks/luacheck-1.2.0-1.rockspec"; + sha256 = "0jnmrppq5hp8cwiw1daa33cdn8y2n5lsjk8vzn7ixb20ddz01m6c"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; repo = "luacheck"; - rev = "v1.1.2"; - hash = "sha256-AUEHRuldlnuxBWGRzcbjM4zu5IBGfbNEUakPmpS4VIo="; + rev = "v1.2.0"; + hash = "sha256-6aDXZRLq2c36dbasyVzcecQKoMvY81RIGYasdF211UY="; }; disabled = luaOlder "5.1"; @@ -1628,7 +1653,7 @@ buildLuarocksPackage { pname = "luadbi-mysql"; version = "0.7.3-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luadbi-mysql-0.7.3-1.rockspec"; + url = "mirror://luarocks/luadbi-mysql-0.7.3-1.rockspec"; sha256 = "1x0pl6qpdi4vmhxs2076kkxmikbv0asndh8lp34r47lym37hcrr3"; }).outPath; src = fetchFromGitHub { @@ -1889,6 +1914,30 @@ buildLuarocksPackage { }; }) {}; +luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: +buildLuarocksPackage { + pname = "luaposix"; + version = "34.1.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luaposix-34.1.1-1.rockspec"; + sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz"; + }).outPath; + src = fetchzip { + url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip"; + sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl"; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.4"; + propagatedBuildInputs = [ bit32 ]; + + meta = { + homepage = "http://github.com/luaposix/luaposix/"; + description = "Lua bindings for POSIX"; + maintainers = with lib.maintainers; [ vyp lblasc ]; + license.fullName = "MIT/X11"; + }; +}) {}; + luaprompt = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luaprompt"; @@ -1910,30 +1959,7 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/dpapavas/luaprompt"; description = "A Lua command prompt with pretty-printing and auto-completion"; - license.fullName = "MIT/X11"; - }; -}) {}; - -luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: -buildLuarocksPackage { - pname = "luaposix"; - version = "34.1.1-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luaposix-34.1.1-1.rockspec"; - sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz"; - }).outPath; - src = fetchzip { - url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip"; - sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl"; - }; - - disabled = luaOlder "5.1" || luaAtLeast "5.4"; - propagatedBuildInputs = [ bit32 ]; - - meta = { - homepage = "http://github.com/luaposix/luaposix/"; - description = "Lua bindings for POSIX"; - maintainers = with lib.maintainers; [ vyp lblasc ]; + maintainers = with lib.maintainers; [ Freed-Wu ]; license.fullName = "MIT/X11"; }; }) {}; @@ -1963,16 +1989,16 @@ buildLuarocksPackage { luarocks = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "luarocks"; - version = "3.11.0-1"; + version = "3.11.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-3.11.0-1.rockspec"; - sha256 = "0pi55445dskpw6nhrq52589h4v39fsf23c0kp8d4zg2qaf6y2n38"; + url = "mirror://luarocks/luarocks-3.11.1-1.rockspec"; + sha256 = "0xg0siza8nlnnkaarmw73q12qx3frlfbysd5ipmxxi1d7yc38bbn"; }).outPath; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; - rev = "v3.11.0"; - hash = "sha256-mSwwBuLWoMT38iYaV/BTdDmmBz4heTRJzxBHC0Vrvc4="; + rev = "v3.11.1"; + hash = "sha256-GglygI8HP+aDFEuucOkjQ2Pgfv4+jW+og+2vL3KoZCQ="; }; @@ -2008,21 +2034,21 @@ buildLuarocksPackage { }; }) {}; -luarocks-build-treesitter-parser = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, luafilesystem }: +luarocks-build-treesitter-parser = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luarocks-build-treesitter-parser"; - version = "2.0.0-1"; + version = "4.1.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-build-treesitter-parser-2.0.0-1.rockspec"; - sha256 = "0ylax1r0yl5k742p8n0fq5irs2r632npigqp1qckfx7kwi89gxhb"; + url = "mirror://luarocks/luarocks-build-treesitter-parser-4.1.0-1.rockspec"; + sha256 = "0r3r8dvjn9zvpj06932ijqwypq636zv2vpq5pcj83xfvvi3fd2rw"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v2.0.0.zip"; - sha256 = "0gqiwk7dk1xn5n2m0iq5c7xkrgyaxwyd1spb573l289gprvlrbn5"; + url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v4.1.0.zip"; + sha256 = "1838q30n2xjb8cmhlzxax0kzvxhsdrskkk4715kkca8zk6i3zm98"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua luafilesystem ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ luafilesystem ]; meta = { homepage = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser"; @@ -2158,16 +2184,16 @@ buildLuarocksPackage { luasystem = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luasystem"; - version = "0.3.0-2"; + version = "0.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasystem-0.3.0-2.rockspec"; - sha256 = "02kwkcwf81v6ncxl1ng2pxlhalz78q2476snh5xxv3wnwqwbp10a"; + url = "mirror://luarocks/luasystem-0.4.0-1.rockspec"; + sha256 = "0brvqqxfz1w4l4nzaxds1d17flq7rx6lw8pjb565fyb2jhg39qc9"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; repo = "luasystem"; - rev = "v0.3.0"; - hash = "sha256-oTFH0x94gSo1sqk1GsDheoVrjJHxFWZLtlJ45GwupoU="; + rev = "v0.4.0"; + hash = "sha256-I1dG6ccOQAwpe18DjiYijKjerk+yDRic6fEERSte2Ks="; }; disabled = luaOlder "5.1"; @@ -2345,14 +2371,14 @@ buildLuarocksPackage { luv = callPackage({ buildLuarocksPackage, cmake, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luv"; - version = "1.44.2-1"; + version = "1.48.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luv-1.44.2-1.rockspec"; - sha256 = "07jwi50i16rv7sj914k1q3l9dy9wldbw2skmsdrzlkc57mqvg348"; + url = "mirror://luarocks/luv-1.48.0-2.rockspec"; + sha256 = "0353bjn9z90a1hd7rksdfrd9fbdd31hbvdaxr1fb0fh0bc1cpy94"; }).outPath; src = fetchurl { - url = "https://github.com/luvit/luv/releases/download/1.44.2-1/luv-1.44.2-1.tar.gz"; - sha256 = "0c2wkszxw6gwa4l6g1d2zzh660j13lif6c7a910vq7zn8jycgd9y"; + url = "https://github.com/luvit/luv/releases/download/1.48.0-2/luv-1.48.0-2.tar.gz"; + sha256 = "2c3a1ddfebb4f6550293a40ee789f7122e97647eede51511f57203de48c03b7a"; }; disabled = luaOlder "5.1"; @@ -2573,14 +2599,14 @@ buildLuarocksPackage { neotest = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, plenary-nvim }: buildLuarocksPackage { pname = "neotest"; - version = "5.2.3-1"; + version = "5.3.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/neotest-5.2.3-1.rockspec"; - sha256 = "16pwkwv2dmi9aqhp6bdbgwhksi891iz73rvksqmv136jx6fi7za1"; + url = "mirror://luarocks/neotest-5.3.3-1.rockspec"; + sha256 = "0bji9bfh129l9find3asakr97pxq76gdjp96gyibv02m4j0hgqjz"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neotest/neotest/archive/5caac5cc235d495a2382bc2980630ef36ac87032.zip"; - sha256 = "1i1d6m17wf3p76nm75jk4ayd4zyhslmqi2pc7j8qx87391mnz2c4"; + url = "https://github.com/nvim-neotest/neotest/archive/f30bab1faef13d47f3905e065215c96a42d075ad.zip"; + sha256 = "04jsfxq9xs751wspqbi850bwykyzf0d4fw4ar5gqwij34zja19h7"; }; disabled = luaOlder "5.1"; @@ -2649,8 +2675,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "8f3c541407e691af6163e2447f3af1bd6e17f9a3"; - hash = "sha256-rz+JMd/hsUEDNVan2sCuEGtbsOVi6oRmPtps+7qSXQE="; + rev = "a110e12d0b58eefcf5b771f533fc2cf3050680ac"; + hash = "sha256-7tEfEjWH5pneI10jLYpenoysRQPa2zPGLTNcbMX3x2I="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2665,14 +2691,14 @@ buildLuarocksPackage { nvim-nio = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "nvim-nio"; - version = "1.9.0-1"; + version = "1.9.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/nvim-nio-1.9.0-1.rockspec"; - sha256 = "0hwjkz0pjd8dfc4l7wk04ddm8qzrv5m15gskhz9gllb4frnk6hik"; + url = "mirror://luarocks/nvim-nio-1.9.4-1.rockspec"; + sha256 = "05xccwawl82xjwxmpihb6v4l7sp0msc6hhgs8mgzbsclznf78052"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neotest/nvim-nio/archive/v1.9.0.zip"; - sha256 = "0y3afl42z41ymksk29al5knasmm9wmqzby860x8zj0i0mfb1q5k5"; + url = "https://github.com/nvim-neotest/nvim-nio/archive/7969e0a8ffabdf210edd7978ec954a47a737bbcc.zip"; + sha256 = "0ip31k5rnmv47rbka1v5mhljmff7friyj4gcqzz4hqj1yccfl1l0"; }; disabled = luaOlder "5.1"; @@ -2708,13 +2734,13 @@ buildLuarocksPackage { }; }) {}; -penlight = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luafilesystem }: +penlight = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "penlight"; - version = "1.14.0-1"; + version = "1.14.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/penlight-1.14.0-1.rockspec"; - sha256 = "1zmibf0pgcnf0lj1xmxs0srbyy1cswvb9g1jajy9lhicnpqqlgvh"; + url = "mirror://luarocks/penlight-1.14.0-2.rockspec"; + sha256 = "0gs07q81mkrk9i0hhqvd8nf5vzmv540ch2hiw4rcqg18vbyincq7"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; @@ -2723,7 +2749,6 @@ buildLuarocksPackage { hash = "sha256-4zAt0GgQEkg9toaUaDn3ST3RvjLUDsuOzrKi9lhq0fQ="; }; - disabled = luaOlder "5.1"; propagatedBuildInputs = [ luafilesystem ]; meta = { @@ -2742,8 +2767,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "08e301982b9a057110ede7a735dd1b5285eb341f"; - hash = "sha256-vy0MXEoSM4rvYpfwbc2PnilvMOA30Urv0FAxjXuvqQ8="; + rev = "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683"; + hash = "sha256-5Jf2mWFVDofXBcXLbMa417mqlEPWLA+cQIZH/vNEV1g="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2829,14 +2854,14 @@ buildLuarocksPackage { rocks-config-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, rocks-nvim }: buildLuarocksPackage { pname = "rocks-config.nvim"; - version = "1.5.0-1"; + version = "2.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-config.nvim-1.5.0-1.rockspec"; - sha256 = "14rj1p7grmdhi3xm683c3c441xxcldhi5flh6lg1fab1rm9mij6b"; + url = "mirror://luarocks/rocks-config.nvim-2.0.0-1.rockspec"; + sha256 = "0vkzhz6szbm6cy4301c103kck36zgk8ig2ssipclca392cq36716"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v1.5.0.zip"; - sha256 = "0kpvd9ddj1vhkz54ckqsym4fbj1krzpp8cslb20k8qk2n1ccjynv"; + url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v2.0.0.zip"; + sha256 = "1gzpcvb79s8a0mxq331fhwgik4bkaj254avri50wm1y5qxb4n3nx"; }; disabled = luaOlder "5.1"; @@ -2850,21 +2875,21 @@ buildLuarocksPackage { }; }) {}; -rocks-dev-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, nvim-nio, rocks-nvim }: +rocks-dev-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim, rtp-nvim }: buildLuarocksPackage { pname = "rocks-dev.nvim"; - version = "1.1.2-1"; + version = "1.2.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-dev.nvim-1.1.2-1.rockspec"; - sha256 = "09yz84akkparvqfsjpslxpv3wzvkjrbqil8fxwl5crffggn5mz1b"; + url = "mirror://luarocks/rocks-dev.nvim-1.2.3-1.rockspec"; + sha256 = "0xhl0rmklhhlcsn268brj7hhl5lk2djhkllzna2rnjaq80cwsh5j"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.1.2.zip"; - sha256 = "19g8dlz2zch0sz21zm92l6ic81bx68wklidjw94xrjyv26139akc"; + url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.2.3.zip"; + sha256 = "17sv49wl366jxriy0cxy3b1z8vans58jmjg4ap5dc9fmg6687jgs"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua nvim-nio rocks-nvim ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ nvim-nio rocks-nvim rtp-nvim ]; meta = { homepage = "https://github.com/nvim-neorocks/rocks-dev.nvim"; @@ -2877,14 +2902,14 @@ buildLuarocksPackage { rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim }: buildLuarocksPackage { pname = "rocks-git.nvim"; - version = "1.4.0-1"; + version = "1.5.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-git.nvim-1.4.0-1.rockspec"; - sha256 = "04zx6yvp5pg306wqaw6fymqci5qnzpzg27xjrycflcyxxq4xmnmg"; + url = "mirror://luarocks/rocks-git.nvim-1.5.1-1.rockspec"; + sha256 = "0if5vaxggf4ryik5szm1p5dv324sybm9h3jbpl78ydd1kf0702m6"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v1.4.0.zip"; - sha256 = "0yjigf9pzy53yylznnnb68dwmylx9a3qv84kdc2whsf4cj23m2nj"; + url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v1.5.1.zip"; + sha256 = "05g31js2k2jjrz0a633vdfz21ji1a2by79yrfhi6wdmp167a5w99"; }; disabled = luaOlder "5.1"; @@ -2898,21 +2923,21 @@ buildLuarocksPackage { }; }) {}; -rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, nvim-nio, rtp-nvim, toml-edit }: +rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }: buildLuarocksPackage { pname = "rocks.nvim"; - version = "2.26.0-1"; + version = "2.31.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks.nvim-2.26.0-1.rockspec"; - sha256 = "1piypyxq1c6l203f3w8z4fhfi649h5ppl58lckvxph9dvidg11lf"; + url = "mirror://luarocks/rocks.nvim-2.31.3-1.rockspec"; + sha256 = "1rrsshsi6c5njcyaibz1mdvhyjl4kf2973kwahyk84j52fmwzwjv"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.26.0.zip"; - sha256 = "10wck99dfwxv49pkd9pva7lqr4a79zccbqvb75qbxkgnj0yd5awc"; + url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.31.3.zip"; + sha256 = "07500g0jvicbxqmsqdb3dcjpmvd6wgwk8g34649f94nhqk3lglx5"; }; disabled = luaOlder "5.1"; - propagatedBuildInputs = [ fidget-nvim fzy nvim-nio rtp-nvim toml-edit ]; + propagatedBuildInputs = [ fidget-nvim fzy luarocks nvim-nio rtp-nvim toml-edit ]; meta = { homepage = "https://github.com/nvim-neorocks/rocks.nvim"; @@ -2922,8 +2947,7 @@ buildLuarocksPackage { }; }) {}; - -rtp-nvim = callPackage ({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: +rtp-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rtp.nvim"; version = "1.0.0-1"; @@ -2941,6 +2965,7 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/nvim-neorocks/rtp.nvim"; description = "Source plugin and ftdetect directories on the Neovim runtimepath."; + maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "GPL-3.0"; }; }) {}; @@ -2948,14 +2973,14 @@ buildLuarocksPackage { rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "4.22.8-1"; + version = "4.25.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-4.22.8-1.rockspec"; - sha256 = "18hghs9v9j3kv3fxwdp7qk9vhbxn4c8xd8pyxwnyjq5ad7ninr82"; + url = "mirror://luarocks/rustaceanvim-4.25.1-1.rockspec"; + sha256 = "1lrjybnicbyl9rh0qcp846s6b57gryca0fw719c8h8pasb9kf1m0"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/4.22.8.zip"; - sha256 = "1n9kqr8xdqamc8hd8a155h7rzyda8bz39n0zdgdw0j8hqc214vmm"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/4.25.1.zip"; + sha256 = "1rym8n7595inb9zdrmw7jwp5iy5r28b7mfjs4k2mvmlby9fxcmz0"; }; disabled = luaOlder "5.1"; @@ -2997,8 +3022,8 @@ buildLuarocksPackage { pname = "serpent"; version = "0.30-2"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/serpent-0.30-2.rockspec"; - sha256 = "01696wwp1m8jlcj0y1wwscnz3cpcjdvm8pcnc6c6issa2s4544vr"; + url = "mirror://luarocks/serpent-0.30-2.rockspec"; + sha256 = "0v83lr9ars1n0djbh7np8jjqdhhaw0pdy2nkcqzqrhv27rzv494n"; }).outPath; src = fetchFromGitHub { owner = "pkulchenko"; @@ -3136,14 +3161,14 @@ buildLuarocksPackage { telescope-manix = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, telescope-nvim }: buildLuarocksPackage { pname = "telescope-manix"; - version = "1.0.2-1"; + version = "1.0.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/telescope-manix-1.0.2-1.rockspec"; - sha256 = "0a5cg3kx2pv8jsr0jdpxd1ahprh55n12ggzlqiailyyskzpx94bl"; + url = "mirror://luarocks/telescope-manix-1.0.3-1.rockspec"; + sha256 = "0avqlglmki244q3ffnlc358z3pn36ibcqysxrxw7h6qy1zcwm8sr"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/telescope-manix/archive/1.0.2.zip"; - sha256 = "0y3n270zkii123r3987xzvp194dl0q1hy234v95w7l48cf4v495k"; + url = "https://github.com/mrcjkb/telescope-manix/archive/1.0.3.zip"; + sha256 = "186rbdddpv8q0zcz18lnkarp0grdzxp80189n4zj2mqyzqnw0svj"; }; disabled = luaOlder "5.1"; @@ -3167,8 +3192,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "35f94f0ef32d70e3664a703cefbe71bd1456d899"; - hash = "sha256-AtvZ7b2bg+Iaei4rRzTBYf76vHJH2Yq5tJAJZrZw/pk="; + rev = "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed"; + hash = "sha256-0fS3RYO/9gwmdK2H9Y/4Z/P++4aEHTHJqR2mH0vWAFY="; }; disabled = lua.luaversion != "5.1"; @@ -3232,39 +3257,6 @@ buildLuarocksPackage { }; }) {}; -toml = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "toml"; - version = "0.3.0-0"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/toml-0.3.0-0.rockspec"; - sha256 = "0y4qdzsvf4xwnr49xcpbqclrq9d6snv83cbdkrchl0cn4cx6zpxy"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/LebJe/toml.lua.git", - "rev": "319e9accf8c5cedf68795354ba81e54c817d1277", - "date": "2023-02-19T23:00:49-05:00", - "path": "/nix/store/p6a98sqp9a4jwsw6ghqcwpn9lxmhvkdg-toml.lua", - "sha256": "05p33bq0ajl41vbsw9bx73shpf0p11n5gb6yy8asvp93zh2m51hq", - "hash": "sha256-GIZSBfwj3a0V8t6sV2wIF7gL9Th9Ja7XDoRKBfAa4xY=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://github.com/LebJe/toml.lua"; - description = "TOML v1.0.0 parser and serializer for Lua. Powered by toml++."; - maintainers = with lib.maintainers; [ mrcjkb ]; - license.fullName = "MIT"; - }; -}) {}; - toml-edit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "toml-edit"; @@ -3289,7 +3281,7 @@ buildLuarocksPackage { }; }) {}; -tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip }: +tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luarocks-build-treesitter-parser }: buildLuarocksPackage { pname = "tree-sitter-norg"; version = "0.2.4-1"; @@ -3302,10 +3294,12 @@ buildLuarocksPackage { sha256 = "08bsk3v61r0xhracanjv25jccqv80ahipx0mv5a1slzhcyymv8kd"; }; + nativeBuildInputs = [ luarocks-build-treesitter-parser ]; meta = { homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; description = "The official tree-sitter parser for Norg documents."; + maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "MIT"; }; }) {}; @@ -3361,16 +3355,16 @@ buildLuarocksPackage { xml2lua = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "xml2lua"; - version = "1.5-2"; + version = "1.6-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/xml2lua-1.5-2.rockspec"; - sha256 = "1h0zszjzi65jc2rmpam7ai38sx2ph09q66jkik5mgzr6cxm1cm4h"; + url = "mirror://luarocks/xml2lua-1.6-2.rockspec"; + sha256 = "1fh57kv95a18q4869hmr4fbzbnlmq5z83mkkixvwzg3szf9kvfcn"; }).outPath; src = fetchFromGitHub { owner = "manoelcampos"; repo = "xml2lua"; - rev = "v1.5-2"; - hash = "sha256-hDCUTM+EM9Z+rCg+CbL6qLzY/5qaz6J1Q2khfBlkY+4="; + rev = "v1.6-2"; + hash = "sha256-4il5mmRLtuyCJ2Nm1tKv2hXk7rmiq7Fppx9LMbjkne0="; }; disabled = luaOlder "5.1"; diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix index 5841547073d3..dc7cbcc5f76e 100644 --- a/pkgs/development/lua-modules/lib.nix +++ b/pkgs/development/lua-modules/lib.nix @@ -124,7 +124,6 @@ rec { (lib.filter (lib.isDerivation) externalDeps); generatedConfig = ({ - local_cache = ""; # To prevent collisions when creating environments, we install the rock # files into per-package subdirectories diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 34338bf96b84..99fe9217c960 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -326,11 +326,15 @@ in ''; }); + lua-resty-jwt = prev.lua-resty-jwt.overrideAttrs(oa: { + meta = oa.meta // { broken = true; }; + }); + lua-zlib = prev.lua-zlib.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [ zlib.dev ]; - meta.broken = luaOlder "5.1" || luaAtLeast "5.4"; + meta = oa.meta // { broken = luaOlder "5.1" || luaAtLeast "5.4"; }; }); luadbi-mysql = prev.luadbi-mysql.overrideAttrs (oa: { @@ -787,19 +791,6 @@ in nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; }); - toml = prev.toml.overrideAttrs (oa: { - patches = [ ./toml.patch ]; - - nativeBuildInputs = oa.nativeBuildInputs ++ [ tomlplusplus ]; - propagatedBuildInputs = oa.propagatedBuildInputs ++ [ sol2 ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "TOML_PLUS_PLUS_SRC" "${tomlplusplus.src}/include/toml++" \ - --replace-fail "MAGIC_ENUM_SRC" "${magic-enum.src}/include/magic_enum" - ''; - }); - toml-edit = prev.toml-edit.overrideAttrs (oa: { cargoDeps = rustPlatform.fetchCargoTarball { diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index 97ec85f6f2e9..3d0f43258a05 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -9,6 +9,7 @@ , meson , ninja , python3 +, yelp-xsl }: python3.pkgs.buildPythonApplication rec { @@ -35,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ itstool # build script checks for its presence but I am not sure if anything uses it - gnome.yelp-xsl + yelp-xsl ]; pythonPath = [ diff --git a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix index 1315b1ff98a2..637dbc58f4dd 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix @@ -2,7 +2,7 @@ # To test your changes in androidEnv run `nix-shell android-sdk-with-emulator-shell.nix` # If you copy this example out of nixpkgs, use these lines instead of the next. - # This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html + # This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html /*nixpkgsSource ? (builtins.fetchTarball { name = "nixpkgs-20.09"; url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz"; diff --git a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix index ec7020a0c9a9..a1308a9c1088 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix @@ -2,7 +2,7 @@ # To test your changes in androidEnv run `nix-shell android-sdk-with-emulator-shell.nix` # If you copy this example out of nixpkgs, use these lines instead of the next. - # This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html + # This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html /*nixpkgsSource ? (builtins.fetchTarball { name = "nixpkgs-20.09"; url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz"; diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index 88c1f7049ec3..0f4c0589adb0 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -1,6 +1,6 @@ { # If you copy this example out of nixpkgs, use these lines instead of the next. - # This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html + # This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html /*nixpkgsSource ? (builtins.fetchTarball { name = "nixpkgs-20.09"; url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz"; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 2031bfa354af..5c16b623d2d0 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -56,6 +56,7 @@ mapAliases { "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09 alloy = pkgs.titanium-alloy; # added 2023-08-17 antennas = pkgs.antennas; # added 2023-07-30 + inherit (pkgs) autoprefixer; # added 2024-06-25 inherit (pkgs) asar; # added 2023-08-26 inherit (pkgs) auto-changelog; # added 2024-06-25 inherit (pkgs) aws-azure-login; # added 2023-09-30 @@ -84,6 +85,7 @@ mapAliases { inherit (pkgs.elmPackages) elm-test; eslint_d = pkgs.eslint_d; # Added 2023-05-26 inherit (pkgs) firebase-tools; # added 2023-08-18 + inherit (pkgs) fixjson; # added 2024-06-26 flood = pkgs.flood; # Added 2023-07-25 generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24 inherit (pkgs) git-run; # added 2024-06-26 @@ -111,6 +113,7 @@ mapAliases { inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 karma = pkgs.karma-runner; # added 2023-07-29 leetcode-cli = vsc-leetcode-cli; # added 2023-08-31 + inherit (pkgs) lv_font_conv; # added 2024-06-28 manta = pkgs.node-manta; # Added 2023-05-06 inherit (pkgs) markdown-link-check; # added 2024-06-28 markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29 @@ -169,9 +172,15 @@ mapAliases { inherit (pkgs) titanium; # added 2023-08-17 triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 + inherit (pkgs) typescript-language-server; # added 2024-02-27 + inherit (pkgs) uglify-js; # added 2024-06-15 + inherit (pkgs) undollar; # added 2024-06-29 inherit (pkgs) ungit; # added 2023-08-20 inherit (pkgs) vim-language-server; # added 2024-06-25 inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30 + vscode-css-languageserver-bin = throw "vscode-css-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 + vscode-html-languageserver-bin = throw "vscode-html-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 + vscode-json-languageserver-bin = throw "vscode-json-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27 vue-cli = self."@vue/cli"; # added 2023-08-18 vue-language-server = self.vls; # added 2023-08-20 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 3f73129037eb..5983d3d099df 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -51,12 +51,6 @@ pscid = "pscid"; remod-cli = "remod"; teck-programmer = "teck-firmware-upgrade"; - typescript-language-server = "typescript-language-server"; - uglify-js = "uglifyjs"; - undollar = "$"; - vscode-css-languageserver-bin = "css-languageserver"; - vscode-html-languageserver-bin = "html-languageserver"; - vscode-json-languageserver-bin = "json-languageserver"; vscode-json-languageserver = "vscode-json-languageserver"; webtorrent-cli = "webtorrent"; } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c6502df1bec7..6b884b8109bf 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -20,7 +20,6 @@ , {"@webassemblyjs/wast-refmt": "1.11.1"} , "alex" , "audiosprite" -, "autoprefixer" , "aws-cdk" , "awesome-lint" , "bower" @@ -102,7 +101,6 @@ , "expo-cli" , "fast-cli" , "fauna-shell" -, "fixjson" , "fkill-cli" , "fleek-cli" , "forever" @@ -149,7 +147,6 @@ , "localtunnel" , "lodash" , "lua-fmt" -, "lv_font_conv" , "madoko" , "mastodon-bot" , "mathjax" @@ -250,18 +247,12 @@ , "tsun" , "ts-node" , "ttf2eot" -, "typescript-language-server" -, "uglify-js" -, "undollar" , "unified-language-server" , "vega-cli" , "vega-lite" , "vercel" , "vls" -, "vscode-css-languageserver-bin" -, "vscode-html-languageserver-bin" , "vscode-json-languageserver" -, "vscode-json-languageserver-bin" , "wavedrom-cli" , "webpack" , "webpack-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c5910dd0352e..d54cc8f11c93 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -27033,15 +27033,6 @@ let sha512 = "v7w209VPj4L6pPn/ftFRJu31Oa8QagwcVw7BZmLCUWU4AQoc954rX9ogSIahDf67Pg+GjPbkW/Kn9XWnlWJG0g=="; }; }; - "fraction.js-4.3.7" = { - name = "fraction.js"; - packageName = "fraction.js"; - version = "4.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz"; - sha512 = "ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew=="; - }; - }; "fragment-cache-0.2.1" = { name = "fragment-cache"; packageName = "fragment-cache"; @@ -33658,15 +33649,6 @@ let sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; }; - "json5-relaxed-0.5.4" = { - name = "json5-relaxed"; - packageName = "json5-relaxed"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/json5-relaxed/-/json5-relaxed-0.5.4.tgz"; - sha512 = "oDPf7b6nFDKcX2qt5OLI/ZwGwH43qS/g2Z98UWo8ChoNtVMYdGa3Y48WHvjPqvNKnTUa2fOanvHFeE7ZxkiboQ=="; - }; - }; "jsonata-1.8.7" = { name = "jsonata"; packageName = "jsonata"; @@ -63314,39 +63296,6 @@ in bypassCache = true; reconstructLock = true; }; - autoprefixer = nodeEnv.buildNodePackage { - name = "autoprefixer"; - packageName = "autoprefixer"; - version = "10.4.19"; - src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz"; - sha512 = "BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew=="; - }; - dependencies = [ - sources."browserslist-4.23.1" - sources."caniuse-lite-1.0.30001634" - sources."electron-to-chromium-1.4.802" - sources."escalade-3.1.2" - sources."fraction.js-4.3.7" - sources."nanoid-3.3.7" - sources."node-releases-2.0.14" - sources."normalize-range-0.1.2" - sources."picocolors-1.0.1" - sources."postcss-8.4.38" - sources."postcss-value-parser-4.2.0" - sources."source-map-js-1.2.0" - sources."update-browserslist-db-1.0.16" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Parse CSS and add vendor prefixes to CSS rules using values from the Can I Use website"; - homepage = "https://github.com/postcss/autoprefixer#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; @@ -72558,55 +72507,6 @@ in bypassCache = true; reconstructLock = true; }; - fixjson = nodeEnv.buildNodePackage { - name = "fixjson"; - packageName = "fixjson"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fixjson/-/fixjson-1.1.2.tgz"; - sha512 = "NptKAXT3UrePy8JfK6ww/yiwqjVipouoEYUucKVpLNOiOWsrZ7XtcG3iUWpb3yGUoaN7OEafsd3cEGFMIjoXUQ=="; - }; - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."detect-indent-6.1.0" - sources."emoji-regex-8.0.0" - sources."escalade-3.1.2" - sources."fs.realpath-1.0.0" - sources."get-caller-file-2.0.5" - sources."glob-7.2.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-fullwidth-code-point-3.0.0" - sources."json5-relaxed-0.5.4" - sources."minimatch-3.1.2" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."require-directory-2.1.1" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."y18n-5.0.8" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "JSON fixer for humans using (relaxed) JSON5"; - homepage = "https://github.com/rhysd/fixjson#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; packageName = "fkill-cli"; @@ -80820,24 +80720,6 @@ in bypassCache = true; reconstructLock = true; }; - lv_font_conv = nodeEnv.buildNodePackage { - name = "lv_font_conv"; - packageName = "lv_font_conv"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lv_font_conv/-/lv_font_conv-1.5.3.tgz"; - sha512 = "0xJQThBOw2iptFccSXrKDIUTQAwr/2zhKjCI1lATIRgZo8uvYRTmenKafW9yTw6G0y5AyW00tqGpUtYuTuBIbQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Rasterize vector fonts for embedded use. Supports subsettings & merge."; - homepage = "https://github.com/lvgl/lv_font_conv#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; madoko = nodeEnv.buildNodePackage { name = "madoko"; packageName = "madoko"; @@ -90233,59 +90115,6 @@ in bypassCache = true; reconstructLock = true; }; - typescript-language-server = nodeEnv.buildNodePackage { - name = "typescript-language-server"; - packageName = "typescript-language-server"; - version = "4.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-4.3.3.tgz"; - sha512 = "3QLj57Ru9S6zv10sa4z1pA3TIR1Rdkd04Ke0EszbO4fx5PLdlYhlC/PMxwlyxls9wrZs7wPCME1Ru0s1Gabz4Q=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Language Server Protocol (LSP) implementation for TypeScript using tsserver"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - uglify-js = nodeEnv.buildNodePackage { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.18.0.tgz"; - sha512 = "SyVVbcNBCk0dzr9XL/R/ySrmYf0s372K6/hFklzgcp2lBFyXtw4I7BOdDjlLhE1aVqaI/SHWXWmYdlZxuyF38A=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "JavaScript parser, mangler/compressor and beautifier toolkit"; - homepage = "https://github.com/mishoo/UglifyJS#readme"; - license = "BSD-2-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - undollar = nodeEnv.buildNodePackage { - name = "undollar"; - packageName = "undollar"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/undollar/-/undollar-1.0.0.tgz"; - sha512 = "nV0/O+9yV/We9a0ZwH8LTXW9Aqit2em7zMpHetUk/kXxw6ongHs4D8PyPPryYGx5/w8iHqu6dJ+qJjHtA7SfUw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "undollar strips the dollar sign from the beginning of the terminal command you just copied from StackOverflow when you were searching for what arguments to pass to `tar` (`xzf`? `xvfJ`? Or was it `xvf`? You never seem to remember)."; - homepage = "https://github.com/ImFeelingDucky/undollar#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; unified-language-server = nodeEnv.buildNodePackage { name = "unified-language-server"; packageName = "unified-language-server"; @@ -91244,72 +91073,6 @@ in bypassCache = true; reconstructLock = true; }; - vscode-css-languageserver-bin = nodeEnv.buildNodePackage { - name = "vscode-css-languageserver-bin"; - packageName = "vscode-css-languageserver-bin"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageserver-bin/-/vscode-css-languageserver-bin-1.4.0.tgz"; - sha512 = "KWrF5f4RYYe8RBDfqb1c0Sdf9xPS2Ly/Z/T18H+uUOMw2QyzIrkxv4bMKy5GFfPm4479k6Ln4ji4UHqSmhGf3g=="; - }; - dependencies = [ - sources."vscode-css-languageservice-3.0.13" - sources."vscode-jsonrpc-8.2.0" - sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.17.5" - sources."vscode-languageserver-protocol-foldingprovider-2.0.1" - sources."vscode-languageserver-types-3.17.5" - sources."vscode-nls-4.1.2" - sources."vscode-uri-1.0.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Binary version published on npm of vscode-css-languageserver extracted from VSCode tree"; - homepage = "https://github.com/vscode-langservers/vscode-css-languageserver-bin#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - vscode-html-languageserver-bin = nodeEnv.buildNodePackage { - name = "vscode-html-languageserver-bin"; - packageName = "vscode-html-languageserver-bin"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageserver-bin/-/vscode-html-languageserver-bin-1.4.0.tgz"; - sha512 = "rDnpvASQwf1dlRaGiu8edo5WlAr4dM3/r/dcPCH4O6UD4+eShhdC1E8IyiSisnJU6bRk+4mDTCgA6cyhGJY2xA=="; - }; - dependencies = [ - sources."typescript-2.9.2" - (sources."vscode-css-languageservice-3.0.13" // { - dependencies = [ - sources."vscode-nls-4.1.2" - ]; - }) - (sources."vscode-html-languageservice-2.1.12" // { - dependencies = [ - sources."vscode-nls-4.1.2" - ]; - }) - sources."vscode-jsonrpc-8.2.0" - sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.17.5" - sources."vscode-languageserver-protocol-foldingprovider-2.0.1" - sources."vscode-languageserver-types-3.17.5" - sources."vscode-nls-3.2.5" - sources."vscode-uri-1.0.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Binary version published on npm of vscode-html-languageserver extracted from VSCode tree"; - homepage = "https://github.com/vscode-langservers/vscode-html-languageserver-bin#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; vscode-json-languageserver = nodeEnv.buildNodePackage { name = "vscode-json-languageserver"; packageName = "vscode-json-languageserver"; @@ -91354,57 +91117,6 @@ in bypassCache = true; reconstructLock = true; }; - vscode-json-languageserver-bin = nodeEnv.buildNodePackage { - name = "vscode-json-languageserver-bin"; - packageName = "vscode-json-languageserver-bin"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageserver-bin/-/vscode-json-languageserver-bin-1.0.1.tgz"; - sha512 = "WU+Ks0OEo1c4pgFUA4gIockhzlRqWqSRL2NXHOCtYhJnuIqfrNgSyECZC+nCMyn/CnzpPuQQjzC74GWlIRXnZQ=="; - }; - dependencies = [ - sources."agent-base-4.3.0" - sources."debug-3.1.0" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" - sources."http-proxy-agent-2.1.0" - sources."https-proxy-agent-2.2.4" - sources."jsonc-parser-1.0.3" - sources."ms-2.0.0" - (sources."request-light-0.2.5" // { - dependencies = [ - sources."vscode-nls-4.1.2" - ]; - }) - (sources."vscode-json-languageservice-3.11.0" // { - dependencies = [ - sources."jsonc-parser-3.2.1" - sources."vscode-nls-5.2.0" - sources."vscode-uri-2.1.2" - ]; - }) - sources."vscode-jsonrpc-3.5.0" - sources."vscode-languageserver-3.5.1" - (sources."vscode-languageserver-protocol-3.5.1" // { - dependencies = [ - sources."vscode-languageserver-types-3.5.0" - ]; - }) - sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.16.0-next.2" - sources."vscode-nls-2.0.2" - sources."vscode-uri-1.0.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "JSON language server"; - homepage = "https://github.com/vscode-langservers/vscode-json-languageserver-bin#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; wavedrom-cli = nodeEnv.buildNodePackage { name = "wavedrom-cli"; packageName = "wavedrom-cli"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index c725197bddb6..9514265cbae8 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -29,17 +29,6 @@ final: prev: { buildInputs = [ final.node-gyp-build ]; }; - autoprefixer = prev.autoprefixer.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - postInstall = '' - wrapProgram "$out/bin/autoprefixer" \ - --prefix NODE_PATH : ${final.postcss}/lib/node_modules - ''; - passthru.tests = { - simple-execution = callPackage ./package-tests/autoprefixer.nix { inherit (final) autoprefixer; }; - }; - }; - bower2nix = prev.bower2nix.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' @@ -225,7 +214,7 @@ final: prev: { version = esbuild-version; src = fetchurl { url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-${esbuild-version}.tgz"; - sha512 = "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw=="; + sha512 = "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ=="; }; }; esbuild-linux-arm64 = { @@ -265,7 +254,7 @@ final: prev: { postInstall = '' wrapProgram "$out/bin/postcss" \ --prefix NODE_PATH : ${final.postcss}/lib/node_modules \ - --prefix NODE_PATH : ${final.autoprefixer}/lib/node_modules + --prefix NODE_PATH : ${pkgs.autoprefixer}/node_modules ln -s '${final.postcss}/lib/node_modules/postcss' "$out/lib/node_modules/postcss" ''; passthru.tests = { @@ -289,7 +278,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - hash = "sha256-136nEfCJjLLUMO3TZhVrltfqv8nU2fA14+L0JLe6Zfk="; + hash = "sha256-TlwKCuDQRFM6+Hhx9eFCfXbtLZq6RwBTIFCWzE4D8N8="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ @@ -389,13 +378,6 @@ final: prev: { ''; }; - typescript-language-server = prev.typescript-language-server.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - postInstall = '' - ${pkgs.xorg.lndir}/bin/lndir ${pkgs.typescript} $out - ''; - }; - uppy-companion = prev."@uppy/companion".override { name = "uppy-companion"; }; diff --git a/pkgs/development/ocaml-modules/biotk/default.nix b/pkgs/development/ocaml-modules/biotk/default.nix index 33a98f71cb67..b120e8008819 100644 --- a/pkgs/development/ocaml-modules/biotk/default.nix +++ b/pkgs/development/ocaml-modules/biotk/default.nix @@ -6,11 +6,11 @@ , ocaml-crunch , camlzip , core_kernel -, core_unix -, csvfields +, core_unix ? null +, csvfields ? null , fmt , gsl -, ppx_csv_conv +, ppx_csv_conv ? null , ppx_deriving , rresult , tyxml @@ -20,13 +20,13 @@ buildDunePackage rec { pname = "biotk"; - version = "0.2.0"; + version = "0.3"; minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/pveber/biotk/releases/download/v${version}/biotk-${version}.tbz"; - hash = "sha256-FQvbVj5MmraSN6AmOckKgJ/LB14E/pCsPvPvNppcv7A="; + hash = "sha256-9eRd3qYteUxu/xNEUER/DHodr6cTCuPtSKr38x32gig="; }; nativeBuildInputs = [ ocaml-crunch ]; diff --git a/pkgs/development/ocaml-modules/dscheck/default.nix b/pkgs/development/ocaml-modules/dscheck/default.nix index a2dd8bd9d2a9..2b781a8631f8 100644 --- a/pkgs/development/ocaml-modules/dscheck/default.nix +++ b/pkgs/development/ocaml-modules/dscheck/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "dscheck"; - version = "0.4.0"; + version = "0.5.0"; minimalOCamlVersion = "5.0"; src = fetchurl { url = "https://github.com/ocaml-multicore/dscheck/releases/download/${version}/dscheck-${version}.tbz"; - hash = "sha256-WWqa2O1y7krpIcxG7KLprn9SIQoWGSD3lgpXLZ9P9kA="; + hash = "sha256-9Rm2DmdvVeCkgAWCvkYdQTj94wmU7JkY8UI3fReIaG0="; }; propagatedBuildInputs = [ containers oseq ]; diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index d678c129188c..980c68298adc 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -16,6 +16,7 @@ let p5 = camlp5; in let camlp5 = p5.override { legacy = true; }; in let fetched = coqPackages.metaFetch ({ + release."1.19.2".sha256 = "sha256-7VTUbsFVoNT6srLwcAn5WNSsWC7cVUdphKRWBHHiH5M="; release."1.18.1".sha256 = "sha256-zgBJefQDe3JyCGbC0wvMcx/9iMVbftBJ43NPogkNeHY="; release."1.17.0".sha256 = "sha256-DTxE8CvYl0et20pxueydI+WzraI6UPHMNvxyp2gU/+w="; release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A="; diff --git a/pkgs/development/ocaml-modules/gitlab/default.nix b/pkgs/development/ocaml-modules/gitlab/default.nix new file mode 100644 index 000000000000..f8bc6224cf70 --- /dev/null +++ b/pkgs/development/ocaml-modules/gitlab/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildDunePackage, + fetchFromGitHub, + uri, + cohttp-lwt, + atdgen, + yojson, + iso8601, + stringext, +}: + +buildDunePackage rec { + pname = "gitlab"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "tmcgilchrist"; + repo = "ocaml-gitlab"; + rev = version; + hash = "sha256-7pUpH1SoP4eW8ild5j+Tcy+aTXq0+eSkhKUOXJ6Z30k="; + }; + + minimalOCamlVersion = "4.08"; + + buildInputs = [ stringext ]; + + nativeBuildInputs = [ atdgen ]; + + propagatedBuildInputs = [ + uri + cohttp-lwt + atdgen + yojson + iso8601 + ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/tmcgilchrist/ocaml-gitlab"; + description = "Native OCaml bindings to Gitlab REST API v4"; + license = licenses.bsd3; + changelog = "https://github.com/tmcgilchrist/ocaml-gitlab/releases/tag/${version}"; + maintainers = with maintainers; [ zazedd ]; + }; +} diff --git a/pkgs/development/ocaml-modules/gitlab/jsoo.nix b/pkgs/development/ocaml-modules/gitlab/jsoo.nix new file mode 100644 index 000000000000..60929f60b3b2 --- /dev/null +++ b/pkgs/development/ocaml-modules/gitlab/jsoo.nix @@ -0,0 +1,28 @@ +{ + lib, + buildDunePackage, + gitlab, + cohttp, + cohttp-lwt-jsoo, + js_of_ocaml-lwt, +}: + +buildDunePackage { + pname = "gitlab-jsoo"; + inherit (gitlab) version src; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + gitlab + cohttp + cohttp-lwt-jsoo + js_of_ocaml-lwt + ]; + + doCheck = true; + + meta = gitlab.meta // { + description = "Gitlab APIv4 JavaScript library"; + }; +} diff --git a/pkgs/development/ocaml-modules/gitlab/unix.nix b/pkgs/development/ocaml-modules/gitlab/unix.nix new file mode 100644 index 000000000000..b914e67b54c9 --- /dev/null +++ b/pkgs/development/ocaml-modules/gitlab/unix.nix @@ -0,0 +1,44 @@ +{ + lib, + buildDunePackage, + gitlab, + cmdliner, + cohttp, + cohttp-lwt-unix, + tls, + lwt, + stringext, + alcotest, +}: + +buildDunePackage { + pname = "gitlab-unix"; + inherit (gitlab) version src; + + minimalOCamlVersion = "4.08"; + + postPatch = '' + substituteInPlace unix/dune --replace-fail "gitlab bytes" "gitlab" + ''; + + buildInputs = [ + cohttp + tls + stringext + ]; + + propagatedBuildInputs = [ + gitlab + cmdliner + cohttp-lwt-unix + lwt + ]; + + checkInputs = [ alcotest ]; + + doCheck = true; + + meta = gitlab.meta // { + description = "Gitlab APIv4 Unix library"; + }; +} diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix index b47c153a4974..49f92b87e015 100644 --- a/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/pkgs/development/ocaml-modules/hidapi/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "hidapi"; - version = "1.1.2"; + version = "1.2.1"; duneVersion = "3"; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "vbmithr"; repo = "ocaml-hidapi"; rev = version; - hash = "sha256-SNQ1/i5wJJgcslIUBe+z5QgHns/waHnILyMUJ46cUwg="; + hash = "sha256-upygm5G46C65lxaiI6kBOzLrWxzW9qWb6efN/t58SRg="; }; minimalOCamlVersion = "4.03"; diff --git a/pkgs/development/ocaml-modules/kqueue/default.nix b/pkgs/development/ocaml-modules/kqueue/default.nix index 6666d58cfb1f..2ea64493f948 100644 --- a/pkgs/development/ocaml-modules/kqueue/default.nix +++ b/pkgs/development/ocaml-modules/kqueue/default.nix @@ -8,13 +8,13 @@ buildDunePackage rec { pname = "kqueue"; - version = "0.3.0"; + version = "0.4.0"; minimalOCamlVersion = "4.12"; src = fetchurl { url = "https://github.com/anuragsoni/kqueue-ml/releases/download/${version}/kqueue-${version}.tbz"; - hash = "sha256-MKRCyN6q9euTEgHIhldGGH8FwuLblWYNG+SiCMWBP6Y="; + hash = "sha256-fJHhmAp0EFzR9JH93a+EHy1auwSBKZV/XcBQLCedJLc="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch b/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch deleted file mode 100644 index 3d880c00947e..000000000000 --- a/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Naur lablGL.ori/Makefile.config lablGL/Makefile.config ---- lablGL.ori/Makefile.config 1970-01-01 01:00:00.000000000 +0100 -+++ lablGL/Makefile.config 2013-06-02 08:13:10.000000000 +0200 -@@ -0,0 +1,63 @@ -+# LablGL and Togl configuration file -+# -+# Please have a look at the config/Makefile in the Objective Caml distribution, -+# or at the labltklink script to get the information needed here -+# -+ -+##### Adjust these always -+ -+# Uncomment if you have the fast ".opt" compilers -+#CAMLC = ocamlc.opt -+#CAMLOPT = ocamlopt.opt -+ -+# Where to put the lablgl script -+BINDIR = @BINDIR@ -+ -+# Where to find X headers -+XINCLUDES = @XINCLUDES@ -+# X libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0) -+#XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lX11 -lXi -+ -+# Where to find Tcl/Tk headers -+# This must the same version as for LablTk -+TKINCLUDES = @TKINCLUDES@ -+# Tcl/Tk libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0) -+#TKLIBS = -L/usr/local/lib -ltk84 -ltcl84 -+ -+# Where to find OpenGL/Mesa/Glut headers and libraries -+GLINCLUDES = -+GLLIBS = -lGL -lGLU -+GLUTLIBS = -lglut -+# The following libraries may be required (try to add them one at a time) -+#GLLIBS = -lGL -lGLU -lXmu -lXext -lXi -lcipher -lpthread -+ -+# How to index a library after installing (ranlib required on MacOSX) -+RANLIB = : -+#RANLIB = ranlib -+ -+##### Uncomment these for windows -+#TKLIBS = tk83.lib tcl83.lib gdi32.lib user32.lib -+#GLLIBS = opengl32.lib glu32.lib -+#TOOLCHAIN = msvc -+#XA = .lib -+#XB = .bat -+#XE = .exe -+#XO = .obj -+#XS = .dll -+ -+##### Adjust these if non standard -+ -+# The Objective Caml library directory -+#LIBDIR = `ocamlc -where` -+ -+# Where to put dlls (if dynamic loading available) -+DLLDIR = @DLLDIR@ -+ -+# Where to put LablGL (standard) -+INSTALLDIR = @INSTALLDIR@ -+ -+# Where is Togl (default) -+#TOGLDIR = Togl -+ -+# C Compiler options -+#COPTS = -c -O diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index abe1649e0094..64ace7c44963 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut, camlp-streams, darwin } : +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libglut, camlp-streams } : if lib.versionOlder ocaml.version "4.06" then throw "lablgl is not available for OCaml ${ocaml.version}" @@ -18,28 +18,30 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ freeglut camlp-streams ]; + buildInputs = [ libglut camlp-streams ]; propagatedBuildInputs = [ libGLU - libGL - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.GLUT - darwin.apple_sdk.libs.Xplugin ]; - patches = [ ./Makefile.config.patch ./META.patch ]; + patches = [ ./META.patch ]; preConfigure = '' mkdir -p $out/bin mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs - substituteInPlace Makefile.config \ - --subst-var-by BINDIR $out/bin/ \ - --subst-var-by INSTALLDIR $out/lib/ocaml/${ocaml.version}/site-lib/lablgl/ \ - --subst-var-by DLLDIR $out/lib/ocaml/${ocaml.version}/site-lib/stublibs/ \ - --subst-var-by TKINCLUDES "" \ - --subst-var-by XINCLUDES "" + cp \ + Makefile.config.${if stdenv.hostPlatform.isDarwin then "osx" else "ex"} \ + Makefile.config ''; + makeFlags = [ + "BINDIR=${placeholder "out"}/bin/" + "INSTALLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/lablgl/" + "DLLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/stublibs/" + "XINCLUDES=" + "TKINCLUDES=" + "TKLIBS=" + ]; + buildFlags = [ "lib" "libopt" "glut" "glutopt" ]; postInstall = '' diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index 4c405f2fff83..905426bf53b2 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "macaddr"; - version = "5.5.0"; + version = "5.6.0"; minimalOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz"; - hash = "sha256-YokLMW4DV5KtKa8a2XFFbRDe/VJbdLU9sbZ/pCN1wXg="; + hash = "sha256-njBDP9tMpDemqo/7RHuspeunYV+4jnsM2KS0FsMggTM="; }; checkInputs = [ ppx_sexp_conv ounit2 ]; diff --git a/pkgs/development/ocaml-modules/mccs/default.nix b/pkgs/development/ocaml-modules/mccs/default.nix index 8a2f195c9445..dbd55b2c599d 100644 --- a/pkgs/development/ocaml-modules/mccs/default.nix +++ b/pkgs/development/ocaml-modules/mccs/default.nix @@ -2,17 +2,15 @@ buildDunePackage rec { pname = "mccs"; - version = "1.1+13"; + version = "1.1+17"; src = fetchFromGitHub { owner = "AltGr"; repo = "ocaml-mccs"; rev = version; - sha256 = "sha256-K249E9qkWNK4BC+ynaR3bVEyu9Tk8iCE7GptKk/aVJc="; + hash = "sha256-0NZF2W/eWwZRXnMJh9LmOdbE/CRDYeLUUx6ty4irP6U="; }; - useDune2 = true; - propagatedBuildInputs = [ cudf ]; diff --git a/pkgs/development/ocaml-modules/miou/default.nix b/pkgs/development/ocaml-modules/miou/default.nix index 909bf019cda7..7dd83aaae377 100644 --- a/pkgs/development/ocaml-modules/miou/default.nix +++ b/pkgs/development/ocaml-modules/miou/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "miou"; - version = "0.1.0"; + version = "0.2.0"; minimalOCamlVersion = "5.0.0"; src = fetchurl { url = "https://github.com/robur-coop/miou/releases/download/v${version}/miou-${version}.tbz"; - hash = "sha256-WTs6L9j4z1/0wKcGIZVwaNrATRGCTN5A6RwO7tY2phE="; + hash = "sha256-hxYCG1NkDEbVyDvN8eS/Fj6s10YyS7NRGlyNOkLy6sA="; }; meta = { diff --git a/pkgs/development/ocaml-modules/mirage-logs/default.nix b/pkgs/development/ocaml-modules/mirage-logs/default.nix index be9592fb374b..ef842ec7318f 100644 --- a/pkgs/development/ocaml-modules/mirage-logs/default.nix +++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix @@ -1,23 +1,23 @@ { lib, fetchurl, buildDunePackage -, logs, lwt, mirage-clock, ptime -, alcotest +, logs, fmt, ptime, mirage-clock, cmdliner +, lwt, alcotest }: buildDunePackage rec { pname = "mirage-logs"; - version = "1.3.0"; + version = "2.1.0"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-${version}.tbz"; - hash = "sha256-c1YQIutqp58TRz+a9Vd/69FCv0jnGRvFnei9BtSbOxA="; + hash = "sha256-rorCsgw7QCQmjotr465KShQGWdoUM88djpwgqwBGnLs="; }; - propagatedBuildInputs = [ logs lwt mirage-clock ptime ]; + propagatedBuildInputs = [ logs fmt ptime mirage-clock cmdliner ]; doCheck = true; - checkInputs = [ alcotest ]; + checkInputs = [ lwt alcotest ]; meta = { description = "Reporter for the Logs library that writes log messages to stderr, using a Mirage `CLOCK` to add timestamps"; diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 8607a2a50344..c34fb91f5e73 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ocamlfuse"; - version = "2.7.1_cvs9"; + version = "2.7.1_cvs11"; src = fetchFromGitHub { owner = "astrada"; repo = "ocamlfuse"; rev = "v${version}"; - hash = "sha256-cOObHUAYiI2mN1qjsxcK6kHAmawuaGQOUNHqWioIvjM="; + hash = "sha256-D/Gn+02Kq4mqEpNZrYYw/NXSJce2joGhl3wUZDhVDYo="; }; postPatch = '' diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index b770c0d7d5d7..c475ebdecd26 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -17,7 +17,7 @@ let caml_ld_library_path = ; in buildDunePackage rec { - version = "5.1.0"; + version = "5.1.2"; pname = "ocsigenserver"; minimalOCamlVersion = "4.08"; @@ -26,7 +26,7 @@ buildDunePackage rec { owner = "ocsigen"; repo = "ocsigenserver"; rev = "refs/tags/${version}"; - hash = "sha256-6xO+4eYSp6rlgPT09L7cvlaz6kYYuUPRa3K/TgZmaqE="; + hash = "sha256-piWHA4RMO370TETC9FtISyBvS1Uhk5CAGAtZleJTpjU="; }; nativeBuildInputs = [ makeWrapper which ]; diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 76856024c09a..dd99947db1f5 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,7 +1,6 @@ { lib , buildDunePackage , fetchurl -, ppx_deriving , bppsuite , alcotest , angstrom-unix @@ -12,16 +11,15 @@ , menhir , menhirLib , printbox-text -, yojson }: buildDunePackage rec { pname = "phylogenetics"; - version = "0.2.0"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/biocaml/phylogenetics/releases/download/v${version}/phylogenetics-${version}.tbz"; - hash = "sha256-JFpYp3pyW7PrBjqCwwDZxkJPA84dp6Qs8rOPvHPY92o="; + hash = "sha256-3oZ9fMAXqOQ02rQ+8W8PZJWXOJLNe2qERrGOeTk3BKg="; }; minimalOCamlVersion = "4.08"; @@ -36,9 +34,7 @@ buildDunePackage rec { gsl lacaml menhirLib - ppx_deriving printbox-text - yojson ]; checkPhase = '' diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix index 5fd645b52113..18308734b164 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "ppx_deriving_yaml"; - version = "0.2.2"; + version = "0.3.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${version}/ppx_deriving_yaml-${version}.tbz"; - hash = "sha256-9xy43jaCpKo/On5sTTt8f0Mytyjj1JN2QuFMcoWYTBY="; + hash = "sha256-HLY0ozmy6zY0KjXkwP3drTdz857PvLS/buN1nB+xf1s="; }; propagatedBuildInputs = [ ppxlib ppx_deriving yaml ]; diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix index 17dee792007b..331eff1c1027 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix @@ -9,13 +9,13 @@ buildDunePackage rec { pname = "shared-memory-ring"; - version = "3.1.1"; + version = "3.2.1"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/shared-memory-ring/releases/download/v${version}/shared-memory-ring-${version}.tbz"; - hash = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU="; + hash = "sha256-qSdntsPQo0/8JlbOoO6NAYtoa86HJy5yWHUsWi/PGDM="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/tdigest/default.nix b/pkgs/development/ocaml-modules/tdigest/default.nix index 4dc40da9dac6..4dcf81d96521 100644 --- a/pkgs/development/ocaml-modules/tdigest/default.nix +++ b/pkgs/development/ocaml-modules/tdigest/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "tdigest"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "SGrondin"; repo = pname; rev = version; - sha256 = "sha256-pkJRJeEbBbAR1STb6v3Zu11twvHkAKAO0YjifRBFTDw="; + sha256 = "sha256-Z2rOaiNGvVDbRwf5XfoNIcenQdrE3fxHnfzyi6Ki2Ic="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/terminal/default.nix b/pkgs/development/ocaml-modules/terminal/default.nix index 8daf53abdb50..1e43b2f8ee2a 100644 --- a/pkgs/development/ocaml-modules/terminal/default.nix +++ b/pkgs/development/ocaml-modules/terminal/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "terminal"; - version = "0.2.2"; + version = "0.4.0"; minimalOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz"; - hash = "sha256-M0HCGSOiHNa1tc+p7DmB9ZVyw2eUD+XgJFBTPftBELU="; + hash = "sha256-i+RJVTN5uy3F6LeYBcgER2kKA9yj6a7pWf7PRtgnj7c="; }; propagatedBuildInputs = [ stdlib-shims uutf uucp ]; diff --git a/pkgs/development/ocaml-modules/unisim_archisec/default.nix b/pkgs/development/ocaml-modules/unisim_archisec/default.nix index a5b364312d41..8db9abd3630b 100644 --- a/pkgs/development/ocaml-modules/unisim_archisec/default.nix +++ b/pkgs/development/ocaml-modules/unisim_archisec/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "unisim_archisec"; - version = "0.0.5"; + version = "0.0.8"; src = fetchurl { - url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.5/unisim_archisec-0.0.5.tbz"; - sha256 = "sha256-94Ky7rtR8oFTtWshTYaY6gyJdqrY3QKMF7qTkZQweXQ="; + url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.8/unisim_archisec-0.0.8.tbz"; + sha256 = "sha256-D8DumHaQnLsMaVHoUL7w8KgGRTh9Rk+22NNSa0a/qII="; }; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix index 093ca1ffe902..296597a6a629 100644 --- a/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/pkgs/development/ocaml-modules/xenstore/default.nix @@ -1,21 +1,23 @@ -{ lib, buildDunePackage, fetchurl -, cstruct, ppx_cstruct, lwt, ounit2 +{ + lib, + buildDunePackage, + fetchFromGitHub, + lwt, + ounit2, }: buildDunePackage rec { pname = "xenstore"; - version = "2.2.0"; + version = "2.3.0"; - minimalOCamlVersion = "4.08"; - duneVersion = "3"; - - src = fetchurl { - url = "https://github.com/mirage/ocaml-xenstore/releases/download/v${version}/xenstore-${version}.tbz"; - hash = "sha256-1Mnqtt5zHeRdYJHvhdQNjN8d4yxUEKD2cpwtoc7DGC0="; + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-xenstore"; + rev = "v${version}"; + hash = "sha256-LaynsbCE/+2QfbQCOLZi8nw1rqmZtgrwAov9cSxYZw8="; }; - buildInputs = [ ppx_cstruct ]; - propagatedBuildInputs = [ cstruct lwt ]; + propagatedBuildInputs = [ lwt ]; doCheck = true; checkInputs = [ ounit2 ]; @@ -23,7 +25,10 @@ buildDunePackage rec { meta = with lib; { description = "Xenstore protocol in pure OCaml"; license = licenses.lgpl21Only; - maintainers = [ maintainers.sternenseemann ]; + maintainers = with maintainers; [ + sternenseemann + sigmasquadron + ]; homepage = "https://github.com/mirage/ocaml-xenstore"; }; } diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index ddf8ca5f6d63..6c75916c69f5 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "yojson"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; - hash = "sha256-zTwdlPaViZoCbf9yaWmJvbENwWMpNLucvm9FmNSvptQ="; + hash = "sha256-mr+tjJp51HI60vZEjmacHmjb/IfMVKG3wGSwyQkSxZU="; }; propagatedBuildInputs = [ seq ]; diff --git a/pkgs/development/php-packages/phpinsights/default.nix b/pkgs/development/php-packages/phpinsights/default.nix index 621ac9de0b29..b571de2b9b72 100644 --- a/pkgs/development/php-packages/phpinsights/default.nix +++ b/pkgs/development/php-packages/phpinsights/default.nix @@ -25,6 +25,6 @@ php.buildComposerProject (finalAttrs: { homepage = "https://phpinsights.com/"; license = lib.licenses.mit; mainProgram = "phpinsights"; - maintainers = with lib.maintainers; [ patka ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index d44d745829d3..cf33c98c03da 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpstan"; - version = "1.11.5"; + version = "1.11.6"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; rev = finalAttrs.version; - hash = "sha256-J1y8+sY/amAhWQTL4odL+fe3t10KDNBIMV9Q92VzQcE="; + hash = "sha256-WQnzw/Tjc6viReO45nkMCL1a2eooWZSB77pY3lm+6wA="; }; - vendorHash = "sha256-BRm1ih+NHQIet7OuuSqXheVV/ZMS2h2wkRjdJ+nam48="; + vendorHash = "sha256-KkPeFTn2j9M0CcFpj9goecJEPBYcOoU1vkbvyaj2M94="; composerStrictValidation = false; meta = { diff --git a/pkgs/development/python-modules/aadict/default.nix b/pkgs/development/python-modules/aadict/default.nix deleted file mode 100644 index 0988fab6d238..000000000000 --- a/pkgs/development/python-modules/aadict/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - six, - pynose, - setuptools, -}: - -buildPythonPackage rec { - pname = "aadict"; - version = "0.2.3"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = "sha256-p3MorFXbtXNdqZRBhwJRvv4TX2h6twenoXhWE2OydwQ="; - }; - - build-system = [ setuptools ]; - - dependencies = [ six ]; - - nativeCheckInputs = [ pynose ]; - - pythonImportsCheck = [ "aadict" ]; - - meta = with lib; { - description = "Auto-attribute dict (and a couple of other useful dict functions)"; - homepage = "https://github.com/metagriffin/aadict"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ glittershark ]; - }; -} diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 498de531b9c5..fcee1327c2a2 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.30.0"; + version = "0.31.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "accelerate"; rev = "refs/tags/v${version}"; - hash = "sha256-E20pI5BrcTrMYrhriuOUl5/liSaQQy6eqRyCoauwb9Q="; + hash = "sha256-1iLTmSyZzOHGeAr2xBW4mebbq1FZdNfJb8blCtbSqsI="; }; buildInputs = [ llvmPackages.openmp ]; diff --git a/pkgs/development/python-modules/accessible-pygments/default.nix b/pkgs/development/python-modules/accessible-pygments/default.nix index 591e5c75db13..74bd2d1e09a0 100644 --- a/pkgs/development/python-modules/accessible-pygments/default.nix +++ b/pkgs/development/python-modules/accessible-pygments/default.nix @@ -3,23 +3,30 @@ buildPythonPackage, fetchPypi, pythonOlder, - setuptools, + hatchling, + hatch-vcs, + hatch-fancy-pypi-readme, pygments, }: buildPythonPackage rec { pname = "accessible-pygments"; - version = "0.0.4"; + version = "0.0.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-57V6mxWVjpYBx+nrB6RAyBMoNUWiCXPyV0pfRT0OlT4="; + pname = "accessible_pygments"; + inherit version; + hash = "sha256-QJGNPmorYZrUJMuR5Va9O9iGVEPZ8i8dzfeeM8gEaHI="; }; - build-system = [ setuptools ]; + build-system = [ + hatchling + hatch-vcs + hatch-fancy-pypi-readme + ]; dependencies = [ pygments ]; diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index e4069863bb21..cf84a064b54f 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -3,7 +3,7 @@ blockdiag, buildPythonPackage, fetchFromGitHub, - pynose, + nose, pytestCheckHook, pythonOlder, setuptools, @@ -27,8 +27,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ blockdiag ]; + # tests rely on nose + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ - pynose + nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 98e3ee4a9522..a0b9efec09c1 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -109,7 +109,13 @@ buildPythonPackage rec { ''; disabledTests = - lib.optionals (!runAllTests) [ + [ + # broke in the fontforge 4.51 -> 4.53 update + "test_glyphs_2_7" + "test_hinting_data" + "test_waterfallplot" + ] + ++ lib.optionals (!runAllTests) [ # Disable slow tests, reduces test time ~25 % "test_report" "test_post_overflow" diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 7af42df65a52..5c019036e771 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -10,7 +10,7 @@ lxml, parsedatetime, pyicu, - pynose, + pytestCheckHook, python-slugify, pythonOlder, pytimeparse, @@ -47,15 +47,11 @@ buildPythonPackage rec { cssselect glibcLocales lxml - pynose pyicu + pytestCheckHook pytz ]; - checkPhase = '' - LC_ALL="en_US.UTF-8" nosetests tests - ''; - pythonImportsCheck = [ "agate" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index cdab42852cf5..309d04eef8a6 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.108"; + version = "9.2.109"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-0Dzp6ws5/mrlQbtq3PqkX5K8DdJIkCejhfnY3pGLdtc="; + hash = "sha256-1/17bSpvhripv0wYEQnhW2Z52fFThPjl8mNPTu2DP5s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix index e8c1606433db..c47ea3e7cf57 100644 --- a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -9,7 +9,6 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, pytz, setuptools, }: @@ -31,7 +30,6 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/aioapns/default.nix b/pkgs/development/python-modules/aioapns/default.nix index ac728fa7e656..30e08af91530 100644 --- a/pkgs/development/python-modules/aioapns/default.nix +++ b/pkgs/development/python-modules/aioapns/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aioapns"; - version = "3.2"; + version = "3.3.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QPayQogW97saMmaPUP5x0CiXd6Qptg/OROigi5ASNQg="; + hash = "sha256-bfQpcp/oEBpFu9ywog8CFGGHR8Z5kL6l2O2nzZXaN90="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index f300758aa811..19744f9aa3ba 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, freezegun, + ical, mashumaro, poetry-core, pyjwt, @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.5.1"; + version = "2024.6.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-SwRr8BJOchQ7qObgVkNGTkaFEx7wiB/EPedRG2csH+A="; + hash = "sha256-v+wg/2JRBJ0VgRYOey92WGwVzHmxU9h/ev2oICefaMg="; }; postPatch = '' @@ -38,6 +39,7 @@ buildPythonPackage rec { dependencies = [ aiohttp + ical mashumaro pyjwt ]; diff --git a/pkgs/development/python-modules/aioazuredevops/default.nix b/pkgs/development/python-modules/aioazuredevops/default.nix index d8b046d3b03b..48687293d434 100644 --- a/pkgs/development/python-modules/aioazuredevops/default.nix +++ b/pkgs/development/python-modules/aioazuredevops/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "aioazuredevops"; - version = "2.0.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "timmo001"; repo = "aioazuredevops"; rev = "refs/tags/${version}"; - hash = "sha256-QEIVAcBoTvuOeLN2kfDa3uYfrUm5Qu1TLp9C0uU+mW4="; + hash = "sha256-1v58I9WOyyrp9n+qdvVeMZ3EObqP/06XCOZYS0nEvPU="; }; build-system = [ @@ -54,7 +54,6 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ - "aioazuredevops.builds" "aioazuredevops.client" "aioazuredevops.core" ]; diff --git a/pkgs/development/python-modules/aiobiketrax/default.nix b/pkgs/development/python-modules/aiobiketrax/default.nix index 88b070a51049..b07dda7f5171 100644 --- a/pkgs/development/python-modules/aiobiketrax/default.nix +++ b/pkgs/development/python-modules/aiobiketrax/default.nix @@ -10,7 +10,6 @@ pytestCheckHook, python-dateutil, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -37,7 +36,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ aiohttp diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix index 96a7cc9c4d74..592e8087349f 100644 --- a/pkgs/development/python-modules/aioboto3/default.nix +++ b/pkgs/development/python-modules/aioboto3/default.nix @@ -13,7 +13,6 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, }: @@ -34,7 +33,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core poetry-dynamic-versioning - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "aiobotocore" ]; diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 8ecbb92d75f7..4a7ced69d970 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.12.3"; + version = "2.13.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiobotocore"; rev = "refs/tags/${version}"; - hash = "sha256-Us94kT7UhTTwMxF63iLLczXZhfr/Z8cJr12DKEphkog="; + hash = "sha256-8fsZCmzjM6JlX3HoRGt7zsezYIXnv411kkHG8rJqMuY="; }; # Relax version constraints: aiobotocore works with newer botocore versions diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index 5aff82034bcc..51a73cc4ecbf 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiocoap"; - version = "0.4.8"; + version = "0.4.10"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "chrysn"; repo = "aiocoap"; rev = "refs/tags/${version}"; - hash = "sha256-jBRxorHr5/CgAR6WVXBUycZpJ6n1DYVFQk6kqVv8D1Q="; + hash = "sha256-sKDkbv8OyPewfQpunFxezP0wjy3EAQxsQ0UfUm0REPM="; }; build-system = [ setuptools ]; @@ -63,6 +63,8 @@ buildPythonPackage rec { [ # Communication is not properly mocked "test_uri_parser" + # Doctest + "test_001" ] ++ lib.optionals (pythonAtLeast "3.12") [ # https://github.com/chrysn/aiocoap/issues/339 diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index f8a116c011e0..c79904c5d05f 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-Fjf7mXXUnBTtPfNHHJdFx5ho4eg0N3iHCGsACa4IMjY="; + hash = "sha256-3r9DyvzqtQ88VwKCghAC9nn5kXbBzbR8drTFTnWC/bM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 371776aa1749..fa2ee1ee7e46 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "24.5.0"; + version = "24.6.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-i/tmPTDb5DJRSj//Ju9OERx8A9S69WkWyoN+j2MO6mI="; + hash = "sha256-wvfAkV+EjGytPog3ik7NAC0rW8nkHufenGfapeQr1X0="; }; build-system = [ @@ -62,6 +62,10 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/esphome/aioesphomeapi/issues/837 "test_reconnect_logic_stop_callback" + # python3.12.4 regression + # https://github.com/esphome/aioesphomeapi/issues/889 + "test_start_connection_cannot_increase_recv_buffer" + "test_start_connection_can_only_increase_buffer_size_to_262144" ]; pythonImportsCheck = [ "aioesphomeapi" ]; diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index 5d02fe426397..31c5b19a1ab3 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -20,7 +20,6 @@ pytest-lazy-fixture, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, pytz, redis, }: @@ -41,7 +40,6 @@ buildPythonPackage rec { build-system = [ hatchling ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "pydantic" ]; diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 62853267d54b..c9c518a57d3b 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Lzdd4UPyu3/avxKO0XPCFI8zhTjDF7zwSKf6RL1/k9M="; + hash = "sha256-8EjmzidcxIOoH+88pEUuSJmbpU34B8dgz9csvlQf8Ks="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiomisc-pytest/default.nix b/pkgs/development/python-modules/aiomisc-pytest/default.nix index 01230505b2b6..ebbc22e37a22 100644 --- a/pkgs/development/python-modules/aiomisc-pytest/default.nix +++ b/pkgs/development/python-modules/aiomisc-pytest/default.nix @@ -6,7 +6,6 @@ poetry-core, pytest, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -24,7 +23,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "pytest" ]; diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix deleted file mode 100644 index f23adad06662..000000000000 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - aiofiles, - asyncio-mqtt, - awesomeversion, - buildPythonPackage, - click, - fetchFromGitHub, - marshmallow, - poetry-core, - pyserial-asyncio, - pytest-asyncio, - pytestCheckHook, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "aiomysensors"; - version = "0.3.16"; - pyproject = true; - - disabled = pythonOlder "3.9"; - - src = fetchFromGitHub { - owner = "MartinHjelmare"; - repo = "aiomysensors"; - rev = "refs/tags/v${version}"; - hash = "sha256-1BpmjCgKiCZmBpBENlg79+I3UhkIxrgLAUD8ixpGUM8="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=src --cov-report=term-missing:skip-covered" "" - ''; - - build-system = [ poetry-core ]; - - dependencies = [ - aiofiles - asyncio-mqtt - awesomeversion - click - marshmallow - pyserial-asyncio - ]; - - nativeCheckInputs = [ - pytest-asyncio - pytestCheckHook - ]; - - pythonImportsCheck = [ "aiomysensors" ]; - - meta = with lib; { - description = "Library to connect to MySensors gateways"; - homepage = "https://github.com/MartinHjelmare/aiomysensors"; - changelog = "https://github.com/MartinHjelmare/aiomysensors/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - mainProgram = "aiomysensors"; - }; -} diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index b68120fee83e..7d3f698129ef 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -9,7 +9,6 @@ pytest-aiohttp, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -35,7 +34,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ aiohttp diff --git a/pkgs/development/python-modules/aiooss2/default.nix b/pkgs/development/python-modules/aiooss2/default.nix index 7bdd692ac2d6..7d1e235949e7 100644 --- a/pkgs/development/python-modules/aiooss2/default.nix +++ b/pkgs/development/python-modules/aiooss2/default.nix @@ -8,7 +8,6 @@ pytest-mock, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, setuptools, setuptools-scm, @@ -38,7 +37,6 @@ buildPythonPackage rec { setuptools-scm ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ aiohttp diff --git a/pkgs/development/python-modules/aiooui/default.nix b/pkgs/development/python-modules/aiooui/default.nix index fb85170c54b4..bc087915bf4f 100644 --- a/pkgs/development/python-modules/aiooui/default.nix +++ b/pkgs/development/python-modules/aiooui/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiooui"; - version = "0.1.5"; + version = "0.1.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "aiooui"; rev = "refs/tags/v${version}"; - hash = "sha256-/RZ8nZatlfo3AJvg/4JgyAHtrnoj50uxbhqr+ToCTJ4="; + hash = "sha256-dsMVKfY9o1krzp100/7JtClgPrpsFTVNwMnYMqOVFIU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix index 773477e62c72..7dd16b1f4811 100644 --- a/pkgs/development/python-modules/aiormq/default.nix +++ b/pkgs/development/python-modules/aiormq/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, pytestCheckHook, pamqp, yarl, @@ -27,7 +26,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "pamqp" ]; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 359a1db2cb74..819eb840fa0d 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "10.0.1"; + version = "11.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; rev = "refs/tags/${version}"; - hash = "sha256-+p+AFgqS/9rCDkIiNm4o7GhQ4dPfKl2s7ukEYaAdlgo="; + hash = "sha256-158b4lsxebtLXXsPhzbkXP9ioPlFIsJcS5G5eDqFY98="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index 78ea18709d8b..dfecf0b966af 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiosmtpd"; - version = "1.4.5"; + version = "1.4.6"; pyproject = true; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiosmtpd"; rev = "refs/tags/v${version}"; - hash = "sha256-8nQ4BVSLYgZHRGkbujy/olV/+GABlkDhe5wef3hyQpQ="; + hash = "sha256-Ih/xbWM9O/fFQiZezydlPlIr36fLRc2lLgdfxD5Jviw="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix index a299a349856d..a0eb4b1b1f79 100644 --- a/pkgs/development/python-modules/aiotractive/default.nix +++ b/pkgs/development/python-modules/aiotractive/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiotractive"; - version = "0.5.7"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zhulik"; repo = "aiotractive"; rev = "refs/tags/v${version}"; - hash = "sha256-fIdIFG1OpAN1R2L2RryTzYZyqGLo3tqAAkRC8UUFM4k="; + hash = "sha256-QwwW/UxRgd4rco80SqQUGt0ArDNT9MXa/U/W2/dHZT0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/pkgs/development/python-modules/aiounittest/default.nix index beae5db296ab..e715d99833f8 100644 --- a/pkgs/development/python-modules/aiounittest/default.nix +++ b/pkgs/development/python-modules/aiounittest/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, setuptools, - pynose, - coverage, + pytestCheckHook, wrapt, }: @@ -25,14 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wrapt ]; - nativeCheckInputs = [ - pynose - coverage - ]; - - checkPhase = '' - nosetests -e test_specific_test - ''; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "aiounittest" ]; diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix index 2d3c94b0f0f0..a9a4d6bca847 100644 --- a/pkgs/development/python-modules/aiowebostv/default.nix +++ b/pkgs/development/python-modules/aiowebostv/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiowebostv"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aiowebostv"; rev = "refs/tags/v${version}"; - hash = "sha256-pjHm+oCwbiD2dtkl30yATIVP85R72xEk/cmA+a5b05c="; + hash = "sha256-RrSEl/U6UzPoE2151opDe0QRmj6M6wAtsQyF4/dd8ek="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix index 9e770ae06522..e753cb6c63dc 100644 --- a/pkgs/development/python-modules/aioxmpp/default.nix +++ b/pkgs/development/python-modules/aioxmpp/default.nix @@ -14,7 +14,6 @@ pytestCheckHook, pythonAtLeast, pythonOlder, - pythonRelaxDepsHook, pytz, setuptools, sortedcollections, @@ -41,7 +40,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ aiosasl diff --git a/pkgs/development/python-modules/aiozoneinfo/default.nix b/pkgs/development/python-modules/aiozoneinfo/default.nix index 632967637818..86f624c9da85 100644 --- a/pkgs/development/python-modules/aiozoneinfo/default.nix +++ b/pkgs/development/python-modules/aiozoneinfo/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiozoneinfo"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = "aiozoneinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-VpdghF2rXoA94YfMSNaICa3yfRRRiQueVrLk1K4igdk="; + hash = "sha256-u7yQiy5xKK1A19cmpXjA4MMK4q7RvtuvwkUECnddzG8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/airtouch5py/default.nix b/pkgs/development/python-modules/airtouch5py/default.nix index a848a97158dd..0a8fc8cf90b1 100644 --- a/pkgs/development/python-modules/airtouch5py/default.nix +++ b/pkgs/development/python-modules/airtouch5py/default.nix @@ -6,7 +6,6 @@ # build-system poetry-core, - pythonRelaxDepsHook, # dependencies bitarray, @@ -31,7 +30,6 @@ buildPythonPackage rec { }; build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "crc" ]; dependencies = [ diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix new file mode 100644 index 000000000000..555f919c0493 --- /dev/null +++ b/pkgs/development/python-modules/albucore/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + setuptools, + pytestCheckHook, + numpy, + opencv4, + tomli, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "albucore"; + version = "0.0.12"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "albumentations-team"; + repo = "albucore"; + rev = "refs/tags/${version}"; + hash = "sha256-TJTIIshMUcHTGSo0lRA3hVkqMqKsfj0EuiV+SSsP5Q4="; + }; + + pythonRemoveDeps = [ "opencv-python" ]; + + build-system = [ setuptools ]; + + dependencies = [ + numpy + opencv4 + tomli + typing-extensions + ]; + + pythonImportsCheck = [ "albucore" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "High-performance image processing library to optimize and extend Albumentations with specialized functions for image transformations"; + homepage = "https://github.com/albumentations-team/albucore"; + changelog = "https://github.com/albumentations-team/albucore/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix index b17e1c055c5f..570f6aedfcd0 100644 --- a/pkgs/development/python-modules/albumentations/default.nix +++ b/pkgs/development/python-modules/albumentations/default.nix @@ -1,27 +1,34 @@ { lib, buildPythonPackage, + pythonOlder, fetchFromGitHub, + + # build-system setuptools, - deepdiff, + + # dependencies + albucore, + eval-type-backport, numpy, opencv4, + pydantic, pyyaml, scikit-image, scikit-learn, scipy, - pydantic, + typing-extensions, + + deepdiff, pytestCheckHook, - pythonOlder, - pythonRelaxDepsHook, + pytest-mock, torch, torchvision, - typing-extensions, }: buildPythonPackage rec { pname = "albumentations"; - version = "1.4.4"; + version = "1.4.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,32 +37,28 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albumentations"; rev = "refs/tags/${version}"; - hash = "sha256-7t1+22zzFtkZaAyOo6xjk+MXT9N44PmQ/NRRfvLeRVk="; + hash = "sha256-1070V9+EZ4qrhxmbMyvTbu89pLoonrn0Peb8nwp2lwA="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - - pythonRemoveDeps = [ - "opencv-python" - "pydantic" - ]; + pythonRemoveDeps = [ "opencv-python" ]; build-system = [ setuptools ]; dependencies = [ + albucore + eval-type-backport numpy opencv4 pydantic pyyaml scikit-image scikit-learn - scipy - typing-extensions ]; nativeCheckInputs = [ deepdiff pytestCheckHook + pytest-mock torch torchvision ]; @@ -67,11 +70,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "albumentations" ]; - meta = with lib; { + meta = { description = "Fast image augmentation library and easy to use wrapper around other libraries"; homepage = "https://github.com/albumentations-team/albumentations"; changelog = "https://github.com/albumentations-team/albumentations/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; }; } diff --git a/pkgs/development/python-modules/alexapy/default.nix b/pkgs/development/python-modules/alexapy/default.nix index fcc0bd1c46f6..af10ae03468e 100644 --- a/pkgs/development/python-modules/alexapy/default.nix +++ b/pkgs/development/python-modules/alexapy/default.nix @@ -12,7 +12,6 @@ poetry-core, pyotp, pythonOlder, - pythonRelaxDepsHook, requests, simplejson, yarl, @@ -36,7 +35,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix index 57323e4b189d..b722dac05fc8 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix @@ -5,7 +5,6 @@ fetchPypi, jmespath, pythonOlder, - pythonRelaxDepsHook, setuptools, }: @@ -25,7 +24,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ cryptography diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 185980320236..f195c3b080ba 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "altair"; - version = "5.2.0"; + version = "5.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "altair-viz"; repo = "altair"; rev = "refs/tags/v${version}"; - hash = "sha256-uTG+V0SQgAQtMjvrVvKVKgIBT9qO+26EPRxQCEXj/gc="; + hash = "sha256-VGtH+baIKObJY8/44JCyKi+XrIddSqOtpNeMCO+8o9M="; }; nativeBuildInputs = [ hatchling ]; @@ -56,6 +56,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "altair" ]; + disabledTests = [ + # ValueError: Saving charts in 'svg' format requires the vl-convert-python or altair_saver package: see http://github.com/altair-viz/altair_saver/ + "test_renderer_with_none_embed_options" + ]; + disabledTestPaths = [ # Disabled because it requires internet connectivity "tests/test_examples.py" diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index 1a096f01606f..0bf6d2515ef2 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -4,6 +4,7 @@ pythonOlder, fetchFromGitHub, pdm-backend, + jschon, pyvcd, jinja2, importlib-resources, @@ -20,14 +21,14 @@ buildPythonPackage rec { pname = "amaranth"; format = "pyproject"; - version = "0.4.5"; + version = "0.5.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; rev = "refs/tags/v${version}"; - hash = "sha256-g9dn6gUTdFHz9GMWHERsRLWHoI3E7vjuQDK0usbZO7g="; + hash = "sha256-+EV2NgYSuCbYTQKeBUN+/D0attfrJ3cso7U6RjLEIbg="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { dependencies = [ + jschon jinja2 pyvcd ] diff --git a/pkgs/development/python-modules/amazon-kclpy/default.nix b/pkgs/development/python-modules/amazon-kclpy/default.nix index 3186ade26999..1ade5e23e240 100644 --- a/pkgs/development/python-modules/amazon-kclpy/default.nix +++ b/pkgs/development/python-modules/amazon-kclpy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "amazon-kclpy"; - version = "2.1.4"; + version = "2.1.5"; pyproject = true; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-kinesis-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-TWIGu7WuoaPhk8cz+hMXvGLIPQ5kly8aj20ZtvTZzwg="; + hash = "sha256-kSboeg/fdg7hbiWyPzAAsYo+0vbQDfRoeJYHlrrFNrA="; }; patches = [ diff --git a/pkgs/development/python-modules/amberelectric/default.nix b/pkgs/development/python-modules/amberelectric/default.nix index 19cc637c816b..5253eef6c214 100644 --- a/pkgs/development/python-modules/amberelectric/default.nix +++ b/pkgs/development/python-modules/amberelectric/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "amberelectric"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HujjqJ3nkPIj8P0qAiQnQzLhji5l8qOAO2Gh53OJ7UY="; + hash = "sha256-gxpFKIrGHpwjPdF0nnyruwCYf3bhrubdtXNx2+wEiZU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index 8adda06c48c9..c983669f85dd 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - case, fetchPypi, pytestCheckHook, pytest-rerunfailures, @@ -26,7 +25,6 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - case pytestCheckHook pytest-rerunfailures ]; diff --git a/pkgs/development/python-modules/ancp-bids/default.nix b/pkgs/development/python-modules/ancp-bids/default.nix index 8ab4de7ac38c..77978e6cd19c 100644 --- a/pkgs/development/python-modules/ancp-bids/default.nix +++ b/pkgs/development/python-modules/ancp-bids/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ancp-bids"; - version = "0.2.1"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ANCPLabOldenburg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Nu9pulVSZysgm/F7jl+VpoqMCiHeysZjQDQ1dT7AnpE="; + hash = "sha256-c6X1gCYAezgZQP6xfQPfKW8V35F1cnTdbryEp3sZ4jw="; }; patches = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index e62fb5ebc7db..41bf3abe2ee0 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -23,7 +23,6 @@ pycparser, pyformlang, pythonOlder, - pythonRelaxDepsHook, pyvex, rich, rpyc, @@ -37,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.108"; + version = "9.2.109"; pyproject = true; disabled = pythonOlder "3.11"; @@ -46,13 +45,12 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-6DjcxmqxDz2aLzYLi/Uz+FsrzeARpJtEMh/Loctyfv8="; + hash = "sha256-hvWE812Gu63vTfDlOY80GuUMAS2jZDSxLs4EP0eSbQE="; }; pythonRelaxDeps = [ "capstone" ]; build-system = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/annotated-types/default.nix b/pkgs/development/python-modules/annotated-types/default.nix index 4cb4b9856ef6..77ab71785200 100644 --- a/pkgs/development/python-modules/annotated-types/default.nix +++ b/pkgs/development/python-modules/annotated-types/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "annotated-types"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "annotated-types"; repo = "annotated-types"; rev = "refs/tags/v${version}"; - hash = "sha256-SZ9/rXYcns4DFM6vk6SRKvuv3MY3T7xO9aW7WAQqtVE="; + hash = "sha256-I1SPUKq2WIwEX5JmS3HrJvrpNrKDu30RWkBRDFE+k9A="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix index 255896d30982..f871df2fbced 100644 --- a/pkgs/development/python-modules/annoy/default.nix +++ b/pkgs/development/python-modules/annoy/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, h5py, numpy, - pynose, + pytestCheckHook, pythonOlder, setuptools, }: @@ -16,9 +16,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-nL/r7+Cl+EPropxr5MhNYB9PQa1N7QSG8biMOwdznBU="; + src = fetchFromGitHub { + owner = "spotify"; + repo = "annoy"; + rev = "refs/tags/v${version}"; + hash = "sha256-oJHW4lULRun2in35pBGOKg44s5kgLH2BKiMOzVu4rf4="; }; postPatch = '' @@ -32,7 +34,16 @@ buildPythonPackage rec { nativeCheckInputs = [ numpy - pynose + pytestCheckHook + ]; + + preCheck = '' + rm -rf annoy + ''; + + disabledTestPaths = [ + # network access + "test/accuracy_test.py" ]; pythonImportsCheck = [ "annoy" ]; diff --git a/pkgs/development/python-modules/anova-wifi/default.nix b/pkgs/development/python-modules/anova-wifi/default.nix index f443e7f58528..500abc063035 100644 --- a/pkgs/development/python-modules/anova-wifi/default.nix +++ b/pkgs/development/python-modules/anova-wifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "anova-wifi"; - version = "0.14.0"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Lash-L"; repo = "anova_wifi"; rev = "refs/tags/v${version}"; - hash = "sha256-a0nc8tbbSIOxLyIcPK5prqEDdz/J0aKwmGG52iHb59U="; + hash = "sha256-F/bd5BtHpF3778eoK0QBaSmdTOpLlz+fixCYR74BRZw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ansible-navigator/default.nix b/pkgs/development/python-modules/ansible-navigator/default.nix index 4f5dca37452f..5d767a4fab43 100644 --- a/pkgs/development/python-modules/ansible-navigator/default.nix +++ b/pkgs/development/python-modules/ansible-navigator/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { pname = "ansible-navigator"; - version = "24.2.0"; + version = "24.3.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-qXBhM63fFwPwo0pmEhZnZnGC8Eht8eFPfVbDkY98MGM="; + hash = "sha256-IAcZFisB3BOmdxZuGZ3PZcDl2CXsg6ToI/1fdPpkIXw="; }; buildInputs = with python3Packages; [ diff --git a/pkgs/development/python-modules/ansible-pylibssh/default.nix b/pkgs/development/python-modules/ansible-pylibssh/default.nix index 068af47bca3c..26dbb4413a9e 100644 --- a/pkgs/development/python-modules/ansible-pylibssh/default.nix +++ b/pkgs/development/python-modules/ansible-pylibssh/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ansible-pylibssh"; - version = "1.1.0"; + version = "1.2.0.post4"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-spaGux6dYvtUtpOdU6oN7SEn8IgBof2NpQSPvr+Zplg="; + hash = "sha256-brnSrzSnumK32/mEON0l0iSPdoYrFwYmBc4MT7WcrX8="; }; # Remove after https://github.com/ansible/pylibssh/pull/502 is merged diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 2bc07dd1277f..0c6ed904a454 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -4,14 +4,12 @@ ansible-core, buildPythonPackage, fetchPypi, - fetchpatch, glibcLocales, importlib-metadata, mock, openssh, - pbr, + packaging, pexpect, - psutil, pytest-mock, pytest-timeout, pytest-xdist, @@ -20,50 +18,36 @@ python-daemon, pyyaml, setuptools, - six, + setuptools-scm, }: buildPythonPackage rec { pname = "ansible-runner"; - version = "2.3.6"; + version = "2.4.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-shdKEtytLcLzQuqCh2iY9WigtmxTVoYAv4BXcVj8uhw="; + hash = "sha256-gtArJUiDDzelNRe2XII8SvNxBpQGx9ITtckEHUXgxbY="; }; - patches = [ - (fetchpatch { - name = "fix-tests.patch"; - url = "https://github.com/ansible/ansible-runner/commit/0d522c90cfc1f305e118705a1b3335ccb9c1633d.patch"; - hash = "sha256-eTnQkftvjK0YHU+ovotRVSuVlvaVeXp5SvYk1DPCg88="; - excludes = [ - ".github/workflows/ci.yml" - "tox.ini" - ]; - }) - (fetchpatch { - # python 3.12 compat - url = "https://github.com/ansible/ansible-runner/commit/dc248497bb2375a363222ce755bf3a31f21d5f64.patch"; - hash = "sha256-QT28Iw0uENoO35rqZpYBcmJB/GNDEF4m86SKf6p0XQU="; - }) - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"setuptools>=45, <=69.0.2", "setuptools-scm[toml]>=6.2, <=8.0.4"' '"setuptools", "setuptools-scm"' + ''; build-system = [ setuptools - pbr + setuptools-scm ]; dependencies = [ - ansible-core - psutil + packaging pexpect python-daemon pyyaml - six ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 0a2103efc9c6..8caf7e1e6274 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pythonOlder, - pythonRelaxDepsHook, installShellFiles, docutils, ansible, @@ -51,7 +50,7 @@ buildPythonPackage rec { nativeBuildInputs = [ installShellFiles docutils - ] ++ lib.optionals (pythonOlder "3.10") [ pythonRelaxDepsHook ]; + ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index d2b531a0066f..2dd2567589f2 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -22,7 +22,7 @@ let pname = "ansible"; - version = "9.6.0"; + version = "10.1.0"; in buildPythonPackage { inherit pname version; @@ -32,7 +32,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-WHMqStdKdG0pns+ki3qRyyF+LAvTpEST8tnymvLzq2E="; + hash = "sha256-fYxEVX9XBocwbhnQ4ylq0jBZPLEr2jXc/JJ0pgY68io="; }; postPatch = '' diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index f97672495a66..ad79271688f6 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -9,6 +9,7 @@ hatch-fancy-pypi-readme, hatchling, httpx, + jiter, pydantic, pytest-asyncio, pytestCheckHook, @@ -21,7 +22,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.26.0"; + version = "0.28.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +31,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-xoYhRRanqZ93UlSoqeeH83JmsoiijDTUDtnY3VDLQAg="; + hash = "sha256-n5Vmi2frUdSbrmulopwUlIO+blkf7cANoKTaTFZQdjw="; }; build-system = [ @@ -42,6 +43,7 @@ buildPythonPackage rec { anyio distro httpx + jiter sniffio pydantic tokenizers diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index e317f6fe5775..3c1492c98223 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -26,6 +26,9 @@ pytestCheckHook, trustme, uvloop, + + # smoke tests + starlette, }: buildPythonPackage rec { @@ -96,6 +99,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "anyio" ]; + passthru.tests = { + inherit starlette; + }; + meta = with lib; { changelog = "https://github.com/agronholm/anyio/blob/${src.rev}/docs/versionhistory.rst"; description = "High level compatibility layer for multiple asynchronous event loop implementations on Python"; diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 0854275c395f..f1ad42c81d9c 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -33,7 +33,6 @@ pytestCheckHook, python, python-dateutil, - pythonRelaxDepsHook, pytz, pyyaml, regex, @@ -50,14 +49,14 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.54.0"; + version = "2.56.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "refs/tags/v${version}"; - hash = "sha256-DcqYBPAS+yUqTJLUem8+2OqRUzb6DoBOeRkMjmvuvws="; + hash = "sha256-SD+93duc3vTIlS/LPOuzXeiUSpwX+GNrqW3GTJMVgKY="; }; patches = [ @@ -96,7 +95,6 @@ buildPythonPackage rec { cython grpcio-tools mypy-protobuf - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 67ed8ef74b59..bda93dfe5cdf 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -1,6 +1,7 @@ { lib, appdirs, + apsw, buildPythonPackage, cvss, fetchFromGitHub, @@ -8,9 +9,10 @@ msgpack, orjson, packageurl-python, + pydantic, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, + rich, semver, setuptools, tabulate, @@ -18,7 +20,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.6.7"; + version = "6.0.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +29,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-/QzK+su+g2ESZ81C0coxKf13WOUVz1GyfJbOrO7fS98="; + hash = "sha256-lgt609UDuHTGQTTrpvxNvgUk6GU+TYqwc19dzatI4Io="; }; postPatch = '' @@ -42,15 +44,17 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ appdirs + apsw cvss httpx msgpack orjson packageurl-python + pydantic + rich semver tabulate ] ++ httpx.optional-dependencies.http2; diff --git a/pkgs/development/python-modules/apricot-select/default.nix b/pkgs/development/python-modules/apricot-select/default.nix index f05e9b8e5e95..254c14527c5a 100644 --- a/pkgs/development/python-modules/apricot-select/default.nix +++ b/pkgs/development/python-modules/apricot-select/default.nix @@ -5,7 +5,7 @@ apricot-select, numba, numpy, - pynose, + nose, pytestCheckHook, pythonOlder, scikit-learn, @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pynose + nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 9f296b76055d..cf3879028869 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.46.0.0"; + version = "3.46.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-x1nG13RDJ5fZ3Eds7yYKcFQ3B+5YKxvMvXrAbXw4bSc="; + hash = "sha256-GcfHkK4TCHPA2K6ymXtpCwNUCCUq0vq98UjYGGwn588="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 8842ab7201db..222a2a4567dd 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.108"; + version = "9.2.109"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-KMpTShw5aLQc1KMTuWVzhV7mV+Y9KnpNhVv153tggyM="; + hash = "sha256-hyUzJO8e2XMkz91wBt9PP0dx1uVDlX2KDBkT5v/M1YQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 2fd19fc2091a..969acd0b1c45 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "argcomplete"; - version = "3.3.0"; + version = "3.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "kislyuk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ekTmT6jYkC36X2e0ukwHfDGwdPg3jK8jML2naBCgNI8="; + hash = "sha256-4JMyBixc6LcSdpvvLmK4nyyqZMK2kuFcPU7OXhJLpoc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 2d2e25a83ed5..cbfeb2c87c7e 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -41,7 +41,6 @@ python-jose, python-multipart, pythonOlder, - pythonRelaxDepsHook, pyyaml, rich, schedule, @@ -68,7 +67,7 @@ buildPythonPackage rec { pname = "argilla"; - version = "1.28.0"; + version = "1.29.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -77,7 +76,7 @@ buildPythonPackage rec { owner = "argilla-io"; repo = "argilla"; rev = "refs/tags/v${version}"; - hash = "sha256-gQpJ2umi3IE5BhRu3bM7ONPIP0hb2YG37jGvDKQHZWA="; + hash = "sha256-+eQNvLDV063JY6CyngpGyo4NdSd6HvAHFgGWtPfZNVQ="; }; pythonRelaxDeps = [ @@ -90,7 +89,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ httpx diff --git a/pkgs/development/python-modules/arsenic/default.nix b/pkgs/development/python-modules/arsenic/default.nix index 2d742f943f79..8d7ab341c9d2 100644 --- a/pkgs/development/python-modules/arsenic/default.nix +++ b/pkgs/development/python-modules/arsenic/default.nix @@ -7,7 +7,6 @@ fetchpatch, packaging, poetry-core, - pythonRelaxDepsHook, pythonOlder, structlog, }: @@ -43,7 +42,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "structlog" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 5f78649ba449..f63bd17297e1 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "asana"; - version = "5.0.3"; + version = "5.0.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "asana"; repo = "python-asana"; rev = "refs/tags/v${version}"; - hash = "sha256-9F63DvwMh9NwlTqFuhiXfgRRRxAFjjRYmYzsuOhlQJ0="; + hash = "sha256-X6444LU2hcx4Er5N+WbSjgbe2tHjl1y1z5FqZGngiOw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index b6b020c07121..f99b201842e6 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "ase"; - version = "3.22.1"; + version = "3.23.0"; pyproject = true; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-AE32sOoEsRFMeQ+t/kXUEl6w5TElxmqTQlr4U9gqtDI="; + hash = "sha256-kaKqMdib2QsO/f5KfoQmTzKCiyq/yfOOZeBBrXb+yK4="; }; build-system = [ setuptools ]; @@ -57,6 +57,8 @@ buildPythonPackage rec { "test_favicon" "test_vibrations_methods" # missing attribute "test_jmol_roundtrip" # missing attribute + "test_pw_input_write_nested_flat" # Did not raise DeprecationWarning + "test_fix_scaled" # Did not raise UserWarning ] ++ lib.optionals (pythonAtLeast "3.12") [ "test_info_calculators" ]; preCheck = '' diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index f4e06bb8af8d..1d54f0895933 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -9,7 +9,6 @@ pytestCheckHook, python-dateutil, pythonOlder, - pythonRelaxDepsHook, pytz, remotezip, requests-mock, @@ -21,7 +20,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "7.0.9"; + version = "7.1.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,14 +29,13 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-CD9Up4h23dplTt51zif+4ZdW0qczRUz2hCOwUOOlS24="; + hash = "sha256-4TiLncVxDxGB8YSgeEvXGb3kY2tjfYYmBAleJeaiPWU="; }; pythonRelaxDeps = [ "tenacity" ]; build-system = [ setuptools-scm ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ dateparser diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index e9eed2ac38e0..097a85098883 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "0.9.33"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,12 +18,12 @@ buildPythonPackage rec { owner = "lmfit"; repo = "asteval"; rev = "refs/tags/${version}"; - hash = "sha256-j07HH84cn2AA5DyMcM7sXiBubCjZP67RJXVcErMPyBk="; + hash = "sha256-2Oj/3tMDC5s4OouSarAJo3TCwBOCY3DYjAZk3TcV9CQ="; }; postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail " --cov=asteval --cov-report xml" "" + substituteInPlace pyproject.toml \ + --replace-fail "--cov=asteval --cov-report html" "" ''; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 123af5462164..200dc13e989f 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "3.1.0"; # Check whether the version is compatible with pylint + version = "3.2.2"; # Check whether the version is compatible with pylint pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "astroid"; rev = "refs/tags/v${version}"; - hash = "sha256-+cTQHbqoucaNi7rPoyH6Cu07vZMS8KWn5C/A3NXRSwE="; + hash = "sha256-Fc/AjMOz9D9SgkxXvMAhvJcZtj9BsPykg0DX4hEqdB8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix index c878ce72f660..9d7a88369aaf 100644 --- a/pkgs/development/python-modules/astropy-iers-data/default.nix +++ b/pkgs/development/python-modules/astropy-iers-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "astropy-iers-data"; - version = "0.2024.04.01.00.33.14"; + version = "0.2024.06.17.00.31.35"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "astropy-iers-data"; rev = "refs/tags/v${version}"; - hash = "sha256-6FHAntN+m0cLDEhWPrcgyD0PgVDOfC8nf4kVl1z8x0g="; + hash = "sha256-hFlDXnxhKuhlCFrF+Uip3Xjc9Jt8UFJcDCST90BmAlg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 5aca4395568e..c88029cb09a8 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -1,6 +1,7 @@ { lib, fetchPypi, + fetchpatch, buildPythonPackage, pythonOlder, @@ -27,16 +28,29 @@ buildPythonPackage rec { pname = "astropy"; - version = "6.0.1"; + version = "6.1.1"; pyproject = true; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-ial13jVtBgjnTx9JNEL7Osu7eoW3OeB0RguwNAAUs5w="; + hash = "sha256-5cb0XZEcMKy41VbH+O2ZSuxxsQjmHu5QZ/AK8eTjYTg="; }; + patches = [ + (fetchpatch { + name = "drop-usage-known-bad-actor-cdn.patch"; + url = "https://github.com/astropy/astropy/commit/d329cb38e49584ad0ff5244fd2fff74cfa1f92f1.patch"; + hash = "sha256-+DbDwYeyR+mMDLRB4jiyol/5WO0LwqSCCEwjgflxoTk="; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2.0.0" "numpy" + ''; + nativeBuildInputs = [ astropy-extension-helpers cython @@ -83,6 +97,8 @@ buildPythonPackage rec { "test_sidereal_lon_independent" "test_timedelta_full_precision_arithmetic" "test_datetime_to_timedelta" + + "test_datetime_difference_agrees_with_timedelta_no_hypothesis" ] ++ lib.optionals stdenv.isDarwin [ "test_sidereal_lat_independent" ]; meta = { diff --git a/pkgs/development/python-modules/async-interrupt/default.nix b/pkgs/development/python-modules/async-interrupt/default.nix index d9fa7c8a59e5..f166eff8db1a 100644 --- a/pkgs/development/python-modules/async-interrupt/default.nix +++ b/pkgs/development/python-modules/async-interrupt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "async-interrupt"; - version = "1.1.1"; + version = "1.1.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "async_interrupt"; rev = "refs/tags/v${version}"; - hash = "sha256-mbvOj1ybCkDNr3je3PtFwmddkh2k/nHOerpC6hGSUYI="; + hash = "sha256-CFCWlIx4iAG6gW2ORRYfZpFWRvjukqdcR2yg6NjVqps="; }; postPatch = '' diff --git a/pkgs/development/python-modules/async-tkinter-loop/default.nix b/pkgs/development/python-modules/async-tkinter-loop/default.nix index 0119dbd96be6..a620c95843cc 100644 --- a/pkgs/development/python-modules/async-tkinter-loop/default.nix +++ b/pkgs/development/python-modules/async-tkinter-loop/default.nix @@ -6,7 +6,6 @@ poetry-core, tkinter, typing-extensions, - pythonRelaxDepsHook, pytestCheckHook, }: @@ -22,7 +21,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook poetry-core ]; diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 86ed8e48b504..7c87735f7472 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.38.3"; + version = "0.39.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,9 +32,11 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-RmpQOVZ/s3Zv2e+iS7LTI5Wh/g0yy0Xv0M8ppsbYZPg="; + hash = "sha256-2A46/j6DkZ7rz/B64aBAp0NvRG5TBuL4VwMVS50+fQs="; }; + pythonRelaxDeps = [ "defusedxml" ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/asyncclick/default.nix b/pkgs/development/python-modules/asyncclick/default.nix index f36b5a773d19..9e5b82197efb 100644 --- a/pkgs/development/python-modules/asyncclick/default.nix +++ b/pkgs/development/python-modules/asyncclick/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asyncclick"; - version = "8.1.7.1"; + version = "8.1.7.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "python-trio"; repo = "asyncclick"; rev = "refs/tags/${version}"; - hash = "sha256-gx7s/HikvjsXalc0Z73JWMKc1SlhR+kohwk2sW4o19I="; + hash = "sha256-ahzI7yILq1OpZ6IT0qt8vjzi6I6zAoTrULOl8CqRw4A="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/asyncio-mqtt/default.nix b/pkgs/development/python-modules/asyncio-mqtt/default.nix deleted file mode 100644 index 8209b9460659..000000000000 --- a/pkgs/development/python-modules/asyncio-mqtt/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - lib, - anyio, - buildPythonPackage, - fetchFromGitHub, - paho-mqtt, - pytestCheckHook, - pythonOlder, - setuptools, - setuptools-scm, - typing-extensions, - wheel, -}: - -buildPythonPackage rec { - pname = "asyncio-mqtt"; - version = "0.16.1"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "sbtinstruments"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-f3JqocjOEwNjo6Uv17ij6oEdrjb6Z2wTzdhdVhx46iM="; - }; - - nativeBuildInputs = [ - setuptools - setuptools-scm - wheel - ]; - - propagatedBuildInputs = [ paho-mqtt ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; - - nativeCheckInputs = [ - anyio - pytestCheckHook - ]; - - pythonImportsCheck = [ "asyncio_mqtt" ]; - - disabledTests = [ - # Tests require network access - "test_client_filtered_messages" - "test_client_logger" - "test_client_max_concurrent_outgoing_calls" - "test_client_no_pending_calls_warnings_with_max_concurrent_outgoing_calls" - "test_client_pending_calls_threshold" - "test_client_tls_context" - "test_client_tls_params" - "test_client_unfiltered_messages" - "test_client_unsubscribe" - "test_client_username_password " - "test_client_websockets" - "test_client_will" - "test_multiple_messages_generators" - ]; - - # newer version are packaged as aiomqtt - passthru.skipBulkUpdate = true; - - meta = with lib; { - description = "Idomatic asyncio wrapper around paho-mqtt"; - homepage = "https://github.com/sbtinstruments/asyncio-mqtt"; - license = licenses.bsd3; - changelog = "https://github.com/sbtinstruments/asyncio-mqtt/blob/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 78775f666f50..6a481aed589d 100644 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.41.13"; + version = "3.41.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ldSiO9exbF89KDaspj3kIzAZzOfr/6ohlOyQ5mBxo/U="; + hash = "sha256-cXVHGEOvEuSH19mub9u6kjK3epetN3IeXlHxwiBzTPY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index 8a04f3e8f9ab..6728f39269ec 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -20,7 +20,6 @@ toolz, wheel, xmltodict, - pythonRelaxDepsHook, }: buildPythonPackage { @@ -37,7 +36,6 @@ buildPythonPackage { hash = "sha256-WfB+OY61IPprT6OCVHl8VA60p7lLVkRGuyYX+nm7bbA="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ setuptools diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index e9be3715ec31..40b47f61016a 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -10,7 +10,6 @@ poetry-core, pprintpp, pythonOlder, - pythonRelaxDepsHook, tbm-utils, }: @@ -44,7 +43,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ attrs diff --git a/pkgs/development/python-modules/auditok/default.nix b/pkgs/development/python-modules/auditok/default.nix index 1ae8f82ab6fc..cad60d86198f 100644 --- a/pkgs/development/python-modules/auditok/default.nix +++ b/pkgs/development/python-modules/auditok/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/amsehili/auditok/"; changelog = "https://github.com/amsehili/auditok/blob/v${version}/CHANGELOG"; license = licenses.mit; - maintainers = with maintainers; [ Benjamin-L ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/autarco/default.nix b/pkgs/development/python-modules/autarco/default.nix index b843f023dc60..72ad0c41fc76 100644 --- a/pkgs/development/python-modules/autarco/default.nix +++ b/pkgs/development/python-modules/autarco/default.nix @@ -10,7 +10,6 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, syrupy, yarl, }: @@ -40,7 +39,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index ae2692cd697f..69d4fdedfd2a 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -13,7 +13,6 @@ pyopenssl, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, urllib3, }: @@ -35,7 +34,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core poetry-dynamic-versioning - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/autofaiss/default.nix b/pkgs/development/python-modules/autofaiss/default.nix index e5d117e6cc29..02dd9c071d7f 100644 --- a/pkgs/development/python-modules/autofaiss/default.nix +++ b/pkgs/development/python-modules/autofaiss/default.nix @@ -9,7 +9,6 @@ numpy, pyarrow, pytestCheckHook, - pythonRelaxDepsHook, pythonOlder, }: @@ -27,7 +26,6 @@ buildPythonPackage rec { hash = "sha256-pey3wrW7CDLMiPPKnmYrcSJqGuy6ecA2SE9m3Jtt6DU="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRemoveDeps = [ # The `dataclasses` packages is a python2-only backport, unnecessary in diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 41c0e90ae939..ec07daa2880c 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -5,7 +5,7 @@ setuptools, fetchPypi, typing-extensions, - pytestCheckHook, + pytest7CheckHook, }: buildPythonPackage rec { @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytest7CheckHook ]; disabledTests = [ # Requires network access diff --git a/pkgs/development/python-modules/aw-core/default.nix b/pkgs/development/python-modules/aw-core/default.nix index e7410409c4be..84b13c6f100d 100644 --- a/pkgs/development/python-modules/aw-core/default.nix +++ b/pkgs/development/python-modules/aw-core/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, poetry-core, jsonschema, peewee, @@ -36,7 +35,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index cd81d99efac8..c2c0b859b033 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -12,7 +12,6 @@ pyopenssl, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, requests-kerberos, toml, @@ -34,7 +33,6 @@ buildPythonPackage rec { build-system = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 005c65b91c10..e672317cc75f 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.86.0"; + version = "1.89.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; rev = "refs/tags/v${version}"; - hash = "sha256-elirU6u6smuYIj8oO6s2ybQB8Tu0pJPkBdjd0W0CfFE="; + hash = "sha256-wqM3n99lD0s/E9nd55q19Us31XgFtU/bBYJR1HTnnvk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix b/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix index 6427a1417ec2..daf6adf4f00c 100644 --- a/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix +++ b/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix @@ -12,15 +12,15 @@ buildPythonPackage rec { pname = "aws-secretsmanager-caching"; - version = "1.1.2"; - pyprject = true; + version = "1.1.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "aws_secretsmanager_caching"; inherit version; - hash = "sha256-hhdo+I1yA/pLA+YFDFi8Ekrv27xQLpxiqXh1+4XqteA="; + hash = "sha256-9tbsnUPg2+T21d6982tMtpHRWpZ7NYsldfXZGXSmwP8="; }; patches = [ diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 9ad75c36d59f..418a938dc75e 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.13.0"; + version = "2.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-xray-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-KhYYzeOteQxS1ltEUbjsDriHXO0Kom9YiCvVhSNvXVQ="; + hash = "sha256-rWP0yQ+Ril0UByOCWJKcL3mD7TvzK8Ddq9JlFIRBFU4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 74d7a17a8f6c..209627d858bf 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.20.11"; + version = "0.20.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w9v7fxkJRXlS5kU3PnK2n5DFDEZe5qRtm73BKst5gDw="; + hash = "sha256-Z271rdHsBh8/+nIrMm3wGhxEJJNIl2hYuBQdkHSlRok="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index 7defc559cce0..a831b5300eb9 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "awslambdaric"; - version = "2.0.10"; + version = "2.0.11"; pyproject = true; disabled = isPy27; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; rev = "refs/tags/${version}"; - sha256 = "sha256-tvTN6gV73Qnbe4OBHtfxt4jXV32fMTPE4H79WIkgkxE="; + sha256 = "sha256-9DiUpgeL4bY7G3b5R06FjpN0st03F84fj0bhp70moKo="; }; patches = [ diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index a9ac6a814c60..12f4549bbe43 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -20,14 +20,13 @@ pyparsing, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, redshift-connector, requests-aws4auth, }: buildPythonPackage rec { pname = "awswrangler"; - version = "3.7.3"; + version = "3.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,14 +35,13 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-gm6ieteW+NcY+AOLcMZLUPcSi2Z/Mo27rzd1i9imp5I="; + hash = "sha256-2eF8WDhWfYgR3Ce/ehzCBtUdGUFzNmrTNfnatDpCg7Q="; }; pythonRelaxDeps = [ "packaging" ]; build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ boto3 diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index 79692ba7d656..e0a316317ef3 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "axis"; - version = "61"; + version = "62"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "axis"; rev = "refs/tags/v${version}"; - hash = "sha256-YiEY+Eu1j42bBzM4f5Ku5mAE2/tY9f+Hyb2DS6LIW7c="; + hash = "sha256-ey0yt+AIbMO74brHepnCFtekDS4XscTKswshlTrS41A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/axisregistry/default.nix b/pkgs/development/python-modules/axisregistry/default.nix index 9b509c2adca2..453f1c27f8bd 100644 --- a/pkgs/development/python-modules/axisregistry/default.nix +++ b/pkgs/development/python-modules/axisregistry/default.nix @@ -4,7 +4,6 @@ fetchPypi, fonttools, protobuf, - pythonRelaxDepsHook, pytestCheckHook, setuptools-scm, }: @@ -24,7 +23,6 @@ buildPythonPackage rec { protobuf ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools-scm ]; diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 3718ee9ae723..d5bc90eaf57b 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -20,7 +20,7 @@ }: buildPythonPackage rec { - version = "1.30.1"; + version = "1.30.2"; pname = "azure-core"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-Jic6JUEx+EJp6OpEZPNWDHMfKcDB9prJkBCEXyOcGo8="; + hash = "sha256-oU3CEO/NYIghqkctn7jo0DXSm2iZOBkUe8KQqKwiRHI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index 1925ea45912b..6fc221c965f5 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.12.0"; + version = "5.12.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-EqF/V51puTDZBuqVeuzEVoJ0/xrQn8qhiLt7/pvpsXY="; + hash = "sha256-DaMLBRLFLqInuKR2sYH/wH0gIiMRF2xxBHuv1HW4G44="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index c7470e5f36c8..6f89cacb08bd 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.16.0"; + version = "1.17.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-b/HWZ83Ngdoc6rQvgKC+Y8qEZin1GKki9zF6fjyEThs="; + hash = "sha256-oRaPIjstf6OWg2K3iv/RV6Hzdy8xCozc6IPMUVxsiZg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index adb2d6033421..c98f7f9f36aa 100644 --- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -10,15 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "13.1.0"; + version = "13.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "azure_mgmt_cdn"; - inherit version; - hash = "sha256-Igpr2snnXkwAyEGlnY3j7JAQ4LnhQS3snmwka2GeO/I="; + inherit pname version; + hash = "sha256-RmMwTzG2Zy3sMgx857qXFcK5nn2LaEs3XwtO/9qQIQw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index f46d6f967b22..01ef04a5d231 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "9.4.0"; + version = "9.5.0"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-yruCHNRGsJ5z0kwxwoemD8w2I0iPH/qTNcaSJn55w0E="; + hash = "sha256-XSGhl94Is2OOCa2I4y2iEfe7WYt9fP7kjWHVfWmz7dk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 2d8e7b884d18..3c511be3ca53 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "7.0.0"; + version = "8.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-99uvyPwzRnUxp4ePA5Xa19QVTRvkAjvHDVIGgbcBP7o="; + hash = "sha256-CL1Z50yjbEkncmKT4FhJ7UaOiUtw1CD85TVEJ7KHjQ4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index ade13d07d21a..d919e7c6163c 100644 --- a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-imagebuilder"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-PzJdaIthJcL6kmgeWxjqQHugMtW+P3wHJEBtcz5sFO8="; + hash = "sha256-5sLVc6vvJiIvwUSRgD1MsB+G/GEpLUz3xHKetLrkiRw="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 1857c3cc6106..1349ea2c4c24 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-storage"; - version = "21.2.0"; + version = "21.2.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-KHyYQLAb6TGBnUA9p+1SvWL9B3sFKd1HDm28T+3ksg0="; + hash = "sha256-UDp/+cMSVAkrBlZEX1cov9/aLQnUaoLpcBnqqaHs7GQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index a4b2769543d3..adbae42173ca 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "7.2.0"; + version = "7.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-78/m9/Ug7Qq8/oZRfhyM8CpxL3N6PbDbfLRsbWR5ge0="; + hash = "sha256-IDK/TVDfC7uCLqAMrDv74OZ0h9LJzBGCwIWPgxSc3qk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 19a7bb6af82e..fa2876123e97 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.19.1"; + version = "12.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-E+FrpC/FSsLH6Pl2BiFzpcgrnsBZRyjhNKrDcpZaEbA="; + hash = "sha256-7rkSVuQdS1ubrWqH/QqK3gfdWKpSNE4sjSdG4noBfTs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index aa53bbe3ddc0..5c67b77e78f9 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -6,6 +6,7 @@ glibcLocales, importlib-metadata, logfury, + annotated-types, packaging, pdm-backend, pyfakefs, @@ -13,7 +14,6 @@ pytest-mock, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, tqdm, typing-extensions, @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "2.3.0"; + version = "2.4.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,17 +30,17 @@ buildPythonPackage rec { owner = "Backblaze"; repo = "b2-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Duva6rFYtMAfMYb2Ze8k3jIX8Ld8u4zdl7WXDbS0o64="; + hash = "sha256-SaoQzP7vtzVWmkUTw0vCeneeSMTmBTIr5kiMXGcgm9g="; }; build-system = [ pdm-backend ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRemoveDeps = [ "setuptools" ]; dependencies = [ + annotated-types packaging logfury requests diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix index 3bd0b83f2db0..de68774a358b 100644 --- a/pkgs/development/python-modules/babel/default.nix +++ b/pkgs/development/python-modules/babel/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, isPyPy, - pythonAtLeast, pythonOlder, # build-system @@ -18,23 +17,17 @@ buildPythonPackage rec { pname = "babel"; - version = "2.14.0"; + version = "2.15.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "Babel"; - inherit version; - hash = "sha256-aRmGfbA2OYuiHrXHoPayirjLw656c6ROvjSudKTn02M="; + inherit pname version; + hash = "sha256-ja8OJl0FdovGx6MUzxMh6aEjr8MozGNcGGIqLzCgRBM="; }; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ pytz ]; - - # including backports.zoneinfo for python<3.9 yields infinite recursion - doCheck = pythonAtLeast "3.9"; + build-system = [ setuptools ]; nativeCheckInputs = [ freezegun @@ -49,12 +42,14 @@ buildPythonPackage rec { "test_format_time" ]; - meta = with lib; { + pythonImportsCheck = [ "babel" ]; + + meta = { + description = "Collection of internationalizing tools"; homepage = "https://babel.pocoo.org/"; changelog = "https://github.com/python-babel/babel/releases/tag/v${version}"; - description = "Collection of internationalizing tools"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "pybabel"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix index 5f59c2b11053..64cd4318226a 100644 --- a/pkgs/development/python-modules/babelfish/default.nix +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -2,20 +2,24 @@ lib, buildPythonPackage, fetchPypi, - setuptools, + pythonOlder, + poetry-core, + importlib-metadata, }: buildPythonPackage rec { pname = "babelfish"; - version = "0.6.0"; - format = "setuptools"; + version = "0.6.1"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "2dadfadd1b205ca5fa5dc9fa637f5b7933160a0418684c7c46a7a664033208a2"; + hash = "sha256-3stnpGYIiNSEgKtpmDCYNxdBWNDxqmO+uxwuEaq5eqs="; }; - propagatedBuildInputs = [ setuptools ]; + build-system = [ poetry-core ]; + + dependencies = lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; # no tests executed doCheck = false; @@ -23,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "babelfish" ]; meta = with lib; { - homepage = "https://pypi.python.org/pypi/babelfish"; + homepage = "https://github.com/Diaoul/babelfish"; description = "Module to work with countries and languages"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix index ffdc8953c36a..afc75992a9a5 100644 --- a/pkgs/development/python-modules/babelfont/default.nix +++ b/pkgs/development/python-modules/babelfont/default.nix @@ -9,26 +9,31 @@ glyphslib, openstep-plist, orjson, - poetry-core, pytestCheckHook, + setuptools, + setuptools-scm, ufolib2, }: buildPythonPackage rec { pname = "babelfont"; - version = "3.0.1"; + version = "3.0.5"; + pyproject = true; # PyPI source tarballs omit tests, fetch from Github instead src = fetchFromGitHub { owner = "simoncozens"; repo = pname; - rev = "v${version}"; - hash = "sha256-1DHcJDVaCgIAODyf5UUrXej8x3ySD4+6/KtxuF2yFV4="; + rev = "refs/tags/v${version}"; + hash = "sha256-9PEOkkm7qH4ExiJJKrTZX5Ph/urtOyFsy7jjtFepncU="; }; - pyproject = true; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ cu2qu fontfeatures fonttools @@ -37,9 +42,7 @@ buildPythonPackage rec { orjson ufolib2 ]; - nativeBuildInputs = [ poetry-core ]; - doCheck = true; nativeCheckInputs = [ defcon pytestCheckHook diff --git a/pkgs/development/python-modules/backports-tarfile/default.nix b/pkgs/development/python-modules/backports-tarfile/default.nix new file mode 100644 index 000000000000..1b1c7790a91a --- /dev/null +++ b/pkgs/development/python-modules/backports-tarfile/default.nix @@ -0,0 +1,65 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + wheel, + jaraco-test, + pytestCheckHook, +}: + +let self = buildPythonPackage rec { + pname = "backports-tarfile"; + version = "1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "backports.tarfile"; + rev = "v${version}"; + hash = "sha256-X3rkL35aDG+DnIOq0fI7CFoWGNtgLkLjtT9y6+23oto="; + }; + + build-system = [ + setuptools + setuptools-scm + wheel + ]; + + doCheck = false; + + nativeCheckInputs = [ + jaraco-test + pytestCheckHook + ]; + + disabledTests = [ + # calls python -m backports.tarfile and doesn't find module documentation + "test_bad_use" + "test_create_command" + "test_create_command_compressed" + "test_create_command_dot_started_filename" + "test_create_command_dotless_filename" + "test_extract_command" + "test_extract_command_different_directory" + "test_extract_command_invalid_file" + "test_list_command_invalid_file" + "test_test_command" + "test_test_command_invalid_file" + # chmod: permission denied + "test_modes" + ]; + + pythonImportsCheck = [ "backports.tarfile" ]; + + passthru.tests.pytest = self.overridePythonAttrs { doCheck = true; }; + + meta = with lib; { + description = "Backport of CPython tarfile module"; + homepage = "https://github.com/jaraco/backports.tarfile"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +}; +in self diff --git a/pkgs/development/python-modules/barectf/default.nix b/pkgs/development/python-modules/barectf/default.nix index e56367d85fa1..532228c31e4f 100644 --- a/pkgs/development/python-modules/barectf/default.nix +++ b/pkgs/development/python-modules/barectf/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, poetry-core, pytest7CheckHook, - pythonRelaxDepsHook, setuptools, jsonschema, pyyaml, @@ -26,7 +25,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/base64io/default.nix b/pkgs/development/python-modules/base64io/default.nix index c5ba9c836144..ab442ae90fa4 100644 --- a/pkgs/development/python-modules/base64io/default.nix +++ b/pkgs/development/python-modules/base64io/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "base64io"; - version = "1.0.3-unstable-2023-10-30"; + version = "1.0.3-unstable-2024-06-24"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws"; repo = "base64io-python"; - rev = "604817576e607d1f7f8af1ffa1530522fd4e4be2"; - hash = "sha256-RFl0iuyHdPf3VpBxH4m/N2yaKEBxkNMT1ldZP9VGGOk="; + rev = "f3dd88bf0db6eb412c55ff579f0aa9f39d970c41"; + hash = "sha256-znQlPlS+jzPiHNBvnDnZ8l1pZP6iuYqExDlPii4dJwM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index ecc9b0bae69e..74759f2a0d98 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -12,7 +12,6 @@ pyproj, pyshp, python, - pythonRelaxDepsHook, setuptools, }: @@ -33,7 +32,6 @@ buildPythonPackage rec { nativeBuildInputs = [ cython geos - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index 519a39c53bac..506352b25d32 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, lark, - pynose, pythonOlder, setuptools, }: @@ -20,11 +19,7 @@ buildPythonPackage rec { hash = "sha256-rI/1n7m9Q36im4mn18UH/QoelXhFuumurGnyiSuNaB4="; }; - # Nose is required during build process, so can not use `nativeCheckInputs`. - buildInputs = [ - pynose - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ lark ]; diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index e4dcaceabbdf..396a9668b777 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "bcrypt"; - version = "4.1.2"; + version = "4.1.3"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-MzE6EgCjrpC3VYfOrFArBIuED8aef3oJBbX4f6x6Elg="; + hash = "sha256-LuFd10n1lS/j8EMND/a3QILhWcUDMqFBPVG1aJzwZiM="; }; cargoRoot = "src/_bcrypt"; @@ -36,7 +36,7 @@ buildPythonPackage rec { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-fTD1AKvyeni5ukYjK53gueKLey+rcIUjW/0R289xeb0="; + hash = "sha256-Uag1pUuis5lpnus2p5UrMLa4HP7VQLhKxR5TEMfpK0s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index 64c3c65c743e..a369c25e8970 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "beaker"; - version = "1.11.0"; + version = "1.13.0"; # The pypy release do not contains the tests src = fetchFromGitHub { owner = "bbangert"; repo = "beaker"; - rev = version; - sha256 = "059sc7iar90lc2y9mppdis5ddfcxyirz03gmsfb0307f5dsa1dhj"; + rev = "refs/tags/${version}"; + sha256 = "sha256-HzjhOPXElwKoJLrhGIbVn798tbX/kaS1EpQIX+vXCtE="; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index ebe39136080e..b0e9c97c5d1a 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "2.3.6"; + version = "3.0.0"; format = "setuptools"; pname = "beancount"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-gB+Tvta1fS4iQ2aIxInVob8fduIQ887RhoB1fmDTR1o="; + hash = "sha256-z2aGhpx+o+78CU7hPthmv196K7DGHk1PXfPjX4Rs/98="; }; # Tests require files not included in the PyPI archive. diff --git a/pkgs/development/python-modules/beautysh/default.nix b/pkgs/development/python-modules/beautysh/default.nix index 79cda3b5eec6..8c8af617f833 100644 --- a/pkgs/development/python-modules/beautysh/default.nix +++ b/pkgs/development/python-modules/beautysh/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, fetchpatch, poetry-core, - pytestCheckHook, + pytest7CheckHook, setuptools, types-colorama, types-setuptools, @@ -46,7 +46,7 @@ buildPythonPackage rec { types-setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytest7CheckHook ]; pythonImportsCheck = [ "beautysh" ]; diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index ab5d4025dbf9..828021217c41 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, hatchling, hatch-vcs, aiohttp, @@ -130,8 +129,6 @@ buildPythonPackage { hash = "sha256-giZteSikwS9YEcVMPCC9h2khbBgvUPRW1biAyixO13Y="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "cattrs" "nvidia-ml-py" diff --git a/pkgs/development/python-modules/berkeleydb/default.nix b/pkgs/development/python-modules/berkeleydb/default.nix index 514a9b0c689a..bf6c93b633d3 100644 --- a/pkgs/development/python-modules/berkeleydb/default.nix +++ b/pkgs/development/python-modules/berkeleydb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "berkeleydb"; - version = "18.1.8"; + version = "18.1.10"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4YMaeQv9hVdA5cEvlS8Z9kbCaYBs/DYnda/Zh4zzJVc="; + hash = "sha256-QmNBoWAHqQAtmHpvTZcib46v/8saBIhIgFPTijEnyBo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 6e95bec307ee..8a3ebaf0b665 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "bids-validator"; - version = "1.14.5"; + version = "1.14.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-TXIb1ff7D6aM+8L5F47O5Dvupp1Sn4Rnl+GQaUdEgno="; + pname = "bids_validator"; + inherit version; + hash = "sha256-3ytrXRqq1h00zK0ElPLtc84wgoJa2jGVTE4UwlONSFw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index 8836f20fbb41..75e799ce44b9 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "biliass"; - version = "1.3.7"; + version = "1.3.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "yutto-dev"; repo = "biliass"; rev = "refs/tags/v${version}"; - hash = "sha256-Opb4rlGe+LDJZs3F7e/NZYfuMtHEWUZeMm8VZQfEzKI="; + hash = "sha256-hBorYAqtxTZ4LElxxJOGxC2g7sBRhRKVv6HOVHZn9FA="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 87e6b47366a2..8162c9fe5efe 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - case, psutil, pythonOlder, }: @@ -21,7 +20,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - case psutil pytestCheckHook ]; diff --git a/pkgs/development/python-modules/biopandas/default.nix b/pkgs/development/python-modules/biopandas/default.nix index b947164f1d88..be59f3638d91 100644 --- a/pkgs/development/python-modules/biopandas/default.nix +++ b/pkgs/development/python-modules/biopandas/default.nix @@ -5,11 +5,11 @@ setuptools, looseversion, mmtf-python, + nose, numpy, pandas, - pynose, pytestCheckHook, - pythonRelaxDepsHook, + pythonOlder, }: buildPythonPackage rec { @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-1c78baBBsDyvAWrNx5mZI/Q75wyXv0DAwAdWm3EwX/I="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "looseversion" ]; build-system = [ setuptools ]; @@ -37,8 +35,12 @@ buildPythonPackage rec { looseversion ]; + # tests rely on nose + # resolved in 0.5.1: https://github.com/BioPandas/biopandas/commit/67aa2f237c70c826cd9ab59d6ae114582da2112f + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ - pynose + nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bip32/default.nix b/pkgs/development/python-modules/bip32/default.nix index a042acd83299..ea8e22a52cc6 100644 --- a/pkgs/development/python-modules/bip32/default.nix +++ b/pkgs/development/python-modules/bip32/default.nix @@ -24,11 +24,7 @@ buildPythonPackage rec { hash = "sha256-o8UKR17XDWp1wTWYeDL0DJY+D11YI4mg0UuGEAPkHxE="; }; - # https://github.com/darosior/python-bip32/pull/40/files - postPatch = '' - substituteInPlace requirements.txt \ - --replace-fail 'coincurve>=15.0,<19' 'coincurve>=15.0,<20' - ''; + pythonRelaxDeps = [ "coincurve" ]; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/bitlist/default.nix b/pkgs/development/python-modules/bitlist/default.nix index 6054bee43bea..76d2b45b2605 100644 --- a/pkgs/development/python-modules/bitlist/default.nix +++ b/pkgs/development/python-modules/bitlist/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bitlist"; version = "1.2.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,15 +23,17 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace '--cov=bitlist --cov-report term-missing' "" + --replace-fail '--cov=bitlist --cov-report term-missing' "" ''; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ parts ]; + pythonRelaxDeps = [ "parts" ]; + + dependencies = [ parts ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix index a80643c4d1bd..9bfc4a89784f 100644 --- a/pkgs/development/python-modules/bitsandbytes/default.nix +++ b/pkgs/development/python-modules/bitsandbytes/default.nix @@ -13,7 +13,7 @@ let pname = "bitsandbytes"; - version = "0.42.0"; + version = "0.43.1"; inherit (torch) cudaCapabilities cudaPackages cudaSupport; inherit (cudaPackages) backendStdenv cudaVersion; @@ -54,7 +54,7 @@ buildPythonPackage { owner = "TimDettmers"; repo = "bitsandbytes"; rev = "refs/tags/${version}"; - hash = "sha256-PZxsFJ6WpfeQqRQrRRBZfZfNY6/TfJFLBeknX24OXcU="; + hash = "sha256-GFbFKPdV96DXPA+PZO4h0zdBclN670fb0PGv4QPHWHU="; }; postPatch = diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index d21e985bfa09..af85d4b32034 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -5,12 +5,13 @@ pythonOlder, bitarray, setuptools, - unittestCheckHook, + pytest-benchmark, + pytestCheckHook, }: buildPythonPackage rec { pname = "bitstring"; - version = "4.1.4"; + version = "4.2.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,14 +20,27 @@ buildPythonPackage rec { owner = "scott-griffiths"; repo = pname; rev = "refs/tags/bitstring-${version}"; - hash = "sha256-CO7R2SCb232OW1DCLo45UIarFG5FhR4WkwuQieXha0Y="; + hash = "sha256-m2LZdUWOMxzr/biZhD1nWagab8PohHTcr+U1di0nkrU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ bitarray ]; + dependencies = [ bitarray ]; - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + pytest-benchmark + pytestCheckHook + ]; + + pytestFlagsArray = [ + "--benchmark-disable" + ]; + + disabledTestPaths = [ + "tests/test_bits.py" + "tests/test_fp8.py" + "tests/test_mxfp.py" + ]; pythonImportsCheck = [ "bitstring" ]; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index d9d1980ed2d0..06b53f599e30 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "black"; - version = "24.4.0"; + version = "24.4.2"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-8Htp/aIFeDZ+rrvWcP+PxlOrGB4f+V2ESX+fog59BkE="; + hash = "sha256-yHK1MFfwAAhdpmoZxV1o9vjdysJkI5KtOjVYeEBvvU0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 3d24c627fbb2..aef8d84b43f1 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.22.1"; + version = "0.22.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "hbldh"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kBKNBVbEq1xHLu/gKUL2SwlA2WKjzqFVC5o4N+qnqLM="; + hash = "sha256-O8EvF+saJ0UBZ8MESM5gIRmk2wbA4HUDADiVUtXzXrY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index 3c3556cc32f6..72cb3205e155 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "blinker"; - version = "1.7.0"; + version = "1.8.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-5oIP9vpOTR2OJ0fCKDdJw/VH5P7hErmFVc3NrjKZYYI="; + hash = "sha256-j3ewnTv3x5XpaelIbznCxenDnU7gdCS+K8WU7OlkLYM="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index b2b7dc6dc9bb..014b7d15b9e3 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.22.7"; + version = "0.23.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-FfjvF6PBM+18JgQBP6vyElQYWMVizAEGk92ILwxpFSk="; + hash = "sha256-MWXOxE0nxBFhkAWjy7qFPhv4AO6VjGf+fAiyaWXeiX8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index b1a7dc98b57d..8b43fd2c9065 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -7,7 +7,7 @@ fetchpatch, funcparserlib, pillow, - pynose, + nose, pytestCheckHook, pythonOlder, reportlab, @@ -48,9 +48,12 @@ buildPythonPackage rec { webcolors ]; + # tests rely on nose + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ ephem - pynose + nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index 518b38000ca0..10e5633927e8 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.19.2"; + version = "0.19.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-adapters"; rev = "refs/tags/v${version}"; - hash = "sha256-hPs6YnmndJ2Z5RotcIRIYWPdvMyX56ul84l1Cs8kqH0="; + hash = "sha256-yRGlp3hykxdWnJde/VF6CwQgP6cupj1BCW7OmFNQAbM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 4a68e748c9ce..9b10c329ce15 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "1.19.0"; + version = "1.19.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-G345Nz0iVUQWOCEnf5UqUa49kAXCmNY22y4v+J2/G2Q="; + hash = "sha256-ofcGdHHd1P+R9ykJGtwHURTzHCeiJ603EqtgUgLPnmM="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index d3e3a36ff885..df2038a8e96c 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-sensor-state-data"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-sensor-state-data"; rev = "refs/tags/v${version}"; - hash = "sha256-phiK+2tULBE78d1X/TsaT2kLRHxiCiuLMkaI7S6tqJ8="; + hash = "sha256-Gsg6Gbb+nvrKr7vn9zUuPTPtSjqFJyMk7oLt7LUUn5A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bme680/default.nix b/pkgs/development/python-modules/bme680/default.nix index bed4b74b0344..3d1a3c0cd233 100644 --- a/pkgs/development/python-modules/bme680/default.nix +++ b/pkgs/development/python-modules/bme680/default.nix @@ -2,39 +2,43 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system + hatchling, + hatch-fancy-pypi-readme, + + # dependencies + smbus2, + + # checks mock, - smbus-cffi, pytestCheckHook, }: buildPythonPackage rec { pname = "bme680"; - version = "1.1.1"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "pimoroni"; repo = "bme680-python"; - rev = "v${version}"; - hash = "sha256-gmdRxMJ0DoCyNcb/bYp746PBi4HktHAAYOcSQJ0Uheg="; + rev = "refs/tags/v${version}"; + hash = "sha256-ep0dnok/ycEoUAnOK4QmdqdO0r4ttzSoqHDl7aPengE="; }; - propagatedBuildInputs = [ smbus-cffi ]; + build-system = [ + hatchling + hatch-fancy-pypi-readme + ]; - preBuild = '' - cd library - ''; + dependencies = [ smbus2 ]; nativeCheckInputs = [ mock pytestCheckHook ]; - postPatch = '' - substituteInPlace library/setup.cfg \ - --replace "smbus" "smbus-cffi" - ''; - pythonImportsCheck = [ "bme680" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/boiboite-opener-framework/default.nix b/pkgs/development/python-modules/boiboite-opener-framework/default.nix index b86989bbbd71..d9936a7593e9 100644 --- a/pkgs/development/python-modules/boiboite-opener-framework/default.nix +++ b/pkgs/development/python-modules/boiboite-opener-framework/default.nix @@ -5,7 +5,6 @@ packaging, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, scapy, setuptools, }: diff --git a/pkgs/development/python-modules/borb/default.nix b/pkgs/development/python-modules/borb/default.nix index 3639e72e4d05..594c64fe66ef 100644 --- a/pkgs/development/python-modules/borb/default.nix +++ b/pkgs/development/python-modules/borb/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "borb"; - version = "2.1.23"; + version = "2.1.24"; pyproject = true; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "jorisschellekens"; repo = "borb"; rev = "refs/tags/v${version}"; - hash = "sha256-cpih7ijoT4dEdoFjh6qQcnzjWd2zusv4tNgPyrIghvg="; + hash = "sha256-3PZ3fHsq9pgJ4oK42Y4b/3ghuYELgRPe09fciOKknuE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index b48ff6603f33..c0404e566de6 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, setuptools, build, coloredlogs, @@ -29,7 +28,6 @@ buildPythonPackage rec { }; build-system = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 8bec33149805..2a2c66f1b73b 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.136"; + version = "1.34.140"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-7Lzngq4ZA30fJmc8/DA1hJPJZY6grwbdWKmZvpY6snU="; + hash = "sha256-P9z8kOsm6l25evHKn8nSHFDMiA2e4A56uRQKWZajYZ0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 274f74201520..e6accaddef6e 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -7,7 +7,6 @@ pytest-xdist, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, s3transfer, setuptools, }: @@ -27,7 +26,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 34432cd96010..97cbd9642893 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.136"; + version = "1.34.140"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-uXvs5Eq8nxbB/LAi0/A8ItQR6j3LRzAgejGOuObvY+c="; + hash = "sha256-+JQtUBHe7h+7ILdVoUzi8O88qZzlcS5Mi3VoUAjb/mM="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 3c71ca2f6b1b..3eaade127cfe 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -8,27 +8,25 @@ pytestCheckHook, python-dateutil, pythonOlder, - pythonRelaxDepsHook, setuptools, urllib3, }: buildPythonPackage rec { pname = "botocore"; - version = "1.34.109"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.34.129"; # N.B: if you change this, change boto3 and awscli to a matching version pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-gEghJSWXgh9yI8s7/KKipROuC7mnHo4iYFr/aGbhPnE="; + hash = "sha256-fFbiWvYRLWnF0UoVtC92unaHaHq8RjqWrF7coZwKnC0="; }; pythonRelaxDeps = [ "urllib3" ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index e35cb5261f7b..129facf57de1 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -12,23 +12,21 @@ torch, scipy, pytestCheckHook, - pythonRelaxDepsHook, }: buildPythonPackage rec { pname = "botorch"; - version = "0.11.0"; + version = "0.11.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eL0buwqrGt4qcwdzCwD85IyiWjAFuP1n8aUb2pvvIKw="; + hash = "sha256-YX/G46U09y/VZuWZhKY8zU0Y+bf0NKumzSGYUWvrq/0="; }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools setuptools-scm wheel diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index 4a0456b936fd..8b84fc8c125f 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -10,15 +10,14 @@ buildPythonPackage rec { pname = "bottleneck"; - version = "1.3.8"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "Bottleneck"; - inherit version; - hash = "sha256-Z4DYlpabp/U8iZW6kMh8VIvrPbQ13JDGC5oQ7Rq02Gg="; + inherit pname version; + hash = "sha256-vrNt9Rm4cJ59NXwMljmwO4hcpjVbv15TdSxoXeUWBbg="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/brian2/default.nix b/pkgs/development/python-modules/brian2/default.nix index aefe2b55500a..c6a31766078b 100644 --- a/pkgs/development/python-modules/brian2/default.nix +++ b/pkgs/development/python-modules/brian2/default.nix @@ -15,16 +15,17 @@ buildPythonPackage rec { pname = "brian2"; - version = "2.6.0"; - format = "setuptools"; + version = "2.7.0"; + pyproject = true; src = fetchPypi { - pname = "Brian2"; - inherit version; - hash = "sha256-qYeIMn8l2V2Ckpj5AY7TWihFnfZ//JcP5VacUUfYCf4="; + inherit pname version; + hash = "sha256-d9GDWp8CGIjeprWf4TtchVd36gmo36HBRkBOLaRXbpo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cython jinja2 numpy @@ -33,7 +34,7 @@ buildPythonPackage rec { sympy ]; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-xdist ]; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index e9cf59606e99..52aafcf554b6 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "btrees"; - version = "5.2"; + version = "6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BTrees"; inherit version; - hash = "sha256-bkoK8BpLvslan5Mbr1xUWXn0NBoTp2Yf+KSXr089g4E="; + hash = "sha256-9puM3TNDThPhgCFruCrgt80x+t+3zFWWlcs3MZyjX/A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/btsocket/default.nix b/pkgs/development/python-modules/btsocket/default.nix index 6374188f7cc1..6065a670f12d 100644 --- a/pkgs/development/python-modules/btsocket/default.nix +++ b/pkgs/development/python-modules/btsocket/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "btsocket"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ukBaz"; repo = "python-btsocket"; - rev = "v${version}"; - hash = "sha256-IqlbFYbEyJPlcmT3DIQIwsjQEAGeIGRtFNx4jWwNtjE="; + rev = "refs/tags/v${version}"; + hash = "sha256-/T89GZJth7pBGQuN1ytCf649oWv7aZcfPHjYoftbLw8="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bundlewrap-keepass/default.nix b/pkgs/development/python-modules/bundlewrap-keepass/default.nix index 7a51ef2e84cc..a738b0aa9e75 100644 --- a/pkgs/development/python-modules/bundlewrap-keepass/default.nix +++ b/pkgs/development/python-modules/bundlewrap-keepass/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/bundlewrap-keepass"; description = "Use secrets from keepass in your BundleWrap repo"; license = licenses.gpl3; - maintainers = with maintainers; [ hexchen ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/bundlewrap-pass/default.nix b/pkgs/development/python-modules/bundlewrap-pass/default.nix index 1a6101c10a72..c4b58575700d 100644 --- a/pkgs/development/python-modules/bundlewrap-pass/default.nix +++ b/pkgs/development/python-modules/bundlewrap-pass/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/bundlewrap-pass"; description = "Use secrets from pass in your BundleWrap repo"; license = licenses.gpl3; - maintainers = with maintainers; [ hexchen ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/bundlewrap-teamvault/default.nix b/pkgs/development/python-modules/bundlewrap-teamvault/default.nix index 588bcd7e5a3a..a8dd57f15b78 100644 --- a/pkgs/development/python-modules/bundlewrap-teamvault/default.nix +++ b/pkgs/development/python-modules/bundlewrap-teamvault/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/trehn/bundlewrap-teamvault"; description = "Pull secrets from TeamVault into your BundleWrap repo"; license = [ licenses.gpl3 ]; - maintainers = with maintainers; [ hexchen ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index c77d8bfe7af1..dcafcf140848 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "bundlewrap"; - version = "4.18.0"; + version = "4.19.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "bundlewrap"; repo = "bundlewrap"; rev = "refs/tags/${version}"; - hash = "sha256-7jBFeJem+0vZot+BknKmCxozmoHCBCAZqDbfQQG3/Vw="; + hash = "sha256-sNdtJRpP54xlkYis4whoGiJJ/Tjnrs4TW6EO3eAMBAo="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix index 189ae9d28196..dac7bb71f236 100644 --- a/pkgs/development/python-modules/cachier/default.nix +++ b/pkgs/development/python-modules/cachier/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - pythonRelaxDepsHook, setuptools, watchdog, portalocker, @@ -32,7 +31,6 @@ buildPythonPackage rec { pythonRemoveDeps = [ "setuptools" ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index dbbcbbbffed6..11a65554116c 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "cairocffi"; - version = "1.6.1"; + version = "1.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eOa75HNXZAxFPQvpKfpJzQXM4uEobz0qHKnL2n79uLc="; + hash = "sha256-LkjuhkiE7Eo6NL+oyauZmfaIKG63FKFaQ+ydBow2VXs="; }; patches = [ diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch index 6542b4367eb4..d4cc7061e86d 100644 --- a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch +++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch @@ -1,21 +1,13 @@ Patch dlopen() to allow direct paths to all required libs -This is an update of the patch submitted in -https://github.com/NixOS/nixpkgs/commit/b13e44e094989d3a902f8c73b22e8d3c0cc7acf4 -by Alexander V. Nikolaev - ---- - cairocffi/__init__.py | 34 ++++++++++++++++------------------ - 1 file changed, 16 insertions(+), 18 deletions(-) - diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py -index 307d58c..43c29e3 100644 +index f917d90..31dab12 100644 --- a/cairocffi/__init__.py +++ b/cairocffi/__init__.py -@@ -21,28 +21,26 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip() +@@ -22,6 +22,14 @@ VERSION = __version__ = '1.7.1' version = '1.17.2' version_info = (1, 17, 2) - + +# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be +# required for runtime +_LIBS = { @@ -24,8 +16,11 @@ index 307d58c..43c29e3 100644 + 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@', + 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@', +} -+ - + + # Python 3.8 no longer searches for DLLs in PATH, so we can add everything in + # CAIROCFFI_DLL_DIRECTORIES manually. Note that unlike PATH, add_dll_directory +@@ -36,26 +44,14 @@ if dll_directories and hasattr(os, 'add_dll_directory'): + def dlopen(ffi, library_names, filenames): """Try various names for the same library, for different platforms.""" - exceptions = [] @@ -33,7 +28,7 @@ index 307d58c..43c29e3 100644 for library_name in library_names: - library_filename = find_library(library_name) - if library_filename: -- filenames = (library_filename,) + filenames +- filenames = (library_filename, *filenames) - else: - exceptions.append( - 'no library called "{}" was found'.format(library_name)) @@ -52,10 +47,8 @@ index 307d58c..43c29e3 100644 + lib = ffi.dlopen(path) + if lib: + return lib -+ + + raise OSError("dlopen() failed to load a library: %s as %s" % (library_name, path)) - - + cairo = dlopen( --- -2.19.2 + ffi, ('cairo-2', 'cairo', 'libcairo-2'), diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index 2fe52ed11b86..f4dbf575be2d 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "can"; - version = "4.3.1"; + version = "4.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "hardbyte"; repo = "python-can"; rev = "refs/tags/v${version}"; - hash = "sha256-t2zt54nPOYcEE0RPb4fbW7sN4HzFXlDIHvHudstBwrM="; + hash = "sha256-p3B1LWSygDX0UhIx4XhXv15H7Hwn9UB20jFIPDZnuNs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index 4a5bf0062193..90351fd00776 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "canopen"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XxhlG5325HabmILpafk0rnc+8kpFqrwzNLWGmCBI0Iw="; + hash = "sha256-eSCEqTwTjVsqQG3dLU61ziCPA72P2mD4GtK7jVbGuCc="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index ce7063adcd51..74035c9bef30 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -4,19 +4,24 @@ capstone, stdenv, setuptools, - pythonAtLeast, + fetchpatch, }: buildPythonPackage rec { pname = "capstone"; version = lib.getVersion capstone; - format = "setuptools"; - - # distutils usage - disabled = pythonAtLeast "3.12"; src = capstone.src; sourceRoot = "${src.name}/bindings/python"; + patches = [ + # Drop distutils in python binding (PR 2271) + (fetchpatch { + name = "drop-distutils-in-python-binding.patch"; + url = "https://github.com/capstone-engine/capstone/commit/d63211e3acb64fceb8b1c4a0d804b4b027f4ef71.patch"; + hash = "sha256-zUGeFmm3xH5dzfPJE8nnHwqwFBrsZ7w8LBJAy20/3RI="; + stripLen = 2; + }) + ]; # libcapstone.a is not built with BUILD_SHARED_LIBS. For some reason setup.py # checks if it exists but it is not really needed. Most likely a bug in setup.py. diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix deleted file mode 100644 index 3271bd8e0179..000000000000 --- a/pkgs/development/python-modules/case/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pynose, - pythonOlder, - pythonRelaxDepsHook, - setuptools, - six, -}: - -buildPythonPackage rec { - pname = "case"; - version = "1.5.3"; - pyproject = true; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - sha256 = "48432b01d91913451c3512c5b90e31b0f348f1074b166a3431085eb70d784fb1"; - }; - - build-system = [ - setuptools - pythonRelaxDepsHook - ]; - - pythonRemoveDeps = [ - # replaced with pynopse for python 3.12 compat - "nose" - ]; - - dependencies = [ - pynose - six - ]; - - # No real unittests, only coverage - doCheck = false; - - pythonImportsCheck = [ "case" ]; - - meta = with lib; { - homepage = "https://github.com/celery/case"; - description = "Utilities for unittests handling"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/catppuccin/default.nix b/pkgs/development/python-modules/catppuccin/default.nix index 3256f83e3108..2726aa4f98de 100644 --- a/pkgs/development/python-modules/catppuccin/default.nix +++ b/pkgs/development/python-modules/catppuccin/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, poetry-core, poetry-dynamic-versioning, + matplotlib, pygments, rich, pytestCheckHook, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "catppuccin"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "catppuccin"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-+V1rln3FlFvs1FEIANIch7k/b2EsI9xBxhg3Bwg99+I="; + hash = "sha256-1CPNs+n9S7fV+EvhFWBwnv6/N3UWQ/jiyRcn4XKzmd8="; }; build-system = [ @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; optional-dependencies = { + matplotlib = [ matplotlib ]; pygments = [ pygments ]; rich = [ rich ]; }; diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index ce8bf6257cfb..319d7feb44fa 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.6.3"; + version = "5.6.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-5vCuJ1HC0zOpYOCAfAYRSU6xJFYxoWeWWsvBAFCUVdM="; + hash = "sha256-HFM8UN3oa+8caVBgIFSg/6PDduiw4gx7j1sQh5P2mD4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index a741b914c161..460ac35b5351 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -10,7 +10,6 @@ pytest-mock, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, requests-mock, responses, @@ -38,7 +37,6 @@ buildPythonPackage rec { build-system = [ poetry-core - pythonRelaxDepsHook ]; dependencies = [ diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index e0e24ed03d27..a922e5a69d29 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "certbot"; - version = "2.9.0"; + version = "2.11.0"; pyproject = true; src = fetchFromGitHub { owner = "certbot"; repo = "certbot"; rev = "refs/tags/v${version}"; - hash = "sha256-yYB9Y0wniRgzNk5XatkjKayIPj7ienXsqOboKPwzIfk="; + hash = "sha256-Qee7lUjgliG5fmUWWPm3MzpGJHUF/DXZ08UA6kkWjjk="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index f7ee7ccd1831..2ed4c9407ac0 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.9.1"; + version = "0.9.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,17 +29,17 @@ buildPythonPackage rec { owner = "xarray-contrib"; repo = "cf-xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-Og84lB99576G3IZz8LNafF86TyYP+ooe2tL8wb60RPw="; + hash = "sha256-7eL8z2r1+X80QqiL/5XzfA+Jlx+WuKvuxIWG4YLCwfg="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm wheel xarray ]; - propagatedBuildInputs = [ xarray ]; + dependencies = [ xarray ]; passthru.optional-dependencies = { all = [ @@ -66,11 +66,11 @@ buildPythonPackage rec { "cf_xarray/tests/test_helpers.py" ]; - meta = with lib; { + meta = { description = "Accessor for xarray objects that interprets CF attributes"; homepage = "https://github.com/xarray-contrib/cf-xarray"; changelog = "https://github.com/xarray-contrib/cf-xarray/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 7d03ab82c7bc..83c955b3c1c0 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, isPyPy, fetchPypi, + fetchpatch2, setuptools, pytestCheckHook, libffi, @@ -12,6 +13,9 @@ pythonAtLeast, }: +let + ccVersion = lib.getVersion stdenv.cc; +in if isPyPy then null else @@ -38,10 +42,23 @@ else # deemed safe to trust in cffi. # ./darwin-use-libffi-closures.diff + + (fetchpatch2 { + # https://github.com/python-cffi/cffi/pull/34 + name = "python-3.13-compat-1.patch"; + url = "https://github.com/python-cffi/cffi/commit/49127c6929bfc7186fbfd3819dd5e058ad888de4.patch"; + hash = "sha256-RbspsjwDf4uwJxMqG0JZGvipd7/JqXJ2uVB7PO4Qcms="; + }) + (fetchpatch2 { + # https://github.com/python-cffi/cffi/pull/24 + name = "python-3.13-compat-2.patch"; + url = "https://github.com/python-cffi/cffi/commit/14723b0bbd127790c450945099db31018d80fa83.patch"; + hash = "sha256-H5rFgRRTr27l5S6REo8+7dmPDQW7WXhP4f4DGZjdi+s="; + }) ] - ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc) "13") [ + ++ lib.optionals (stdenv.cc.isClang && (ccVersion == "boot" || lib.versionAtLeast ccVersion "13")) [ # -Wnull-pointer-subtraction is enabled with -Wextra. Suppress it to allow the following tests - # to run and pass when cffi is built with newer versions of clang: + # to run and pass when cffi is built with newer versions of clang (including the bootstrap tools clang on Darwin): # - testing/cffi1/test_verify1.py::test_enum_usage # - testing/cffi1/test_verify1.py::test_named_pointer_as_argument ./clang-pointer-substraction-warning.diff diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index c2f90f4d52f2..0e182eafcd74 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.86.0"; + version = "0.87.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "aws-cloudformation"; repo = "cfn-lint"; rev = "refs/tags/v${version}"; - hash = "sha256-QkxCQ8YPRZSqAidmPus4JCgzez6uuRWvcaqfZsvugtY="; + hash = "sha256-em6Vi9zIn8ikmcHVbljA1vr+R3t8ZpJ57p3Ix3bqMYU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index f8689e4e6cef..739d828ef2e5 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.3"; + version = "1.6.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0Kayn3KhPwjgCLm+z/JHzHXISsshMzLt4Yh5xbaqTf0="; + hash = "sha256-4yVAYZN1in7WcwjetS5yd4KhnjhOGDN45/9iCYvgrtw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index fda91a8259dd..d3f0d7a0f427 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chameleon"; - version = "4.5.2"; + version = "4.5.4"; pyproject = true; src = fetchFromGitHub { owner = "malthe"; repo = "chameleon"; rev = "refs/tags/${version}"; - hash = "sha256-SVLKT6JeFUpF7gYkq3B7Lm9b9SG2qa6Ekp8i8xM0Xh0="; + hash = "sha256-TbXx3reRpUqnMVDsr38FM1SLgARjqXAduO3k87U5TIg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index ab0986a7dcab..f0f6ea8edcde 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, cheroot, - fetchpatch, fetchPypi, jaraco-collections, more-itertools, @@ -26,29 +25,17 @@ buildPythonPackage rec { pname = "cherrypy"; - version = "18.9.0"; + version = "18.10.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "CherryPy"; - inherit version; - hash = "sha256-awbBkc5xqGRh8wVyoatX/8CfQxQ7qOQsEDx7M0ciDrE="; + inherit pname version; + hash = "sha256-bHDnjuETAOiyHAdnxUKuaxAqScrFz9Tj4xPXu5B8WJE="; }; - patches = [ - # Replace distutils.spawn.find_executable with shutil.which, https://github.com/cherrypy/cherrypy/pull/2023 - (fetchpatch { - name = "remove-distutils.patch"; - url = "https://github.com/cherrypy/cherrypy/commit/8a19dd5f1e712a326a3613b17e6fc900012ed09a.patch"; - hash = "sha256-fXECX0CdU74usiq9GEkIG9CF+dueszblT4qOeF6B700="; - }) - ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools_scm_git_archive >= 1.1",' "" # Disable doctest plugin because times out substituteInPlace pytest.ini \ --replace-fail "--doctest-modules" "-vvv" \ @@ -57,9 +44,9 @@ buildPythonPackage rec { sed -i "/--cov/d" pytest.ini ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ cheroot jaraco-collections more-itertools diff --git a/pkgs/development/python-modules/chroma-hnswlib/default.nix b/pkgs/development/python-modules/chroma-hnswlib/default.nix index 845f2064f1cd..52fe37696132 100644 --- a/pkgs/development/python-modules/chroma-hnswlib/default.nix +++ b/pkgs/development/python-modules/chroma-hnswlib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "chroma-hnswlib"; - version = "0.7.3"; + version = "0.7.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "hnswlib"; rev = "refs/tags/${version}"; - hash = "sha256-c4FvymqZy8AZKbh6Y8xZRjKAqYcUyZABRGc1u7vwlsk="; + hash = "sha256-KU/t37MZMFeNWPme+rgCHchZH7B8timIV2EH40laXkA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 867a380d7897..50cae5fb0108 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -33,7 +33,6 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, pyyaml, requests, rustc, @@ -75,7 +74,6 @@ buildPythonPackage rec { cargo pkg-config protobuf - pythonRelaxDepsHook rustc rustPlatform.cargoSetupHook setuptools diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index 5bc7a634de1a..e12dc6f3255e 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + attrs, duet, matplotlib, networkx, @@ -31,7 +32,7 @@ buildPythonPackage rec { pname = "cirq-core"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -40,7 +41,7 @@ buildPythonPackage rec { owner = "quantumlib"; repo = "cirq"; rev = "refs/tags/v${version}"; - hash = "sha256-JAJJciFg3BuRha1wTKixtKWcYy3NA2mNpniPyPHTTe8="; + hash = "sha256-KHwVq0qVtc8E9i2lugILYNwk9awq952w0x4DM+HG7Pg="; }; sourceRoot = "${src.name}/${pname}"; @@ -52,6 +53,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ + attrs duet matplotlib networkx diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix index e8e0366b78d9..b7b70b00afed 100644 --- a/pkgs/development/python-modules/cirq-google/default.nix +++ b/pkgs/development/python-modules/cirq-google/default.nix @@ -5,7 +5,6 @@ google-api-core, protobuf, pytestCheckHook, - pythonRelaxDepsHook, setuptools, }: @@ -17,7 +16,6 @@ buildPythonPackage rec { sourceRoot = "${src.name}/${pname}"; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index 991153a573ae..1643c6acfa47 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -9,7 +9,6 @@ poetry-core, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, toml, }: @@ -43,7 +42,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 1c7b15ca241f..7d9e7a65b726 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -13,7 +13,6 @@ pypdf, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, pyyaml, rich, schema, @@ -37,23 +36,18 @@ buildPythonPackage rec { hash = "sha256-zAjGVICrYgai6GFpcJyigKxn7kNEZKclggR5ktzrCQ0="; }; - pythonRelaxDeps = [ "clarifai-grpc" ]; - - pythonRemoveDeps = [ "opencv-python" ]; + pythonRelaxDeps = [ + "clarifai-grpc" + "schema" + ]; build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - dependencies = [ clarifai-grpc inquirerpy - llama-index-core numpy - opencv4 - pandas pillow - pypdf pyyaml rich schema @@ -75,6 +69,8 @@ buildPythonPackage rec { disabledTests = [ # Test requires network access and API key "test_export_workflow_general" + "test_validate_invalid_id" + "test_validate_invalid_hex_id" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 6b9108aea977..e905189e9c05 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -7,14 +7,13 @@ pysmt, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, setuptools, z3-solver, }: buildPythonPackage rec { pname = "claripy"; - version = "9.2.108"; + version = "9.2.109"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,14 +22,13 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-CTCgiwt/vMJugo1KS5zugbfwk/a3TeMX/ezk9wkMsoo="; + hash = "sha256-loDB5y5j8hVmQL2zZf/az6jsRJKRRNWlcRp2WjS90Hc="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail pythonRemoveDeps = [ "z3-solver" ]; build-system = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index ac93d8c9fb7e..e64548c36850 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -8,7 +8,6 @@ minidump, pefile, pyelftools, - pynose, pytestCheckHook, pythonOlder, pyvex, @@ -19,14 +18,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.108"; + version = "9.2.109"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-d3Hs3k7PmOZqvLoiHD9HctaEHHOafCefjUcKGBPIiHU="; + hash = "sha256-zuEDi4+qd5Inrd0t8StgnvrDnrYGvEPk/I5yxfEErYk="; }; in buildPythonPackage rec { @@ -40,11 +39,13 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-3zzTH6WKAavB/lkLBastOdeKegO8IyKRGN7k2vnX5WA="; + hash = "sha256-+4VJ1fqnYPvgiCmU/+aKM+7YZkvDbCMxbWO3YqnELA8="; }; build-system = [ setuptools ]; + pythonRelaxDeps = [ "pyvex" ]; + dependencies = [ archinfo cart @@ -58,7 +59,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pynose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index e29989fdb866..be805228302a 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -6,7 +6,6 @@ poetry-core, pytest-mock, pytestCheckHook, - pythonRelaxDepsHook, rapidfuzz, }: @@ -24,7 +23,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "rapidfuzz" ]; diff --git a/pkgs/development/python-modules/cli-ui/default.nix b/pkgs/development/python-modules/cli-ui/default.nix index 88f152a6fc59..ecd30ce3fc07 100644 --- a/pkgs/development/python-modules/cli-ui/default.nix +++ b/pkgs/development/python-modules/cli-ui/default.nix @@ -3,7 +3,6 @@ python3Packages, fetchPypi, pytestCheckHook, - pythonRelaxDepsHook, pythonOlder, poetry-core, colorama, @@ -24,7 +23,6 @@ python3Packages.buildPythonPackage rec { pythonRelaxDeps = [ "tabulate" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/clickhouse-cli/default.nix b/pkgs/development/python-modules/clickhouse-cli/default.nix index b444e17fbde4..15a700f684e1 100644 --- a/pkgs/development/python-modules/clickhouse-cli/default.nix +++ b/pkgs/development/python-modules/clickhouse-cli/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonRelaxDepsHook, setuptools, click, prompt-toolkit, @@ -22,7 +21,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index 967f1850c698..d5300b5499a8 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -24,7 +24,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.7.11"; + version = "0.7.12"; format = "setuptools"; @@ -34,7 +34,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; rev = "refs/tags/v${version}"; - hash = "sha256-Qh1F9dtDg19jr0ic3V+jH3pQczSMqVi7kxD6HG2llyA="; + hash = "sha256-UJSg/ADxVsO4xuym8NGjbgQafWmu7J3Is2hKvObYhU8="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 284e5a0eb53a..964b2724d07c 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -57,6 +57,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "ClusterShell" ]; + doCheck = false; # tests often get stuck + # Many tests want to open network connections # https://github.com/cea-hpc/clustershell#test-suite # diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix index 49ac02e6e92e..f0de12dcc8b3 100644 --- a/pkgs/development/python-modules/cmdstanpy/default.nix +++ b/pkgs/development/python-modules/cmdstanpy/default.nix @@ -5,7 +5,6 @@ fetchpatch, substituteAll, cmdstan, - pythonRelaxDepsHook, setuptools, pandas, numpy, @@ -18,14 +17,14 @@ buildPythonPackage rec { pname = "cmdstanpy"; - version = "1.2.3"; + version = "1.2.4"; pyproject = true; src = fetchFromGitHub { owner = "stan-dev"; repo = "cmdstanpy"; rev = "refs/tags/v${version}"; - hash = "sha256-PV7W1H4QYIOx1EHrGljrGUhCH1Y8ZPd9gEtCocc7x64="; + hash = "sha256-SKDqLvWbzaBcL13E87kcphBJNIZfdkPp2g4SIDEKA0U="; }; patches = [ @@ -47,7 +46,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index 0c2153af5710..e7c8e7072538 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "coconut"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; rev = "refs/tags/v${version}"; - hash = "sha256-xlA/yryUXZCU56gJ0y7M9JHgWkvXiB09ywyf0sP1o+4="; + hash = "sha256-AqKLSghuyha4wSaC/91bfNna7v8xyw8NLRWBjwu5Rjo="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index b71784091607..46aed51be299 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.3.4"; + version = "5.5.8"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tFoshbAl3RU2fWm/knSN5KMOyCq7Swj6UwG3LokFH+I="; + hash = "sha256-hM52Zv+PvfT0H7X2ykUqsmOaUUvIiWeihUqbG4INbqA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix index 74ca443929b6..6516cfce1687 100644 --- a/pkgs/development/python-modules/coincurve/default.nix +++ b/pkgs/development/python-modules/coincurve/default.nix @@ -2,49 +2,62 @@ lib, buildPythonPackage, fetchFromGitHub, - asn1crypto, - autoconf, - automake, - cffi, - libtool, + + # build-system + cmake, + hatchling, + ninja, pkg-config, - pytestCheckHook, - python, - pythonOlder, + setuptools, + scikit-build-core, + + # dependencies + asn1crypto, + cffi, secp256k1, + + # checks + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "coincurve"; - version = "19.0.1"; - format = "setuptools"; + version = "20.0.0"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ofek"; repo = "coincurve"; rev = "refs/tags/v${version}"; - hash = "sha256-T60iKRrc8/t86nqf8/R4971SjOw586YNCWWBuLd9MjM="; + hash = "sha256-NKx/iLuzFEu1UBuwa14x55Ab3laVAKEtX6dtoWi0dOg="; }; postPatch = '' - substituteInPlace setup.py \ - --replace ", 'requests'" "" - # don't try to load .dll files - rm coincurve/_windows_libsecp256k1.py cp -r --no-preserve=mode ${secp256k1.src} libsecp256k1 patchShebangs secp256k1/autogen.sh ''; - nativeBuildInputs = [ - autoconf - automake - libtool + build-system = [ + hatchling + cffi + cmake + ninja pkg-config + setuptools + scikit-build-core ]; - propagatedBuildInputs = [ + dontUseCmakeConfigure = true; + + env.COINCURVE_IGNORE_SYSTEM_LIB = "OFF"; + + buildInputs = [ secp256k1 ]; + + dependencies = [ asn1crypto cffi ]; diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index b7c9ef2a68d1..fe5bf7716e40 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -9,7 +9,6 @@ pytestCheckHook, python-dateutil, pythonOlder, - pythonRelaxDepsHook, requests, tqdm, typer, @@ -35,7 +34,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/comicon/default.nix b/pkgs/development/python-modules/comicon/default.nix index 932d6810ea3f..d42304712ef3 100644 --- a/pkgs/development/python-modules/comicon/default.nix +++ b/pkgs/development/python-modules/comicon/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - pythonRelaxDepsHook, pythonOlder, ebooklib, lxml, @@ -27,7 +26,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "pypdf" ]; diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 64be57156196..049cc4e09aa1 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -5,7 +5,7 @@ beautifulsoup4, buildPythonPackage, click, - fetchPypi, + fetchFromGitHub, pytest-xdist, pytestCheckHook, pythonAtLeast, @@ -18,14 +18,16 @@ buildPythonPackage rec { pname = "commoncode"; - version = "31.0.3"; + version = "31.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ura55/m/iesqN6kSYmdHB1sbthSHXaFWiQ76wVmyl0E="; + src = fetchFromGitHub { + owner = "nexB"; + repo = "commoncode"; + rev = "refs/tags/v${version}"; + hash = "sha256-4ZgyNlMj1i1fRru4wgDOyP3qzbne8D2eH/tFI60kgrE="; }; dontConfigure = true; @@ -46,6 +48,11 @@ buildPythonPackage rec { pytest-xdist ]; + preCheck = '' + # prevent readout of /etc/os-release during tests + sed -i "s/is_on_ubuntu_22()/lambda _: False/" src/commoncode/system.py + ''; + disabledTests = [ # chinese character translates different into latin diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix index aff927bfc6a8..4c99fc866c5d 100644 --- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix +++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonRelaxDepsHook, fetchFromGitHub, libmambapy, hatchling, @@ -21,7 +20,6 @@ buildPythonPackage rec { hash = "sha256-vsUYrDVNMKHd3mlaAFYCP4uPQ9HxeKsose5O8InaMcE="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ hatchling diff --git a/pkgs/development/python-modules/conda-package-handling/default.nix b/pkgs/development/python-modules/conda-package-handling/default.nix index 59736724577b..75ccc6039fff 100644 --- a/pkgs/development/python-modules/conda-package-handling/default.nix +++ b/pkgs/development/python-modules/conda-package-handling/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { pname = "conda-package-handling"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "conda"; repo = "conda-package-handling"; - rev = version; - hash = "sha256-WeGfmT6lLwcwhheLBPMFcVMudY+zPsvTuXuOsiEAorQ="; + rev = "refs/tags/${version}"; + hash = "sha256-Mo3qCNA/NtVtrsJmJ96ST6GMt2basSh5KlFBkrJ4pGE="; }; pyproject = true; diff --git a/pkgs/development/python-modules/conda-package-streaming/default.nix b/pkgs/development/python-modules/conda-package-streaming/default.nix index 931da36132c2..462660cce15f 100644 --- a/pkgs/development/python-modules/conda-package-streaming/default.nix +++ b/pkgs/development/python-modules/conda-package-streaming/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "conda-package-streaming"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "conda"; repo = "conda-package-streaming"; - rev = "v${version}"; - hash = "sha256-UTql2M+9eFDuHOwLYYKJ751wEcOfLJYzfU6+WF8Je2g="; + rev = "refs/tags/v${version}"; + hash = "sha256-3TSjVISnUTReyKtt58RXCD30VodhiDDfJssM3PkP5Yk="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index adebce0b2377..f9971372197a 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonRelaxDepsHook, hostPlatform, fetchFromGitHub, # build dependencies @@ -27,7 +26,7 @@ }: buildPythonPackage rec { pname = "conda"; - version = "24.4.0"; + version = "24.5.0"; pyproject = true; src = fetchFromGitHub { @@ -35,10 +34,9 @@ buildPythonPackage rec { owner = "conda"; repo = "conda"; rev = "refs/tags/${version}"; - hash = "sha256-LdoBlR5EFYd2mQIjOgp1MH3w6osfRfurPq+N5Y1iaFw="; + hash = "sha256-DbgdTaCMWf0d3MLEMGoWxN3x37tAtoW8T7mm5279yqk="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ hatchling diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 6c8373b3fad2..0e599c2945c3 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "connexion"; - version = "3.0.6"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "spec-first"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0EaJwxT80qLqlrxYk4H7Pf/UKq2pA/8HGL8OiqNA/2s="; + hash = "sha256-rngQDU9kXw/Z+Al0SCVnWN8xnphueTtZ0+xPBR5MbEM="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix index 8bfa583d7b42..430855c6f03e 100644 --- a/pkgs/development/python-modules/container-inspector/default.nix +++ b/pkgs/development/python-modules/container-inspector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "container-inspector"; - version = "32.0.1"; + version = "33.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "nexB"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-J9glnfs6l36/IQoIvE8a+Cw4B8x/6r5UeAU8+T/OiQg="; + hash = "sha256-vtC42yq59vTE+4tF5CSm9zszj8goOP5i6+NMF2n4T1Q="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix index 85c7d8539219..652fbbef7207 100644 --- a/pkgs/development/python-modules/contourpy/default.nix +++ b/pkgs/development/python-modules/contourpy/default.nix @@ -27,7 +27,7 @@ let contourpy = buildPythonPackage rec { pname = "contourpy"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ let owner = "contourpy"; repo = "contourpy"; rev = "refs/tags/v${version}"; - hash = "sha256-5yZrIwwe9dL5vtdSJnOhY9X4BdK/cdEY4DkVVjCq1uw="; + hash = "sha256-Qd6FC7SgFyC/BvOPWVkr2ZfKVMVAknLlidNRq3zcWU0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/convertertools/default.nix b/pkgs/development/python-modules/convertertools/default.nix new file mode 100644 index 000000000000..bf58e95a9e58 --- /dev/null +++ b/pkgs/development/python-modules/convertertools/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + + # build-system + cython, + poetry-core, + setuptools, + + # checks + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "convertertools"; + version = "0.5.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "bluetooth-devices"; + repo = "convertertools"; + rev = "v${version}"; + hash = "sha256-g4dSJjogMBC8wqvbYDjDP6YihxuG7PQn/jwrrBFOt80="; + }; + + postPatch = '' + sed -i "/--cov/d" pyproject.toml + ''; + + build-system = [ + cython + poetry-core + setuptools + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "convertertools" ]; + + meta = with lib; { + description = "Tools for converting python data types"; + homepage = "https://github.com/bluetooth-devices/convertertools"; + changelog = "https://github.com/bluetooth-devices/convertertools/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/conway-polynomials/default.nix b/pkgs/development/python-modules/conway-polynomials/default.nix index fdf3f76a122e..c89898e85107 100644 --- a/pkgs/development/python-modules/conway-polynomials/default.nix +++ b/pkgs/development/python-modules/conway-polynomials/default.nix @@ -2,17 +2,22 @@ lib, fetchPypi, buildPythonPackage, + setuptools, }: buildPythonPackage rec { pname = "conway-polynomials"; - version = "0.9"; + version = "0.10"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-btIwBgm8558BddW4VGhY7sAoVPi+MjfbjRRJzMzBxYE="; + pname = "conway_polynomials"; + inherit version; + hash = "sha256-T2GfZPgaPrFsTibFooT+7sJ6b0qtZHZD55ryiYAa4PM="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "conway_polynomials" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix index a4f745f63caa..91e9c603e13b 100644 --- a/pkgs/development/python-modules/correctionlib/default.nix +++ b/pkgs/development/python-modules/correctionlib/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "correctionlib"; - version = "2.6.0"; + version = "2.6.1"; pyproject = true; src = fetchFromGitHub { owner = "cms-nanoAOD"; repo = "correctionlib"; rev = "refs/tags/v${version}"; - hash = "sha256-RI0wL+/6aNCV9PZMY9ZLNFLVYPm9kAyxcvLzLLM/T3Y="; + hash = "sha256-mfNSETMjhLoa3MK7zPggz568j1T6ay42cKa1GGKKfT8="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 2c23c43fd65f..7e366cf49725 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "coverage"; - version = "7.4.4"; + version = "7.5.3"; pyproject = true; # uses f strings @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-yQHfg9CXZJ4lfoA74iWSrt/VGC8Hs8yH1kC7ua/VD0k="; + hash = "sha256-BK78pRkNHcelOkwaWn+FaIETBteo7iMcQvtpIVVxlE8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 2e2e23e44d65..c59dd631bf08 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -1,57 +1,62 @@ { buildPythonPackage, lib, - fetchPypi, - isPy27, + fetchFromGitHub, + + # build-system + poetry-core, + + # checks mock, - pytest, - pytest-runner, + pytestCheckHook, sh, coverage, docopt, requests, - urllib3, git, - isPy3k, + responses, }: buildPythonPackage rec { pname = "coveralls"; - version = "3.3.1"; - format = "setuptools"; - disabled = isPy27; + version = "4.0.1"; + pyproject = true; - # wanted by tests - src = fetchPypi { - inherit pname version; - sha256 = "b32a8bb5d2df585207c119d6c01567b81fba690c9c10a753bfe27a335bfc43ea"; + src = fetchFromGitHub { + owner = "TheKevJames"; + repo = "coveralls-python"; + rev = "refs/tags/${version}"; + hash = "sha256-1MjP99NykWNDyzWwZopLAzZ93vGX1mXEU+m+zvOBIZA="; }; + build-system = [ poetry-core ]; + + dependencies = [ + coverage + docopt + requests + ]; + nativeCheckInputs = [ mock sh - pytest + pytestCheckHook + responses git ]; - buildInputs = [ pytest-runner ]; - - postPatch = '' - sed -i "s/'coverage>=\([^,]\+\),.*',$/'coverage>=\1',/" setup.py + preCheck = '' + export PATH=${coverage}/bin:$PATH ''; - # FIXME: tests requires .git directory to be present - doCheck = false; - - checkPhase = '' - python setup.py test - ''; - - propagatedBuildInputs = [ - coverage - docopt - requests - ] ++ lib.optional (!isPy3k) urllib3; + disabledTests = [ + # requires .git in checkout + "test_git" + # try to run unwrapped python + "test_5" + "test_7" + "test_11" + ]; meta = { description = "Show coverage stats online via coveralls.io"; diff --git a/pkgs/development/python-modules/cpe/default.nix b/pkgs/development/python-modules/cpe/default.nix new file mode 100644 index 000000000000..97f617bbd674 --- /dev/null +++ b/pkgs/development/python-modules/cpe/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "cpe"; + version = "1.2.1"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "nilp0inter"; + repo = "cpe"; + rev = "refs/tags/v${version}"; + hash = "sha256-1hTOMbsL1089/yPZbAIs5OgjtEzCBlFv2hGi+u4hV/k="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "cpe" ]; + + disabledTests = [ + # Tests are outdated + "testfile_cpelang2" + "test_incompatible_versions" + "test_equals" + ]; + + meta = { + description = "Common platform enumeration for python"; + homepage = "https://github.com/nilp0inter/cpe"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ tochiaha ]; + }; +} diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index d37e4e4063bf..1d8f388f7881 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "craft-application"; - version = "2.6.3"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-application"; rev = "refs/tags/${version}"; - hash = "sha256-ZhZoR8O5oxcF8+zzihiIbiC/j3AkDL7AjaJSlZ0N48s="; + hash = "sha256-COcZgl2XzPWknSKMUZgZBEMzkDdwK2PouIEuWKOP8dc="; }; postPatch = '' @@ -44,7 +44,7 @@ buildPythonPackage rec { --replace-fail "dev" "${version}" substituteInPlace pyproject.toml \ - --replace-fail "setuptools==69.4.0" "setuptools" + --replace-fail "setuptools==" "setuptools>=" ''; build-system = [ diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index e4927e69612b..52954f8f0ddf 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "craft-providers"; - version = "1.23.1"; + version = "1.24.0"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-providers"; rev = "refs/tags/${version}"; - hash = "sha256-opVgOtbwZD+uQJ10Q8QlgQaS9KjRFnQ4h98Ak7Ze5qQ="; + hash = "sha256-CkaJ8taTsnBpCffe/Eu4/FGpMwKcg3yeLVAahCyEsII="; }; patches = [ @@ -52,10 +52,12 @@ buildPythonPackage rec { # The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69 # This is already patched in nixpkgs. substituteInPlace pyproject.toml \ - --replace-fail "setuptools==69.1.1" "setuptools" \ + --replace-fail "setuptools==" "setuptools>=" \ --replace-fail "urllib3<2" "urllib3" ''; + pythonRelaxDeps = [ "requests" ]; + nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/craft-store/default.nix b/pkgs/development/python-modules/craft-store/default.nix index 637e7ed26a9d..853df850c02a 100644 --- a/pkgs/development/python-modules/craft-store/default.nix +++ b/pkgs/development/python-modules/craft-store/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "craft-store"; - version = "2.6.0"; + version = "2.6.2"; pyproject = true; @@ -28,12 +28,12 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-store"; rev = "refs/tags/${version}"; - hash = "sha256-VtKOe3IrvGcNWfp1/tg1cO94xtfkP7AbIHh0WTdlfbQ="; + hash = "sha256-QKfXOgAWMV1mVm32ZP3HQTJmWKm82dEDmy3fo5d67TU="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==67.7.2" "setuptools" + --replace-fail "setuptools==" "setuptools>=" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cryptodatahub/default.nix b/pkgs/development/python-modules/cryptodatahub/default.nix index ae898e42b759..2c2bad80e21b 100644 --- a/pkgs/development/python-modules/cryptodatahub/default.nix +++ b/pkgs/development/python-modules/cryptodatahub/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cryptodatahub"; - version = "0.12.4"; + version = "0.12.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "coroner"; repo = "cryptodatahub"; rev = "refs/tags/v${version}"; - hash = "sha256-+IGzXYSaeZjN5AxBu7jXgrnGtrtaSveFiVeNQRBZMNg="; + hash = "sha256-jYMzvh4tgfLS7Za0MYHbWbczptAvENfzfTEV9Drlfto="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix index 56af4ceb5901..98f3ce9ce8ab 100644 --- a/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -19,15 +19,14 @@ buildPythonPackage rec { pname = "cryptolyzer"; - version = "0.12.3"; + version = "0.12.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "CryptoLyzer"; - inherit version; - hash = "sha256-UdM0+PkO3K4XshcqaDkEKry6Spny9KMZAHiADxxth+c="; + inherit pname version; + hash = "sha256-Qc1L4F2U/nk37s/mIa2YgJZqC2dkPsB/Si84SEl576Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index 61efe59f0637..c0e28720423a 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "cryptoparser"; - version = "0.12.4"; + version = "0.12.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-y5rpc0tn5JJQr4xdRUJbsq8XT/YqqJqZr3CXjqN7k7I="; + hash = "sha256-t8vK7T6nz1iH81fTMEYkQv7E7EjmkTx3u4zUIybEm5E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix index 55ac4c5489fc..7e4447546446 100644 --- a/pkgs/development/python-modules/cssutils/default.nix +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, - pythonAtLeast, pythonOlder, fetchFromGitHub, setuptools-scm, + more-itertools, cssselect, jaraco-test, lxml, @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "cssutils"; - version = "2.10.2"; + version = "2.11.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,11 +24,13 @@ buildPythonPackage rec { owner = "jaraco"; repo = "cssutils"; rev = "refs/tags/v${version}"; - hash = "sha256-1sAn6pFwWsnYS1eHQmyDNGTo6kdhL1vJBwUptADvHyo="; + hash = "sha256-U9myMfKz1HpYVJXp85izRBpm2wjLHYZj8bUVt3ROTEg="; }; build-system = [ setuptools-scm ]; + dependencies = [ more-itertools ]; + nativeCheckInputs = [ cssselect jaraco-test diff --git a/pkgs/development/python-modules/ctap-keyring-device/default.nix b/pkgs/development/python-modules/ctap-keyring-device/default.nix index 656e5f04456c..a18241658b01 100644 --- a/pkgs/development/python-modules/ctap-keyring-device/default.nix +++ b/pkgs/development/python-modules/ctap-keyring-device/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonRelaxDepsHook, setuptools-scm, # install requirements fido2, @@ -40,7 +39,6 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools-scm ]; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 2388e215d929..8c042a9a965e 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -21,9 +21,8 @@ let name = "cudatoolkit-joined-${cudaPackages.cudaVersion}"; paths = with cudaPackages; [ cuda_cccl # - cuda_cccl.dev cuda_cudart - cuda_nvcc.dev # + cuda_nvcc # cuda_nvprof cuda_nvrtc cuda_nvtx @@ -41,14 +40,14 @@ let in buildPythonPackage rec { pname = "cupy"; - version = "13.0.0"; + version = "13.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LwTnhX9pKnEzYNycOwZwmAarhAT8o5ta+XIcBKKXmq4="; + hash = "sha256-5NvSsu1BWaXMDA+YpxCgFJUOssFu60VelWEo87O9DVE="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index d418b3b3c304..bc6ebb6820c8 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -12,15 +12,15 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "6.15.16"; + version = "7.1.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "cx_Freeze"; + pname = "cx_freeze"; inherit version; - hash = "sha256-xjmRiG/ypTGfjw0HwDSaa74aZbXzIPi5JDiI5jyaSiI="; + hash = "sha256-M1wwutDj5lNlXyMJkzCEWL7cmXuvW3qZXoZB3rousoc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 30629ee89e91..1dec71571003 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -9,7 +9,6 @@ lxml, packageurl-python, py-serializable, - pythonRelaxDepsHook, poetry-core, pytestCheckHook, pythonOlder, @@ -24,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "7.4.1"; + version = "7.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -33,12 +32,11 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-ATeSMS8WaJS/2CaeNQgaK/6zyQBw07+6YYTZdhZPJug="; + hash = "sha256-yBBtE9DfHzUNXHMCo3KoUAAsvkBshczmVtMCUTtQ9zg="; }; build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ importlib-metadata diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 1ba1c24413fb..d76fd3049cfe 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "2.8.0"; + version = "2.9.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; rev = "refs/tags/v${version}"; - hash = "sha256-g16BqbL2WOsMO7PlzTfVR8Ftf32VR8QtvBw1ZNTIOZQ="; + hash = "sha256-8D9HBWotn15fkHlwpXcpsC0VmaD7JuD0XVRJGRj1Ijg="; }; build-system = [ diff --git a/pkgs/development/python-modules/cypherpunkpay/default.nix b/pkgs/development/python-modules/cypherpunkpay/default.nix index cb4233883d37..8228274ee171 100644 --- a/pkgs/development/python-modules/cypherpunkpay/default.nix +++ b/pkgs/development/python-modules/cypherpunkpay/default.nix @@ -16,7 +16,6 @@ pysocks, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, tzlocal, waitress, @@ -50,7 +49,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 99bf5858bf68..09d4749c0978 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -14,7 +14,6 @@ pyarrow, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, typing-extensions, uproot, }: @@ -38,7 +37,6 @@ buildPythonPackage rec { build-system = [ hatch-vcs hatchling - pythonRelaxDepsHook ]; dependencies = [ diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 78577b34d939..31380317f054 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -11,11 +11,12 @@ pyarrow, distributed, pytestCheckHook, + xarray }: buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.6"; + version = "1.1.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-O0s7jrxjTkIAb6zW+NuG1PPHhRHndcLt11uYNyknO4A="; + hash = "sha256-3wQhADDS05soZq+oy75eBXIK0JQhochrRmtIqykuvOA="; }; postPatch = '' @@ -49,6 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ distributed pytestCheckHook + xarray ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 2f6ffeff4ecd..6b96c3d2199a 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -66,12 +66,23 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # AttributeError: 'csr_matrix' object has no attribute 'A' + # Fixed in https://github.com/dask/dask-ml/pull/996 + "tests/test_svd.py" + ]; + + disabledTests = [ + # Flaky: `Arrays are not almost equal to 3 decimals` (although values do actually match) + "test_whitening" + ]; + __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Scalable Machine Learn with Dask"; homepage = "https://github.com/dask/dask-ml"; - license = licenses.bsd3; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index c4988b4c8c5b..ce78dd686404 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -41,7 +41,7 @@ let self = buildPythonPackage rec { pname = "dask"; - version = "2024.6.2"; + version = "2024.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -50,7 +50,7 @@ let owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-5jG9hx1tZkqLwjWF73Fm2oJBuejbq4a7GP9fMd8hRJg="; + hash = "sha256-EvDn7i4GOEHYwhptYF+2yKUb3VDWjR7/WCUGKEJi/H4="; }; build-system = [ diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index fdbee91fdae4..00a67be18575 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -12,14 +12,13 @@ pyarrow, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, sqlalchemy, thrift, }: buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +27,7 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-LiA+zZuhPPXgBb8B1vZ/PuAYMrBXzxgd1CXwugf0mk8="; + hash = "sha256-Sk/tYgFnWWHAsMSHhEUIwUagc6femAzQpQGyzJGXW1E="; }; pythonRelaxDeps = [ @@ -38,7 +37,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dataprep-ml/default.nix b/pkgs/development/python-modules/dataprep-ml/default.nix index a8e24c9bc2a1..df952df2bd0a 100644 --- a/pkgs/development/python-modules/dataprep-ml/default.nix +++ b/pkgs/development/python-modules/dataprep-ml/default.nix @@ -12,7 +12,6 @@ pydateinfer, python-dateutil, pythonOlder, - pythonRelaxDepsHook, scipy, symlinkJoin, type-infer, @@ -44,7 +43,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 6c3c9b11434a..3718c4db7eab 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.19.1"; + version = "2.20.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GicQopfQ6Ih9VEcLPAPlkvYAo2+aRqiFP1iGRM8/9m0="; + hash = "sha256-9mB4RXJVkmaK+fLEmyZAdf64YKGoAhE3RzMoj4/8K98="; }; # remove pyarrow<14.0.1 vulnerability fix diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 199634e5c475..d5976e2a9291 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.64.7"; + version = "0.64.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-MxTCVgV0xDKXiYOx6rh5v55uQqlf9Wd06wHfnhDS4Hk="; + hash = "sha256-Nt/e0j1mF5Qkpp/dRa9W7En1WoGD2MsR3iREv9IQu5E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 45f009df98ad..1fc9b1e80de0 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.16.1"; + version = "0.16.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Wy8d1Eje/OIG7MFumWD+k3jzIwfqH8sMKYwiwU9YyIE="; + hash = "sha256-eJmXm0wa26a0/S6GyqP175TE5qsjTLtzBspr/iQ/xN8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix new file mode 100644 index 000000000000..ad2616490319 --- /dev/null +++ b/pkgs/development/python-modules/dbt-adapters/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + agate, + dbt-common, + mashumaro, + protobuf, + pytz, + typing-extensions, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "dbt-adapters"; + version = "1.3.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = "dbt-adapters"; + rev = "refs/tags/v${version}"; + hash = "sha256-Erx/j1x+I4ypPqBFzJRZk3ILr3ZG97Hvk4vXe2p6cDc="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + agate + dbt-common + mashumaro + protobuf + pytz + typing-extensions + ] ++ mashumaro.optional-dependencies.msgpack; + + pythonImportsCheck = [ "dbt.adapters" ]; + + # circular dependencies + doCheck = false; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "The set of adapter protocols and base functionality that supports integration with dbt-core"; + homepage = "https://github.com/dbt-labs/dbt-adapters"; + changelog = "https://github.com/dbt-labs/dbt-adapters/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/dbt-bigquery/default.nix b/pkgs/development/python-modules/dbt-bigquery/default.nix index 6de783f936a6..d04bf2788b60 100644 --- a/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -9,14 +9,13 @@ google-cloud-storage, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, setuptools, urllib3, }: buildPythonPackage rec { pname = "dbt-bigquery"; - version = "1.7.8"; + version = "1.8.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,13 +24,12 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-bigquery"; rev = "refs/tags/v${version}"; - hash = "sha256-Uc842hkrCYDR92ACDtNW+Iqq5l54CSp40D1tOL7wt8o="; + hash = "sha256-5sqKvYXKBze6t0yNaeYvwyS919CHMXCv3RRzNnBxfec="; }; pythonRelaxDeps = [ "agate" ]; build-system = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix new file mode 100644 index 000000000000..be1246264845 --- /dev/null +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -0,0 +1,65 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + agate, + colorama, + isodate, + jinja2, + jsonschema, + mashumaro, + pathspec, + protobuf, + python-dateutil, + requests, + typing-extensions, + pytest-mock, + pytest-xdist, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "dbt-common"; + version = "1.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = "dbt-common"; + rev = "refs/tags/v${version}"; + hash = "sha256-3UjwQy257ks21fQV0uZNKu5EsuzjlIAEcVtRWkR9x/4="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + agate + colorama + isodate + jinja2 + jsonschema + mashumaro + pathspec + protobuf + python-dateutil + requests + typing-extensions + ] ++ mashumaro.optional-dependencies.msgpack; + + pythonImportsCheck = [ "dbt_common" ]; + + nativeCheckInputs = [ + pytest-mock + pytest-xdist + pytestCheckHook + ]; + + meta = { + description = "Shared common utilities for dbt-core and adapter implementations use"; + homepage = "https://github.com/dbt-labs/dbt-common"; + changelog = "https://github.com/dbt-labs/dbt-common/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 2de11c94934d..0d2437e47f0b 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -2,15 +2,13 @@ lib, agate, buildPythonPackage, - cffi, click, - colorama, + daff, + dbt-adapters, + dbt-common, dbt-extractor, dbt-semantic-interfaces, fetchFromGitHub, - hologram, - idna, - isodate, jinja2, logbook, mashumaro, @@ -21,20 +19,17 @@ protobuf, python3, pythonOlder, - pythonRelaxDepsHook, pytz, pyyaml, requests, setuptools, sqlparse, typing-extensions, - urllib3, - werkzeug, }: buildPythonPackage rec { pname = "dbt-core"; - version = "1.7.14"; + version = "1.8.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -43,7 +38,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-core"; rev = "refs/tags/v${version}"; - hash = "sha256-4PydrJGhriGCB6oc4kQE8/a24Sn9cqZhoKsiBJuEDYM="; + hash = "sha256-W1bD/XUmBYKzx66/rO//lCG+LOwDSlOW/KQPs0+cKTI="; }; sourceRoot = "${src.name}/core"; @@ -51,6 +46,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "agate" "click" + "dbt-semantic-interfaces" "mashumaro" "networkx" "logbook" @@ -59,20 +55,17 @@ buildPythonPackage rec { ]; build-system = [ - pythonRelaxDepsHook setuptools ]; dependencies = [ agate - cffi click - colorama + daff + dbt-adapters + dbt-common dbt-extractor dbt-semantic-interfaces - hologram - idna - isodate jinja2 logbook mashumaro @@ -86,8 +79,6 @@ buildPythonPackage rec { requests sqlparse typing-extensions - urllib3 - werkzeug ] ++ mashumaro.optional-dependencies.msgpack; # tests exist for the dbt tool but not for this package specifically diff --git a/pkgs/development/python-modules/dbt-postgres/default.nix b/pkgs/development/python-modules/dbt-postgres/default.nix index 8cca80c11285..f3503eac82d0 100644 --- a/pkgs/development/python-modules/dbt-postgres/default.nix +++ b/pkgs/development/python-modules/dbt-postgres/default.nix @@ -2,28 +2,39 @@ lib, agate, buildPythonPackage, + fetchFromGitHub, + dbt-adapters, + dbt-common, dbt-core, + hatchling, psycopg2, pythonOlder, - setuptools, }: -buildPythonPackage { +buildPythonPackage rec { pname = "dbt-postgres"; + version = "1.8.2"; pyproject = true; - inherit (dbt-core) version src; + disabled = pythonOlder "3.8"; - disabled = pythonOlder "3.7"; - - sourceRoot = "${dbt-core.src.name}/plugins/postgres"; + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = "dbt-postgres"; + rev = "refs/tags/v${version}"; + hash = "sha256-E7Y2lY8aCiAZx5sLWwpOBLTrdOsCQAdWWJTvR2jGOaA="; + }; env.DBT_PSYCOPG2_NAME = "psycopg2"; - build-system = [ setuptools ]; + build-system = [ hatchling ]; + + pythonRemoveDeps = [ "psycopg2-binary" ]; dependencies = [ agate + dbt-adapters + dbt-common dbt-core psycopg2 ]; diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index b30c787a9324..b818182d13b0 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -8,14 +8,13 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, redshift-connector, setuptools, }: buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.7.7"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +23,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-redshift"; rev = "refs/tags/v${version}"; - hash = "sha256-DKqJ/8hEPe9O9YrAjrTL2Gh1lj6QrdtHtd7aarZ7GkQ="; + hash = "sha256-XTAWCJ+aTFrAuggS3dbR9X08/x9ypXgE8tlWTaOmyRc="; }; pythonRelaxDeps = [ @@ -32,7 +31,6 @@ buildPythonPackage rec { "redshift-connector" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 1abaa554e9a2..5f6a9d41fc4d 100644 --- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -6,7 +6,6 @@ dbt-postgres, fetchFromGitHub, hatchling, - pythonRelaxDepsHook, hypothesis, importlib-metadata, jinja2, @@ -21,7 +20,7 @@ buildPythonPackage rec { pname = "dbt-semantic-interfaces"; - version = "0.4.4"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,14 +29,13 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-semantic-interfaces"; rev = "refs/tags/v${version}"; - hash = "sha256-uvwcnOKjwxEmA+/QRGSRofpoE4jZzmE02mGSDLINrJw="; + hash = "sha256-77WKfegchgHIxgzL3Yhtx/4S5pYi6HeVCQH/19YscWA="; }; pythonRelaxDeps = [ "importlib-metadata" ]; build-system = [ hatchling - pythonRelaxDepsHook ]; dependencies = [ diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix index 5f46ad88e038..17e9cd092709 100644 --- a/pkgs/development/python-modules/dbt-snowflake/default.nix +++ b/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbt-snowflake"; - version = "1.7.3"; + version = "1.8.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-snowflake"; rev = "refs/tags/v${version}"; - hash = "sha256-ksnLQdoXR8KVtYTFdlaWT8UYjAsLNyEVVap/QHtm+j8="; + hash = "sha256-jvhjf+Ce/oyHXFxMryz5Uy6Hq5Sx6vKgaGEJVAzqSdA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dbus-deviation/default.nix b/pkgs/development/python-modules/dbus-deviation/default.nix index c804f94bc1b9..f49197cc90fc 100644 --- a/pkgs/development/python-modules/dbus-deviation/default.nix +++ b/pkgs/development/python-modules/dbus-deviation/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { homepage = "https://tecnocode.co.uk/dbus-deviation/"; description = "Project for parsing D-Bus introspection XML and processing it in various ways"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index e26f2a522e17..f018af1bce0c 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.21.3"; + version = "2.22.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "dbus-fast"; rev = "refs/tags/v${version}"; - hash = "sha256-Wmv6R/aOBFPSzTVEElYsg/CrywB/pAYPWZBsMhpqtFQ="; + hash = "sha256-WT32nkRcS+JFCJCZNXXFm38nzttYLsqU98tJD7YBn9w="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/deal-solver/default.nix b/pkgs/development/python-modules/deal-solver/default.nix index 4657d0f21d9a..8acefba226a8 100644 --- a/pkgs/development/python-modules/deal-solver/default.nix +++ b/pkgs/development/python-modules/deal-solver/default.nix @@ -8,7 +8,6 @@ astroid, pytestCheckHook, hypothesis, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -27,7 +26,6 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core - pythonRelaxDepsHook ]; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 697758093fef..4b002da52acf 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "8.0.0"; + version = "8.1.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-iAUGk7ErRG7ZgvjbmEZRLAOFlMHKZ/iM8pkwAtFla2E="; + hash = "sha256-q52dMygpBzL92yW8DFIKpjxykGqW86CNM1xqxGf/JJ0="; }; build-system = [ diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index e16fd6e90cc3..af4500ffd580 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "6.7.1"; + version = "7.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = "refs/tags/${version}"; - hash = "sha256-YGYprSC5j06Ozg0dUJN5xnba0HUgiXa+d9Ci3czGWoY="; + hash = "sha256-HqmAE5sLwyjyUahIUeRIJW0c5eliq/qEzE2FydHwc70="; }; postPatch = '' diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index ee23d66e59d7..ce997d1fcb82 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -1,27 +1,38 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, + lxml, python, }: buildPythonPackage rec { pname = "defusedxml"; - version = "0.7.1"; - format = "setuptools"; + version = "0.8.0rc2"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"; + src = fetchFromGitHub { + owner = "tiran"; + repo = "defusedxml"; + rev = "refs/tags/v${version}"; + hash = "sha256-X88A5V9uXP3wJQ+olK6pZJT66LP2uCXLK8goa5bPARA="; }; + build-system = [ setuptools ] ; + + nativeCheckInputs = [ lxml ]; + checkPhase = '' + runHook preCheck ${python.interpreter} tests.py + runHook postCheck ''; pythonImportsCheck = [ "defusedxml" ]; meta = with lib; { + changelog = "https://github.com/tiran/defusedxml/blob/v${version}/CHANGES.txt"; description = "Python module to defuse XML issues"; homepage = "https://github.com/tiran/defusedxml"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/deltalake/default.nix b/pkgs/development/python-modules/deltalake/default.nix new file mode 100644 index 000000000000..ef0dae99acb6 --- /dev/null +++ b/pkgs/development/python-modules/deltalake/default.nix @@ -0,0 +1,82 @@ +{ lib +, buildPythonPackage +, fetchPypi +, rustPlatform +, pyarrow +, pyarrow-hotfix +, openssl +, stdenv +, darwin +, libiconv +, pkg-config +, pytestCheckHook +, pytest-benchmark +, pytest-cov +, pandas +}: + +buildPythonPackage rec { + pname = "deltalake"; + version = "0.18.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-qkmCKk1VnROK7luuPlKbIx3S3C8fzGJy8yhTyZWXyGc="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-Dj2vm0l4b/E6tbXgs5iPvbDAsxNW0iPUSRPzT5KaA3Y="; + }; + + env.OPENSSL_NO_VENDOR = 1; + + dependencies = [ + pyarrow + pyarrow-hotfix + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + libiconv + ]; + + nativeBuildInputs = [ + pkg-config # openssl-sys needs this + ] ++ (with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]); + + pythonImportsCheck = [ "deltalake" ]; + + nativeCheckInputs = [ + pytestCheckHook + pandas + pytest-benchmark + pytest-cov + ]; + + preCheck = '' + # For paths in test to work, we have to be in python dir + cp pyproject.toml python/ + cd python + + # In tests we want to use deltalake that we have built + rm -rf deltalake + ''; + + pytestFlagsArray = [ "-m 'not integration'" ]; + + meta = with lib; { + description = "Native Rust library for Delta Lake, with bindings into Python"; + homepage = "https://github.com/delta-io/delta-rs"; + changelog = "https://github.com/delta-io/delta-rs/blob/python-v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ kfollesdal mslingsby harvidsen andershus ]; + }; +} diff --git a/pkgs/development/python-modules/demetriek/default.nix b/pkgs/development/python-modules/demetriek/default.nix index b51e463c67f0..2a9a466c9ab0 100644 --- a/pkgs/development/python-modules/demetriek/default.nix +++ b/pkgs/development/python-modules/demetriek/default.nix @@ -12,7 +12,6 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, yarl, }: @@ -54,7 +53,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 2cd72f29655b..5f113865c388 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -31,6 +31,8 @@ buildPythonPackage rec { hash = "sha256-VxoRK1qeGrIunsiCzeZJUHxW/sxk+PFpntInL+G/yI8="; }; + pythonRelaxDeps = [ "defusedxml" ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix index 9fa8cb8d1590..a678a2bb69de 100644 --- a/pkgs/development/python-modules/detect-secrets/default.nix +++ b/pkgs/development/python-modules/detect-secrets/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "detect-secrets"; - version = "1.4.0"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Yelp"; repo = pname; - rev = "v${version}"; - hash = "sha256-6EmL6XPySqcA3EA+FFkfw7Dkxl5LvyBorIw0hesV5eU="; + rev = "refs/tags/v${version}"; + hash = "sha256-pNLAZUJhjZ3b01XaltJUJ9O7Blv6/pHQrRvURe7MJ5A="; leaveDotGit = true; }; diff --git a/pkgs/development/python-modules/detectron2/default.nix b/pkgs/development/python-modules/detectron2/default.nix index 944ff80850cf..2247b4581a4d 100644 --- a/pkgs/development/python-modules/detectron2/default.nix +++ b/pkgs/development/python-modules/detectron2/default.nix @@ -3,7 +3,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, ninja, which, # build inputs @@ -72,7 +71,6 @@ buildPythonPackage { ''; nativeBuildInputs = [ - pythonRelaxDepsHook ninja which ]; diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 6a414f9cabb9..a9d34cd2f0bb 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -19,23 +19,22 @@ pytest-xdist, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, scipy, sympy, }: buildPythonPackage rec { pname = "devito"; - version = "4.8.7"; + version = "4.8.8"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "devitocodes"; repo = "devito"; rev = "refs/tags/v${version}"; - hash = "sha256-UEj3WXRBaEOMX+wIDUjE6AP30QSSBUJHzNh3Kp/2AkE="; + hash = "sha256-j+If/yYj85c8GpSo/fq5MfxVHQlo/4+Qh+Bn1N/9nd4="; }; pythonRemoveDeps = [ @@ -47,7 +46,6 @@ buildPythonPackage rec { pythonRelaxDeps = true; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ anytree diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 7f5ab1ef7422..e83e9d88d724 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -13,14 +13,15 @@ buildPythonPackage rec { pname = "devpi-common"; - version = "4.0.3"; + version = "4.0.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-+OAbT23wgPYihMzljFuxzh6GmwwjSqx60TVgl0X8Fz0="; + pname = "devpi_common"; + inherit version; + hash = "sha256-I1oKmkXJblTGC6a6L3fYVs+Q8aacG+6UmIfp7cA6Qcw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index ff1ef2e64b42..6330d0653795 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "9.0.0"; + version = "9.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-HchR0/PzIMBI0DYY5MDZhh+koVBrQl0tCaVksgyVZ0o="; + hash = "sha256-xsn38erNkBnRGMr7dZCERcqkGnn2Xzb59QbJYm28vHA="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/diffsync/default.nix b/pkgs/development/python-modules/diffsync/default.nix index f5ffb2dfbd06..28ea4eb3a9f5 100644 --- a/pkgs/development/python-modules/diffsync/default.nix +++ b/pkgs/development/python-modules/diffsync/default.nix @@ -6,7 +6,6 @@ packaging, poetry-core, pydantic, - pythonRelaxDepsHook, redis, structlog, }: @@ -25,7 +24,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index 3eb3f6137ab7..4ef707184fe3 100644 --- a/pkgs/development/python-modules/diffusers/default.nix +++ b/pkgs/development/python-modules/diffusers/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "diffusers"; - version = "0.29.0"; + version = "0.29.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "diffusers"; rev = "refs/tags/v${version}"; - hash = "sha256-sC/vstc7347ofNWESiUnvRsfAu/sKzlNV3lTPTuqUkY="; + hash = "sha256-RJQo+2lZ863nP9ZCQbntfuxDI+elB0RJ5E8zGs65E2A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 73f022e97eaa..7102f03e869a 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -30,7 +30,6 @@ dissect-xfs, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, setuptools, setuptools-scm, }: @@ -56,7 +55,6 @@ buildPythonPackage rec { setuptools-scm ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ dissect-archive diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index f282e0bb5504..8455b4506268 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -11,7 +11,6 @@ packaging, psutil, pythonOlder, - pythonRelaxDepsHook, pyyaml, setuptools, setuptools-scm, @@ -26,7 +25,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2024.6.2"; + version = "2024.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +34,7 @@ buildPythonPackage rec { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-GgW9BtTqjac+olAGg+LOO+lTopuUukVUmQ0ZWsMJOc8="; + hash = "sha256-Nf/TOLqBaYhezXcBJPMvBwkP+cH5BnN5rxGqLMAb/8U="; }; postPatch = '' @@ -45,7 +44,6 @@ buildPythonPackage rec { ''; build-system = [ - pythonRelaxDepsHook setuptools setuptools-scm versioneer diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix index cbf1502bfde9..aec84b910291 100644 --- a/pkgs/development/python-modules/dj-database-url/default.nix +++ b/pkgs/development/python-modules/dj-database-url/default.nix @@ -1,24 +1,33 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, django, pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "dj-database-url"; - version = "2.1.0"; - format = "setuptools"; + version = "2.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-8gQs7+EIblOcnaOfrVrX9hFzv3lmXmm/fk3lX6iLE18="; + src = fetchFromGitHub { + owner = "jazzband"; + repo = "dj-database-url"; + rev = "refs/tags/v${version}"; + hash = "sha256-i2btutob+5R+FFPlGwRSNF01MTfxVop8xaePDHxnqLE="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ + django + typing-extensions + ]; # Tests access a DB via network doCheck = false; diff --git a/pkgs/development/python-modules/django-admin-sortable2/default.nix b/pkgs/development/python-modules/django-admin-sortable2/default.nix index ae9b84536f93..22ef40ac2f69 100644 --- a/pkgs/development/python-modules/django-admin-sortable2/default.nix +++ b/pkgs/development/python-modules/django-admin-sortable2/default.nix @@ -8,14 +8,15 @@ buildPythonPackage rec { pname = "django-admin-sortable2"; - version = "2.1.10"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit version pname; - hash = "sha256-N1awLH0JxbN+/mV3GNWq4rdfRv0Bu/4cOdTmBlEBnXk="; + pname = "django_admin_sortable2"; + inherit version; + hash = "sha256-MKlSf5P8YbeixZVNtX2EKJMeN/Riw7RssQEFPcX1F1E="; }; propagatedBuildInputs = [ django_4 ]; diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index f7f15c540a99..85b44d4523a9 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -3,7 +3,6 @@ lib, buildPythonPackage, fetchPypi, - pythonRelaxDepsHook, django, funcy, redis, @@ -31,7 +30,6 @@ buildPythonPackage rec { hash = "sha256-d6N8c9f6z8cpk2XtZqEr56SH3XRd2GwdM8ouv9OzKHg="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "funcy" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-celery-beat/default.nix b/pkgs/development/python-modules/django-celery-beat/default.nix index f46ce7c36b9d..a66912ee09fc 100644 --- a/pkgs/development/python-modules/django-celery-beat/default.nix +++ b/pkgs/development/python-modules/django-celery-beat/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - case, celery, cron-descriptor, django-timezone-field, @@ -42,7 +41,6 @@ buildPythonPackage rec { ephem pytest-timeout pytest-django - case pytestCheckHook ]; diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix index 086987f4dabc..668c36f5deda 100644 --- a/pkgs/development/python-modules/django-compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonRelaxDepsHook, # build-system setuptools, @@ -26,18 +25,17 @@ buildPythonPackage rec { pname = "django-compressor"; - version = "4.4"; + version = "4.5"; pyproject = true; src = fetchPypi { pname = "django_compressor"; inherit version; - hash = "sha256-GwrMnPup9pvDjnxB2psNcKILyVWHtkP/75YJz0YGT2c="; + hash = "sha256-nZjJBbdBvmywmtgowdIqn/kkTdCII+KSavjd0YccPGU="; }; build-system = [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index a198b7dfff03..27c0974e2311 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, buildPythonPackage, + setuptools, django, pytest-django, pytestCheckHook, @@ -9,23 +10,27 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.13.0"; - format = "setuptools"; + version = "4.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; - repo = "django-cors-headers"; + repo = pname; rev = version; - hash = "sha256-pIyf4poW8/slxj4PVvmXpuYp//v5w00yU0Vz6Jiy2yM="; + hash = "sha256-/uTQ09zIjRV1Ilb/mXyr4zn5tJI/mNFHpfql2ptuER4="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; nativeCheckInputs = [ pytest-django pytestCheckHook ]; + pythonImportsCheck = [ "corsheaders" ]; + meta = with lib; { description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers"; homepage = "https://github.com/OttoYiu/django-cors-headers"; diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index 20e4c5d7e1eb..99bb0afb9178 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "4.3"; + version = "4.4.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8rwEM+YSO9TtkC1UWS4JrzFH+TlGOHzL+WmxNwMJIWQ="; + hash = "sha256-ZfGDXyrHwlFpeGK1QTD4nlGWdbEK7+hurOVkAAp/LyA="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 54f01c14c48f..8e10c4c1f567 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -2,13 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, + fetchpatch2, # build-system setuptools, # dependencies + aiosmtpd, django, + looseversion, # tests factory-boy, @@ -27,25 +29,37 @@ buildPythonPackage rec { version = "3.2.3"; pyproject = true; - # https://github.com/django-extensions/django-extensions/issues/1831 - # Requires asyncore, which was dropped in 3.12 - disabled = pythonAtLeast "3.12"; - - src = fetchFromGitHub { + src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; hash = "sha256-A2+5FBv0IhTJPkwgd7je+B9Ac64UHJEa3HRBbWr2FxM="; }; + patches = [ + (fetchpatch2 { + # Replace dead asyncore, smtp implementation with aiosmtpd + name = "django-extensions-aiosmtpd.patch"; + url = "https://github.com/django-extensions/django-extensions/commit/37d56c4a4704c823ac6a4ef7c3de4c0232ceee64.patch"; + hash = "sha256-49UeJQKO0epwY/7tqoiHgOXdgPcB/JBIZaCn3ulaHTg="; + }) + ]; + postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov=django_extensions --cov-report html --cov-report term" "" + --replace-fail "--cov=django_extensions --cov-report html --cov-report term" "" + + substituteInPlace django_extensions/management/commands/pipchecker.py \ + --replace-fail "from distutils.version" "from looseversion" ''; build-system = [ setuptools ]; - dependencies = [ django ]; + dependencies = [ + aiosmtpd + django + looseversion + ]; __darwinAllowLocalNetworking = true; @@ -61,6 +75,11 @@ buildPythonPackage rec { werkzeug ]; + disabledTests = [ + # Mismatch in expectation of exception message + "test_installed_apps_no_resolve_conflicts_function" + ]; + disabledTestPaths = [ # requires network access "tests/management/commands/test_pipchecker.py" diff --git a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix index 60a3ed0de63e..63140be2e28b 100644 --- a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix @@ -3,11 +3,19 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system poetry-core, + + # dependencies django, django-debug-toolbar, graphene-django, + + # tests python, + pytest-django, + pytestCheckHook }: buildPythonPackage rec { @@ -33,17 +41,19 @@ buildPythonPackage rec { pythonImportsCheck = [ "graphiql_debug_toolbar" ]; - DB_BACKEND = "sqlite"; - DB_NAME = ":memory:"; - DJANGO_SETTINGS_MODULE = "tests.settings"; + nativeCheckInputs = [ + pytest-django + pytestCheckHook + ]; - checkPhase = '' - runHook preCheck - ${python.interpreter} -m django test tests - runHook postCheck + preCheck = '' + export DB_BACKEND=sqlite + export DB_NAME=:memory: + export DJANGO_SETTINGS_MODULE=tests.settings ''; meta = with lib; { + changelog = "https://github.com/flavors/django-graphiql-debug-toolbar/releases/tag/${src.rev}"; description = "Django Debug Toolbar for GraphiQL IDE"; homepage = "https://github.com/flavors/django-graphiql-debug-toolbar"; license = licenses.mit; diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index 32839d246c33..8b49b0014b92 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -14,7 +14,6 @@ # tests elasticsearch, geopy, - nose, pysolr, python-dateutil, requests, @@ -23,42 +22,36 @@ buildPythonPackage rec { pname = "django-haystack"; - version = "3.2.1"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { - inherit pname version; - hash = "sha256-l+MZeu/CJf5AW28XYAolNL+CfLTWdDEwwgvBoG9yk6Q="; + pname = "django_haystack"; + inherit version; + hash = "sha256-487ta4AAYl2hTUCetNrGmJSQXirIrBj5v9tZMjygLqs="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "geopy==" "geopy>=" - ''; - - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; buildInputs = [ django ]; - passthru.optional-dependencies = { + optional-dependencies = { elasticsearch = [ elasticsearch ]; }; - doCheck = lib.versionOlder django.version "4"; - nativeCheckInputs = [ geopy - nose pysolr python-dateutil requests whoosh - ] ++ passthru.optional-dependencies.elasticsearch; + ] ++ optional-dependencies.elasticsearch; + checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix index 76641bd9cbc8..420475a54e8a 100644 --- a/pkgs/development/python-modules/django-health-check/default.nix +++ b/pkgs/development/python-modules/django-health-check/default.nix @@ -7,6 +7,8 @@ django, redis, celery, + boto3, + django-storages, pytest-django, pytestCheckHook, mock, @@ -15,14 +17,14 @@ buildPythonPackage rec { pname = "django-health-check"; - version = "3.18.1"; + version = "3.18.2"; format = "setuptools"; src = fetchFromGitHub { owner = "KristianOellegaard"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4fl7x0pleI1yL+tEWGt5Gmcl6ZKETQz2AsNQDVIAwy8="; + hash = "sha256-c0JOfbuVIiTqZo/alJWPN7AB8a3nNdG7euS3scwGHaY="; }; buildInputs = [ @@ -36,6 +38,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + boto3 + django-storages pytest-django pytestCheckHook mock diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 8ca641ad75e5..6d29cacb8c54 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -6,10 +6,10 @@ nix-update-script, # build-system - gettext, + flit-gettext, + flit-scm, nodejs, npmHooks, - setuptools-scm, # dependencies django, @@ -21,58 +21,52 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.4.5"; - format = "setuptools"; + version = "3.5.4"; + pyproject = true; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; rev = "refs/tags/${version}"; - hash = "sha256-FXh5OFMTjsKgjEeIS+CiOwyGOs4AisJA+g49rCILDsQ="; + hash = "sha256-d8rKn4Hab7y/e/VLhVfr3A3TUhoDtjP7RhCj+o6IbyE="; }; postPatch = '' - substituteInPlace setup.py \ - --replace 'cmd = ["npm", "ci"]' 'cmd = ["true"]' \ - --replace 'f"{self.build_lib}/{name}.mo"' 'f"{name}.mo"' + sed -i "/addopts/d" pyproject.toml - sed -i "/addopts/d" setup.cfg + # missing integrity hashes for yocto-queue, yargs-parser + cp ${./package-lock.json} package-lock.json ''; npmDeps = fetchNpmDeps { - inherit src; - hash = "sha256-cZEr/7FW4vCR8gpraT+/rPwYK9Xn22b5WH7lnuK5L4U="; + inherit src postPatch; + hash = "sha256-npAFpdqGdttE4facBimS/y2SqwnCvOHJhd60SPR/IaA="; }; - nativeBuildInputs = [ - gettext + build-system = [ + flit-gettext + flit-scm nodejs npmHooks.npmConfigHook - setuptools-scm ]; - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; nativeCheckInputs = [ pytestCheckHook pytest-django ]; - env.DJANGO_SETTINGS_MODULE = "hijack.tests.test_app.settings"; - - pytestFlagsArray = [ - "--pyargs" - "hijack" - "-W" - "ignore::DeprecationWarning" - ]; + preCheck = '' + export DJANGO_SETTINGS_MODULE=hijack.tests.test_app.settings + ''; # needed for npmDeps update passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Allows superusers to hijack (=login as) and work on behalf of another user"; - homepage = "https://github.com/arteria/django-hijack"; + homepage = "https://github.com/django-hijack/django-hijack"; changelog = "https://github.com/django-hijack/django-hijack/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ris ]; diff --git a/pkgs/development/python-modules/django-hijack/package-lock.json b/pkgs/development/python-modules/django-hijack/package-lock.json new file mode 100644 index 000000000000..74de400e4d82 --- /dev/null +++ b/pkgs/development/python-modules/django-hijack/package-lock.json @@ -0,0 +1,7875 @@ +{ + "name": "django-hijack", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "django-hijack", + "version": "1.0.0", + "license": "MIT", + "devDependencies": { + "jest": "*", + "jest-environment-jsdom": "*", + "standard": "*", + "stylelint": "*", + "stylelint-config-standard-scss": "*", + "stylelint-scss": "*" + } + }, + "node_modules/@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz", + "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz", + "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.7", + "@babel/helper-compilation-targets": "^7.24.7", + "@babel/helper-module-transforms": "^7.24.7", + "@babel/helpers": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/template": "^7.24.7", + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/generator": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz", + "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.24.7", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz", + "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.24.7", + "@babel/helper-validator-option": "^7.24.7", + "browserslist": "^4.22.2", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-environment-visitor": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz", + "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==", + "dev": true, + "dependencies": { + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-function-name": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz", + "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==", + "dev": true, + "dependencies": { + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-hoist-variables": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz", + "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==", + "dev": true, + "dependencies": { + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", + "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", + "dev": true, + "dependencies": { + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz", + "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==", + "dev": true, + "dependencies": { + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-module-imports": "^7.24.7", + "@babel/helper-simple-access": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-plugin-utils": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz", + "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-simple-access": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", + "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", + "dev": true, + "dependencies": { + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz", + "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz", + "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz", + "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz", + "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==", + "dev": true, + "dependencies": { + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.24.7", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/@babel/highlight/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/parser": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz", + "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==", + "dev": true, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.12.13" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz", + "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-typescript": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz", + "integrity": "sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/template": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz", + "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz", + "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.7", + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-function-name": "^7.24.7", + "@babel/helper-hoist-variables": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7", + "debug": "^4.3.1", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/types": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz", + "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true + }, + "node_modules/@csstools/css-parser-algorithms": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.7.0.tgz", + "integrity": "sha512-qvBMcOU/uWFCH/VO0MYe0AMs0BGMWAt6FTryMbFIKYtZtVnqTZtT8ktv5o718llkaGZWomJezJZjq3vJDHeJNQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": "^14 || ^16 || >=18" + }, + "peerDependencies": { + "@csstools/css-tokenizer": "^2.3.2" + } + }, + "node_modules/@csstools/css-tokenizer": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.3.2.tgz", + "integrity": "sha512-0xYOf4pQpAaE6Sm2Q0x3p25oRukzWQ/O8hWVvhIt9Iv98/uu053u2CGm/g3kJ+P0vOYTAYzoU8Evq2pg9ZPXtw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": "^14 || ^16 || >=18" + } + }, + "node_modules/@csstools/media-query-list-parser": { + "version": "2.1.12", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.12.tgz", + "integrity": "sha512-t1/CdyVJzOQUiGUcIBXRzTAkWTFPxiPnoKwowKW2z9Uj78c2bBWI/X94BeVfUwVq1xtCjD7dnO8kS6WONgp8Jw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": "^14 || ^16 || >=18" + }, + "peerDependencies": { + "@csstools/css-parser-algorithms": "^2.7.0", + "@csstools/css-tokenizer": "^2.3.2" + } + }, + "node_modules/@csstools/selector-specificity": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz", + "integrity": "sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": "^14 || ^16 || >=18" + }, + "peerDependencies": { + "postcss-selector-parser": "^6.0.13" + } + }, + "node_modules/@dual-bundle/import-meta-resolve": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz", + "integrity": "sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", + "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/eslintrc/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@eslint/eslintrc/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true + }, + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "dependencies": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/console": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", + "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/core": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", + "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", + "dev": true, + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^29.7.0", + "jest-config": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-resolve-dependencies": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "jest-watcher": "^29.7.0", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/environment": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", + "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", + "dev": true, + "dependencies": { + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", + "dev": true, + "dependencies": { + "expect": "^29.7.0", + "jest-snapshot": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/expect-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", + "dev": true, + "dependencies": { + "jest-get-type": "^29.6.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/fake-timers": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", + "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@sinonjs/fake-timers": "^10.0.2", + "@types/node": "*", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/globals": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", + "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/types": "^29.6.3", + "jest-mock": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/reporters": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", + "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", + "dev": true, + "dependencies": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "@types/node": "*", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^6.0.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "slash": "^3.0.0", + "string-length": "^4.0.1", + "strip-ansi": "^6.0.0", + "v8-to-istanbul": "^9.0.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/source-map": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", + "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", + "dev": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.18", + "callsites": "^3.0.0", + "graceful-fs": "^4.2.9" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/test-result": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", + "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", + "dev": true, + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/test-sequencer": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", + "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", + "dev": true, + "dependencies": { + "@jest/test-result": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/transform": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", + "dev": true, + "dependencies": { + "@babel/core": "^7.11.6", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "dev": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true + }, + "node_modules/@sinonjs/commons": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", + "dev": true, + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^3.0.0" + } + }, + "node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@types/babel__core": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.6.8", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", + "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz", + "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==", + "dev": true, + "dependencies": { + "@babel/types": "^7.20.7" + } + }, + "node_modules/@types/graceful-fs": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", + "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true + }, + "node_modules/@types/istanbul-lib-report": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", + "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", + "dev": true, + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } + }, + "node_modules/@types/istanbul-reports": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", + "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", + "dev": true, + "dependencies": { + "@types/istanbul-lib-report": "*" + } + }, + "node_modules/@types/jsdom": { + "version": "20.0.1", + "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz", + "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==", + "dev": true, + "dependencies": { + "@types/node": "*", + "@types/tough-cookie": "*", + "parse5": "^7.0.0" + } + }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true + }, + "node_modules/@types/node": { + "version": "20.14.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", + "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } + }, + "node_modules/@types/stack-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", + "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", + "dev": true + }, + "node_modules/@types/tough-cookie": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz", + "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==", + "dev": true + }, + "node_modules/@types/yargs": { + "version": "17.0.32", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", + "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "21.0.3", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", + "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", + "dev": true + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, + "node_modules/abab": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", + "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", + "deprecated": "Use your platform's native atob() and btoa() methods instead", + "dev": true + }, + "node_modules/acorn": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz", + "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-globals": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz", + "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==", + "dev": true, + "dependencies": { + "acorn": "^8.1.0", + "acorn-walk": "^8.0.2" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.3.3", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz", + "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==", + "dev": true, + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-includes": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/array.prototype.findlast": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", + "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz", + "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.toreversed": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz", + "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", + "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", + "is-shared-array-buffer": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true + }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/babel-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", + "dev": true, + "dependencies": { + "@jest/transform": "^29.7.0", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^29.6.3", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.8.0" + } + }, + "node_modules/babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "dependencies": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-jest-hoist": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", + "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", + "dev": true, + "dependencies": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.1.14", + "@types/babel__traverse": "^7.0.6" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/babel-preset-current-node-syntax": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", + "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", + "dev": true, + "dependencies": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.8.3", + "@babel/plugin-syntax-import-meta": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-top-level-await": "^7.8.3" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/babel-preset-jest": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", + "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", + "dev": true, + "dependencies": { + "babel-plugin-jest-hoist": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browserslist": { + "version": "4.23.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz", + "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "caniuse-lite": "^1.0.30001629", + "electron-to-chromium": "^1.4.796", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.16" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/bser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "dev": true, + "dependencies": { + "node-int64": "^0.4.0" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, + "node_modules/builtins": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", + "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", + "dev": true, + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/builtins/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/call-bind": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001639", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001639.tgz", + "integrity": "sha512-eFHflNTBIlFwP2AIKaYuBQN/apnUoKNhBdza8ZnW/h2di4LCZ4xFqYlxUxo+LQ76KFI1PGcC1QDxMbxTZpSCAg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ] + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "engines": { + "node": ">=8" + } + }, + "node_modules/cjs-module-lexer": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz", + "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==", + "dev": true + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "dev": true, + "engines": { + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" + } + }, + "node_modules/collect-v8-coverage": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", + "dev": true + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/colord": { + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", + "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", + "dev": true + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "node_modules/cosmiconfig": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", + "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", + "dev": true, + "dependencies": { + "env-paths": "^2.2.1", + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/cosmiconfig/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/cosmiconfig/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/create-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", + "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "prompts": "^2.0.1" + }, + "bin": { + "create-jest": "bin/create-jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/css-functions-list": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.2.tgz", + "integrity": "sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==", + "dev": true, + "engines": { + "node": ">=12 || >=16" + } + }, + "node_modules/css-tree": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", + "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", + "dev": true, + "dependencies": { + "mdn-data": "2.0.30", + "source-map-js": "^1.0.1" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" + } + }, + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "dev": true, + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/cssom": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", + "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==", + "dev": true + }, + "node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dev": true, + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true + }, + "node_modules/data-urls": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", + "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", + "dev": true, + "dependencies": { + "abab": "^2.0.6", + "whatwg-mimetype": "^3.0.0", + "whatwg-url": "^11.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/data-view-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", + "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", + "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", + "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/debug": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", + "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decimal.js": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", + "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", + "dev": true + }, + "node_modules/dedent": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", + "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", + "dev": true, + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/diff-sequences": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "dev": true, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/domexception": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", + "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", + "deprecated": "Use your platform's native DOMException instead", + "dev": true, + "dependencies": { + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.4.815", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.815.tgz", + "integrity": "sha512-OvpTT2ItpOXJL7IGcYakRjHCt8L5GrrN/wHCQsRB4PQa1X9fe+X9oen245mIId7s14xvArCGSTIq644yPUKKLg==", + "dev": true + }, + "node_modules/emittery": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sindresorhus/emittery?sponsor=1" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es-abstract": { + "version": "1.23.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", + "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.3", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "data-view-buffer": "^1.0.1", + "data-view-byte-length": "^1.0.1", + "data-view-byte-offset": "^1.0.0", + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.0.3", + "es-to-primitive": "^1.2.1", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.4", + "get-symbol-description": "^1.0.2", + "globalthis": "^1.0.3", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", + "has-symbols": "^1.0.3", + "hasown": "^2.0.2", + "internal-slot": "^1.0.7", + "is-array-buffer": "^3.0.4", + "is-callable": "^1.2.7", + "is-data-view": "^1.0.1", + "is-negative-zero": "^2.0.3", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.3", + "is-string": "^1.0.7", + "is-typed-array": "^1.1.13", + "is-weakref": "^1.0.2", + "object-inspect": "^1.13.1", + "object-keys": "^1.1.1", + "object.assign": "^4.1.5", + "regexp.prototype.flags": "^1.5.2", + "safe-array-concat": "^1.1.2", + "safe-regex-test": "^1.0.3", + "string.prototype.trim": "^1.2.9", + "string.prototype.trimend": "^1.0.8", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.2", + "typed-array-byte-length": "^1.0.1", + "typed-array-byte-offset": "^1.0.2", + "typed-array-length": "^1.0.6", + "unbox-primitive": "^1.0.2", + "which-typed-array": "^1.1.15" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-iterator-helpers": { + "version": "1.0.19", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz", + "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.3", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "globalthis": "^1.0.3", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.7", + "iterator.prototype": "^1.1.2", + "safe-array-concat": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", + "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", + "dev": true, + "dependencies": { + "hasown": "^2.0.0" + } + }, + "node_modules/es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/escalade": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "dev": true, + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/eslint": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": "^8.0.1", + "eslint-plugin-import": "^2.25.2", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", + "eslint-plugin-promise": "^6.0.0" + } + }, + "node_modules/eslint-config-standard-jsx": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz", + "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "peerDependencies": { + "eslint": "^8.8.0", + "eslint-plugin-react": "^7.28.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dev": true, + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz", + "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==", + "dev": true, + "dependencies": { + "debug": "^3.2.7" + }, + "engines": { + "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-es": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", + "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", + "dev": true, + "dependencies": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", + "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.8.0", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", + "semver": "^6.3.1", + "tsconfig-paths": "^3.15.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-n": { + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", + "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "dev": true, + "dependencies": { + "builtins": "^5.0.1", + "eslint-plugin-es": "^4.1.0", + "eslint-utils": "^3.0.0", + "ignore": "^5.1.1", + "is-core-module": "^2.11.0", + "minimatch": "^3.1.2", + "resolve": "^1.22.1", + "semver": "^7.3.8" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-n/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-plugin-promise": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.2.0.tgz", + "integrity": "sha512-QmAqwizauvnKOlifxyDj2ObfULpHQawlg/zQdgEixur9vl0CvZGv/LCJV2rtj3210QCoeGBzVMfMXqGAOr/4fA==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.34.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz", + "integrity": "sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.8", + "array.prototype.findlast": "^1.2.5", + "array.prototype.flatmap": "^1.3.2", + "array.prototype.toreversed": "^1.1.2", + "array.prototype.tosorted": "^1.1.4", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.0.19", + "estraverse": "^5.3.0", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.8", + "object.fromentries": "^2.0.8", + "object.hasown": "^1.1.4", + "object.values": "^1.2.0", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.5", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.11" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" + } + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/eslint/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/eslint/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/esquery": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", + "dev": true, + "dependencies": { + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "node_modules/fastest-levenshtein": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", + "dev": true, + "engines": { + "node": ">= 4.9.1" + } + }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/fb-watchman": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "dev": true, + "dependencies": { + "bser": "2.1.1" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "dev": true + }, + "node_modules/for-each": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.3" + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/function.prototype.name": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/global-modules": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", + "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", + "dev": true, + "dependencies": { + "global-prefix": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/global-prefix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", + "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", + "dev": true, + "dependencies": { + "ini": "^1.3.5", + "kind-of": "^6.0.2", + "which": "^1.3.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/global-prefix/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", + "dev": true, + "dependencies": { + "define-properties": "^1.2.1", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globjoin": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz", + "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==", + "dev": true + }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true + }, + "node_modules/has-bigints": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/html-encoding-sniffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", + "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", + "dev": true, + "dependencies": { + "whatwg-encoding": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, + "node_modules/html-tags": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz", + "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "dev": true, + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dev": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true, + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ignore": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-fresh/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/import-local": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", + "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", + "dev": true, + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "dev": true + }, + "node_modules/internal-slot": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0", + "hasown": "^2.0.0", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, + "node_modules/is-async-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", + "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, + "dependencies": { + "has-bigints": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz", + "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==", + "dev": true, + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-data-view": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", + "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", + "dev": true, + "dependencies": { + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-finalizationregistry": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", + "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-generator-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/is-generator-function": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", + "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-negative-zero": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-number-object": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", + "dev": true + }, + "node_modules/is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", + "dev": true, + "dependencies": { + "which-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", + "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", + "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", + "dev": true, + "dependencies": { + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-instrument/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dev": true, + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-reports": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", + "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", + "dev": true, + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/iterator.prototype": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", + "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", + "dev": true, + "dependencies": { + "define-properties": "^1.2.1", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "reflect.getprototypeof": "^1.0.4", + "set-function-name": "^2.0.1" + } + }, + "node_modules/jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", + "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", + "dev": true, + "dependencies": { + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", + "import-local": "^3.0.2", + "jest-cli": "^29.7.0" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-changed-files": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", + "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", + "dev": true, + "dependencies": { + "execa": "^5.0.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-circus": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", + "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^1.0.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^29.7.0", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0", + "pretty-format": "^29.7.0", + "pure-rand": "^6.0.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-cli": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", + "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", + "dev": true, + "dependencies": { + "@jest/core": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "create-jest": "^29.7.0", + "exit": "^0.1.2", + "import-local": "^3.0.2", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "yargs": "^17.3.1" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-config": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", + "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", + "dev": true, + "dependencies": { + "@babel/core": "^7.11.6", + "@jest/test-sequencer": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-jest": "^29.7.0", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-circus": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "micromatch": "^4.0.4", + "parse-json": "^5.2.0", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@types/node": "*", + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "ts-node": { + "optional": true + } + } + }, + "node_modules/jest-diff": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-docblock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", + "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", + "dev": true, + "dependencies": { + "detect-newline": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-each": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", + "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", + "jest-util": "^29.7.0", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-environment-jsdom": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz", + "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/jsdom": "^20.0.0", + "@types/node": "*", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0", + "jsdom": "^20.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jest-environment-node": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", + "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-get-type": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "dev": true, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" + } + }, + "node_modules/jest-leak-detector": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", + "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", + "dev": true, + "dependencies": { + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-matcher-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-message-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^29.6.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-mock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", + "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-pnp-resolver": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", + "dev": true, + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "jest-resolve": "*" + }, + "peerDependenciesMeta": { + "jest-resolve": { + "optional": true + } + } + }, + "node_modules/jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", + "dev": true, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-resolve": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", + "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "resolve": "^1.20.0", + "resolve.exports": "^2.0.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-resolve-dependencies": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", + "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", + "dev": true, + "dependencies": { + "jest-regex-util": "^29.6.3", + "jest-snapshot": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-runner": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", + "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", + "dev": true, + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/environment": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-leak-detector": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-resolve": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-util": "^29.7.0", + "jest-watcher": "^29.7.0", + "jest-worker": "^29.7.0", + "p-limit": "^3.1.0", + "source-map-support": "0.5.13" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-runtime": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", + "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/globals": "^29.7.0", + "@jest/source-map": "^29.6.3", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-snapshot": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", + "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", + "dev": true, + "dependencies": { + "@babel/core": "^7.11.6", + "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/types": "^7.3.3", + "@jest/expect-utils": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "natural-compare": "^1.4.0", + "pretty-format": "^29.7.0", + "semver": "^7.5.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-validate": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", + "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", + "leven": "^3.1.0", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-validate/node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/jest-watcher": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", + "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", + "dev": true, + "dependencies": { + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "jest-util": "^29.7.0", + "string-length": "^4.0.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-worker": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", + "dev": true, + "dependencies": { + "@types/node": "*", + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsdom": { + "version": "20.0.3", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz", + "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==", + "dev": true, + "dependencies": { + "abab": "^2.0.6", + "acorn": "^8.8.1", + "acorn-globals": "^7.0.0", + "cssom": "^0.5.0", + "cssstyle": "^2.3.0", + "data-urls": "^3.0.2", + "decimal.js": "^10.4.2", + "domexception": "^4.0.0", + "escodegen": "^2.0.0", + "form-data": "^4.0.0", + "html-encoding-sniffer": "^3.0.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.1", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.2", + "parse5": "^7.1.1", + "saxes": "^6.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.1.2", + "w3c-xmlserializer": "^4.0.0", + "webidl-conversions": "^7.0.0", + "whatwg-encoding": "^2.0.0", + "whatwg-mimetype": "^3.0.0", + "whatwg-url": "^11.0.0", + "ws": "^8.11.0", + "xml-name-validator": "^4.0.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true, + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsx-ast-utils": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/known-css-properties": { + "version": "0.31.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.31.0.tgz", + "integrity": "sha512-sBPIUGTNF0czz0mwGGUoKKJC8Q7On1GPbCSFPfyEsfHb2DyBG0Y4QtV+EVWpINSaiGKZblDNuF5AezxSgOhesQ==", + "dev": true + }, + "node_modules/leven": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, + "node_modules/load-json-file": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", + "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.15", + "parse-json": "^4.0.0", + "pify": "^4.0.1", + "strip-bom": "^3.0.0", + "type-fest": "^0.3.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/load-json-file/node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/load-json-file/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/load-json-file/node_modules/type-fest": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", + "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, + "node_modules/lodash.truncate": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", + "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", + "dev": true + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/makeerror": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", + "dev": true, + "dependencies": { + "tmpl": "1.0.5" + } + }, + "node_modules/mathml-tag-names": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", + "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/mdn-data": { + "version": "2.0.30", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", + "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", + "dev": true + }, + "node_modules/meow": { + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz", + "integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", + "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "dev": true, + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/nanoid": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "node_modules/node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "dev": true + }, + "node_modules/node-releases": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", + "dev": true + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nwsapi": { + "version": "2.2.10", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.10.tgz", + "integrity": "sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==", + "dev": true + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "has-symbols": "^1.0.3", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.entries": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", + "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", + "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.hasown": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz", + "integrity": "sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==", + "dev": true, + "dependencies": { + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.values": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", + "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-locate/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parse5": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", + "dev": true, + "dependencies": { + "entities": "^4.4.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/picocolors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", + "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", + "dev": true + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/pirates": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/pkg-conf": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz", + "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==", + "dev": true, + "dependencies": { + "find-up": "^3.0.0", + "load-json-file": "^5.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-conf/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/postcss": { + "version": "8.4.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz", + "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "nanoid": "^3.3.7", + "picocolors": "^1.0.1", + "source-map-js": "^1.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/postcss-media-query-parser": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", + "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", + "dev": true + }, + "node_modules/postcss-resolve-nested-selector": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", + "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==", + "dev": true + }, + "node_modules/postcss-safe-parser": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz", + "integrity": "sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss-safe-parser" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "engines": { + "node": ">=18.0" + }, + "peerDependencies": { + "postcss": "^8.4.31" + } + }, + "node_modules/postcss-scss": { + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz", + "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss-scss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "engines": { + "node": ">=12.0" + }, + "peerDependencies": { + "postcss": "^8.4.29" + } + }, + "node_modules/postcss-selector-parser": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz", + "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==", + "dev": true, + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/postcss-value-parser": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "dev": true + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "dev": true, + "dependencies": { + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dev": true, + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, + "node_modules/prop-types/node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "node_modules/psl": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", + "dev": true + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/pure-rand": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", + "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ] + }, + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "dev": true + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/react-is": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", + "dev": true + }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", + "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.1", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "globalthis": "^1.0.3", + "which-builtin-type": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", + "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "set-function-name": "^2.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "dev": true + }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve.exports": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", + "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-array-concat": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", + "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-regex-test": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-regex": "^1.1.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, + "node_modules/saxes": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", + "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", + "dev": true, + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=v12.22.7" + } + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/side-channel": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true + }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-js": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, + "node_modules/stack-utils": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", + "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz", + "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "eslint": "^8.41.0", + "eslint-config-standard": "17.1.0", + "eslint-config-standard-jsx": "^11.0.0", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-n": "^15.7.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-react": "^7.32.2", + "standard-engine": "^15.0.0", + "version-guard": "^1.1.1" + }, + "bin": { + "standard": "bin/cmd.cjs" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/standard-engine": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz", + "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "get-stdin": "^8.0.0", + "minimist": "^1.2.6", + "pkg-conf": "^3.1.0", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/string-length": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", + "dev": true, + "dependencies": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string.prototype.matchall": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", + "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.7", + "regexp.prototype.flags": "^1.5.2", + "set-function-name": "^2.0.2", + "side-channel": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", + "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", + "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/stylelint": { + "version": "16.6.1", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.6.1.tgz", + "integrity": "sha512-yNgz2PqWLkhH2hw6X9AweV9YvoafbAD5ZsFdKN9BvSDVwGvPh+AUIrn7lYwy1S7IHmtFin75LLfX1m0D2tHu8Q==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/stylelint" + }, + { + "type": "github", + "url": "https://github.com/sponsors/stylelint" + } + ], + "dependencies": { + "@csstools/css-parser-algorithms": "^2.6.3", + "@csstools/css-tokenizer": "^2.3.1", + "@csstools/media-query-list-parser": "^2.1.11", + "@csstools/selector-specificity": "^3.1.1", + "@dual-bundle/import-meta-resolve": "^4.1.0", + "balanced-match": "^2.0.0", + "colord": "^2.9.3", + "cosmiconfig": "^9.0.0", + "css-functions-list": "^3.2.2", + "css-tree": "^2.3.1", + "debug": "^4.3.4", + "fast-glob": "^3.3.2", + "fastest-levenshtein": "^1.0.16", + "file-entry-cache": "^9.0.0", + "global-modules": "^2.0.0", + "globby": "^11.1.0", + "globjoin": "^0.1.4", + "html-tags": "^3.3.1", + "ignore": "^5.3.1", + "imurmurhash": "^0.1.4", + "is-plain-object": "^5.0.0", + "known-css-properties": "^0.31.0", + "mathml-tag-names": "^2.1.3", + "meow": "^13.2.0", + "micromatch": "^4.0.7", + "normalize-path": "^3.0.0", + "picocolors": "^1.0.1", + "postcss": "^8.4.38", + "postcss-resolve-nested-selector": "^0.1.1", + "postcss-safe-parser": "^7.0.0", + "postcss-selector-parser": "^6.1.0", + "postcss-value-parser": "^4.2.0", + "resolve-from": "^5.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^7.1.0", + "supports-hyperlinks": "^3.0.0", + "svg-tags": "^1.0.0", + "table": "^6.8.2", + "write-file-atomic": "^5.0.1" + }, + "bin": { + "stylelint": "bin/stylelint.mjs" + }, + "engines": { + "node": ">=18.12.0" + } + }, + "node_modules/stylelint-config-recommended": { + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-14.0.1.tgz", + "integrity": "sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/stylelint" + }, + { + "type": "github", + "url": "https://github.com/sponsors/stylelint" + } + ], + "engines": { + "node": ">=18.12.0" + }, + "peerDependencies": { + "stylelint": "^16.1.0" + } + }, + "node_modules/stylelint-config-recommended-scss": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-14.0.0.tgz", + "integrity": "sha512-HDvpoOAQ1RpF+sPbDOT2Q2/YrBDEJDnUymmVmZ7mMCeNiFSdhRdyGEimBkz06wsN+HaFwUh249gDR+I9JR7Onw==", + "dev": true, + "dependencies": { + "postcss-scss": "^4.0.9", + "stylelint-config-recommended": "^14.0.0", + "stylelint-scss": "^6.0.0" + }, + "engines": { + "node": ">=18.12.0" + }, + "peerDependencies": { + "postcss": "^8.3.3", + "stylelint": "^16.0.2" + }, + "peerDependenciesMeta": { + "postcss": { + "optional": true + } + } + }, + "node_modules/stylelint-config-standard": { + "version": "36.0.1", + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-36.0.1.tgz", + "integrity": "sha512-8aX8mTzJ6cuO8mmD5yon61CWuIM4UD8Q5aBcWKGSf6kg+EC3uhB+iOywpTK4ca6ZL7B49en8yanOFtUW0qNzyw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/stylelint" + }, + { + "type": "github", + "url": "https://github.com/sponsors/stylelint" + } + ], + "dependencies": { + "stylelint-config-recommended": "^14.0.1" + }, + "engines": { + "node": ">=18.12.0" + }, + "peerDependencies": { + "stylelint": "^16.1.0" + } + }, + "node_modules/stylelint-config-standard-scss": { + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-13.1.0.tgz", + "integrity": "sha512-Eo5w7/XvwGHWkeGLtdm2FZLOMYoZl1omP2/jgFCXyl2x5yNz7/8vv4Tj6slHvMSSUNTaGoam/GAZ0ZhukvalfA==", + "dev": true, + "dependencies": { + "stylelint-config-recommended-scss": "^14.0.0", + "stylelint-config-standard": "^36.0.0" + }, + "engines": { + "node": ">=18.12.0" + }, + "peerDependencies": { + "postcss": "^8.3.3", + "stylelint": "^16.3.1" + }, + "peerDependenciesMeta": { + "postcss": { + "optional": true + } + } + }, + "node_modules/stylelint-scss": { + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.3.2.tgz", + "integrity": "sha512-pNk9mXOVKkQtd+SROPC9io8ISSgX+tOVPhFdBE+LaKQnJMLdWPbGKAGYv4Wmf/RrnOjkutunNTN9kKMhkdE5qA==", + "dev": true, + "dependencies": { + "known-css-properties": "^0.31.0", + "postcss-media-query-parser": "^0.2.3", + "postcss-resolve-nested-selector": "^0.1.1", + "postcss-selector-parser": "^6.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": ">=18.12.0" + }, + "peerDependencies": { + "stylelint": "^16.0.2" + } + }, + "node_modules/stylelint/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/stylelint/node_modules/balanced-match": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", + "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", + "dev": true + }, + "node_modules/stylelint/node_modules/file-entry-cache": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.0.0.tgz", + "integrity": "sha512-6MgEugi8p2tiUhqO7GnPsmbCCzj0YRCwwaTbpGRyKZesjRSzkqkAE9fPp7V2yMs5hwfgbQLgdvSSkGNg1s5Uvw==", + "dev": true, + "dependencies": { + "flat-cache": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/stylelint/node_modules/flat-cache": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-5.0.0.tgz", + "integrity": "sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==", + "dev": true, + "dependencies": { + "flatted": "^3.3.1", + "keyv": "^4.5.4" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/stylelint/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/stylelint/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/stylelint/node_modules/write-file-atomic": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", + "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", + "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-hyperlinks": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz", + "integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "engines": { + "node": ">=14.18" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/svg-tags": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", + "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==", + "dev": true + }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "dev": true + }, + "node_modules/table": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz", + "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==", + "dev": true, + "dependencies": { + "ajv": "^8.0.1", + "lodash.truncate": "^4.4.2", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/table/node_modules/ajv": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz", + "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.3", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.4.1" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/table/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, + "node_modules/tmpl": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", + "dev": true + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tough-cookie": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", + "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", + "dev": true, + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tr46": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", + "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "dev": true, + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/tsconfig-paths": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", + "dev": true, + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/tsconfig-paths/node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/tsconfig-paths/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", + "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", + "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unbox-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", + "which-boxed-primitive": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, + "node_modules/universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz", + "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "escalade": "^3.1.2", + "picocolors": "^1.0.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dev": true, + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true + }, + "node_modules/v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/version-guard": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.2.tgz", + "integrity": "sha512-D8d+YxCUpoqtCnQzDxm6SF7DLU3gr2535T4khAtMq4osBahsQnmSxuwXFdrbAdDGG8Uokzfis/jvyeFPdmlc7w==", + "dev": true, + "engines": { + "node": ">=0.10.48" + } + }, + "node_modules/w3c-xmlserializer": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz", + "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==", + "dev": true, + "dependencies": { + "xml-name-validator": "^4.0.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/walker": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", + "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", + "dev": true, + "dependencies": { + "makeerror": "1.0.12" + } + }, + "node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/whatwg-encoding": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", + "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", + "dev": true, + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/whatwg-mimetype": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", + "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/whatwg-url": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", + "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "dev": true, + "dependencies": { + "tr46": "^3.0.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, + "dependencies": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", + "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", + "dev": true, + "dependencies": { + "function.prototype.name": "^1.1.5", + "has-tostringtag": "^1.0.0", + "is-async-function": "^2.0.0", + "is-date-object": "^1.0.5", + "is-finalizationregistry": "^1.0.2", + "is-generator-function": "^1.0.10", + "is-regex": "^1.1.4", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", + "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "node_modules/write-file-atomic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/ws": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/xml-name-validator": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", + "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 1a155875676f..6cde0dae20cb 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -8,7 +8,6 @@ psycopg2, python, pythonOlder, - pythonRelaxDepsHook, pytz, setuptools-scm, tablib, @@ -32,7 +31,6 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ diff-match-patch diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index c786de25abce..8a10b0675b46 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, django, + python-ipware, pythonOlder, }: @@ -18,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-2exD0r983yFv7Y1JSghN61dhpUhgpTsudDRqTzhM/0c="; }; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ django python-ipware ]; # django.core.exceptions.ImproperlyConfigured: Requested setting IPWARE_TRUSTED_PROXY_LIST, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. doCheck = false; diff --git a/pkgs/development/python-modules/django-leaflet/default.nix b/pkgs/development/python-modules/django-leaflet/default.nix index f39a19584440..99e7e47ca8b6 100644 --- a/pkgs/development/python-modules/django-leaflet/default.nix +++ b/pkgs/development/python-modules/django-leaflet/default.nix @@ -4,21 +4,25 @@ django, fetchPypi, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "django-leaflet"; - version = "0.29.1"; - format = "setuptools"; + version = "0.30.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-ECtocPJHYR1DsFLeVMVdtlia4UNOJyNMsU1CrX1aVsQ="; + pname = "django_leaflet"; + inherit version; + hash = "sha256-jsG2RcUe0Zob9GAZVKSIr8iPPubqqsh679uhUioNR0Y="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; # The tests seem to be impure. # They are throwing a error about unset configs: @@ -33,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/makinacorpus/django-leaflet"; changelog = "https://github.com/makinacorpus/django-leaflet/blob/${version}/CHANGES"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 32e5d59b4de0..e32886c600f5 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pythonOlder, django, + django-stubs, pytestCheckHook, pytest-django, parameterized, @@ -11,7 +12,7 @@ let # 0.18.12 was yanked from PyPI, it refers to this issue: # https://github.com/deschler/django-modeltranslation/issues/701 - version = "0.19.2"; + version = "0.19.3"; in buildPythonPackage { pname = "django-modeltranslation"; @@ -21,7 +22,7 @@ buildPythonPackage { owner = "deschler"; repo = "django-modeltranslation"; rev = "refs/tags/v${version}"; - hash = "sha256-l0NyHIDAv7qmwtbMcxdnHFExlLchdfkP4iX/1ABzcRA="; + hash = "sha256-tCj3+9iQ5DBf0fxAHgHkgcARFDfZTV/o6wvQ7ASUJWQ="; }; # Remove all references to pytest-cov @@ -37,6 +38,7 @@ buildPythonPackage { propagatedBuildInputs = [ django ]; nativeCheckInputs = [ + django-stubs pytestCheckHook pytest-django parameterized diff --git a/pkgs/development/python-modules/django-mysql/default.nix b/pkgs/development/python-modules/django-mysql/default.nix deleted file mode 100644 index 9cb828f9b247..000000000000 --- a/pkgs/development/python-modules/django-mysql/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # build-system - setuptools, - - # dependencies - django, - - # tests - pytest-django, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "django-mysql"; - version = "4.13.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "adamchainz"; - repo = "django-mysql"; - rev = "refs/tags/${version}"; - hash = "sha256-hIvkLLv9R23u+JC6t/zwbMvmgLMstYp0ytuSqNiohJg="; - }; - - build-system = [ setuptools ]; - - dependencies = [ django ]; - - doCheck = false; # requires mysql/mariadb server - - env.DJANGO_SETTINGS_MODULE = "tests.settings"; - - nativeCheckInputs = [ - pytest-django - pytestCheckHook - ]; - - pythonImportsCheck = [ "django_mysql" ]; - - meta = with lib; { - changelog = "https://github.com/adamchainz/django-mysql/blob/${version}/docs/changelog.rst"; - description = "Extensions to Django for use with MySQL/MariaD"; - homepage = "https://github.com/adamchainz/django-mysql"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index fdde98dd5ee5..139a0d022c15 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, # propagates django, @@ -41,7 +40,6 @@ buildPythonPackage rec { requests ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "django" ]; DJANGO_SETTINGS_MODULE = "tests.settings"; diff --git a/pkgs/development/python-modules/django-simple-history/default.nix b/pkgs/development/python-modules/django-simple-history/default.nix index 3714914bc95a..0179760be698 100644 --- a/pkgs/development/python-modules/django-simple-history/default.nix +++ b/pkgs/development/python-modules/django-simple-history/default.nix @@ -3,15 +3,16 @@ buildPythonPackage, django, fetchFromGitHub, - pytest-django, + hatch-fancy-pypi-readme, + hatchling, + hatch-vcs, python, pythonOlder, - setuptools-scm, }: buildPythonPackage rec { pname = "django-simple-history"; - version = "3.5.0"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,15 +21,21 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-simple-history"; rev = "refs/tags/${version}"; - hash = "sha256-BW/F+RBf1KvwGRY9IK00+n69Jtx/ndEuvpHSi8/odSE="; + hash = "sha256-bPdMdtiEDRvRD00ZBwUQkeCDKCx2SW65+FsbuMwVdK0="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatchling + hatch-vcs + ]; propagatedBuildInputs = [ django ]; checkPhase = '' + runHook preCheck ${python.interpreter} runtests.py + runHook postCheck ''; pythonImportsCheck = [ "simple_history" ]; diff --git a/pkgs/development/python-modules/django-stubs-ext/default.nix b/pkgs/development/python-modules/django-stubs-ext/default.nix index cfedb113a1c8..1176f2ba09c7 100644 --- a/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/pkgs/development/python-modules/django-stubs-ext/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "django-stubs-ext"; - version = "4.2.7"; + version = "5.0.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-UZNCrAhJzaFVl0bJpWPwP/mfY2sOvnwUt16BagDf3cM="; + pname = "django_stubs_ext"; + inherit version; + hash = "sha256-QJxiWF1/mWzvXHYObifqP/KflhyUN0fmdRnIN0IsrTI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index dfae4891d542..72adac752285 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -16,14 +16,15 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "4.2.7"; + version = "5.0.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-jM0v9O5a3yK547expRbS4cIZHp2U5nLDXMK8PdYeD2s="; + pname = "django_stubs"; + inherit version; + hash = "sha256-I2vFYG5WB8uWj5K2SEcfntqkYad0vAE7+ea/+HMPa98="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-timezone-field/default.nix b/pkgs/development/python-modules/django-timezone-field/default.nix index c111c4aff6d4..e53b0da04c4a 100644 --- a/pkgs/development/python-modules/django-timezone-field/default.nix +++ b/pkgs/development/python-modules/django-timezone-field/default.nix @@ -6,50 +6,45 @@ poetry-core, django, djangorestframework, - pytz, - pytest, + pytestCheckHook, + pytest-django, pytest-lazy-fixture, - python, }: buildPythonPackage rec { pname = "django-timezone-field"; - version = "5.1"; - disabled = pythonOlder "3.5"; - format = "pyproject"; + version = "7.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mfogel"; repo = pname; rev = version; - hash = "sha256-FAYO8OEE/h4rsbC4Oc57ylWV7TqQ6DOd6/2M+mb/AsM="; + hash = "sha256-q06TuYkBA4z6tJdT3an6Z8o1i/o85XbYa1JYZBHC8lI="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - django - djangorestframework - pytz + dependencies = [ django ]; + + pythonImportsCheck = [ + # Requested setting USE_DEPRECATED_PYTZ, but settings are not configured. + #"timezone_field" ]; - pythonImportsCheck = [ "timezone_field" ]; - - # Uses pytest.lazy_fixture directly which is broken in pytest-lazy-fixture - # https://github.com/TvoroG/pytest-lazy-fixture/issues/22 - doCheck = false; - - DJANGO_SETTINGS_MODULE = "tests.settings"; + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings + ''; nativeCheckInputs = [ - pytest + djangorestframework + pytestCheckHook + pytest-django pytest-lazy-fixture ]; - checkPhase = '' - ${python.interpreter} -m django test - ''; - meta = with lib; { description = "Django app providing database, form and serializer fields for pytz timezone objects"; homepage = "https://github.com/mfogel/django-timezone-field"; diff --git a/pkgs/development/python-modules/django-two-factor-auth/default.nix b/pkgs/development/python-modules/django-two-factor-auth/default.nix index f14b4a0d0c85..718d2206700b 100644 --- a/pkgs/development/python-modules/django-two-factor-auth/default.nix +++ b/pkgs/development/python-modules/django-two-factor-auth/default.nix @@ -9,7 +9,6 @@ phonenumbers, pydantic, pythonOlder, - pythonRelaxDepsHook, qrcode, setuptools-scm, twilio, @@ -31,7 +30,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools-scm ]; diff --git a/pkgs/development/python-modules/django-webpush/default.nix b/pkgs/development/python-modules/django-webpush/default.nix index 25d406e348c4..0c9b0ac65787 100644 --- a/pkgs/development/python-modules/django-webpush/default.nix +++ b/pkgs/development/python-modules/django-webpush/default.nix @@ -4,7 +4,6 @@ django, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, pywebpush, setuptools-scm, }: @@ -26,7 +25,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "pywebpush" ]; build-system = [ - pythonRelaxDepsHook setuptools-scm ]; diff --git a/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/pkgs/development/python-modules/djangorestframework-stubs/default.nix index 70c672cdc25a..140168e8260c 100644 --- a/pkgs/development/python-modules/djangorestframework-stubs/default.nix +++ b/pkgs/development/python-modules/djangorestframework-stubs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "djangorestframework-stubs"; - version = "3.14.5"; + version = "3.15.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "typeddjango"; repo = "djangorestframework-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-AOhNlhTZ6Upevb/7Z1sUQoIkIlwYlIcf1CC+Ag7H4bg="; + hash = "sha256-5fZzSRn59ii41QKOqkZUXTDnm70Um9SY445Vfoo8sgg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index d151b538bf99..184307a5a2e4 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -57,6 +57,11 @@ buildPythonPackage rec { pyyaml ]; + disabledTests = [ + # https://github.com/encode/django-rest-framework/issues/9422 + "test_urlpatterns" + ]; + pythonImportsCheck = [ "rest_framework" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index b061554987c4..b22d1cbc884e 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "1.1.6"; + version = "1.1.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-DOctlh9EPo+fBWlLNUVC3uU04I4rjFtgxi1drKfB2g8="; + hash = "sha256-tfYPtHu/XY12LxNLzqDDiOumtJg0KmgqIfFoZUUJS3c="; }; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix index 25a375bf7eb6..af8c7bdbee7f 100644 --- a/pkgs/development/python-modules/dm-control/default.nix +++ b/pkgs/development/python-modules/dm-control/default.nix @@ -6,7 +6,6 @@ absl-py, mujoco, pyparsing, - pythonRelaxDepsHook, setuptools, wheel, dm-env, @@ -46,7 +45,6 @@ buildPythonPackage rec { absl-py mujoco pyparsing - pythonRelaxDepsHook setuptools wheel ]; diff --git a/pkgs/development/python-modules/dploot/default.nix b/pkgs/development/python-modules/dploot/default.nix index 4104ec2ac44b..4cb0a90c0f0f 100644 --- a/pkgs/development/python-modules/dploot/default.nix +++ b/pkgs/development/python-modules/dploot/default.nix @@ -8,7 +8,6 @@ poetry-core, pyasn1, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -29,7 +28,6 @@ buildPythonPackage rec { "pyasn1" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix index 1940c43ed06d..8b74363689d0 100644 --- a/pkgs/development/python-modules/dragonfly/default.nix +++ b/pkgs/development/python-modules/dragonfly/default.nix @@ -74,6 +74,6 @@ buildPythonPackage rec { description = "Speech recognition framework allowing powerful Python-based scripting"; homepage = "https://github.com/dictation-toolbox/dragonfly"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 4e3683fc485b..73a551a5c278 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -12,7 +12,6 @@ pytestCheckHook, sphinxHook, sphinx-rtd-theme, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -60,7 +59,6 @@ buildPythonPackage rec { nativeBuildInputs = [ sphinxHook sphinx-rtd-theme - pythonRelaxDepsHook ]; # Version 12.0.0 re-introduced Python 2 support and set some very restrictive version bounds diff --git a/pkgs/development/python-modules/dtlssocket/default.nix b/pkgs/development/python-modules/dtlssocket/default.nix index 589785da7bc3..2d8e3988bee1 100644 --- a/pkgs/development/python-modules/dtlssocket/default.nix +++ b/pkgs/development/python-modules/dtlssocket/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "dtlssocket"; - version = "0.1.18"; + version = "0.1.19"; format = "pyproject"; src = fetchPypi { pname = "DTLSSocket"; inherit version; - hash = "sha256-TnS2LYe6CeAlezc83bGpRqOpQbPJMQHzJn6PnXon4FI="; + hash = "sha256-hKwWkQ/K+FTgn2Gs8Pynz/ihuVeO8grqekPPbGK5eDI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index 5b13f55ebed9..3c195638a8e0 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -6,7 +6,6 @@ pythonOlder, duckdb, hypothesis, - ipython-sql, pandas, poetry-core, pytest-remotedata, @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.12.1"; + version = "0.13.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +25,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-+l6sRZHJnLfei1LR8WHqpC+0+91VLYKXn2e0w9+QRyk="; + hash = "sha256-XbO9LyweJ+pYQvEbdmiUJnVNr2BQAgwu9Imq7rAFEYg="; }; nativeBuildInputs = [ poetry-core ]; @@ -40,16 +39,10 @@ buildPythonPackage rec { export HOME="$(mktemp -d)" ''; - disabledTests = [ - # test should be skipped based on sqlalchemy version but isn't and fails - "test_commit" - ]; - nativeCheckInputs = [ pytestCheckHook ]; checkInputs = [ hypothesis - ipython-sql pandas pytest-remotedata snapshottest diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index f39a99ed5f30..9dbaee5c8975 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -5,9 +5,7 @@ fetchFromGitHub, pythonOlder, setuptools, - orjson, pyreqwest-impersonate, - curl-cffi, # Optional dependencies lxml, @@ -15,7 +13,7 @@ buildPythonPackage rec { pname = "duckduckgo-search"; - version = "v5.3.1"; + version = "6.1.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,20 +21,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "deedy5"; repo = "duckduckgo_search"; - rev = version; - hash = "sha256-T7rlB3dU7y+HbHr1Ss9KkejlXFORhnv9Va7cFTRtfQU="; + rev = "v${version}"; + hash = "sha256-hw6fe0SDywBQ8k6gpkTVxdJW5AQUk+GY2qoou0JzTlo="; }; build-system = [ setuptools ]; dependencies = [ click - curl-cffi - orjson pyreqwest-impersonate ]; - passthru.optional-dependencies = { + optional-dependencies = { lxml = [ lxml ]; }; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 2a7ca19802b7..436dae6ee78f 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -2,9 +2,9 @@ lib, stdenv, buildPythonPackage, - certifi, fastimport, fetchFromGitHub, + fetchpatch2, gevent, geventhttpclient, git, @@ -12,8 +12,7 @@ gnupg, gpgme, paramiko, - pytest-xdist, - pytestCheckHook, + unittestCheckHook, pythonOlder, setuptools, setuptools-rust, @@ -21,7 +20,7 @@ }: buildPythonPackage rec { - version = "0.21.7"; + version = "0.22.1"; pname = "dulwich"; format = "setuptools"; @@ -30,22 +29,30 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jelmer"; repo = "dulwich"; - rev = "refs/tags/${pname}-${version}"; - hash = "sha256-iP+6KtaQ8tfOobovSLSJZogS/XWW0LuHgE2oV8uQW/8="; + rev = "refs/tags/dulwich-${version}"; + hash = "sha256-bf3ZUMX4afpdTBpFnx0HMyzCNG6V/p4eOl36djxGbtk="; }; + patches = [ + (fetchpatch2 { + name = "dulwich-geventhttpclient-api-breakage.patch"; + url = "https://github.com/jelmer/dulwich/commit/5f0497de9c37ac4f4e8f27bed8decce13765d3df.patch"; + hash = "sha256-0GgDgmYuLCsMc9nRRLNL2W6WYrkZ/1ZnZBQusEAzLKI="; + }) + ]; + build-system = [ setuptools setuptools-rust ]; propagatedBuildInputs = [ - certifi urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { fastimport = [ fastimport ]; + https = [ urllib3 ]; pgp = [ gpgme gnupg @@ -59,33 +66,20 @@ buildPythonPackage rec { geventhttpclient git glibcLocales - pytest-xdist - pytestCheckHook + unittestCheckHook ] - ++ passthru.optional-dependencies.fastimport - ++ passthru.optional-dependencies.pgp - ++ passthru.optional-dependencies.paramiko; + ++ lib.flatten (lib.attrValues optional-dependencies); + + preCheck = '' + # requires swift config file + rm tests/contrib/test_swift_smoke.py + + # ImportError: attempted relative import beyond top-level package + rm tests/test_greenthreads.py + ''; doCheck = !stdenv.isDarwin; - disabledTests = [ - # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpsqwlbpd1/\xc0' - "test_no_decode_encode" - # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpwmtfyvo2/refs.git/refs/heads/\xcd\xee\xe2\xe0\xff\xe2\xe5\xf2\xea\xe01' - "test_cyrillic" - # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpfseetobk/test/\xc0' - "test_commit_no_encode_decode" - # https://github.com/jelmer/dulwich/issues/1279 - "test_init_connector" - ]; - - disabledTestPaths = [ - # missing test inputs - "dulwich/contrib/test_swift_smoke.py" - # flaky on high core count >4 - "dulwich/tests/compat/test_client.py" - ]; - pythonImportsCheck = [ "dulwich" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 2ac7229c325b..3ee9866f98c5 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -12,8 +12,8 @@ buildPythonPackage rec { pname = "dunamai"; - version = "1.20.0"; - format = "pyproject"; + version = "1.21.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "dunamai"; rev = "refs/tags/v${version}"; - hash = "sha256-K7G5BiUm8QTRbw0W3ebTld7CAZI8sYSnRsD7vQhCptE="; + hash = "sha256-dsL1MhlL1Yjj06D0z2FzZ53Frfp4U+5dXA9vPjU+pvY="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/dvc-azure/default.nix b/pkgs/development/python-modules/dvc-azure/default.nix index f212889f2085..7aada9f9e75a 100644 --- a/pkgs/development/python-modules/dvc-azure/default.nix +++ b/pkgs/development/python-modules/dvc-azure/default.nix @@ -6,7 +6,6 @@ dvc-objects, fetchPypi, knack, - pythonRelaxDepsHook, setuptools-scm, }: @@ -25,7 +24,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc-gs/default.nix b/pkgs/development/python-modules/dvc-gs/default.nix index 235c6a8e5f8e..f457d2e1d3e8 100644 --- a/pkgs/development/python-modules/dvc-gs/default.nix +++ b/pkgs/development/python-modules/dvc-gs/default.nix @@ -4,7 +4,6 @@ dvc-objects, fetchPypi, gcsfs, - pythonRelaxDepsHook, setuptools-scm, }: @@ -23,7 +22,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc-http/default.nix b/pkgs/development/python-modules/dvc-http/default.nix index e9eb01b5379e..ddd707736ae4 100644 --- a/pkgs/development/python-modules/dvc-http/default.nix +++ b/pkgs/development/python-modules/dvc-http/default.nix @@ -7,7 +7,6 @@ fsspec, funcy, pythonOlder, - pythonRelaxDepsHook, setuptools-scm, }: diff --git a/pkgs/development/python-modules/dvc-s3/default.nix b/pkgs/development/python-modules/dvc-s3/default.nix index d85b3ecf9d52..eaed1006a500 100644 --- a/pkgs/development/python-modules/dvc-s3/default.nix +++ b/pkgs/development/python-modules/dvc-s3/default.nix @@ -6,7 +6,6 @@ dvc-objects, fetchPypi, flatten-dict, - pythonRelaxDepsHook, s3fs, setuptools-scm, }: @@ -31,13 +30,7 @@ buildPythonPackage rec { --replace-fail "aiobotocore[boto3]" "aiobotocore" ''; - build-system = [ - setuptools-scm - ]; - - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + build-system = [ setuptools-scm ]; dependencies = [ aiobotocore diff --git a/pkgs/development/python-modules/dvc-ssh/default.nix b/pkgs/development/python-modules/dvc-ssh/default.nix index cba3ae243d17..3578e1b572eb 100644 --- a/pkgs/development/python-modules/dvc-ssh/default.nix +++ b/pkgs/development/python-modules/dvc-ssh/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, dvc-objects, fetchPypi, - pythonRelaxDepsHook, setuptools-scm, sshfs, }: @@ -26,7 +25,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc-studio-client/default.nix b/pkgs/development/python-modules/dvc-studio-client/default.nix index 63187c72342c..ce592806ceeb 100644 --- a/pkgs/development/python-modules/dvc-studio-client/default.nix +++ b/pkgs/development/python-modules/dvc-studio-client/default.nix @@ -12,21 +12,21 @@ buildPythonPackage rec { pname = "dvc-studio-client"; - version = "0.20.0"; - format = "pyproject"; + version = "0.21.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "iterative"; - repo = pname; + repo = "dvc-studio-client"; rev = "refs/tags/${version}"; - hash = "sha256-JLrsbgifoUnN1Mwml9tO3/SkA6miE14AGjxrFwEcRks="; + hash = "sha256-SCRMBZKOt8JtDi5aGgk6TCxetvG3QU1jOv6U5/6ChTE="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dulwich gitpython requests diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index f9190e727a1d..85c817f2f4fc 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -36,7 +36,6 @@ pygtrie, pyparsing, pythonOlder, - pythonRelaxDepsHook, requests, rich, ruamel-yaml, @@ -58,7 +57,7 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.50.0"; + version = "3.51.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -67,7 +66,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-/MvKWpJzKWLj1+y8nPMQiAwdktmQyJNM+s6ctYNk9u0="; + hash = "sha256-MjzunpPWzGfa62Jr+krEdm+i+N10QNmW7qRWaU/58OM="; }; pythonRelaxDeps = [ @@ -84,7 +83,6 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ diff --git a/pkgs/development/python-modules/e3-core/default.nix b/pkgs/development/python-modules/e3-core/default.nix index fbcc39e88325..2701b845234e 100644 --- a/pkgs/development/python-modules/e3-core/default.nix +++ b/pkgs/development/python-modules/e3-core/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "e3-core"; - version = "22.4.0"; + version = "22.5.0"; pyproject = true; src = fetchFromGitHub { owner = "AdaCore"; repo = "e3-core"; - rev = "v${version}"; - hash = "sha256-dgEk2/qRfAYwUz+e5TWKUy/aPLpmyWZ32OV1i7QM9Fs="; + rev = "refs/tags/v${version}"; + hash = "sha256-7csZYohU89uavSMPOKGJ8HClmtiweGSghyR7QgFfSY8="; }; patches = [ ./0001-use-distro-over-ld.patch ]; diff --git a/pkgs/development/python-modules/easyenergy/default.nix b/pkgs/development/python-modules/easyenergy/default.nix index 654227e0e059..c85dba799360 100644 --- a/pkgs/development/python-modules/easyenergy/default.nix +++ b/pkgs/development/python-modules/easyenergy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "easyenergy"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-easyenergy"; rev = "refs/tags/v${version}"; - hash = "sha256-UHCwxdtziWIZMf3ORIZoQFE3MI8qbBQo5PEbvppvwD4="; + hash = "sha256-tWKfcGznxck8VLK3YshOIbPet2CEbUZbT8JzgaAhAso="; }; postPatch = '' diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 1be006d1c05b..c53e939a66b6 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.21.7"; + version = "0.21.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-BWA0Irf6OpUGX/NkHMuxQ45QUr3PRdWLSEs9Bavk8RM="; + hash = "sha256-ffKteff4Xsg9kxJukVlSnwmKowRN35bMfDJo/9mV6s8="; }; build-system = [ diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 93fd450edfa4..113898825f5d 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -19,7 +19,6 @@ pytest-random-order, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, sanic, sanic-testing, setuptools, @@ -49,7 +48,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ aiohttp diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 14eee9278f20..45476eaf0418 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "8.13.1"; + version = "8.14.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FTMFODQZp+5hulOG9P4iueIHMnmv75c01bWfXKtoL3o="; + sha256 = "sha256-MmxtzPMvH/PUyEiJOIWQd4REuhj3cK3uUvJHIcuXxMc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 905a2e2daf44..e33c98782bb4 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "elasticsearch"; - version = "8.13.0"; + version = "8.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5Ovrsi0J8O+DnCa2qpjhnM1ja8t38IwStWKwLKzV50Q="; + sha256 = "sha256-qiSQAp3Zb0AVszPBgnqiH9bApNIjsA37D+kzuNCaURs="; }; nativeBuildInputs = [ elastic-transport ]; diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index 3d073bb1e030..735496b67645 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "email-validator"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "email_validator"; inherit version; - hash = "sha256-IApwaAugiQS+bR7vcpIFzA1odjQ5mlkk2EJTPvuCS4Q="; + hash = "sha256-FMDz00PEvto3QAQhs5+kEbvjOnXfIIJd9zrVPgap8Ew="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/embedding-reader/default.nix b/pkgs/development/python-modules/embedding-reader/default.nix index c49f6026d7e4..0f4d3c54a34b 100644 --- a/pkgs/development/python-modules/embedding-reader/default.nix +++ b/pkgs/development/python-modules/embedding-reader/default.nix @@ -7,7 +7,6 @@ pandas, pyarrow, pytestCheckHook, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -22,7 +21,6 @@ buildPythonPackage rec { hash = "sha256-paN6rAyH3L7qCfWPr5kXo9Xl57gRMhdcDnoyLJ7II2w="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "pyarrow" ]; diff --git a/pkgs/development/python-modules/emborg/default.nix b/pkgs/development/python-modules/emborg/default.nix index 572c73fb786a..5d244fb9a322 100644 --- a/pkgs/development/python-modules/emborg/default.nix +++ b/pkgs/development/python-modules/emborg/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "emborg"; - version = "1.38"; + version = "1.39"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "emborg"; rev = "refs/tags/v${version}"; - hash = "sha256-dK/6y1cjegomiy3fta2grUm4T0ZrylmstXfkJo4mDCE="; + hash = "sha256-DK98VAYSwN+UKuwwbd2O+gF2PDQPosbXo9D2Zrwe/yU="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 994c90467bee..d6f1fd245931 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -2,14 +2,16 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + typing-extensions, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "emoji"; - version = "2.10.1"; - format = "setuptools"; + version = "2.12.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +19,13 @@ buildPythonPackage rec { owner = "carpedm20"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cCYZ+0IFHIR9++RfUbFTRMKYB9nC5dBaPMH6dSiAXK0="; + hash = "sha256-m9V9ryIE2U+KsyzFhAoMCGYMkPCBUl/ex1Ue5OUwslc="; }; + build-system = [ setuptools ]; + + dependencies = [ typing-extensions ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "test_emojize_name_only" ]; diff --git a/pkgs/development/python-modules/enocean/default.nix b/pkgs/development/python-modules/enocean/default.nix index 61c2ca0e1b20..fd3eedb863a0 100644 --- a/pkgs/development/python-modules/enocean/default.nix +++ b/pkgs/development/python-modules/enocean/default.nix @@ -5,7 +5,8 @@ beautifulsoup4, enum-compat, pyserial, - pynose, + nose, + pythonOlder, }: buildPythonPackage rec { @@ -26,7 +27,10 @@ buildPythonPackage rec { pyserial ]; - nativeCheckInputs = [ pynose ]; + # tests rely on nose + doCheck = pythonOlder "3.12"; + + nativeCheckInputs = [ nose ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index 3d113a4f2dfd..c64f607795ba 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -5,7 +5,7 @@ fetchPypi, jinja2, mock, - pynose, + nose, poetry-core, pythonOlder, terminaltables, @@ -31,9 +31,12 @@ buildPythonPackage rec { terminaltables ]; + # test rely on nose + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ mock - pynose + nose ]; checkPhase = '' diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index d89a041be864..0e9cabdcf656 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch, hatchling, jax, jaxlib, @@ -28,9 +29,18 @@ buildPythonPackage rec { hash = "sha256-3OwHND1YEdg/SppqiB7pCdp6v+lYwTbtX07tmyEMWDo="; }; - nativeBuildInputs = [ hatchling ]; + patches = [ + # TODO: remove when next release (0.11.5) is out + (fetchpatch { + name = "make-tests-pass-with-jaxtyping-0-2-30"; + url = "https://github.com/patrick-kidger/equinox/commit/cf942646cddffd32519d876c653d09e064bd66b8.patch"; + hash = "sha256-q/vbvLhqT4q+BK+q5sPVY5arzXCmH5LWxt4evAwywtM="; + }) + ]; - propagatedBuildInputs = [ + build-system = [ hatchling ]; + + dependencies = [ jax jaxlib jaxtyping @@ -64,11 +74,11 @@ buildPythonPackage rec { "test_backward_nan" ]; - meta = with lib; { + meta = { description = "JAX library based around a simple idea: represent parameterised functions (such as neural networks) as PyTrees"; changelog = "https://github.com/patrick-kidger/equinox/releases/tag/v${version}"; homepage = "https://github.com/patrick-kidger/equinox"; - license = licenses.asl20; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix index 3204da1d5a97..ce5f362675bc 100644 --- a/pkgs/development/python-modules/es-client/default.nix +++ b/pkgs/development/python-modules/es-client/default.nix @@ -12,7 +12,6 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, pyyaml, requests, six, @@ -21,7 +20,7 @@ buildPythonPackage rec { pname = "es-client"; - version = "8.13.1"; + version = "8.14.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,14 +29,13 @@ buildPythonPackage rec { owner = "untergeek"; repo = "es_client"; rev = "refs/tags/v${version}"; - hash = "sha256-4v9SRWVG9p4kCob4C3by2JxNqX6L3yMHpbnMYEAM7A0="; + hash = "sha256-CJhiSDmIlhTWV7LLWd2ZCzuj5cWXwgh0lkKJvhmaDFw="; }; pythonRelaxDeps = true; build-system = [ hatchling ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ certifi diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 2824f5e821fe..bf3eee9692f1 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lb0qHgxs4s16LsxubNlzb/eUs61ctU2B2MvC5BTQuHA="; + hash = "sha256-DHLDcL2inYV+GI2TEBnDJlGpweqXfAjI2TmxztFjf94="; }; patchPhase = '' diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix index 1f2cd6dfadcd..afa496973249 100644 --- a/pkgs/development/python-modules/evtx/default.nix +++ b/pkgs/development/python-modules/evtx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "evtx"; - version = "0.8.2"; + version = "0.8.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,13 +20,13 @@ buildPythonPackage rec { owner = "omerbenamram"; repo = "pyevtx-rs"; rev = "refs/tags/${version}"; - hash = "sha256-t//oNvD+7wnv5KkriKBX4xgGS8pQpZgCsKxAEXsj0X8="; + hash = "sha256-s94KCUIJplrkMvFsFxPokTucB5TwVYD1xxcoJyvk5NU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-DPEL36cYNV5v4iW3+Fg1eEeuBuK9S7Qe78xOzZs8aJw="; + hash = "sha256-i16FNFbYrF2BONahLP7APMi9RPaLGmbnBH4hBPnHWzg="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index cb1577e1ed4f..7dc9c78852ea 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = "exceptiongroup"; rev = version; - hash = "sha256-iGeaRVJeFAWfJpwr7N4kST7d8YxpX3WgDqQemlR0cLU="; + hash = "sha256-87HmZsbsoV7QPHux50sYsFY2RaIc3627dH3WAwqXfQU="; }; nativeBuildInputs = [ flit-scm ]; @@ -28,16 +28,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = - if pythonAtLeast "3.12" then - [ - # https://github.com/agronholm/exceptiongroup/issues/116 - "test_deep_split" - "test_deep_subgroup" - ] - else - null; - pythonImportsCheck = [ "exceptiongroup" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index 7eb94f3b1348..6c225d2679f7 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -44,6 +44,11 @@ buildPythonPackage rec { disabledTests = [ # requires ipython, which causes a circular dependency "test_two_statement_lookups" + + # Asserts against time passed using time.time() to estimate + # if the test runs fast enough. That makes the test flaky when + # running on slow systems or cross- / emulated building + "test_many_source_for_filename_calls" ]; pythonImportsCheck = [ "executing" ]; diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 9bc49b2ee682..391881204e29 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -7,7 +7,6 @@ igraph, pygments, pytestCheckHook, - pythonRelaxDepsHook, setuptools, }: @@ -25,7 +24,6 @@ buildPythonPackage rec { nativeBuildInputs = [ antlr4 - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/extract-msg/default.nix b/pkgs/development/python-modules/extract-msg/default.nix index c687ef3272f7..27faad2695ca 100644 --- a/pkgs/development/python-modules/extract-msg/default.nix +++ b/pkgs/development/python-modules/extract-msg/default.nix @@ -8,7 +8,6 @@ olefile, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, red-black-tree-mod, rtfde, setuptools, @@ -35,7 +34,6 @@ buildPythonPackage rec { ]; build-system = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/extruct/default.nix b/pkgs/development/python-modules/extruct/default.nix index f44f9443add9..f7ede7184112 100644 --- a/pkgs/development/python-modules/extruct/default.nix +++ b/pkgs/development/python-modules/extruct/default.nix @@ -10,7 +10,6 @@ pyrdfa3, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, rdflib, setuptools, six, diff --git a/pkgs/development/python-modules/fairseq/default.nix b/pkgs/development/python-modules/fairseq/default.nix index e0634af26f20..5cea23e2bda6 100644 --- a/pkgs/development/python-modules/fairseq/default.nix +++ b/pkgs/development/python-modules/fairseq/default.nix @@ -7,7 +7,6 @@ # Native build inputs cython, - pythonRelaxDepsHook, which, # Propagated build inputs @@ -53,7 +52,6 @@ buildPythonPackage rec { nativeBuildInputs = [ cython - pythonRelaxDepsHook which ]; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 9f01cc2ed4f5..babcc2423d35 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "faker"; - version = "24.11.0"; + version = "25.8.0"; pyproject = true; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-NLlHWBwrztNAw5s1+J2/rE81aTLP/4/ok73oVJA/Dm4="; + hash = "sha256-vexfL7BX0kTr724O0xj+pNy98yw6GgEHZvxF9daPxo0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/farm-haystack/default.nix b/pkgs/development/python-modules/farm-haystack/default.nix index 14c563918964..f2139a61bc25 100644 --- a/pkgs/development/python-modules/farm-haystack/default.nix +++ b/pkgs/development/python-modules/farm-haystack/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, hatchling, boilerpy3, events, @@ -92,19 +91,18 @@ buildPythonPackage rec { pname = "farm-haystack"; - version = "1.25.0"; + version = "2.2.3"; pyproject = true; src = fetchFromGitHub { owner = "deepset-ai"; repo = "haystack"; rev = "refs/tags/v${version}"; - hash = "sha256-lAXzWnHpOBVjgleFTYqlZ34hmZkcrPJ/h1kk4iVVvec="; + hash = "sha256-vaZ8bn36Eezf3/SnJ6ao0CvFZaHrpgbX+nM0IOqG2oo="; }; nativeBuildInputs = [ hatchling - pythonRelaxDepsHook ]; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/fastapi-cli/default.nix b/pkgs/development/python-modules/fastapi-cli/default.nix new file mode 100644 index 000000000000..f717ccee0428 --- /dev/null +++ b/pkgs/development/python-modules/fastapi-cli/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pdm-backend +, typer +, fastapi +, uvicorn + +# checks +, pytestCheckHook +, rich +}: + +let self = buildPythonPackage rec { + pname = "fastapi-cli"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tiangolo"; + repo = "fastapi-cli"; + rev = version; + hash = "sha256-eWvZn7ZeLnQZAvGOzY77o6oO5y+QV2cx+peBov9YpJE="; + }; + + build-system = [ pdm-backend ]; + + dependencies = [ typer ]; + + optional-dependencies = { + standard = [ + fastapi + uvicorn + ]; + }; + + doCheck = false; + + passthru.tests.pytest = self.overridePythonAttrs { doCheck = true; }; + + nativeCheckInputs = [ + pytestCheckHook + rich + ] ++ optional-dependencies.standard; + + # coverage + disabledTests = [ "test_script" ]; + + pythonImportsCheck = [ "fastapi_cli" ]; + + meta = with lib; { + description = "Run and manage FastAPI apps from the command line with FastAPI CLI"; + homepage = "https://github.com/tiangolo/fastapi-cli"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +}; +in self diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index a39604d71497..83f0eb95438a 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -3,12 +3,12 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, # build-system - hatchling, + pdm-backend, # dependencies + fastapi-cli, starlette, pydantic, typing-extensions, @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.110.2"; + version = "0.111.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -48,27 +48,24 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; rev = "refs/tags/${version}"; - hash = "sha256-qUh5exkXVRcKIO0t4KIOZhhpsftj3BrWaL2asf8RqUI="; + hash = "sha256-DQYjK1dZuL7cF6quyNkgdd/GYmWm7k6YlF7YEjObQlI="; }; - nativeBuildInputs = [ - hatchling - pythonRelaxDepsHook - ]; + build-system = [ pdm-backend ]; pythonRelaxDeps = [ "anyio" - # https://github.com/tiangolo/fastapi/pull/9636 "starlette" ]; - propagatedBuildInputs = [ + dependencies = [ + fastapi-cli starlette pydantic typing-extensions ]; - passthru.optional-dependencies.all = + optional-dependencies.all = [ httpx jinja2 @@ -95,7 +92,7 @@ buildPythonPackage rec { python-jose trio sqlalchemy - ] ++ passthru.optional-dependencies.all ++ python-jose.optional-dependencies.cryptography; + ] ++ optional-dependencies.all ++ python-jose.optional-dependencies.cryptography; pytestFlagsArray = [ # ignoring deprecation warnings to avoid test failure from diff --git a/pkgs/development/python-modules/fastembed/default.nix b/pkgs/development/python-modules/fastembed/default.nix index f55f8a78ac24..2767700af20b 100644 --- a/pkgs/development/python-modules/fastembed/default.nix +++ b/pkgs/development/python-modules/fastembed/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - pythonRelaxDepsHook, # build-system poetry-core, @@ -39,7 +38,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ huggingface-hub diff --git a/pkgs/development/python-modules/faster-fifo/default.nix b/pkgs/development/python-modules/faster-fifo/default.nix deleted file mode 100644 index 1b6d4a0ce90d..000000000000 --- a/pkgs/development/python-modules/faster-fifo/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # build-system - cython, - setuptools, - - # tests - numpy, - unittestCheckHook, -}: - -buildPythonPackage rec { - pname = "faster-fifo"; - version = "1.4.6"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "alex-petrenko"; - repo = "faster-fifo"; - rev = "v${version}"; - hash = "sha256-vgaaIJTtNg2XqEZ9TB7tTMPJ9yMyWjtfdgNU/lcNLcg="; - }; - - nativeBuildInputs = [ - cython - setuptools - ]; - - pythonImportsCheck = [ "faster_fifo" ]; - - nativeCheckInputs = [ - numpy - unittestCheckHook - ]; - - meta = with lib; { - description = "Faster alternative to Python's multiprocessing.Queue (IPC FIFO queue"; - homepage = "https://github.com/alex-petrenko/faster-fifo"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix index f36b90cbb3ff..8dff7f5a3944 100644 --- a/pkgs/development/python-modules/faster-whisper/default.nix +++ b/pkgs/development/python-modules/faster-whisper/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, # build-system setuptools, @@ -20,19 +19,18 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "SYSTRAN"; repo = "faster-whisper"; rev = "refs/tags/v${version}"; - hash = "sha256-O2RRwb+omgSpfckHh3oPu454g2ULT4gyolrg5olHcRc="; + hash = "sha256-C/O+wt3dykQJmH+VsVkpQwEAdyW8goMUMKR0Z3Y7jdo="; }; build-system = [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "tokenizers" ]; diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index bc17b09b7995..7edfa503f2e9 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.13.4"; + version = "3.15.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0T9GZhi/3nK9LBglXiafclQsbnDnusg6AjLWscxcjPQ="; + hash = "sha256-WKJUmv354C4Qcg6qTURw9WOG16b3Lt19BZYzevjtetg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/find-libpython/default.nix b/pkgs/development/python-modules/find-libpython/default.nix index f247e9c22d9c..657c051c0396 100644 --- a/pkgs/development/python-modules/find-libpython/default.nix +++ b/pkgs/development/python-modules/find-libpython/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "find-libpython"; - version = "0.3.1"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ktbarrett"; repo = "find_libpython"; rev = "refs/tags/v${version}"; - hash = "sha256-DBBAgfYQ4UBFn5Osb1kpVBWbrZVBAvcVGQ/J4rJO/rQ="; + hash = "sha256-rYVGE9P5Xtm32kMoiqaZVMgnDbX3JBnI1uV80aNNOfw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 098cbce956fe..f63a5a37324c 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, pythonOlder, + setuptools, fetchFromGitHub, bleach, mt-940, @@ -12,26 +13,36 @@ }: buildPythonPackage rec { - version = "4.0.0"; + version = "4.1.0"; pname = "fints"; - disabled = pythonOlder "3.6"; + pyproject = true; - format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "raphaelm"; repo = "python-fints"; rev = "v${version}"; - hash = "sha256-SREprcrIdeKVpL22IViexwiKmFfbT2UbKEmxtVm6iu0="; + hash = "sha256-1k6ZeYlv0vxNkqQse9vi/NT6ag3DJONKCWB594LvER0="; }; - propagatedBuildInputs = [ - requests - mt-940 - sepaxml + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "enum-tools~=0.9.0" "" + sed -i "/document_enum/d" fints/formals.py + ''; + + build-system = [ setuptools ]; + + dependencies = [ bleach + mt-940 + requests + sepaxml ]; + pythonImportsCheck = [ "fints" ]; + nativeCheckInputs = [ pytestCheckHook pytest-mock diff --git a/pkgs/development/python-modules/finvizfinance/default.nix b/pkgs/development/python-modules/finvizfinance/default.nix index ce85324c561e..9d09ace0f578 100644 --- a/pkgs/development/python-modules/finvizfinance/default.nix +++ b/pkgs/development/python-modules/finvizfinance/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "finvizfinance"; - version = "0.14.7"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "lit26"; repo = "finvizfinance"; rev = "refs/tags/v${version}"; - hash = "sha256-ht1bez04MAgugsQqa47q2ED7z8xpiXmzkOYBR7/PZHU="; + hash = "sha256-cdQdpQWPnMJ69VxOrn8SvNWTRcGt3S/PwoClGO9uh5I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index a78c772c74a2..17f148f39f7c 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "fipy"; - version = "3.4.4"; + version = "3.4.5"; format = "setuptools"; # Python 3.12 is not yet supported. @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "usnistgov"; repo = "fipy"; rev = "refs/tags/${version}"; - hash = "sha256-XZpm+gzysR2OXBcxWUEjP1PlaLuOL2NpmeKMCH+OEb4="; + hash = "sha256-345YrGQgHNq0FULjJjLqHksyfm/EHl+KyGfxwS6xK9U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index 5cce963a2dfc..05a94d1f2dc3 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, + setuptools, six, hypothesis, mock, @@ -14,8 +14,8 @@ buildPythonPackage rec { pname = "fire"; - version = "0.5.0"; - format = "setuptools"; + version = "0.6.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,19 +23,12 @@ buildPythonPackage rec { owner = "google"; repo = "python-fire"; rev = "refs/tags/v${version}"; - hash = "sha256-cwY1RRNtpAn6LnBASQLTNf4XXSPnfhOa1WgglGEM2/s="; + hash = "sha256-tBmsy0MuJu0Ei+4lUy/XfKoOU+OuH4xqmjPv/uKVuwg="; }; - patches = [ - # https://github.com/google/python-fire/pull/440 - (fetchpatch { - name = "remove-asyncio-coroutine.patch"; - url = "https://github.com/google/python-fire/pull/440/commits/30b775a7b36ce7fbc04656c7eec4809f99d3e178.patch"; - hash = "sha256-GDAAlvZKbJl3OhajsEO0SZvWIXcPDi3eNKKVgbwSNKk="; - }) - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ six termcolor ]; diff --git a/pkgs/development/python-modules/firebase-messaging/default.nix b/pkgs/development/python-modules/firebase-messaging/default.nix index ed630616db8b..dc9bee90b3cb 100644 --- a/pkgs/development/python-modules/firebase-messaging/default.nix +++ b/pkgs/development/python-modules/firebase-messaging/default.nix @@ -1,5 +1,7 @@ { lib, + aiohttp, + aioresponses, async-timeout, buildPythonPackage, cryptography, @@ -9,9 +11,9 @@ protobuf, pytest-asyncio, pytest-mock, + pytest-socket, pytestCheckHook, pythonOlder, - requests, requests-mock, sphinx, sphinx-autodoc-typehints, @@ -21,7 +23,7 @@ buildPythonPackage rec { pname = "firebase-messaging"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +32,7 @@ buildPythonPackage rec { owner = "sdb9696"; repo = "firebase-messaging"; rev = "refs/tags/${version}"; - hash = "sha256-8e+S12ZMqAmK7OR7O45QsRa0UKQq6cngeaqz2ugi6iY="; + hash = "sha256-pZpnekJ11yx3L8l56vZOa4uS+jJMxUkYODgNAqysVeY="; }; outputs = [ @@ -44,10 +46,10 @@ buildPythonPackage rec { ] ++ passthru.optional-dependencies.docs; propagatedBuildInputs = [ + aiohttp cryptography http-ece protobuf - requests ]; passthru.optional-dependencies = { @@ -61,10 +63,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "firebase_messaging" ]; nativeCheckInputs = [ + aioresponses async-timeout requests-mock pytest-asyncio pytest-mock + pytest-socket pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 3d2938f9e6fd..8fa7a8fa99a9 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flake8"; - version = "7.0.0"; + version = "7.1.0"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "flake8"; rev = version; - hash = "sha256-2oVvchDhH3cX90RTIquYLyr+rzHxzQgYA4k4ReTxpH8="; + hash = "sha256-jkRr/k/XjiKOkcd4jlOQTnnFun7/hMHdVUWBlS1QZ1E="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index e6d6231a25ca..b35020f88ee2 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "4.4.1"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - hash = "sha256-pk1MO1GXVHdEx8QffrD+Aga6Fnc2nOR5A90Iw8m3U70="; + hash = "sha256-CoQ5/pOR1xy71koUm1uwTJDLTDROTjJQMW9ZcgtzV50="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix index 966d7db267db..46e225783493 100644 --- a/pkgs/development/python-modules/flask-assets/default.nix +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -5,8 +5,7 @@ setuptools, flask, webassets, - flask-script, - nose, + pytestCheckHook, }: buildPythonPackage rec { @@ -31,10 +30,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask webassets - flask-script - nose ]; + doCheck = false; # tests are broken with webassets 2.0 + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "flask_assets" ]; + meta = with lib; { homepage = "https://github.com/miracle2k/flask-assets"; description = "Asset management for Flask, to compress and merge CSS and Javascript files"; diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index d21d3cedd4df..e679bf16e8eb 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "flask-caching"; - version = "2.1.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "Flask-Caching"; + pname = "flask_caching"; inherit version; - hash = "sha256-t1AMFFE1g2qVLj3jqAiB2WVOMnopyFLJJlYH9cRJI1w="; + hash = "sha256-1+TKZKM7Sf6zOfzdF+a6JfXgEWjPiF5TeQ6IX4Ok0s8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 9af0d44166f6..2456aa9ab52a 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "flask-cors"; - version = "4.0.0"; + version = "4.0.1"; pyproject = true; src = fetchFromGitHub { owner = "corydolphin"; repo = "flask-cors"; rev = "refs/tags/${version}"; - hash = "sha256-o//ulROKKBv/CBJIGPBFP/+T0TpMHUVjr23Y5g1V05g="; + hash = "sha256-ISot5KglCjfbJNsnveDLK44vVaapHRAFdS+1tOd08pw="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 6f6f60c84cab..ce9da8b158dc 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, # build-system - setuptools, + flit-core, # dependencies flask, @@ -20,20 +20,21 @@ buildPythonPackage rec { pname = "flask-login"; - version = "0.6.3"; + version = "0.7.0dev0-2024-06-18"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "Flask-Login"; - inherit version; - hash = "sha256-XiPRSmB+8SgGxplZC4nQ8ODWe67sWZ11lHv5wUczAzM="; + src = fetchFromGitHub { + owner = "maxcountryman"; + repo = "flask-login"; + rev = "30675c56b651389d47b47eeb1ad114decb35b8fc"; + hash = "sha256-mIEYZnYWerjCetQuV2HRcmerMh2uLWNvHV7tfo5j4PU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ flask werkzeug ]; diff --git a/pkgs/development/python-modules/flask-mailman/default.nix b/pkgs/development/python-modules/flask-mailman/default.nix index 5727fd016da0..2403e436266e 100644 --- a/pkgs/development/python-modules/flask-mailman/default.nix +++ b/pkgs/development/python-modules/flask-mailman/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flask-mailman"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "waynerv"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wfbMz9k9cy9m95mc0Y0lqmpJczrfjhmumO31gRQy704="; + hash = "sha256-2ll5+D35dQN3r7gDpY1iSOuJBlqMorhjhFohPug8GK8="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/flask-openid/default.nix b/pkgs/development/python-modules/flask-openid/default.nix index 9c27a483f64b..6fbcb0b29c8d 100644 --- a/pkgs/development/python-modules/flask-openid/default.nix +++ b/pkgs/development/python-modules/flask-openid/default.nix @@ -2,23 +2,25 @@ lib, buildPythonPackage, fetchPypi, + setuptools, flask, python3-openid, - isPy3k, }: buildPythonPackage rec { pname = "flask-openid"; - version = "1.3.0"; - format = "setuptools"; + version = "1.3.1"; + pyproject = true; src = fetchPypi { - pname = "Flask-OpenID"; + pname = "flask_openid"; inherit version; - sha256 = "539289ed2d19af61ae38d8fe46aec9e4de2b56f9f8b46da0b98c0d387f1d975a"; + hash = "sha256-J2KLwKN+ZTCUiCMZPgaNeQNa2Ulth7dAQEQ+xITHZXo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ flask python3-openid ]; diff --git a/pkgs/development/python-modules/flask-session/default.nix b/pkgs/development/python-modules/flask-session/default.nix index c781ba6e01c1..dcfb8bfe4a36 100644 --- a/pkgs/development/python-modules/flask-session/default.nix +++ b/pkgs/development/python-modules/flask-session/default.nix @@ -2,39 +2,70 @@ lib, fetchFromGitHub, buildPythonPackage, + + # build-system flit-core, + + # dependencies flask, cachelib, + msgspec, + + # checks + boto3, + flask-sqlalchemy, pytestCheckHook, + redis, + pymongo, + pymemcache, + python-memcached, + pkgs, }: buildPythonPackage rec { pname = "flask-session"; - version = "0.5.0"; - format = "pyproject"; + version = "0.8.0"; + pyproject = true; src = fetchFromGitHub { owner = "pallets-eco"; repo = "flask-session"; rev = "refs/tags/${version}"; - hash = "sha256-t8w6ZS4gBDpnnKvL3DLtn+rRLQNJbrT2Hxm4f3+a3Xc="; + hash = "sha256-QLtsM0MFgZbuLJPLc5/mUwyYc3bYxildNKNxOF8Z/3Y="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ - flask + dependencies = [ cachelib + flask + msgspec ]; - nativeCheckInputs = [ pytestCheckHook ]; - - # The rest of the tests require database servers and optional db connector dependencies - pytestFlagsArray = [ - "-k" - "'null_session or filesystem_session'" + nativeCheckInputs = [ + flask-sqlalchemy + pytestCheckHook + redis + pymongo + pymemcache + python-memcached + boto3 ]; + preCheck = '' + ${pkgs.redis}/bin/redis-server & + ${pkgs.memcached}/bin/memcached & + ''; + + postCheck = '' + kill %% + kill %% + ''; + + disabledTests = [ "test_mongo_default" ]; # unfree + + disabledTestPaths = [ "tests/test_dynamodb.py" ]; + pythonImportsCheck = [ "flask_session" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index 955177b9bbca..c176c825943c 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -6,7 +6,6 @@ # build-system jaxlib, - pythonRelaxDepsHook, setuptools-scm, # dependencies @@ -48,7 +47,6 @@ buildPythonPackage rec { build-system = [ jaxlib - pythonRelaxDepsHook setuptools-scm ]; diff --git a/pkgs/development/python-modules/flet-runtime/default.nix b/pkgs/development/python-modules/flet-runtime/default.nix index 323e93e43ee1..d9679fdc4f45 100644 --- a/pkgs/development/python-modules/flet-runtime/default.nix +++ b/pkgs/development/python-modules/flet-runtime/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, flet-client-flutter, poetry-core, - pythonRelaxDepsHook, flet-core, httpx, oauthlib, @@ -26,7 +25,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "httpx" ]; diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index 9f4ed972ed27..7857ff562737 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, flet-client-flutter, - pythonRelaxDepsHook, # build-system poetry-core, @@ -33,7 +32,10 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook + ]; + + makeWrapperArgs = [ + "--prefix" "PYTHONPATH" ":" "$PYTHONPATH" ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/flexcache/default.nix b/pkgs/development/python-modules/flexcache/default.nix index 1442940ca199..a15801505ca9 100644 --- a/pkgs/development/python-modules/flexcache/default.nix +++ b/pkgs/development/python-modules/flexcache/default.nix @@ -2,9 +2,19 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system + setuptools, setuptools-scm, + wheel, + + # dependencies typing-extensions, + + # checks pytestCheckHook, + pytest-mpl, + pytest-subtests, }: buildPythonPackage rec { @@ -15,23 +25,31 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hgrecco"; repo = "flexcache"; - rev = "refs/tags/${version}"; + rev = version; hash = "sha256-MAbTe7NxzfRPzo/Wnb5SnPJvJWf6zVeYsaw/g9OJYSE="; }; - build-system = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + wheel + ]; dependencies = [ typing-extensions ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-mpl + pytest-subtests + ]; pythonImportsCheck = [ "flexcache" ]; - meta = { + meta = with lib; { description = "An robust and extensible package to cache on disk the result of expensive calculations"; homepage = "https://github.com/hgrecco/flexcache"; changelog = "https://github.com/hgrecco/flexcache/blob/${src.rev}/CHANGES"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ doronbehar ]; + license = licenses.bsd3; + maintainers = with maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/flexparser/default.nix b/pkgs/development/python-modules/flexparser/default.nix index b0ec855ed229..60ab74a5546e 100644 --- a/pkgs/development/python-modules/flexparser/default.nix +++ b/pkgs/development/python-modules/flexparser/default.nix @@ -2,9 +2,19 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system + setuptools, setuptools-scm, + wheel, + + # dependencies typing-extensions, + + # checks pytestCheckHook, + pytest-mpl, + pytest-subtests, }: buildPythonPackage rec { @@ -15,23 +25,31 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hgrecco"; repo = "flexparser"; - rev = "refs/tags/${version}"; + rev = version; hash = "sha256-9ImG8uh1SZ+pAbqzWBkTVn+3EBAGzzdP8vqqP59IgIw="; }; - build-system = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; - dependencies = [ typing-extensions ]; + propagatedBuildInputs = [ typing-extensions ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-mpl + pytest-subtests + ]; pythonImportsCheck = [ "flexparser" ]; - meta = { + meta = with lib; { description = "Parsing made fun ... using typing"; homepage = "https://github.com/hgrecco/flexparser"; changelog = "https://github.com/hgrecco/flexparser/blob/${src.rev}/CHANGES"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ doronbehar ]; + license = licenses.bsd3; + maintainers = with maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/flit-gettext/default.nix b/pkgs/development/python-modules/flit-gettext/default.nix new file mode 100644 index 000000000000..311861da7f71 --- /dev/null +++ b/pkgs/development/python-modules/flit-gettext/default.nix @@ -0,0 +1,79 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + substituteAll, + + # build-system + flit-scm, + wheel, + + # dependencies + flit-core, + gettext, + + # tests + build, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "flit-gettext"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "codingjoe"; + repo = "flit-gettext"; + rev = version; + hash = "sha256-YsRfpciSrHmivEJKfzdp6UaPx2tSr3VdjU4ZIbYQX6c="; + }; + + patches = [ + (substituteAll { + src = ./msgfmt-path.patch; + msgfmt = lib.getExe' gettext "msgfmt"; + }) + ]; + + postPatch = '' + sed -i "s/--cov//" pyproject.toml + ''; + + nativeBuildInputs = [ + flit-scm + wheel + ]; + + propagatedBuildInputs = [ flit-core ]; + + optional-dependencies = { + scm = [ flit-scm ]; + }; + + nativeCheckInputs = [ + build + pytestCheckHook + wheel + ] ++ optional-dependencies.scm; + + disabledTests = [ + # tests for missing msgfmt, but we always provide it + "test_compile_gettext_translations__no_gettext" + ]; + + disabledTestPaths = [ + # calls python -m build, but can't find build + "tests/test_core.py" + "tests/test_scm.py" + ]; + + pythonImportsCheck = [ "flit_gettext" ]; + + meta = with lib; { + description = "Compiling gettext i18n messages during project bundling"; + homepage = "https://github.com/codingjoe/flit-gettext"; + license = licenses.bsd2; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/flit-gettext/msgfmt-path.patch b/pkgs/development/python-modules/flit-gettext/msgfmt-path.patch new file mode 100644 index 000000000000..957eb513f772 --- /dev/null +++ b/pkgs/development/python-modules/flit-gettext/msgfmt-path.patch @@ -0,0 +1,13 @@ +diff --git a/flit_gettext/utils.py b/flit_gettext/utils.py +index dd1b135..1c8877c 100644 +--- a/flit_gettext/utils.py ++++ b/flit_gettext/utils.py +@@ -7,7 +7,7 @@ def compile_gettext_translations(config): + """Compile gettext translations.""" + print("\33[1m* Compiling gettext translations...\33[0m") + +- msgfmt = shutil.which("msgfmt") ++ msgfmt = shutil.which("msgfmt") or "@msgfmt@" + + if msgfmt is None: + raise OSError("msgfmt not found, please install gettext or check your PATH.") diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix index 4314bc737779..320cb1343f46 100644 --- a/pkgs/development/python-modules/fluent-logger/default.nix +++ b/pkgs/development/python-modules/fluent-logger/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "fluent-logger"; - version = "0.11.0"; + version = "0.11.1"; pyproject = true; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-logger-python"; rev = "refs/tags/v${version}"; - hash = "sha256-PfyjJZT5K/IMsyyWNZdh/CZf+uZHeJGfhyAPuu0IhJk="; + hash = "sha256-i6S5S2ZUwC5gQPdVjefUXrKj43iLIqxd8tdXbMBJNnA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix index f331c0705cd2..b514947d8e3b 100644 --- a/pkgs/development/python-modules/flufl/bounce.nix +++ b/pkgs/development/python-modules/flufl/bounce.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch2, setuptools, atpublic, zope-interface, @@ -19,6 +20,14 @@ buildPythonPackage rec { hash = "sha256-JVBK65duwP5aGc1sQTo0EMtRT9zb3Kn5tdjTQ6hgODE="; }; + patches = [ + (fetchpatch2 { + # Replace deprecated failIf with assertFalse for Python 3.12 compatibility. + url = "https://gitlab.com/warsaw/flufl.bounce/-/commit/e0b9fd0f24572e024a8d0484a3c9fb4542337d18.patch"; + hash = "sha256-HJHEbRVjiiP5Z7W0sQCj6elUMyaWOTqQw6UpYOYCVZM="; + }) + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 619a6c1f6a43..ccc8a300095c 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "folium"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "python-visualization"; repo = "folium"; rev = "refs/tags/v${version}"; - hash = "sha256-ADDqjZUQVI4K/Bf38905g1K9TD2/e1RYvYWddvFtdrU="; + hash = "sha256-uKT6WqT3pI3rqfV/3CA+mXBk3F7h4RWW1h2FPIy0JH4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix index d98575536419..5d0f5d6dcaef 100644 --- a/pkgs/development/python-modules/fontbakery/default.nix +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -29,7 +29,6 @@ protobuf, pytestCheckHook, pytest-xdist, - pythonRelaxDepsHook, pyyaml, requests, requests-mock, @@ -47,11 +46,11 @@ buildPythonPackage rec { pname = "fontbakery"; - version = "0.12.5"; + version = "0.12.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DN1v5MQtMhHO12tVPkJUuIfh+X3kb1o71zAwNgtLH+I="; + hash = "sha256-7cZeazEyAyU+WDop2n7wneg2wzh+9U9atKSRcreJpGw="; }; pyproject = true; @@ -96,7 +95,6 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ installShellFiles - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 1f7e3f04d050..419124aea28c 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.51.0"; + version = "4.53.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JUAFGLjyq/2OXlhTB6dIcO3Mq7Rx1HII+sg2TaQfPYU="; + hash = "sha256-eWN5QcdiQIDfjn7Hrqk0f5jMaADpqNa/kExncjcWXFw="; }; build-system = [ diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix deleted file mode 100644 index 178f97c0f3d6..000000000000 --- a/pkgs/development/python-modules/forbiddenfruit/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pynose, - setuptools, -}: - -buildPythonPackage rec { - version = "0.1.4"; - pname = "forbiddenfruit"; - pyproject = true; - - src = fetchFromGitHub { - owner = "clarete"; - repo = "forbiddenfruit"; - rev = "refs/tags/${version}"; - hash = "sha256-yHIZsVn2UVmWeBNIzWDE6AOwAXZilPqXo+bVtXqGkJk="; - }; - - build-system = [ setuptools ]; - - env.FFRUIT_EXTENSION = "true"; - - pythonImportsCheck = [ "forbiddenfruit" ]; - - nativeCheckInputs = [ pynose ]; - - # https://github.com/clarete/forbiddenfruit/pull/47 required to switch to pytest - checkPhase = '' - runHook preCheck - - find ./build -name '*.so' -exec mv {} tests/unit \; - nosetests - - runHook postCheck - ''; - - meta = with lib; { - description = "Patch python built-in objects"; - homepage = "https://github.com/clarete/forbiddenfruit"; - changelog = "https://github.com/clarete/forbiddenfruit/releases/tag/${version}"; - license = with licenses; [ - mit - gpl3Plus - ]; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/fpdf2/default.nix b/pkgs/development/python-modules/fpdf2/default.nix index 378798f5ea9b..2cd654ded25a 100644 --- a/pkgs/development/python-modules/fpdf2/default.nix +++ b/pkgs/development/python-modules/fpdf2/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "fpdf2"; - version = "2.7.8"; + version = "2.7.9"; pyproject = true; src = fetchFromGitHub { owner = "py-pdf"; repo = "fpdf2"; rev = "refs/tags/${version}"; - hash = "sha256-6aedXr8Yhes1aYIslBvw2HzRc4BwYDIiGJvEdp1tFSc="; + hash = "sha256-8CuK8ZFn4msOSNIdgOFjD3ygVeiBUw4/Bc3w1J6Kn9U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/freebox-api/default.nix b/pkgs/development/python-modules/freebox-api/default.nix index a5fa4fe5746f..ec5df3641737 100644 --- a/pkgs/development/python-modules/freebox-api/default.nix +++ b/pkgs/development/python-modules/freebox-api/default.nix @@ -6,7 +6,6 @@ poetry-core, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, urllib3, }: @@ -26,7 +25,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "urllib3" ]; diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index ab170e3ee916..cc15733d053b 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -4,20 +4,21 @@ fetchPypi, pytestCheckHook, python-dateutil, + pythonAtLeast, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "freezegun"; - version = "1.4.0"; + version = "1.5.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EJObC6D/Wtrs87BqXC9zBx2WeOUHxertsjx2HVasd0s="; + hash = "sha256-sp3t/NptXo4IPOcbK1QnU61Iz+xEA3s/x5cC4pgKiek="; }; nativeBuildInputs = [ setuptools ]; @@ -26,6 +27,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.13") [ + # https://github.com/spulec/freezegun/issues/547 + "test_method_decorator_works_on_unittest_kwarg_frozen_time" + "test_method_decorator_works_on_unittest_kwarg_frozen_time_with_func" + "test_method_decorator_works_on_unittest_kwarg_hello" + ]; + pythonImportsCheck = [ "freezegun" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/freud/default.nix b/pkgs/development/python-modules/freud/default.nix index e5b776734367..49a25ed500e3 100644 --- a/pkgs/development/python-modules/freud/default.nix +++ b/pkgs/development/python-modules/freud/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "freud"; - version = "3.0.0"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "glotzerlab"; repo = "freud"; - rev = "v${version}"; - hash = "sha256-aKh2Gub1vU/wzvWkCl8yzlIswp8CtR975USiCr6ijUI="; + rev = "refs/tags/v${version}"; + hash = "sha256-jlscEHQ1q4oqxE06NhVWCOlPRcjDcJVrvy4h6iYrkz0="; fetchSubmodules = true; }; # Because we prefer to not `leaveDotGit`, we need to fool upstream into diff --git a/pkgs/development/python-modules/frida-python/default.nix b/pkgs/development/python-modules/frida-python/default.nix index 0ef08b77d371..d73e5645e517 100644 --- a/pkgs/development/python-modules/frida-python/default.nix +++ b/pkgs/development/python-modules/frida-python/default.nix @@ -5,14 +5,25 @@ fetchPypi, buildPythonPackage, typing-extensions, + darwin, }: let version = "16.0.19"; format = "setuptools"; - devkit = fetchurl { - url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-linux-x86_64.tar.xz"; - hash = "sha256-yNXNqv8eCbpdQKFShpAh6rUCEuItrOSNNLOjESimPdk="; - }; + + devkit = { + aarch64-darwin = fetchurl { + url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-macos-arm64.tar.xz"; + hash = "sha256-5VAZnpHQ5wjl7IM96GhIKOfFYHFDKKOoSjN1STna2UA="; + }; + + x86_64-linux = fetchurl { + url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-linux-x86_64.tar.xz"; + hash = "sha256-yNXNqv8eCbpdQKFShpAh6rUCEuItrOSNNLOjESimPdk="; + }; + }.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + in buildPythonPackage rec { pname = "frida-python"; @@ -32,8 +43,14 @@ buildPythonPackage rec { popd ''; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit"; + propagatedBuildInputs = [ typing-extensions ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + ]; + pythonImportsCheck = [ "frida" ]; passthru = { @@ -45,6 +62,6 @@ buildPythonPackage rec { homepage = "https://www.frida.re"; license = lib.licenses.wxWindows; maintainers = with lib.maintainers; [ s1341 ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-darwin" "x86_64-linux" ]; }; } diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index 89140e97a432..7bf6d5a6d2a7 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "frigidaire"; - version = "0.18.19"; + version = "0.18.21"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = "frigidaire"; rev = "refs/tags/${version}"; - hash = "sha256-wbYijFiMk+EIAjD6+mKt/c6JwN9oQLfeL1Pk30RbKKs="; + hash = "sha256-7fpVFKhLXBD0ec2mGfbFHygaH8BtOIOd5NoYz03IKp8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index a52c32614657..2ca4ab01e716 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -12,6 +12,7 @@ # tests pytestCheckHook, + versionCheckHook, }: buildPythonPackage rec { @@ -30,7 +31,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ wcwidth ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + versionCheckHook + pytestCheckHook + ]; preCheck = '' export PATH=$out/bin:$PATH diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix index fb9e9b620663..4b4f81d1a2aa 100644 --- a/pkgs/development/python-modules/furl/default.nix +++ b/pkgs/development/python-modules/furl/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + pythonAtLeast, flake8, orderedmultidict, pytestCheckHook, @@ -35,6 +36,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # AssertionError: assert '//////path' == '////path' + "test_odd_urls" + ]; + pythonImportsCheck = [ "furl" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 190f54481679..26eab2292967 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchPypi, - pythonRelaxDepsHook, sphinx, beautifulsoup4, sphinx-basic-ng, @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "furo"; - version = "2024.1.29"; + version = "2024.5.6"; format = "wheel"; disabled = pythonOlder "3.8"; @@ -20,10 +19,9 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-NUi+LO9Foy+M3AJy1BX8s+X6ag603f4h3z7PH+RaE88="; + hash = "sha256-SQoA0IwKN+zJDeA66SJ+jrXW9/dQ7fmAfzmKK98jWN4="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "sphinx" ]; diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 52711cead2d0..29809ebdfa5f 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, sdcc, libusb1, + setuptools-scm, crcmod, }: @@ -20,7 +21,10 @@ buildPythonPackage rec { hash = "sha256-PtWxjT+97+EeNMN36zOT1+ost/w3lRRkaON3Cl3dpp4="; }; - nativeBuildInputs = [ sdcc ]; + nativeBuildInputs = [ + setuptools-scm + sdcc + ]; propagatedBuildInputs = [ libusb1 diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index a11a9d0fabe4..ace8f66e14ea 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, setuptools-scm, pythonOlder, - pythonRelaxDepsHook, fetchFromGitHub, pytestCheckHook, pytest-xdist, @@ -28,7 +27,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index 16bd5bb9085d..5ab18ebb6905 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { hash = "sha256-WuGeZ2EggyhbEDIbjg4ffIFaj2DyHi8Tvowhoi5k2Os="; }; + pythonRelaxDeps = [ "requests-oauthlib" ]; + build-system = [ pdm-backend ]; dependencies = [ diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix index 3dba75d253f5..4c192b43f666 100644 --- a/pkgs/development/python-modules/gbulb/default.nix +++ b/pkgs/development/python-modules/gbulb/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "gbulb"; - version = "0.6.4"; + version = "0.6.5"; format = "setuptools"; src = fetchFromGitHub { owner = "beeware"; repo = "gbulb"; rev = "refs/tags/v${version}"; - hash = "sha256-AdZSvxix0cpoFQSrslGl+hB/s6Nh0EsWMQmXZAJVJOg="; + hash = "sha256-03Ott+V3Y4+Y72Llsug5coqG3C+pjAdLkPYbaY/6Uow="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 95b6db3b9a29..2c42a1008ad1 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "6.1.0"; + version = "6.1.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-mZn/3oROIUSv6cCxXs3rBJtlmKsqNflTW2pcER8GisE="; + hash = "sha256-aKLuv/hH9ZVM8WeUwCtJ6BB2/aQh6NHJKh890hR23eM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix b/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix index 9d93efe8897d..87f9e361feaa 100644 --- a/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix +++ b/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix @@ -11,7 +11,6 @@ pyopenssl, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, retry-decorator, rsa, six, diff --git a/pkgs/development/python-modules/gekko/default.nix b/pkgs/development/python-modules/gekko/default.nix index d62c1f3dbfd1..1fb6123f0133 100644 --- a/pkgs/development/python-modules/gekko/default.nix +++ b/pkgs/development/python-modules/gekko/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "gekko"; - version = "1.1.1"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xc6NfPCvkEYjUG82QmFqDuu02QNwKfoS6DDpkdaMWJ8="; + hash = "sha256-JN7CWOR7CcWzmKDNlUXm/6ilrTJ3vLa8h2TNnmALhfk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix index 218904113c07..78ee38cfa32a 100644 --- a/pkgs/development/python-modules/genshi/default.nix +++ b/pkgs/development/python-modules/genshi/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "genshi"; - version = "0.7.7"; + version = "0.7.9"; src = fetchPypi { pname = "Genshi"; inherit version; - hash = "sha256-wQBSCGLNaQhdEO4ah+kSief1n2s9m9Yiv1iygE5rmqs="; + hash = "sha256-x2FwqLLcGJROCRUQPChMuInfzuNODhQLozY8gPdUGtI="; }; # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase) diff --git a/pkgs/development/python-modules/getjump/default.nix b/pkgs/development/python-modules/getjump/default.nix index 62f6e49ec63d..153f25ad2cb1 100644 --- a/pkgs/development/python-modules/getjump/default.nix +++ b/pkgs/development/python-modules/getjump/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "getjump"; - version = "2.4.2"; + version = "2.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WSLfhVCqP+N+2Rs2PUXOknnlNx3UtWdFYrK1lTW1fqQ="; + hash = "sha256-3VxsKum6aB35XYjz9ZKkUBdPuofOWzG+ttkX9pnzu7U="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/gflanguages/default.nix b/pkgs/development/python-modules/gflanguages/default.nix index 5f0976661fcc..058f241d37d7 100644 --- a/pkgs/development/python-modules/gflanguages/default.nix +++ b/pkgs/development/python-modules/gflanguages/default.nix @@ -5,7 +5,6 @@ protobuf, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, setuptools, setuptools-scm, uharfbuzz, @@ -14,13 +13,13 @@ buildPythonPackage rec { pname = "gflanguages"; - version = "0.6.1"; + version = "0.6.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mlRNzrAgeEt1/VbQEXWIxCD9NkULMOnkFsALO5H+1SY="; + hash = "sha256-v93mXDwHT/8Tau78ApLUR+dQCpL9jmRQp0BT5y/sfq4="; }; pyproject = true; @@ -39,7 +38,6 @@ buildPythonPackage rec { dependencies = [ protobuf ]; nativeCheckInputs = [ - pythonRelaxDepsHook pytestCheckHook uharfbuzz youseedee diff --git a/pkgs/development/python-modules/gfsubsets/default.nix b/pkgs/development/python-modules/gfsubsets/default.nix index 33dca6d3a858..ff2db29a1eb2 100644 --- a/pkgs/development/python-modules/gfsubsets/default.nix +++ b/pkgs/development/python-modules/gfsubsets/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gfsubsets"; - version = "2024.2.5"; + version = "2024.5.9"; gitTag = "v2024.02.05"; src = fetchPypi { inherit pname version; - hash = "sha256-g9QxLa3B1MMTs+jmj4CyJySZRU0zoFNYdbOZwHjKPaQ="; + hash = "sha256-OgpdcOJWX0o0Hy6LjRsxsZMAVWgKziM+bqe/FfJniZY="; }; pyproject = true; diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index 838e0679c74c..422b7b52c3c5 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -4,7 +4,6 @@ fetchPypi, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, setuptools, smmap, }: @@ -23,7 +22,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "smmap" ]; diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index fe14c80356ae..85e581200fde 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -11,13 +11,12 @@ pytest-xdist, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, typing-extensions, }: buildPythonPackage rec { pname = "githubkit"; - version = "0.11.5"; + version = "0.11.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +25,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; rev = "refs/tags/v${version}"; - hash = "sha256-YlI5NEfZD+9I2Ikd/LyEq+MnsdYixi+UVNUP8mfFKc8="; + hash = "sha256-bcQUms4nZ4BUowcF3YxTQPc6Ts6VoRumEA0DuCPQpfg="; }; postPatch = '' @@ -38,7 +37,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ hishel diff --git a/pkgs/development/python-modules/glueviz/default.nix b/pkgs/development/python-modules/glueviz/default.nix index 98a8248333a6..1db27a1d7282 100644 --- a/pkgs/development/python-modules/glueviz/default.nix +++ b/pkgs/development/python-modules/glueviz/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "glueviz"; - version = "1.17.1"; + version = "1.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "glue-viz"; repo = "glue"; rev = "refs/tags/v${version}"; - sha256 = "sha256-nr84GJAGnpKzjZEFNsQujPysSQENwGxdNfPIYUCJkK4="; + sha256 = "sha256-C9UqDdhPcaznidiDlQO27Vgct2MT9gVlH740hoYg3Bc="; }; buildInputs = [ pyqt-builder ]; diff --git a/pkgs/development/python-modules/glyphsets/default.nix b/pkgs/development/python-modules/glyphsets/default.nix index 2792bec5c3ed..e918de58ae85 100644 --- a/pkgs/development/python-modules/glyphsets/default.nix +++ b/pkgs/development/python-modules/glyphsets/default.nix @@ -24,6 +24,16 @@ buildPythonPackage rec { hash = "sha256-fa+W1IGIZcn1P1xNKm1Yb/TOuf4QdDVnIvlDkOLOcLY="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "setuptools_scm>=8.0.4,<8.1" "setuptools_scm" + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + dependencies = [ defcon fonttools @@ -31,16 +41,15 @@ buildPythonPackage rec { glyphslib pyyaml requests - setuptools unicodedata2 ]; - build-system = [ setuptools-scm ]; - doCheck = true; nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' export PATH="$out/bin:$PATH" ''; + disabledTests = [ # This "test" just tries to connect to PyPI and look for newer releases. Not needed. "test_dependencies" diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index 17f14f488944..f0db91f45cc0 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { - version = "8.1.2"; + version = "8.2.10"; format = "setuptools"; pname = "gnureadline"; disabled = isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-QmKmqjVqsi72QvQ6f5TrQqctbwxTLttOjGuTP1cwVtI="; + hash = "sha256-p0a6mNTeN7B55C2Um3BMM8FoswvR+QcaHSXJ2ppEmZc="; }; buildInputs = [ pkgs.ncurses ]; diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 1ee6497fd181..10fb6837f5ee 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.6.5"; + version = "0.6.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xAicJ3+k4mci92qwPuMDnyi+i/HJvigpSLlYOhVMbXk="; + hash = "sha256-FznwNcru7KXCj4h0Be7IaQ8zctr3n+zyZFSpek8XM6g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 440729136876..cbff06c5d889 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.18.0"; + version = "2.19.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Ytl0F7/GdNbO8lHlxNY5qWVeAMRVKMQ2T7/rtHjOcqk="; + hash = "sha256-zxt8JpQEeIbSrxEooDrpnjkRCKCIBPh8/TWXDknJzRA="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 1a6ef5e6c9cf..c31e4c81359f 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.133.0"; + version = "2.135.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KTCSkFtmoEbTGHqZrEVOErAMwscERPJusvH5wagnILQ="; + hash = "sha256-tVKigSPtlUkwNWmNuA6O14yRBqi0IuY6F1FQubVbcE4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 807cf745f788..d086f02de5c0 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.29.0"; + version = "2.30.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zy3/My0HMidVD/x0V4aKxCGNbFALFV/mzBfSsTYCw2A="; + hash = "sha256-q2MKEyD2cgkJrXan29toQc31xmsyjWkAJ+SGe9+xZog="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 08770d71976d..c6ef79d8ad36 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.4.3"; + version = "1.4.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+1BOYZn+jehbqp0xzs9ndod4Uf5Yhn3mAzF+x8xzmYc="; + hash = "sha256-i0Qn8G+6ZpqVn9VMjaY1YP9M8vjiwVjCDVR5sIiQR5U="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index a8240580d12e..7b05f46dbd34 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.13.3"; + version = "2.13.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iRqQgurt6xe8W7ck/BULdwLGhNdCD58irj98X8YRxxo="; + hash = "sha256-NxAoob0wJKobtcEQNTgH+fylnTtJdL98h23IVNfLhew="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 7353e61ad5d4..05040c6ae1c9 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.9.3"; + version = "5.10.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-l9ZHiR5/TNJfa4Oa5XzTVYCd8so5ZlPtJK9itO8C9BI="; + hash = "sha256-HjIv6DujcvnUPYgdr9z97VDaqpoZe6ReOA1vI7pQSWA="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 66de0b03ad00..43fa37d3aabf 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.16.0"; + version = "2.16.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5hrnAimm5TLkOcjRZEejICREfy7kojA/xNBUwljWh38="; + hash = "sha256-M4HrgpbtECjZtCGqQrkQDxmMWH+OM8AF0xplVnALda4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index efb503cc702f..5a9c25bfc20f 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.21.4"; + version = "2.23.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AQW8FKOYt/05GUO766/VkY8+NAaCepiXObLcOInMEhg="; + hash = "sha256-UrX8b3CxY1FvrWEKr8CI++eI9QHVu+HV9FjNw/y6/Sw="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index ca1b446f9232..2612fb157fae 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.17.3"; + version = "1.17.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oKOqWVmAP14dKpbVDlcX2KSRceTqVES/UGlLsYtnWHA="; + hash = "sha256-ocZ41cEZVjSfFMVoNiPOxwaymn9eylWmw6qlp/R/yMQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index bbcab9f59bb9..79071c30d32e 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.31.0"; + version = "1.32.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1BbYIjVlAEz3cnPx3tzQ5z8z415X3TZJjUsr5aXcs4w="; + hash = "sha256-EQ3KkE+5mxaFrJ6+zfGFQKI013dY4TyrxxzvDE/KuME="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index b3f0d3d55830..3d47efcfcfbb 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -12,25 +12,23 @@ protobuf, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, setuptools, }: buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.16.0"; + version = "2.17.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3aSF+lA3EKgo0BJGvRbOnbCCPcUbvKdCzpamgX1YZp8="; + hash = "sha256-STeKv/VO9la1Lcpe8PLrqaqD3CsscseHFLA6GpX+k4g="; }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 919a21471a8b..e25cf74a493e 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.15.3"; + version = "3.15.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7Vh6HmDPhHw7Gt1rKCVuLRci+nOkKFM09excqTPmFvI="; + hash = "sha256-nZ3YzyJe+fsGdahvkuecrDKVoo0JpEeeEj7wy+VHSWs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 321331671859..2ee06820909d 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.7.2"; + version = "3.7.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BEMwrWGMgQMz/yKWzSf/0UXySWONGzWycN5rRgsA6NI="; + hash = "sha256-7kjEjoIMfgmTJmOYaXD+9FbcD0XHr3KdRvHz3ZfB37Y="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix index c29a04239447..11d64bd57447 100644 --- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix +++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-vpc-access"; - version = "1.10.3"; + version = "1.10.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-mkDYB4HFJEu1ZRKo58s5a9lZjQ0pUs6nOBMnm27ajeM="; + hash = "sha256-FmCNw0esH7WbH0v4YzHyvc0lyRhJp3ywJNe+gMePdTU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index 21730414ed6c..69882392bb98 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -9,7 +9,6 @@ protobuf, pydantic, pythonOlder, - pythonRelaxDepsHook, setuptools, tqdm, typing-extensions, @@ -33,7 +32,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ google-ai-generativelanguage diff --git a/pkgs/development/python-modules/google-re2/default.nix b/pkgs/development/python-modules/google-re2/default.nix index 01821eee8fc3..bcfbd6744dd6 100644 --- a/pkgs/development/python-modules/google-re2/default.nix +++ b/pkgs/development/python-modules/google-re2/default.nix @@ -3,28 +3,31 @@ buildPythonPackage, pythonOlder, fetchPypi, + setuptools, pybind11, re2, - six, }: buildPythonPackage rec { pname = "google-re2"; - version = "1.1"; - format = "setuptools"; + version = "1.1.20240601"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-06lGfuUrRqx3ypKPbQy+rM/ZLwPKDw9lud9qlRhPOhw="; + pname = "google_re2"; + inherit version; + hash = "sha256-MYf2iFUwd1TUnzmOWDhT1bCNeD0/5mL2kWuZkHX34JU="; }; - propagatedBuildInputs = [ - pybind11 - re2 - six - ]; + build-system = [ setuptools ]; + + buildInputs = [ re2 ]; + + dependencies = [ pybind11 ]; + + doCheck = false; # no tests in sdist pythonImportsCheck = [ "re2" ]; diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index eff67014bed5..f5975586735c 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.7.0"; + version = "2.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Xxj1+pg29LCDFiBkocLJjBcjm/2pylCtlwzPkF8+Yls="; + hash = "sha256-6uRRp7LizbqqD9LrAMyKHuXpXha1VZc1nLw9J9fZDjM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 32449c05311d..9e62755a0e11 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.63.0"; + version = "1.63.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-F60BsR1fHQFxwG07pcBMVEdOiDtmuUlyK0k47iaU704="; + hash = "sha256-xkQvegprKoA2lFfXnmZyu33LqriOCEgwJJfj7IB4Cmo="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/gophish/default.nix b/pkgs/development/python-modules/gophish/default.nix index 8a7d8c90d487..48b4e880e5fc 100644 --- a/pkgs/development/python-modules/gophish/default.nix +++ b/pkgs/development/python-modules/gophish/default.nix @@ -10,7 +10,6 @@ pyparsing, python-dateutil, pythonOlder, - pythonRelaxDepsHook, requests, setuptools, six, @@ -35,7 +34,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ appdirs diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix index 28d364c2650d..d40d2f3c6174 100644 --- a/pkgs/development/python-modules/gpsoauth/default.nix +++ b/pkgs/development/python-modules/gpsoauth/default.nix @@ -5,7 +5,6 @@ poetry-core, pycryptodomex, pythonOlder, - pythonRelaxDepsHook, requests, }: @@ -22,7 +21,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook poetry-core ]; diff --git a/pkgs/development/python-modules/gpt-2-simple/default.nix b/pkgs/development/python-modules/gpt-2-simple/default.nix index d8561bf346e9..e2908da74f70 100644 --- a/pkgs/development/python-modules/gpt-2-simple/default.nix +++ b/pkgs/development/python-modules/gpt-2-simple/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Easily retrain OpenAI's GPT-2 text-generating model on new texts"; homepage = "https://github.com/minimaxir/gpt-2-simple"; license = licenses.mit; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/gpustat/default.nix b/pkgs/development/python-modules/gpustat/default.nix index c7a920a07f1a..d3a06d7f8900 100644 --- a/pkgs/development/python-modules/gpustat/default.nix +++ b/pkgs/development/python-modules/gpustat/default.nix @@ -8,7 +8,6 @@ psutil, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, setuptools-scm, }: @@ -27,7 +26,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "nvidia-ml-py" ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools-scm ]; diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index 176200e95c8e..161c364694e3 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "gpy"; - version = "1.13.0"; + version = "1.13.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SheffieldML"; repo = "GPy"; - rev = "refs/tags/v.${version}"; - hash = "sha256-2HKKKBD/JFSeLQGvvgObxqxv9IHEKFnpaejdKbYZbmY="; + rev = "refs/tags/v${version}"; + hash = "sha256-ykoGdXy1uagKrP9Nqn74mDESZwKVPq6wQgnHlCznevM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix index 5c82e860ed5a..27bc11f0ee0e 100644 --- a/pkgs/development/python-modules/gpytorch/default.nix +++ b/pkgs/development/python-modules/gpytorch/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, linear-operator, scikit-learn, setuptools, @@ -23,6 +24,16 @@ buildPythonPackage rec { hash = "sha256-cpkfjx5G/4duL1Rr4nkHTHi03TDcYbcx3bKP2Ny7Ijo="; }; + patches = [ + (fetchpatch { + # https://github.com/cornellius-gp/gpytorch/pull/2545 + name = "scipy-1.14-compatibility.patch"; + url = "https://github.com/cornellius-gp/gpytorch/commit/2562be472521b8aec366de2619e3130a96fab982.patch"; + excludes = [ "setup.py" ]; + hash = "sha256-znOFpN6go2iIxP24VjJLKF3Laxcr4xV/IyP2y36g4QY="; + }) + ]; + nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix index 8e2c61075d98..e632650a40a6 100644 --- a/pkgs/development/python-modules/grad-cam/default.nix +++ b/pkgs/development/python-modules/grad-cam/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchPypi, - pythonRelaxDepsHook, setuptools, matplotlib, numpy, @@ -34,7 +33,6 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index 768e5e3f9956..1c7a51dd2aa8 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -4,7 +4,6 @@ fetchFromGitHub, nix-update-script, pythonOlder, - pythonRelaxDepsHook, # pyproject hatchling, hatch-requirements-txt, @@ -58,7 +57,6 @@ buildPythonPackage rec { hatchling hatch-requirements-txt hatch-fancy-pypi-readme - pythonRelaxDepsHook ]; dependencies = [ diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 4d028da04e49..5cc026cd3f2a 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchPypi, pythonOlder, - pythonRelaxDepsHook, writeShellScriptBin, gradio, @@ -91,7 +90,6 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - pythonRelaxDepsHook hatchling hatch-requirements-txt hatch-fancy-pypi-readme diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index 14fcdeb744e7..bea97bea98f7 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -37,6 +37,9 @@ buildPythonPackage rec { graphql-relay ]; + # snaphottest->fastdiff->wasmer dependency chain does not support 3.12. + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ pytest7CheckHook pytest-asyncio diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 891af40a779d..74e7442f0e41 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "graspologic"; - version = "3.3.0"; + version = "3.4.1"; pyproject = true; disabled = isPy27; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "graspologic"; rev = "refs/tags/v${version}"; - hash = "sha256-hd3OyV95N8vhc4s50HbKkrcUOeSegn66Dkw7dixim00="; + hash = "sha256-taX/4/uCQXW7yFykVHY78hJIGThEIycHwrEOZ3h1LPY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index 54869f592d66..147cd19164e2 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "greatfet"; - version = "2019.5.1.dev0"; + version = "2024.0.1"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "greatfet"; - rev = "v${version}"; - sha256 = "054vkx4xkbhxhh5grjbs9kw3pjkv1zapp91ysrqr0c8mg1pc7zxv"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-AKpaJZJTzMY3IQXLvVnLWh3IHeGp759z6tvaBl28BHQ="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 0d27b5bf7107..f1e5c52f0f92 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + setuptools, netifaces, pycryptodome, pytest-asyncio, @@ -12,19 +13,21 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.4.6"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "cmroche"; repo = "greeclimate"; rev = "refs/tags/v${version}"; - hash = "sha256-yoCbFLtyPEtELp2ptpBBdJTE7yyMqUeMRWT3wfKk5JM="; + hash = "sha256-EHVUbvz0lz0gnmLd8XpIVo8OaZPr2k96l1Wu57pnIJE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ netifaces pycryptodome ]; @@ -34,6 +37,23 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # OSError: [Errno 101] Network is unreachable + "test_get_device_info" + "test_device_bind" + "test_device_late_bind" + "test_update_properties" + "test_set_properties" + "test_uninitialized_properties" + "test_update_current_temp" + "test_send_temperature" + "test_enable_disable_sleep_mode" + "test_mismatch_temrec_farenheit" + "test_device_equality" + "test_issue_69_TemSen_40_should_not_set_firmware_v4" + "test_issue_87_quiet_should_set_2" + ]; + pythonImportsCheck = [ "greeclimate" "greeclimate.device" diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 5c41e8845541..2ea828cd4174 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -24,6 +24,11 @@ let hash = "sha256-QzdEQjUyWVVM4zWZ2otpLVqpb4l21WfUut8mM3H75JE="; }; + patches = [ + # https://github.com/python-greenlet/greenlet/pull/396 + ./python-3.13-compat.patch + ]; + nativeBuildInputs = [ setuptools ]; # tests in passthru, infinite recursion via objgraph/graphviz diff --git a/pkgs/development/python-modules/greenlet/python-3.13-compat.patch b/pkgs/development/python-modules/greenlet/python-3.13-compat.patch new file mode 100644 index 000000000000..9f5488b831d3 --- /dev/null +++ b/pkgs/development/python-modules/greenlet/python-3.13-compat.patch @@ -0,0 +1,313 @@ +Port of https://github.com/python-greenlet/greenlet/pull/396 + +From 94979488f841fcb41bd2bd3b80b5c0b011af4c94 Mon Sep 17 00:00:00 2001 +From: Victor Stinner +Date: Wed, 14 Feb 2024 16:37:42 +0100 +Subject: [PATCH 1/5] Fix #392: Port to Python 3.13 + +* Replace C_RECURSION_LIMIT with Py_C_RECURSION_LIMIT. +* Add Py_C_RECURSION_LIMIT for Python 3.12 and older. +* Disable GREENLET_USE_CFRAME on Python 3.13. +* Define Py_BUILD_CORE to include pycore_frame.h. +--- + src/greenlet/TPythonState.cpp | 10 +++++++--- + src/greenlet/greenlet_cpython_compat.hpp | 13 +++++++++++-- + src/greenlet/greenlet_greenlet.hpp | 1 + + 3 files changed, 19 insertions(+), 5 deletions(-) + +diff --git a/src/greenlet/TPythonState.cpp b/src/greenlet/TPythonState.cpp +index 465d4174..c0dbf703 100644 +--- a/src/greenlet/TPythonState.cpp ++++ b/src/greenlet/TPythonState.cpp +@@ -130,11 +130,13 @@ void PythonState::operator<<(const PyThreadState *const tstate) noexcept + #if GREENLET_PY311 + #if GREENLET_PY312 + this->py_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining; +- this->c_recursion_depth = C_RECURSION_LIMIT - tstate->c_recursion_remaining; ++ this->c_recursion_depth = Py_C_RECURSION_LIMIT - tstate->c_recursion_remaining; + #else // not 312 + this->recursion_depth = tstate->recursion_limit - tstate->recursion_remaining; + #endif // GREENLET_PY312 ++ #if GREENLET_USE_CFRAME + this->current_frame = tstate->cframe->current_frame; ++ #endif + this->datastack_chunk = tstate->datastack_chunk; + this->datastack_top = tstate->datastack_top; + this->datastack_limit = tstate->datastack_limit; +@@ -199,12 +201,14 @@ void PythonState::operator>>(PyThreadState *const tstate) noexcept + #if GREENLET_PY311 + #if GREENLET_PY312 + tstate->py_recursion_remaining = tstate->py_recursion_limit - this->py_recursion_depth; +- tstate->c_recursion_remaining = C_RECURSION_LIMIT - this->c_recursion_depth; ++ tstate->c_recursion_remaining = Py_C_RECURSION_LIMIT - this->c_recursion_depth; + this->unexpose_frames(); + #else // \/ 3.11 + tstate->recursion_remaining = tstate->recursion_limit - this->recursion_depth; + #endif // GREENLET_PY312 ++ #if GREENLET_USE_CFRAME + tstate->cframe->current_frame = this->current_frame; ++ #endif + tstate->datastack_chunk = this->datastack_chunk; + tstate->datastack_top = this->datastack_top; + tstate->datastack_limit = this->datastack_limit; +@@ -238,7 +242,7 @@ void PythonState::set_initial_state(const PyThreadState* const tstate) noexcept + #if GREENLET_PY312 + this->py_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining; + // XXX: TODO: Comment from a reviewer: +- // Should this be ``C_RECURSION_LIMIT - tstate->c_recursion_remaining``? ++ // Should this be ``Py_C_RECURSION_LIMIT - tstate->c_recursion_remaining``? + // But to me it looks more like that might not be the right + // initialization either? + this->c_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining; +diff --git a/src/greenlet/greenlet_cpython_compat.hpp b/src/greenlet/greenlet_cpython_compat.hpp +index cdc1617f..c0fb94c5 100644 +--- a/src/greenlet/greenlet_cpython_compat.hpp ++++ b/src/greenlet/greenlet_cpython_compat.hpp +@@ -12,19 +12,24 @@ + + #if PY_VERSION_HEX >= 0x30A00B1 + # define GREENLET_PY310 1 ++#else ++# define GREENLET_PY310 0 ++#endif ++ + /* + Python 3.10 beta 1 changed tstate->use_tracing to a nested cframe member. + See https://github.com/python/cpython/pull/25276 + We have to save and restore this as well. ++ ++Python 3.13 removed PyThreadState.cframe (GH-108035). + */ ++#if GREENLET_PY310 && PY_VERSION_HEX < 0x30D0000 + # define GREENLET_USE_CFRAME 1 + #else + # define GREENLET_USE_CFRAME 0 +-# define GREENLET_PY310 0 + #endif + + +- + #if PY_VERSION_HEX >= 0x30B00A4 + /* + Greenlet won't compile on anything older than Python 3.11 alpha 4 (see +@@ -124,4 +129,8 @@ static inline void PyThreadState_LeaveTracing(PyThreadState *tstate) + } + #endif + ++#if !defined(Py_C_RECURSION_LIMIT) && defined(C_RECURSION_LIMIT) ++# define Py_C_RECURSION_LIMIT C_RECURSION_LIMIT ++#endif ++ + #endif /* GREENLET_CPYTHON_COMPAT_H */ +diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp +index d52ce1fd..6da6841f 100644 +--- a/src/greenlet/greenlet_greenlet.hpp ++++ b/src/greenlet/greenlet_greenlet.hpp +@@ -23,6 +23,7 @@ using greenlet::refs::BorrowedGreenlet; + #endif + + #if GREENLET_PY312 ++# define Py_BUILD_CORE + # include "internal/pycore_frame.h" + #endif + + +From 00611d7567d09869973fe314f60575674cc877d8 Mon Sep 17 00:00:00 2001 +From: Victor Stinner +Date: Mon, 3 Jun 2024 10:55:14 +0200 +Subject: [PATCH 3/5] Support delete_later + +--- + src/greenlet/TPythonState.cpp | 14 ++++++++++++-- + src/greenlet/greenlet.cpp | 4 ++++ + src/greenlet/greenlet_cpython_compat.hpp | 6 ++++++ + src/greenlet/greenlet_greenlet.hpp | 4 ++++ + 4 files changed, 26 insertions(+), 2 deletions(-) + +diff --git a/src/greenlet/TPythonState.cpp b/src/greenlet/TPythonState.cpp +index c0dbf703..bfb40cac 100644 +--- a/src/greenlet/TPythonState.cpp ++++ b/src/greenlet/TPythonState.cpp +@@ -18,7 +18,11 @@ PythonState::PythonState() + #else + ,recursion_depth(0) + #endif ++#if GREENLET_PY313 ++ ,delete_later(nullptr) ++#else + ,trash_delete_nesting(0) ++#endif + #if GREENLET_PY311 + ,current_frame(nullptr) + ,datastack_chunk(nullptr) +@@ -145,7 +149,9 @@ void PythonState::operator<<(const PyThreadState *const tstate) noexcept + Py_XDECREF(frame); // PyThreadState_GetFrame gives us a new + // reference. + this->_top_frame.steal(frame); +- #if GREENLET_PY312 ++ #if GREENLET_PY313 ++ this->delete_later = Py_XNewRef(tstate->delete_later); ++ #elif GREENLET_PY312 + this->trash_delete_nesting = tstate->trash.delete_nesting; + #else // not 312 + this->trash_delete_nesting = tstate->trash_delete_nesting; +@@ -213,7 +219,11 @@ void PythonState::operator>>(PyThreadState *const tstate) noexcept + tstate->datastack_top = this->datastack_top; + tstate->datastack_limit = this->datastack_limit; + this->_top_frame.relinquish_ownership(); +- #if GREENLET_PY312 ++ #if GREENLET_PY313 ++ Py_XDECREF(tstate->delete_later); ++ tstate->delete_later = this->delete_later; ++ Py_CLEAR(this->delete_later); ++ #elif GREENLET_PY312 + tstate->trash.delete_nesting = this->trash_delete_nesting; + #else // not 3.12 + tstate->trash_delete_nesting = this->trash_delete_nesting; +diff --git a/src/greenlet/greenlet.cpp b/src/greenlet/greenlet.cpp +index 5a9818e8..dfc748a8 100644 +--- a/src/greenlet/greenlet.cpp ++++ b/src/greenlet/greenlet.cpp +@@ -1328,6 +1328,7 @@ mod_enable_optional_cleanup(PyObject* UNUSED(module), PyObject* flag) + Py_RETURN_NONE; + } + ++#if !GREENLET_PY313 + PyDoc_STRVAR(mod_get_tstate_trash_delete_nesting_doc, + "get_tstate_trash_delete_nesting() -> Integer\n" + "\n" +@@ -1343,6 +1344,7 @@ mod_get_tstate_trash_delete_nesting(PyObject* UNUSED(module)) + return PyLong_FromLong(tstate->trash_delete_nesting); + #endif + } ++#endif + + static PyMethodDef GreenMethods[] = { + {"getcurrent", +@@ -1356,7 +1358,9 @@ static PyMethodDef GreenMethods[] = { + {"get_total_main_greenlets", (PyCFunction)mod_get_total_main_greenlets, METH_NOARGS, mod_get_total_main_greenlets_doc}, + {"get_clocks_used_doing_optional_cleanup", (PyCFunction)mod_get_clocks_used_doing_optional_cleanup, METH_NOARGS, mod_get_clocks_used_doing_optional_cleanup_doc}, + {"enable_optional_cleanup", (PyCFunction)mod_enable_optional_cleanup, METH_O, mod_enable_optional_cleanup_doc}, ++#if !GREENLET_PY313 + {"get_tstate_trash_delete_nesting", (PyCFunction)mod_get_tstate_trash_delete_nesting, METH_NOARGS, mod_get_tstate_trash_delete_nesting_doc}, ++#endif + {NULL, NULL} /* Sentinel */ + }; + +diff --git a/src/greenlet/greenlet_cpython_compat.hpp b/src/greenlet/greenlet_cpython_compat.hpp +index c0fb94c5..ce5fd882 100644 +--- a/src/greenlet/greenlet_cpython_compat.hpp ++++ b/src/greenlet/greenlet_cpython_compat.hpp +@@ -55,6 +55,12 @@ Greenlet won't compile on anything older than Python 3.11 alpha 4 (see + # define GREENLET_PY312 0 + #endif + ++#if PY_VERSION_HEX >= 0x30D0000 ++# define GREENLET_PY313 1 ++#else ++# define GREENLET_PY313 0 ++#endif ++ + #ifndef Py_SET_REFCNT + /* Py_REFCNT and Py_SIZE macros are converted to functions + https://bugs.python.org/issue39573 */ +diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp +index 6da6841f..fbfdfbfc 100644 +--- a/src/greenlet/greenlet_greenlet.hpp ++++ b/src/greenlet/greenlet_greenlet.hpp +@@ -111,7 +111,11 @@ namespace greenlet + #else + int recursion_depth; + #endif ++#if GREENLET_PY313 ++ PyObject *delete_later; ++#else + int trash_delete_nesting; ++#endif + #if GREENLET_PY311 + _PyInterpreterFrame* current_frame; + _PyStackChunk* datastack_chunk; + +From b65558ec962d3d81ae09787ebca8686d233e2a4c Mon Sep 17 00:00:00 2001 +From: Victor Stinner +Date: Wed, 5 Jun 2024 12:04:21 +0200 +Subject: [PATCH 4/5] Fix current_frame + +--- + src/greenlet/TPythonState.cpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/greenlet/TPythonState.cpp b/src/greenlet/TPythonState.cpp +index bfb40cac..82eb34f0 100644 +--- a/src/greenlet/TPythonState.cpp ++++ b/src/greenlet/TPythonState.cpp +@@ -138,7 +138,9 @@ void PythonState::operator<<(const PyThreadState *const tstate) noexcept + #else // not 312 + this->recursion_depth = tstate->recursion_limit - tstate->recursion_remaining; + #endif // GREENLET_PY312 +- #if GREENLET_USE_CFRAME ++ #if GREENLET_PY313 ++ this->current_frame = tstate->current_frame; ++ #elif GREENLET_USE_CFRAME + this->current_frame = tstate->cframe->current_frame; + #endif + this->datastack_chunk = tstate->datastack_chunk; +@@ -212,7 +214,9 @@ void PythonState::operator>>(PyThreadState *const tstate) noexcept + #else // \/ 3.11 + tstate->recursion_remaining = tstate->recursion_limit - this->recursion_depth; + #endif // GREENLET_PY312 +- #if GREENLET_USE_CFRAME ++ #if GREENLET_PY313 ++ tstate->current_frame = this->current_frame; ++ #elif GREENLET_USE_CFRAME + tstate->cframe->current_frame = this->current_frame; + #endif + tstate->datastack_chunk = this->datastack_chunk; + +From b7cfc1748766cac351fe5fca32fa7c8cacdea2ae Mon Sep 17 00:00:00 2001 +From: Victor Stinner +Date: Wed, 5 Jun 2024 12:17:28 +0200 +Subject: [PATCH 5/5] Update tests + +--- + src/greenlet/tests/test_greenlet.py | 4 +++- + src/greenlet/tests/test_greenlet_trash.py | 9 +++++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/greenlet/tests/test_greenlet.py b/src/greenlet/tests/test_greenlet.py +index 51849cd6..259707ae 100644 +--- a/src/greenlet/tests/test_greenlet.py ++++ b/src/greenlet/tests/test_greenlet.py +@@ -471,7 +471,9 @@ def creator(): + # Unfortunately, this doesn't actually clear the references, they're in the + # fast local array. + if not wait_for_cleanup: +- result[0].gr_frame.f_locals.clear() ++ # f_locals has no clear method in Python 3.13 ++ if hasattr(result[0].gr_frame.f_locals, 'clear'): ++ result[0].gr_frame.f_locals.clear() + else: + self.assertIsNone(result[0].gr_frame) + +diff --git a/src/greenlet/tests/test_greenlet_trash.py b/src/greenlet/tests/test_greenlet_trash.py +index 8d9716e9..2bce8fd0 100644 +--- a/src/greenlet/tests/test_greenlet_trash.py ++++ b/src/greenlet/tests/test_greenlet_trash.py +@@ -29,8 +29,17 @@ + + import unittest + ++try: ++ from greenlet._greenlet import get_tstate_trash_delete_nesting ++except ImportError: ++ get_tstate_trash_delete_nesting = None ++ ++ + class TestTrashCanReEnter(unittest.TestCase): + ++ # Python 3.13 has not "trash delete nesting" anymore (but "delete later") ++ @unittest.skipIf(get_tstate_trash_delete_nesting is None, ++ 'need get_tstate_trash_delete_nesting()') + def test_it(self): + # Try several times to trigger it, because it isn't 100% + # reliable. diff --git a/pkgs/development/python-modules/gridnet/default.nix b/pkgs/development/python-modules/gridnet/default.nix index 75ad2c335149..8b8be88367d8 100644 --- a/pkgs/development/python-modules/gridnet/default.nix +++ b/pkgs/development/python-modules/gridnet/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gridnet"; - version = "5.0.0"; + version = "5.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-gridnet"; rev = "refs/tags/v${version}"; - hash = "sha256-7tLT5sRoUjWs1DOIuUEbnJJkg9LHZqrN/eu+Mjx5Yd4="; + hash = "sha256-HVBUAasK7lFsj/tT0j70x/2w4RJtnHWfX/1XbfKKLf8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 9291bd5f14e0..aa06cb44f0ca 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -1,26 +1,31 @@ { lib, buildPythonPackage, - pythonRelaxDepsHook, fetchPypi, + setuptools, grpcio, protobuf, }: buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.62.2"; - format = "setuptools"; + version = "1.64.1"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-bkrCxD12skXF9m2Y9SPbCHhrGGEoplXubyCjCn5o5Pk="; + pname = "grpcio_channelz"; + inherit version; + hash = "sha256-FUNKohIyERNoZe1y5JzmaP6IausTewNgpv6765Efd1U="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "grpcio" ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "grpcio" + "protobuf" + ]; + + dependencies = [ grpcio protobuf ]; diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index c71c63fce021..4822365f1b6a 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonRelaxDepsHook, fetchPypi, grpcio, protobuf, @@ -9,12 +8,13 @@ buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.62.2"; + version = "1.64.1"; format = "setuptools"; src = fetchPypi { - inherit pname version; - hash = "sha256-pE0eoeFRC1xiJl2toE2GYhuxSR113ph3E8nA6gBcEKg="; + pname = "grpcio_health_checking"; + inherit version; + hash = "sha256-VSOJ8/Jj32p/U8sk8opjGlhKMHIfn0Mp0nFZU+GX49s="; }; propagatedBuildInputs = [ @@ -22,7 +22,6 @@ buildPythonPackage rec { protobuf ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "grpcio" ]; pythonImportsCheck = [ "grpc_health" ]; diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 4699a09a3343..982711830d46 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -2,25 +2,30 @@ lib, buildPythonPackage, fetchPypi, - pythonRelaxDepsHook, + setuptools, grpcio, protobuf, }: buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.62.2"; - format = "setuptools"; + version = "1.64.1"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-LdRIBtaNAAZjZSm9pXMBKxmkIoFHjC0FHNquu5HiUWw="; + pname = "grpcio_reflection"; + inherit version; + hash = "sha256-43511hl02iKjtcJgSZKqLyFjlx6jeK2Fa047YyEJ88c="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "grpcio" ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "grpcio" + "protobuf" + ]; + + dependencies = [ grpcio protobuf ]; diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index c587948f185f..2486ba8aa7cd 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -10,14 +10,15 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.62.2"; + version = "1.64.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - hash = "sha256-YuG/ywICWhzXNzKi0zZy0+nQ300hwSxR4LvK8JurdCo="; + pname = "grpcio_status"; + inherit version; + hash = "sha256-xQvRTrZQbYWApsVTvqRj18CEmbLA6T9tGGTF6Oq7EGY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index 263e57ed8f3a..33ec8143c265 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -5,20 +5,20 @@ grpcio, protobuf, pythonOlder, - pythonRelaxDepsHook, setuptools, }: buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.62.2"; + version = "1.64.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-dNGeGQnpQbGmvvf71fnvMwWZ9nb7BrsGB8hFDtVVnfI="; + pname = "grpcio_testing"; + inherit version; + hash = "sha256-Nta9aurAzEg/iUlYE35Jz7uQ+syH4NMnHNuMGq7XEBw="; }; postPatch = '' @@ -26,9 +26,13 @@ buildPythonPackage rec { --replace-fail '"grpcio>={version}".format(version=grpc_version.VERSION)' '"grpcio"' ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "protobuf" + ]; + + dependencies = [ grpcio protobuf ]; diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index d98f1bee9ee2..fa204c048982 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -9,12 +9,13 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.62.2"; + version = "1.64.1"; format = "setuptools"; src = fetchPypi { - inherit pname version; - hash = "sha256-X9XhWCtnjmuUHuX1gJNAvl4HJGkd9SmaroImZA+U4Y8="; + pname = "grpcio_tools"; + inherit version; + hash = "sha256-crNVC5GtuDVGVuzw9tHUYRKZBEuuEfsefMHRu2a4wes="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 5e1524866087..dca383e92a6b 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "grpcio"; format = "setuptools"; - version = "1.62.2"; + version = "1.64.1"; src = fetchPypi { inherit pname version; - hash = "sha256-x3YYBx2Wt6i+LBBwGphTeCO5xluiVsC5Bn4FlM29lU0="; + hash = "sha256-jVHdHFnV+g80JmuAo4BewpofJkJcKlRzYTP22H/Eloo="; }; outputs = [ diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index 995357abff7e..e5ad36e1b19b 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -3,14 +3,25 @@ buildPythonPackage, callPackage, fetchFromGitHub, + + # build-system + setuptools, + + # dependencies babel, - gruut-ipa, dateparser, + gruut-ipa, jsonlines, - num2words, - python-crfsuite, - python, networkx, + num2words, + numpy, + python-crfsuite, + + # optional dependencies + pydub, + rapidfuzz, + + # checks glibcLocales, pytestCheckHook, }: @@ -18,6 +29,7 @@ let langPkgs = [ "ar" + "ca" "cs" "de" "en" @@ -35,49 +47,53 @@ let in buildPythonPackage rec { pname = "gruut"; - version = "2.3.4"; - format = "setuptools"; + version = "2.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; - repo = pname; + repo = "gruut"; rev = "refs/tags/v${version}"; - hash = "sha256-DD7gnvH9T2R6E19+exWE7Si+XEpfh0Iy5FYbycjgzgM="; + hash = "sha256-iwde6elsAbICZ+Rc7CPgcZTOux1hweVZc/gf4K+hP9M="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "gruut_lang_en~=2.0.0" "gruut_lang_en" \ - --replace "jsonlines~=1.2.0" "jsonlines" \ - --replace "networkx>=2.5.0,<3.0.0" "networkx" - ''; + pythonRelaxDeps = true; - propagatedBuildInputs = - [ - babel - gruut-ipa - jsonlines - num2words - python-crfsuite - dateparser - networkx - ] - ++ (map ( - lang: - callPackage ./language-pack.nix { + build-system = [ setuptools ]; + + dependencies = [ + babel + dateparser + gruut-ipa + jsonlines + networkx + num2words + numpy + python-crfsuite + ] ++ optional-dependencies.en; + + optional-dependencies = + { + train = [ + pydub + rapidfuzz + ]; + } + // lib.genAttrs langPkgs (lang: [ + (callPackage ./language-pack.nix { inherit lang version - format src + build-system ; - } - ) langPkgs); + }) + ]); nativeCheckInputs = [ glibcLocales pytestCheckHook - ]; + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # https://github.com/rhasspy/gruut/issues/25 @@ -86,7 +102,6 @@ buildPythonPackage rec { # requires mishkal library "test_fa" "test_ar" - "test_lb" ]; preCheck = '' diff --git a/pkgs/development/python-modules/gruut/language-pack.nix b/pkgs/development/python-modules/gruut/language-pack.nix index 3a2dcaba893b..b3a9e5828778 100644 --- a/pkgs/development/python-modules/gruut/language-pack.nix +++ b/pkgs/development/python-modules/gruut/language-pack.nix @@ -4,13 +4,14 @@ lang, version, - format, src, + build-system, }: buildPythonPackage rec { pname = "gruut-lang-${lang}"; - inherit version format src; + pyproject = true; + inherit version src build-system; prePatch = '' cd "${pname}" diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 449f41620abe..48b8694650b4 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "gsd"; - version = "3.2.1"; + version = "3.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-huMM98An/DG8PIVblS3b6AxF6vJ5IoKOs1f9kBnR3ik="; + hash = "sha256-sDb6TJvN7yFiRabc66zIjk6w9CEUYMhpe+fWv+apvkI="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/gsm0338/default.nix b/pkgs/development/python-modules/gsm0338/default.nix index 4f6326ec9ca5..e6153f48a58f 100644 --- a/pkgs/development/python-modules/gsm0338/default.nix +++ b/pkgs/development/python-modules/gsm0338/default.nix @@ -28,9 +28,6 @@ buildPythonPackage { description = "Python codec for GSM 03.38"; homepage = "https://github.com/dsch/gsm0338"; license = licenses.mit; - maintainers = with maintainers; [ - flokli - janik - ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index f2cc5a2edfac..ccb4c30f24d4 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { homepage = "https://gstreamer.freedesktop.org"; description = "Python bindings for GStreamer"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 25296b64d9ba..909fff5b5aaa 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -17,27 +17,23 @@ setproctitle, pytestCheckHook, + pytest-cov, }: buildPythonPackage rec { pname = "gunicorn"; - version = "21.2.0"; + version = "22.0.0"; pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "benoitc"; repo = "gunicorn"; - rev = version; - hash = "sha256-xP7NNKtz3KNrhcAc00ovLZRx2h6ZqHbwiFOpCiuwf98="; + rev = "refs/tags/${version}"; + hash = "sha256-xIXQMAdTZEBORu6789tLpT1OpBL+aveL/MfDj4f4bes="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=gunicorn --cov-report=xml" "" - ''; - build-system = [ setuptools ]; dependencies = [ packaging ]; @@ -52,7 +48,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "gunicorn" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + ] ++ lib.flatten (lib.attrValues optional-dependencies); meta = { description = "gunicorn 'Green Unicorn' is a WSGI HTTP Server for UNIX, fast clients and sleepy applications"; diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix index 40c61f8a7dc9..32024f892556 100644 --- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix +++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix @@ -8,7 +8,6 @@ pyaml, pydantic, pythonOlder, - pythonRelaxDepsHook, thelogrus, }: @@ -30,7 +29,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ gitlike-commands diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index 4a1f28a60b43..170a29ef8cf9 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -10,6 +10,7 @@ cython, fetchFromGitHub, poetry-core, + pytest-asyncio, pytestCheckHook, pythonOlder, setuptools, @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "3.1.1"; + version = "3.1.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-HlQAYR+feu1awKFf11Q5Us4zSeHASu8OscJ8T8tlm5M="; + hash = "sha256-HG2G/ymSw6e03KJOB/F5ja2Cv5nD+nPgOjMHPCYNSH8="; }; postPatch = '' @@ -51,7 +52,10 @@ buildPythonPackage rec { bluetooth-data-tools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "habluetooth" ]; diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 8b9f883ce54c..62ccb7ef91d0 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -14,7 +14,6 @@ pytest-timeout, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, setuptools, snitun, syrupy, @@ -37,7 +36,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "acme" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index a6b84d93b1a6..8b7c477c8494 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.8.0"; + version = "0.9.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Kbz/ETSJGx6u0ZNfEWfl9klBIB3yPcfHGy1uKK50TGA="; + hash = "sha256-m40ZK1+cfWgrwWftFqExUZidCrbDMC1Sfshugqrp5QM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/hatch-odoo/default.nix b/pkgs/development/python-modules/hatch-odoo/default.nix index 91a0ef99efbd..e3c0c26dbebf 100644 --- a/pkgs/development/python-modules/hatch-odoo/default.nix +++ b/pkgs/development/python-modules/hatch-odoo/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage rec { pname = "hatch-odoo"; - version = "0.1"; + version = "1.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "acsone"; repo = pname; - rev = version; - sha256 = "sha256-+KM3tpeQ4e53bVhUeWUSfyuIzPRvWkjZi4S/gH4UHVY="; + rev = "refs/tags/${version}"; + sha256 = "sha256-I3jaiG0Xu8B34q30p7zTs+FeBXUQiPKTAJLSVxE9gYE="; }; buildInputs = [hatch-vcs]; diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 8df49b40e94d..069cd5374b4c 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "hatchling"; - version = "1.24.2"; + version = "1.25.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Qd3CfNsl2573tovvB1+CnITLNJqhv/gkB5fQElEFR7A="; + hash = "sha256-cGRjGlEmELUiUKTT/xvYFVHW0UMcTre3LnNN9sdPQmI="; }; # listed in backend/pyproject.toml diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index fb0f4b8e27e3..e6439ea0f730 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.35.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sZSatje+UXt69r7Nv4QMR3IvlHHGuHDm813h72/Oo+M="; + hash = "sha256-Nf4rkVkXPEPPZ+xBCnfKfYeggBfhsgijnAIJzByR46A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix index c6b9bbcde847..9fe99f93b30e 100644 --- a/pkgs/development/python-modules/hdate/default.nix +++ b/pkgs/development/python-modules/hdate/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, pdm-backend, - pythonRelaxDepsHook, pytestCheckHook, pythonOlder, pytz, @@ -30,7 +29,6 @@ buildPythonPackage rec { build-system = [ pdm-backend - pythonRelaxDepsHook ]; dependencies = [ diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index d3de4a76bd48..e56d4fd17123 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -9,7 +9,6 @@ fetchPypi, joblib, six, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -24,7 +23,6 @@ buildPythonPackage rec { pythonRemoveDeps = [ "cython" ]; nativeBuildInputs = [ - pythonRelaxDepsHook cython ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix index c36314947e10..0b175669db51 100644 --- a/pkgs/development/python-modules/hdmedians/default.nix +++ b/pkgs/development/python-modules/hdmedians/default.nix @@ -2,39 +2,55 @@ lib, buildPythonPackage, fetchPypi, - nose, cython, numpy, + oldest-supported-numpy, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { version = "0.14.2"; - format = "setuptools"; pname = "hdmedians"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "b47aecb16771e1ba0736557255d80ae0240b09156bff434321de559b359ac2d6"; + hash = "sha256-tHrssWdx4boHNlVyVdgK4CQLCRVr/0NDId5VmzWawtY="; }; - # nose was specified in setup.py as a build dependency... - buildInputs = [ - cython - nose + patches = [ + # https://github.com/daleroberts/hdmedians/pull/10 + ./replace-nose.patch ]; - propagatedBuildInputs = [ numpy ]; - # cannot resolve path for packages in tests - doCheck = false; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "'nose>=1.0'," "" + ''; - checkPhase = '' - nosetests + build-system = [ + cython + oldest-supported-numpy + setuptools + ]; + + dependencies = [ numpy ]; + + pythonImportsCheck = [ "hdmedians" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + cd $out ''; meta = with lib; { homepage = "https://github.com/daleroberts/hdmedians"; description = "High-dimensional medians"; - license = licenses.gpl3; + license = licenses.asl20; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hdmedians/replace-nose.patch b/pkgs/development/python-modules/hdmedians/replace-nose.patch new file mode 100644 index 000000000000..3cf12e42e349 --- /dev/null +++ b/pkgs/development/python-modules/hdmedians/replace-nose.patch @@ -0,0 +1,91 @@ +diff --git a/hdmedians/tests/test_geomedian.py b/hdmedians/tests/test_geomedian.py +index 0bc37e9..ff5f938 100644 +--- a/hdmedians/tests/test_geomedian.py ++++ b/hdmedians/tests/test_geomedian.py +@@ -4,9 +4,9 @@ Tests. + + import numpy as np + import hdmedians as hd ++import pytest + + from numpy.testing import assert_equal, assert_array_almost_equal +-from nose.tools import assert_true, assert_raises + + # shape (6, 25) + DATA1 = np.array([[693, 990, 1281, 2101, 3524, 2577], +@@ -124,10 +124,12 @@ def test_nangeomedian_axis_one_two_good(): + def test_nangeomedian_axis_bad(): + data = np.array([[1.0, np.nan, 1.0], + [2.0, 1.0, 1.0]]) +- assert_raises(IndexError, hd.nangeomedian, data, axis=2) ++ with pytest.raises(IndexError): ++ hd.nangeomedian(data, axis=2) + + + def test_nangeomedian_all_nan(): + data = np.array([[np.nan, np.nan, np.nan], + [np.nan, np.nan, np.nan]]) +- assert_raises(ValueError, hd.nangeomedian, data) ++ with pytest.raises(ValueError): ++ hd.nangeomedian(data) +diff --git a/hdmedians/tests/test_medoid.py b/hdmedians/tests/test_medoid.py +index c5e0a7f..4fbdf80 100644 +--- a/hdmedians/tests/test_medoid.py ++++ b/hdmedians/tests/test_medoid.py +@@ -4,9 +4,9 @@ Tests. + + import numpy as np + import hdmedians as hd ++import pytest + + from numpy.testing import assert_equal, assert_array_almost_equal +-from nose.tools import assert_true, assert_raises + + # shape (6, 25) + DATA1 = np.array([[693, 990, 1281, 2101, 3524, 2577], +@@ -59,7 +59,7 @@ def test_medoid_in_set_random(): + s = [list(x) for x in a.T] + m = hd.medoid(a) + idx = s.index(list(m)) +- assert_true(idx > -1) ++ assert(idx > -1) + + + def test_medoid_noaxis(): +@@ -85,7 +85,8 @@ def test_medoid_axis_one(): + + + def test_medoid_axis_bad(): +- assert_raises(IndexError, hd.medoid, DATA1, axis=2) ++ with pytest.raises(IndexError): ++ hd.medoid(DATA1, axis=2) + + + def test_medoid_noaxis_indexonly(): +@@ -136,7 +137,8 @@ def test_nanmedoid_two_obs(): + def test_nanmedoid_all_nan(): + data = np.array([[np.nan, np.nan, np.nan], + [np.nan, np.nan, np.nan]]) +- assert_raises(ValueError, hd.nanmedoid, data) ++ with pytest.raises(ValueError): ++ hd.nanmedoid(data) + + + def test_nanmedoid_axis_zero(): +@@ -170,7 +172,8 @@ def test_nanmedoid_axis_one_indexonly(): + + + def test_nanmedoid_axis_bad(): +- assert_raises(IndexError, hd.nanmedoid, DATA1, axis=2) ++ with pytest.raises(IndexError): ++ hd.nanmedoid(DATA1, axis=2) + + + def test_nanmedoid_two_obs(): +@@ -184,4 +187,5 @@ def test_nanmedoid_two_obs(): + def test_nanmedoid_all_nan(): + data = np.array([[np.nan, np.nan, np.nan], + [np.nan, np.nan, np.nan]]) +- assert_raises(ValueError, hd.nanmedoid, data) ++ with pytest.raises(ValueError): ++ hd.nanmedoid(data) diff --git a/pkgs/development/python-modules/here-routing/default.nix b/pkgs/development/python-modules/here-routing/default.nix index 0ab74bcd2bb6..d8e6e4a3c800 100644 --- a/pkgs/development/python-modules/here-routing/default.nix +++ b/pkgs/development/python-modules/here-routing/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - poetry-core, + hatchling, aiohttp, async-timeout, yarl, @@ -14,26 +14,26 @@ buildPythonPackage rec { pname = "here-routing"; - version = "1.0.0"; + version = "1.0.1"; disabled = pythonOlder "3.10"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "eifinger"; repo = "here_routing"; rev = "v${version}"; - hash = "sha256-wdjPbM9J+2q3NisdlOHIddSWHHIfwQY/83v6IBAXSq0="; + hash = "sha256-sdNs5QNYvL1Cpbk9Yi+7PSiDZ6LEgAXQ19IYSAY78p0="; }; postPatch = '' sed -i "/^addopts/d" pyproject.toml ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout yarl @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "here_routing" ]; meta = { - changelog = "https://github.com/eifinger/here_routing/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/eifinger/here_routing/releases/tag/v${version}"; description = "Asynchronous Python client for the HERE Routing V8 API"; homepage = "https://github.com/eifinger/here_routing"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/here-transit/default.nix b/pkgs/development/python-modules/here-transit/default.nix index 8c9ef33e5715..2aae9b51fe53 100644 --- a/pkgs/development/python-modules/here-transit/default.nix +++ b/pkgs/development/python-modules/here-transit/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - poetry-core, + hatchling, aiohttp, async-timeout, yarl, @@ -14,26 +14,26 @@ buildPythonPackage rec { pname = "here-transit"; - version = "1.2.0"; + version = "1.2.1"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "eifinger"; repo = "here_transit"; rev = "v${version}"; - hash = "sha256-C5HZZCmK9ILUUXyx1i/cUggSM3xbOzXiJ13hrT2DWAI="; + hash = "sha256-fORg1iqRcD75Is1EW9XeAu8astibypmnNXo3vHduQdk="; }; postPatch = '' sed -i "/^addopts/d" pyproject.toml ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout yarl @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "here_transit" ]; meta = { - changelog = "https://github.com/eifinger/here_transit/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/eifinger/here_transit/releases/tag/v${version}"; description = "Asynchronous Python client for the HERE Routing V8 API"; homepage = "https://github.com/eifinger/here_transit"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index fb38f22af4bf..25ed4d5d9505 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, setuptools-scm, dulwich, mercurial, @@ -10,19 +11,23 @@ buildPythonPackage rec { pname = "hg-git"; - version = "1.1.1"; - format = "pyproject"; + version = "1.1.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-r04Q6zbt8VM1jYkoGOdJZqKPPxXy4jC1X1d9nJ+fEWY="; + pname = "hg_git"; + inherit version; + hash = "sha256-BZzcElZa0pMBSGXSiSB+d+YFhJMM5PAdT2Txq5qLZCU="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ dulwich mercurial ]; diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix index 05d2214f6a3d..f83a50b29160 100644 --- a/pkgs/development/python-modules/hikari/default.nix +++ b/pkgs/development/python-modules/hikari/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, pytest-runner, aiohttp, attrs, @@ -37,7 +36,6 @@ buildPythonPackage rec { ''; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ aiohttp diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix index e316e91a0ef8..176322d93221 100644 --- a/pkgs/development/python-modules/hkdf/default.nix +++ b/pkgs/development/python-modules/hkdf/default.nix @@ -1,28 +1,40 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + pythonOlder, nose, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "hkdf"; version = "0.0.3"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2"; + src = fetchFromGitHub { + owner = "casebeer"; + repo = "python-hkdf"; + rev = "cc3c9dbf0a271b27a7ac5cd04cc1485bbc3b4307"; + hash = "sha256-i3vJzUI7dpZbgZkz7Agd5RAeWisNWftdk/mkJBZkkLg="; }; + build-system = [ setuptools ]; + + pythonImportsCheck = [ "hkdf" ]; + + # tests rely on nose + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ nose ]; checkPhase = '' - nosetests - ''; + runHook preCheck - # no tests in PyPI tarball - doCheck = false; + nosetests + + runHook postCheck + ''; meta = with lib; { description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 50beaa7df266..22948219d3db 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.51"; + version = "0.52"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-0zLoxXgp4gby2pj96CJ2TOZBMmzuWKczotma7Q/3/ys="; + hash = "sha256-sLtszBu/eyhfIW8xdkHb3FWx2pW/E8cxPeNa4o7DnIs="; }; build-system = [ diff --git a/pkgs/development/python-modules/hologram/default.nix b/pkgs/development/python-modules/hologram/default.nix index 17e7b62e1f63..bedeb1f17dfb 100644 --- a/pkgs/development/python-modules/hologram/default.nix +++ b/pkgs/development/python-modules/hologram/default.nix @@ -6,7 +6,6 @@ jsonschema, pytestCheckHook, python-dateutil, - pythonRelaxDepsHook, setuptools, wheel, }: @@ -33,7 +32,6 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools wheel ]; diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index e09ca86f8a16..ae765df32b4b 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.18.3"; + version = "1.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-V44w6J1ydU+XqD6+CBmP7I6HzH5JslufMew5P5OcpQA="; + hash = "sha256-yrFSL3WptGN3+TZLZ1vv15gS4iAFlxRHCljiFHXVMbo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index f155a5db19c3..fc288114c374 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.12.0"; + version = "1.12.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,34 +28,29 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "home-assistant-bluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-KTaZ3xbZpBIN5zP73YdJW6QeCQThGdqejnfWwvL+0R8="; + hash = "sha256-WAsgiOmYqmt/PCKp+vZA2To95YZAgnYCF8ysCn5N9nc="; }; - patches = [ - # https://github.com/home-assistant-libs/home-assistant-bluetooth/issues/38 - ./habluetooth-3.0-compat.patch - ]; - postPatch = '' # drop pytest parametrization (coverage, etc.) sed -i '/addopts/d' pyproject.toml ''; - nativeBuildInputs = [ + build-system = [ cython poetry-core setuptools ]; - propagatedBuildInputs = [ habluetooth ]; - - pythonImportsCheck = [ "home_assistant_bluetooth" ]; + dependencies = [ habluetooth ]; nativeCheckInputs = [ bleak pytestCheckHook ]; + pythonImportsCheck = [ "home_assistant_bluetooth" ]; + meta = with lib; { description = "Basic bluetooth models used by Home Assistant"; changelog = "https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/habluetooth-3.0-compat.patch b/pkgs/development/python-modules/home-assistant-bluetooth/habluetooth-3.0-compat.patch deleted file mode 100644 index c56d890fd8aa..000000000000 --- a/pkgs/development/python-modules/home-assistant-bluetooth/habluetooth-3.0-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/tests/test_models.py b/tests/test_models.py -index ecfd70c..b8001f2 100644 ---- a/tests/test_models.py -+++ b/tests/test_models.py -@@ -88,6 +88,7 @@ def test_model_from_scanner(): - "service_uuids": ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"], - "source": "local", - "time": now, -+ "tx_power": -127, - } - - -@@ -109,6 +110,7 @@ def test_construct_service_info_bleak(): - advertisement=switchbot_adv, - connectable=False, - time=now, -+ tx_power=None, - ) - - assert service_info.service_uuids == ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"] -@@ -132,6 +134,7 @@ def test_construct_service_info_bleak(): - "service_uuids": ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"], - "source": "local", - "time": now, -+ "tx_power": None, - } - - -@@ -165,6 +168,7 @@ def test_from_device_and_advertisement_data(): - "service_uuids": ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"], - "source": "local", - "time": now_monotonic, -+ "tx_power": -127, - } - - -@@ -200,6 +204,7 @@ def test_pyobjc_compat(): - advertisement=switchbot_adv, - connectable=False, - time=now, -+ tx_power=None, - ) - - assert service_info.service_uuids == ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"] -@@ -223,4 +228,5 @@ def test_pyobjc_compat(): - "service_uuids": ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"], - "source": "local", - "time": now, -+ "tx_power": None, - } diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index e4425df5c63a..04e71d133e19 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2024.5.2"; + version = "2024.7.0"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-LP/Iw0dgm8TUws/SNUfg7b/OPIboCGB7JRiEwXNd+4A="; + hash = "sha256-1yR8Z+R16u099XtxPasmocFbdQPH1Rr6sqngNpWmuWE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index 0c2c6fda5ed8..c9c18a722d1c 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2024.5.2"; + version = "2024.7.0"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -40,11 +40,11 @@ buildPythonPackage rec { { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-4C3KHmFbbpeWvmfwoVcc8kWRw22sGJMyDKsUGcbch6U="; + hash = "sha256-omEYZXAqkB5+trALBTqJ8SBGasTHD2mT2km6FizBvS8="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-n+Dn0vL0uUEvXsoKegSpJIG2jHbXSrYv2NhL+ZeVHrk="; + hash = "sha256-mTMXCpYRon8SqZB+0+P4IM+NUUOKBfxjf/NmLTElB+A="; }; } .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix index ebadd5552698..28836e4854ce 100644 --- a/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/pkgs/development/python-modules/hoomd-blue/default.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + buildPythonPackage, fetchgit, cmake, pkgconfig, @@ -19,9 +19,10 @@ let onOffBool = b: if b then "ON" else "OFF"; withMPI = (mpi != null); in -stdenv.mkDerivation rec { +buildPythonPackage rec { version = "2.3.4"; pname = "hoomd-blue"; + pyproject = false; # Built with cmake src = fetchgit { url = "https://bitbucket.org/glotzer/hoomd-blue"; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 59da4385026f..e0943982dc7e 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2024.6.1"; + version = "2024.7.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "hstspreload"; rev = "refs/tags/${version}"; - hash = "sha256-eeZR+UDQ6Cp1WTcz2duSTgQ+7vrF9T08aVT0mJk6ctA="; + hash = "sha256-WCmUYYPx8tJJ1Z3utjS8k6vePx/pZ6OZ+D0YjovqizQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/htmllistparse/default.nix b/pkgs/development/python-modules/htmllistparse/default.nix index 746726bb3637..f2f6b2110688 100644 --- a/pkgs/development/python-modules/htmllistparse/default.nix +++ b/pkgs/development/python-modules/htmllistparse/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Python parser for Apache/nginx-style HTML directory listing"; mainProgram = "rehttpfs"; license = licenses.mit; - maintainers = with maintainers; [ hexchen ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix index 4765b346752e..50de4ff088d4 100644 --- a/pkgs/development/python-modules/http-ece/default.nix +++ b/pkgs/development/python-modules/http-ece/default.nix @@ -4,7 +4,8 @@ cryptography, fetchPypi, mock, - pynose, + nose, + pythonOlder, }: buildPythonPackage rec { @@ -25,9 +26,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ]; + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ mock - pynose + nose ]; meta = with lib; { diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 869077cdd6e6..a4e867d98171 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonRelaxDepsHook, # build-system setuptools, @@ -36,7 +35,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "greenlet" ]; diff --git a/pkgs/development/python-modules/huepy/default.nix b/pkgs/development/python-modules/huepy/default.nix new file mode 100644 index 000000000000..541011ea2b50 --- /dev/null +++ b/pkgs/development/python-modules/huepy/default.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchPypi, + setuptools, + buildPythonPackage, +}: + +buildPythonPackage rec { + pname = "huepy"; + version = "1.2.1"; + pyproject = true; + + src = fetchPypi { + pname = "huepy"; + inherit version; + hash = "sha256-Wym+73lzEvt2BhiLxc2Y94q49+AVdkJ6kxLxybILdZ0="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "huepy" ]; + + # no test + doCheck = false; + + meta = { + description = "Print awesomely in terminals"; + homepage = "https://pypi.org/project/huepy/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ tochiaha ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index a17f2abbb970..11d41ca0334d 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "huey"; - version = "2.5.0"; + version = "2.5.1"; format = "pyproject"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-t767eqZ6U12mG8nWEYC9Hoq/jW2yfrPkCxB3/xLKQww="; + hash = "sha256-0oiYmLOwUsZjq7mR0nXwS00VVsLWOXY25whw6262uEo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 5f36a456210c..74002cade843 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hvac"; - version = "2.2.0"; + version = "2.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-5LAkjFZyy5pvWXTnyPUnGgnGxmPL+KsRczoifz0tssI="; + hash = "sha256-G4XjMg6GQt2C8jTbYyU82haagXWJ6CNxPcX8qDEZseI="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 5a4881fefbf3..408263164621 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.9.2"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-moyekkkTmqo97l8c6g+TzzY3TReemGcF/N3CuSxHB5M="; + hash = "sha256-6HSGqVv+FRq1LvFjpek9nL0EOZLPC3Vcyt0r82/t03Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 05495e0ab229..febac35bc4a4 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - xorgserver, + xorg, pytest, pytest-xvfb, i3, @@ -31,7 +31,7 @@ buildPythonPackage rec { pytest xdpyinfo pytest-xvfb - xorgserver + xorg.xvfb i3 ]; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 1bb75ee2c86e..3a3a86731df3 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.20.0"; + version = "3.20.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-CqbZcEP1ianvRRpx527KBjQTjvGBzlSmoKY1Pe5MXRA="; + hash = "sha256-nE1JIlYlJ5O3L7FQD5L+JvLnVs7nq4Ff6dmHvgXjj0M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 2d573dcaeafd..53eaa42d30c0 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ical"; - version = "8.0.2"; + version = "8.1.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "ical"; rev = "refs/tags/${version}"; - hash = "sha256-NrnRId+bgRh31+ocWBjWE2Zo3gOvPJ2fYtOVWOWD5EY="; + hash = "sha256-b0laQRDATmx4401bJKkdHsfT9gpMff8vGaZJ9l8O7w4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 9a3043affca1..1170485bf39f 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { - version = "5.0.12"; + version = "5.0.13"; pname = "icalendar"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "collective"; repo = "icalendar"; rev = "refs/tags/v${version}"; - hash = "sha256-313NcknY2zad4lI+/P0szDVjEQ8VatnSiBiaG/Ta1Bw="; + hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/icalevents/default.nix b/pkgs/development/python-modules/icalevents/default.nix index 26c62a1233e1..7cbffd265e8f 100644 --- a/pkgs/development/python-modules/icalevents/default.nix +++ b/pkgs/development/python-modules/icalevents/default.nix @@ -5,7 +5,6 @@ pythonOlder, pytestCheckHook, poetry-core, - pythonRelaxDepsHook, datetime, httplib2, icalendar, @@ -29,7 +28,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index c54c7d514c40..5c67a8ee5c2d 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -18,7 +18,7 @@ let in buildPythonPackage rec { pname = "ifcopenshell"; - version = "240306"; + version = "240611"; format = "other"; src = fetchFromGitHub { @@ -26,7 +26,7 @@ buildPythonPackage rec { repo = "IfcOpenShell"; rev = "refs/tags/blenderbim-${version}"; fetchSubmodules = true; - sha256 = "sha256-DtA8KeWipPfOnztKG/lrgLZeOCUG3nWR9oW7OST7koc="; + sha256 = "sha256-fCgxSambC01qb14EoZTrVxNNw8H3nX8oMi6gk0O/HmQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index c71616be90db..d281d66369cb 100644 --- a/pkgs/development/python-modules/ihm/default.nix +++ b/pkgs/development/python-modules/ihm/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ihm"; - version = "1.1"; + version = "1.2"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; rev = "refs/tags/${version}"; - hash = "sha256-auzArRwiue2CFo2DNS0NAF+aoZFvadhP6ARM0lRGcSA="; + hash = "sha256-lQ7/A/RT8/5gLozsToti+4g1Jc++GtjzOU4XZ+feqDs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index 100fafcb4959..7a16b64e86f3 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ijson"; - version = "3.2.3"; + version = "3.3.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EClOm/ictxPaBbxHkL3/YWYQQy21YZZIJwdImOF0+Rc="; + hash = "sha256-fxcua6G+4NTI+OvWOVd7/kKd7g8/lndaBnuLrkSS2KA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/image-go-nord/default.nix b/pkgs/development/python-modules/image-go-nord/default.nix index 926d26aa2c26..5350b3180d29 100644 --- a/pkgs/development/python-modules/image-go-nord/default.nix +++ b/pkgs/development/python-modules/image-go-nord/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "image-go-nord"; - version = "0.1.7"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Schrodinger-Hat"; repo = "ImageGoNord-pip"; rev = "refs/tags/v${version}"; - hash = "sha256-vXABG3aJ6bwT37hfo909oF8qfAY3ZW18xvr1V8vSy5w="; + hash = "sha256-2Dnl0dcdMo4PnhHTb/5cJ7C0CvW84av4CCbrTLPqopg="; }; propagatedBuildInputs = [ pillow ]; diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index 5c70706d8c40..250f5ea64b18 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -1,26 +1,35 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, substituteAll, - ffmpeg_4, + ffmpeg, + + # build-system + setuptools, + + # checks + psutil, + pytestCheckHook, python, }: buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.9"; - format = "setuptools"; + version = "0.5.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-ObzRZgEY7zYPpAR0VlAQcTZGYaqdkCHT0mxY8e4ggfU="; + src = fetchFromGitHub { + owner = "imageio"; + repo = "imageio-ffmpeg"; + rev = "refs/tags/v${version}"; + hash = "sha256-i9DBEhRyW5shgnhpaqpPLTI50q+SATJnxur8PAauYX4="; }; patches = [ (substituteAll { src = ./ffmpeg-path.patch; - ffmpeg = "${ffmpeg_4}/bin/ffmpeg"; + ffmpeg = "${ffmpeg}/bin/ffmpeg"; }) ]; @@ -29,20 +38,31 @@ buildPythonPackage rec { sed -i '/setup_requires=\["pip>19"\]/d' setup.py ''; - checkPhase = '' - runHook preCheck + build-system = [ setuptools ]; + nativeCheckInputs = [ + psutil + pytestCheckHook + ]; + + disabledTestPaths = [ + # network access + "tests/test_io.py" + "tests/test_special.py" + "tests/test_terminate.py" + ]; + + postCheck = '' ${python.interpreter} << EOF from imageio_ffmpeg import get_ffmpeg_version - assert get_ffmpeg_version() == '${ffmpeg_4.version}' + assert get_ffmpeg_version() == '${ffmpeg.version}' EOF - - runHook postCheck ''; pythonImportsCheck = [ "imageio_ffmpeg" ]; meta = with lib; { + changelog = "https://github.com/imageio/imageio-ffmpeg/releases/tag/v${version}"; description = "FFMPEG wrapper for Python"; homepage = "https://github.com/imageio/imageio-ffmpeg"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch b/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch index 33e2f9695d80..aef4d1f2364f 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch +++ b/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch @@ -1,16 +1,13 @@ -diff --git a/imageio_ffmpeg/_utils.py b/imageio_ffmpeg/_utils.py -index 6387834..e5e312d 100644 --- a/imageio_ffmpeg/_utils.py +++ b/imageio_ffmpeg/_utils.py -@@ -38,29 +38,7 @@ def get_ffmpeg_exe(): +@@ -38,28 +38,7 @@ def get_ffmpeg_exe(): @lru_cache() def _get_ffmpeg_exe(): - plat = get_platform() - - # 2. Try from here -- bin_dir = resource_filename("imageio_ffmpeg", "binaries") -- exe = os.path.join(bin_dir, FNAME_PER_PLATFORM.get(plat, "")) +- exe = os.path.join(_get_bin_dir(), FNAME_PER_PLATFORM.get(plat, "")) - if exe and os.path.isfile(exe) and _is_valid_exe(exe): - return exe - @@ -32,4 +29,4 @@ index 6387834..e5e312d 100644 + return "@ffmpeg@" - def _popen_kwargs(prevent_sigint=False): + def _get_bin_dir(): diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index ce6a88040fad..1ce7dea4645b 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "1.5.0"; + version = "1.6.0"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "refs/tags/v${version}"; - hash = "sha256-kY6Y8Uu1HwSkcmlKL5+zPh4n+4mofX2aoPVXAZvInlI="; + hash = "sha256-T4sA/PsoTfS2L0RwJyJP6BY33MJuybVqruHnwwstnXA="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix index 3407aa277152..69a93830c5f6 100644 --- a/pkgs/development/python-modules/import-expression/default.nix +++ b/pkgs/development/python-modules/import-expression/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { pname = "import-expression"; - version = "1.1.5"; + version = "2.0.0"; pyproject = true; src = fetchPypi { inherit version; pname = "import_expression"; - hash = "sha256-mVlYj8/I3LFEoHJRds/vbCjH2x/C1oNiUCXmh1FtQME="; + hash = "sha256-Biw7dIOPKbDcqYJSCyeqC/seREcVihSZuaKNFfgjTew="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 43c9826aa1ba..eea1111ff05e 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -16,12 +16,13 @@ # tests jaraco-collections, + jaraco-test, pytestCheckHook, }: buildPythonPackage rec { pname = "importlib-resources"; - version = "6.3.2"; + version = "6.4.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -29,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_resources"; inherit version; - hash = "sha256-lj63lkklKwFgwa/P5aHT/jrWbt0KixFL6s/7cMBnQiM="; + hash = "sha256-zbK0U7gEbKTjeY6x2E88zhRGoOjnte9O+2APGfw5gUU="; }; build-system = [ @@ -42,6 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook jaraco-collections + jaraco-test ]; pythonImportsCheck = [ "importlib_resources" ]; diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix index 86f59510ba26..8f4b2e960ebc 100644 --- a/pkgs/development/python-modules/incomfort-client/default.nix +++ b/pkgs/development/python-modules/incomfort-client/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "incomfort-client"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "incomfort-client"; rev = "refs/tags/v${version}"; - hash = "sha256-2hTH0haG8ja0Hgomj7kbbHUij9w3jbhHeKeMCtsgeEE="; + hash = "sha256-GD5NsVvmuCuEXw8KvojSj5b67/i0skvhYW8ko+9iysU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 45b0b844bdb9..8d0fe80336c6 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "inflect"; - version = "7.2.0"; + version = "7.2.1"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Mv6s+s/K4vIub8zeoQ8N3yamOPrENNDd2q+8oANPN4Q="; + hash = "sha256-p85eI9Z5hzTyVsGtntUhhrjsJ28QsYzj0+yxnCHrbLY="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 1f7e7c017501..b2270ef11248 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -5,7 +5,6 @@ mock, msgpack, pandas, - pynose, pytestCheckHook, python-dateutil, pytz, @@ -25,6 +24,11 @@ buildPythonPackage rec { hash = "sha256-WMZH9gQ3Et2G6a7hLrTM+7tUFUZ7yZEKSKqMdMEQiXA="; }; + patches = [ + # https://github.com/influxdata/influxdb-python/pull/835 + ./remove-nose.patch + ]; + postPatch = '' for f in influxdb/tests/dataframe_client_test.py influxdb/tests/influxdb08/dataframe_client_test.py; do substituteInPlace "$f" \ @@ -52,7 +56,6 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pandas - pynose pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/influxdb/remove-nose.patch b/pkgs/development/python-modules/influxdb/remove-nose.patch new file mode 100644 index 000000000000..b3d00c999581 --- /dev/null +++ b/pkgs/development/python-modules/influxdb/remove-nose.patch @@ -0,0 +1,713 @@ +diff --git a/influxdb/tests/client_test.py b/influxdb/tests/client_test.py +index 115fbc4..5b348c7 100644 +--- a/influxdb/tests/client_test.py ++++ b/influxdb/tests/client_test.py +@@ -32,7 +32,6 @@ import requests + import requests.exceptions + import requests_mock + +-from nose.tools import raises + from urllib3.connection import HTTPConnection + + from influxdb import InfluxDBClient +@@ -383,12 +382,12 @@ class TestInfluxDBClient(unittest.TestCase): + received_data.decode() + ) + +- @raises(Exception) + def test_write_points_fails(self): + """Test write points fail for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- with _mocked_session(cli, 'post', 500): +- cli.write_points([]) ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'post', 500): ++ cli.write_points([]) + + def test_write_points_with_precision(self): + """Test write points with precision for TestInfluxDBClient object.""" +@@ -541,12 +540,12 @@ class TestInfluxDBClient(unittest.TestCase): + consistency='boo' + ) + +- @raises(Exception) + def test_write_points_with_precision_fails(self): + """Test write points w/precision fail for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- with _mocked_session(cli, 'post', 500): +- cli.write_points_with_precision([]) ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'post', 500): ++ cli.write_points_with_precision([]) + + def test_query(self): + """Test query method for TestInfluxDBClient object.""" +@@ -651,11 +650,11 @@ class TestInfluxDBClient(unittest.TestCase): + [example_object, example_object] + ) + +- @raises(Exception) + def test_query_fail(self): + """Test query failed for TestInfluxDBClient object.""" +- with _mocked_session(self.cli, 'get', 401): +- self.cli.query('select column_one from foo;') ++ with self.assertRaises(Exception): ++ with _mocked_session(self.cli, 'get', 401): ++ self.cli.query('select column_one from foo;') + + def test_ping(self): + """Test ping querying InfluxDB version.""" +@@ -697,11 +696,11 @@ class TestInfluxDBClient(unittest.TestCase): + 'create database "123"' + ) + +- @raises(Exception) + def test_create_database_fails(self): + """Test create database fail for TestInfluxDBClient object.""" +- with _mocked_session(self.cli, 'post', 401): +- self.cli.create_database('new_db') ++ with self.assertRaises(Exception): ++ with _mocked_session(self.cli, 'post', 401): ++ self.cli.create_database('new_db') + + def test_drop_database(self): + """Test drop database for TestInfluxDBClient object.""" +@@ -762,12 +761,12 @@ class TestInfluxDBClient(unittest.TestCase): + [{'name': 'new_db_1'}, {'name': 'new_db_2'}] + ) + +- @raises(Exception) + def test_get_list_database_fails(self): + """Test get list of dbs fail for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 401): +- cli.get_list_database() ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 401): ++ cli.get_list_database() + + def test_get_list_measurements(self): + """Test get list of measurements for TestInfluxDBClient object.""" +@@ -840,12 +839,12 @@ class TestInfluxDBClient(unittest.TestCase): + self.cli.get_list_series(tags={'region': 'us-west'}), + ['cpu_load_short,host=server01,region=us-west']) + +- @raises(Exception) + def test_get_list_series_fails(self): + """Test get a list of series from the database but fail.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 401): +- cli.get_list_series() ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 401): ++ cli.get_list_series() + + def test_create_retention_policy_default(self): + """Test create default ret policy for TestInfluxDBClient object.""" +@@ -971,12 +970,12 @@ class TestInfluxDBClient(unittest.TestCase): + 'alter retention policy "somename" on "db" default' + ) + +- @raises(Exception) + def test_alter_retention_policy_invalid(self): + """Test invalid alter ret policy for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 400): +- self.cli.alter_retention_policy('somename', 'db') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 400): ++ self.cli.alter_retention_policy('somename', 'db') + + def test_drop_retention_policy(self): + """Test drop retention policy for TestInfluxDBClient object.""" +@@ -994,12 +993,12 @@ class TestInfluxDBClient(unittest.TestCase): + 'drop retention policy "somename" on "db"' + ) + +- @raises(Exception) + def test_drop_retention_policy_fails(self): + """Test failed drop ret policy for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'delete', 401): +- cli.drop_retention_policy('default', 'db') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'delete', 401): ++ cli.drop_retention_policy('default', 'db') + + def test_get_list_retention_policies(self): + """Test get retention policies for TestInfluxDBClient object.""" +@@ -1179,12 +1178,12 @@ class TestInfluxDBClient(unittest.TestCase): + 'grant all privileges to "test"' + ) + +- @raises(Exception) + def test_grant_admin_privileges_invalid(self): + """Test grant invalid admin privs for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 400): +- self.cli.grant_admin_privileges('') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 400): ++ self.cli.grant_admin_privileges('') + + def test_revoke_admin_privileges(self): + """Test revoke admin privs for TestInfluxDBClient object.""" +@@ -1203,12 +1202,12 @@ class TestInfluxDBClient(unittest.TestCase): + 'revoke all privileges from "test"' + ) + +- @raises(Exception) + def test_revoke_admin_privileges_invalid(self): + """Test revoke invalid admin privs for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 400): +- self.cli.revoke_admin_privileges('') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 400): ++ self.cli.revoke_admin_privileges('') + + def test_grant_privilege(self): + """Test grant privs for TestInfluxDBClient object.""" +@@ -1227,12 +1226,12 @@ class TestInfluxDBClient(unittest.TestCase): + 'grant read on "testdb" to "test"' + ) + +- @raises(Exception) + def test_grant_privilege_invalid(self): + """Test grant invalid privs for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 400): +- self.cli.grant_privilege('', 'testdb', 'test') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 400): ++ self.cli.grant_privilege('', 'testdb', 'test') + + def test_revoke_privilege(self): + """Test revoke privs for TestInfluxDBClient object.""" +@@ -1251,12 +1250,12 @@ class TestInfluxDBClient(unittest.TestCase): + 'revoke read on "testdb" from "test"' + ) + +- @raises(Exception) + def test_revoke_privilege_invalid(self): + """Test revoke invalid privs for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 400): +- self.cli.revoke_privilege('', 'testdb', 'test') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 400): ++ self.cli.revoke_privilege('', 'testdb', 'test') + + def test_get_list_privileges(self): + """Test get list of privs for TestInfluxDBClient object.""" +@@ -1278,12 +1277,12 @@ class TestInfluxDBClient(unittest.TestCase): + {'database': 'db3', 'privilege': 'NO PRIVILEGES'}] + ) + +- @raises(Exception) + def test_get_list_privileges_fails(self): + """Test failed get list of privs for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 401): +- cli.get_list_privileges('test') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 401): ++ cli.get_list_privileges('test') + + def test_get_list_continuous_queries(self): + """Test getting a list of continuous queries.""" +@@ -1333,11 +1332,11 @@ class TestInfluxDBClient(unittest.TestCase): + ] + ) + +- @raises(Exception) + def test_get_list_continuous_queries_fails(self): + """Test failing to get a list of continuous queries.""" +- with _mocked_session(self.cli, 'get', 400): +- self.cli.get_list_continuous_queries() ++ with self.assertRaises(Exception): ++ with _mocked_session(self.cli, 'get', 400): ++ self.cli.get_list_continuous_queries() + + def test_create_continuous_query(self): + """Test continuous query creation.""" +@@ -1366,11 +1365,12 @@ class TestInfluxDBClient(unittest.TestCase): + '"6_months"."events" from "events" group by time(10m) end' + ) + +- @raises(Exception) + def test_create_continuous_query_fails(self): + """Test failing to create a continuous query.""" +- with _mocked_session(self.cli, 'get', 400): +- self.cli.create_continuous_query('cq_name', 'select', 'db_name') ++ with self.assertRaises(Exception): ++ with _mocked_session(self.cli, 'get', 400): ++ self.cli.create_continuous_query('cq_name', 'select', ++ 'db_name') + + def test_drop_continuous_query(self): + """Test dropping a continuous query.""" +@@ -1387,11 +1387,11 @@ class TestInfluxDBClient(unittest.TestCase): + 'drop continuous query "cq_name" on "db_name"' + ) + +- @raises(Exception) + def test_drop_continuous_query_fails(self): + """Test failing to drop a continuous query.""" +- with _mocked_session(self.cli, 'get', 400): +- self.cli.drop_continuous_query('cq_name', 'db_name') ++ with self.assertRaises(Exception): ++ with _mocked_session(self.cli, 'get', 400): ++ self.cli.drop_continuous_query('cq_name', 'db_name') + + def test_invalid_port_fails(self): + """Test invalid port fail for TestInfluxDBClient object.""" +diff --git a/influxdb/tests/dataframe_client_test.py b/influxdb/tests/dataframe_client_test.py +index 87b8e0d..a8c8416 100644 +--- a/influxdb/tests/dataframe_client_test.py ++++ b/influxdb/tests/dataframe_client_test.py +@@ -13,7 +13,6 @@ import unittest + import warnings + import requests_mock + +-from nose.tools import raises + from influxdb.tests import skip_if_pypy, using_pypy + + from .client_test import _mocked_session +@@ -597,35 +596,35 @@ class TestDataFrameClient(unittest.TestCase): + m.last_request.body, + ) + +- @raises(TypeError) + def test_write_points_from_dataframe_fails_without_time_index(self): + """Test failed write points from df without time index.""" + dataframe = pd.DataFrame(data=[["1", 1, 1.0], ["2", 2, 2.0]], + columns=["column_one", "column_two", + "column_three"]) + +- with requests_mock.Mocker() as m: +- m.register_uri(requests_mock.POST, +- "http://localhost:8086/db/db/series", +- status_code=204) ++ with self.assertRaises(TypeError): ++ with requests_mock.Mocker() as m: ++ m.register_uri(requests_mock.POST, ++ "http://localhost:8086/db/db/series", ++ status_code=204) + +- cli = DataFrameClient(database='db') +- cli.write_points(dataframe, "foo") ++ cli = DataFrameClient(database='db') ++ cli.write_points(dataframe, "foo") + +- @raises(TypeError) + def test_write_points_from_dataframe_fails_with_series(self): + """Test failed write points from df with series.""" + now = pd.Timestamp('1970-01-01 00:00+00:00') + dataframe = pd.Series(data=[1.0, 2.0], + index=[now, now + timedelta(hours=1)]) + +- with requests_mock.Mocker() as m: +- m.register_uri(requests_mock.POST, +- "http://localhost:8086/db/db/series", +- status_code=204) ++ with self.assertRaises(TypeError): ++ with requests_mock.Mocker() as m: ++ m.register_uri(requests_mock.POST, ++ "http://localhost:8086/db/db/series", ++ status_code=204) + +- cli = DataFrameClient(database='db') +- cli.write_points(dataframe, "foo") ++ cli = DataFrameClient(database='db') ++ cli.write_points(dataframe, "foo") + + def test_create_database(self): + """Test create database for TestInfluxDBClient object.""" +@@ -657,12 +656,12 @@ class TestDataFrameClient(unittest.TestCase): + 'create database "123"' + ) + +- @raises(Exception) + def test_create_database_fails(self): + """Test create database fail for TestInfluxDBClient object.""" + cli = DataFrameClient(database='db') +- with _mocked_session(cli, 'post', 401): +- cli.create_database('new_db') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'post', 401): ++ cli.create_database('new_db') + + def test_drop_database(self): + """Test drop database for TestInfluxDBClient object.""" +@@ -709,12 +708,12 @@ class TestDataFrameClient(unittest.TestCase): + 'drop database "123"' + ) + +- @raises(Exception) + def test_get_list_database_fails(self): + """Test get list of dbs fail for TestInfluxDBClient object.""" + cli = DataFrameClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 401): +- cli.get_list_database() ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 401): ++ cli.get_list_database() + + def test_get_list_measurements(self): + """Test get list of measurements for TestInfluxDBClient object.""" +@@ -819,12 +818,12 @@ class TestDataFrameClient(unittest.TestCase): + 'alter retention policy "somename" on "db" default' + ) + +- @raises(Exception) + def test_alter_retention_policy_invalid(self): + """Test invalid alter ret policy for TestInfluxDBClient object.""" + cli = DataFrameClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 400): +- cli.alter_retention_policy('somename', 'db') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 400): ++ cli.alter_retention_policy('somename', 'db') + + def test_drop_retention_policy(self): + """Test drop retention policy for TestInfluxDBClient object.""" +@@ -843,12 +842,12 @@ class TestDataFrameClient(unittest.TestCase): + 'drop retention policy "somename" on "db"' + ) + +- @raises(Exception) + def test_drop_retention_policy_fails(self): + """Test failed drop ret policy for TestInfluxDBClient object.""" + cli = DataFrameClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'delete', 401): +- cli.drop_retention_policy('default', 'db') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'delete', 401): ++ cli.drop_retention_policy('default', 'db') + + def test_get_list_retention_policies(self): + """Test get retention policies for TestInfluxDBClient object.""" +diff --git a/influxdb/tests/influxdb08/client_test.py b/influxdb/tests/influxdb08/client_test.py +index 39ab52d..d20a411 100644 +--- a/influxdb/tests/influxdb08/client_test.py ++++ b/influxdb/tests/influxdb08/client_test.py +@@ -13,7 +13,6 @@ import requests + import requests.exceptions + import requests_mock + +-from nose.tools import raises + from mock import patch + + from influxdb.influxdb08 import InfluxDBClient +@@ -131,12 +130,12 @@ class TestInfluxDBClient(unittest.TestCase): + cli.switch_database('another_database') + self.assertEqual(cli._database, 'another_database') + +- @raises(FutureWarning) + def test_switch_db_deprecated(self): + """Test deprecated switch database for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'database') +- cli.switch_db('another_database') +- self.assertEqual(cli._database, 'another_database') ++ with self.assertRaises(FutureWarning): ++ cli.switch_db('another_database') ++ self.assertEqual(cli._database, 'another_database') + + def test_switch_user(self): + """Test switch user for TestInfluxDBClient object.""" +@@ -288,12 +287,13 @@ class TestInfluxDBClient(unittest.TestCase): + time_precision='ms' + ) + +- @raises(Exception) + def test_write_points_fails(self): + """Test failed write points for TestInfluxDBClient object.""" +- with _mocked_session('post', 500): +- cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.write_points([]) ++ with self.assertRaises(Exception): ++ with _mocked_session('post', 500): ++ cli = InfluxDBClient('host', 8086, 'username', ++ 'password', 'db') ++ cli.write_points([]) + + def test_write_points_with_precision(self): + """Test write points with precision.""" +@@ -313,12 +313,13 @@ class TestInfluxDBClient(unittest.TestCase): + time_precision='g' + ) + +- @raises(Exception) + def test_write_points_with_precision_fails(self): + """Test write points where precision fails.""" +- with _mocked_session('post', 500): +- cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.write_points_with_precision([]) ++ with self.assertRaises(Exception): ++ with _mocked_session('post', 500): ++ cli = InfluxDBClient('host', 8086, 'username', ++ 'password', 'db') ++ cli.write_points_with_precision([]) + + def test_delete_points(self): + """Test delete points for TestInfluxDBClient object.""" +@@ -333,30 +334,31 @@ class TestInfluxDBClient(unittest.TestCase): + {'u': 'username', 'p': 'password'}) + self.assertEqual(kwds['url'], 'http://host:8086/db/db/series/foo') + +- @raises(Exception) + def test_delete_points_with_wrong_name(self): + """Test delete points with wrong name.""" +- with _mocked_session('delete', 400): +- cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.delete_points("nonexist") ++ with self.assertRaises(Exception): ++ with _mocked_session('delete', 400): ++ cli = InfluxDBClient('host', 8086, 'username', ++ 'password', 'db') ++ cli.delete_points("nonexist") + +- @raises(NotImplementedError) + def test_create_scheduled_delete(self): + """Test create scheduled deletes.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.create_scheduled_delete([]) ++ with self.assertRaises(NotImplementedError): ++ cli.create_scheduled_delete([]) + +- @raises(NotImplementedError) + def test_get_list_scheduled_delete(self): + """Test get schedule list of deletes TestInfluxDBClient.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.get_list_scheduled_delete() ++ with self.assertRaises(NotImplementedError): ++ cli.get_list_scheduled_delete() + +- @raises(NotImplementedError) + def test_remove_scheduled_delete(self): + """Test remove scheduled delete TestInfluxDBClient.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.remove_scheduled_delete(1) ++ with self.assertRaises(NotImplementedError): ++ cli.remove_scheduled_delete(1) + + def test_query(self): + """Test query for TestInfluxDBClient object.""" +@@ -438,12 +440,13 @@ class TestInfluxDBClient(unittest.TestCase): + [example_object, example_object] + ) + +- @raises(Exception) + def test_query_fail(self): + """Test failed query for TestInfluxDBClient.""" +- with _mocked_session('get', 401): +- cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.query('select column_one from foo;') ++ with self.assertRaises(Exception): ++ with _mocked_session('get', 401): ++ cli = InfluxDBClient('host', 8086, 'username', ++ 'password', 'db') ++ cli.query('select column_one from foo;') + + def test_query_bad_precision(self): + """Test query with bad precision for TestInfluxDBClient.""" +@@ -460,12 +463,13 @@ class TestInfluxDBClient(unittest.TestCase): + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') + self.assertTrue(cli.create_database('new_db')) + +- @raises(Exception) + def test_create_database_fails(self): + """Test failed create database for TestInfluxDBClient.""" +- with _mocked_session('post', 401): +- cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.create_database('new_db') ++ with self.assertRaises(Exception): ++ with _mocked_session('post', 401): ++ cli = InfluxDBClient('host', 8086, 'username', ++ 'password', 'db') ++ cli.create_database('new_db') + + def test_delete_database(self): + """Test delete database for TestInfluxDBClient.""" +@@ -473,12 +477,13 @@ class TestInfluxDBClient(unittest.TestCase): + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') + self.assertTrue(cli.delete_database('old_db')) + +- @raises(Exception) + def test_delete_database_fails(self): + """Test failed delete database for TestInfluxDBClient.""" +- with _mocked_session('delete', 401): +- cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.delete_database('old_db') ++ with self.assertRaises(Exception): ++ with _mocked_session('delete', 401): ++ cli = InfluxDBClient('host', 8086, 'username', ++ 'password', 'db') ++ cli.delete_database('old_db') + + def test_get_list_database(self): + """Test get list of databases for TestInfluxDBClient.""" +@@ -490,23 +495,23 @@ class TestInfluxDBClient(unittest.TestCase): + self.assertEqual(len(cli.get_list_database()), 1) + self.assertEqual(cli.get_list_database()[0]['name'], 'a_db') + +- @raises(Exception) + def test_get_list_database_fails(self): + """Test failed get list of databases for TestInfluxDBClient.""" +- with _mocked_session('get', 401): +- cli = InfluxDBClient('host', 8086, 'username', 'password') +- cli.get_list_database() ++ with self.assertRaises(Exception): ++ with _mocked_session('get', 401): ++ cli = InfluxDBClient('host', 8086, 'username', 'password') ++ cli.get_list_database() + +- @raises(FutureWarning) + def test_get_database_list_deprecated(self): + """Test deprecated get database list for TestInfluxDBClient.""" + data = [ + {"name": "a_db"} + ] +- with _mocked_session('get', 200, data): +- cli = InfluxDBClient('host', 8086, 'username', 'password') +- self.assertEqual(len(cli.get_database_list()), 1) +- self.assertEqual(cli.get_database_list()[0]['name'], 'a_db') ++ with self.assertRaises(FutureWarning): ++ with _mocked_session('get', 200, data): ++ cli = InfluxDBClient('host', 8086, 'username', 'password') ++ self.assertEqual(len(cli.get_database_list()), 1) ++ self.assertEqual(cli.get_database_list()[0]['name'], 'a_db') + + def test_delete_series(self): + """Test delete series for TestInfluxDBClient.""" +@@ -514,12 +519,13 @@ class TestInfluxDBClient(unittest.TestCase): + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') + cli.delete_series('old_series') + +- @raises(Exception) + def test_delete_series_fails(self): + """Test failed delete series for TestInfluxDBClient.""" +- with _mocked_session('delete', 401): +- cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.delete_series('old_series') ++ with self.assertRaises(Exception): ++ with _mocked_session('delete', 401): ++ cli = InfluxDBClient('host', 8086, 'username', ++ 'password', 'db') ++ cli.delete_series('old_series') + + def test_get_series_list(self): + """Test get list of series for TestInfluxDBClient.""" +@@ -662,29 +668,30 @@ class TestInfluxDBClient(unittest.TestCase): + } + ) + +- @raises(NotImplementedError) + def test_get_list_database_admins(self): + """Test get list of database admins for TestInfluxDBClient.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.get_list_database_admins() ++ with self.assertRaises(NotImplementedError): ++ cli.get_list_database_admins() + +- @raises(NotImplementedError) + def test_add_database_admin(self): + """Test add database admins for TestInfluxDBClient.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.add_database_admin('admin', 'admin_secret_password') ++ with self.assertRaises(NotImplementedError): ++ cli.add_database_admin('admin', 'admin_secret_password') + +- @raises(NotImplementedError) + def test_update_database_admin_password(self): + """Test update database admin pass for TestInfluxDBClient.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.update_database_admin_password('admin', 'admin_secret_password') ++ with self.assertRaises(NotImplementedError): ++ cli.update_database_admin_password('admin', ++ 'admin_secret_password') + +- @raises(NotImplementedError) + def test_delete_database_admin(self): + """Test delete database admin for TestInfluxDBClient.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.delete_database_admin('admin') ++ with self.assertRaises(NotImplementedError): ++ cli.delete_database_admin('admin') + + def test_get_database_users(self): + """Test get database users for TestInfluxDBClient.""" +@@ -842,11 +849,11 @@ class TestInfluxDBClient(unittest.TestCase): + + self.assertIsNone(m.last_request.body) + +- @raises(NotImplementedError) + def test_update_permission(self): + """Test update permission for TestInfluxDBClient.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.update_permission('admin', []) ++ with self.assertRaises(NotImplementedError): ++ cli.update_permission('admin', []) + + @mock.patch('requests.Session.request') + def test_request_retry(self, mock_request): +diff --git a/influxdb/tests/influxdb08/dataframe_client_test.py b/influxdb/tests/influxdb08/dataframe_client_test.py +index 0a766af..104ae6b 100644 +--- a/influxdb/tests/influxdb08/dataframe_client_test.py ++++ b/influxdb/tests/influxdb08/dataframe_client_test.py +@@ -10,8 +10,6 @@ import warnings + + import requests_mock + +-from nose.tools import raises +- + from influxdb.tests import skip_if_pypy, using_pypy + + from .client_test import _mocked_session +@@ -191,33 +189,33 @@ class TestDataFrameClient(unittest.TestCase): + cli.write_points({"foo": dataframe}, time_precision='u') + self.assertListEqual(json.loads(m.last_request.body), points_us) + +- @raises(TypeError) + def test_write_points_from_dataframe_fails_without_time_index(self): + """Test write points from dataframe that fails without time index.""" + dataframe = pd.DataFrame(data=[["1", 1, 1.0], ["2", 2, 2.0]], + columns=["column_one", "column_two", + "column_three"]) + +- with requests_mock.Mocker() as m: +- m.register_uri(requests_mock.POST, +- "http://localhost:8086/db/db/series") ++ with self.assertRaises(TypeError): ++ with requests_mock.Mocker() as m: ++ m.register_uri(requests_mock.POST, ++ "http://localhost:8086/db/db/series") + +- cli = DataFrameClient(database='db') +- cli.write_points({"foo": dataframe}) ++ cli = DataFrameClient(database='db') ++ cli.write_points({"foo": dataframe}) + +- @raises(TypeError) + def test_write_points_from_dataframe_fails_with_series(self): + """Test failed write points from dataframe with series.""" + now = pd.Timestamp('1970-01-01 00:00+00:00') + dataframe = pd.Series(data=[1.0, 2.0], + index=[now, now + timedelta(hours=1)]) + +- with requests_mock.Mocker() as m: +- m.register_uri(requests_mock.POST, +- "http://localhost:8086/db/db/series") ++ with self.assertRaises(TypeError): ++ with requests_mock.Mocker() as m: ++ m.register_uri(requests_mock.POST, ++ "http://localhost:8086/db/db/series") + +- cli = DataFrameClient(database='db') +- cli.write_points({"foo": dataframe}) ++ cli = DataFrameClient(database='db') ++ cli.write_points({"foo": dataframe}) + + def test_query_into_dataframe(self): + """Test query into a dataframe.""" diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index 400887dbd277..e4397954dd66 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -6,13 +6,14 @@ arrow, six, hypothesis, + num2words, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "inform"; - version = "1.29"; + version = "1.30"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "inform"; rev = "refs/tags/v${version}"; - hash = "sha256-quJGgXMvVZGqZA6M/AjU/cjYeL0R2nuPDoL0Ji0Ow6I="; + hash = "sha256-6Yx9ZdmrFApJ6zBiC8Q++hlATVqjriJLS2KsqC0IBCk="; }; nativeBuildInputs = [ flit-core ]; @@ -32,6 +33,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + num2words pytestCheckHook hypothesis ]; diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix index 7c8a962ec462..4722aa190241 100644 --- a/pkgs/development/python-modules/inkbird-ble/default.nix +++ b/pkgs/development/python-modules/inkbird-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "inkbird-ble"; - version = "0.5.6"; + version = "0.5.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-re5HjPtssFkpcltCr0HEJmJyHbXJdkr2wDgaAHfy2Tk="; + hash = "sha256-cUqU4XaY7CORhzy0AGjXI5c5ka+PnF4cHdyopyEBcLo="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index 15e24ce15769..8b65de7cfe35 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -20,16 +20,16 @@ buildPythonPackage rec { pname = "inquirer"; - version = "3.2.4"; + version = "3.2.5"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub rec { owner = "magmax"; repo = "python-inquirer"; rev = "refs/tags/v${version}"; - hash = "sha256-LsZ2SYgBOKZegk7b9DwForwMA49XvIe+Z6WvI1/YscY="; + hash = "sha256-7No4Yw0zBGflvglx7G1/yjrsU/DkTrSz93DfIzokBYM="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix index bb36e7a8abf2..02cba2b3b9d6 100644 --- a/pkgs/development/python-modules/instructor/default.nix +++ b/pkgs/development/python-modules/instructor/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, docstring-parser, fetchFromGitHub, + jiter, openai, poetry-core, pydantic, @@ -15,7 +16,6 @@ diskcache, redis, pythonOlder, - pythonRelaxDepsHook, rich, tenacity, typer, @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "instructor"; - version = "1.2.3"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,21 +32,21 @@ buildPythonPackage rec { owner = "jxnl"; repo = "instructor"; rev = "refs/tags/${version}"; - hash = "sha256-LmorlFKIG7iPAK4pDbQqjxjiwB1md3u52B4u5WlqqTk="; + hash = "sha256-ye6uNnwvJ3RXmKM8ix/sBiJgeCFQazNVgHZkBAnL0nw="; }; pythonRelaxDeps = [ "docstring-parser" "pydantic" + "jiter" ]; build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - dependencies = [ aiohttp docstring-parser + jiter openai pydantic rich @@ -75,7 +75,6 @@ buildPythonPackage rec { disabledTestPaths = [ # Tests require OpenAI API key "tests/test_distil.py" - "tests/test_new_client.py" "tests/llm/" ]; diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index a6f697ef8c28..f6c38f32cad6 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -4,7 +4,6 @@ fetchPypi, pythonOlder, pytestCheckHook, - pythonRelaxDepsHook, matplotlib, nibabel, numpy, @@ -36,7 +35,6 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace "pytest-runner" "" ''; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "nibabel" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/iodata/default.nix b/pkgs/development/python-modules/iodata/default.nix index af27d8494d06..e412d4fcbd89 100644 --- a/pkgs/development/python-modules/iodata/default.nix +++ b/pkgs/development/python-modules/iodata/default.nix @@ -2,37 +2,44 @@ buildPythonPackage, lib, fetchFromGitHub, + setuptools, + setuptools-scm, numpy, scipy, attrs, - cython, - nose, + pytest-xdist, + pytestCheckHook, }: buildPythonPackage rec { pname = "iodata"; - version = "1.0.0a2"; - format = "setuptools"; + version = "1.0.0a4"; + pyproject = true; src = fetchFromGitHub { owner = "theochem"; repo = pname; - rev = version; - hash = "sha256-GFTCYE19Re7WLhV8eU+0i8OMp/Tsms/Xj9DRTcgjcz4="; + rev = "refs/tags/v${version}"; + hash = "sha256-ld6V+/8lg4Du6+mHU5XuXXyMpWwyepXurerScg/bf2Q="; }; - nativeBuildInputs = [ - cython - nose + build-system = [ + setuptools + setuptools-scm ]; - propagatedBuildInputs = [ + + dependencies = [ numpy scipy attrs ]; pythonImportsCheck = [ "iodata" ]; - doCheck = false; # Requires roberto or nose and a lenghtly setup to find the cython modules + + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + ]; meta = with lib; { description = "Python library for reading, writing, and converting computational chemistry file formats and generating input files"; diff --git a/pkgs/development/python-modules/ionoscloud/default.nix b/pkgs/development/python-modules/ionoscloud/default.nix index 901c4289cca7..5c296986b58d 100644 --- a/pkgs/development/python-modules/ionoscloud/default.nix +++ b/pkgs/development/python-modules/ionoscloud/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Python API client for ionoscloud"; changelog = "https://github.com/ionos-cloud/sdk-python/blob/v${version}/docs/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ hexchen ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/iptools/default.nix b/pkgs/development/python-modules/iptools/default.nix index 42e296afcc86..c3d14b161c02 100644 --- a/pkgs/development/python-modules/iptools/default.nix +++ b/pkgs/development/python-modules/iptools/default.nix @@ -1,25 +1,34 @@ { lib, buildPythonPackage, - fetchPypi, - nose, + fetchFromGitHub, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { version = "0.7.0"; - format = "setuptools"; pname = "iptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "1sp2v76qqsgqjk0vqfbm2s4sc4mi0gkkpzjnvwih3ymmidilz2hi"; + src = fetchFromGitHub { + owner = "bd808"; + repo = "python-iptools"; + rev = "refs/tags/v${version}"; + hash = "sha256-340Wc4QGwUqEEANM5EQzFaXxIWVf2fDr4qfCuxNEVBQ="; }; - buildInputs = [ nose ]; + build-system = [ setuptools ]; + + pythonImportsCheck = [ "iptools" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tests/iptools/iptools_test.py" ]; meta = with lib; { description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting"; - homepage = "https://pypi.python.org/pypi/iptools"; + homepage = "https://github.com/bd808/python-iptools"; license = licenses.bsd0; }; } diff --git a/pkgs/development/python-modules/ipwhois/default.nix b/pkgs/development/python-modules/ipwhois/default.nix index 43495abeb052..bd69e5ccd514 100644 --- a/pkgs/development/python-modules/ipwhois/default.nix +++ b/pkgs/development/python-modules/ipwhois/default.nix @@ -9,7 +9,6 @@ libredirect, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, setuptools, }: @@ -41,7 +40,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "dnspython" ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/ipy/default.nix b/pkgs/development/python-modules/ipy/default.nix index 7db51ef648b1..5a5876b8b2be 100644 --- a/pkgs/development/python-modules/ipy/default.nix +++ b/pkgs/development/python-modules/ipy/default.nix @@ -2,25 +2,26 @@ lib, buildPythonPackage, fetchPypi, - nose, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "ipy"; version = "1.01"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "IPy"; inherit version; - sha256 = "edeca741dea2d54aca568fa23740288c3fe86c0f3ea700344571e9ef14a7cc1a"; + hash = "sha256-7eynQd6i1UrKVo+iN0AojD/obA8+pwA0RXHp7xSnzBo="; }; - nativeCheckInputs = [ nose ]; + build-system = [ setuptools ]; - checkPhase = '' - nosetests -e fuzz - ''; + pythonImportsCheck = [ "IPy" ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Class and tools for handling of IPv4 and IPv6 addresses and networks"; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 3ef98a9a8eb8..7fd770219301 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.29.4"; + version = "6.29.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-PUQHAGD5R1rCCSt2ASP63xBdLiSTwkhItmkafE9Cr1w="; + hash = "sha256-8JOiLEpA+IKPjjMKnCl8uT3KsTvZZ43tbejlz4HFYhU="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 diff --git a/pkgs/development/python-modules/ipython-genutils/default.nix b/pkgs/development/python-modules/ipython-genutils/default.nix index a0f8717de4b6..980e828c44a5 100644 --- a/pkgs/development/python-modules/ipython-genutils/default.nix +++ b/pkgs/development/python-modules/ipython-genutils/default.nix @@ -2,10 +2,9 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, setuptools, - nose, pytestCheckHook, - pythonAtLeast, }: buildPythonPackage rec { @@ -13,27 +12,23 @@ buildPythonPackage rec { version = "0.2.0"; pyproject = true; - # uses the imp module, upstream says "DO NOT USE" - disabled = pythonAtLeast "3.12"; - src = fetchPypi { pname = "ipython_genutils"; inherit version; hash = "sha256-6y4RbnXs751NIo/cZq9UJpr6JqtEYwQuM3hbiHxii6g="; }; - nativeBuildInputs = [ setuptools ]; - - nativeCheckInputs = [ - nose - pytestCheckHook + patches = [ + (fetchpatch { + name = "ipython_genutils-denose.patch"; + url = "https://build.opensuse.org/public/source/devel:languages:python:jupyter/python-ipython_genutils/denose.patch?rev=9"; + hash = "sha256-At0aq6rLw/L64Own069m0p/WQm7iDa24fm0SPLLRBdE="; + }) ]; - preCheck = '' - substituteInPlace ipython_genutils/tests/test_path.py \ - --replace "setUp" "setup_method" \ - --replace "tearDown" "teardown_method" - ''; + nativeBuildInputs = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ipython_genutils" ]; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 56feb411fe95..af34d35c647d 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -42,13 +42,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.24.0"; + version = "8.25.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-AQ2z+KcopXi7ZB/dBsBjufuOlqlGTGOuxjEPvLXoBQE="; + hash = "sha256-xu1yahQLbnJbkRUo+AQ5xTT6yRUkavPvw5RAprD51xY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 8afe89caf8ca..b73810bf3b8a 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "irc"; - version = "20.4.0"; + version = "20.4.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fSUX9VZta/Oqhdf5jHdYth8NY+6RW/2fb1ZxOXNmRPk="; + hash = "sha256-J1aYebrlzYmRwhfNy0ZRkNe08YpqJnSeSNBT/QtaUsw="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/jaconv/default.nix b/pkgs/development/python-modules/jaconv/default.nix index 474b168c6042..d56e02f9d674 100644 --- a/pkgs/development/python-modules/jaconv/default.nix +++ b/pkgs/development/python-modules/jaconv/default.nix @@ -2,29 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, pythonOlder, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "jaconv"; version = "0.3.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ikegami-yukino"; - repo = pname; + repo = "jaconv"; rev = "refs/tags/v${version}"; hash = "sha256-9ruhOLaYNESeKOwJs3IN6ct66fSq7My9DOyA7/cH3d0="; }; - nativeCheckInputs = [ - nose - pytestCheckHook - ]; + patches = [ ./use-pytest.patch ]; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "jaconv" ]; diff --git a/pkgs/development/python-modules/jaconv/use-pytest.patch b/pkgs/development/python-modules/jaconv/use-pytest.patch new file mode 100644 index 000000000000..b91704ee4f32 --- /dev/null +++ b/pkgs/development/python-modules/jaconv/use-pytest.patch @@ -0,0 +1,34 @@ +diff --git a/test_jaconv.py b/test_jaconv.py +index 7e0a169..aaf180d 100644 +--- a/test_jaconv.py ++++ b/test_jaconv.py +@@ -1,11 +1,8 @@ + # -*- coding: utf-8 -*- + from __future__ import unicode_literals +-from nose.tools import assert_equal, nottest + import jaconv + from functools import partial + +-assert_equal.__self__.maxDiff = None +- + HIRAGANA = ('ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞた', + 'だちぢっつづてでとどなにぬねのはばぱひびぴふぶぷへべぺほぼぽま', + 'みむめもゃやゅゆょよらりるれろわをんーゎゐゑゕゖゔゝゞ・「」。、') +@@ -25,13 +22,15 @@ FULL_ASCII = ('！＂＃＄％＆＇（）＊＋，－．／：；＜＝＞？ + FULL_DIGIT = '０１２３４５６７８９' + + +-@nottest ++def assert_equal(x, y): ++ assert x == y ++ ++ + def _compare(mathod, lhs, rhs): + for i in range(len(lhs)): + assert_equal(mathod(lhs[i]), rhs[i]) + + +-@nottest + def _concat(*iterables): + result = '' + for iterable in iterables: diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix index a1a725ddf001..a6e843f7d4a2 100644 --- a/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/pkgs/development/python-modules/jaraco-abode/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "jaraco-abode"; - version = "5.1.1"; + version = "5.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.abode"; rev = "refs/tags/v${version}"; - hash = "sha256-TUxljF1k/fvQoNcHx6jMRJrYgzxjXefvMl+mBD0DL8o="; + hash = "sha256-O7adVcczkEZ3B7qhZlIWp5A7ujHlEjLQG6OfR59eSO4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jaraco-classes/default.nix b/pkgs/development/python-modules/jaraco-classes/default.nix index 399849db57d9..e80c2add69f2 100644 --- a/pkgs/development/python-modules/jaraco-classes/default.nix +++ b/pkgs/development/python-modules/jaraco-classes/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "jaraco-classes"; - version = "3.3.1"; + version = "3.4.0"; format = "pyproject"; disabled = isPy27; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.classes"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ds84jNEx/2/BnMTbLMvXf/nxKSqyCBM7B7S0NNYagVE="; + sha256 = "sha256-pXDsLKiEru+UXcEBT4/cP1u8s9vSn1Zhf7Qnwy9Zr0I="; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jaraco-context/default.nix b/pkgs/development/python-modules/jaraco-context/default.nix index 41837b391d89..c0ea092b0fc1 100644 --- a/pkgs/development/python-modules/jaraco-context/default.nix +++ b/pkgs/development/python-modules/jaraco-context/default.nix @@ -4,11 +4,12 @@ fetchFromGitHub, pythonOlder, setuptools-scm, + backports-tarfile, }: buildPythonPackage rec { pname = "jaraco-context"; - version = "4.3.0"; + version = "5.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,13 +18,15 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.context"; rev = "refs/tags/v${version}"; - hash = "sha256-YdbkpKv7k62uyhmjKoxeA9uf5BWnRD/rK+z46FJN4xk="; + hash = "sha256-Caj51qBLHbuiey023iLc+N2M8QiJKH8G/Pzu1v3AToU="; }; pythonNamespaces = [ "jaraco" ]; nativeBuildInputs = [ setuptools-scm ]; + dependencies = lib.optionals (pythonOlder "3.12") [ backports-tarfile ]; + # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/jaraco-text/default.nix b/pkgs/development/python-modules/jaraco-text/default.nix index 4828e7c0b0c9..a3656f5cfbc2 100644 --- a/pkgs/development/python-modules/jaraco-text/default.nix +++ b/pkgs/development/python-modules/jaraco-text/default.nix @@ -15,15 +15,15 @@ buildPythonPackage rec { pname = "jaraco-text"; - version = "3.12.0"; + version = "3.12.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - pname = "jaraco.text"; + pname = "jaraco_text"; inherit version; - hash = "sha256-OJ4lyNSzLpcVv1MFlvqw9c06pHKW5DlpOS4YpUGvWSw="; + hash = "sha256-tplJH50HS0/q/f2gQH+lu8XYP0hWB6AS6TRyuhYfaEM="; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 95e85bf8e2b2..ec8c53daab46 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -8,6 +8,7 @@ fetchFromGitHub, jaxlib, jaxlib-bin, + jaxlib-build, hypothesis, lapack, matplotlib, @@ -23,10 +24,6 @@ let usingMKL = blas.implementation == "mkl" || lapack.implementation == "mkl"; - # jaxlib is broken on aarch64-* as of 2023-03-05, but the binary wheels work - # fine. jaxlib is only used in the checkPhase, so switching backends does not - # impact package behavior. Get rid of this once jaxlib is fixed on aarch64-*. - jaxlib' = if jaxlib.meta.broken then jaxlib-bin else jaxlib; in buildPythonPackage rec { pname = "jax"; @@ -61,7 +58,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis - jaxlib' + jaxlib matplotlib pytestCheckHook pytest-xdist @@ -130,7 +127,11 @@ buildPythonPackage rec { "testQdwhWithOnRankDeficientInput5" ]; - disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + disabledTestPaths = [ + # Segmentation fault. See https://gist.github.com/zimbatm/e9b61891f3bcf5e4aaefd13f94344fba + "tests/linalg_test.py" + ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # RuntimeWarning: invalid value encountered in cast "tests/lax_test.py" ]; @@ -147,7 +148,7 @@ buildPythonPackage rec { # NIXPKGS_ALLOW_UNFREE=1 nixglhost -- nix run --impure .#python3Packages.jax.passthru.tests.test_cuda_jaxlibBin passthru.tests = { test_cuda_jaxlibSource = callPackage ./test-cuda.nix { - jaxlib = jaxlib.override { cudaSupport = true; }; + jaxlib = jaxlib-build.override { cudaSupport = true; }; }; test_cuda_jaxlibBin = callPackage ./test-cuda.nix { jaxlib = jaxlib-bin.override { cudaSupport = true; }; @@ -158,7 +159,11 @@ buildPythonPackage rec { passthru.skipBulkUpdate = true; meta = with lib; { - description = "Differentiate, compile, and transform Numpy code"; + description = "Source-built JAX frontend: differentiate, compile, and transform Numpy code"; + longDescription = '' + This is the JAX frontend package, it's meant to be used together with one of the jaxlib implementations, + e.g. `python3Packages.jaxlib`, `python3Packages.jaxlib-bin`, or `python3Packages.jaxlibWithCuda`. + ''; homepage = "https://github.com/google/jax"; license = licenses.asl20; maintainers = with maintainers; [ samuela ]; diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 5d4943a97ced..0932222e02b8 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -34,12 +34,12 @@ let cudaLibPath = lib.makeLibraryPath ( with cudaPackages; [ - cuda_cudart.lib # libcudart.so - cuda_cupti.lib # libcupti.so - cudnn.lib # libcudnn.so - libcufft.lib # libcufft.so - libcusolver.lib # libcusolver.so - libcusparse.lib # libcusparse.so + (lib.getLib cuda_cudart) # libcudart.so + (lib.getLib cuda_cupti) # libcupti.so + (lib.getLib cudnn) # libcudnn.so + (lib.getLib libcufft) # libcufft.so + (lib.getLib libcusolver) # libcusolver.so + (lib.getLib libcusparse) # libcusparse.so ] ); @@ -225,7 +225,7 @@ buildPythonPackage { inherit (jaxlib-build) pythonImportsCheck; meta = with lib; { - description = "XLA library for JAX"; + description = "Prebuilt jaxlib backend from PyPi"; homepage = "https://github.com/google/jax"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index a00def5fb9bc..1e7cf125ef30 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -55,7 +55,6 @@ let inherit (cudaPackages) cudaFlags cudaVersion - cudnn nccl ; @@ -68,30 +67,39 @@ let effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; meta = with lib; { - description = "JAX is Autograd and XLA, brought together for high-performance machine learning research"; + description = "Source-built JAX backend. JAX is Autograd and XLA, brought together for high-performance machine learning research"; homepage = "https://github.com/google/jax"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; - platforms = platforms.unix; + + # Make this platforms.unix once Darwin is supported. + # The top-level jaxlib now falls back to jaxlib-bin on unsupported platforms. # aarch64-darwin is broken because of https://github.com/bazelbuild/rules_cc/pull/136 # however even with that fix applied, it doesn't work for everyone: # https://github.com/NixOS/nixpkgs/pull/184395#issuecomment-1207287129 - # NOTE: We always build with NCCL; if it is unsupported, then our build is broken. - broken = effectiveStdenv.isDarwin || nccl.meta.unsupported; + platforms = platforms.linux; + }; + + # Bazel wants a merged cudnn at configuration time + cudnnMerged = symlinkJoin { + name = "cudnn-merged"; + paths = with cudaPackages; [ + (lib.getDev cudnn) + (lib.getLib cudnn) + ]; }; # These are necessary at build time and run time. cuda_libs_joined = symlinkJoin { name = "cuda-joined"; paths = with cudaPackages; [ - cuda_cudart.lib # libcudart.so - cuda_cudart.static # libcudart_static.a - cuda_cupti.lib # libcupti.so - libcublas.lib # libcublas.so - libcufft.lib # libcufft.so - libcurand.lib # libcurand.so - libcusolver.lib # libcusolver.so - libcusparse.lib # libcusparse.so + (lib.getLib cuda_cudart) # libcudart.so + (lib.getLib cuda_cupti) # libcupti.so + (lib.getLib libcublas) # libcublas.so + (lib.getLib libcufft) # libcufft.so + (lib.getLib libcurand) # libcurand.so + (lib.getLib libcusolver) # libcusolver.so + (lib.getLib libcusparse) # libcusparse.so ]; }; # These are only necessary at build time. @@ -101,20 +109,23 @@ let cuda_libs_joined # Binaries - cudaPackages.cuda_nvcc.bin # nvcc + (lib.getBin cuda_nvcc) # nvcc + + # Archives + (lib.getOutput "static" cuda_cudart) # libcudart_static.a # Headers - cuda_cccl.dev # block_load.cuh - cuda_cudart.dev # cuda.h - cuda_cupti.dev # cupti.h - cuda_nvcc.dev # See https://github.com/google/jax/issues/19811 - cuda_nvml_dev # nvml.h - cuda_nvtx.dev # nvToolsExt.h - libcublas.dev # cublas_api.h - libcufft.dev # cufft.h - libcurand.dev # curand.h - libcusolver.dev # cusolver_common.h - libcusparse.dev # cusparse.h + (lib.getDev cuda_cccl) # block_load.cuh + (lib.getDev cuda_cudart) # cuda.h + (lib.getDev cuda_cupti) # cupti.h + (lib.getDev cuda_nvcc) # See https://github.com/google/jax/issues/19811 + (lib.getDev cuda_nvml_dev) # nvml.h + (lib.getDev cuda_nvtx) # nvToolsExt.h + (lib.getDev libcublas) # cublas_api.h + (lib.getDev libcufft) # cufft.h + (lib.getDev libcurand) # curand.h + (lib.getDev libcusolver) # cusolver_common.h + (lib.getDev libcusparse) # cusparse.h ]; }; @@ -308,10 +319,10 @@ let + lib.optionalString cudaSupport '' build --config=cuda build --action_env CUDA_TOOLKIT_PATH="${cuda_build_deps_joined}" - build --action_env CUDNN_INSTALL_PATH="${cudnn}" - build --action_env TF_CUDA_PATHS="${cuda_build_deps_joined},${cudnn},${nccl}" + build --action_env CUDNN_INSTALL_PATH="${cudnnMerged}" + build --action_env TF_CUDA_PATHS="${cuda_build_deps_joined},${cudnnMerged},${lib.getDev nccl}" build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudaVersion}" - build --action_env TF_CUDNN_VERSION="${lib.versions.major cudnn.version}" + build --action_env TF_CUDNN_VERSION="${lib.versions.major cudaPackages.cudnn.version}" build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.realArches}" '' + @@ -374,13 +385,20 @@ let sha256 = ( if cudaSupport then - { x86_64-linux = "sha256-vUoAPkYKEnHkV4fw6BI0mCeuP2e8BMCJnVuZMm9LwSA="; } + { x86_64-linux = "sha256-Uf0VMRE0jgaWEYiuphWkWloZ5jMeqaWBl3lSvk2y1HI="; } else { - x86_64-linux = "sha256-R5Bm+0GYN1zJ1aEUBW76907MxYKAIawHHJoIb1RdsKE="; - aarch64-linux = "sha256-P5JEmJljN1DeRA0dNkzyosKzRnJH+5SD2aWdV5JsoiY="; + x86_64-linux = "sha256-NzJJg6NlrPGMiR8Fn8u4+fu0m+AulfmN5Xqk63Um6sw="; + aarch64-linux = "sha256-Ro3qzrUxSR+3TH6ROoJTq+dLSufrDN/9oEo2MRkx7wM="; } ).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}"); + + # Non-reproducible fetch https://github.com/NixOS/nixpkgs/issues/321920#issuecomment-2184940546 + preInstall = '' + cat << \EOF > "$bazelOut/external/go_sdk/versions.json" + [] + EOF + ''; }; buildAttrs = { @@ -418,7 +436,7 @@ let throw "Unsupported target platform: ${effectiveStdenv.hostPlatform}"; in buildPythonPackage { - inherit meta pname version; + inherit pname version; format = "wheel"; src = @@ -431,13 +449,13 @@ buildPythonPackage { # for more info. postInstall = lib.optionalString cudaSupport '' mkdir -p $out/bin - ln -s ${cudaPackages.cuda_nvcc.bin}/bin/ptxas $out/bin/ptxas + ln -s ${lib.getExe' cudaPackages.cuda_nvcc "ptxas"} $out/bin/ptxas find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do patchelf --add-rpath "${ lib.makeLibraryPath [ cuda_libs_joined - cudnn + (lib.getLib cudaPackages.cudnn) nccl ] }" "$lib" @@ -471,4 +489,11 @@ buildPythonPackage { # Without it there are complaints about libcudart.so.11.0 not being found # because RPATH path entries added above are stripped. dontPatchELF = cudaSupport; + + passthru = { + # Note "bazel.*.tar.gz" can be accessed as `jaxlib.bazel-build.deps` + inherit bazel-build; + }; + + inherit meta; } diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index 298ae13d5082..c8fba04ec260 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -4,10 +4,7 @@ pythonOlder, fetchFromGitHub, hatchling, - pythonRelaxDepsHook, - numpy, typeguard, - typing-extensions, cloudpickle, equinox, ipython, @@ -21,7 +18,7 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.28"; + version = "0.2.31"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,18 +27,15 @@ let owner = "google"; repo = "jaxtyping"; rev = "refs/tags/v${version}"; - hash = "sha256-xDFrgPecUIfCACg/xkMQ8G1+6hNiUUDg9eCZKNpNfzs="; + hash = "sha256-kuGFzp8sDLq6J/qq8ap3lD3n1pABHurXcbRUtDQyWwE="; }; - nativeBuildInputs = [ + build-system = [ hatchling - pythonRelaxDepsHook ]; - propagatedBuildInputs = [ - numpy + dependencies = [ typeguard - typing-extensions ]; pythonRelaxDeps = [ "typeguard" ]; @@ -70,11 +64,12 @@ let pythonImportsCheck = [ "jaxtyping" ]; - meta = with lib; { + meta = { description = "Type annotations and runtime checking for JAX arrays and PyTrees"; homepage = "https://github.com/google/jaxtyping"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + changelog = "https://github.com/patrick-kidger/jaxtyping/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; }; in diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 585d730cdd76..fa774a40b7e8 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "4.1.1"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HdDuIQFgx70wACgDxEPmJgrGAuplsGVlKh1WfTv9yno="; + hash = "sha256-LMYD2RPA2OMokoRU09KVJhywN+mVAif2fJYpq0cQ/fk="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index b39ba3ce8a42..26bd4a173dcb 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch2, # build-system setuptools, @@ -31,6 +32,14 @@ buildPythonPackage rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch2 { + # pytest8 compat + url = "https://github.com/davidhalter/jedi/commit/39c8317922f8f0312c12127cad10aea38d0ed7b5.patch"; + hash = "sha256-wXHWcfoRJUl+ADrNMML0+DYTcRTyLs55Qrs7sDqT8BA="; + }) + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ parso ]; diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 1bef7eeca9ed..4210f5499d28 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "jellyfish"; - version = "1.0.0"; + version = "1.0.4"; disabled = !isPy3k; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-iBquNnGZm7B85QwnaW8pyn6ELz4SOswNtlJcmZmIG9Q="; + hash = "sha256-cqq7O+3VE83SBxIkL9URc7WZcsCxRregucbzLxZWKT8="; }; nativeBuildInputs = with rustPlatform; [ @@ -33,7 +33,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}-rust-dependencies"; - hash = "sha256-Grk+n4VCPjirafcRWWI51jHw/IFUYkBtbXY739j0MFI="; + hash = "sha256-HtzgxTO6tbN/tohaiTm9B9jrFYGTt1Szo9qRzpcy8BA="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index ba8f7048c5b6..da220641dbe2 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -2,6 +2,7 @@ lib, stdenv, python, + pythonAtLeast, buildPythonPackage, pythonOlder, fetchPypi, @@ -44,6 +45,14 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.i18n; + disabledTests = lib.optionals (pythonAtLeast "3.13") [ + # https://github.com/pallets/jinja/issues/1900 + "test_custom_async_iteratable_filter" + "test_first" + "test_loop_errors" + "test_package_zip_list" + ]; + passthru.doc = stdenv.mkDerivation { # Forge look and feel of multi-output derivation as best as we can. # diff --git a/pkgs/development/python-modules/jiter/Cargo.lock b/pkgs/development/python-modules/jiter/Cargo.lock new file mode 100644 index 000000000000..d19633c580b9 --- /dev/null +++ b/pkgs/development/python-modules/jiter/Cargo.lock @@ -0,0 +1,588 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[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 = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "bencher" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dfdb4953a096c551ce9ace855a604d702e6e62d77fac690575ae347571717f5" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "cc" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +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 = "codspeed" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a104ac948e0188b921eb3fcbdd55dcf62e542df4c7ab7e660623f6288302089" +dependencies = [ + "colored", + "libc", + "serde_json", +] + +[[package]] +name = "codspeed-bencher-compat" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceaba84ea2634603a0f199c07fa39ff4dda61f89a3f9149fb89b035bc317b671" +dependencies = [ + "bencher", + "codspeed", +] + +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "fuzz" +version = "0.5.0" +dependencies = [ + "indexmap", + "jiter", + "libfuzzer-sys", + "num-bigint", + "num-traits", + "serde", + "serde_json", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jiter" +version = "0.5.0" +dependencies = [ + "ahash", + "bencher", + "bitvec", + "codspeed-bencher-compat", + "lexical-parse-float", + "num-bigint", + "num-traits", + "paste", + "pyo3", + "pyo3-build-config", + "serde", + "serde_json", + "smallvec", +] + +[[package]] +name = "jiter-python" +version = "0.5.0" +dependencies = [ + "jiter", + "pyo3", +] + +[[package]] +name = "jobserver" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +dependencies = [ + "libc", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lexical-parse-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1962a33ed2a201c637fc14a4e0fd4e06e6edfdeee6a5fede0dab55507ad74cf7" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "num-bigint", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab7164b2202753bd33afc7f90a10355a719aa973d1f94502c50d06f3488bc420" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6424906ca49013c0829c5c1ed405e20e2da2dc78b82d198564880a704e6a7b7" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b2f19e153122d64afd8ce7aaa72f06a00f52e34e1d1e74b6d71baea396460a" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd698c04cac17cf0fe63d47790ab311b8b25542f5cb976b65c374035c50f1eef" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "serde" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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 = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "syn" +version = "2.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[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_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[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_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[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_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/development/python-modules/jiter/default.nix b/pkgs/development/python-modules/jiter/default.nix new file mode 100644 index 000000000000..4f23966dcc16 --- /dev/null +++ b/pkgs/development/python-modules/jiter/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + rustPlatform, + fetchFromGitHub, + libiconv, + dirty-equals, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "jiter"; + version = "0.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "jiter"; + rev = "refs/tags/v${version}"; + hash = "sha256-EgovddXbwutLaVkosdbJ2Y3BpEms+RoeaO8ghBRNdio="; + }; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; + + buildAndTestSubdir = "crates/jiter-python"; + + nativeBuildInputs = [ rustPlatform.cargoSetupHook ]; + + build-system = [ rustPlatform.maturinBuildHook ]; + + buildInputs = [ libiconv ]; + + pythonImportsCheck = [ "jiter" ]; + + nativeCheckInputs = [ + dirty-equals + pytestCheckHook + ]; + + meta = { + description = "Fast iterable JSON parser"; + homepage = "https://github.com/pydantic/jiter/"; + changelog = "https://github.com/pydantic/jiter/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/jiwer/default.nix b/pkgs/development/python-modules/jiwer/default.nix index 6d4fb7d8c971..0d200572a7e2 100644 --- a/pkgs/development/python-modules/jiwer/default.nix +++ b/pkgs/development/python-modules/jiwer/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - pythonRelaxDepsHook, rapidfuzz, click, pythonOlder, @@ -25,7 +24,6 @@ buildPythonPackage rec { build-system = [ poetry-core - pythonRelaxDepsHook ]; dependencies = [ diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 764d14a58d97..f56aa7a39197 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "joblib"; - version = "1.4.0"; + version = "1.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HrDcCRkZzThEkN6JDLXf1ThBCm1LO1Tu8J+4xQtAmxw="; + hash = "sha256-I4LFgWsmNvvSCgng9Ona1HNnZf37fcpYKUO5wTZrPw4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/joserfc/default.nix b/pkgs/development/python-modules/joserfc/default.nix index 17f5e6ae3b9d..a48098db4a48 100644 --- a/pkgs/development/python-modules/joserfc/default.nix +++ b/pkgs/development/python-modules/joserfc/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "joserfc"; - version = "0.9.0"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "authlib"; repo = "joserfc"; - rev = version; - hash = "sha256-+NFCveMPzE0hSs2Qe20/MDHApXVtU3cR/GPFKPqfVV4="; + rev = "refs/tags/${version}"; + hash = "sha256-mnJzhkdX0+5Y/XwGlHgxLP0me8Cs/Cl3p46KgTKw2ug="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jschon/default.nix b/pkgs/development/python-modules/jschon/default.nix new file mode 100644 index 000000000000..8a1686095fbf --- /dev/null +++ b/pkgs/development/python-modules/jschon/default.nix @@ -0,0 +1,75 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, rfc3986 +, pytestCheckHook +, hypothesis +, requests +, pytest-httpserver +, pytest-xdist +}: + +buildPythonPackage rec { + pname = "jschon"; + version = "0.11.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "marksparkza"; + repo = "jschon"; + rev = "v${version}"; + hash = "sha256-uOvEIEUEILsoLuV5U9AJCQAlT4iHQhsnSt65gfCiW0k="; + fetchSubmodules = true; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + rfc3986 + ]; + + pythonImportsCheck = [ + "jschon" + "jschon.catalog" + "jschon.vocabulary" + "jschon.exc" + "jschon.exceptions" + "jschon.formats" + "jschon.json" + "jschon.jsonpatch" + "jschon.jsonpointer" + "jschon.jsonschema" + "jschon.output" + "jschon.uri" + "jschon.utils" + ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + requests + pytest-httpserver + #pytest-benchmark # not needed for distribution + pytest-xdist # not used upstream, but massive speedup + ]; + + disabledTestPaths = [ + "tests/test_benchmarks.py" + ]; + + # used in checks + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "An object-oriented JSON Schema implementation for Python"; + homepage = "https://github.com/marksparkza/jschon"; + changelog = "https://github.com/marksparkza/jschon/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index 6b976adc6b1e..7d6912cc4a0f 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -12,7 +12,6 @@ pygments, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, pytz, pyyaml, requests, @@ -36,7 +35,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ click diff --git a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix index 7187d7353fd0..9a65903e384d 100644 --- a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix +++ b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "json-stream-rs-tokenizer"; - version = "0.4.25"; + version = "0.4.26"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "smheidrich"; repo = "py-json-stream-rs-tokenizer"; rev = "refs/tags/v${version}"; - hash = "sha256-zo/jRAWSwcOnO8eU4KhDNz44P6xDGcrZf9CflwsSvF0="; + hash = "sha256-ogX0KsfHRQW7+exRMKGwJiNINrOKPiTKxAqiTZyEWrg="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/development/python-modules/jsonconversion/default.nix b/pkgs/development/python-modules/jsonconversion/default.nix index dc4e89d9fa99..ac068b224edc 100644 --- a/pkgs/development/python-modules/jsonconversion/default.nix +++ b/pkgs/development/python-modules/jsonconversion/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, pytestCheckHook, pdm-backend, numpy, @@ -23,7 +22,6 @@ buildPythonPackage rec { build-system = [ pdm-backend - pythonRelaxDepsHook ]; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index a36d3429302e..dfb40be4bb61 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "3.0.4"; + version = "3.2.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-obFMjWIhzY85TyqX5zXqHX7ckn+9E1sm8vhwBlfIxis="; + hash = "sha256-S212QJdBmfes+QNSlTZbWhpxqREJ7/oVuhcPu0jPhxw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix index 72c50ead2090..5017a0da27d6 100644 --- a/pkgs/development/python-modules/jsonpointer/default.nix +++ b/pkgs/development/python-modules/jsonpointer/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "jsonpointer"; - version = "2.4"; + version = "3.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-WFzugrcCEfqeYEO3u4nbbhqklSQ0Dd6K1rYyBuponYg="; + hash = "sha256-Ky1ynyCRUi1hw7MfguEYcPYLaPQ/vHBct2v0uDKvWe8="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/jsonschema-path/default.nix b/pkgs/development/python-modules/jsonschema-path/default.nix index 467c162ca545..153c584047a9 100644 --- a/pkgs/development/python-modules/jsonschema-path/default.nix +++ b/pkgs/development/python-modules/jsonschema-path/default.nix @@ -4,7 +4,6 @@ pythonOlder, fetchFromGitHub, poetry-core, - pythonRelaxDepsHook, pathable, pyyaml, referencing, @@ -33,7 +32,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "referencing" ]; diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix index f79283fa5160..f424b6db4649 100644 --- a/pkgs/development/python-modules/jsonschema-spec/default.nix +++ b/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, # build poetry-core, @@ -42,7 +41,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "referencing" ]; diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index c68b003bf52f..b0db522f61e9 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.21.1"; + version = "4.22.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hXJ8ACefX6a+2+YjjSqmQDvt2LSGSrESB9B988wbLuU="; + hash = "sha256-WyLUNKRZNRGa+ZBVLIYuXW1WTo9mASBrMFph/fZhorc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jsonxs/default.nix b/pkgs/development/python-modules/jsonxs/default.nix new file mode 100644 index 000000000000..cf71095cf765 --- /dev/null +++ b/pkgs/development/python-modules/jsonxs/default.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + setuptools, +}: +let + pname = "jsonxs"; + version = "0.6"; +in +buildPythonPackage { + inherit pname version; + + pyproject = true; + + src = fetchFromGitHub { + owner = "fboender"; + repo = "jsonxs"; + rev = "v${version}"; + hash = "sha256-CmKK+qStb9xjmEACY41tQnffD4cMUUQPb74Cni5FTEk="; + }; + + build-system = [ setuptools ]; + + meta = { + description = "A python library that uses path expression strings to get and set values in JSON"; + homepage = "https://github.com/fboender/jsonxs"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tie ]; + }; +} diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 620ca9231208..e0cc52123cfb 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "jupyter-book"; - version = "1.0.0"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "jupyter_book"; - hash = "sha256-U5xdBJNUYgDZ3ie9S1936uoDEV+JN/gl1P+Cs4AamH4="; + hash = "sha256-rRXuSanf7Hc6HTBJ2sOFY4KqL5txRKGAEUduZcEbX0Y="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 2a5f0a783e14..6341f29b85c1 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "jupyter-repo2docker"; - version = "2024.03.0"; + version = "2024.07.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "jupyterhub"; repo = "repo2docker"; rev = "refs/tags/${version}"; - hash = "sha256-D8sgeyfQjEkBYck/CikAVNZzUSl1R9uXSv75DTXT5U0="; + hash = "sha256-ZzZBuJBPDG4to1fSYn2xysupXbPS9Q6wqWr3Iq/Vds8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 166a1bb82b3f..f64f383895ff 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.2.1"; + version = "4.2.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-oQ+3EIWmkAggxi1DMkAFBGQC/8jw/eaWED43I4qDlQc="; + hash = "sha256-325Glp6lHWaBUWfyPZLxBUI7fx8G+mBNT0SusBjILHs="; }; build-system = [ diff --git a/pkgs/development/python-modules/justext/default.nix b/pkgs/development/python-modules/justext/default.nix index fd9d94c399a0..cd2e6c933a6d 100644 --- a/pkgs/development/python-modules/justext/default.nix +++ b/pkgs/development/python-modules/justext/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pytestCheckHook, lxml, + lxml-html-clean, }: buildPythonPackage rec { @@ -18,14 +19,17 @@ buildPythonPackage rec { hash = "sha256-9i7hzCK/ijh8xw9l2ZbVhVj5IBf0WD/49/R1tSWgqrQ="; }; - propagatedBuildInputs = [ lxml ]; + propagatedBuildInputs = [ + lxml + lxml-html-clean + ]; nativeCheckInputs = [ pytestCheckHook ]; # patch out coverage report postPatch = '' substituteInPlace setup.cfg \ - --replace " --cov=justext --cov-report=term-missing --no-cov-on-fail" "" + --replace-fail " --cov=justext --cov-report=term-missing --no-cov-on-fail" "" ''; pythonImportsCheck = [ "justext" ]; diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix index a6ba282e6d29..caed3ddfcf7b 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { description = "Python Kaldi speech recognition"; homepage = "https://github.com/daanzu/kaldi-active-grammar"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; # Other platforms are supported upstream. platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix index c8983cc65a9f..a3c9ae63c784 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { description = "Speech Recognition Toolkit"; homepage = "https://kaldi-asr.org"; license = licenses.mit; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index 96fba596da1f..efbff71a3795 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -8,7 +8,6 @@ networkx, prometheus-client, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -32,7 +31,6 @@ buildPythonPackage rec { "prometheus-client" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ flask diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix index 8b0c78d705ed..21927ef81def 100644 --- a/pkgs/development/python-modules/kazoo/default.nix +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -5,10 +5,9 @@ six, eventlet, gevent, - pynose, mock, coverage, - pkgs, + openjdk8_headless, }: buildPythonPackage rec { @@ -25,10 +24,9 @@ buildPythonPackage rec { buildInputs = [ eventlet gevent - pynose mock coverage - pkgs.openjdk8 + openjdk8_headless ]; # not really needed @@ -48,5 +46,6 @@ buildPythonPackage rec { homepage = "https://kazoo.readthedocs.org"; description = "Higher Level Zookeeper Client"; license = licenses.asl20; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index 4385c806fa0e..aeccbe375738 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sapi-python-client"; - version = "0.8.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "keboola"; repo = "sapi-python-client"; rev = "refs/tags/${version}"; - hash = "sha256-Xc4VD91Nhnj0UyWHpdwEaETJVH8Ue6/kuiKEMaiSR0g="; + hash = "sha256-4ykOwSQ1tM0ZviETkjU0ydg7FWjkGNysHQe+f9MS0MM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 315cae0e0b56..b7256ec3ccd9 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "keras"; - version = "3.4.0"; + version = "3.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "keras-team"; repo = "keras"; rev = "refs/tags/v${version}"; - hash = "sha256-P/TRczWi/prv5D0/I6yLChIDfc6QdGcRSaF4Dd1Iowk="; + hash = "sha256-Pp84wTvcrWnxuksYUrzs9amapwBC8yU1PA0PE5dRl6k="; }; build-system = [ diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 0fa0854d6dac..2ffd2235d3de 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -8,8 +8,9 @@ setuptools-scm, shtab, importlib-metadata, - dbus-python, jaraco-classes, + jaraco-context, + jaraco-functools, jeepney, secretstorage, pytestCheckHook, @@ -17,13 +18,13 @@ buildPythonPackage rec { pname = "keyring"; - version = "24.3.1"; + version = "25.2.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-wzJ7b/r8DovvvbWXys20ko/+XBIS92RfGG5tmVeomNs="; + hash = "sha256-2q/9QtvaJd2vsa1f7EAk5bvP5CRZfKHKRSspmGHknxs="; }; nativeBuildInputs = [ @@ -33,7 +34,11 @@ buildPythonPackage rec { ]; propagatedBuildInputs = - [ jaraco-classes ] + [ + jaraco-classes + jaraco-context + jaraco-functools + ] ++ lib.optionals stdenv.isLinux [ jeepney secretstorage diff --git a/pkgs/development/python-modules/khanaa/default.nix b/pkgs/development/python-modules/khanaa/default.nix index 91148489c9e8..5c9cf53dc11c 100644 --- a/pkgs/development/python-modules/khanaa/default.nix +++ b/pkgs/development/python-modules/khanaa/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "khanaa"; - version = "0.0.6"; + version = "0.1.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "cakimpei"; repo = "khanaa"; rev = "refs/tags/v${version}"; - hash = "sha256-BzxNHYMkp5pdJYQ80EI5jlP654yX9woW7wz1jArCln4="; + hash = "sha256-QFvvahVEld3BooINeUYJDahZyfh5xmQNtWRLAOdr6lw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index a353418fd5a3..2170ba9e966c 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -7,7 +7,6 @@ backports-zoneinfo, boto3, buildPythonPackage, - case, confluent-kafka, fetchPypi, hypothesis, @@ -16,7 +15,7 @@ pycurl, pymongo, #, pyro4 - pytest7CheckHook, + pytestCheckHook, pythonOlder, pyyaml, redis, @@ -46,7 +45,7 @@ buildPythonPackage rec { ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; - passthru.optional-dependencies = { + optional-dependencies = { msgpack = [ msgpack ]; yaml = [ pyyaml ]; redis = [ redis ]; @@ -71,10 +70,9 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - case hypothesis - pytest7CheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + pytestCheckHook + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "kombu" ]; diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index 567467c7bf47..b8877b7a6462 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, deprecation, poetry-core, - pythonRelaxDepsHook, async-timeout, cloudevents, fastapi, @@ -56,7 +55,6 @@ buildPythonPackage rec { poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ async-timeout diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 4f5eacab9d19..b7387675c954 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -10,7 +10,6 @@ pytestCheckHook, python-dateutil, pythonOlder, - pythonRelaxDepsHook, pyyaml, requests, requests-oauthlib, @@ -22,7 +21,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "29.0.0"; + version = "30.1.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -31,18 +30,10 @@ buildPythonPackage rec { owner = "kubernetes-client"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-KChfiXYnJTeIW6O7GaK/fMxU2quIvbjc4gB4aZBeTtI="; + hash = "sha256-zOooibXkk0iA6IYJViz+SIMgHwG0fr4WR3ZjhgIeUjE="; }; - postPatch = '' - substituteInPlace kubernetes/base/config/kube_config_test.py \ - --replace-fail "assertEquals" "assertEqual" - ''; - - pythonRelaxDeps = [ "urllib3" ]; - build-system = [ - pythonRelaxDepsHook setuptools ]; @@ -58,7 +49,7 @@ buildPythonPackage rec { websocket-client ]; - passthru.optional-dependencies = { + optional-dependencies = { adal = [ adal ]; }; @@ -67,7 +58,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = lib.optionals stdenv.isDarwin [ # AssertionError: != diff --git a/pkgs/development/python-modules/kurbopy/default.nix b/pkgs/development/python-modules/kurbopy/default.nix index 0935e36f7c76..d084fd43fac6 100644 --- a/pkgs/development/python-modules/kurbopy/default.nix +++ b/pkgs/development/python-modules/kurbopy/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "kurbopy"; - version = "0.10.40"; + version = "0.11.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-dhpcDi20Na6SDbRxrC8N3SWdN1J/CWJgCUI3scJX/6s="; + hash = "sha256-0TIVx0YH5L8l6at1fcWkj2UZYK0aF1fahTu9/+7MWMI="; }; propagatedBuildInputs = [ fonttools ]; @@ -28,7 +28,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-V3LeT0dqkfft1ftc+azwvuSzzdUJ7/wAp31fN7te9RQ="; + hash = "sha256-W0BebCXC1wqwtQP+zHjISxSJjXHD9U6p9eNS12Nfb2Y="; }; doCheck = true; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 082ee58cbac3..04f3b74c95fd 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -16,7 +16,6 @@ pytestCheckHook, python-dateutil, pythonOlder, - pythonRelaxDepsHook, requests, setuptools, shapely, @@ -28,7 +27,7 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.67.0"; + version = "3.72.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +36,7 @@ buildPythonPackage rec { owner = "Labelbox"; repo = "labelbox-python"; rev = "refs/tags/v.${version}"; - hash = "sha256-JQTjmYxPBS8JC4HQTtbQ7hb80LPLYE4OEj1lFA6cZ1Y="; + hash = "sha256-gor1LFT/XrWxWPwGn8lOkF46p/yrRILZp6fpeV+xvto="; }; postPatch = '' @@ -49,7 +48,6 @@ buildPythonPackage rec { --replace-fail "pytest_plugins" "_pytest_plugins" ''; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "python-dateutil" ]; diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index d677d59d2365..405bbfa33810 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -15,7 +15,6 @@ pytestCheckHook, pytest-dependency, pytest-mock, - pythonRelaxDepsHook, pyudev, pyusb, pyyaml, @@ -28,17 +27,16 @@ buildPythonPackage rec { pname = "labgrid"; - version = "23.0.5"; + version = "23.0.6"; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; rev = "refs/tags/v${version}"; - hash = "sha256-jrapbSrybuLT3V11rvV342tOr7/sRwBMgAdNWDG5obA="; + hash = "sha256-UAfBzQZeFNs2UJSFb5fH5wHXQoVU/dOTFciR0/UB7vc="; }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools setuptools-scm wheel diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index cd18863618ad..9a6db9930256 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -10,14 +10,13 @@ pythonOlder, redis, requests, - pythonRelaxDepsHook, sphinx, ua-parser, }: buildPythonPackage rec { pname = "lacuscore"; - version = "1.9.6"; + version = "1.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +25,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; rev = "refs/tags/v${version}"; - hash = "sha256-SCObCYcZ+aDzWOkE5tzkKMkgAP/h7HDNyHXMFmYjiHQ="; + hash = "sha256-hbMMKV/LJSfCgl293Tm4kkpwoYYpgydV/reri9ONj+4="; }; pythonRelaxDeps = [ @@ -36,7 +35,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ async-timeout diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix index fb11a1abeed4..8afb70b1a467 100644 --- a/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "langchain-chroma"; - version = "0.1.1"; + version = "0.2.9"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-chroma==${version}"; - hash = "sha256-PW4vfZVccuYnaR0jtOfHVaXXYoUyQbCfB8NwM+mXFGc="; + rev = "refs/tags/langchain-core==${version}"; + hash = "sha256-/BUn/NxaE9l3VY6dPshr1JJaHTGzn9NMQhSQ2De65Jg="; }; sourceRoot = "${src.name}/libs/partners/chroma"; diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 063ee482ddb5..4bf2cd9bd0f9 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.2.5"; + version = "0.2.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,8 +37,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/${pname}==${version}"; - hash = "sha256-SVqhNfRAQoVyUsPw55ByPtVzU/h1II/ox8I79QJsci8="; + rev = "refs/tags/langchain-core==${version}"; + hash = "sha256-/BUn/NxaE9l3VY6dPshr1JJaHTGzn9NMQhSQ2De65Jg="; }; sourceRoot = "${src.name}/libs/community"; diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 954ddd477f4a..f55d59b85059 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -15,7 +15,6 @@ pytest-xdist, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, pyyaml, syrupy, tenacity, @@ -24,7 +23,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.2.7"; + version = "0.2.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,8 +31,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "langchain-core==${version}"; - hash = "sha256-MmWgnpOO+OWUyRUBqIKuIHG2/p8NfSlVJVbUXfF4spg="; + rev = "refs/tags/langchain-core==${version}"; + hash = "sha256-/BUn/NxaE9l3VY6dPshr1JJaHTGzn9NMQhSQ2De65Jg="; }; sourceRoot = "${src.name}/libs/core"; @@ -45,7 +44,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ jsonpatch diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index d24c177a0712..beb4c5d8c332 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.2.1"; + version = "0.2.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-text-splitters==${version}"; - hash = "sha256-5le+P+7iGjrTetnTHiJilqtc7G7kJbZnEsUgFyF2aQ8="; + rev = "refs/tags/langchain-core==${version}"; + hash = "sha256-/BUn/NxaE9l3VY6dPshr1JJaHTGzn9NMQhSQ2De65Jg="; }; sourceRoot = "${src.name}/libs/text-splitters"; diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index b6d34154583d..73c6050f01fd 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.2.5"; + version = "0.2.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,8 +39,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain==${version}"; - hash = "sha256-WaJRXvA/SImTSgAkk06vmOtTbsYYs8nTChFLzmsFz7Q="; + rev = "refs/tags/langchain-core==${version}"; + hash = "sha256-/BUn/NxaE9l3VY6dPshr1JJaHTGzn9NMQhSQ2De65Jg="; }; sourceRoot = "${src.name}/libs/langchain"; diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index fc2f51f9c87a..52f4c384f806 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -4,25 +4,28 @@ marisa-trie, pythonOlder, fetchPypi, - poetry-core, pytestCheckHook, language-data, setuptools, + setuptools-scm }: buildPythonPackage rec { pname = "langcodes"; - version = "3.3.0"; + version = "3.4.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "794d07d5a28781231ac335a1561b8442f8648ca07cd518310aeb45d6f0807ef6"; + sha256 = "sha256-rlp30aAdDR6RhUpnGJCJK3zpq7YBq3Mn/FyHT4meGXk="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; propagatedBuildInputs = [ language-data @@ -41,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python toolkit for working with and comparing the standardized codes for languages"; - homepage = "https://github.com/LuminosoInsight/langcodes"; + homepage = "https://github.com/georgkrause/langcodes"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index 46ae86b6b839..05b65c0cd137 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -11,7 +11,6 @@ packaging, poetry-core, pydantic, - pythonRelaxDepsHook, wrapt, }: @@ -29,7 +28,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "packaging" ]; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index d86c96eb87ad..97ed19193113 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -16,14 +16,13 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, uvicorn, }: buildPythonPackage rec { pname = "langsmith"; - version = "0.1.77"; + version = "0.1.80"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +31,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-Tkqo0BbBqFMsEDtEo0sVgSQOoa/J+ECw/7T7yALnL84="; + hash = "sha256-bkbJKg2ikdkTenAP+GD+Ss13nF8KrizLNM72oDgQgJM="; }; sourceRoot = "${src.name}/python"; @@ -41,8 +40,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - dependencies = [ orjson pydantic diff --git a/pkgs/development/python-modules/laundrify-aio/default.nix b/pkgs/development/python-modules/laundrify-aio/default.nix index 70244547abec..a34e6a533fd3 100644 --- a/pkgs/development/python-modules/laundrify-aio/default.nix +++ b/pkgs/development/python-modules/laundrify-aio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "laundrify-aio"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "laundrify"; repo = "laundrify-pypi"; rev = "v${version}"; - hash = "sha256-mIdw2167H4Ume/DqV+fjRiBrph+8Jj5EEUALDDj4ah8="; + hash = "sha256-XhdIKitUyC5RWW/o98ZyhG7BuVCINsiNWlh3liITKCs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lazy-loader/default.nix b/pkgs/development/python-modules/lazy-loader/default.nix index 3d95f5e62d7a..974288e365f3 100644 --- a/pkgs/development/python-modules/lazy-loader/default.nix +++ b/pkgs/development/python-modules/lazy-loader/default.nix @@ -2,26 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, - flit-core, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "lazy-loader"; - version = "0.3"; - format = "pyproject"; + version = "0.4"; + pyproject = true; src = fetchFromGitHub { owner = "scientific-python"; repo = "lazy_loader"; rev = "refs/tags/v${version}"; - hash = "sha256-Ky9EwPYt/wBqWXopH5WFjlVG+/Rd2gc+mlCeWqG7mZg="; + hash = "sha256-4Kid6yhm9C2liPoW+NlCsOiBZvv6iYt7hDunARc4PRY="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "lazy_loader" ]; + meta = with lib; { description = "Populate library namespace without incurring immediate import costs"; homepage = "https://github.com/scientific-python/lazy_loader"; diff --git a/pkgs/development/python-modules/leb128/default.nix b/pkgs/development/python-modules/leb128/default.nix index 40ebe1d9fda8..1606c54c340c 100644 --- a/pkgs/development/python-modules/leb128/default.nix +++ b/pkgs/development/python-modules/leb128/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "leb128"; - version = "1.0.5"; + version = "1.0.7"; format = "setuptools"; # fetchPypi doesn't include files required for tests @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "mohanson"; repo = "leb128"; rev = "refs/tags/v${version}"; - hash = "sha256-zK14LPziBkvXAMzuPbcg/47caO/5GEYA9txAzCGfpS8="; + hash = "sha256-17C0Eic8T2PFkuIGExcrfb3b1HldaSBAPSh5TtRBUuU="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 0a1f6841d390..5010d8153032 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -16,7 +16,6 @@ python-gnupg, python-u2flib-host, pythonOlder, - pythonRelaxDepsHook, setuptools, setuptools-scm, websocket-client, @@ -37,7 +36,6 @@ buildPythonPackage rec { build-system = [ setuptools setuptools-scm - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "protobuf" ]; diff --git a/pkgs/development/python-modules/lexilang/default.nix b/pkgs/development/python-modules/lexilang/default.nix index 6c487f45dce0..e586eba5a3e2 100644 --- a/pkgs/development/python-modules/lexilang/default.nix +++ b/pkgs/development/python-modules/lexilang/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lexilang"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "LibreTranslate"; repo = "LexiLang"; - rev = "v${version}"; - hash = "sha256-TLkaqCE9NDjN2XuYOUkeeWIRcqkxrdg31fS4mEnlcEo="; + rev = "refs/tags/v${version}"; + hash = "sha256-/uSoEz/5HJnFVkXZndIlM+K0OJLJaorFQ6+kWYELjrs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/libclang/default.nix b/pkgs/development/python-modules/libclang/default.nix index fe9390a76e1a..fb66d88b942b 100644 --- a/pkgs/development/python-modules/libclang/default.nix +++ b/pkgs/development/python-modules/libclang/default.nix @@ -53,6 +53,6 @@ buildPythonPackage { meta = libclang.meta // { description = "Python bindings for the C language family frontend for LLVM"; - maintainers = with lib.maintainers; [ lilyinstarlight ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index ba7e0fa5340e..140c919d7081 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, cargo, hypothesis, libiconv, @@ -21,7 +20,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "1.1.0"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,27 +29,18 @@ buildPythonPackage rec { owner = "instagram"; repo = "libcst"; rev = "refs/tags/v${version}"; - hash = "sha256-kFs7edBWz0GRbgbLDmtpUVi5R+6mYXsJSvceOoPW9ck="; + hash = "sha256-H0YO8ILWOyhYdosNRWQQ9wziFk0syKSG3vF2zuYkL2k="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-fhaHiz64NH6S61fSXj4gNxxcuB+ECxWSSmG5StiFr1k="; + hash = "sha256-AcqHn3A7WCVyVnOBD96k4pxokhzgmCWOipK/DrIAQkU="; }; cargoRoot = "native"; - patches = [ - # https://github.com/Instagram/LibCST/pull/1042 - (fetchpatch { - name = "remove-distutils.patch"; - url = "https://github.com/Instagram/LibCST/commit/a6834aa0e6eb78e41549fd1087d7ba60ca4dd237.patch"; - hash = "sha256-lyIXJhm4UMwdCOso6McDslIvtK7Ar8sF5Zy7qo1nicQ="; - }) - ]; - postPatch = '' # avoid infinite recursion by not formatting the release files substituteInPlace libcst/codegen/generate.py \ diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index 60c282a1e59b..7800dbd0f6b5 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.3.6"; + version = "3.3.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-N96gdO5sezMyKt0QdX7ORg5DnEVSqb1j+WohvOHdYYU="; + hash = "sha256-3t/YYP7Hnua3fZ4PPN59BcPKHWukygUlcBGfNPOjJAE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix index 73c31a259d9d..97f5e0dec10a 100644 --- a/pkgs/development/python-modules/libmambapy/default.nix +++ b/pkgs/development/python-modules/libmambapy/default.nix @@ -22,14 +22,14 @@ }: buildPythonPackage rec { pname = "libmambapy"; - version = "1.5.7"; + version = "2024.03.25"; pyproject = true; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; - rev = "${pname}-${version}"; - hash = "sha256-HfmvLi9IBWlaGAn2Ej4Bnm4b3l19jEXwNl5IUkdVxi0="; + rev = "refs/tags/${version}"; + hash = "sha256-sxZDlMFoMLq2EAzwBVO++xvU1C30JoIoZXEX/sqkXS0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/librespot/default.nix b/pkgs/development/python-modules/librespot/default.nix index 7e6d2edb253b..e2e98bc1e6ed 100644 --- a/pkgs/development/python-modules/librespot/default.nix +++ b/pkgs/development/python-modules/librespot/default.nix @@ -7,7 +7,6 @@ pycryptodomex, pyogg, pytestCheckHook, - pythonRelaxDepsHook, requests, websocket-client, zeroconf, @@ -27,7 +26,6 @@ buildPythonPackage rec { pythonRelaxDeps = true; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ defusedxml diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index cc1e27a8db56..eae30cc7407d 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, pytestCheckHook, hatchling, argostranslate, @@ -43,7 +42,6 @@ buildPythonPackage rec { build-system = [ hatchling - pythonRelaxDepsHook ]; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index fa99efb4f66c..9b015e335b75 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system setuptools, @@ -34,7 +35,7 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.10.2"; + version = "0.10.2.post1"; format = "pyproject"; src = fetchFromGitHub { @@ -42,11 +43,20 @@ buildPythonPackage rec { repo = "librosa"; rev = "refs/tags/${version}"; fetchSubmodules = true; # for test data - hash = "sha256-zUKljPKWOhyb3Zv4KEUcvLsVkxVhL+rzErKycAl6jIg="; + hash = "sha256-0FbKVAFWmcFTW2dR27nif6hPZeIxFWYF1gTm4BEJZ/Q="; }; nativeBuildInputs = [ setuptools ]; + patches = [ + (fetchpatch2 { + # https://github.com/librosa/librosa/issues/1849 + name = "librosa-scipy-1.14-compat.patch"; + url = "https://github.com/librosa/librosa/commit/d0a12c87cdff715ffb8ac1c7383bba1031aa71e4.patch"; + hash = "sha256-NHuGo4U1FRikb5OIkycQBvuZ+0OdG/VykTcuhXkLUug="; + }) + ]; + postPatch = '' substituteInPlace setup.cfg \ --replace-fail "--cov-report term-missing --cov librosa --cov-report=xml " "" diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 9af39f33d3d5..6dbb2c867112 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "libvirt"; - version = "10.4.0"; + version = "10.5.0"; pyproject = true; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - hash = "sha256-Qwn07C8N2ZZzE5+qCo2HtBSm5/zGBqbiLnJePxuEJjs="; + hash = "sha256-dPjT9PRoUzNrY79yejAW/sbkMr0fpLif7IKZIW/K3KI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 2b7e33347c94..16465624d65a 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -39,14 +39,14 @@ assert cudaSupport -> gpuSupport != true; buildPythonPackage rec { pname = "lightgbm"; - version = "4.3.0"; + version = "4.4.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AG9XhKm87kPlp+lD3E8C3hui7np68e5fGQ04Pztsnr4="; + hash = "sha256-nop2QJEUgRNOYJh9XR4c0Vf0MMO0s43o02/FXDArwpk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 050dcc565824..f8384033690f 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2024.4.26"; + version = "2024.5.30"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-H8GAJvmkYJy8PJsXn4Yl9qY3zb9aFBa7sr4DN0bKYfQ="; + hash = "sha256-uKJMeC1dXhQp1CGbtdnqmELFO64VWblhABGfpKHGCZQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/linear-operator/default.nix b/pkgs/development/python-modules/linear-operator/default.nix index 918a439c6279..ab402c37aa79 100644 --- a/pkgs/development/python-modules/linear-operator/default.nix +++ b/pkgs/development/python-modules/linear-operator/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, jaxtyping, pytestCheckHook, - pythonRelaxDepsHook, scipy, setuptools, setuptools-scm, @@ -26,7 +25,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools setuptools-scm wheel diff --git a/pkgs/development/python-modules/linien-client/default.nix b/pkgs/development/python-modules/linien-client/default.nix index 631413a4e9cb..ad1882af8182 100644 --- a/pkgs/development/python-modules/linien-client/default.nix +++ b/pkgs/development/python-modules/linien-client/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client components of the Linien spectroscopy lock application"; homepage = "https://github.com/linien-org/linien/tree/develop/linien-client"; + changelog = "https://github.com/linien-org/linien/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fsagbuya diff --git a/pkgs/development/python-modules/linien-common/default.nix b/pkgs/development/python-modules/linien-common/default.nix index 1fa188b8529c..6904fccd83bf 100644 --- a/pkgs/development/python-modules/linien-common/default.nix +++ b/pkgs/development/python-modules/linien-common/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "linien-common"; - version = "1.0.2"; + version = "2.0.4"; pyproject = true; src = fetchFromGitHub { owner = "linien-org"; repo = "linien"; rev = "refs/tags/v${version}"; - hash = "sha256-V6oo0a4cNlvn4pIwzchvCTOu7qtUGS+Pc0qpbEsvGZo="; + hash = "sha256-TCQ1jLZpeQlG/ZyWY0qrHceMJ1TH7AYO7toYc74ZWq4="; }; sourceRoot = "${src.name}/linien-common"; @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Shared components of the Linien spectroscopy lock application"; homepage = "https://github.com/linien-org/linien/tree/develop/linien-common"; + changelog = "https://github.com/linien-org/linien/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fsagbuya diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 67608a0a776d..816c72e5f288 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "linode-api"; - version = "5.13.1"; + version = "5.16.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "linode"; repo = "python-linode-api"; rev = "refs/tags/v${version}"; - hash = "sha256-WB4CurdokRKh1eD6FZR2SeMpa3Z0BzLb0ldI7SYPEVI="; + hash = "sha256-B90BfuAqyncJPIvcni7bthiwSfmeL9CqeTYT1/y5TNY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/lit/default.nix b/pkgs/development/python-modules/lit/default.nix index 512f0501976b..6d4aec66c750 100644 --- a/pkgs/development/python-modules/lit/default.nix +++ b/pkgs/development/python-modules/lit/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "lit"; - version = "17.0.6"; + version = "18.1.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-36mvm1X8RQmla+e/I0bwedf0okLVg7ny4LB4/Qq64xs="; + hash = "sha256-Ld2b4mvcxtoDrqPsRWxpRetaCdveVI01AL/5uO1HY7s="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index 950563c88aec..253b53a00788 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.40.6"; + version = "1.40.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-mXrLhgOETrkwHYSJSmEPvFwZiO0kx9FmXlTJN2WZ8WI="; + hash = "sha256-CK/b0PVBOzfhnTk+iu/buu7BIjAGdz3aXYAGgB4s/pw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix index 8a592823003a..a29e06f15c1f 100644 --- a/pkgs/development/python-modules/livereload/default.nix +++ b/pkgs/development/python-modules/livereload/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "livereload"; - version = "2.6.3"; + version = "2.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "lepture"; repo = "python-livereload"; - rev = version; - sha256 = "1alp83h3l3771l915jqa1ylyllad7wxnmblayan0z0zj37jkp9n7"; + rev = "refs/tags/${version}"; + sha256 = "sha256-1at/KMgDTj0TTnq5Vjgklkyha3QUF8bFeKxQSrvx1oE="; }; buildInputs = [ django ]; diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix index 7cd5fb8241c9..6073a4e60427 100644 --- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -6,7 +6,6 @@ llama-index-llms-openai, poetry-core, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -26,7 +25,6 @@ buildPythonPackage rec { build-system = [ poetry-core - pythonRelaxDepsHook ]; dependencies = [ diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 729fc0ac0d62..6e8ab30f934a 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.47"; + version = "0.10.48.post1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-Rq7Mz9aN6SHLZ5UzDb2i90j7wP+SlYJa9b14Yu00Cuc="; + hash = "sha256-O8mHttYMRUzWvhydQsOux7tynhDuMKapsSDJQXL0MRQ="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix index 3bd7ddbef460..05558eb38942 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -6,7 +6,6 @@ llama-index-core, poetry-core, pytestCheckHook, - pythonRelaxDepsHook, pythonOlder, }: @@ -27,7 +26,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ google-generativeai diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix index 87ed37e9601d..f848acf1fd42 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix @@ -6,7 +6,6 @@ llama-index-core, poetry-core, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -26,7 +25,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ google-generativeai diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 06d00b774787..56b31b8aca55 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.2.6"; + version = "0.2.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-xv/Z/HLFUEfLqjE4052bc8aBJq3bvreYD/XZw1vijQQ="; + hash = "sha256-SMdEeJ3kZPbiIU1PW3PWBKBI/B5fRwC/wqEZnkLekHY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 0bcedaa6fbb5..3c3a3ff12b5c 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.1.21"; + version = "0.1.22"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-6dYxE1FgrIcJPNfVrj4yxN6/juqvop7kc5Z1hnFV13M="; + hash = "sha256-cpvy6nBDUXRl4dWFCJUSt32LPOkiM6Z8E41dYhBh7VY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-program-openai/default.nix b/pkgs/development/python-modules/llama-index-program-openai/default.nix index c3c181855218..e542c0f8a4e6 100644 --- a/pkgs/development/python-modules/llama-index-program-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-program-openai/default.nix @@ -7,7 +7,6 @@ llama-index-llms-openai, poetry-core, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -27,7 +26,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ llama-index-agent-openai diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index 95045b4d3154..ee6c4453e4d5 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -8,13 +8,12 @@ pymupdf, pypdf, pythonOlder, - pythonRelaxDepsHook, striprtf, }: buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.1.25"; + version = "0.1.27"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-I43dmKo3fWpEMiAT64SAVgN8gK2EVx6lv0UaZA//TVw="; + hash = "sha256-BMm8MGOpQJ/Nh3932bKr/VAuBydjqm3XiODGN0GLhmQ="; }; pythonRelaxDeps = [ @@ -32,7 +31,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ beautifulsoup4 diff --git a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix index 1db642215883..575c703b795f 100644 --- a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix @@ -6,7 +6,6 @@ llama-parse, poetry-core, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -26,7 +25,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index e08c5bdaedaa..5af67033af97 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.1.9"; + version = "0.1.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-alwnqzriXPUEvtlRPB8DU2XftXa4hv4zTUaQjKJKWc8="; + hash = "sha256-l5cfezZGHvN74CO5zrVTE5bMSDYNC9vaUczhKQMBzEc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix index 47a74e8a9710..fcf3e0fa9742 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix @@ -6,7 +6,6 @@ llama-index-core, poetry-core, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -26,7 +25,6 @@ buildPythonPackage rec { build-system = [ poetry-core - pythonRelaxDepsHook ]; dependencies = [ diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index 63e8b5d9992d..078e7a7b3d59 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -7,7 +7,6 @@ pgvector, poetry-core, psycopg2, - pythonRelaxDepsHook, pythonOlder, }: @@ -28,7 +27,6 @@ buildPythonPackage rec { build-system = [ poetry-core - pythonRelaxDepsHook ]; dependencies = [ diff --git a/pkgs/development/python-modules/llama-index/default.nix b/pkgs/development/python-modules/llama-index/default.nix index 575c61c89f41..97cfb265396d 100644 --- a/pkgs/development/python-modules/llama-index/default.nix +++ b/pkgs/development/python-modules/llama-index/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, poetry-core, - pythonRelaxDepsHook, llama-index-agent-openai, llama-index-cli, llama-index-core, @@ -26,10 +25,6 @@ buildPythonPackage { build-system = [ poetry-core ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - pythonRelaxDeps = [ "llama-index-core" ]; diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 147183c04634..25ae1155ec92 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-tFwtszoNa3otX1nj0Ox+5/gieoUuqlawSqErEvLA1SE="; + hash = "sha256-CKSLz0r1tiO/JvpiZgOFcrlUCfe+ZHRgZ9uNOPaSf+U="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 5c3a03fe7681..2d92814a1835 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.42.0"; + version = "0.43.0"; pyproject = true; disabled = isPyPy || pythonAtLeast "3.13"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "numba"; repo = "llvmlite"; rev = "refs/tags/v${version}"; - hash = "sha256-vN2npyAyN6C340l69YSRtRJrAe4EHSqh4SCgWfeSQaQ="; + hash = "sha256-5QBSRDb28Bui9IOhGofj+c7Rk7J5fNv5nPksEPY/O5o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lmcloud/default.nix b/pkgs/development/python-modules/lmcloud/default.nix index 3bf4f38e5b5b..cfb193bcdfe1 100644 --- a/pkgs/development/python-modules/lmcloud/default.nix +++ b/pkgs/development/python-modules/lmcloud/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "lmcloud"; - version = "1.1.11"; + version = "1.1.13"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zweckj"; repo = "lmcloud"; - rev = "refs/tags/v${version}"; - hash = "sha256-NuqWzlTkarrLXgYV4Zzwlb++rV+6cpG97YZnDwi0m98="; + rev = "refs/tags/v.${version}"; + hash = "sha256-byZtmyZcvr39hKzamGjSunMeVE2C19QtwF4u78k+YOY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index fe7a341c1480..35ceedccd0d8 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "lmdb"; - version = "1.4.1"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-H0x2ryTpB1k0h8kE7166GZO+s47Tha+CrbJahY8tZY0="; + hash = "sha256-cXwlWCfTMeAvckK0QFGqBkZskPbXMuywezHt+x4Gxno="; }; buildInputs = [ lmdb ]; diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index 2bf7bf447bc9..b0287a226a67 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -17,12 +17,13 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "2.3.2"; + version = "3.5.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; - hash = "sha256-Ex5ZPlteDaiyex90QumucVdTTbpp9uWiBrvw1kMr++8="; + pname = "localstack_ext"; + inherit version; + hash = "sha256-tJNgNqCzlebbDOOgkScOKaf04bLTVIjP+BaFiDLo/Gs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index d6b26ebe4086..7bcb46fa595c 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "localstack"; - version = "3.0.0"; + version = "3.5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; rev = "refs/tags/v${version}"; - hash = "sha256-N/Mc1bubCcq38VxUqkO9LGG25pEetEyJ+VJMdg/7hrU="; + hash = "sha256-Sd5B4+pvUwNXfP3hsqBkUoHo06YyzUGCUHzc8f77Vx4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/lockfile/default.nix b/pkgs/development/python-modules/lockfile/default.nix index deb05ac31dac..0a0b906e9122 100644 --- a/pkgs/development/python-modules/lockfile/default.nix +++ b/pkgs/development/python-modules/lockfile/default.nix @@ -4,7 +4,8 @@ fetchPypi, setuptools, pbr, - pynose, + nose, + pythonOlder, }: buildPythonPackage rec { @@ -22,7 +23,10 @@ buildPythonPackage rec { setuptools ]; - nativeCheckInputs = [ pynose ]; + # tests rely on nose + doCheck = pythonOlder "3.12"; + + nativeCheckInputs = [ nose ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index 8123a9967e22..27bfd2092388 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -7,7 +7,6 @@ poetry-core, pypykatz, pythonOlder, - pythonRelaxDepsHook, rich, }: @@ -31,7 +30,6 @@ buildPythonPackage rec { "rich" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 98d1fae1d2b5..f53979f98d7c 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "lxml"; - version = "5.1.0"; + version = "5.2.2"; pyproject = true; src = fetchFromGitHub { owner = "lxml"; repo = "lxml"; rev = "refs/tags/lxml-${version}"; - hash = "sha256-eWLYzZWatYDmhuBTZynsdytlNFKKmtWQ1XIyzVD8sDY="; + hash = "sha256-c9r2uqjXmQOXyPCsJTzi1OatkQ9rhJbKqpxaoFz2l18="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs diff --git a/pkgs/development/python-modules/lzallright/default.nix b/pkgs/development/python-modules/lzallright/default.nix index d6dbde3cc457..697acafb6ed6 100644 --- a/pkgs/development/python-modules/lzallright/default.nix +++ b/pkgs/development/python-modules/lzallright/default.nix @@ -10,19 +10,19 @@ buildPythonPackage rec { pname = "lzallright"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "vlaci"; repo = pname; rev = "v${version}"; - hash = "sha256-Zzif6WtecgAkNmml0kt0Z+Ewx0L30ahr+kwzYR5aUAM="; + hash = "sha256-6Dez14qlZ7cnVQfaiTHGuiTSAHvBoKtolgKF7ne9ASw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-+pV9q2QM6qFA1a5E10OAsE7KJEUsTiEiU1KqO4/2rFw="; + hash = "sha256-ZYFAWkcDdX10024hc+gdARyaJFpNNcXf+gGLxBP5VlA="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index d1f564a0c534..b48572c49a2e 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "m3u8"; - version = "4.1.0"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "globocom"; repo = "m3u8"; rev = "refs/tags/${version}"; - hash = "sha256-vH5y/fk9dW8w54U3o+70enbTOubV4V0/NVbSSqOY9rQ="; + hash = "sha256-sI260BR22Ft5y/2lKn1ihu52y6soyk+yzj24TEOKJlA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/macaroonbakery/default.nix b/pkgs/development/python-modules/macaroonbakery/default.nix index ed94e0261f9e..e9eb35783996 100644 --- a/pkgs/development/python-modules/macaroonbakery/default.nix +++ b/pkgs/development/python-modules/macaroonbakery/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, nix-update-script, - protobuf3, + protobuf, pymacaroons, pynacl, pyrfc3339, @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ - protobuf3 + protobuf pymacaroons pynacl pyrfc3339 diff --git a/pkgs/development/python-modules/maison/default.nix b/pkgs/development/python-modules/maison/default.nix index c37ce359ef90..4b94862ce332 100644 --- a/pkgs/development/python-modules/maison/default.nix +++ b/pkgs/development/python-modules/maison/default.nix @@ -7,7 +7,6 @@ pydantic, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, toml, }: @@ -29,7 +28,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix index ab3428b502e6..ece4f85008c6 100644 --- a/pkgs/development/python-modules/makefun/default.nix +++ b/pkgs/development/python-modules/makefun/default.nix @@ -2,6 +2,7 @@ lib, fetchPypi, buildPythonPackage, + pythonAtLeast, # build-system setuptools, @@ -33,6 +34,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/smarie/python-makefun/issues/102 + "test_args_order_and_kind" + ]; + pythonImportsCheck = [ "makefun" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index aa0fba8ff8b7..2e31d43b92b7 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "mako"; - version = "1.3.3"; + version = "1.3.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Mako"; inherit version; - hash = "sha256-4WwB2aucEfcpDu8c/vwJP7WkXuSj2gni/sLk0brlTnM="; + hash = "sha256-SNvCBWjB0naiaYs22Wj6dhYb8ScZSQfqb8WU+oH5Q7w="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/mandown/default.nix b/pkgs/development/python-modules/mandown/default.nix index 1b7361b952ff..41c059aa1da2 100644 --- a/pkgs/development/python-modules/mandown/default.nix +++ b/pkgs/development/python-modules/mandown/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - pythonRelaxDepsHook, beautifulsoup4, comicon, feedparser, @@ -20,19 +19,18 @@ buildPythonPackage rec { pname = "mandown"; - version = "1.8.2"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "potatoeggy"; repo = "mandown"; rev = "refs/tags/v${version}"; - hash = "sha256-DSbxWff5pY7tjB9aXY8/rQJzCQyDN2+OrmP10uEeXWM="; + hash = "sha256-K5/ij0VzQJGj+VvASllaV8/YBCiu2Lv+JdeSHLYMV7I="; }; nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/manifest-ml/default.nix b/pkgs/development/python-modules/manifest-ml/default.nix index 8b1dcaf5a090..7eeec2a60fee 100644 --- a/pkgs/development/python-modules/manifest-ml/default.nix +++ b/pkgs/development/python-modules/manifest-ml/default.nix @@ -12,7 +12,6 @@ pydantic, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, redis, requests, sentence-transformers, @@ -46,7 +45,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "pydantic" ]; build-system = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/manim-slides/default.nix b/pkgs/development/python-modules/manim-slides/default.nix index b8b236238ab5..7d9292b54224 100644 --- a/pkgs/development/python-modules/manim-slides/default.nix +++ b/pkgs/development/python-modules/manim-slides/default.nix @@ -5,7 +5,6 @@ pythonOlder, hatchling, - pythonRelaxDepsHook, manim, ffmpeg, @@ -35,7 +34,7 @@ }: buildPythonPackage rec { pname = "manim-slides"; - version = "5.1.6"; + version = "5.1.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -44,12 +43,11 @@ buildPythonPackage rec { owner = "jeertmans"; repo = "manim-slides"; rev = "refs/tags/v${version}"; - hash = "sha256-BFfp/jeKBXr+Ukh0jNEtMPHlstlBjhSnvA803ddYoZE="; + hash = "sha256-egQYL4Qvs1fQcJ5WEM461TSYqs2XN39wbyfx9uEFeIs="; }; build-system = [ hatchling - pythonRelaxDepsHook ]; pythonRemoveDeps = [ "opencv-python" ]; diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index 69aee1f41c3d..545f9df3c5a5 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -6,7 +6,6 @@ pytest-xdist, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, cairo, ffmpeg, @@ -191,7 +190,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 9c1139880a19..57c6d82830cb 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.6.23"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-wnjd2U2f6ONiSehLpAhLK0VIUVcoxhFuyYWiQu/8YjY="; + hash = "sha256-N2GBQxtNReedw8+27fTs//BfVuoG3y39HEo9nrcOiYA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index b9ce61973394..8001af18c0ff 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, cython, + setuptools, pytestCheckHook, hypothesis, readme-renderer, @@ -11,17 +12,21 @@ buildPythonPackage rec { pname = "marisa-trie"; - version = "1.1.0"; - format = "setuptools"; + version = "1.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-W/Q+0M82r0V4/nsDTPlfUyQ5dmUWaA5L1gNyNhHr1Ws="; + pname = "marisa_trie"; + inherit version; + hash = "sha256-/t/GdJf4qidXdWtc9JN1nyRdMh+3iRTOElttddqom18="; }; - nativeBuildInputs = [ cython ]; + build-system = [ + cython + setuptools + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index f64d415aa76b..1754ec45b76e 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -21,7 +21,6 @@ stdenv, pytest-regressions, pytestCheckHook, - pythonRelaxDepsHook, pythonOlder, }: @@ -43,7 +42,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "linkify-it-py" ]; nativeBuildInputs = [ - pythonRelaxDepsHook flit-core ]; diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index 4456e418c487..153eb0298fce 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mashumaro"; - version = "3.13"; + version = "3.13.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Fatal1ty"; repo = "mashumaro"; rev = "refs/tags/v${version}"; - hash = "sha256-ETK1rHKlByQkqibejiZmXF6c4eIiMazLa8XY2OH30q4="; + hash = "sha256-Km3RuDU77L3N2RQBhpcEztOjYtQhTXFZoGKu70g5EPU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/material-color-utilities/default.nix b/pkgs/development/python-modules/material-color-utilities/default.nix index 527d86a6bbde..527726401f82 100644 --- a/pkgs/development/python-modules/material-color-utilities/default.nix +++ b/pkgs/development/python-modules/material-color-utilities/default.nix @@ -3,7 +3,6 @@ lib, buildPythonPackage, fetchPypi, - pythonRelaxDepsHook, pillow, regex, }: @@ -17,7 +16,6 @@ buildPythonPackage rec { sha256 = "sha256-PG8C585wWViFRHve83z3b9NijHyV+iGY2BdMJpyVH64="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "Pillow" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/matplotlib/darwin-sandbox-crash.patch b/pkgs/development/python-modules/matplotlib/darwin-sandbox-crash.patch new file mode 100644 index 000000000000..883f1edc8be0 --- /dev/null +++ b/pkgs/development/python-modules/matplotlib/darwin-sandbox-crash.patch @@ -0,0 +1,14 @@ +--- a/lib/matplotlib/font_manager.py ++++ b/lib/matplotlib/font_manager.py +@@ -266,8 +266,11 @@ def _get_fontconfig_fonts(): + @lru_cache + def _get_macos_fonts(): + """Cache and list the font paths known to ``system_profiler SPFontsDataType``.""" +- d, = plistlib.loads( +- subprocess.check_output(["system_profiler", "-xml", "SPFontsDataType"])) ++ try: ++ d, = plistlib.loads( ++ subprocess.check_output(["system_profiler", "-xml", "SPFontsDataType"])) ++ except (OSError, subprocess.CalledProcessError, plistlib.InvalidFileException): ++ return [] + return [Path(entry["path"]) for entry in d["_items"]] diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index c0efd43bdcad..66436a2d2669 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchPypi, - writeText, buildPythonPackage, isPyPy, pythonOlder, @@ -11,12 +10,22 @@ certifi, pkg-config, pybind11, - setuptools, + meson-python, setuptools-scm, + pytestCheckHook, + python, + matplotlib, + fetchurl, # native libraries ffmpeg-headless, freetype, + # By default, almost all tests fail due to the fact we use our version of + # freetype. We still define use this argument to define the overriden + # derivation `matplotlib.passthru.tests.withoutOutdatedFreetype` - which + # builds matplotlib with the freetype version they default to, with which all + # tests should pass. + doCheck ? false, qhull, # propagates @@ -80,7 +89,7 @@ let in buildPythonPackage rec { - version = "3.8.4"; + version = "3.9.0"; pname = "matplotlib"; pyproject = true; @@ -88,9 +97,15 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-iqw5fV6ewViWDjHDgcX/xS3dUr2aR3F+KmlAOBZ9/+o="; + hash = "sha256-5tKepsGeNLMPt9iLcIH4aaAwFPZv4G1izHfVpuqI7Xo="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don't crash when running in Darwin sandbox + # Submitted upstream: https://github.com/matplotlib/matplotlib/pull/28498 + ./darwin-sandbox-crash.patch + ]; + env.XDG_RUNTIME_DIR = "/tmp"; # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the @@ -100,21 +115,16 @@ buildPythonPackage rec { # With the following patch we just hard-code these paths into the install # script. postPatch = - let - tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"''; - in '' substituteInPlace pyproject.toml \ --replace-fail '"numpy>=2.0.0rc1,<2.3",' "" - '' - + lib.optionalString enableTk '' - sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py + patchShebangs tools '' + lib.optionalString (stdenv.isLinux && interactive) '' # fix paths to libraries in dlopen calls (headless detection) - substituteInPlace src/_c_internal_utils.c \ - --replace libX11.so.6 ${libX11}/lib/libX11.so.6 \ - --replace libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0 + substituteInPlace src/_c_internal_utils.cpp \ + --replace-fail libX11.so.6 ${libX11}/lib/libX11.so.6 \ + --replace-fail libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0 ''; nativeBuildInputs = [ pkg-config ] ++ lib.optionals enableGtk3 [ gobject-introspection ]; @@ -144,7 +154,7 @@ buildPythonPackage rec { certifi numpy pybind11 - setuptools + meson-python setuptools-scm ]; @@ -171,29 +181,45 @@ buildPythonPackage rec { ++ lib.optionals enableNbagg [ ipykernel ] ++ lib.optionals enableTk [ tkinter ]; - passthru.config = { - directories = { - basedirlist = "."; - }; - libs = { - system_freetype = true; - system_qhull = true; - # LTO not working in darwin stdenv, see #19312 - enable_lto = !stdenv.isDarwin; - }; + mesonFlags = lib.mapAttrsToList lib.mesonBool { + system-freetype = true; + system-qhull = true; + # Otherwise GNU's `ar` binary fails to put symbols from libagg into the + # matplotlib shared objects. See: + # -https://github.com/matplotlib/matplotlib/issues/28260#issuecomment-2146243663 + # -https://github.com/matplotlib/matplotlib/issues/28357#issuecomment-2155350739 + b_lto = false; }; passthru.tests = { inherit sage; + withOutdatedFreetype = matplotlib.override { + doCheck = true; + freetype = freetype.overrideAttrs (_: { + src = fetchurl { + url = "https://download.savannah.gnu.org/releases/freetype/freetype-old/freetype-2.6.1.tar.gz"; + sha256 = "sha256-Cjx9+9ptoej84pIy6OltmHq6u79x68jHVlnkEyw2cBQ="; + }; + patches = [ ]; + }); + }; }; - env.MPLSETUPCFG = writeText "mplsetup.cfg" (lib.generators.toINI { } passthru.config); - - # Encountering a ModuleNotFoundError, as describved and investigated at: - # https://github.com/NixOS/nixpkgs/issues/255262 . It could be that some of - # which may fail due to a freetype version that doesn't match the freetype - # version used by upstream. - doCheck = false; + pythonImportsCheck = [ "matplotlib" ]; + inherit doCheck; + nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' + # https://matplotlib.org/devdocs/devel/testing.html#obtain-the-reference-images + find lib -name baseline_images -printf '%P\n' | while read p; do + cp -r lib/"$p" $out/${python.sitePackages}/"$p" + done + # Tests will fail without these files as well + cp \ + lib/matplotlib/tests/{mpltest.ttf,cmr10.pfb,Courier10PitchBT-Bold.pfb} \ + $out/${python.sitePackages}/matplotlib/tests/ + # https://github.com/NixOS/nixpkgs/issues/255262 + cd $out + ''; meta = with lib; { description = "Python plotting library, making publication quality plots"; diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index 4340a7837164..0457ad15cd50 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "maxminddb"; - version = "2.6.1"; + version = "2.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bF1ZH2JeA7CjTfDH/4FYBnY5e4M14T7OEwxuOeSjr7k="; + hash = "sha256-fYQtMuJiCryJS315paEAemnfLGzyeaBrlMnDkT9m8mQ="; }; buildInputs = [ libmaxminddb ]; diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index be2d41eb2cd9..b9fa608772b7 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "mayavi"; # TODO: Remove meta.broken on next release. - version = "4.8.1"; + version = "4.8.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-n0J+8spska542S02ibpr7KJMhGDicG2KHJuEKJrT/Z4="; + hash = "sha256-sQ/pFF8hxI5JAvDnRrNgOzy2lNEUVlFaRoIPIaCnQik="; }; patches = [ diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index 6b68f4f64322..a209f36ed4f1 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mdit-py-plugins"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YBJu0vIOD747DrJLcqiZMHq34+gHdXeGLCw1OxxzIJ0="; + hash = "sha256-xIbP2zHvHWV+2wW17i78vxc5npCvRBYP6QuL/mCBIww="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix index 7c7d95adf5d3..5cca00165cfb 100644 --- a/pkgs/development/python-modules/mdtraj/default.nix +++ b/pkgs/development/python-modules/mdtraj/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "mdtraj"; - version = "1.9.9"; + version = "1.10.0"; pyproject = true; src = fetchFromGitHub { owner = "mdtraj"; repo = "mdtraj"; rev = "refs/tags/${version}"; - hash = "sha256-2Jg6DyVJlRBLD/6hMtcsrAdxKF5RkpUuhAQm/lqVGeE="; + hash = "sha256-hNv/humEZOX4W7cOlJSAodk9pIi18//YJNSWNiEFiVg="; }; patches = [ diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index 550d068d3b05..279bf1169f69 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.31.2"; + version = "0.31.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-OGL7n4GIRrwU8OBdzi/H09lUy/Vue0bfHCLnztc4h5g="; + hash = "sha256-8O0tTif5ii12lD0SXD2rDiRK8xOWkYrZ+K2MTG+Pj7A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index 003e4f9609d0..d8a195f5f724 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mesa"; - version = "2.2.4"; + version = "2.3.0"; format = "setuptools"; # According to their docs, this library is for Python 3+. @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mesa"; inherit version; - hash = "sha256-5og3ACS2r36BEGWfqtw6WG6yJwNF5p3M9K25sSmHosM="; + hash = "sha256-wXHCyUk05Ez4ye5a1rKXCyKPZMK7bR7xZ5rpD5mEaUw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 8fc2d7919b7c..4c5d9928d070 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.3.4"; + version = "2.3.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-WxiddF1n9lyxKkZk1MU40NzLh6goLVs81mbJZ3F33R8="; + hash = "sha256-s56apVx7+EXkdw3FUjyGKGFjP+IVbO0/VDB4urXEtXQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix index 3b1d5e2b95b5..89cdc0735ea5 100644 --- a/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -5,7 +5,6 @@ poetry-core, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, pytz, requests, requests-mock, @@ -29,7 +28,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "urllib3" ]; diff --git a/pkgs/development/python-modules/miauth/default.nix b/pkgs/development/python-modules/miauth/default.nix index 707057783921..aec9084ed773 100644 --- a/pkgs/development/python-modules/miauth/default.nix +++ b/pkgs/development/python-modules/miauth/default.nix @@ -1,13 +1,18 @@ { lib, - bluepy, buildPythonPackage, - cryptography, fetchPypi, - pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, + + # build-system setuptools, + + # dependencies + bluepy, + cryptography, + + # checks + pytestCheckHook, }: buildPythonPackage rec { @@ -24,8 +29,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "cryptography" ]; dependencies = [ diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 90ed0fb4cf48..270604f782ea 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -8,7 +8,6 @@ # build-system setuptools, setuptools-scm, - pythonRelaxDepsHook, # dependencies packaging, @@ -49,7 +48,6 @@ buildPythonPackage rec { build-system = [ setuptools setuptools-scm - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "packaging" ]; diff --git a/pkgs/development/python-modules/minichain/default.nix b/pkgs/development/python-modules/minichain/default.nix index 61792c468925..5109a0136bde 100644 --- a/pkgs/development/python-modules/minichain/default.nix +++ b/pkgs/development/python-modules/minichain/default.nix @@ -9,7 +9,6 @@ openai, pytestCheckHook, pythonAtLeast, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -32,7 +31,6 @@ buildPythonPackage rec { substituteInPlace ./minichain/__init__.py --replace "from .gradio import GradioConf, show" "" ''; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRemoveDeps = [ # Only used in the examples: diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix index f341bbf006f8..c4ec910b6425 100644 --- a/pkgs/development/python-modules/miniupnpc/default.nix +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "miniupnpc"; - version = "2.0.2"; + version = "2.2.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0ca94zz7sr2x57j218aypxqcwkr23n8js30f3yrvvqbg929nr93y"; + sha256 = "sha256-KwpNVl+tZTZHHZKW9p3a/S0nZJW6lZftjBK9ECkRUMo="; }; nativeBuildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 0a6864daea63..e04490dd4642 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, buildPythonPackage, pythonOlder, - pythonRelaxDepsHook, # Mitmproxy requirements aioquic, asgiref, @@ -58,11 +57,12 @@ buildPythonPackage rec { hash = "sha256-rIyRY1FolbdoaI4OgFG7D2/mot8NiRHalgittPzledw="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "aioquic" "cryptography" + "pyperclip" + "tornado" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-autolinks-plugin/default.nix b/pkgs/development/python-modules/mkdocs-autolinks-plugin/default.nix index 8a4a98e994ef..c837ff25ceb6 100644 --- a/pkgs/development/python-modules/mkdocs-autolinks-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-autolinks-plugin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "mkdocs-autolinks-plugin"; - version = "0.7.1"; + version = "071"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "zachhannum"; repo = "mkdocs-autolinks-plugin"; # The commit messages mention version 0.7.1, but the tag is v_071. - rev = "e2b649eb4db23459bcec121838f27c92c81f9ce1"; + rev = "refs/tags/v_${version}"; hash = "sha256-mEbuB9VwK7po1TqtJfBSkItOVlI3/W3nD2LYRHgPpTA="; }; diff --git a/pkgs/development/python-modules/mkdocs-awesome-pages-plugin/default.nix b/pkgs/development/python-modules/mkdocs-awesome-pages-plugin/default.nix new file mode 100644 index 000000000000..f7bf173400dd --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-awesome-pages-plugin/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + mkdocs, + wcmatch, + natsort, + pytestCheckHook, + beautifulsoup4, + mock-open, + importlib-metadata, + pythonOlder, +}: +buildPythonPackage rec { + pname = "mkdocs-awesome-pages-plugin"; + version = "2.9.2"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "lukasgeiter"; + repo = "mkdocs-awesome-pages-plugin"; + rev = "refs/tags/v${version}"; + hash = "sha256-pYyZ84eNrslxgLSBr3teQqmV7hA+LHwJ+Z99QgPdh6U="; + }; + + propagatedBuildInputs = [ + mkdocs + wcmatch + natsort + ]; + + nativeBuildInputs = [poetry-core]; + + nativeCheckInputs = [ + pytestCheckHook + beautifulsoup4 + mock-open + importlib-metadata + ]; + + disabledTestPaths = [ + # requires "generatedfiles" mkdocs plugin + "mkdocs_awesome_pages_plugin/tests/e2e/test_gen_files.py" + ]; + + meta = with lib; { + description = "An MkDocs plugin that simplifies configuring page titles and their order"; + homepage = "https://github.com/lukasgeiter/mkdocs-awesome-pages-plugin"; + changelog = "https://github.com/lukasgeiter/mkdocs-awesome-pages-plugin/blob/v${version}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [phaer]; + }; +} diff --git a/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix b/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix index 44b0c28d6a68..68725065cb0b 100644 --- a/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix +++ b/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "mkdocs-drawio-exporter"; - version = "0.8.0"; + version = "0.9.1"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-9cvA186FS6bHmpOrv4OfPZ5kRfgfafBfaWxgWJIlwwA="; + hash = "sha256-x8X8hvN/tL8C6VhgMCEHDh2hILjBoyLgQfsFD1+qXgo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-get-deps/default.nix b/pkgs/development/python-modules/mkdocs-get-deps/default.nix new file mode 100644 index 000000000000..72d4fce4fa10 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-get-deps/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, importlib-metadata +, mergedeep +, platformdirs +, pyyaml +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mkdocs-get-deps"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mkdocs"; + repo = "get-deps"; + rev = "v${version}"; + hash = "sha256-DahmSYWYhVch950InYBiCh6qz1pH2Kibf5ixwCNdsTg="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + importlib-metadata + mergedeep + platformdirs + pyyaml + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "mkdocs_get_deps" ]; + + meta = with lib; { + description = "An extra command for MkDocs that infers required PyPI packages from `plugins` in mkdocs.yml"; + homepage = "https://github.com/mkdocs/get-deps"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix index 9573329d6b59..c64987e32a28 100644 --- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix +++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -11,12 +11,11 @@ pygments, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { pname = "mkdocs-jupyter"; - version = "0.24.6"; + version = "0.24.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mkdocs_jupyter"; inherit version; - hash = "sha256-ify+ipUjhk1UFt4aYHEWQLa8KXInnSrfRu0ndsLZ/3w="; + hash = "sha256-Cadi9ITVQNnA6UTTSyjLU2oyhp4iS0YOL8eRsUP3aUA="; }; postPatch = '' @@ -37,7 +36,6 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index f344a92445ab..595333762f12 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.18"; + version = "9.5.27"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-5FCIDAWRY6YfZi4QbcEpJMFfbJ17vudxlUYx4czDxrY="; + hash = "sha256-iuQmZJ5iJEeD54SxNO6ppcI74zyUL2WdSNhDNnmC7ZY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix index d3fdfd625bb1..42455ed84cc6 100644 --- a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mkdocs-rss-plugin"; - version = "1.14.0"; + version = "1.15.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Guts"; repo = "mkdocs-rss-plugin"; rev = "refs/tags/${version}"; - hash = "sha256-4/sLwdScYatDXfAGbEsiYMdQ7IYMSlA3X1u04G3XcOc="; + hash = "sha256-sGm6uWlZeW65uorfTK8pk8ZT2AE9nmsZhe+UYVrSr+8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 25005b56d455..fc3b7fd4d8a9 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -17,6 +17,7 @@ markdown, markupsafe, mergedeep, + mkdocs-get-deps, packaging, pathspec, platformdirs, @@ -35,7 +36,7 @@ buildPythonPackage rec { pname = "mkdocs"; - version = "1.5.3"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -44,18 +45,19 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-axH4AeL+osxoUIVJbW6YjiTfUr6TAXMB4raZ3oO0fyw="; + hash = "sha256-tpDKomHFoGYPLz7rcohkU9w7G/5+YkJ5Y6wJJRyMecI="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ click ghp-import jinja2 markdown markupsafe mergedeep + mkdocs-get-deps packaging pathspec platformdirs diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 7ee9df1c26a7..923c39951657 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -2,6 +2,7 @@ lib, alembic, buildPythonPackage, + cachetools, click, cloudpickle, databricks-cli, @@ -17,13 +18,14 @@ markdown, matplotlib, numpy, + opentelemetry-api, + opentelemetry-sdk, packaging, pandas, prometheus-flask-exporter, protobuf, python-dateutil, pythonOlder, - pythonRelaxDepsHook, pyarrow, pytz, pyyaml, @@ -39,21 +41,20 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.12.2"; + version = "2.14.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-1xLxr51E8eueG67oymT3MR4YW3Vy/DweCoOkyM7/aq0="; + hash = "sha256-zqC2eK3zjR+PbNlxMKhjJddLsVk7iVtq+tx1ACHr9aI="; }; # Remove currently broken dependency `shap`, a model explainability package. # This seems quite unprincipled especially with tests not being enabled, # but not mlflow has a 'skinny' install option which does not require `shap`. nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; pythonRemoveDeps = [ "shap" ]; @@ -65,6 +66,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ alembic + cachetools click cloudpickle databricks-cli @@ -79,12 +81,14 @@ buildPythonPackage rec { markdown matplotlib numpy + opentelemetry-api + opentelemetry-sdk packaging pandas prometheus-flask-exporter protobuf - python-dateutil pyarrow + python-dateutil pytz pyyaml querystring-parser diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index c45e35af8382..b65f87105d2d 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -30,13 +30,13 @@ let in buildPythonPackage rec { pname = "mlx"; - version = "0.6.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "ml-explore"; repo = "mlx"; rev = "refs/tags/v${version}"; - hash = "sha256-FihdI+3ACKMJfPT2POjTRdtkXs7x+KiQpdpo3RcczBE="; + hash = "sha256-+vgHEt+L91YJLpQo4bps+Rnm/TS1PAPXNohdICGK6GE="; }; pyproject = true; diff --git a/pkgs/development/python-modules/mobi/default.nix b/pkgs/development/python-modules/mobi/default.nix index c4f3af961ca3..82065268cfeb 100644 --- a/pkgs/development/python-modules/mobi/default.nix +++ b/pkgs/development/python-modules/mobi/default.nix @@ -5,7 +5,6 @@ loguru, poetry-core, pythonOlder, - pythonRelaxDepsHook, setuptools, }: @@ -27,7 +26,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 3a209f7a6a43..a76b460857af 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -36,12 +36,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.12.5"; + version = "3.12.8"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-6yWo7SBlVldK+AxUBnQOXjQBxz9HbIC+Ch977xiZxek="; + hash = "sha256-++zGXLtQ01srmF0EqUFqaxh+mnNzW8IzYG1RzNGTXkw="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/mockupdb/default.nix b/pkgs/development/python-modules/mockupdb/default.nix index 5ac9a946ac16..47ba794d0a0b 100644 --- a/pkgs/development/python-modules/mockupdb/default.nix +++ b/pkgs/development/python-modules/mockupdb/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, pymongo, + pythonAtLeast, pythonOlder, pytestCheckHook, }: @@ -12,7 +13,8 @@ buildPythonPackage rec { version = "1.8.1"; format = "setuptools"; - disabled = pythonOlder "3.9"; + # use the removed ssl.wrap_socket function + disabled = pythonOlder "3.9" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/moddb/default.nix b/pkgs/development/python-modules/moddb/default.nix index 2846ef2d7a31..17af65e37a20 100644 --- a/pkgs/development/python-modules/moddb/default.nix +++ b/pkgs/development/python-modules/moddb/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, beautifulsoup4, pyrate-limiter, requests, @@ -21,7 +20,6 @@ buildPythonPackage rec { hash = "sha256-2t5QQAmSLOrdNCl0XdsFPdP2UF10/qq69DovqeQ1Vt8="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ beautifulsoup4 diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index a525adad5947..e8472d3233e5 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -5,7 +5,6 @@ setuptools, pythonOlder, z3-solver, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -26,7 +25,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ z3-solver ]; diff --git a/pkgs/development/python-modules/moderngl-window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix index 90e07d12178d..8042df62a5f9 100644 --- a/pkgs/development/python-modules/moderngl-window/default.nix +++ b/pkgs/development/python-modules/moderngl-window/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, setuptools, glfw, moderngl, @@ -37,7 +36,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "pillow" ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/molbar/default.nix b/pkgs/development/python-modules/molbar/default.nix index ada2c6cfb535..f69bfb6f17c2 100644 --- a/pkgs/development/python-modules/molbar/default.nix +++ b/pkgs/development/python-modules/molbar/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage , python -, pythonRelaxDepsHook , lib , gfortran , fetchgit @@ -34,7 +33,6 @@ buildPythonPackage rec { nativeBuildInputs = [ gfortran - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "networkx" ]; diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index 84cbbf48157b..e2861df3571f 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "molecule"; - version = "24.6.0"; + version = "24.6.1"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-jey0xoT8r7hae08DjaEl7UJb3RDbdr8M20E/m4TkG1g="; + hash = "sha256-QcGQOllyl8JgK9BZ4Qe17y4yydokeX3LeP+Yc8ZhXuY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/molecule/plugins.nix b/pkgs/development/python-modules/molecule/plugins.nix index 8b7c5b8ffba5..b87c3b121b54 100644 --- a/pkgs/development/python-modules/molecule/plugins.nix +++ b/pkgs/development/python-modules/molecule/plugins.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonRelaxDepsHook, setuptools-scm, python-vagrant, docker, @@ -22,7 +21,6 @@ buildPythonPackage rec { pythonRemoveDeps = [ "molecule" ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools-scm ]; diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix index bffc3ec456ed..645ed9a05811 100644 --- a/pkgs/development/python-modules/monai/default.nix +++ b/pkgs/development/python-modules/monai/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, pythonOlder, pythonAtLeast, ninja, @@ -16,8 +17,7 @@ buildPythonPackage rec { pname = "monai"; version = "1.3.1"; pyproject = true; - # upper bound due to use of `distutils`; remove after next release: - disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Project-MONAI"; @@ -26,6 +26,14 @@ buildPythonPackage rec { hash = "sha256-YjEJbDM9+PiC3Kse8NA/b/yJBsReaK6yIyEB9uktiEc="; }; + patches = [ + (fetchpatch { + name = "remove-distutils"; + url = "https://github.com/Project-MONAI/MONAI/commit/87862f0d5730d42d282e779fc1450f18b4869863.patch"; + hash = "sha256-wApYfugDPWcuxwmd91peNqc0+l+SoMlT8hhx99oI2Co="; + }) + ]; + preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES; ''; diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index 6fd9f94525e7..0130714fecf7 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "10.2.0"; + version = "10.3.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-j8y0gMQ9PpmgAIdjTAbdArDVD78IizgN5aQaAV7COeE="; + hash = "sha256-5dk+9BEiT7zvNmpujdxMV4G8Y1nUNBKmXdWWTkYRFGM="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index e72fb7b5ea40..a013da79a922 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -44,19 +44,19 @@ buildPythonPackage rec { pname = "moto"; - version = "5.0.5"; + version = "5.0.9"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Lqyi33dY9oaN9CC/ByXNC5PZhwlgbx+4sjQ7W9yCLZE="; + hash = "sha256-63Hxy6AccP/x8WCGrLJNbZrrMoMNZG2JifmKKa6uJLo="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ boto3 botocore cryptography @@ -68,7 +68,7 @@ buildPythonPackage rec { jinja2 ]; - passthru.optional-dependencies = { + optional-dependencies = { # non-exhaustive list of extras, that was cobbled together for testing all = [ antlr4-python3-runtime @@ -98,7 +98,7 @@ buildPythonPackage rec { pytestCheckHook pytest-order pytest-xdist - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; # Some tests depend on AWS credentials environment variables to be set. env.AWS_ACCESS_KEY_ID = "ak"; @@ -156,6 +156,9 @@ buildPythonPackage rec { # Threading tests regularly blocks test execution "tests/test_utilities/test_threaded_server.py" "tests/test_s3/test_s3_bucket_policy.py" + + # https://github.com/getmoto/moto/issues/7786 + "tests/test_dynamodb/test_dynamodb_import_table.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 01b6a7086ab8..7f1196b461a9 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -73,6 +73,8 @@ buildPythonPackage rec { "test_setup" "test_subtitles" "test_sys_write_flush" + # media duration mismatch: assert 2.9 == 3.0 + "test_ffmpeg_parse_infos" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index 1daa1bc2170f..a9d0fb10eabe 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.49"; + version = "0.3.50"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Hxqk0eSEOWSpomrS/vTdJV9/1mKQ/yCJQOBpm9tAvqo="; + hash = "sha256-xHdZdfTiKbDGu6oYIiTd8P/npH2kUjz7s8A9+CBJN0A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mpris-server/default.nix b/pkgs/development/python-modules/mpris-server/default.nix index 611ac8a2f864..06383416d96c 100644 --- a/pkgs/development/python-modules/mpris-server/default.nix +++ b/pkgs/development/python-modules/mpris-server/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonRelaxDepsHook, fetchPypi, emoji, pydbus, @@ -21,7 +20,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/multipart/default.nix b/pkgs/development/python-modules/multipart/default.nix index 34b12c70edfe..312699ecda41 100644 --- a/pkgs/development/python-modules/multipart/default.nix +++ b/pkgs/development/python-modules/multipart/default.nix @@ -2,28 +2,21 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "multipart"; - version = "0.2.4"; - - format = "setuptools"; + version = "0.2.5"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "06ba205360bc7096fefe618e4f1e9b2cdb890b4f2157053a81f386912a2522cb"; + hash = "sha256-+piDjUDJZ7sZWJYmoPuKXEDEId2i/r4bA1H89ibiRlE="; }; - patches = [ - (fetchpatch { - name = "dont-test-semicolon-separators-in-urlencoded-data.patch"; - url = "https://github.com/defnull/multipart/commit/4d4ac6b79c453918ebf40c690e8d57d982ee840b.patch"; - hash = "sha256-rMeMhQEhonWAHzy5M8Im5mL6km5a9O0CGVOV+T3UNqo="; - }) - ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mwcli/default.nix b/pkgs/development/python-modules/mwcli/default.nix index 613a52bd8a67..adcc5ab1e34c 100644 --- a/pkgs/development/python-modules/mwcli/default.nix +++ b/pkgs/development/python-modules/mwcli/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonRelaxDepsHook, docopt, para, }: @@ -20,7 +19,6 @@ buildPythonPackage rec { # Prevent circular dependency pythonRemoveDeps = [ "mwxml" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ docopt diff --git a/pkgs/development/python-modules/myjwt/default.nix b/pkgs/development/python-modules/myjwt/default.nix index 9f58f93f60ca..e7c80a480167 100644 --- a/pkgs/development/python-modules/myjwt/default.nix +++ b/pkgs/development/python-modules/myjwt/default.nix @@ -13,7 +13,6 @@ pytest-mock, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, questionary, requests, requests-mock, @@ -46,7 +45,6 @@ buildPythonPackage rec { build-system = [ poetry-core - pythonRelaxDepsHook ]; dependencies = [ diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 3a0c97957b39..af3d186fb5a3 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.23.2"; + version = "7.24.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-v5/3TCEtDXbmitb3e15XWkW8VO5nJk8TCVvVyh5rAMs="; + hash = "sha256-RVpyCXIM7ze2iWJsi3i5N5JF2EyASAJ52DpYeebNk5A="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 73e0a331799a..0dca10652ac6 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -7,7 +7,6 @@ protobuf, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, setuptools, testers, types-protobuf, @@ -25,7 +24,6 @@ buildPythonPackage rec { hash = "sha256-AvJC6zQJ9miJ8rGjqlg1bsTZCc3Q+TEVYi6ecDZuyjw="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "protobuf" ]; diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index bbf92943bf53..c5b7736c113a 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, flit-core, pythonOlder, defusedxml, @@ -18,12 +17,10 @@ pytest-regressions, sphinx-pytest, pytestCheckHook, - pythonRelaxDepsHook, }: - buildPythonPackage rec { pname = "myst-parser"; - version = "2.0.0"; + version = "3.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,20 +29,11 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1BW7Z+0rs5Up+VZ3vDygnhLzE9Y2BqEMnTnflboweu0="; + hash = "sha256-TKo1lanZNM+XrOKZ0ZmtlhEPoAYQUspkyHXZm1wNTFE="; }; - patches = [ - (fetchpatch { - name = "myst-parser-sphinx7.2-compat.patch"; - url = "https://github.com/executablebooks/MyST-Parser/commit/4f670fc04c438b57a9d4014be74e9a62cc0deba4.patch"; - hash = "sha256-FCvFSsD7qQwqWjSW7R4Gx+E2jaGkifSZqaRbAglt9Yw="; - }) - ]; - nativeBuildInputs = [ flit-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -71,24 +59,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "docutils" ]; - disabledTests = [ - # AssertionError due to different files - "test_basic" - "test_footnotes" - "test_gettext_html" - "test_fieldlist_extension" - # docutils 0.19 expectation mismatches - "test_docutils_roles" - # sphinx 7.0 expectation mismatches - "test_heading_slug_func" - "test_references_singlehtml" - # sphinx 6.0 expectation mismatches - "test_sphinx_directives" - # sphinx 5.3 expectation mismatches - "test_render" - "test_includes" - ]; - meta = with lib; { description = "Sphinx and Docutils extension to parse MyST"; homepage = "https://myst-parser.readthedocs.io/"; diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index e46087b9e524..dc60601b7e6c 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonRelaxDepsHook, setuptools, ipywidgets, fastcore, @@ -26,7 +25,6 @@ buildPythonPackage rec { hash = "sha256-MntVdZ6LazdFCm+h5FaTxvzEwCtoJjrW/EJPTt2fdnU="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "ipywidgets" ]; diff --git a/pkgs/development/python-modules/nbmake/default.nix b/pkgs/development/python-modules/nbmake/default.nix index bb050d9b89af..4c6d46e6d470 100644 --- a/pkgs/development/python-modules/nbmake/default.nix +++ b/pkgs/development/python-modules/nbmake/default.nix @@ -4,7 +4,6 @@ pythonOlder, fetchFromGitHub, poetry-core, - pythonRelaxDepsHook, setuptools, wheel, ipykernel, @@ -34,7 +33,6 @@ buildPythonPackage rec { build-system = [ poetry-core - pythonRelaxDepsHook setuptools wheel ]; diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 94715f449203..b44f40ffc9c5 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "5.0.0"; + version = "5.0.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = "refs/tags/${version}"; - hash = "sha256-WSeY9v1ELIZEWvbVHGZFq+8tZVVPkOwUwQ/4cOh8IwQ="; + hash = "sha256-XHdKQu6mfPl8hUNBqOZlGmI1SdBqwZm/sYzBZEbpDD0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index a265984a800e..aaf776d9aaba 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "netaddr"; - version = "1.2.1"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-brj+3wQSxtKU0GiFwRDelFz00i0rUQ0EBPTgaVCFeYc="; + sha256 = "sha256-XDw9mJW1Ubdjd5un23oDSH3B+OOzha+BmvNBrp725Io="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/nethsm/default.nix b/pkgs/development/python-modules/nethsm/default.nix index 5285d609d747..77d25a7a1b1d 100644 --- a/pkgs/development/python-modules/nethsm/default.nix +++ b/pkgs/development/python-modules/nethsm/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonRelaxDepsHook, flit-core, certifi, cryptography, @@ -35,7 +34,6 @@ buildPythonPackage { nativeBuildInputs = [ flit-core - pythonRelaxDepsHook ]; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/netio/default.nix b/pkgs/development/python-modules/netio/default.nix index bf33aa47ddc1..305b177b8245 100644 --- a/pkgs/development/python-modules/netio/default.nix +++ b/pkgs/development/python-modules/netio/default.nix @@ -5,7 +5,6 @@ poetry-core, pyopenssl, pythonOlder, - pythonRelaxDepsHook, requests, }: @@ -25,7 +24,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "pyopenssl" ]; diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index dc2c2a908a79..11c6592526cc 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "3.1.0"; + version = "3.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "nettigo-air-monitor"; rev = "refs/tags/${version}"; - hash = "sha256-9LrzCUstzMTzt2qHzDsllyep5Rtt6vrrvVPRFILUtwA="; + hash = "sha256-2INL6ZXi7f4HD0ilhQLSivk8TfYh3qRSPRsCCtCLAP8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix index 9b84c400e529..e6b68e8490d2 100644 --- a/pkgs/development/python-modules/nextdns/default.nix +++ b/pkgs/development/python-modules/nextdns/default.nix @@ -4,18 +4,18 @@ aioresponses, buildPythonPackage, fetchFromGitHub, - orjson, pytest-asyncio, pytest-error-for-skips, pytestCheckHook, pythonOlder, setuptools, syrupy, + tenacity, }: buildPythonPackage rec { pname = "nextdns"; - version = "3.0.0"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,14 +24,14 @@ buildPythonPackage rec { owner = "bieniu"; repo = "nextdns"; rev = "refs/tags/${version}"; - hash = "sha256-ka/VT7c72la4z/BVAWnV06MxVmu52ZcJ4GsEeP7vbKA="; + hash = "sha256-bBGuMfXCAqds9SMGj1I+9rk/u2QljZW60quvWODboCA="; }; build-system = [ setuptools ]; dependencies = [ aiohttp - orjson + tenacity ]; nativeCheckInputs = [ @@ -42,6 +42,12 @@ buildPythonPackage rec { syrupy ]; + disabledTests = [ + # mocked object called too many times + "test_retry_error" + "test_retry_success" + ]; + pythonImportsCheck = [ "nextdns" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix index 7c7a8895edff..1699b18c182d 100644 --- a/pkgs/development/python-modules/nh3/default.nix +++ b/pkgs/development/python-modules/nh3/default.nix @@ -10,12 +10,12 @@ }: let pname = "nh3"; - version = "0.2.15"; + version = "0.2.17"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-OyTehgnjmDALU2qPRL/HrvoAMyIsmYuTKFlOJT8r+Gk="; + hash = "sha256-j9OoXAuuCWsBHanN+SzSip94ZA+kY8HUVvfY/omUSSM="; }; in buildPythonPackage { @@ -26,7 +26,7 @@ buildPythonPackage { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-fetAE3cj9hh4SoPE72Bqco5ytUMiDqbazeS2MHdUibM="; + hash = "sha256-WomlVzKOUfcgAWGJInSvZn9hm+bFpgc4nJbRiyPCU64="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix index 88bcb450fbf5..30197c168339 100644 --- a/pkgs/development/python-modules/niaaml/default.nix +++ b/pkgs/development/python-modules/niaaml/default.nix @@ -8,30 +8,28 @@ poetry-core, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, scikit-learn, toml-adapt, }: buildPythonPackage rec { pname = "niaaml"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = "lukapecnik"; + owner = "firefly-cpp"; repo = "NiaAML"; rev = "refs/tags/${version}"; - hash = "sha256-d6UlpMrT0GBZlcD1BCZxInXTdyFMBVltxnSyUFbSy0g="; + hash = "sha256-VMZLEirE01Q9eyQIhV18PepGWmBcxLIwNeuVf7EuSWE="; }; pythonRelaxDeps = [ "pandas" ]; nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook toml-adapt ]; @@ -54,8 +52,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python automated machine learning framework"; - homepage = "https://github.com/lukapecnik/NiaAML"; - changelog = "https://github.com/lukapecnik/NiaAML/releases/tag/${version}"; + homepage = "https://github.com/firefly-cpp/NiaAML"; + changelog = "https://github.com/firefly-cpp/NiaAML/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; diff --git a/pkgs/development/python-modules/niaclass/default.nix b/pkgs/development/python-modules/niaclass/default.nix index b4fa278bfa01..3240ea92711f 100644 --- a/pkgs/development/python-modules/niaclass/default.nix +++ b/pkgs/development/python-modules/niaclass/default.nix @@ -8,7 +8,6 @@ poetry-core, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, scikit-learn, toml-adapt, }: @@ -21,7 +20,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = "lukapecnik"; + owner = "firefly-cpp"; repo = "NiaClass"; rev = "refs/tags/${version}"; hash = "sha256-C3EF18lzheE+dXHJA6WJNFECAH4HfPiCDo7QxtHvOLI="; @@ -31,7 +30,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook toml-adapt ]; @@ -53,8 +51,8 @@ buildPythonPackage rec { meta = with lib; { description = "Framework for solving classification tasks using Nature-inspired algorithms"; - homepage = "https://github.com/lukapecnik/NiaClass"; - changelog = "https://github.com/lukapecnik/NiaClass/releases/tag/${version}"; + homepage = "https://github.com/firefly-cpp/NiaClass"; + changelog = "https://github.com/firefly-cpp/NiaClass/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index 60308f21573f..f7cfecd8a5c1 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -7,7 +7,8 @@ openpyxl, pandas, poetry-core, - pytestCheckHook, + pytest7CheckHook, + pytest-xdist, pythonOlder, }: @@ -34,7 +35,7 @@ buildPythonPackage rec { pandas ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytest7CheckHook pytest-xdist ]; pythonImportsCheck = [ "niapy" ]; diff --git a/pkgs/development/python-modules/nikola/default.nix b/pkgs/development/python-modules/nikola/default.nix index 3af0fd4b9eb6..955679a5b860 100644 --- a/pkgs/development/python-modules/nikola/default.nix +++ b/pkgs/development/python-modules/nikola/default.nix @@ -8,7 +8,6 @@ doit, feedparser, fetchPypi, - fetchpatch2, freezegun, ghp-import, hsluv, @@ -44,7 +43,7 @@ buildPythonPackage rec { pname = "nikola"; - version = "8.3.0"; + version = "8.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -52,17 +51,9 @@ buildPythonPackage rec { src = fetchPypi { pname = "Nikola"; inherit version; - hash = "sha256-VYuhiGLMTHcOZM8/bGZT7Xx5BOHo9gsMPjufYglrBL0="; + hash = "sha256-IfJB2Rl3c1MyEiuyNpT3udfpM480VvFD8zosJFDHr7k="; }; - patches = [ - (fetchpatch2 { - name = "nikola-pytest8-compat.patch"; - url = "https://github.com/getnikola/nikola/commit/5f1003f91cd59f62622d379efe9be5fb19a1ed3e.patch"; - hash = "sha256-2H3125RUnwvN/XgwgfRe1139rhAz/9viMEcUYRGQMPs="; - }) - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace-fail "--cov nikola --cov-report term-missing" "" diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index c592b35c076b..5ac5192eeb19 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchPypi, pythonOlder, - pythonRelaxDepsHook, # python dependencies click, python-dateutil, @@ -58,7 +57,6 @@ buildPythonPackage rec { --replace "/usr/bin/env bash" "${bash}/bin/bash" ''; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "traits" ]; diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index 3e711b1bc7a7..e9a1ac4c3a18 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "nitime"; - version = "0.10.2"; + version = "0.11"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NCaWr7ZqL1XV0QfUD+4+Yn33N1cCP33ib5oJ91OtJLU="; + hash = "sha256-4Ie8fuk9CKdn/64TsCfN2No2dU16ICpBRWYerqqF0/0="; }; # Upstream wants to build against the oldest version of numpy possible, but diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index 2729f23eab35..51f499d6ab17 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pythonOlder, - pythonRelaxDepsHook, h5py, nibabel, numpy, @@ -23,7 +22,6 @@ buildPythonPackage rec { hash = "sha256-Lty4aPzSlwRJSqCXeIVICF+gudYqto1OS4cVZyrB2nY="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; buildInputs = [ setuptools-scm toml diff --git a/pkgs/development/python-modules/norfair/default.nix b/pkgs/development/python-modules/norfair/default.nix index 11afdd9533d0..c3c50cd13334 100644 --- a/pkgs/development/python-modules/norfair/default.nix +++ b/pkgs/development/python-modules/norfair/default.nix @@ -11,7 +11,6 @@ motmetrics, opencv4, pytestCheckHook, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -28,7 +27,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "rich" ]; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index 9155ae68a6b9..95a564c14c58 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "nose2"; - version = "0.14.1"; + version = "0.15.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-f48Dohyd4sMwFZM6/O9yv45KLV3+w7QAkih95uQbCTo="; + hash = "sha256-NncPUZ31vs08v+C+5Ku/v5ufa0604DNh0oK378/E8N8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/notifications-android-tv/default.nix b/pkgs/development/python-modules/notifications-android-tv/default.nix index e8ed0bd97f69..319c81c13d08 100644 --- a/pkgs/development/python-modules/notifications-android-tv/default.nix +++ b/pkgs/development/python-modules/notifications-android-tv/default.nix @@ -12,15 +12,15 @@ buildPythonPackage rec { pname = "notifications-android-tv"; - version = "1.0.0"; + version = "1.2.2"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "engrbm87"; repo = "notifications_android_tv"; - rev = version; - hash = "sha256-Xr+d2uYzgFp/Fb00ymov02+GYnwjGc3FbJ/rIvQXzCE="; + rev = "refs/tags/${version}"; + hash = "sha256-JUvxxVCiQtywAWU5AYnPm4SueIWIXkzLxPYveVXpc2E="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index a0c0b0b96aed..38f4ff5af140 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -9,7 +9,6 @@ libnotify, which, poetry-core, - pythonRelaxDepsHook, jeepney, loguru, pytest, @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "notify-py"; - version = "0.3.42"; + version = "0.3.43"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -28,7 +27,7 @@ buildPythonPackage rec { owner = "ms7m"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XtjJImH9UwPPZS/Yqs8S5xGXOLBRmJRawzxWXoPWvrM="; + hash = "sha256-4PJ/0dLG3bWDuF1G/qUmvNaIUFXgPP2S/0uhZz86WRA="; }; patches = @@ -50,7 +49,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "loguru" ]; diff --git a/pkgs/development/python-modules/nototools/default.nix b/pkgs/development/python-modules/nototools/default.nix index a712a936c4ef..ea555a5e0977 100644 --- a/pkgs/development/python-modules/nototools/default.nix +++ b/pkgs/development/python-modules/nototools/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "nototools"; - version = "0.2.19"; + version = "0.2.20"; disabled = pythonOlder "3.6"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "nototools"; rev = "refs/tags/v${version}"; - sha256 = "sha256-anAz+5PIhGhpFunjV2EVk2CrbXq2U0e+LINYUnS0IKU="; + sha256 = "sha256-id4UhyWOFHrtmBZHhnaY2jHDIK0s7rcGBpg4QsBTLKs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix index 9d402201dcce..bd52934394bd 100644 --- a/pkgs/development/python-modules/notus-scanner/default.nix +++ b/pkgs/development/python-modules/notus-scanner/default.nix @@ -8,7 +8,6 @@ pytestCheckHook, python-gnupg, pythonOlder, - pythonRelaxDepsHook, sentry-sdk, tomli, }: @@ -29,12 +28,12 @@ buildPythonPackage rec { pythonRelaxDeps = [ "packaging" + "psutil" "python-gnupg" ]; build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ paho-mqtt diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index f329a00589d2..478a40150180 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "4.4.0"; + version = "5.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8Lzh6ku2TUQFatqbOb5JIc/WkRPegx/gNnT53DErMuk="; + hash = "sha256-SnmI1/lB1p/zldgn9jIid4yJ5+ubr5mh/IAqXY/1Wbc="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/numba-scipy/default.nix b/pkgs/development/python-modules/numba-scipy/default.nix index d144bf4c9610..05c07632a979 100644 --- a/pkgs/development/python-modules/numba-scipy/default.nix +++ b/pkgs/development/python-modules/numba-scipy/default.nix @@ -6,7 +6,6 @@ numba, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -28,7 +27,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "scipy" diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 2e219e018dd1..4c79076be77f 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -8,6 +8,7 @@ buildPythonPackage, setuptools, numpy, + numpy_2, llvmlite, libcxx, importlib-metadata, @@ -32,9 +33,7 @@ let cudatoolkit = cudaPackages.cuda_nvcc; in buildPythonPackage rec { - # Using an untagged version, with numpy 1.25 support, when it's released - # also drop the versioneer patch in postPatch - version = "0.59.1"; + version = "0.60.0"; pname = "numba"; pyproject = true; @@ -56,7 +55,7 @@ buildPythonPackage rec { # use `forceFetchGit = true;`.` If in the future we'll observe the hash # changes too often, we can always use forceFetchGit, and inject the # relevant strings ourselves, using `sed` commands, in extraPostFetch. - hash = "sha256-4udpgLLHbHNtxPiYVkj+gxAjTWV3ClZOv98Y313/qbc="; + hash = "sha256-hUL281wHLA7wo8umzBNhiGJikyIF2loCzjLECuC+pO0="; }; postPatch = '' @@ -68,16 +67,19 @@ buildPythonPackage rec { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; - nativeBuildInputs = - [ numpy ] - ++ lib.optionals cudaSupport [ - autoAddDriverRunpath - cudaPackages.cuda_nvcc - ]; + build-system = [ + setuptools + numpy_2 + ]; + + nativeBuildInputs = lib.optionals cudaSupport [ + autoAddDriverRunpath + cudaPackages.cuda_nvcc + ]; buildInputs = lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; - propagatedBuildInputs = [ + dependencies = [ numpy llvmlite setuptools diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/1.nix similarity index 100% rename from pkgs/development/python-modules/numpy/default.nix rename to pkgs/development/python-modules/numpy/1.nix diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix new file mode 100644 index 000000000000..6b52b7acec73 --- /dev/null +++ b/pkgs/development/python-modules/numpy/2.nix @@ -0,0 +1,180 @@ +{ + lib, + stdenv, + fetchPypi, + python, + pythonAtLeast, + pythonOlder, + buildPythonPackage, + writeTextFile, + + # build-system + cython, + gfortran, + meson-python, + mesonEmulatorHook, + pkg-config, + xcbuild, + + # native dependencies + blas, + lapack, + + # Reverse dependency + sage, + + # tests + hypothesis, + pytest-xdist, + pytestCheckHook, + setuptools, + typing-extensions, +}: + +assert (!blas.isILP64) && (!lapack.isILP64); + +let + cfg = writeTextFile { + name = "site.cfg"; + text = lib.generators.toINI { } { + ${blas.implementation} = { + include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; + library_dirs = "${blas}/lib:${lapack}/lib"; + runtime_library_dirs = "${blas}/lib:${lapack}/lib"; + libraries = "lapack,lapacke,blas,cblas"; + }; + lapack = { + include_dirs = "${lib.getDev lapack}/include"; + library_dirs = "${lapack}/lib"; + runtime_library_dirs = "${lapack}/lib"; + }; + blas = { + include_dirs = "${lib.getDev blas}/include"; + library_dirs = "${blas}/lib"; + runtime_library_dirs = "${blas}/lib"; + }; + }; + }; +in +buildPythonPackage rec { + pname = "numpy"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchPypi { + inherit pname version; + extension = "tar.gz"; + hash = "sha256-z10cnmg3+K+fkra9PobVE83BH2D9YhhcxJ7H0aujSGQ="; + }; + + patches = lib.optionals python.hasDistutilsCxxPatch [ + # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 + # Patching of numpy.distutils is needed to prevent it from undoing the + # patch to distutils. + ./numpy-distutils-C++.patch + ]; + + postPatch = '' + # remove needless reference to full Python path stored in built wheel + substituteInPlace numpy/meson.build \ + --replace-fail 'py.full_path()' "'python'" + ''; + + build-system = + [ + cython + gfortran + meson-python + pkg-config + ] + ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; + + # we default openblas to build with 64 threads + # if a machine has more than 64 threads, it will segfault + # see https://github.com/OpenMathLib/OpenBLAS/issues/2993 + preConfigure = '' + sed -i 's/-faltivec//' numpy/distutils/system_info.py + export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES)) + ''; + + # HACK: copy mesonEmulatorHook's flags to the variable used by meson-python + postConfigure = '' + mesonFlags="$mesonFlags ''${mesonFlagsArray[@]}" + ''; + + buildInputs = [ + blas + lapack + ]; + + preBuild = '' + ln -s ${cfg} site.cfg + ''; + + enableParallelBuilding = true; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + pytest-xdist + setuptools + typing-extensions + ]; + + preCheck = '' + pushd $out + ''; + + postCheck = '' + popd + ''; + + # https://github.com/numpy/numpy/blob/a277f6210739c11028f281b8495faf7da298dbef/numpy/_pytesttester.py#L180 + pytestFlagsArray = [ + "-m" + "not\\ slow" # fast test suite + ]; + + disabledTests = + lib.optionals (pythonAtLeast "3.13") [ + # https://github.com/numpy/numpy/issues/26713 + "test_iter_refcount" + ] + ++ lib.optionals stdenv.isAarch32 [ + # https://github.com/numpy/numpy/issues/24548 + "test_impossible_feature_enable" # AssertionError: Failed to generate error + "test_features" # AssertionError: Failure Detection + "test_new_policy" # AssertionError: assert False + "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded + "test_unary_spurious_fpexception" # AssertionError: Got warnings: [] + "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1 + "test_real" # AssertionError: selectedrealkind(16): expected 10 but got -1 + "test_quad_precision" # AssertionError: selectedrealkind(32): expected 16 but got -1 + "test_big_arrays" # ValueError: array is too big; `arr.size * arr.dtype.itemsize` is larger tha... + "test_multinomial_pvals_float32" # Failed: DID NOT RAISE + ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # AssertionError: (np.int64(0), np.longdouble('9.9999999999999994515e-21'), np.longdouble('3.9696755572509052902e+20'), 'arctanh') + "test_loss_of_precision" + ]; + + passthru = { + # just for backwards compatibility + blas = blas.provider; + blasImplementation = blas.implementation; + inherit cfg; + tests = { + inherit sage; + }; + }; + + meta = { + changelog = "https://github.com/numpy/numpy/releases/tag/v${version}"; + description = "Scientific tools for Python"; + homepage = "https://numpy.org/"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix index 2a170ebe3e44..86185683c4ce 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nutils"; - version = "8.6"; + version = "8.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "evalf"; repo = "nutils"; rev = "refs/tags/v${version}"; - hash = "sha256-vfdb7+jcJ5EuWDoZyRExWEPEWt+lgbzmAL3QhguLtHE="; + hash = "sha256-wxouS0FXrdIhm6nTVBuzkwHceJnZ7f7k8nMFxFsZchE="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 9f5365633104..dc2fd74fbef5 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -3,7 +3,7 @@ blockdiag, fetchFromGitHub, buildPythonPackage, - pynose, + nose, pytestCheckHook, setuptools, pythonOlder, @@ -27,8 +27,11 @@ buildPythonPackage rec { dependencies = [ blockdiag ]; + # tests rely on nose + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ - pynose + nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 36017bb2e1e8..231c14e4ceff 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -8,12 +8,13 @@ python, pythonOlder, substituteAll, + setuptools, }: buildPythonPackage rec { pname = "objgraph"; version = "3.6.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7" || isPyPy; @@ -29,6 +30,10 @@ buildPythonPackage rec { }) ]; + build-system = [ + setuptools + ]; + passthru.optional-dependencies = { ipython = [ graphviz ]; }; diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 5ca36d1c444c..847d45fc823d 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -8,7 +8,6 @@ pyopenssl, python-dateutil, pythonOlder, - pythonRelaxDepsHook, pytz, setuptools, }: @@ -33,7 +32,6 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index b9b961e6c9c4..37980cd904a1 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.3.1"; + version = "16.4.1"; disabled = pythonOlder "3.10"; @@ -46,7 +46,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-AGBLxN4XVP298a2DS14nfpDFbYTCvX3gx/BNVAj0iH8="; + hash = "sha256-C/xyinjiJgwdLHTLqFQApgr7q1gmmWoYBPfAq4iPUi0="; }; patches = [ diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix index 10373acbd436..abe1e5d1cba3 100644 --- a/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -5,7 +5,6 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - pythonRelaxDepsHook, pythonOlder, pytest-asyncio, pytestCheckHook, @@ -37,10 +36,6 @@ buildPythonPackage rec { poetry-core ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - pythonRelaxDeps = [ "pytz" ]; dependencies = [ diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index be36594a57cf..39fb0bf3a4bc 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "3.5.3"; + version = "3.5.4"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-ExW/wSuuLQH6MB9PIXjmHgdUxhqX6AXnKPDe9PJ2T/4="; + hash = "sha256-2ZGzGJaVChd7XQM45qQF4vDw70iCEqxrVQP8lhGNfUg="; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index d825547bd4d5..239a204c0fb4 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "okta"; - version = "2.9.6"; + version = "2.9.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WRWbS8bYUafnvnTKLHlV7YV5410E0jk2UYos2F20A7k="; + hash = "sha256-wW3QiWcyH9byMywsRAdWLulFUagouWM87vMJtQ+q2UE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix index 72fc64e65c5b..f253c73d8899 100644 --- a/pkgs/development/python-modules/oletools/default.nix +++ b/pkgs/development/python-modules/oletools/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "oletools"; - version = "0.60.1"; + version = "0.60.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "decalage2"; repo = pname; rev = "v${version}"; - hash = "sha256-H3oL8sk2r267wV0hoHOq9r9DY2Atxs+hZUVb6tmHy0w="; + hash = "sha256-ons1VeWStxUZw2CPpnX9p5I3Q7cMhi34JU8TeuUDt+Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index fcfe04192262..33433bc17ac9 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -9,7 +9,6 @@ pytest-httpserver, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -35,7 +34,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ httpx ]; diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index d4257e4489d8..082d0e0a313a 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, cmake, fetchFromGitHub, - fetchpatch, gtest, nbval, numpy, @@ -26,7 +25,7 @@ let in buildPythonPackage rec { pname = "onnx"; - version = "1.15.0"; + version = "1.16.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -35,19 +34,10 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Jzga1IiUO5LN5imSUmnbsjYtapRatTihx38EOUjm9Os="; + hash = "sha256-I1wwfn91hdH3jORIKny0Xc73qW2P04MjkVCgcaNnQUE="; }; - patches = [ - ./1.15.0-CVE-2024-27318.patch - (fetchpatch { - name = "CVE-2024-27319.patch"; - url = "https://github.com/onnx/onnx/commit/08a399ba75a805b7813ab8936b91d0e274b08287.patch"; - hash = "sha256-9X92N9i/hpQjDGe4I/C+FwUcTUTtP2Nf7+pcTA2sXoA="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ cmake pybind11 ]; @@ -56,10 +46,11 @@ buildPythonPackage rec { abseil-cpp protobuf google-re2 + gtestStatic pillow ]; - propagatedBuildInputs = [ + dependencies = [ protobuf_21 protobuf numpy diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix index 612e76354a00..b7475fd5b480 100644 --- a/pkgs/development/python-modules/onnxruntime/default.nix +++ b/pkgs/development/python-modules/onnxruntime/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, autoPatchelfHook, - pythonRelaxDepsHook, onnxruntime, coloredlogs, numpy, @@ -36,7 +35,7 @@ buildPythonPackage { chmod +w dist ''; - nativeBuildInputs = [ pythonRelaxDepsHook ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; # This project requires fairly large dependencies such as sympy which we really don't always need. pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/opcua-widgets/default.nix b/pkgs/development/python-modules/opcua-widgets/default.nix index 4d0ff49f2cce..371118f677d0 100644 --- a/pkgs/development/python-modules/opcua-widgets/default.nix +++ b/pkgs/development/python-modules/opcua-widgets/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Common widgets for opcua-modeler og opcua-client-gui"; homepage = "https://github.com/FreeOpcUa/opcua-widgets"; license = licenses.gpl3Only; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/open-interpreter/default.nix b/pkgs/development/python-modules/open-interpreter/default.nix index 726a312b38e2..0fd3600d5d3e 100644 --- a/pkgs/development/python-modules/open-interpreter/default.nix +++ b/pkgs/development/python-modules/open-interpreter/default.nix @@ -3,7 +3,6 @@ fetchFromGitHub, buildPythonPackage, pythonOlder, - pythonRelaxDepsHook, poetry-core, appdirs, @@ -50,7 +49,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openai-triton/bin.nix b/pkgs/development/python-modules/openai-triton/bin.nix index ef95ac07244a..bdf722bbc0fc 100644 --- a/pkgs/development/python-modules/openai-triton/bin.nix +++ b/pkgs/development/python-modules/openai-triton/bin.nix @@ -13,7 +13,6 @@ autoPatchelfHook, filelock, lit, - pythonRelaxDepsHook, zlib, }: @@ -34,13 +33,13 @@ buildPythonPackage rec { pythonRemoveDeps = [ "cmake" + # torch and triton refer to each other so this hook is included to mitigate that. "torch" ]; buildInputs = [ zlib ]; nativeBuildInputs = [ - pythonRelaxDepsHook # torch and triton refer to each other so this hook is included to mitigate that. autoPatchelfHook ]; diff --git a/pkgs/development/python-modules/openai-triton/default.nix b/pkgs/development/python-modules/openai-triton/default.nix index d1aaed52052d..a9955f1d83d0 100644 --- a/pkgs/development/python-modules/openai-triton/default.nix +++ b/pkgs/development/python-modules/openai-triton/default.nix @@ -7,7 +7,6 @@ fetchpatch, setuptools, pytestCheckHook, - pythonRelaxDepsHook, cmake, ninja, pybind11, @@ -91,8 +90,7 @@ buildPythonPackage rec { --replace "include (\''${CMAKE_CURRENT_SOURCE_DIR}/googletest.cmake)" ""\ --replace "include(GoogleTest)" "find_package(GTest REQUIRED)" - cat << \EOF > python/triton/common/build.py - + cat << \EOF >> python/triton/common/build.py def libcuda_dirs(): return [ "${addDriverRunpath.driverLink}/lib" ] EOF @@ -105,7 +103,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - pythonRelaxDepsHook # pytestCheckHook # Requires torch (circular dependency) and probably needs GPUs: cmake ninja diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 88e876035d7b..82094bf7923c 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.35.5"; + version = "1.35.9"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-vtqqINwO08olJuynsFtsW7Kp8ikZI6tsZHZWnjTfitM="; + hash = "sha256-THsA284Z/LRQ3GJLnAR5GtFJUYw6EJJZzcFTsiCKxaY="; }; build-system = [ diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 15b02bf4bd10..61c4d891bbef 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -20,7 +20,7 @@ parse, poetry-core, pytest-aiohttp, - pytest7CheckHook, + pytestCheckHook, pythonOlder, responses, requests, @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.19.0"; + version = "0.19.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-+YYcSNX717JjVHMk4Seb145iq9/rQZEVQn27Ulk1A3E="; + hash = "sha256-6FFJsXObIA9tchTJJmoSu9u+/ZuKuw29AYsLEmvHXrY="; }; postPatch = '' @@ -82,7 +82,7 @@ buildPythonPackage rec { nativeCheckInputs = [ httpx pytest-aiohttp - pytest7CheckHook + pytestCheckHook responses webob ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); diff --git a/pkgs/development/python-modules/openhomedevice/default.nix b/pkgs/development/python-modules/openhomedevice/default.nix index 3c53f5f58322..b08b23905ce8 100644 --- a/pkgs/development/python-modules/openhomedevice/default.nix +++ b/pkgs/development/python-modules/openhomedevice/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "openhomedevice"; - version = "2.2"; + version = "2.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bazwilliams"; repo = "openhomedevice"; rev = "refs/tags/${version}"; - hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw="; + hash = "sha256-q8UG+PYtJ7lLlnw2Rt5O/SxOrUtYmwO1cEG1WocaQ7M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/openllm-core/default.nix b/pkgs/development/python-modules/openllm-core/default.nix index 928a47a43d75..1da77dee3242 100644 --- a/pkgs/development/python-modules/openllm-core/default.nix +++ b/pkgs/development/python-modules/openllm-core/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, accelerate, attrs, bitsandbytes, @@ -19,13 +18,14 @@ mypy-extensions, orjson, peft, + pydantic, transformers, typing-extensions, }: buildPythonPackage rec { pname = "openllm-core"; - version = "0.4.44"; + version = "0.5.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,18 +34,17 @@ buildPythonPackage rec { owner = "bentoml"; repo = "OpenLLM"; rev = "refs/tags/v${version}"; - hash = "sha256-kRR715Vnt9ZAmxuWvtH0z093crH0JFrEKPtbjO3QMRc="; + hash = "sha256-sEZLszzoo39WUnziHGp7zWNO0YaqkXeXAoIxvyhw42w="; }; sourceRoot = "${src.name}/openllm-core"; - nativeBuildInputs = [ pythonRelaxDepsHook ]; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "hatch-vcs==0.3.0" "hatch-vcs" \ - --replace-fail "hatchling==1.18.0" "hatchling" \ - --replace-fail "hatch-fancy-pypi-readme==23.1.0" "hatch-fancy-pypi-readme" + --replace-fail "hatch-vcs==" "hatch-vcs>=" \ + --replace-fail "hatchling==" "hatchling>=" \ + --replace-fail "hatch-fancy-pypi-readme==" "hatch-fancy-pypi-readme>=" ''; pythonRelaxDeps = [ "cattrs" ]; @@ -59,6 +58,7 @@ buildPythonPackage rec { dependencies = [ attrs cattrs + pydantic # not listed in pyproject.toml, but required at runtime click-option-group deepmerge diff --git a/pkgs/development/python-modules/openllm/default.nix b/pkgs/development/python-modules/openllm/default.nix index 6ed4db129e58..5d5af060d846 100644 --- a/pkgs/development/python-modules/openllm/default.nix +++ b/pkgs/development/python-modules/openllm/default.nix @@ -6,7 +6,6 @@ hatchling, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, accelerate, bentoml, bitsandbytes, @@ -54,7 +53,6 @@ buildPythonPackage rec { sourceRoot = "${src.name}/openllm-python"; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRemoveDeps = [ # remove cuda-python as it has an unfree license diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix index dafc633a5632..a73c319fd10b 100644 --- a/pkgs/development/python-modules/opensearch-py/default.nix +++ b/pkgs/development/python-modules/opensearch-py/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "opensearch-py"; - version = "2.4.2"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "opensearch-project"; repo = "opensearch-py"; rev = "refs/tags/v${version}"; - hash = "sha256-MPuHdjhsrccKYUIDlDYGoXBbBu/V+q43Puf0e5j8vhU="; + hash = "sha256-qpay0EDD99MzxDMkjk3hU/34rxLD71PM8zdcIcHj/0Q="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 8116626b94d8..8fde20af6cbf 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -9,14 +9,13 @@ opentelemetry-test-utils, setuptools, pytestCheckHook, - pythonRelaxDepsHook, writeScript, }: let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.24.0"; + version = "1.25.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,12 +25,11 @@ let owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${version}"; - hash = "sha256-id5cwNl2idgZa1AFfolzEo5vzspv3V2c1Vtzg3EWDZs="; + hash = "sha256-9mxgPYliGkNsZGOhF9YCmxZjP3hc2UUmxSpWY4IMLCo="; }; sourceRoot = "${src.name}/opentelemetry-api"; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 1068b33036a9..1939a63fa6a1 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "0.45b0"; + version = "0.46b0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-snpanTREdvfqpqPI8UWzm55pDK8Q77guqgT8kFULRKU="; + hash = "sha256-BC/RJL4GgC3vGe4bC9mavPNpE+j8ZIkOKCbK4I4LuGQ="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation"; diff --git a/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix b/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix index f4001c4f13b6..ab2db17a4218 100644 --- a/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix +++ b/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, @@ -22,6 +21,8 @@ buildPythonPackage { build-system = [ hatchling ]; + dependencies = [ opentelemetry-api ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "opentelemetry.semconv" ]; diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index 4110e887dc4f..d20bcf4c1f1c 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -51,13 +51,13 @@ in buildPythonPackage rec { pname = "openusd"; - version = "24.03"; + version = "24.05"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenUSD"; rev = "refs/tags/v${version}"; - hash = "sha256-EYf8GhXhsAx0Wxz9ibDZEV4E5scL3GPiu3Nje7N5C/I="; + hash = "sha256-akwLIB5YUbnDiaQXX/K5YLXzWlTYWZG51dtxbSFxPt0="; }; stdenv = if python.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix index 3e6ea255621d..4f7c86d2a481 100644 --- a/pkgs/development/python-modules/opuslib/default.nix +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -4,7 +4,7 @@ fetchpatch, isPy27, libopus, - pynose, + pytestCheckHook, lib, stdenv, substituteAll, @@ -46,7 +46,11 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeCheckInputs = [ pynose ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ + "tests/{decoder,encoder,hl_decoder,hl_encoder}.py" + ]; meta = with lib; { description = "Python bindings to the libopus, IETF low-delay audio codec"; diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index 49bd8f996fc0..7aaef933a66c 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.1.35"; + version = "0.2.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-xLCwjeNDx9RqxlNkIWMo0Pcrg7akGuu4Rv9oRDgOK18="; + hash = "sha256-f0E/7jnzoIrV4V1KSbec0MZB/BLz0UVbBCsc3v4dp0o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/orange-widget-base/default.nix b/pkgs/development/python-modules/orange-widget-base/default.nix index 61d63c17344b..50a1e956919a 100644 --- a/pkgs/development/python-modules/orange-widget-base/default.nix +++ b/pkgs/development/python-modules/orange-widget-base/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "orange-widget-base"; - version = "4.22.0"; + version = "4.24.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-nV2aBPZzn7K+QECtCVoLLh5smG31zE2G9jFTKlxh9qM="; + hash = "sha256-2cBg7s4+qMrb2G4sMk5yednOzJCNheHIQ3lty4KAg18="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index a235fef5f044..146edc07bf06 100644 --- a/pkgs/development/python-modules/orange3/default.nix +++ b/pkgs/development/python-modules/orange3/default.nix @@ -6,7 +6,6 @@ buildPythonPackage, chardet, copyDesktopItems, - pythonRelaxDepsHook, cython, catboost, xgboost, @@ -53,7 +52,7 @@ let self = buildPythonPackage rec { pname = "orange3"; - version = "3.36.2"; + version = "3.37.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -62,7 +61,7 @@ let owner = "biolab"; repo = "orange3"; rev = "refs/tags/${version}"; - hash = "sha256-v9lk5vGhBaR2PHZ+Jq0hy1WaCsbeLe+vZlTaHBkfacU="; + hash = "sha256-3PybiHXH6oIYJb78/a7LnQA6cYUicDx4Mf65QhIhT4w="; }; postPatch = '' @@ -75,7 +74,6 @@ let nativeBuildInputs = [ copyDesktopItems - pythonRelaxDepsHook oldest-supported-numpy cython qt5.wrapQtAppsHook diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index aa5a5572dec9..e3140c40c4f8 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -2,10 +2,13 @@ lib, absl-py, buildPythonPackage, - cached-property, + + # build-system + flit-core, + + # dependencies etils, fetchPypi, - flit-core, importlib-resources, jax, jaxlib, @@ -13,17 +16,21 @@ nest-asyncio, numpy, protobuf, - pytest-xdist, - pytestCheckHook, - pythonOlder, pyyaml, tensorstore, typing-extensions, + + # checks + google-cloud-logging, + mock, + pytest-xdist, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.5.9"; + version = "0.5.20"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,14 +38,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "orbax_checkpoint"; inherit version; - hash = "sha256-H96IkUM3IxV79uddNBCU0dq+0dvPx8/Ps4HeCItGi2A="; + hash = "sha256-V91BdeaYqMSVeZGrfmwZ17OoeSrnByuc0rJnzls0iE0="; }; build-system = [ flit-core ]; dependencies = [ absl-py - cached-property etils importlib-resources jax @@ -53,6 +59,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + google-cloud-logging + mock pytest-xdist pytestCheckHook ]; @@ -68,11 +76,11 @@ buildPythonPackage rec { "orbax/checkpoint/utils_test.py" ]; - meta = with lib; { + meta = { description = "Orbax provides common utility libraries for JAX users"; homepage = "https://github.com/google/orbax/tree/main/checkpoint"; changelog = "https://github.com/google/orbax/blob/${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 5bb2acb5dfd8..c1d58c0a1c54 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.10.3"; + version = "3.10.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,13 +40,13 @@ buildPythonPackage rec { owner = "ijl"; repo = "orjson"; rev = "refs/tags/${version}"; - hash = "sha256-bK6wA8P/IXEbiuJAx7psd0nUUKjR1jX4scFfJr1MBAk="; + hash = "sha256-Q2zi3mNgCFrg7Ucana0+lmR9C9kkuUidEJj8GneR2W4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-ilGq+/gPSuNwURUWy2ZxInzmUv+PxYMxd8esxrMpr2o="; + hash = "sha256-yhLKw4BhdIHgcu4iVlXQlHk/8J+3NK6LlmSWbm/5y4Q="; }; maturinBuildFlags = [ "--interpreter ${python.executable}" ]; diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index 2400ed2b223f..a2ef75c52bb1 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -21,14 +21,13 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, sqlalchemy, typing-extensions, }: buildPythonPackage rec { pname = "ormar"; - version = "0.12.2"; + version = "0.20.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -37,7 +36,7 @@ buildPythonPackage rec { owner = "collerek"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Yd5ex0bcy61zq5Sn2dKeb98s/CMxUWnyGx6jFWQ3RUs="; + hash = "sha256-DzvmJpWJANIoc5lvWAD0b2bhbKdDEpNL2l3TqXSZSnc="; }; pythonRelaxDeps = [ @@ -48,7 +47,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index 96533b823651..0b083f5d2be7 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "osc"; - version = "1.7.0"; + version = "1.8.0"; format = "setuptools"; src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; rev = version; - hash = "sha256-ze5mgFU3jc+hB1W2ayj4i2dBFJ0CXsZULzbdFMz3G3Y="; + hash = "sha256-YYcTZ4TB/wDl+T3yF5n2Wp0r4v8eWCTO2fjv/ygicmM="; }; buildInputs = [ bashInteractive ]; # needed for bash-completion helper diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index b812207a5abb..d5573a7db850 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "7.1.0"; + version = "7.2.0"; pyproject = true; src = fetchPypi { pname = "oslo.utils"; inherit version; - hash = "sha256-XkLzOU0fH5duiZSsSgkYlm0vfq98dzgN1hLEpBSN2Y4="; + hash = "sha256-lPgFM5GjNQLatNhEZUAyYsoZ/9jP0poaXqPIqmIO9hA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 5a47de257846..d3dbb48df72f 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -9,7 +9,6 @@ oldest-supported-numpy, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, qdldl, scipy, setuptools-scm, @@ -33,7 +32,6 @@ buildPythonPackage rec { cmake oldest-supported-numpy setuptools-scm - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "scipy" ]; diff --git a/pkgs/development/python-modules/oss2/default.nix b/pkgs/development/python-modules/oss2/default.nix index 79c0b50e2235..374f526b57f5 100644 --- a/pkgs/development/python-modules/oss2/default.nix +++ b/pkgs/development/python-modules/oss2/default.nix @@ -10,7 +10,6 @@ pycryptodome, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, six, }: @@ -29,7 +28,6 @@ buildPythonPackage rec { hash = "sha256-jDSXPVyy8XvPgsGZXsdfavFPptq28pCwr9C63OZvNrY="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ requests diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index 833b22995af5..940f5a20b342 100644 --- a/pkgs/development/python-modules/ossfs/default.nix +++ b/pkgs/development/python-modules/ossfs/default.nix @@ -6,7 +6,6 @@ fsspec, oss2, pythonOlder, - pythonRelaxDepsHook, setuptools-scm, }: @@ -31,7 +30,6 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools-scm ]; diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix index 6f7ee0ee37a0..b7e51351f7ef 100644 --- a/pkgs/development/python-modules/outlines/default.nix +++ b/pkgs/development/python-modules/outlines/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "outlines"; - version = "0.0.38"; + version = "0.0.45"; pyproject = true; src = fetchFromGitHub { owner = "outlines-dev"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kOd2J6PV2idWaltkGUVNXfB+1dNU1f8vbnHQ5i1WxG8="; + hash = "sha256-VJ/q3NBNatBv3gsV637sciiOHdDJRnMlcisu5GRmWM0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index 1f741962c902..f1cfb0536739 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ovh"; - version = "1.1.0"; + version = "1.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EI+bWjtHEZPOSkWJx3gvS8y//gugMWl3TrBHKsKO9nk="; + hash = "sha256-Yarx6ymS/Vr4Gbpa3Qgmbp7eLgAkUeOhYGpMNn3aoE8="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index 1946c3087fbf..8ce0a1ed4020 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -9,14 +9,15 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.15.0"; + version = "0.15.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-8hmyzmNIGFonvWpy5v3J+YTmyfoVfv+ny5PjQcSc3MI="; + pname = "packageurl_python"; + inherit version; + hash = "sha256-mje5p8rZoocrRhIVG6N0n9neyQSFV3wU03S25mt+3wM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 58327bc57543..4ddebe8901df 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -15,14 +15,14 @@ let packaging = buildPythonPackage rec { pname = "packaging"; - version = "24.0"; + version = "24.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-64LF4+ViCQdHZuaIW7BLjDigwBXQowA26+fs40yZiek="; + hash = "sha256-Am7XLI7T/M5b+JUFciWGmJJ/0dvaEKXpgc3wrDf08AI="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/paddle2onnx/default.nix b/pkgs/development/python-modules/paddle2onnx/default.nix index 34278879ddd8..ee429fb164d0 100644 --- a/pkgs/development/python-modules/paddle2onnx/default.nix +++ b/pkgs/development/python-modules/paddle2onnx/default.nix @@ -9,7 +9,7 @@ }: let pname = "paddle2onnx"; - version = "1.2.0"; + version = "1.2.4"; format = "wheel"; pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}"; src = fetchPypi { @@ -18,7 +18,7 @@ let python = pyShortVersion; abi = pyShortVersion; platform = "manylinux_2_12_x86_64.manylinux2010_x86_64"; - hash = "sha256-18eStagm7V4D87fiPoigAyXxVGoo//8UENutSqNfUBI="; + hash = "sha256-2muP4Y1zvqYVxvN6I9wjdMY+YE2d0nRmIwFFI/BsIKE="; }; in buildPythonPackage { diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix index c263fce2c649..8033d8c79e6d 100644 --- a/pkgs/development/python-modules/paddleocr/default.nix +++ b/pkgs/development/python-modules/paddleocr/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonRelaxDepsHook, fetchFromGitHub, attrdict, beautifulsoup4, @@ -29,7 +28,7 @@ }: let - version = "2.7.1"; + version = "2.7.5"; in buildPythonPackage { pname = "paddleocr"; @@ -39,8 +38,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "PaddlePaddle"; repo = "PaddleOCR"; - rev = "v${version}"; - hash = "sha256-5Dt4UL+7dwJNjcNnCVi3o8bLCt7/m/M6oh1vPu9rza8="; + rev = "refs/tags/v${version}"; + hash = "sha256-8mnSV4ga6G2cbYCX84XJRFiLCoXstTAtqvg9QqVN6GI="; }; patches = [ @@ -55,7 +54,6 @@ buildPythonPackage { ./remove-import-imaug.patch ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; # trying to relax only pymupdf makes the whole build fail pythonRelaxDeps = true; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/paho-mqtt/1.nix b/pkgs/development/python-modules/paho-mqtt/1.nix new file mode 100644 index 000000000000..83582102767b --- /dev/null +++ b/pkgs/development/python-modules/paho-mqtt/1.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + isPy3k, + pytestCheckHook, + mock, + six, +}: + +buildPythonPackage rec { + pname = "paho-mqtt"; + version = "1.6.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "eclipse"; + repo = "paho.mqtt.python"; + rev = "v${version}"; + hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; + }; + + nativeCheckInputs = [ + pytestCheckHook + six + ] ++ lib.optionals (!isPy3k) [ mock ]; + + doCheck = !stdenv.isDarwin; + + pythonImportsCheck = [ "paho.mqtt" ]; + + meta = with lib; { + description = "MQTT version 3.1.1 client class"; + homepage = "https://eclipse.org/paho"; + license = licenses.epl10; + maintainers = with maintainers; [ + mog + dotlambda + ]; + }; +} diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index 83582102767b..437aa9884beb 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -2,38 +2,57 @@ lib, stdenv, buildPythonPackage, + pythonOlder, fetchFromGitHub, - isPy3k, + hatchling, pytestCheckHook, - mock, - six, }: -buildPythonPackage rec { +let + testing = fetchFromGitHub { + owner = "eclipse"; + repo = "paho.mqtt.testing"; + rev = "a4dc694010217b291ee78ee13a6d1db812f9babd"; + hash = "sha256-SQoNdkWMjnasPjpXQF2yV97MUra8gb27pc3rNoA8Rjw="; + }; +in buildPythonPackage rec { pname = "paho-mqtt"; - version = "1.6.1"; - format = "setuptools"; + version = "2.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.python"; rev = "v${version}"; - hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; + hash = "sha256-VMq+WTW+njK34QUUTE6fR2j2OmHxVzR0wrC92zYb1rY="; }; + build-system = [ + hatchling + ]; + nativeCheckInputs = [ pytestCheckHook - six - ] ++ lib.optionals (!isPy3k) [ mock ]; + ]; doCheck = !stdenv.isDarwin; pythonImportsCheck = [ "paho.mqtt" ]; + preCheck = '' + ln -s ${testing} paho.mqtt.testing + + # paho.mqtt not in top-level dir to get caught by this + export PYTHONPATH=".:$PYTHONPATH" + ''; + meta = with lib; { - description = "MQTT version 3.1.1 client class"; + changelog = "https://github.com/eclipse/paho.mqtt.python/blob/${src.rev}/ChangeLog.txt"; + description = "MQTT version 5.0/3.1.1 client class"; homepage = "https://eclipse.org/paho"; - license = licenses.epl10; + license = licenses.epl20; maintainers = with maintainers; [ mog dotlambda diff --git a/pkgs/development/python-modules/pallets-sphinx-themes/default.nix b/pkgs/development/python-modules/pallets-sphinx-themes/default.nix index a021db9db307..bba0de1f208f 100644 --- a/pkgs/development/python-modules/pallets-sphinx-themes/default.nix +++ b/pkgs/development/python-modules/pallets-sphinx-themes/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pallets-sphinx-themes"; - version = "2.1.1"; + version = "2.1.3"; format = "setuptools"; src = fetchFromGitHub { owner = "pallets"; repo = "pallets-sphinx-themes"; rev = "refs/tags/${version}"; - sha256 = "sha256-Z03rsqkwF2rYaqRZflf5qc5EdHPIEcEcB1ftYIm5DQs="; + sha256 = "sha256-uXSejJLVmYpzRCP92JQKHosnlx7dgZlFf5XzbxOfvII="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/panasonic-viera/default.nix b/pkgs/development/python-modules/panasonic-viera/default.nix index aff9ad947807..6cbdd76236d5 100644 --- a/pkgs/development/python-modules/panasonic-viera/default.nix +++ b/pkgs/development/python-modules/panasonic-viera/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + poetry-core, aiohttp, pycryptodome, xmltodict, @@ -9,17 +10,18 @@ buildPythonPackage rec { pname = "panasonic-viera"; - version = "0.4.0"; - - format = "setuptools"; + version = "0.4.2"; + pyproject = true; src = fetchPypi { pname = "panasonic_viera"; inherit version; - sha256 = "baad2db7958ddbc7288d0f1c50a9eeddd8b83f3d30ad14ac3f6c51fe953e0eb6"; + hash = "sha256-gcFAFwEdCqiC1yHIA2B/gzmwvRwMC9fDxkgCbzIOpjM="; }; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ aiohttp pycryptodome xmltodict diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 93ac3fe7771c..3323c5c9a83b 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -66,7 +66,7 @@ let pandas = buildPythonPackage rec { pname = "pandas"; - version = "2.2.1"; + version = "2.2.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -75,14 +75,15 @@ let owner = "pandas-dev"; repo = "pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-eyVUIYG0KCAEJbh/qZiEjGpdXq7A+2Lab+5bp+7t4cw="; + hash = "sha256-+zQKrsJmP3FJeOiYwNH1u96+/ECDHQF39evzur3cKjc="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "Cython==3.0.5" "Cython>=3.0.5" \ --replace-fail "meson-python==0.13.1" "meson-python>=0.13.1" \ - --replace-fail "meson==1.2.1" "meson>=1.2.1" + --replace-fail "meson==1.2.1" "meson>=1.2.1" \ + --replace-fail "numpy>=2.0.0rc1" "numpy" ''; nativeBuildInputs = diff --git a/pkgs/development/python-modules/pandoc-xnos/default.nix b/pkgs/development/python-modules/pandoc-xnos/default.nix index c41e2811ae31..af8c05f9a9eb 100644 --- a/pkgs/development/python-modules/pandoc-xnos/default.nix +++ b/pkgs/development/python-modules/pandoc-xnos/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; + pythonRelaxDeps = [ "psutil" ]; + propagatedBuildInputs = [ pandocfilters psutil diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index ddf9e6d69f6d..f034d572b3b6 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonRelaxDepsHook, bleach, bokeh, param, @@ -31,7 +30,6 @@ buildPythonPackage rec { python = "py3"; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "bokeh" ]; diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 6ab9af132478..76c6fdc51a5d 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.20.1"; + version = "1.20.2"; format = "pyproject"; src = fetchFromGitHub { owner = "r1chardj0n3s"; repo = "parse"; rev = "refs/tags/${version}"; - hash = "sha256-FAAs39peR+Ibv0RKLrcnY2w0Z2EjVYyZ8U4HcbjTiew="; + hash = "sha256-i/H3E/Z8vqt2jLS8BaVHJuD2Fbi7TP7EeOjXAJ16bWg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 6b3044636fee..7dd87d5f6af4 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -28,7 +28,6 @@ opensearch-py, publicsuffixlist, pythonOlder, - pythonRelaxDepsHook, requests, tqdm, xmltodict, @@ -42,19 +41,18 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "8.11.0"; + version = "8.12.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OBxiaXB8NKNMviRI19rYYJxpnfnaEL3zSPmYB4urIug="; + hash = "sha256-mscc3TRMYuaTqrrxGPCVVKa2fg5sXwK/BglpbvLXbLc="; }; nativeBuildInputs = [ hatchling - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix index 457456c678bf..1c0f6a521ad8 100644 --- a/pkgs/development/python-modules/parsel/default.nix +++ b/pkgs/development/python-modules/parsel/default.nix @@ -9,13 +9,14 @@ psutil, pytestCheckHook, pythonOlder, + setuptools, w3lib, }: buildPythonPackage rec { pname = "parsel"; version = "1.9.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,12 +25,9 @@ buildPythonPackage rec { hash = "sha256-FOANwHcxyQMNtiDBlfyuiEtbSEjp+cUjxhGfcIzPqaw="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner",' "" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cssselect jmespath lxml @@ -47,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to extract data from HTML and XML using XPath and CSS selectors"; homepage = "https://github.com/scrapy/parsel"; + changelog = "https://github.com/scrapy/parsel/blob/v${version}/NEWS"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/parts/default.nix b/pkgs/development/python-modules/parts/default.nix index 1df8298ba68f..5f942a17c58f 100644 --- a/pkgs/development/python-modules/parts/default.nix +++ b/pkgs/development/python-modules/parts/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "parts"; - version = "1.7.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TbcFgWKKgHXFyi1NqwVy1ITGHESb4ZusivOpFWazN1s="; + hash = "sha256-wQgiwr7iOBvy24/w1C311PivWLtXLD/Djs34zo1Zid4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pathy/default.nix b/pkgs/development/python-modules/pathy/default.nix index 07e55245b385..3e384c62a98a 100644 --- a/pkgs/development/python-modules/pathy/default.nix +++ b/pkgs/development/python-modules/pathy/default.nix @@ -6,7 +6,6 @@ pathlib-abc, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, setuptools, smart-open, typer, @@ -24,7 +23,6 @@ buildPythonPackage rec { hash = "sha256-uz0OawuL92709jxxkeluCvLtZcj9tfoXSI+ch55jcG0="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "smart-open" ]; diff --git a/pkgs/development/python-modules/pcffont/default.nix b/pkgs/development/python-modules/pcffont/default.nix index 0f5a49c0692f..db83e7f9c5e2 100644 --- a/pkgs/development/python-modules/pcffont/default.nix +++ b/pkgs/development/python-modules/pcffont/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pcffont"; - version = "0.0.14"; + version = "0.0.15"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pcffont"; inherit version; - hash = "sha256-S3mK4tY7zNGRX8K81QJVvaYpIaTDLx5zn4vKbhrK9VM="; + hash = "sha256-sJWopdjZ0vM0BrdBgc6XZsDGFN7/NCCBqrCyYCRhT3M="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pdb2pqr/default.nix b/pkgs/development/python-modules/pdb2pqr/default.nix index da3e3e0c2f06..e082eab102ba 100644 --- a/pkgs/development/python-modules/pdb2pqr/default.nix +++ b/pkgs/development/python-modules/pdb2pqr/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pythonOlder, - pythonRelaxDepsHook, mmcif-pdbx, numpy, propka, @@ -26,7 +25,6 @@ buildPythonPackage rec { hash = "sha256-He301TJ1bzWub0DZ6Ro/Xc+JMtJBbyygVpWjPY6RMbA="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "docutils" ]; diff --git a/pkgs/development/python-modules/pdf2docx/default.nix b/pkgs/development/python-modules/pdf2docx/default.nix index e8a3f7e41634..af91594808b5 100644 --- a/pkgs/development/python-modules/pdf2docx/default.nix +++ b/pkgs/development/python-modules/pdf2docx/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, python, buildPythonPackage, - pythonRelaxDepsHook, imagemagick, pip, pytestCheckHook, @@ -33,7 +32,6 @@ buildPythonPackage { nativeBuildInputs = [ pip - pythonRelaxDepsHook imagemagick ]; diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index 714dff4c5a52..889c36936afc 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.3.0"; + version = "2.3.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-V+NESf7NavR6L6ko4Oh4KhAR2iIN5GiHZPELwvkpr4c="; + hash = "sha256-I1bAjryLDXzlstIHK4cD6/HPJBGGskRUVp7B2PDwXhc="; }; env.PDM_BUILD_SCM_VERSION = version; diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index 43ef11bebd58..c1657025e0a6 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pdoc"; - version = "14.5.0"; + version = "14.5.1"; disabled = pythonOlder "3.8"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-lie+lPUVWVgbSGC09gMmy4Z2BdC2CHFYQ60isExvhSk="; + hash = "sha256-YtoY/Sp9r6yIviXFKPYc+N8PjfKX+cZxtCZmR6fr1Tc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 93bde3408dea..9f77c7546ac1 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, # build-system pdm-backend, @@ -61,7 +60,6 @@ buildPythonPackage rec { nativeBuildInputs = [ pdm-backend - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "unidecode" ]; @@ -105,6 +103,7 @@ buildPythonPackage rec { "test_basic_generation_works" "test_custom_generation_works" "test_custom_locale_generation_works" + "test_deprecated_attribute" ]; env.LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/persist-queue/default.nix b/pkgs/development/python-modules/persist-queue/default.nix index 4f37222bf446..ac91a7fa4ef0 100644 --- a/pkgs/development/python-modules/persist-queue/default.nix +++ b/pkgs/development/python-modules/persist-queue/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "persist-queue"; - version = "0.8.1"; + version = "1.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4ZONOsbZthaSwRX43crajZox8iUGeCWF45WIpB7Ppao="; + sha256 = "sha256-P/t0aQLTAj/QnrRol2Cf3ubHexZB8Z4vyNmNdEvfyEU="; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index 96d6d796fbdf..cffa4633a117 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -1,35 +1,38 @@ { lib, buildPythonPackage, - cffi, fetchPypi, + isPyPy, + + # build-systems + setuptools, + + # dependencies + cffi, + zope-deferredimport, zope-interface, - sphinx, - manuel, pythonOlder, }: buildPythonPackage rec { pname = "persistent"; - version = "5.2"; - format = "setuptools"; + version = "6.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2+pdH/nbTkUco5vAtCqepTfmyskoKujAeA+4/64+yDQ="; + hash = "sha256-CDZQwP/ty4gDKJY8KUuVEaArawXkIec3p9Vfnu2I+18="; }; - nativeBuildInputs = [ - sphinx - manuel - ]; + build-system = [ setuptools ]; propagatedBuildInputs = [ zope-interface - cffi - ]; + zope-deferredimport + ] + ++ lib.optionals (!isPyPy) [ cffi ]; pythonImportsCheck = [ "persistent" ]; diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index e947ce4a16d1..4abf1e9f092c 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.6.2"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-moH0BtoVAbyGJHh9kvKSUoArgsp/IFhG6+J2NOO+FRQ="; + hash = "sha256-tL+Roe2GHSVm6tIxIWXI6ek8rOMN8Ak2+Xe5ebn497E="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index d8ad4f8b7ea7..2607688f4cf5 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.31.1"; + version = "1.31.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-sREw1MYV3TBi6o/tgUMGSnl4t/5tRPFLciYdQ8jicIc="; + hash = "sha256-HqRs8J2Oygf+fqre/XlR43vuf6vmdd8WTxpXL/swCHY="; }; build-system = [ diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index cd9b32c97b32..8df6d6fc3d90 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.34"; + version = "8.13.39"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fCZ2vge30PdEEeJ14GYDgKDsPuDTWfBw1xlCS9LF9i4="; + hash = "sha256-23yklw0gayBWIxEFMAdTsaWyKfQ0FvjCswEOY/u2jXc="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 2a01d74be69f..38b239651b7c 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.23.1"; + version = "2.24.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xJohROJNAPdEITtM/VncAYL8ASkfgThKy8XXnqiS3hU="; + hash = "sha256-VHtifCC28GKIE+0oz1wMgmZ9G6+rT8nF0PG6tYkhjG8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 5bd009c93438..14ae97ea9686 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "8.14.0"; + version = "9.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-3ORvbhO3eLu/NIE0Lwdf93QtUHUmyMf7LmdMBJpkYIg="; + hash = "sha256-dTEYI3dGu3Q/80lijp0ooApveSL1VWVHwLw7covnYYc="; }; patches = [ @@ -53,12 +53,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "shims_enabled = not cflags_defined" "shims_enabled = False" + --replace-fail "shims_enabled = not cflags_defined" "shims_enabled = False" ''; buildInputs = [ qpdf ]; - nativeBuildInputs = [ + build-system = [ pybind11 setuptools ]; @@ -74,7 +74,7 @@ buildPythonPackage rec { python-xmp-toolkit ]; - propagatedBuildInputs = [ + dependencies = [ deprecated lxml packaging diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index 52acaacfb62a..38ec710a14f4 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -8,7 +8,6 @@ poetry-core, python-dateutil, pythonOlder, - pythonRelaxDepsHook, pyyaml, requests, setuptools, @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "pinecone-client"; - version = "4.1.0"; + version = "4.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,12 +26,11 @@ buildPythonPackage rec { src = fetchPypi { pname = "pinecone_client"; inherit version; - hash = "sha256-QgYqYo56lB0Lwku4r7Am861NJkzwbWpiej3lgyFK494="; + hash = "sha256-sueMKd5QwYDb/nXhXwjIfsGjpPG8ayvh8Myu4atENPo="; }; pythonRelaxDeps = [ "urllib3" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ setuptools diff --git a/pkgs/development/python-modules/pint-pandas/default.nix b/pkgs/development/python-modules/pint-pandas/default.nix index 33a982ce11ec..3e7f18366266 100644 --- a/pkgs/development/python-modules/pint-pandas/default.nix +++ b/pkgs/development/python-modules/pint-pandas/default.nix @@ -3,6 +3,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, setuptools, setuptools-scm, wheel, @@ -13,34 +14,36 @@ buildPythonPackage rec { pname = "pint-pandas"; - version = "0.4"; - format = "pyproject"; + version = "0.6"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "hgrecco"; repo = "pint-pandas"; - rev = version; - hash = "sha256-FuH6wksSCkkL2AyQN46hwTnfeAZFwkWRl6KEEhsxmUY="; + rev = "refs/tags/${version}"; + hash = "sha256-5/Qk6HZlfeKkfSqnVA8aADjJ99SUiurYCqSIUBPFIzc="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm wheel ]; - propagatedBuildInputs = [ + dependencies = [ pint pandas ]; nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { broken = stdenv.isDarwin; description = "Pandas support for pint"; - license = licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://github.com/hgrecco/pint-pandas"; - maintainers = with maintainers; [ doronbehar ]; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index 178e738ed165..51ef03ffc7dd 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -8,11 +8,11 @@ setuptools, setuptools-scm, - # propagates - typing-extensions, + # dependencies appdirs, flexcache, flexparser, + typing-extensions, # tests pytestCheckHook, @@ -25,28 +25,29 @@ buildPythonPackage rec { pname = "pint"; - version = "0.24"; - format = "pyproject"; + version = "0.24.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "hgrecco"; repo = "pint"; rev = "refs/tags/${version}"; - hash = "sha256-zMcLC3SSl/W7+xX4ah3ZV7fN/LIGJzatqH4MNK8/fec="; + hash = "sha256-PQAQvjMi7pFgNhUbw20vc306aTyEbCQNHGef/pxxpXo="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ appdirs flexcache flexparser typing-extensions + # Both uncertainties and numpy are not necessarily needed for every # function of pint, but needed for the pint-convert executable which we # necessarily distribute with this package as it is. @@ -67,12 +68,12 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - meta = with lib; { + meta = { changelog = "https://github.com/hgrecco/pint/blob/${version}/CHANGES"; description = "Physical quantities module"; mainProgram = "pint-convert"; - license = licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://github.com/hgrecco/pint/"; - maintainers = with maintainers; [ doronbehar ]; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 310de7c4c717..058970320f90 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -2,23 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system installShellFiles, - mock, - scripttest, - setuptools, - virtualenv, wheel, - pretend, - pytest, + setuptools, # docs sphinx, + # checks + freezegun, + git, + mock, + scripttest, + virtualenv, + pretend, + proxy-py, + pytestCheckHook, + tomli-w, + werkzeug, + # coupled downsteam dependencies pip-tools, }: -buildPythonPackage rec { +let self = buildPythonPackage rec { pname = "pip"; version = "24.0"; format = "pyproject"; @@ -72,17 +81,21 @@ buildPythonPackage rec { cd .. ''; + doCheck = false; + nativeCheckInputs = [ + freezegun + git mock scripttest virtualenv pretend - pytest + pytestCheckHook + proxy-py + tomli-w + werkzeug ]; - # Pip wants pytest, but tests are not distributed - doCheck = false; - postInstall = '' installManPage docs/build/man/* @@ -94,6 +107,7 @@ buildPythonPackage rec { passthru.tests = { inherit pip-tools; + pytest = self.overridePythonAttrs { doCheck = true; }; }; meta = { @@ -102,4 +116,5 @@ buildPythonPackage rec { homepage = "https://pip.pypa.io/"; changelog = "https://pip.pypa.io/en/stable/news/#v${lib.replaceStrings [ "." ] [ "-" ] version}"; }; -} +}; +in self diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index 916ac250e86f..d3f8f3f43b14 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "1.4.3"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "pypa"; repo = "pipx"; rev = "refs/tags/${version}"; - hash = "sha256-NxXOeVXwBhGqi4DUABV8UV+cDER0ROBFdgiyYTzdvuo="; + hash = "sha256-B57EIUIwy0XG5bnIwxYKgm3WwckdJWWAeUl84mWC1Ds="; }; build-system = [ @@ -77,8 +77,20 @@ buildPythonPackage rec { "legacy_venv" "determination" "json" + "test_auto_update_shared_libs" + "test_cli" + "test_cli_global" + "test_fetch_missing_python" + "test_list_does_not_trigger_maintenance" + "test_list_pinned_packages" "test_list_short" + "test_list_standalone_interpreter" + "test_list_unused_standalone_interpreters" + "test_list_used_standalone_interpreters" + "test_pin" "test_skip_maintenance" + "test_unpin" + "test_unpin_warning" ]; postInstall = '' diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix index e30f7c93d32e..b080d9f6b627 100644 --- a/pkgs/development/python-modules/pixel-font-builder/default.nix +++ b/pkgs/development/python-modules/pixel-font-builder/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pixel-font-builder"; - version = "0.0.25"; + version = "0.0.26"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pixel_font_builder"; inherit version; - hash = "sha256-66mGZ7q64z+tTJSSveD7UCkTq7YXgsHTM25MqUSLfvM="; + hash = "sha256-bgs2FbOA5tcUXe5+KuVztWGAv5yFxQNBaiZMeZ+ic+8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index e0dcda5ff470..589721c4106e 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.10.0"; + version = "1.11.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Xfc4NTmNENt5+O7NXNhrH20pMXWJ6nB5aZTUk5mvYpc="; + hash = "sha256-Lg3KHPTI45ZE7tMkCOqZZu4V4NMkxiuomaOTs8a0Z6o="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pkutils/default.nix b/pkgs/development/python-modules/pkutils/default.nix index a1f87f55e35a..724e991ee143 100644 --- a/pkgs/development/python-modules/pkutils/default.nix +++ b/pkgs/development/python-modules/pkutils/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, nose3, pythonOlder, - pythonRelaxDepsHook, semver, }: @@ -24,7 +23,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "semver" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ semver ]; diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 84150bed715c..5bd7bc2ada3e 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -6,21 +6,25 @@ python-dateutil, urllib3, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "plaid-python"; - version = "21.1.0"; - format = "setuptools"; + version = "23.0.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - hash = "sha256-KZGfr60RclPMis3y/XPY+VMQr0IxGXMwI7tPxNOlmhg="; + pname = "plaid_python"; + inherit version; + hash = "sha256-1/819y1zcjoVwv5ITdvhno/X7piWdO22vYMovupwKXo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ nulltype python-dateutil urllib3 diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index ac812994bc14..977127a694e6 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "4.2.0"; + version = "4.2.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DjRqOIkyhkA3Z1gl2o78R4kp23qJBj+pRmDBld8AbDI="; + hash = "sha256-WsHB+Si8RnJ9b8dYA9m7YRin3UYdJlL1v6/v8SExXtY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index cdbe9b143c2d..42472024e020 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -12,7 +12,7 @@ setuptools, setuptools-scm, playwright-driver, - pythonRelaxDepsHook, + nodejs, }: let @@ -21,7 +21,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.42.0"; + version = "1.44.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; rev = "refs/tags/v${version}"; - hash = "sha256-GfaZ6wMbJShyTTcV9uulmsL8OI/OA+YDMvS2s3ePnjs="; + hash = "sha256-RM04I1QiyJhPvKdAdy8w2GmOOR+BWilxrZ5QUrwxBWA="; }; patches = [ @@ -65,14 +65,14 @@ buildPythonPackage rec { # Set the correct driver path with the help of a patch in patches substituteInPlace playwright/_impl/_driver.py \ - --replace "@driver@" "${driver}/bin/playwright" + --replace-fail "@node@" "${lib.getExe nodejs}" \ + --replace-fail "@driver@" "${driver}/package/cli.js" ''; nativeBuildInputs = [ git setuptools-scm setuptools - pythonRelaxDepsHook ] ++ lib.optionals stdenv.isLinux [ auditwheel ]; pythonRelaxDeps = [ "pyee" ]; diff --git a/pkgs/development/python-modules/playwright/driver-location.patch b/pkgs/development/python-modules/playwright/driver-location.patch index a7f79840c65d..033b785e4eed 100644 --- a/pkgs/development/python-modules/playwright/driver-location.patch +++ b/pkgs/development/python-modules/playwright/driver-location.patch @@ -1,22 +1,22 @@ diff --git a/playwright/_impl/_driver.py b/playwright/_impl/_driver.py -index f3b911f..d00e509 100644 +index 9e8cdc1..7ee382d 100644 --- a/playwright/_impl/_driver.py +++ b/playwright/_impl/_driver.py @@ -23,11 +23,7 @@ from playwright._repo_version import version - def compute_driver_executable() -> Path: -- package_path = Path(inspect.getfile(playwright)).parent -- platform = sys.platform -- if platform == "win32": -- return package_path / "driver" / "playwright.cmd" -- return package_path / "driver" / "playwright.sh" -+ return Path("@driver@") + def compute_driver_executable() -> Tuple[str, str]: +- driver_path = Path(inspect.getfile(playwright)).parent / "driver" +- cli_path = str(driver_path / "package" / "cli.js") +- if sys.platform == "win32": +- return (str(driver_path / "node.exe"), cli_path) +- return (os.getenv("PLAYWRIGHT_NODEJS_PATH", str(driver_path / "node")), cli_path) ++ return "@node@", "@driver@" - if sys.version_info.major == 3 and sys.version_info.minor == 7: + def get_driver_env() -> dict: diff --git a/setup.py b/setup.py -index 3487a6a..05112c2 100644 +index 8709e52..59784dd 100644 --- a/setup.py +++ b/setup.py @@ -141,25 +141,8 @@ class PlaywrightBDistWheelCommand(BDistWheelCommand): diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index e8d6af86ca19..07f6f6813f1c 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -12,7 +12,6 @@ puremagic, pydub, pythonOlder, - pythonRelaxDepsHook, pytz, requests, setuptools, @@ -23,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.24.11"; + version = "1.25.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-aDD+eovq6V7c69ORqekcfmDgTGJqvd2lYMIQ2+9TFYY="; + hash = "sha256-Sm6FfwUxW3t7gLwWd+ZJPyp0VSMPgGpuT3lrMurWOa0="; }; pythonRelaxDeps = [ @@ -44,7 +43,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ aiohttp diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 0e2717c3b2be..15e281911325 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.15.13"; + version = "4.15.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-i898cHYOSrzSreWBmW7W9QBUoyIDKwmt4k2wgutN3bw="; + hash = "sha256-fcKLsx+hCMcY+LE7tHW0oys89MnmnYZndnctGBCiFDk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index 649e00327367..ff03c4a6a533 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pluggy"; - version = "1.4.0"; + version = "1.5.0"; disabled = pythonOlder "3.8"; @@ -20,10 +20,10 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = "pluggy"; rev = "refs/tags/${version}"; - hash = "sha256-1XHJwODmpYQkYZvnZck6RrtT4lOeCf8cr1QFx9DCbzw="; + hash = "sha256-f0DxyZZk6RoYtOEXLACcsOn2B+Hot4U4g5Ogr/hKmOE="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; # To prevent infinite recursion with pytest doCheck = false; diff --git a/pkgs/development/python-modules/plugincode/default.nix b/pkgs/development/python-modules/plugincode/default.nix index 8dda4b7f7f62..9d82132c196b 100644 --- a/pkgs/development/python-modules/plugincode/default.nix +++ b/pkgs/development/python-modules/plugincode/default.nix @@ -38,7 +38,8 @@ buildPythonPackage rec { pytest-xdist ]; - pythonImportsCheck = [ "plugincode" ]; + # wants to read /etc/os-release and crashes because that is not available in the sandbox + # pythonImportsCheck = [ "plugincode" ]; disabledTests = [ # We don't want black as an input diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix index 69559b4ca25e..5fbc757db88b 100644 --- a/pkgs/development/python-modules/plux/default.nix +++ b/pkgs/development/python-modules/plux/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "plux"; - version = "1.5.0"; + version = "1.10.0"; pyproject = true; # Tests are not available from PyPi @@ -18,18 +18,22 @@ buildPythonPackage rec { owner = "localstack"; repo = "plux"; rev = "refs/tags/v${version}"; - hash = "sha256-XHRQTgvxXJCjCD/9Invf/5OCtp12A5poRUv8tR9DJsk="; + hash = "sha256-krlI7WimBluzkw3MVtGeotK5NFf+gsaUfL4CfhNPfpE="; }; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ stevedore ]; + dependencies = [ stevedore ]; nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' + export HOME=$TMPDIR + ''; + pythonImportsCheck = [ "plugin.core" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index f451f39b0852..690a155d056e 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "1.2.0"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qkRnlLLzbYf7C2VjPDjYfllej8an4WftNahPLz/Wkxw="; + hash = "sha256-dhAqDRMRcIYUluYgBlhyPPDZTnLlDrhcAOnT0dHk3Mo="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/polyswarm-api/default.nix b/pkgs/development/python-modules/polyswarm-api/default.nix index 64aa9d27933b..6b45f328598f 100644 --- a/pkgs/development/python-modules/polyswarm-api/default.nix +++ b/pkgs/development/python-modules/polyswarm-api/default.nix @@ -7,7 +7,6 @@ pytestCheckHook, python-dateutil, pythonOlder, - pythonRelaxDepsHook, requests, responses, setuptools, @@ -16,7 +15,7 @@ buildPythonPackage rec { pname = "polyswarm-api"; - version = "3.7.0"; + version = "3.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,12 +24,11 @@ buildPythonPackage rec { owner = "polyswarm"; repo = "polyswarm-api"; rev = "refs/tags/${version}"; - hash = "sha256-zEh8qus/+3mcAaY+SK6FLT6wB6UtGLKPoR1WVZdn9vM="; + hash = "sha256-AH0DJYmZL+EejIkhy97JyekdB6ywf49kka0C2sDbdlY="; }; pythonRelaxDeps = [ "future" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 3aec7fe45c56..ed35b18025ce 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pooch"; - version = "1.8.1"; + version = "1.8.2"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-J+9jCX3ZpuT50mlPXPvy8KXe+kT8yv7AjWAecx10YnA="; + hash = "sha256-dlYfDeaKAdpN9q846ZVcTJ0aXJDac/fkAnalco7IPRA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix index 381bd2bb2193..9d361a3ff11c 100644 --- a/pkgs/development/python-modules/pot/default.nix +++ b/pkgs/development/python-modules/pot/default.nix @@ -3,25 +3,25 @@ autograd, buildPythonPackage, fetchFromGitHub, - cupy, cvxopt, cython, - oldest-supported-numpy, + jax, + jaxlib, matplotlib, numpy, - tensorflow, pymanopt, pytestCheckHook, pythonOlder, scikit-learn, scipy, - enableDimensionalityReduction ? false, - enableGPU ? false, + setuptools, + tensorflow, + torch, }: buildPythonPackage rec { pname = "pot"; - version = "0.9.3"; + version = "0.9.4"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,40 +30,66 @@ buildPythonPackage rec { owner = "PythonOT"; repo = "POT"; rev = "refs/tags/${version}"; - hash = "sha256-fdqDM0V6zTFe1lcqi53ZZNHAfmuR2I7fdX4SN9qeNn8="; + hash = "sha256-Yx9hjniXebn7ZZeqou0JEsn2Yf9hyJSu/acDlM4kCCI="; }; - nativeBuildInputs = [ + build-system = [ + setuptools cython - oldest-supported-numpy - ]; - - propagatedBuildInputs = - [ - numpy - scipy - ] - ++ lib.optionals enableGPU [ cupy ] - ++ lib.optionals enableDimensionalityReduction [ - autograd - pymanopt - ]; - - nativeCheckInputs = [ - cvxopt - matplotlib numpy - tensorflow - scikit-learn - pytestCheckHook ]; + dependencies = [ + numpy + scipy + ]; + + optional-dependencies = { + backend-numpy = [ ]; + backend-jax = [ + jax + jaxlib + ]; + backend-cupy = [ ]; + backend-tf = [ tensorflow ]; + backend-torch = [ torch ]; + cvxopt = [ cvxopt ]; + dr = [ + scikit-learn + pymanopt + autograd + ]; + gnn = [ + torch + # torch-geometric + ]; + plot = [ matplotlib ]; + all = + with optional-dependencies; + ( + backend-numpy + ++ backend-jax + ++ backend-cupy + ++ backend-tf + ++ backend-torch + ++ optional-dependencies.cvxopt + ++ dr + ++ gnn + ++ plot + ); + }; + + nativeCheckInputs = [ pytestCheckHook ]; + postPatch = '' substituteInPlace setup.cfg \ --replace " --cov-report= --cov=ot" "" \ --replace " --durations=20" "" \ --replace " --junit-xml=junit-results.xml" "" + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2.0.0" "numpy" + # we don't need setup.py to find the macos sdk for us sed -i '/sdk_path/d' setup.py ''; @@ -106,8 +132,6 @@ buildPythonPackage rec { "test_emd1d_device_tf" ]; - disabledTestPaths = lib.optionals (!enableDimensionalityReduction) [ "test/test_dr.py" ]; - pythonImportsCheck = [ "ot" "ot.lp" diff --git a/pkgs/development/python-modules/pprintpp/default.nix b/pkgs/development/python-modules/pprintpp/default.nix index cd7e115d5aff..d7da3d5511e8 100644 --- a/pkgs/development/python-modules/pprintpp/default.nix +++ b/pkgs/development/python-modules/pprintpp/default.nix @@ -3,10 +3,9 @@ buildPythonPackage, fetchpatch, fetchPypi, + nose, parameterized, pytestCheckHook, - pynose, - python, pythonOlder, setuptools, }: @@ -39,9 +38,12 @@ buildPythonPackage rec { build-system = [ setuptools ]; + # tests rely on nose + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ + nose parameterized - pynose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix index f523ffce1c82..544681c2c704 100644 --- a/pkgs/development/python-modules/ppscore/default.nix +++ b/pkgs/development/python-modules/ppscore/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, setuptools, pandas, pytestCheckHook, @@ -25,7 +24,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 1dc575d2dc06..f7fd2f5bfca2 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, hatch-vcs, hatchling, - pytest-lazy-fixture, + pytest-lazy-fixtures, pytestCheckHook, pythonOlder, wcwidth, @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "prettytable"; - version = "3.9.0"; + version = "3.10.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "prettytable"; rev = "refs/tags/${version}"; - hash = "sha256-yIO4eO2VdOnUt9qoNQOeq/c0os2LQ3mqAkCOIuoGpyg="; + hash = "sha256-S23nUCA2WTxnCKKKFrtN9HYjP0SHUBPPsVNAc4SYlVg="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wcwidth ]; nativeCheckInputs = [ - pytest-lazy-fixture + pytest-lazy-fixtures pytestCheckHook ]; diff --git a/pkgs/development/python-modules/private-gpt/default.nix b/pkgs/development/python-modules/private-gpt/default.nix index 7012ff5cf5fc..765132c92ba5 100644 --- a/pkgs/development/python-modules/private-gpt/default.nix +++ b/pkgs/development/python-modules/private-gpt/default.nix @@ -42,6 +42,8 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ "fastapi" ]; + dependencies = [ fastapi injector diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index 99ed394c1ffd..3f557c8de242 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, setuptools, }: @@ -15,6 +16,14 @@ buildPythonPackage rec { hash = "sha256-5dV96nFhJR6RytuEvz7MhSdfsSH9R45Xn4AHd7HUJL0="; }; + patches = [ + (fetchpatch { + # Add optional ignore_case param to wait_for_strings + url = "https://github.com/ionelmc/python-process-tests/commit/236c3e83722a36eddb4abb111a2fcceb49cc9ab7.patch"; + hash = "sha256-LbLaDXHbywvsq++lklNiLw8u0USuiEpuxzpNMhXBWtE="; + }) + ]; + nativeBuildInputs = [ setuptools ]; # No tests diff --git a/pkgs/development/python-modules/prometrix/default.nix b/pkgs/development/python-modules/prometrix/default.nix index 850ee8e55be6..52e0621136c7 100644 --- a/pkgs/development/python-modules/prometrix/default.nix +++ b/pkgs/development/python-modules/prometrix/default.nix @@ -11,7 +11,6 @@ poetry-core, prometheus-api-client, pydantic, - pythonRelaxDepsHook, requests, }: @@ -35,7 +34,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ boto3 diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index 77550d1cf121..0a415b1926fe 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.43"; + version = "3.0.47"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - hash = "sha256-NSe3ryYQbLxloEC8yEg5o1ZuwbBRuwv+lTYx5wSw/30="; + hash = "sha256-Hhspy1gICx5p8gfIk6GnvxbRJ6XDDJ0Xolpdd3kuU2A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index fb725723d954..233f71b0a3d9 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "prov"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "b6438f2195ecb9f6e8279b58971e02bc51814599b5d5383366eef91d867422ee"; + sha256 = "sha256-DiOMFAXRpVxyvTmzttc9b3q/2dCn+rLsBpOhmimlYX8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index f1e852930f6b..0b7a69a434fa 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.9.8"; + version = "6.0.0"; format = "setuptools"; inherit stdenv; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-a+Em4yJUht/yhqj7mgYkalJT9MfFO0depfWsk05kGUw="; + hash = "sha256-j6rk8xC22Wn6JsoFRTOLIfc8axXbfEqNk0pUgvqoGPI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/psycopg/ctypes.patch b/pkgs/development/python-modules/psycopg/ctypes.patch index d2b0842b44b4..b3816d9c8d7c 100644 --- a/pkgs/development/python-modules/psycopg/ctypes.patch +++ b/pkgs/development/python-modules/psycopg/ctypes.patch @@ -1,5 +1,5 @@ diff --git a/psycopg/psycopg/pq/_pq_ctypes.py b/psycopg/psycopg/pq/_pq_ctypes.py -index 9ca1d129..02929ab6 100644 +index cfc68672..02929ab6 100644 --- a/psycopg/psycopg/pq/_pq_ctypes.py +++ b/psycopg/psycopg/pq/_pq_ctypes.py @@ -11,14 +11,10 @@ from ctypes import Structure, CFUNCTYPE, POINTER @@ -18,12 +18,15 @@ index 9ca1d129..02929ab6 100644 class FILE(Structure): -@@ -28,9 +24,7 @@ class FILE(Structure): +@@ -28,12 +24,7 @@ class FILE(Structure): FILE_ptr = POINTER(FILE) if sys.platform == "linux": - libcname = ctypes.util.find_library("c") -- assert libcname +- if not libcname: +- # Likely this is a system using musl libc, see the following bug: +- # https://github.com/python/cpython/issues/65821 +- libcname = "libc.so" - libc = ctypes.cdll.LoadLibrary(libcname) + libc = ctypes.cdll.LoadLibrary("@libc@") diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 36ad3e83d342..c98ee99f154e 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -35,13 +35,13 @@ let pname = "psycopg"; - version = "3.1.17"; + version = "3.1.19"; src = fetchFromGitHub { owner = "psycopg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Paq4Wkvv6d6+fNcvRO/yfj7OWCMygqccKIdfsohHUMM="; + hash = "sha256-Fvg67sGWSNwChZTO5QdLSOKrbGfxzQZJqCjI5Jidcqo="; }; patches = [ diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index b9cc815f61d5..24ce03dad657 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "psygnal"; - version = "0.11.0"; + version = "0.11.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LZkYlqplapV2jD5yV5Co8zhGdHP0dqkIAoIj1AFETbA="; + hash = "sha256-eGJWtmw2Ps3jII4T8E6s3djzxfqcSdyPemvejal0cn4="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix index e707086e259c..0cc11d0910a0 100644 --- a/pkgs/development/python-modules/ptyprocess/default.nix +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -26,6 +26,10 @@ buildPythonPackage rec { url = "https://github.com/pexpect/ptyprocess/commit/40c1ccf3432a6787be1801ced721540e34c6cd87.patch"; hash = "sha256-IemngBqBq3QRCmVscWtsuXHiFgvTOJIIB9SyAvsqHd0="; }) + (fetchpatch { + url = "https://github.com/pexpect/ptyprocess/commit/a44312974bd9084aa568d2e18ce5b2a7e0e45983.patch"; + hash = "sha256-DEO4FbzKNAXADYocSQhhwjQTGGu9V5pqd38u1sWhpOI="; + }) ]; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 9d594dbede78..11d5d38fd10a 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,19 +11,19 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.1.20240618"; + version = "1.0.1.20240629"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+wJoH/vCwNPmQlQfikDmnqbNQlMLA315N+U4Yvy/mMw="; + hash = "sha256-WXyE+4SHMDoaG+g+GrDcfgYlQTdOv8IQkrmaxBWNjek="; }; build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { update = [ requests ]; readme = [ pandoc ]; }; @@ -35,6 +35,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "publicsuffixlist/test.py" ]; meta = with lib; { + changelog = "https://github.com/ko-zu/psl/blob/v${version}-gha/CHANGES.md"; description = "Public Suffix List parser implementation"; homepage = "https://github.com/ko-zu/psl"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index c0cba36a76c9..abdc439fd611 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "23.5.2"; + version = "24.4.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-6RHTmOrwU5zzxjtCFzV7UaPRt+SlBgfRWRzytJ9dLGo="; + hash = "sha256-aX7VDn1FLnhniuOOKrk1hDAIvsRIlVKDzQ+zYoZ+MWU="; }; patches = [ diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 9d1da8ffdf18..8d276960ac2e 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "6.38.0"; + version = "6.41.0"; pyproject = true; build-system = [ setuptools ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-sV8Gt8EZ1LPzRbnFoVIWjykiFK04UWQAjuF7hAmJBPk="; + hash = "sha256-7l+m4ULDGa15QNu6l2kURQznKP2Ut9Y1P9njV7s9nzc="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 4abf6f287497..1731d2cd0730 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.10.5"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-I+y59o4L+wLOF+hARLUh+341NYHlOKMfnq0ETs0ZUL0="; + hash = "sha256-iLMcRNwH8ENa8eLV3crAZ+bOFZFyUanycDZvYem9AVs="; }; build-system = [ diff --git a/pkgs/development/python-modules/pwndbg/default.nix b/pkgs/development/python-modules/pwndbg/default.nix index 8862184d9cf7..e4b77db14eab 100644 --- a/pkgs/development/python-modules/pwndbg/default.nix +++ b/pkgs/development/python-modules/pwndbg/default.nix @@ -19,7 +19,6 @@ unicorn, gdb-pt-dump, poetry-core, - pythonRelaxDepsHook, }: let # The newest gdb-pt-dump is incompatible with pwndbg 2024.02.14. @@ -52,7 +51,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/py-pdf-parser/default.nix b/pkgs/development/python-modules/py-pdf-parser/default.nix index 2cc04d82a445..84d2e77d45af 100644 --- a/pkgs/development/python-modules/py-pdf-parser/default.nix +++ b/pkgs/development/python-modules/py-pdf-parser/default.nix @@ -5,7 +5,6 @@ fetchPypi, pdfminer-six, pythonOlder, - pythonRelaxDepsHook, setuptools, wand, }: @@ -24,7 +23,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py-serializable/default.nix b/pkgs/development/python-modules/py-serializable/default.nix index dd7b8dd4312d..b0e0f0284cb4 100644 --- a/pkgs/development/python-modules/py-serializable/default.nix +++ b/pkgs/development/python-modules/py-serializable/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ "defusedxml" ]; + dependencies = [ defusedxml ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index dd18c14f87ea..5a546643e17e 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -10,14 +10,15 @@ buildPythonPackage rec { pname = "py-vapid"; - version = "1.9.0"; + version = "1.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-BmSreJl0LvKyhzl6TUYe9pHtDML1hyBRKNjPYX/9uRk="; + pname = "py_vapid"; + inherit version; + hash = "sha256-/itUYb9Fx7r/EDnfaYHwO4f6qHzeBIKt36NbP+Y2rBs="; }; propagatedBuildInputs = [ cryptography ]; diff --git a/pkgs/development/python-modules/py3buddy/default.nix b/pkgs/development/python-modules/py3buddy/default.nix index 33a5cfc593a3..e076aa3b667e 100644 --- a/pkgs/development/python-modules/py3buddy/default.nix +++ b/pkgs/development/python-modules/py3buddy/default.nix @@ -1,23 +1,24 @@ { lib, - stdenv, + buildPythonPackage, fetchFromGitHub, python, pyusb, }: -stdenv.mkDerivation (finalAttrs: { +buildPythonPackage rec { pname = "py3buddy"; version = "1.0"; + pyproject = false; # manually installed src = fetchFromGitHub { owner = "armijnhemel"; repo = "py3buddy"; - rev = finalAttrs.version; + rev = version; hash = "sha256-KJ0xGEXHY6o2074WFZ0u7gATS+wrrjyzanYretckWYk="; }; - propagatedBuildInputs = [ pyusb ]; + dependencies = [ pyusb ]; dontConfigure = true; dontBuild = true; @@ -40,4 +41,4 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ prusnak ]; }; -}) +} diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index 83b59caaa8b2..1fdad3647bd0 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyamg"; - version = "5.1.0"; + version = "5.2.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-+Q+d55W04pWJ7dLrRG0R3bRmZ46+gj7TKfzzV1nqOQw="; + hash = "sha256-9EnZNCJOUDQB7nLNLuzhop2JO3q+NfYqRNUrqDEZjvo="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix index 661bf3cd3ff4..9f4510785b0f 100644 --- a/pkgs/development/python-modules/pyannote-audio/default.nix +++ b/pkgs/development/python-modules/pyannote-audio/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "pyannote-audio"; - version = "3.1.1"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "pyannote"; repo = "pyannote-audio"; - rev = version; - hash = "sha256-BxmEJE6v+QkEaAJ2oB2LwDQIoRajv6F9SRc8lP9iRLM="; + rev = "refs/tags/${version}"; + hash = "sha256-AFBT6vpOgEIqEn778TWJ04gai7UOyfOeZdmtliYJLvs="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index ed555556f84f..7c7b4b360070 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pyasn1, pytestCheckHook, pythonOlder, @@ -9,29 +10,31 @@ buildPythonPackage rec { pname = "pyasn1-modules"; - version = "0.3.0"; - format = "setuptools"; + version = "0.4.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pyasn1"; - repo = pname; + repo = "pyasn1-modules"; rev = "refs/tags/v${version}"; - hash = "sha256-AAS1VuppCIxgswpLSHFAc6q9cyJBLpdDuU9D1KU13vg="; + hash = "sha256-UJycVfj08+3zjHPji5Qlh3yqeS30dEwu1pyrN1yo1Vc="; }; - propagatedBuildInputs = [ pyasn1 ]; + build-system = [ setuptools ]; + + dependencies = [ pyasn1 ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pyasn1_modules" ]; - meta = with lib; { + meta = { description = "Collection of ASN.1-based protocols modules"; - homepage = "https://github.com/pyasn1/pyasn1-modules"; + homepage = "https://pyasn1.readthedocs.io"; changelog = "https://github.com/pyasn1/pyasn1-modules/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; + license = lib.licenses.bsd2; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 827b797f06fa..77a4b8249d07 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -35,6 +35,8 @@ buildPythonPackage rec { --replace "requests~=2.24" "requests" ''; + pythonRelaxDeps = [ "requests-oauthlib" ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 054eec8fe72e..10667bc2f4f2 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -18,7 +18,6 @@ pytest-httpserver, pytest-timeout, pytestCheckHook, - pythonRelaxDepsHook, pythonAtLeast, pythonOlder, requests, @@ -64,7 +63,6 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index d8f1352137e2..cdb7753119bf 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -14,7 +14,6 @@ sqlalchemy, pytestCheckHook, versioneer, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -33,7 +32,6 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools versioneer ] ++ versioneer.optional-dependencies.toml; diff --git a/pkgs/development/python-modules/pybigwig/default.nix b/pkgs/development/python-modules/pybigwig/default.nix index c53941e8b5df..b82126e5862e 100644 --- a/pkgs/development/python-modules/pybigwig/default.nix +++ b/pkgs/development/python-modules/pybigwig/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "pybigwig"; - version = "0.3.22"; + version = "0.3.23"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "deeptools"; repo = "pyBigWig"; rev = "refs/tags/${version}"; - hash = "sha256-wJC5eXIC9PNlbCtmq671WuoIJVkh3aX7K6WArJWjyFg="; + hash = "sha256-ch9nZrQAnzFQQ62/NF4J51pV4DQAbVq4/f/6LaXf5hM="; }; buildInputs = [ zlib ]; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 408544f42405..b0b766160712 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch2, cmake, ninja, setuptools, @@ -60,6 +61,14 @@ buildPythonPackage rec { hash = "sha256-DVkI5NxM5uME9m3PFYVpJOOa2j+yjL6AJn76fCTv2nE="; }; + patches = [ + (fetchpatch2 { + # https://github.com/pybind/pybind11/pull/5127 + url = "https://github.com/pybind/pybind11/commit/540bef2d2c9fb54fa7c1474ee1af959ce90f2b32.patch"; + hash = "sha256-0ZWlH/5kQ3An/tu6ulOXO2k32asATrr1mlI4nGjIqaI="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "timeout=300" "" diff --git a/pkgs/development/python-modules/pycardano/default.nix b/pkgs/development/python-modules/pycardano/default.nix index 010a030693cb..cc1f79c9b2c5 100644 --- a/pkgs/development/python-modules/pycardano/default.nix +++ b/pkgs/development/python-modules/pycardano/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, # Python deps blockfrost-python, cachetools, @@ -45,7 +44,6 @@ buildPythonPackage rec { hash = "sha256-LP/W8IC2del476fGFq10VMWwMrbAoCCcZOngA8unBM0="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ blockfrost-python diff --git a/pkgs/development/python-modules/pycatch22/default.nix b/pkgs/development/python-modules/pycatch22/default.nix index 0f777bb361af..69b218ec66b0 100644 --- a/pkgs/development/python-modules/pycatch22/default.nix +++ b/pkgs/development/python-modules/pycatch22/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycatch22"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "DynamicsAndNeuralSystems"; repo = "pycatch22"; rev = "refs/tags/v${version}"; - hash = "sha256-l41LLo9k075EL8rV48bwa4Yw12XuqNJSDYtd9kyqS3U="; + hash = "sha256-NvZrjOdC6rV4hwCuGcc2Br/VDhLwZcYpfnNvQpqU134="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pycddl/default.nix b/pkgs/development/python-modules/pycddl/default.nix index cd7f27e0f6e6..b1ffac55aad6 100644 --- a/pkgs/development/python-modules/pycddl/default.nix +++ b/pkgs/development/python-modules/pycddl/default.nix @@ -7,18 +7,19 @@ pytestCheckHook, psutil, cbor2, + hypothesis, }: buildPythonPackage rec { pname = "pycddl"; - version = "0.5.2"; + version = "0.6.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LdecJPSov2Y/QI4MWb20DcF0EtMuDO0VwiQDUeD55GI="; + hash = "sha256-63fe8UJXEH6t4l7ujV8JDvlGb7q3kL6fHHATFdklzFc="; }; nativeBuildInputs = with rustPlatform; [ @@ -41,14 +42,21 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-FJET2Xb1cq4aePFhPXpp2oEPIOtpugYWNFAa2Dj0F6Y="; + hash = "sha256-ssDEKRd3Y9/10oXBZHCxvlRkl9KMh3pGYbCkM4rXThQ="; }; nativeCheckInputs = [ + hypothesis pytestCheckHook psutil cbor2 ]; + + disabledTests =[ + # flaky + "test_memory_usage" + ]; + pythonImportsCheck = [ "pycddl" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index a2798e8199e6..e16ec8a669ab 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -6,7 +6,6 @@ pydantic, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, setuptools, }: @@ -28,7 +27,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ pydantic ]; diff --git a/pkgs/development/python-modules/pycocotools/default.nix b/pkgs/development/python-modules/pycocotools/default.nix index ccca116a7f0a..64f64a51fc58 100644 --- a/pkgs/development/python-modules/pycocotools/default.nix +++ b/pkgs/development/python-modules/pycocotools/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pycocotools"; - version = "2.0.7"; + version = "2.0.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-2ot4FRlu6/Ctq/Z/zEWRJsvGSYu8arH9FEw3FGXYaHk="; + hash = "sha256-jyvO23hromw2ejaA+cTrWyrZ3MsrNOrrIF4KAh4d+40="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 519d14215578..9c6133207a3c 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycodestyle"; - version = "2.11.1"; + version = "2.12.0"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-QboOevyXUt+1PO1UieifgYa+AOWZ5xJmBpW3p1/yZj8="; + hash = "sha256-RC+VAUG09D33Ut0wNRH/3tOgTCtvt/ZZgFdPDDHm55w="; }; pythonImportsCheck = [ "pycodestyle" ]; diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix index 3a1c3efdf3cd..c90aee856a3c 100644 --- a/pkgs/development/python-modules/pycookiecheat/default.nix +++ b/pkgs/development/python-modules/pycookiecheat/default.nix @@ -7,7 +7,6 @@ keyring, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, playwright, setuptools, setuptools-scm, @@ -37,7 +36,6 @@ buildPythonPackage rec { setuptools-scm ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ cryptography diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index a0140aa4c260..427961347646 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -22,9 +22,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bumpalo" @@ -89,9 +89,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "lock_api" @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "memoffset" @@ -126,9 +126,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -155,16 +155,16 @@ checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "pycrdt" -version = "0.8.24" +version = "0.8.31" dependencies = [ "pyo3", "yrs", @@ -244,9 +244,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ "bitflags", ] @@ -265,18 +265,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.200" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -285,9 +285,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -311,9 +311,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.61" +version = "2.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" +checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" dependencies = [ "proc-macro2", "quote", @@ -328,18 +328,18 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", @@ -420,9 +420,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -436,57 +436,57 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "yrs" -version = "0.18.7" +version = "0.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58fbc807677598fedfab76f99f6e1aa5c644411255002b5438ea0ab14672398" +checksum = "da227d69095141c331d9b60c11496d0a3c6505cd9f8e200898b197219e8e394f" dependencies = [ "arc-swap", "atomic_refcell", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 85a994d9f201..3b77a8596228 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -4,25 +4,25 @@ buildPythonPackage, fetchFromGitHub, libiconv, - cargo, rustPlatform, - rustc, + anyio, objsize, pydantic, pytestCheckHook, + trio, y-py, }: buildPythonPackage rec { pname = "pycrdt"; - version = "0.8.24"; + version = "0.8.31"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; rev = "refs/tags/v${version}"; - hash = "sha256-3j5OhjeVE42n4EEOOMUGlQGdnQ/xia0KD543uCMFpCo="; + hash = "sha256-fIpa4ikpeUVb8fucBfFS99zwWSK1GhGAC/QweXDc0Kg="; }; postPatch = '' @@ -32,10 +32,8 @@ buildPythonPackage rec { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; nativeBuildInputs = [ - cargo rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook - rustc ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -43,9 +41,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pycrdt" ]; nativeCheckInputs = [ + anyio objsize pydantic pytestCheckHook + trio y-py ]; diff --git a/pkgs/development/python-modules/pycron/default.nix b/pkgs/development/python-modules/pycron/default.nix index c861dfaa4b37..a5bd2ee07467 100644 --- a/pkgs/development/python-modules/pycron/default.nix +++ b/pkgs/development/python-modules/pycron/default.nix @@ -6,7 +6,6 @@ arrow, delorean, pendulum, - pynose, pytestCheckHook, pytz, udatetime, @@ -30,12 +29,16 @@ buildPythonPackage rec { arrow delorean pendulum - pynose pytestCheckHook pytz udatetime ]; + disabledTestPaths = [ + # depens on nose + "tests/test_has_been.py" + ]; + pythonImportsCheck = [ "pycron" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix index cc9854b46853..b0a84ed3fbdb 100644 --- a/pkgs/development/python-modules/pydantic-core/default.nix +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -18,14 +18,14 @@ let pydantic-core = buildPythonPackage rec { pname = "pydantic-core"; - version = "2.16.3"; + version = "2.18.4"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-core"; rev = "refs/tags/v${version}"; - hash = "sha256-RXytujvx/23Z24TWpvnHdjJ4/dXqjs5uiavUmukaD9A="; + hash = "sha256-wt6HG2jQU09Zxhxhzb49HvNnxahfSk2xvNApVZkqqbw="; }; patches = [ ./01-remove-benchmark-flags.patch ]; @@ -33,7 +33,7 @@ let cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-wj9u6s/3E3EWfQydkLrwHbJBvm8DwcGCoQQpSw1+q7U="; + hash = "sha256-m0xP4fIFgInkUeAy4HqfTKHEiqmWpYO8CgKzxg+WXiU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix index 0a9970552c81..6a9cfaaeb29f 100644 --- a/pkgs/development/python-modules/pydantic-extra-types/default.nix +++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pydantic-extra-types"; - version = "2.6.0"; + version = "2.8.2"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-extra-types"; rev = "refs/tags/v${version}"; - hash = "sha256-XLVhoZ3+TfVYEuk/5fORaGpCBaB5NcuskWhHgt+llS0="; + hash = "sha256-YNr3eKwlPmLpYp0Z4WAOmWNMjta22ZZMuSlONkONxZU="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix index 15685c8c66bc..2d158699724a 100644 --- a/pkgs/development/python-modules/pydantic-settings/default.nix +++ b/pkgs/development/python-modules/pydantic-settings/default.nix @@ -14,7 +14,7 @@ let self = buildPythonPackage rec { pname = "pydantic-settings"; - version = "2.2.1"; + version = "2.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ let owner = "pydantic"; repo = "pydantic-settings"; rev = "refs/tags/v${version}"; - hash = "sha256-4o8LlIFVizoxb484lVT67e24jhtUl49otr1lX/2zZ4M="; + hash = "sha256-1wnTAoF9xi1xLgSWl0FhtIddWPpHgDJPxJlsctJvFQo="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index e9d181b65789..f47c028ac54c 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "2.6.3"; + version = "2.7.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,18 +38,9 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pydantic"; rev = "refs/tags/v${version}"; - hash = "sha256-neTdG/IcXopCmevzFY5/XDlhPHmOb6dhyAnzaobmeG8="; + hash = "sha256-S4FZUnOsKC8J0xyTeXhMmCACCma+VfCSmrE6sYAnpok="; }; - patches = [ - (fetchpatch { - # https://github.com/pydantic/pydantic/pull/8678 - name = "fix-pytest8-compatibility.patch"; - url = "https://github.com/pydantic/pydantic/commit/825a6920e177a3b65836c13c7f37d82b810ce482.patch"; - hash = "sha256-Dap5DtDzHw0jS/QUo5CRI9sLDJ719GRyC4ZNDWEdzus="; - }) - ]; - buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; build-system = [ @@ -81,10 +72,10 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d) substituteInPlace pyproject.toml \ - --replace "'--benchmark-columns', 'min,mean,stddev,outliers,rounds,iterations'," "" \ - --replace "'--benchmark-group-by', 'group'," "" \ - --replace "'--benchmark-warmup', 'on'," "" \ - --replace "'--benchmark-disable'," "" + --replace-fail "'--benchmark-columns', 'min,mean,stddev,outliers,rounds,iterations'," "" \ + --replace-fail "'--benchmark-group-by', 'group'," "" \ + --replace-fail "'--benchmark-warmup', 'on'," "" \ + --replace-fail "'--benchmark-disable'," "" ''; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix index 840784222544..8cb99dd9806f 100644 --- a/pkgs/development/python-modules/pydevd/default.nix +++ b/pkgs/development/python-modules/pydevd/default.nix @@ -6,6 +6,7 @@ setuptools, numpy, psutil, + pytest-xdist, pytestCheckHook, pythonAtLeast, pythonOlder, @@ -34,6 +35,7 @@ buildPythonPackage rec { nativeCheckInputs = [ numpy psutil + pytest-xdist pytestCheckHook trio untangle @@ -66,6 +68,9 @@ buildPythonPackage rec { "test_case_stop_async_iteration_exception" "test_case_unhandled_exception_generator" "test_function_breakpoints_async" + # raise segmentation fault + # https://github.com/fabioz/PyDev.Debugger/issues/269 + "test_evaluate_expression" ] ++ lib.optionals stdenv.isDarwin [ "test_multiprocessing_simple" diff --git a/pkgs/development/python-modules/pydicom-seg/default.nix b/pkgs/development/python-modules/pydicom-seg/default.nix index ecab789fa2a9..9f06d7b44dd0 100644 --- a/pkgs/development/python-modules/pydicom-seg/default.nix +++ b/pkgs/development/python-modules/pydicom-seg/default.nix @@ -5,7 +5,6 @@ fetchpatch, pythonOlder, pytestCheckHook, - pythonRelaxDepsHook, poetry-core, jsonschema, numpy, @@ -41,7 +40,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydiscovergy/default.nix b/pkgs/development/python-modules/pydiscovergy/default.nix index 44f9cfc7c259..919eec4fae1f 100644 --- a/pkgs/development/python-modules/pydiscovergy/default.nix +++ b/pkgs/development/python-modules/pydiscovergy/default.nix @@ -11,7 +11,6 @@ poetry-core, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, pytz, respx, }: @@ -36,7 +35,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ authlib diff --git a/pkgs/development/python-modules/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix index d6e0d6bf9775..1c858f5d0291 100644 --- a/pkgs/development/python-modules/pydy/default.nix +++ b/pkgs/development/python-modules/pydy/default.nix @@ -2,11 +2,12 @@ lib, buildPythonPackage, fetchPypi, + pythonOlder, numpy, scipy, sympy, setuptools, - pynose, + nose, cython, }: @@ -28,8 +29,11 @@ buildPythonPackage rec { sympy ]; + # tests rely on nose + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ - pynose + nose cython ]; diff --git a/pkgs/development/python-modules/pydyf/default.nix b/pkgs/development/python-modules/pydyf/default.nix index 218a3f35f847..d39f36b39e9e 100644 --- a/pkgs/development/python-modules/pydyf/default.nix +++ b/pkgs/development/python-modules/pydyf/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pydyf"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-1bJE6PwkEZznvV1R6i1nc8D/iKqBWX21VrxEDGuIBhA="; + hash = "sha256-NXGUWT769h17SKuXw9WXIhFJNJZ8PfPXh4ym3SWwTDA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyecoforest/default.nix b/pkgs/development/python-modules/pyecoforest/default.nix index de968de3cef6..b0c69a520ade 100644 --- a/pkgs/development/python-modules/pyecoforest/default.nix +++ b/pkgs/development/python-modules/pyecoforest/default.nix @@ -39,6 +39,15 @@ buildPythonPackage rec { respx ]; + disabledTests = [ + # respx.models.AllMockedAssertionError + "test_get" + "test_get_errors" + "test_set_temperature" + "test_set_power" + "test_turn" + ]; + pythonImportsCheck = [ "pyecoforest" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyefergy/default.nix b/pkgs/development/python-modules/pyefergy/default.nix index 2370bd7e6278..47e4e41e624f 100644 --- a/pkgs/development/python-modules/pyefergy/default.nix +++ b/pkgs/development/python-modules/pyefergy/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, poetry-core, poetry-dynamic-versioning, - pythonRelaxDepsHook, iso4217, pythonOlder, pytz, @@ -28,7 +27,6 @@ buildPythonPackage rec { build-system = [ poetry-core poetry-dynamic-versioning - pythonRelaxDepsHook ]; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 3081ed70edb5..a0d40f98a510 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.20.3"; + version = "1.20.6"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-4lMsyzw56gFimUs52mEzy5eKYF9s2ClNi3yfdIBbccY="; + hash = "sha256-gR2VSMAjobecNpAYYoQ/Os3slcLSnLZMblzwDzQeEx8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 4a9dd9f6a750..6eee2bfae7d5 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.23"; + version = "0.2.25"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-myqv7zNhSUZTdyujg0ogrbzpypA5APGJhTM+FtrgXNA="; + hash = "sha256-1UDyJAXB6owD732vYpadv7w4j6ysorEH1SSewTgVPec="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 8e49354362a1..ff29175870ab 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pyfakefs"; - version = "5.4.1"; + version = "5.5.0"; pyproject = true; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-IMtR6GDC8/+DhZFirVE0u4sKHnqB3woYz8zEhi0Nncw="; + hash = "sha256-dEiqoHFC+JLQpOtSpe0yBqnwLGWZ5obNl9YkwYl5wVQ="; }; postPatch = diff --git a/pkgs/development/python-modules/pyfcm/default.nix b/pkgs/development/python-modules/pyfcm/default.nix index 342b3b88976a..c65ead3e790b 100644 --- a/pkgs/development/python-modules/pyfcm/default.nix +++ b/pkgs/development/python-modules/pyfcm/default.nix @@ -2,26 +2,37 @@ lib, fetchFromGitHub, buildPythonPackage, + setuptools, requests, + urllib3, + google-auth, }: buildPythonPackage rec { pname = "pyfcm"; - version = "1.4.8"; - format = "setuptools"; + version = "2.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "olucurious"; repo = "pyfcm"; - rev = version; - sha256 = "15q6p21wsjm75ccmzcsgad1w9fgk6189hbrp7pawpxl7l3qxn2p7"; + rev = "refs/tags/${version}"; + hash = "sha256-lpSbb0DDXLHne062s7g27zRpvTuOHiqQkqGOtWvuWdI="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ + requests + urllib3 + google-auth + ]; # pyfcm's unit testing suite requires network access doCheck = false; + pythonImportsCheck = [ "pyfcm" ]; + meta = with lib; { description = "Python client for FCM - Firebase Cloud Messaging (Android, iOS and Web)"; homepage = "https://github.com/olucurious/pyfcm"; diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix index 72731b0d1a31..865bf8832fa9 100644 --- a/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/pkgs/development/python-modules/pyfritzhome/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyfritzhome"; - version = "0.6.11"; + version = "0.6.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "hthiery"; repo = "python-fritzhome"; rev = "refs/tags/${version}"; - hash = "sha256-YzrRkFa4J3NXdc4W5CHrHvqSVJ8yBGtaf6gRqmiY7gI="; + hash = "sha256-L+9CjSXJrPmlLif1SYfJr6C76IufUzj9FHSGQO78Vsw="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index b286b3e4c88a..4dd6aa9b6dd6 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + stdenv, boost, freetype, ftgl, @@ -31,6 +32,10 @@ buildPythonPackage rec { sed -i "s,'boost_python','boost_python${pythonVersion}',g" setup.py ''; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_COMPILE = "-L${libGL}/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries"; + }; + buildInputs = [ boost freetype diff --git a/pkgs/development/python-modules/pyfume/default.nix b/pkgs/development/python-modules/pyfume/default.nix index 1dd97fef2536..b79bf238d48c 100644 --- a/pkgs/development/python-modules/pyfume/default.nix +++ b/pkgs/development/python-modules/pyfume/default.nix @@ -14,19 +14,24 @@ buildPythonPackage rec { pname = "pyfume"; - version = "0.3.1"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "pyFUME"; - inherit version; - hash = "sha256-8J9qhSaTlb/KiCjegmc8iaGaZOXJ0Pk1EquOTEUUtW0="; + inherit pname version; + hash = "sha256-UwW5OwFfu01lDKwz72iB2egbOoxb+t8UnEFIUjZmffU="; }; nativeBuildInputs = [ setuptools ]; + pythonRelaxDeps = [ + "numpy" + "pandas" + "scipy" + ]; + propagatedBuildInputs = [ fst-pso numpy diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 588b87c166d1..fecd65e34991 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -9,6 +9,8 @@ pkg-config, setuptools, cython, + ninja, + meson-python, AppKit, fontconfig, @@ -21,20 +23,21 @@ SDL2_image, SDL2_mixer, SDL2_ttf, + numpy, }: buildPythonPackage rec { pname = "pygame-ce"; - version = "2.4.1"; + version = "2.5.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pygame-community"; repo = "pygame-ce"; rev = "refs/tags/${version}"; - hash = "sha256-4Ky+QEUsQ0odcwEETk0yGECs7CcJQthhavboOnMDvF8="; + hash = "sha256-LVwOAp7ss8TPxJhfqGwOfH9EXNoNBGFpU+4tv4ozpvo="; # Unicode file cause different checksums on HFS+ vs. other filesystems postFetch = "rm -rf $out/docs/reST"; }; @@ -62,6 +65,8 @@ buildPythonPackage rec { postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "sphinx<=7.2.6"' "" substituteInPlace buildconfig/config_{unix,darwin}.py \ --replace-fail 'from distutils' 'from setuptools._distutils' substituteInPlace src_py/sysfont.py \ @@ -77,6 +82,8 @@ buildPythonPackage rec { pkg-config cython setuptools + ninja + meson-python ]; buildInputs = [ @@ -91,6 +98,11 @@ buildPythonPackage rec { SDL2_ttf ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + nativeCheckInputs = [ + numpy + ]; + + preConfigure = '' ${python.pythonOnBuildForHost.interpreter} buildconfig/config.py ''; @@ -116,7 +128,22 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ "pygame" ]; + pythonImportsCheck = [ + "pygame" + "pygame.camera" + "pygame.colordict" + "pygame.cursors" + "pygame.freetype" + "pygame.ftfont" + "pygame.locals" + "pygame.midi" + "pygame.pkgdata" + "pygame.sndarray" # requires numpy + "pygame.sprite" + "pygame.surfarray" + "pygame.sysfont" + "pygame.version" + ]; meta = with lib; { description = "Pygame Community Edition (CE) - library for multimedia application built on SDL"; diff --git a/pkgs/development/python-modules/pygatt/default.nix b/pkgs/development/python-modules/pygatt/default.nix index fd9b7521e25e..bc77900c0270 100644 --- a/pkgs/development/python-modules/pygatt/default.nix +++ b/pkgs/development/python-modules/pygatt/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, mock, - pynose, + nose, pexpect, pyserial, pytestCheckHook, @@ -39,19 +39,16 @@ buildPythonPackage rec { dependencies = [ pyserial ]; - passthru.optional-dependencies.GATTTOOL = [ pexpect ]; + optional-dependencies.GATTTOOL = [ pexpect ]; - nativeBuildInputs = [ - # For cross compilation the doCheck is false and therefor the - # nativeCheckInputs not included. We have to include nose here, since - # setup.py requires nose unconditionally. - pynose - ]; + # tests require nose + doCheck = pythonOlder "3.12"; nativeCheckInputs = [ mock + nose pytestCheckHook - ] ++ passthru.optional-dependencies.GATTTOOL; + ] ++ optional-dependencies.GATTTOOL; pythonImportsCheck = [ "pygatt" ]; diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index ccc9d2726d31..715c455c3cab 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -7,7 +7,6 @@ pdm-backend, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, responses, setuptools, @@ -38,10 +37,6 @@ buildPythonPackage rec { pdm-backend ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - dependencies = [ marshmallow marshmallow-dataclass diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index 49cf9dab4a26..c75cf68715ed 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -8,7 +8,6 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, typeguard, websockets, }: @@ -34,7 +33,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index 82c0b2ec326e..ff8569b9b8eb 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -9,17 +9,20 @@ # tests pytestCheckHook, wcag-contrast-ratio, + pythonOlder }: let pygments = buildPythonPackage rec { pname = "pygments"; - version = "2.17.2"; + version = "2.18.0"; pyproject = true; + disabled = pythonOlder "3.8"; # 2.18.0 requirement + src = fetchPypi { inherit pname version; - hash = "sha256-2kbOyf0t5b46inhPQ05MSrZwtP9U1gXEwnF+nUnEw2c="; + hash = "sha256-eG/4AvMukTEb/ziJ9umoboFQX+mfJzW7bWCuDFAE8Zk="; }; nativeBuildInputs = [ hatchling ]; @@ -51,7 +54,7 @@ let description = "Generic syntax highlighter"; mainProgram = "pygmentize"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sigmanificient ]; }; }; in diff --git a/pkgs/development/python-modules/pygsl/default.nix b/pkgs/development/python-modules/pygsl/default.nix index 2549a2d7f497..c8e247f7d2d9 100644 --- a/pkgs/development/python-modules/pygsl/default.nix +++ b/pkgs/development/python-modules/pygsl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pygsl"; - version = "2.3.4"; + version = "2.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = "pygsl"; repo = "pygsl"; - rev = "refs/tags/v.${version}"; - hash = "sha256-2TalLKDDoJdKGZHr7eNNvVW8fL7wQJjnZv34LJokfow="; + rev = "refs/tags/v${version}"; + hash = "sha256-7agGgfDUgY6mRry7d38vGGNLJC4dFUniy2M/cnejDDs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 51461e392bce..8dd0fb09c740 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyicu"; - version = "2.12"; + version = "2.13.1"; format = "setuptools"; src = fetchPypi { pname = "PyICU"; inherit version; - hash = "sha256-vXq176k61pLm2qKc0kk2TlISGDKSIXJqETyjyygchhE="; + hash = "sha256-1JGQheqgfaErrejuch57v3reAVHKD4KUaibI9LmM3Os="; }; nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config diff --git a/pkgs/development/python-modules/pykalman/default.nix b/pkgs/development/python-modules/pykalman/default.nix index 31eb43a15bd4..ce4e509174c8 100644 --- a/pkgs/development/python-modules/pykalman/default.nix +++ b/pkgs/development/python-modules/pykalman/default.nix @@ -1,39 +1,33 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, numpy, scipy, pytestCheckHook, - nose, + setuptools, }: buildPythonPackage rec { pname = "pykalman"; version = "0.9.7"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-E1d5IAOTxrNwIhmQ9zFnQEcvVBNG6SEdEWMOLC2PuKA="; + src = fetchFromGitHub { + owner = "pykalman"; + repo = "pykalman"; + rev = "aaf8c8574b0474b6f41b7b135a9a7f2dfbd0e86c"; # no tags + hash = "sha256-++YqxGMsFGv5OxicDFO9Xz89e62NG8X+6oR6M9ePUcg="; }; - patches = [ - # https://github.com/pykalman/pykalman/issues/83 - ./fix-masked-arrays-not-supported.patch - # python 3.11 issues fix: https://github.com/pykalman/pykalman/pull/101 - ./fix-p311-issues.patch - ]; + build-system = [ setuptools ]; propagatedBuildInputs = [ numpy scipy ]; - nativeCheckInputs = [ - pytestCheckHook - nose - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pykalman" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pykalman/fix-masked-arrays-not-supported.patch b/pkgs/development/python-modules/pykalman/fix-masked-arrays-not-supported.patch deleted file mode 100644 index f6dc6679cc54..000000000000 --- a/pkgs/development/python-modules/pykalman/fix-masked-arrays-not-supported.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/pykalman/utils.py -+++ b/pykalman/utils.py -@@ -70,7 +70,10 @@ - cv_chol = linalg.cholesky(cv + min_covar * np.eye(n_dim), - lower=True) - cv_log_det = 2 * np.sum(np.log(np.diagonal(cv_chol))) -- cv_sol = solve_triangular(cv_chol, (X - mu).T, lower=True).T -+ try: -+ cv_sol = solve_triangular(cv_chol, (X - mu).T, lower=True).T -+ except ValueError: -+ cv_sol = np.linalg.solve(cv_chol, (X - mu).T).T - log_prob[:, c] = - .5 * (np.sum(cv_sol ** 2, axis=1) + \ - n_dim * np.log(2 * np.pi) + cv_log_det) - diff --git a/pkgs/development/python-modules/pykalman/fix-p311-issues.patch b/pkgs/development/python-modules/pykalman/fix-p311-issues.patch deleted file mode 100644 index 002c8b893aad..000000000000 --- a/pkgs/development/python-modules/pykalman/fix-p311-issues.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/pykalman/utils.py -+++ b/pykalman/utils_copy.py -@@ -40,6 +40,10 @@ - from scipy import linalg - - -+# monkey patch -+if not hasattr(inspect, 'getargspec'): -+ inspect.getargspec = inspect.getfullargspec -+ - def array1d(X, dtype=None, order=None): - """Returns at least 1-d array with data from X""" - return np.asarray(np.atleast_1d(X), dtype=dtype, order=order) diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix index e6ccb9bcbf2f..a4f605692c5f 100644 --- a/pkgs/development/python-modules/pykoplenti/default.nix +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -8,7 +8,6 @@ pycryptodome, pydantic, pythonOlder, - pythonRelaxDepsHook, setuptools, }: @@ -29,7 +28,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "pydantic" ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/pylacrosse/default.nix b/pkgs/development/python-modules/pylacrosse/default.nix index a151a64d59d5..ec7977b5a042 100644 --- a/pkgs/development/python-modules/pylacrosse/default.nix +++ b/pkgs/development/python-modules/pylacrosse/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, mock, - pynose, + nose, pyserial, pytestCheckHook, pythonOlder, @@ -30,9 +30,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyserial ]; + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ mock - pynose + nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix index bea461e7e1ce..436056cf66c7 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.9.0"; + version = "1.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "PyLacus"; rev = "refs/tags/v${version}"; - hash = "sha256-ytO9wtCkiC6CLWLkmSV/R+Rnx/W4Jv2dsgykZ2GB13U="; + hash = "sha256-HPd/kF79Xb5kyYdOpm6ny6/rRNeu8WkTv7rM1Kpb7YI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 99f2ce5cf72a..01491a2a619a 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "3.1.1"; + version = "3.2.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "pylint-dev"; repo = "pylint"; rev = "refs/tags/v${version}"; - hash = "sha256-LmpLt2GCzYU73BUpORHaFbGqkxyYqoPoKZpUJSChqKQ="; + hash = "sha256-J+68YwjVhaMPlvLCMI/BdnUCQPDYU9u0pIvOYlbzWvs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index add82ecc2d15..dcd863d08bfc 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { hash = "sha256-MSQdX2PKQohmPGqtRZnUmCCVgKgaf4+cHAUItiPv7pY="; }; + pythonRelaxDeps = [ "deepdiff" ]; + build-system = [ poetry-core poetry-dynamic-versioning diff --git a/pkgs/development/python-modules/pyloadapi/default.nix b/pkgs/development/python-modules/pyloadapi/default.nix index aec92117415c..15631d51ecda 100644 --- a/pkgs/development/python-modules/pyloadapi/default.nix +++ b/pkgs/development/python-modules/pyloadapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyloadapi"; - version = "1.2.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tr4nt0r"; repo = "pyloadapi"; rev = "refs/tags/v${version}"; - hash = "sha256-uOgqc1RqmEk0Lqz/ixlChKTZva7+0v4V8KutLSgPKEE="; + hash = "sha256-tgK2zxgd0v2JEWgFwJLcNngDobuttM7FHKuHfTeFo14="; }; postPatch = '' @@ -47,6 +47,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyloadapi" ]; + disabledTestPaths = [ + # Tests require network access + "tests/test_cli.py" + ]; + meta = with lib; { description = "Simple wrapper for pyLoad's API"; homepage = "https://github.com/tr4nt0r/pyloadapi"; diff --git a/pkgs/development/python-modules/pylxd/default.nix b/pkgs/development/python-modules/pylxd/default.nix index 3c737f504123..048822ad976e 100644 --- a/pkgs/development/python-modules/pylxd/default.nix +++ b/pkgs/development/python-modules/pylxd/default.nix @@ -10,7 +10,6 @@ pythonOlder, requests, urllib3, - pythonRelaxDepsHook, requests-toolbelt, requests-unixsocket, setuptools, @@ -34,7 +33,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "urllib3" ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index c1758da4db8e..a56164dee5b9 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2024.5.1"; + version = "2024.6.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "materialsproject"; repo = "pymatgen"; rev = "refs/tags/v${version}"; - hash = "sha256-ZMOZ4eFtIaIcBPGT6bgAV+47LEGWAAnF/ml68j0fXws="; + hash = "sha256-BV3zwb74ZnwTWUgKt5K6lZLASdO6/UQ8Ke3gBsLhy2M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 7064d0360784..d1cced8ea507 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -1,24 +1,28 @@ { lib, - arviz, buildPythonPackage, + pythonOlder, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + arviz, cachetools, cloudpickle, - fetchFromGitHub, numpy, pandas, pytensor, - pythonOlder, rich, scipy, - setuptools, threadpoolctl, typing-extensions, }: buildPythonPackage rec { pname = "pymc"; - version = "5.15.1"; + version = "5.16.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +31,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-TAQv3BNSYt750JSZWQibjqzhQ0zXOJDVENMharjr6gQ="; + hash = "sha256-C3D07uouV8QZLplIonmViZoCXb4AAEN+uGvNly2hcMc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index 472a9c334c3a..627d5ad562dc 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, hatchling, pytestCheckHook, markdown, @@ -45,19 +46,27 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "10.7.1"; - format = "pyproject"; + version = "10.8.1"; + pyproject = true; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = "refs/tags/${version}"; - hash = "sha256-P2MkGD0B9mn34ia3Kd4MQej1XryNVXWVMF4JHaPTS0M="; + hash = "sha256-No0RDBgr40xSOiKXQRLRZnMdV+5i4eM8Jwp7c2Jw/ZY="; }; - nativeBuildInputs = [ hatchling ]; + patches = [ + (fetchpatch2 { + name = "pymdown-extensions-pygments-compat.patch"; + url = "https://github.com/facelessuser/pymdown-extensions/commit/f1e2fad862c9738e420b8451dfdfbd9e90e849fc.patch"; + hash = "sha256-ENYTRXBJ76VPhhab8MdOh+bkcQNRklXT3thvPi+gHIY="; + }) + ]; - propagatedBuildInputs = [ + build-system = [ hatchling ]; + + dependencies = [ markdown pygments ]; diff --git a/pkgs/development/python-modules/pymilvus/default.nix b/pkgs/development/python-modules/pymilvus/default.nix index 3a498ee4ffa2..c9f706ca4a95 100644 --- a/pkgs/development/python-modules/pymilvus/default.nix +++ b/pkgs/development/python-modules/pymilvus/default.nix @@ -12,7 +12,6 @@ pyarrow, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, scikit-learn, setuptools-scm, @@ -41,7 +40,6 @@ buildPythonPackage rec { nativeBuildInputs = [ gitpython - pythonRelaxDepsHook setuptools-scm wheel ]; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 1ba5c2a225db..0f504b00cd75 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pymongo"; - version = "4.6.3"; + version = "4.7.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QAB0CQuaYx8SC0LGGyIv10NJDBM6XS+ZwCCM78zMlk4="; + hash = "sha256-Y1SmayKPLNOZvnQpaF+2jgfxkRCjZ5eC7LT9to2gODE="; }; propagatedBuildInputs = [ dnspython ]; diff --git a/pkgs/development/python-modules/pymysql/default.nix b/pkgs/development/python-modules/pymysql/default.nix index 7e9fdcfeb48b..be019c73f185 100644 --- a/pkgs/development/python-modules/pymysql/default.nix +++ b/pkgs/development/python-modules/pymysql/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pymysql"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchPypi { - pname = "PyMySQL"; + pname = "pymysql"; inherit version; - hash = "sha256-TxOn34vzalHoHdnzYF/t5FpIeP4C+SNjSf2Co/BhL5Y="; + hash = "sha256-4SdhGq8rQXQDxgv03FcBJK60pX9fN7jpWuOZpC+QTNA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyngo/default.nix b/pkgs/development/python-modules/pyngo/default.nix index f580b50b01c1..0f6c85d993c8 100644 --- a/pkgs/development/python-modules/pyngo/default.nix +++ b/pkgs/development/python-modules/pyngo/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, # build-system hatchling, @@ -35,7 +34,6 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index 900198cb425a..2e40250adb4b 100644 --- a/pkgs/development/python-modules/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonRelaxDepsHook, installShellFiles, libnitrokey, flit-core, @@ -71,7 +70,6 @@ buildPythonPackage { nativeBuildInputs = [ flit-core installShellFiles - pythonRelaxDepsHook ]; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index 6b2c088209cb..00a3e513ea67 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.12"; + version = "0.5.13"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-BzYpH8u+39Xgo6KA9xpj+Osvi9lnDUwLUawbTQga33A="; + hash = "sha256-10JUwO4KHu7IRZfV/on+3Pd4WT7qvjLC+XQSk0qYAPs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pynose/default.nix b/pkgs/development/python-modules/pynose/default.nix deleted file mode 100644 index c86f814aac7b..000000000000 --- a/pkgs/development/python-modules/pynose/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, -}: - -buildPythonPackage rec { - pname = "pynose"; - version = "1.5.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "mdmintz"; - repo = "pynose"; - rev = "refs/tags/v${version}"; - hash = "sha256-Oi+vwInqgsdZfr5abJUa4zkTktpEuG0m89d1O8Oot0Q="; - }; - - nativeBuildInputs = [ setuptools ]; - - # has no tests - doCheck = false; - - meta = with lib; { - description = "pynose fixes nose to extend unittest and make testing easier"; - homepage = "https://github.com/mdmintz/pynose"; - license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index ffce3a97b0c6..0f9e4808cb97 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -1,13 +1,22 @@ { lib, stdenv, - fetchPypi, + fetchFromGitHub, buildPythonPackage, + + # build-system + cmake, + scikit-build-core, + pathspec, + ninja, + nanobind, + + # dependencies appdirs, cffi, + darwin, decorator, mako, - mesa_drivers, numpy, ocl-icd, oldest-supported-numpy, @@ -16,30 +25,36 @@ pybind11, pytestCheckHook, pytools, - setuptools, six, - wheel, }: let - os-specific-buildInputs = if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; + os-specific-buildInputs = if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.OpenCL ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2024.1"; + version = "2024.2.6"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-7NVy7pQK2L2hY5w6e+tog0/JqYrX6z9uAarE99nUusE="; + src = fetchFromGitHub { + owner = "inducer"; + repo = "pyopencl"; + rev = "refs/tags/v${version}"; + hash = "sha256-nP7ZAGeRXrjqDRWlc2SDP1hk1fseGeu9Zx0lOp9Pchs="; }; nativeBuildInputs = [ + cmake + nanobind + ninja + numpy oldest-supported-numpy - setuptools - wheel + pathspec + scikit-build-core ]; + dontUseCmakeConfigure = true; + buildInputs = [ opencl-headers pybind11 @@ -60,6 +75,7 @@ buildPythonPackage rec { preBuild = '' export HOME=$(mktemp -d) + rm -rf pyopencl ''; # gcc: error: pygpu_language_opencl.cpp: No such file or directory diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index 78cc507e42d8..9c8af0ac924a 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { --replace '"GL",' '"${pkgs.libGL}/lib/libGL${ext}",' \ --replace '"GLU",' '"${pkgs.libGLU}/lib/libGLU${ext}",' \ --replace '"GLX",' '"${pkgs.libglvnd}/lib/libGLX${ext}",' \ - --replace '"glut",' '"${pkgs.freeglut}/lib/libglut${ext}",' \ + --replace '"glut",' '"${pkgs.libglut}/lib/libglut${ext}",' \ --replace '"GLESv1_CM",' '"${pkgs.libGL}/lib/libGLESv1_CM${ext}",' \ --replace '"GLESv2",' '"${pkgs.libGL}/lib/libGLESv2${ext}",' \ --replace '"gle",' '"${pkgs.gle}/lib/libgle${ext}",' \ @@ -40,14 +40,14 @@ buildPythonPackage rec { substituteInPlace OpenGL/platform/egl.py \ --replace "('OpenGL','GL')" "('${pkgs.libGL}/lib/libOpenGL${ext}', '${pkgs.libGL}/lib/libGL${ext}')" \ --replace "'GLU'," "'${pkgs.libGLU}/lib/libGLU${ext}'," \ - --replace "'glut'," "'${pkgs.freeglut}/lib/libglut${ext}'," \ + --replace "'glut'," "'${pkgs.libglut}/lib/libglut${ext}'," \ --replace "'GLESv1_CM'," "'${pkgs.libGL}/lib/libGLESv1_CM${ext}'," \ --replace "'GLESv2'," "'${pkgs.libGL}/lib/libGLESv2${ext}'," \ --replace "'gle'," '"${pkgs.gle}/lib/libgle${ext}",' \ --replace "'EGL'," "'${pkgs.libGL}/lib/libEGL${ext}'," substituteInPlace OpenGL/platform/darwin.py \ --replace "'OpenGL'," "'${pkgs.libGL}/lib/libGL${ext}'," \ - --replace "'GLUT'," "'${pkgs.freeglut}/lib/libglut${ext}'," + --replace "'GLUT'," "'${pkgs.libglut}/lib/libglut${ext}'," '' + '' # https://github.com/NixOS/nixpkgs/issues/76822 diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index e006bbcefd51..f8e09d76c0e9 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.13.11"; + version = "1.13.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-N1PcyaVvPBX9ahHedR7pow6jAKwVOMmKqddWhYLtT8w="; + hash = "sha256-zcFcF0a3gyY3WmRiRlQntO8hjbkUm2Cxumn2aKHchvY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index d342ce313e8c..78d8e05301e4 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -8,7 +8,6 @@ requests, setuptools, pytestCheckHook, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -29,7 +28,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ geojson diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index f5113813a1ae..3a2fc269ceda 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -12,6 +12,7 @@ pbr, pexpect, pythonAtLeast, + pythonOlder, substituteAll, tree, xclip, @@ -54,6 +55,8 @@ buildPythonPackage rec { pexpect ]; + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ nose ]; # Configuration so that the tests work diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix index 22c2af63e439..2354927ec2d7 100644 --- a/pkgs/development/python-modules/pyperclip/default.nix +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -2,22 +2,24 @@ lib, buildPythonPackage, fetchPypi, - stdenv, python, + setuptools, }: buildPythonPackage rec { - version = "1.8.2"; - format = "setuptools"; + version = "1.9.0"; pname = "pyperclip"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57"; + hash = "sha256-t94BQt3IG/xcdQfuoZ2pILkiUrVIuWGGyvlKXiUn0xA="; }; - # No such file or directory: 'pbcopy' - doCheck = !stdenv.isDarwin; + build-system = [ setuptools ]; + + # https://github.com/asweigart/pyperclip/issues/263 + doCheck = false; checkPhase = '' ${python.interpreter} tests/test_pyperclip.py diff --git a/pkgs/development/python-modules/pypoolstation/default.nix b/pkgs/development/python-modules/pypoolstation/default.nix index 472d16ede486..f9ddc503ede6 100644 --- a/pkgs/development/python-modules/pypoolstation/default.nix +++ b/pkgs/development/python-modules/pypoolstation/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pypoolstation"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hszGCA2DDGQSh37lxp8G0bqHliH/+i2so5imDyzyOJw="; + hash = "sha256-SA5Eqz0WoisVVAjeKQymVh17+fHa7SuiYXgOL2BiJcc="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index 32a93e89c57a..0ad48f55d931 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, jinja2, mako, - nose, pyramid, pyramid-mako, pytestCheckHook, @@ -35,7 +34,6 @@ buildPythonPackage rec { django jinja2 mako - nose tornado pyramid pyramid-mako diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix index ef380a7b872f..ef00791037b3 100644 --- a/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/pkgs/development/python-modules/pyqt-builder/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.16.0"; + version = "1.16.2"; format = "pyproject"; src = fetchPypi { - pname = "PyQt-builder"; + pname = "pyqt_builder"; inherit version; - hash = "sha256-R7vSz6VDACAQj59AMB4WbL6pi27z5TlTNQvdTGsxqxg="; + hash = "sha256-v3I823zSPSUS4qzae8a4HwD7BczF6aiEa9NNR1FM3bk="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "PEP 517 compliant build system for PyQt"; - homepage = "https://pypi.org/project/PyQt-builder/"; + homepage = "https://github.com/Python-PyQt/PyQt-builder"; license = licenses.gpl3Only; maintainers = with maintainers; [ nrdxp ]; }; diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index 77f2f3df334e..3c3fc7253c8d 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -15,7 +15,6 @@ pytest-mock, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, qcs-sdk-python, respx, rpcq, @@ -30,7 +29,7 @@ buildPythonPackage rec { pname = "pyquil"; - version = "4.9.2"; + version = "4.10.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +38,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "pyquil"; rev = "refs/tags/v${version}"; - hash = "sha256-TxmQ9QXTTr4Xv37WmgArfK8Q5H1zAu8qx8wRsvK+vVM="; + hash = "sha256-mXcuvZauldoKmTZzFJ6TGgETxpqhXsXYBTCZpwc1I7Q="; }; pythonRelaxDeps = [ @@ -51,7 +50,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ deprecated diff --git a/pkgs/development/python-modules/pyreaderwriterlock/default.nix b/pkgs/development/python-modules/pyreaderwriterlock/default.nix index 7decdf8fda39..91a5d2934916 100644 --- a/pkgs/development/python-modules/pyreaderwriterlock/default.nix +++ b/pkgs/development/python-modules/pyreaderwriterlock/default.nix @@ -4,17 +4,20 @@ buildPythonPackage, pythonOlder, - # propagates + # build-system + setuptools, + + # dependencies typing-extensions, # tests - unittestCheckHook, + pytestCheckHook, }: buildPythonPackage rec { pname = "pyreaderwriterlock"; version = "1.0.9"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -25,9 +28,11 @@ buildPythonPackage rec { hash = "sha256-8FC+4aDgGpF1BmOdlkFtMy7OfWdSmvn9fjKXSmmeJlg="; }; - propagatedBuildInputs = [ typing-extensions ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ unittestCheckHook ]; + dependencies = [ typing-extensions ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "readerwriterlock" ]; diff --git a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix index bdb4bb06c167..465615b99ed8 100644 --- a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix +++ b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix @@ -22,20 +22,20 @@ let in buildPythonPackage rec { pname = "pyreqwest-impersonate"; - version = "0.4.7"; + version = "0.4.9"; pyproject = true; src = fetchFromGitHub { owner = "deedy5"; repo = "pyreqwest_impersonate"; rev = "v${version}"; - hash = "sha256-ck5RqSUgnLAjZ+1A1wQRyRMahJRq3nzYvE+WBpu6wk0="; + hash = "sha256-U22NNYN8p3IQIAVb6dOrErFvuJ5m5yXi2ELbyuaNlFc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-eGmx4ftS1D7qb2pPZxp4XE44teXcRwKs3tcKm8otsaM="; + hash = "sha256-rj9tfOzhzfWBoxBGlTXHAmiH5qxyoLnHhlEijy/q+Ws="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index f01ff7b0f2e4..faec26a7fe31 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.6.3"; + version = "0.6.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pyrisco"; rev = "refs/tags/v${version}"; - hash = "sha256-E/KVQSoyJWJJ+UFtu3SzJDfXu2cj7A0puYgcUxrHKRo="; + hash = "sha256-Xd6m7P/9ZB0tY6io59kCr8n4H8PXMO3nyMRmm8rpgJs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index 0c1d05fa284c..94d2c640d97e 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,20 +1,22 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, graphviz, - jupyter, + ipywidgets, matplotlib, - networkx, + notebook, + numpy, opt-einsum, pandas, pillow, pyro-api, pythonOlder, - torch, scikit-learn, + scipy, seaborn, setuptools, + torch, torchvision, tqdm, wget, @@ -22,37 +24,40 @@ buildPythonPackage rec { pname = "pyro-ppl"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit version pname; - hash = "sha256-QfTABRWVaCgPvFEWSJYKmKKxpBACfYvQpDIgrJsQLN8="; + src = fetchFromGitHub { + owner = "pyro-ppl"; + repo = "pyro"; + rev = "refs/tags/${version}"; + hash = "sha256-Dvbl/80EGoGWGhWYVIf/xjovUJG1+3WtpMH+lx1oB2E="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ + numpy + opt-einsum pyro-api torch - networkx - opt-einsum tqdm ]; - passthru.optional-dependencies = { + optional-dependencies = { extras = [ + notebook + ipywidgets graphviz - jupyter - # lap matplotlib + torchvision pandas pillow scikit-learn seaborn - torchvision + scipy # visdom wget ]; diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 91fda24bfef6..957394ad5fa3 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -12,7 +12,6 @@ pytestCheckHook, python-dateutil, pythonOlder, - pythonRelaxDepsHook, pytz, repoze-who, requests, @@ -54,7 +53,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix index f0fe36b94d03..3fb8236f9b71 100644 --- a/pkgs/development/python-modules/pysequoia/default.nix +++ b/pkgs/development/python-modules/pysequoia/default.nix @@ -17,18 +17,18 @@ buildPythonPackage rec { pname = "pysequoia"; - version = "0.1.20"; + version = "0.1.24"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-KavsLp17e4ckX11B0pefiQ1Hma/O9x0VY/uVPiJm4Fs="; + hash = "sha256-sLGPVyUVh1MxAJz8933xGAxaI9+0L/D6wViy5ARLe44="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-7Lw6gR6o2HJ/zyG4b0wz4nmU2AIIAhyK9zaQ6w+/RgE="; + hash = "sha256-DLMAL1pJwJ5xU9XzJXlrqfNGloK9VNGxnapnh34bRhI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix index 882c761d191e..18dc69489edf 100644 --- a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix +++ b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix @@ -5,7 +5,6 @@ # build-system setuptools, - wheel, # dependencies pyserial, @@ -17,22 +16,19 @@ buildPythonPackage rec { pname = "pyserial-asyncio-fast"; - version = "0.12"; + version = "0.13"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "pyserial-asyncio-fast"; rev = version; - hash = "sha256-37dbJq+9Ex+/uiRR2esgOP15CjySA0MLvxnjiPDTF08="; + hash = "sha256-qAJ9jkhY2Gq/+/JBRObdSljTDPe3cKbjUfFon2ZgEps="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ pyserial ]; + dependencies = [ pyserial ]; pythonImportsCheck = [ "serial_asyncio_fast" ]; @@ -42,6 +38,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/home-assistant-libs/pyserial-asyncio-fast/releases/tag/${version}"; description = "Fast asyncio extension package for pyserial that implements eager writes"; homepage = "https://github.com/bdraco/pyserial-asyncio-fast"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index aa92b81e2dde..c622d13b7414 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -79,5 +79,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 79c691980ffb..870fb5cd71fb 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -83,10 +83,7 @@ stdenv.mkDerivation (finalAttrs: { ]; homepage = "https://wiki.qt.io/Qt_for_Python"; changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}"; - maintainers = with lib.maintainers; [ - gebner - Enzime - ]; + maintainers = with lib.maintainers; [ gebner ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix index 3e995ca11f8a..b062ff435606 100644 --- a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix @@ -6,7 +6,6 @@ pysigma, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -25,7 +24,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ pysigma ]; diff --git a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix index 5716a6ebd79e..2e2249fd9c54 100644 --- a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix @@ -7,7 +7,6 @@ pysigma-backend-elasticsearch, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, }: @@ -34,7 +33,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ pysigma diff --git a/pkgs/development/python-modules/pysigma-backend-qradar/default.nix b/pkgs/development/python-modules/pysigma-backend-qradar/default.nix index 9c2976ed46f4..d0ec8be3b48e 100644 --- a/pkgs/development/python-modules/pysigma-backend-qradar/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-qradar/default.nix @@ -7,7 +7,6 @@ pysigma-pipeline-sysmon, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, }: @@ -29,7 +28,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ pysigma ]; diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 6fbb4b8b93ed..3ccbefb250e3 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -8,7 +8,6 @@ pyparsing, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, pyyaml, requests, }: @@ -34,7 +33,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ jinja2 diff --git a/pkgs/development/python-modules/pysilero-vad/default.nix b/pkgs/development/python-modules/pysilero-vad/default.nix index 19cd2e70ed6a..7d2b44a61ec2 100644 --- a/pkgs/development/python-modules/pysilero-vad/default.nix +++ b/pkgs/development/python-modules/pysilero-vad/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, stdenv, - pythonRelaxDepsHook, # build-system setuptools, @@ -30,7 +29,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "numpy" ]; diff --git a/pkgs/development/python-modules/pysim/default.nix b/pkgs/development/python-modules/pysim/default.nix index 8cbe3dd854b9..ee828c0f7118 100644 --- a/pkgs/development/python-modules/pysim/default.nix +++ b/pkgs/development/python-modules/pysim/default.nix @@ -64,9 +64,6 @@ buildPythonPackage { description = "Python tool to program SIMs / USIMs / ISIMs"; homepage = "https://github.com/osmocom/pysim"; license = licenses.gpl2; - maintainers = with maintainers; [ - flokli - janik - ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix index b67d44e86c39..ac2d7482496a 100644 --- a/pkgs/development/python-modules/pysimplegui/default.nix +++ b/pkgs/development/python-modules/pysimplegui/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pysimplegui"; - version = "5.0.4"; + version = "5.0.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PySimpleGUI"; inherit version; - hash = "sha256-pThG6BBWxy98REUae91yBZDKK8Q1Zc1PHpoW7nhdmAw="; + hash = "sha256-4B2LgWmdXAU9ACSR0F26Q9+eP3izRI+p6QS/o9m6Hfk="; }; propagatedBuildInputs = [ tkinter ]; diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix index cb5c822820b1..395130f01636 100644 --- a/pkgs/development/python-modules/pysolcast/default.nix +++ b/pkgs/development/python-modules/pysolcast/default.nix @@ -10,7 +10,6 @@ requests, responses, poetry-core, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -31,7 +30,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ anyconfig diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index a5e35e698c99..7ffcf52bea8a 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -29,6 +29,17 @@ buildPythonPackage rec { --replace py4j== 'py4j>=' ''; + postFixup = '' + # find_python_home.py has been wrapped as a shell script + substituteInPlace $out/bin/find-spark-home \ + --replace 'export SPARK_HOME=$($PYSPARK_DRIVER_PYTHON "$FIND_SPARK_HOME_PYTHON_SCRIPT")' \ + 'export SPARK_HOME=$("$FIND_SPARK_HOME_PYTHON_SCRIPT")' + # patch PYTHONPATH in pyspark so that it properly looks at SPARK_HOME + substituteInPlace $out/bin/pyspark \ + --replace 'export PYTHONPATH="''${SPARK_HOME}/python/:$PYTHONPATH"' \ + 'export PYTHONPATH="''${SPARK_HOME}/..:''${SPARK_HOME}/python/:$PYTHONPATH"' + ''; + propagatedBuildInputs = [ py4j ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pysubs2/default.nix b/pkgs/development/python-modules/pysubs2/default.nix index 8025a0e160e4..c833f155c934 100644 --- a/pkgs/development/python-modules/pysubs2/default.nix +++ b/pkgs/development/python-modules/pysubs2/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Python library for editing subtitle files"; mainProgram = "pysubs2"; license = licenses.mit; - maintainers = with maintainers; [ Benjamin-L ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index f61e7089f2d2..60972f086b54 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.3.21"; + version = "3.3.23"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rc9XhV99vzgoUF5ERFmJHHB9GMwq5Y44CJKg+g5tjOo="; + hash = "sha256-fjZ3DK95d0keYaMbBaRJTncnaxpWea+kIGzhh/fYDxw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 88aa722c89b8..0eb36db86388 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -34,6 +34,8 @@ buildPythonPackage rec { hash = "sha256-uLZ1TQx5awHOOF+IR3aWTwwYTd71O/V+EHaDrb1LAXU="; }; + pythonRelaxDeps = [ "defusedxml" ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index 6b529ddb810d..bad53e61dfa5 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -2,8 +2,12 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system cython, versioneer, + + # dependencies cons, etuples, filelock, @@ -12,6 +16,8 @@ numpy, scipy, typing-extensions, + + # checks jax, jaxlib, numba, @@ -23,7 +29,7 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.22.1"; + version = "2.23.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -32,7 +38,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-FG95+3g+DcqQkyJX3PavfyUWTINFLrgAPTaHYN/jk90="; + hash = "sha256-r7ooPwZSEsypYAf+oWu7leuoIK39gFfHZACrxsbcIV0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index d0acc179479b..b2771d70c495 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -11,7 +11,6 @@ pytest-doctestplus, pytest-filter-subpackage, pytest-mock, - pytest-openfiles, pytest-remotedata, setuptools, setuptools-scm, @@ -46,7 +45,6 @@ buildPythonPackage rec { pytest-doctestplus pytest-filter-subpackage pytest-mock - pytest-openfiles pytest-remotedata ]; diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 15158fe0e0e8..07f162465f9e 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "4.1.0"; + version = "5.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-OQSxPfv+xH8AO453/VtYnNEZBKId3xqzimTyBNahDvY="; + hash = "sha256-WDe1jp9uvTNbD4Bg7szmm2YkFbFtxQOIOgL0Xf6xSFc="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index 8cc38ccc15bc..674566e2301e 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -2,18 +2,20 @@ lib, buildPythonPackage, fetchPypi, - pytest, + pythonAtLeast, + setuptools, + pytest_7, cram, bash, }: buildPythonPackage rec { - version = "0.2.2"; - format = "setuptools"; pname = "pytest-cram"; + version = "0.2.2"; + pyproject = true; - nativeCheckInputs = [ pytest ]; - propagatedBuildInputs = [ cram ]; + # relies on the imp module + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; @@ -26,6 +28,13 @@ buildPythonPackage rec { --replace "/bin/bash" "${bash}/bin/bash" ''; + build-system = [ setuptools ]; + + dependencies = [ cram ]; + + # https://github.com/tbekolay/pytest-cram/issues/15 + nativeCheckInputs = [ pytest_7 ]; + # Remove __init__.py from tests folder, otherwise pytest raises an error that # the imported and collected modules are different. checkPhase = '' diff --git a/pkgs/development/python-modules/pytest-examples/default.nix b/pkgs/development/python-modules/pytest-examples/default.nix index 8dd796c5e0bf..05f16043172a 100644 --- a/pkgs/development/python-modules/pytest-examples/default.nix +++ b/pkgs/development/python-modules/pytest-examples/default.nix @@ -3,72 +3,52 @@ black, buildPythonPackage, fetchFromGitHub, - fetchpatch, hatchling, pytest, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, ruff, }: buildPythonPackage rec { pname = "pytest-examples"; - version = "0.0.10"; - format = "pyproject"; + version = "0.0.12"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pydantic"; repo = "pytest-examples"; rev = "refs/tags/v${version}"; - hash = "sha256-jCxOGDJlFkMH9VtaaPsE5zt+p3Z/mrVzhdNSI51/nVM="; + hash = "sha256-hTLTL3w4OEv8Pkzc/h9qDMnlhe6P+Q6XUImLVDsDKvk="; }; - patches = [ - (fetchpatch { - url = "https://github.com/pydantic/pytest-examples/commit/551ba911713c2859caabc91b664723dd6bc800c5.patch"; - hash = "sha256-Y3OU4fNyLADhBQGwX2jY0gagVV2q2dcn3kJRLUyCtZI="; - }) - (fetchpatch { - url = "https://github.com/pydantic/pytest-examples/commit/3bef5d644fe3fdb076270833768e4c6df9148530.patch"; - hash = "sha256-pf+WKzZNqgjbJiblMMLHWk23kjg4W9nm+KBmC8rG8Lw="; - }) - ]; - postPatch = '' # ruff binary is used directly, the ruff Python package is not needed substituteInPlace pytest_examples/lint.py \ - --replace "'ruff'" "'${ruff}/bin/ruff'" + --replace-fail "'ruff'" "'${lib.getExe ruff}'" ''; pythonRemoveDeps = [ "ruff" ]; - nativeBuildInputs = [ + build-system = [ hatchling - pythonRelaxDepsHook ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ black ]; + dependencies = [ black ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pytest_examples" ]; - disabledTests = [ - # Test fails with latest ruff v0.1.2 - # See https://github.com/pydantic/pytest-examples/issues/26 - "test_ruff_error" - ]; - - meta = with lib; { + meta = { description = "Pytest plugin for testing examples in docstrings and markdown files"; homepage = "https://github.com/pydantic/pytest-examples"; changelog = "https://github.com/pydantic/pytest-examples/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pytest-golden/default.nix b/pkgs/development/python-modules/pytest-golden/default.nix index 6cc78e6d7018..1d2879049e45 100644 --- a/pkgs/development/python-modules/pytest-golden/default.nix +++ b/pkgs/development/python-modules/pytest-golden/default.nix @@ -10,7 +10,6 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, testfixtures, }: @@ -39,7 +38,6 @@ buildPythonPackage rec { nativeBuildInputs = [ # hatchling used for > 0.2.2 poetry-core - pythonRelaxDepsHook ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index b9dfda5404a3..59a5a76e2eb5 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -7,7 +7,6 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, setuptools, setuptools-scm, }: @@ -27,7 +26,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix new file mode 100644 index 000000000000..3205d9d0e82d --- /dev/null +++ b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-lazy-fixtures"; + version = "1.0.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dev-petrov"; + repo = "pytest-lazy-fixtures"; + rev = version; + hash = "sha256-BOKUg5HPBQfteKOEsdZ30h/hWbVZPuHMhtGXF3KfMXg="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pytest_lazy_fixtures" ]; + + meta = with lib; { + description = "Allows you to use fixtures in @pytest.mark.parametrize"; + homepage = "https://github.com/dev-petrov/pytest-lazy-fixtures"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-md-report/default.nix b/pkgs/development/python-modules/pytest-md-report/default.nix index 8a624e6e48df..5caa41592589 100644 --- a/pkgs/development/python-modules/pytest-md-report/default.nix +++ b/pkgs/development/python-modules/pytest-md-report/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + setuptools-scm, pytablewriter, pytest, tcolorpy, @@ -12,16 +14,22 @@ buildPythonPackage rec { pname = "pytest-md-report"; - version = "0.5.1"; - format = "setuptools"; + version = "0.6.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-WzPspBVcrtcDqZI+PuAttfI7YBKC5DW5IM+Y7iUdQFI="; + pname = "pytest_md_report"; + inherit version; + hash = "sha256-XpbGVevJtcPHt4v3xTgsH2gFbpaQRDAlJ5D4c33lzpk="; }; + build-system = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ pytablewriter tcolorpy diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 020133c352c6..fd26b16b6508 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -6,9 +6,8 @@ pytest, jinja2, matplotlib, - pynose, pillow, - pytestCheckHook, + pytest7CheckHook, }: buildPythonPackage rec { @@ -28,11 +27,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 matplotlib - pynose pillow ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytest7CheckHook ]; disabledTests = [ # Broken since b6e98f18950c2b5dbdc725c1181df2ad1be19fee diff --git a/pkgs/development/python-modules/pytest-notebook/default.nix b/pkgs/development/python-modules/pytest-notebook/default.nix index f65d7efd9ea2..21f40beb6a89 100644 --- a/pkgs/development/python-modules/pytest-notebook/default.nix +++ b/pkgs/development/python-modules/pytest-notebook/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, flit-core, - pythonRelaxDepsHook, attrs, jsonschema, nbclient, @@ -32,7 +31,6 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix deleted file mode 100644 index ebd0a0976c64..000000000000 --- a/pkgs/development/python-modules/pytest-openfiles/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchpatch, - fetchPypi, - isPy27, - packaging, - pytest, - pytestCheckHook, - psutil, - setuptools-scm, -}: - -buildPythonPackage rec { - pname = "pytest-openfiles"; - version = "0.5.0"; - format = "setuptools"; - disabled = isPy27; # abandoned - - src = fetchPypi { - inherit pname version; - sha256 = "179c2911d8aee3441fee051aba08e0d9b4dab61b829ae4811906d5c49a3b0a58"; - }; - - patches = [ - (fetchpatch { - name = "replace-distutils-with-packaging.patch"; - url = "https://github.com/astropy/pytest-openfiles/commit/e17e8123936689b0b0ecfb713976588d6793d8bb.patch"; - includes = [ "pytest_openfiles/plugin.py" ]; - hash = "sha256-+6xqOwnBO+jxenXxPdDhLqqm3w+ZRjWeVqqgz8j22bU="; - }) - ]; - - nativeBuildInputs = [ setuptools-scm ]; - - buildInputs = [ pytest ]; - - propagatedBuildInputs = [ - packaging - psutil - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = with lib; { - description = "Pytest plugin for detecting inadvertent open file handles"; - homepage = "https://astropy.org"; - license = licenses.bsd3; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index eb0afeda5e22..9c109021be28 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -47,11 +47,6 @@ buildPythonPackage rec { "ignore::DeprecationWarning" ]; - disabledTestPathss = lib.optionals (pythonAtLeast "3.12") [ - # AttributeError: partially initialized module 'pandas' has no attribute '_pandas_datetime_CAPI' (most likely due to a circular import) - "tests/test_num_regression.py" - ]; - pythonImportsCheck = [ "pytest_regressions" "pytest_regressions.plugin" diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 3d2873321a75..751532baa6aa 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -11,23 +11,33 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "13.0"; + version = "14.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4TLb5CC8R29US5bnA27dCmlwdXQgm2Z3JjyVDRmwkZk="; + hash = "sha256-SkALy808ekrRUauK+sEj2Q7KOr4n+Ycl3E2XAoh9LpI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ packaging ]; + + dependencies = [ packaging ]; nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # https://github.com/pytest-dev/pytest-rerunfailures/issues/267 + "test_run_session_teardown_once_after_reruns" + "test_exception_matches_rerun_except_query" + "test_exception_not_match_rerun_except_query" + "test_exception_matches_only_rerun_query" + "test_exception_match_only_rerun_in_dual_query" + ]; + meta = with lib; { description = "Pytest plugin to re-run tests to eliminate flaky failures"; homepage = "https://github.com/pytest-dev/pytest-rerunfailures"; diff --git a/pkgs/development/python-modules/pytest-responses/default.nix b/pkgs/development/python-modules/pytest-responses/default.nix new file mode 100644 index 000000000000..911fd0debdd2 --- /dev/null +++ b/pkgs/development/python-modules/pytest-responses/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + responses, +}: + +buildPythonPackage rec { + pname = "pytest-responses"; + version = "0.5.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "getsentry"; + repo = "pytest-responses"; + rev = "refs/tags/${version}"; + hash = "sha256-6QAiNWCJbo4rmaByrc8VNw39/eF3uqFOss3GJuCvpZg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ responses ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pytest_responses" ]; + + meta = { + description = "Plugin for py.test response"; + homepage = "https://github.com/getsentry/pytest-responses"; + changelog = "https://github.com/getsentry/pytest-responses/blob/${version}/CHANGES"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ tochiaha ]; + mainProgram = "pytest-reponses"; + }; +} diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index b75a4b790528..555c84031144 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, pythonOlder, + setuptools, setuptools-scm, pytestCheckHook, filelock, @@ -14,28 +15,32 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "3.5.0"; + version = "3.6.1"; disabled = pythonOlder "3.7"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-y7NvPWfgxHi6pX+k7ciEOIfg9s/ELWd1MKNtdHKzLYo="; + pname = "pytest_xdist"; + inherit version; + hash = "sha256-6tFWpNsjHux2lzf1dmjvWKIISjSy5VxKj6INhhEHMA0="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ execnet ]; + dependencies = [ execnet ]; nativeCheckInputs = [ filelock pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { psutil = [ psutil ]; setproctitle = [ setproctitle ]; }; diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index 4d784be7c118..efe696a270d8 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.23.0"; + version = "1.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-+NQEGiChwe8ZQwVOSj33rHtD5/KR9kD0PDTp3MSzTfo="; + hash = "sha256-FeJwY3WG6rxWdV7l/MgcSL20a6fvfA1bG2QwLQgMxg8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest/8.2.2-unittest-testcase-regression.patch b/pkgs/development/python-modules/pytest/8.2.2-unittest-testcase-regression.patch new file mode 100644 index 000000000000..1d127b191f81 --- /dev/null +++ b/pkgs/development/python-modules/pytest/8.2.2-unittest-testcase-regression.patch @@ -0,0 +1,72 @@ +From de47b73520fd9b7e41272701d7fd4663357af046 Mon Sep 17 00:00:00 2001 +From: Ran Benita +Date: Fri, 7 Jun 2024 09:49:29 +0300 +Subject: [PATCH] unittest: fix assertion errors on unittest reruns + +This fixes unittest test reruns when using plugins like +pytest-rerunfailures. + +The `instance` property uses AttributeError to check if the instance +needs to be initialized, so `del` is the correct way to clear it, not +setting to `None`. + +Regressed in 8.2.2. +--- + changelog/12424.bugfix.rst | 1 + + src/_pytest/unittest.py | 2 +- + .../pytest_rerunfailures_integration.py | 11 +++++++++++ + tox.ini | 2 +- + 4 files changed, 14 insertions(+), 2 deletions(-) + create mode 100644 changelog/12424.bugfix.rst + create mode 100644 testing/plugins_integration/pytest_rerunfailures_integration.py + +diff --git a/changelog/12424.bugfix.rst b/changelog/12424.bugfix.rst +new file mode 100644 +index 00000000000..7ad1126858b +--- /dev/null ++++ b/changelog/12424.bugfix.rst +@@ -0,0 +1 @@ ++Fix crash with `assert testcase is not None` assertion failure when re-running unittest tests using plugins like pytest-rerunfailures. Regressed in 8.2.2. +diff --git a/src/_pytest/unittest.py b/src/_pytest/unittest.py +index 643443f08c6..ca82ac5c14a 100644 +--- a/src/_pytest/unittest.py ++++ b/src/_pytest/unittest.py +@@ -222,7 +222,7 @@ def teardown(self) -> None: + self._explicit_tearDown() + self._explicit_tearDown = None + self._obj = None +- self._instance = None ++ del self._instance + super().teardown() + + def startTest(self, testcase: "unittest.TestCase") -> None: +diff --git a/testing/plugins_integration/pytest_rerunfailures_integration.py b/testing/plugins_integration/pytest_rerunfailures_integration.py +new file mode 100644 +index 00000000000..9a13a3279a9 +--- /dev/null ++++ b/testing/plugins_integration/pytest_rerunfailures_integration.py +@@ -0,0 +1,11 @@ ++import unittest ++ ++ ++class MyTestCase(unittest.TestCase): ++ first_time = True ++ ++ def test_fail_the_first_time(self) -> None: ++ """Regression test for issue #12424.""" ++ if self.first_time: ++ type(self).first_time = False ++ self.fail() +diff --git a/tox.ini b/tox.ini +index 0a3f0acf5b8..35b335a015d 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -141,7 +141,7 @@ commands = + pytest --cov=. simple_integration.py + pytest --ds=django_settings simple_integration.py + pytest --html=simple.html simple_integration.py +- pytest --reruns 5 simple_integration.py ++ pytest --reruns 5 simple_integration.py pytest_rerunfailures_integration.py + pytest pytest_anyio_integration.py + pytest pytest_asyncio_integration.py + pytest pytest_mock_integration.py diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 291f469be960..558909a61d25 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -4,6 +4,7 @@ callPackage, pythonOlder, fetchPypi, + fetchpatch2, writeText, # build-system @@ -30,14 +31,20 @@ buildPythonPackage rec { pname = "pytest"; - version = "8.1.1"; + version = "8.2.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rJeBQadZSJSIF9NgKXt6rg/LnW/2vJ7G1RS4XVplwEQ="; + hash = "sha256-3ku4EE4gGTnM3GiLJ6iae+IHmyLivSsH+Aa2unEReXc="; }; + patches = [ + # https://github.com/pytest-dev/pytest/issues/12424 + # https://github.com/pytest-dev/pytest/pull/12436 + ./8.2.2-unittest-testcase-regression.patch + ]; + outputs = [ "out" "testout" diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index 9abc67d70294..18eece5e128b 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -33,16 +33,16 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "7.9.1"; + version = "8.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "ArangoDB-Community"; + owner = "arangodb"; repo = "python-arango"; rev = "refs/tags/${version}"; - hash = "sha256-N10ysJKk0jxFyjgR/MXKHVS2MxCQtfFFGEh1IZ2eJk0="; + hash = "sha256-SoqrmQ4owXsaZ5NgfTGfxPbFhS17+2zv5iOjXKJe3lI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index a20a469eb3c1..055a993ca013 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -15,7 +15,6 @@ python-fsutil, python-slugify, pythonOlder, - pythonRelaxDepsHook, pyyaml, requests, setuptools, @@ -41,7 +40,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "boto3" ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index 5f0ebb3988e1..9092a49d7690 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -2,15 +2,22 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, + runCommand, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + dbus-python, + + # checks dbus, gobject-introspection, - dbus-python, pygobject3, bluez, networkmanager, - setuptools-scm, - runCommand, + pytestCheckHook, }: let @@ -24,7 +31,7 @@ in buildPythonPackage rec { pname = "python-dbusmock"; version = "0.31.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "martinpitt"; @@ -33,9 +40,12 @@ buildPythonPackage rec { hash = "sha256-DdV78o089Jkc7mSsGvlJgVpv8kPpMILo7lC6EbLxkxg="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ dbus-python ]; + dependencies = [ dbus-python ]; nativeCheckInputs = [ dbus @@ -44,39 +54,19 @@ buildPythonPackage rec { bluez pbap-client networkmanager - nose + pytestCheckHook ]; - # TODO: Get the rest of these tests running? - NOSE_EXCLUDE = lib.concatStringsSep "," [ - "test_bluez4" # NixOS ships BlueZ5 - # These appear to fail because they're expecting to run in an Ubuntu chroot? - "test_everything" # BlueZ5 OBEX - "test_polkitd" - "test_consolekit" - "test_api" - "test_logind" - "test_notification_daemon" - "test_ofono" - "test_gnome_screensaver" - "test_cli" - "test_timedated" - "test_upower" - # needs glib - "test_accounts_service" - # needs dbus-daemon active - "test_systemd" - # Very slow, consider disabling? - # "test_networkmanager" + disabledTests = [ + # wants to call upower, which is a reverse-dependency + "test_dbusmock_test_template" + # Failed to execute program org.TestSystem: No such file or directory + "test_system_service_activation" + "test_session_service_activation" ]; - checkPhase = '' - runHook preCheck - nosetests -v - runHook postCheck - ''; - meta = with lib; { + changelog = "https://github.com/martinpitt/python-dbusmock/releases/tag/${version}"; description = "Mock D-Bus objects for tests"; homepage = "https://github.com/martinpitt/python-dbusmock"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix index 627cb55ff354..28c4d4c3c115 100644 --- a/pkgs/development/python-modules/python-docx/default.nix +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -2,7 +2,7 @@ lib, behave, buildPythonPackage, - fetchPypi, + fetchFromGitHub, lxml, mock, pyparsing, @@ -14,19 +14,21 @@ buildPythonPackage rec { pname = "python-docx"; - version = "1.1.0"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-WCm3IhQc8at5rt8MNNn+mSSyl2RYTA8hZOsrAtzfF8k="; + src = fetchFromGitHub { + owner = "python-openxml"; + repo = "python-docx"; + rev = "refs/tags/v${version}"; + hash = "sha256-isxMtq5j5J02GcHMzOJdJw+ZokLoxA6fG1xsN21Irbc="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ lxml typing-extensions ]; diff --git a/pkgs/development/python-modules/python-fx/default.nix b/pkgs/development/python-modules/python-fx/default.nix index cdaae586a52e..b3a15ff913ca 100644 --- a/pkgs/development/python-modules/python-fx/default.nix +++ b/pkgs/development/python-modules/python-fx/default.nix @@ -19,7 +19,6 @@ pytestCheckHook, pythonOlder, antlr4, - pythonRelaxDepsHook, pyyaml, setuptools, six, @@ -52,7 +51,6 @@ buildPythonPackage rec { nativeBuildInputs = [ antlr4 - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 2209320f8712..8d7d40c4a734 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -16,14 +16,15 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "4.4.0"; + version = "4.6.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-HRF797QzroJV5ddOcsZgl49Q7oXrYiSMn7Uu9Dw+OBQ="; + pname = "python_gitlab"; + inherit version; + hash = "sha256-tWrjY4kDdMrt6FPvVS6SxBVR1gWADeHGS6YbzyXyN7A="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 098bc746f553..b2c59c10ecd9 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ "defusedxml" ]; + dependencies = [ defusedxml lxml diff --git a/pkgs/development/python-modules/python-hcl2/default.nix b/pkgs/development/python-modules/python-hcl2/default.nix new file mode 100644 index 000000000000..07e9d2140fa1 --- /dev/null +++ b/pkgs/development/python-modules/python-hcl2/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + lark, + pytestCheckHook, + setuptools-scm, + setuptools, +}: + +buildPythonPackage rec { + pname = "python-hcl2"; + version = "4.3.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "amplify-education"; + repo = "python-hcl2"; + rev = "v${version}"; + hash = "sha256-P/EZG6LVW33X9IDE4TbQxakEfenkOqBJ1RM6BZE/7Kk="; + }; + + disabled = pythonOlder "3.7"; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ lark ]; + + pythonImportsCheck = [ "hcl2" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "A parser for HCL2 written in Python using Lark"; + homepage = "https://github.com/amplify-education/python-hcl2"; + changelog = "https://github.com/amplify-education/python-hcl2/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ shivaraj-bh ]; + }; +} diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index 090f5acd8e4a..8afb965dbaca 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -14,7 +14,6 @@ requests-mock, stestr, multiprocess, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -34,7 +33,6 @@ buildPythonPackage rec { --replace test_jenkins_open_no_timeout dont_test_jenkins_open_no_timeout ''; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "setuptools" ]; buildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 1ccae8b44d0e..56b56ebca187 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -1,7 +1,6 @@ { lib, aiohttp, - anyio, async-timeout, asyncclick, buildPythonPackage, @@ -12,6 +11,7 @@ poetry-core, pydantic, pytest-asyncio, + pytest-freezer, pytest-mock, pytestCheckHook, pythonOlder, @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.6.2.1"; + version = "0.7.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,14 +29,13 @@ buildPythonPackage rec { owner = "python-kasa"; repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-iCqJY3qkA3ZVXTCfxvQoaZsaqGui8PwKGAmLXKZgLJs="; + hash = "sha256-jbyc4YeUKjioUFXL5SVdgeUlSIiOCJ7D0cZRWPiKZII="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp - anyio async-timeout asyncclick cryptography @@ -45,6 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-freezer pytest-mock pytestCheckHook voluptuous diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index c79e3f7e8d7b..f2df743ee1c4 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -22,7 +22,6 @@ pytestCheckHook, python-lsp-jsonrpc, pythonOlder, - pythonRelaxDepsHook, rope, setuptools, setuptools-scm, diff --git a/pkgs/development/python-modules/python-lzf/default.nix b/pkgs/development/python-modules/python-lzf/default.nix index bcf7ea480a42..c2592f956253 100644 --- a/pkgs/development/python-modules/python-lzf/default.nix +++ b/pkgs/development/python-modules/python-lzf/default.nix @@ -1,19 +1,27 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, + unittestCheckHook, }: buildPythonPackage rec { - version = "0.2.4"; - format = "setuptools"; + version = "0.2.6"; pname = "python-lzf"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "1l8m6vzwm1m8hn7ldw8j8r2b6r199k8z3q0wnhdyy4p68hahyhni"; + src = fetchFromGitHub { + owner = "teepark"; + repo = "python-lzf"; + rev = "refs/tags/release-${version}"; + hash = "sha256-n5E75kRqe0dDbyFicoyLBAVi/SuoUU7qJka3viipQk8="; }; + build-system = [ setuptools ]; + + nativeCheckInputs = [ unittestCheckHook ]; + meta = with lib; { description = "liblzf python bindings"; homepage = "https://github.com/teepark/python-lzf"; diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index e981e6ce8c6a..288f7a934a57 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -8,7 +8,6 @@ # build setuptools, - pythonRelaxDepsHook, # propagates aiohttp, @@ -56,7 +55,7 @@ in buildPythonPackage rec { pname = "python-matter-server"; - version = "6.1.0"; + version = "6.2.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -65,7 +64,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-sY/FaMZ3p/AC63t1ku1Khgqi71G7u2O+ZPTuMPHFkuk="; + hash = "sha256-20heZrdSuKfiRuKKnDyguSC5bbV/9qBcu6E/5vcV1iU="; }; patches = [ @@ -83,7 +82,6 @@ buildPythonPackage rec { build-system = [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "home-assistant-chip-clusters" ]; diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index b465f6a4d60e..07466ebcddcd 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -37,6 +37,8 @@ buildPythonPackage rec { hash = "sha256-BJw1Gg3FO2R6WWKjkrpxDN4fTMTug5AIj0SNq1gEbBY="; }; + pythonRelaxDeps = [ "defusedxml" ]; + nativeBuildInputs = [ poetry-core ]; patches = [ diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix index ad3d7fd724bc..69fedb261ed1 100644 --- a/pkgs/development/python-modules/python-ndn/default.nix +++ b/pkgs/development/python-modules/python-ndn/default.nix @@ -10,7 +10,6 @@ pycryptodomex, pygtrie, pytestCheckHook, - pythonRelaxDepsHook, pythonOlder, setuptools, }: @@ -33,7 +32,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -56,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/named-data/python-ndn"; changelog = "https://github.com/named-data/python-ndn/blob/${src.rev}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix index 5969aeb56b78..2f4cfc1fef7f 100644 --- a/pkgs/development/python-modules/python-nomad/default.nix +++ b/pkgs/development/python-modules/python-nomad/default.nix @@ -2,23 +2,27 @@ lib, buildPythonPackage, fetchPypi, + setuptools, requests, pythonOlder, }: buildPythonPackage rec { pname = "python-nomad"; - version = "2.0.0"; - format = "setuptools"; + version = "2.0.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-5IyHNw1ArE8fU9DoSQMGkDI9d/OiR1YI/7nTPeFIK+A="; + pname = "python_nomad"; + inherit version; + hash = "sha256-TXCm6FxYoavjN3ASioQ7yXQVsDDXedDKBgGGP8ghQdM="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # Tests require nomad agent doCheck = false; diff --git a/pkgs/development/python-modules/python-opensky/default.nix b/pkgs/development/python-modules/python-opensky/default.nix index 7f5dc62febb7..bef8dadf3186 100644 --- a/pkgs/development/python-modules/python-opensky/default.nix +++ b/pkgs/development/python-modules/python-opensky/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-opensky"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-opensky"; rev = "refs/tags/v${version}"; - hash = "sha256-Ia6/Lr/uNuF1u0s4g0tpYaW+hKeLbUKxYC/O+ZBqiXI="; + hash = "sha256-V6iRwWzCnPCvu8eks2sHPYrX3OmaFnNj+i57kQJKYm0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 2bc0c40cc1a0..b89a7534a2ab 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -2,8 +2,10 @@ lib, stdenv, buildPythonPackage, + setuptools, eventlet, fetchPypi, + fetchpatch, gevent, pkgs, process-tests, @@ -17,7 +19,9 @@ buildPythonPackage rec { pname = "python-redis-lock"; version = "4.0.0"; - format = "setuptools"; + + pyproject = true; + build-system = [ setuptools ]; disabled = pythonOlder "3.7"; @@ -26,7 +30,16 @@ buildPythonPackage rec { hash = "sha256-Sr0Lz0kTasrWZye/VIbdJJQHjKVeSe+mk/eUB3MZCRo="; }; - propagatedBuildInputs = [ redis ] ++ lib.optionals withDjango [ django-redis ]; + patches = [ + (fetchpatch { + url = "https://github.com/ionelmc/python-redis-lock/pull/119.diff"; + hash = "sha256-Fo43+pCtnrEMxMdEEdo0YfJGkBlhhH0GjYNgpZeHF3U="; + }) + + ./test_signal_expiration_increase_sleep.patch + ]; + + dependencies = [ redis ] ++ lib.optionals withDjango [ django-redis ]; nativeCheckInputs = [ eventlet diff --git a/pkgs/development/python-modules/python-redis-lock/test_signal_expiration_increase_sleep.patch b/pkgs/development/python-modules/python-redis-lock/test_signal_expiration_increase_sleep.patch new file mode 100644 index 000000000000..47e721d37a31 --- /dev/null +++ b/pkgs/development/python-modules/python-redis-lock/test_signal_expiration_increase_sleep.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_redis_lock.py b/tests/test_redis_lock.py +index ac9e3ef..331ab41 100644 +--- a/tests/test_redis_lock.py ++++ b/tests/test_redis_lock.py +@@ -552,7 +552,7 @@ def test_signal_expiration(conn, signal_expire, method): + lock.release() + elif method == 'reset_all': + reset_all(conn) +- time.sleep(0.5) ++ time.sleep(0.6) + assert conn.exists('lock-signal:signal_expiration') + time.sleep((signal_expire - 500) / 1000.0) + assert conn.llen('lock-signal:signal_expiration') == 0 diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 02e550736312..480c79403903 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -15,7 +15,6 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -41,7 +40,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ aiohttp diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index 9ccfc02646ac..a7d91fcb759a 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -8,14 +8,15 @@ buildPythonPackage rec { pname = "python-sql"; - version = "1.4.3"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-YmC+/4NaNdOgrsTx2jUbC+nKoaDZSmy6lAp82Nz2Ymk="; + pname = "python_sql"; + inherit version; + hash = "sha256-93RnHx0IT6a6Q4mJJM3r5O0NAHHfjWCAQKzU8cjYaqM="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-technove/default.nix b/pkgs/development/python-modules/python-technove/default.nix index 55a92fbc7281..66413bc3f259 100644 --- a/pkgs/development/python-modules/python-technove/default.nix +++ b/pkgs/development/python-modules/python-technove/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-technove"; - version = "1.2.2"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Moustachauve"; repo = "pytechnove"; rev = "refs/tags/v${version}"; - hash = "sha256-kc5jR0IM2OagvmtqhicnBbrwrdk3E/iJhRIgUtKoirI="; + hash = "sha256-umtM2fIyEiimt/X2SvgqjaTYGutvJHkSJ3pRfwSbOfQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-whois/default.nix b/pkgs/development/python-modules/python-whois/default.nix index be1186c5ee9c..82c4286626b4 100644 --- a/pkgs/development/python-modules/python-whois/default.nix +++ b/pkgs/development/python-modules/python-whois/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pynose, pytestCheckHook, python-dateutil, pythonOlder, @@ -28,7 +27,6 @@ buildPythonPackage rec { dependencies = [ python-dateutil ]; nativeCheckInputs = [ - pynose pytestCheckHook simplejson ]; diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index 44985f080a64..819bc5875c6f 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - pynose, + nose, pythonOlder, setuptools, }: @@ -21,7 +21,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeCheckInputs = [ pynose ]; + # tests rely on nose + doCheck = pythonOlder "3.12"; + + nativeCheckInputs = [ nose ]; pythonImportsCheck = [ "pytimeparse" ]; diff --git a/pkgs/development/python-modules/pytlv/default.nix b/pkgs/development/python-modules/pytlv/default.nix index 630cc9a21b3c..2960c12e95a8 100644 --- a/pkgs/development/python-modules/pytlv/default.nix +++ b/pkgs/development/python-modules/pytlv/default.nix @@ -24,9 +24,6 @@ buildPythonPackage rec { description = "TLV (tag length lavue) data parser, especially useful for EMV tags parsing"; homepage = "https://github.com/timgabets/pytlv"; license = licenses.lgpl2; - maintainers = with maintainers; [ - flokli - janik - ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 1de63995bf29..f755014155dd 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pytools"; - version = "2024.1.2"; + version = "2024.1.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-CBhx5FFQXEuYbrr6aK7qv9x76z+qG6pQ9yauviHh0Fc="; + hash = "sha256-jDd7sf/ctRAzAbjn6U8By+Nlc6AeAgQ0/qlikbHxrBk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index ec57a02f0acd..e667590bf1b7 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -4,19 +4,30 @@ buildPythonPackage, fetchFromGitHub, isPy27, + + # build-system + setuptools, + + # dependencies numpy, scikit-learn, - pytestCheckHook, torch, - torchvision, tqdm, + + # optional-dependencies faiss, + tensorboard, + + # tests + cudaSupport, + pytestCheckHook, + torchvision }: buildPythonPackage rec { pname = "pytorch-metric-learning"; version = "2.5.0"; - format = "setuptools"; + pyproject = true; disabled = isPy27; @@ -27,14 +38,30 @@ buildPythonPackage rec { hash = "sha256-1y7VCnzgwFOMeMloVdYyszNhf/zZlBJUjuF4qgA5c0A="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ numpy torch scikit-learn - torchvision tqdm ]; + optional-dependencies = { + with-hooks = [ + # TODO: record-keeper + faiss + tensorboard + ]; + with-hooks-cpu = [ + # TODO: record-keeper + faiss + tensorboard + ]; + }; + preCheck = '' export HOME=$TMP export TEST_DEVICE=cpu @@ -43,29 +70,35 @@ buildPythonPackage rec { # package only requires `unittest`, but use `pytest` to exclude tests nativeCheckInputs = [ - faiss pytestCheckHook - ]; + torchvision + ] ++ lib.flatten (lib.attrValues optional-dependencies); - disabledTests = - [ - # TypeError: setup() missing 1 required positional argument: 'world_size' - "TestDistributedLossWrapper" - # require network access: - "TestInference" - "test_get_nearest_neighbors" - "test_tuplestoweights_sampler" - "test_untrained_indexer" - "test_metric_loss_only" - "test_pca" - # flaky - "test_distributed_classifier_loss_and_miner" - ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ - # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly - "test_global_embedding_space_tester" - "test_with_same_parent_label_tester" - ]; + disabledTests = [ + # network access + "test_tuplestoweights_sampler" + "test_metric_loss_only" + "test_add_to_indexer" + "test_get_nearest_neighbors" + "test_list_of_text" + "test_untrained_indexer" + ] ++ lib.optionals stdenv.isDarwin [ + # AttributeError: module 'torch.distributed' has no attribute 'init_process_group' + "test_single_proc" + ] ++ lib.optionals cudaSupport [ + # crashes with SIGBART + "test_accuracy_calculator_and_faiss_with_torch_and_numpy" + "test_accuracy_calculator_large_k" + "test_custom_knn" + "test_global_embedding_space_tester" + "test_global_two_stream_embedding_space_tester" + "test_index_type" + "test_k_warning" + "test_many_tied_distances" + "test_query_within_reference" + "test_tied_distances" + "test_with_same_parent_label_tester" + ]; meta = { description = "Metric learning library for PyTorch"; diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index 185d481f754d..2050953b6663 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pytubefix"; - version = "5.6.3"; + version = "5.7.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qYNIQhwSZ3ZG3WMY6qCul1OEno1PWgMlfcFSxN3c6aw="; + sha256 = "sha256-5VnJXQo/VjeGB9Kpazg/MHU8m4Kh/JVd43HXitpk0Mk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index 019158e1cbf1..13073a59f481 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pyudev"; - version = "0.24.1"; + version = "0.24.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-deVNNyGPWsRbDaHw/ZzF5SajysPvHPrUEM96sziwFHE="; + hash = "sha256-LpRUJ6IWdIk7uXYyQB22ITnZHOoe6WE3zHsHrSIZj8c="; }; postPatch = lib.optionalString stdenvNoCC.isLinux '' diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/development/python-modules/pyunbound/default.nix similarity index 92% rename from pkgs/tools/networking/unbound/python.nix rename to pkgs/development/python-modules/pyunbound/default.nix index 94f2374d904d..a5d33cbfa440 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/development/python-modules/pyunbound/default.nix @@ -1,11 +1,10 @@ -{ lib, stdenv, unbound, openssl, expat, libevent, swig, pythonPackages }: +{ lib, buildPythonPackage, unbound, openssl, expat, libevent, swig, python, stdenv }: -let - inherit (pythonPackages) python; -in -stdenv.mkDerivation rec { +buildPythonPackage rec { pname = "pyunbound"; inherit (unbound) version src; + pyproject = false; # Built with configure script + patches = unbound.patches or null; nativeBuildInputs = [ swig ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index b17b67b0c8ef..790c8fbabc2c 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.108"; + version = "9.2.109"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-N1sGTjDiqmwyXdXpApUgVAmUPjwJUiEIaTZoWyrBpAs="; + hash = "sha256-GdKU+SbZbc81WSnqsxdiEuGUoBjmDPTrBfHs6zxehkg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index cf07118b5d02..f927515894c3 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -5,15 +5,15 @@ isPyPy, # build-system - cython, - setuptools, - setuptools-scm, - packaging, cffi, + cython, + cmake, + ninja, + packaging, + pathspec, + scikit-build-core, - # dependencies - - py, + # checks pytestCheckHook, python, pythonOlder, @@ -24,25 +24,29 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "25.1.2"; + version = "26.0.3"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-k/GqMR6LuRLjTwBM8YZAek6Q7sTw7MDv0mBWv37aAiY="; + hash = "sha256-26fZ8uBH36K8o7AfT4SqUkZyUgPWKE43kPLKFfumtAo="; }; - nativeBuildInputs = [ - setuptools - setuptools-scm + build-system = [ + cmake + ninja packaging + pathspec + scikit-build-core ] ++ (if isPyPy then [ cffi ] else [ cython ]); + dontUseCmakeConfigure = true; + buildInputs = [ zeromq ]; - propagatedBuildInputs = lib.optionals isPyPy [ cffi ]; + dependencies = lib.optionals isPyPy [ cffi ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index e585051f5aa8..e5a2688d0011 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "qcelemental"; - version = "0.27.1"; + version = "0.28.0"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-dlcfIUKAg6yc4S3RXVJ1sKM29E1ZvHY82kjx1CM8/08="; + hash = "sha256-2pb924jBcB+BKyU2mmoWnTXy1URsN8YuhgSMsPGxaKI="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index ede69b5ebeb6..e0bbde85f66b 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -19,6 +19,7 @@ ipython, ipywidgets, jsonschema, + libcst, matplotlib, numpy, opentelemetry-api, @@ -63,7 +64,7 @@ buildPythonPackage rec { pname = "qcodes"; - version = "0.45.0"; + version = "0.46.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -72,7 +73,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "Qcodes"; rev = "refs/tags/v${version}"; - hash = "sha256-H91CpvxGQW0X+m/jlqXMc1RdI9w62lt5jgYOxZ2iPQg="; + hash = "sha256-CeAX3sBE21v68KnCe8z28WTc7zMPA7usRRGh+dNijjo="; }; build-system = [ @@ -132,6 +133,9 @@ buildPythonPackage rec { opencensus opencensus-ext-azure ]; + refactor = [ + libcst + ]; zurichinstruments = [ # zhinst-qcodes ]; @@ -140,6 +144,7 @@ buildPythonPackage rec { nativeCheckInputs = [ deepdiff hypothesis + libcst lxml pip pytest-asyncio diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 0847a10ce625..181fb7585e20 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -15,7 +15,6 @@ python-dateutil, pythonAtLeast, pythonOlder, - pythonRelaxDepsHook, respx, retrying, rfc3339, @@ -24,7 +23,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.25.1"; + version = "0.25.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +32,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-GtHAV4BvBdexjJxlT1jcNklSogYor2aWoQI2QNs/dOQ="; + hash = "sha256-MkM7cRgDGjW8nh4JOqH0aKKlTV5qpQDLCR5kGfdKp2A="; }; patches = [ @@ -54,7 +53,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ attrs diff --git a/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock b/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock index fc65e87b236e..58d71179d4cf 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock +++ b/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock @@ -1121,7 +1121,7 @@ dependencies = [ "futures-util", "http", "hyper", - "rustls 0.21.10", + "rustls 0.21.11", "tokio", "tokio-rustls 0.24.1", ] @@ -1283,14 +1283,13 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "9.2.0" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" +checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ "base64 0.21.7", - "js-sys", "pem", - "ring 0.17.8", + "ring 0.16.20", "serde", "serde_json", "simple_asn1", @@ -1880,12 +1879,11 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "3.0.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ - "base64 0.21.7", - "serde", + "base64 0.13.1", ] [[package]] @@ -2124,7 +2122,7 @@ dependencies = [ [[package]] name = "qcs" -version = "0.21.7" +version = "0.21.10" dependencies = [ "assert2", "async-trait", @@ -2184,9 +2182,9 @@ dependencies = [ [[package]] name = "qcs-api-client-common" -version = "0.7.12" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96a94ca1f4ac3e094d51d90deb5d158dddfd0723cca1b50d302acfd2e4e78ef" +checksum = "53c56fa367070074f32143b4adef924af1441faa86e835f45371e14801884d14" dependencies = [ "async-trait", "backoff", @@ -2207,9 +2205,9 @@ dependencies = [ [[package]] name = "qcs-api-client-grpc" -version = "0.7.14" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b82196be0676c8dc24749a830e886ffda6e34b3130c6a7078354c24dec07933a" +checksum = "01247ae1b0523e058007edb0132cd40915452b8b4dc669d68156e187740ead70" dependencies = [ "backoff", "http", @@ -2240,9 +2238,9 @@ dependencies = [ [[package]] name = "qcs-api-client-openapi" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e318c4bffb689688d4f95afb2b5a52a70e12a191da402e0dded093102fcb1e9" +checksum = "04d7172e79b083a85c911917c03be58eda083b36ea7575db685d21aa2fa99b41" dependencies = [ "anyhow", "qcs-api-client-common", @@ -2260,7 +2258,7 @@ dependencies = [ [[package]] name = "qcs-sdk-python" -version = "0.17.7" +version = "0.17.10" dependencies = [ "async-trait", "numpy", @@ -2290,8 +2288,8 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quil-rs" -version = "0.25.1" -source = "git+https://github.com/rigetti/quil-rs?tag=quil-py/v0.9.1#4179fb03feff6b83edfb7a0448b0b3967ed28212" +version = "0.26.0" +source = "git+https://github.com/rigetti/quil-rs?tag=quil-py/v0.10.0#25966563850ed151fad0cdab3f6931bdd90be8f8" dependencies = [ "approx", "indexmap 2.2.6", @@ -2436,7 +2434,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.10", + "rustls 0.21.11", "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", "serde", @@ -2491,14 +2489,15 @@ dependencies = [ [[package]] name = "rigetti-pyo3" -version = "0.3.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff977cba40f2cadf214226cf51c9729a4f5730a5413f901246eed78cb6e795c9" +checksum = "c59068763670399bb3e895a17cc631d9214c3172b64fc74d3ab63dac7371c340" dependencies = [ "num-complex", "num-traits", "paste", "pyo3", + "time", ] [[package]] @@ -2628,9 +2627,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" dependencies = [ "log", "ring 0.17.8", @@ -2640,9 +2639,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring 0.17.8", @@ -3290,7 +3289,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.10", + "rustls 0.21.11", "tokio", ] @@ -3300,7 +3299,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] diff --git a/pkgs/development/python-modules/qcs-sdk-python/default.nix b/pkgs/development/python-modules/qcs-sdk-python/default.nix index b47603e24a55..86421d7d84a3 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/default.nix +++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qcs-sdk-python"; - version = "0.17.7"; + version = "0.17.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,13 +24,13 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-sdk-rust"; rev = "python/v${version}"; - hash = "sha256-6Rh5gQH+ObpWGR9rYJfkXnGfG1GjKLn+ckiR7RhKzoE="; + hash = "sha256-pBh7g4MH5hL3k458q6UhkW/5/HdFm4ELnJHIl0wQFGE="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "quil-rs-0.25.1" = "sha256-zC4DEjCN6y9XeZlzmXHSTbVTpFQ4Srozix89IHDhHXc="; + "quil-rs-0.26.0" = "sha256-Er4sl47i6TbcbG3JHHexrOn/Sdd5mLTl5R+eA7heBVg="; }; }; diff --git a/pkgs/development/python-modules/qdldl/default.nix b/pkgs/development/python-modules/qdldl/default.nix index 86054ca65b9d..4491788552c7 100644 --- a/pkgs/development/python-modules/qdldl/default.nix +++ b/pkgs/development/python-modules/qdldl/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "qdldl"; - version = "0.1.7.post2"; + version = "0.1.7.post3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-SxU5pewQzHV6/XFW1960AGAHythtd0yfD9w+NEFVV9M="; + hash = "sha256-WbOqK6IkyvI3StJArXmmlbxHdjnGTjFkzvTyyZyHzx0="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 1ccb60f07f34..b8e1280ceb3d 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -5,7 +5,6 @@ ipykernel, jupyter-core, jupyter-client, - ipython-genutils, pygments, pyqt5, pytestCheckHook, @@ -32,7 +31,6 @@ buildPythonPackage rec { dependencies = [ ipykernel - ipython-genutils jupyter-core jupyter-client pygments diff --git a/pkgs/development/python-modules/qudida/default.nix b/pkgs/development/python-modules/qudida/default.nix index 5003b5860c5d..7e0bac314b25 100644 --- a/pkgs/development/python-modules/qudida/default.nix +++ b/pkgs/development/python-modules/qudida/default.nix @@ -5,7 +5,6 @@ numpy, opencv4, pythonOlder, - pythonRelaxDepsHook, scikit-learn, typing-extensions, }: @@ -22,7 +21,6 @@ buildPythonPackage rec { hash = "sha256-2xmOKIerDJqgAj5WWvv/Qd+3azYfhf1eE/eA11uhjMg="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRemoveDeps = [ "opencv-python" ]; diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index 654aeca183d1..ea6844159930 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -7,7 +7,6 @@ prompt-toolkit, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -26,7 +25,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "prompt_toolkit" ]; diff --git a/pkgs/development/python-modules/quil/default.nix b/pkgs/development/python-modules/quil/default.nix index c1530c320617..b03c8998e8c0 100644 --- a/pkgs/development/python-modules/quil/default.nix +++ b/pkgs/development/python-modules/quil/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "quil"; - version = "0.9.1"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,13 +22,13 @@ buildPythonPackage rec { owner = "rigetti"; repo = "quil-rs"; rev = "quil-py/v${version}"; - hash = "sha256-c9nFF74Mr6S2b7NthRVUnarwxFZ9s5RUaoxYruE6QvI="; + hash = "sha256-GJ39pvIqYs2bMGAHJL8OgB0OfmIpo/k3FxorYvdOvhI="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-FNkXdBLfKnrD9aUe25uJHi+TtApgFSCryYCY1r8ebho="; + hash = "sha256-VvnjdCFrpo/rDLNJrHpZoV+E+fQGgNW/nBOvMG91sHQ="; }; buildAndTestSubdir = "quil-py"; diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 2436fe3acd60..d248b962f0d3 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.8.8"; + version = "1.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-wAOmO5bev1zgPcJoiqKlS4anUKayo8HsncQXM+b1clQ="; + hash = "sha256-BNWP2uAJcEOCE92QakNI7Ils0iXRN5PUA9cSVrhDmx4="; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/pkgs/development/python-modules/radios/default.nix b/pkgs/development/python-modules/radios/default.nix index d66a41e2b343..241e95a18985 100644 --- a/pkgs/development/python-modules/radios/default.nix +++ b/pkgs/development/python-modules/radios/default.nix @@ -4,7 +4,6 @@ pythonOlder, fetchFromGitHub, poetry-core, - pythonRelaxDepsHook, aiodns, aiohttp, awesomeversion, @@ -41,7 +40,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "pycountry" ]; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 325c47600004..1d406e5d3508 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.9.3"; + version = "3.9.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-G1WveLVoeWkaKrHRFgCt8HVBnBYNdCb7/JVCm0L4dv8="; + hash = "sha256-Af5WTmvUVO91GfnnjVnShMB188XINBdmk2NWC80REdI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix index 48209fc9efca..aae91c7567e0 100644 --- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -6,7 +6,6 @@ fetchzip, substitute, - pythonRelaxDepsHook, pytestCheckHook, setuptools, @@ -73,8 +72,6 @@ buildPythonPackage { echo "from .rapidocr_onnxruntime.main import RapidOCR, VisRes" > __init__.py ''; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - # Upstream expects the source files to be under rapidocr_onnxruntime/rapidocr_onnxruntime # instead of rapidocr_onnxruntime for the wheel to build correctly. preBuild = '' diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index d0869e8afc08..cad6772ed22a 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -37,7 +37,6 @@ python, pythonAtLeast, pythonOlder, - pythonRelaxDepsHook, pyyaml, requests, scikit-image, @@ -112,7 +111,6 @@ buildPythonPackage rec { nativeBuildInputs = [ autoPatchelfHook - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/readability-lxml/default.nix b/pkgs/development/python-modules/readability-lxml/default.nix index 5c772879dcc7..e676918cb698 100644 --- a/pkgs/development/python-modules/readability-lxml/default.nix +++ b/pkgs/development/python-modules/readability-lxml/default.nix @@ -7,6 +7,7 @@ chardet, cssselect, lxml, + lxml-html-clean, timeout-decorator, }: @@ -26,6 +27,7 @@ buildPythonPackage rec { chardet cssselect lxml + lxml-html-clean ]; postPatch = '' diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix index 24b267d688ad..e4c545ad48fd 100644 --- a/pkgs/development/python-modules/redis-om/default.nix +++ b/pkgs/development/python-modules/redis-om/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, unasync, poetry-core, python, @@ -35,7 +34,6 @@ buildPythonPackage rec { }; build-system = [ - pythonRelaxDepsHook unasync poetry-core ]; diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 31b2da5d6d3f..a55e5b293bb4 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "redis"; - version = "5.0.3"; + version = "5.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SXO650RMD77WSga4dEb3k2HLfk7BU4wCLWlu16UBVYA="; + hash = "sha256-OEc818Y4mtPkSpH0w+r2vLip90YAfym/T7IIJP8LIZc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 76506e1f0f9b..4434ff860134 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2023.12.25"; + version = "2024.5.15"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-KRcaoSjaaa/fS95BLVvtwzXyyo/P5EiQOFd9BfFhgeU="; + hash = "sha256-0+4C2eX0gsyDCRNKke6qy90iYboRGw/vN0jutJE+aiw="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index 708e0acc5324..dedab0bbc95e 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, # build deps poetry-core, @@ -32,7 +31,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "pytest" ]; diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index a295c2654513..40939cd6f295 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.2.3"; + version = "0.2.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = "renault-api"; rev = "refs/tags/v${version}"; - hash = "sha256-+QqiD4mMfzlHmSiriaS0JzbMdOGCG7cg/xv6zJaPSOU="; + hash = "sha256-dr830PDGiTpiWCHsgxDspVyk6isOVsdGhB/jL96CDic="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index e681e1f6d555..99e91d683cfb 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.9.3"; + version = "0.9.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-tCT43wbDScL/aoQFmLPkrw59a88f4qpNeNa0Q27H9wA="; + hash = "sha256-Iv9WDxtnSXZC++8m6+cr7jG6yNXkK0KR5tyUIzQ4Na0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 48e0065bc564..61ff8046da7d 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -18,7 +18,7 @@ let in buildPythonPackage rec { pname = "reportlab"; - version = "4.2.0"; + version = "4.2.2"; pyproject = true; # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-R0+yjWNDGl1H11yQ1YA5MFDffUkaCceHffMpGi6fbQo="; + hash = "sha256-dl7svdaEkcVpR+KcOLi2m4NO5du90vt0CfCOvevwRCg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index 626f674d7b9b..2bd4a8112233 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -16,7 +16,6 @@ pytest, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, pyyaml, reptor, requests, @@ -49,7 +48,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ asgiref diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix index e8fb4e1e9665..7548fb3c6f84 100644 --- a/pkgs/development/python-modules/reqif/default.nix +++ b/pkgs/development/python-modules/reqif/default.nix @@ -9,7 +9,6 @@ pytestCheckHook, python, pythonOlder, - pythonRelaxDepsHook, xmlschema, }: @@ -35,7 +34,6 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-ntlm/default.nix b/pkgs/development/python-modules/requests-ntlm/default.nix index 347bf8cbee72..baa445aeb17c 100644 --- a/pkgs/development/python-modules/requests-ntlm/default.nix +++ b/pkgs/development/python-modules/requests-ntlm/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "requests-ntlm"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; src = fetchPypi { pname = "requests_ntlm"; inherit version; - hash = "sha256-M8KF9QdOMXy90zjRma+kanwBEy5cER02vUFVNOm5Fqg="; + hash = "sha256-spzCRiYj3/35uIxD4YDMtzW0AHIopUIiDogsWK5Wxmg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index 46d63b3a8c27..27b2ae885573 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "requests-oauthlib"; - version = "1.3.1"; + version = "2.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-db6sSkeIHuuU1epdatMe+IhWr/4jMrmq+1LGRSzPDXo="; + hash = "sha256-s9/669iE2M13hJQ2lgOp57WNKREb9rQb3C3NhyA69Ok="; }; propagatedBuildInputs = [ @@ -37,6 +37,9 @@ buildPythonPackage rec { "test_url_is_native_str" ]; + # Requires selenium and chrome + disabledTestPaths = [ "tests/examples/test_native_spa_pkce_auth0.py" ]; + pythonImportsCheck = [ "requests_oauthlib" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix index 68af7fcca277..3f17d6048a2d 100644 --- a/pkgs/development/python-modules/resend/default.nix +++ b/pkgs/development/python-modules/resend/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resend"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "resend"; repo = "resend-python"; rev = "refs/tags/v${version}"; - hash = "sha256-AYCymWYibCeBG8B5uqqslEMF/Rdz9NAGC1D422FPKmU="; + hash = "sha256-Kk80+3oub32jIj2epTeunAfvYSSoP0GyZC4dhnYb8SM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix index 1dae80096035..7f6ea4561385 100644 --- a/pkgs/development/python-modules/respx/default.nix +++ b/pkgs/development/python-modules/respx/default.nix @@ -8,25 +8,32 @@ pytest-asyncio, pytestCheckHook, pythonOlder, + setuptools, starlette, trio, }: buildPythonPackage rec { pname = "respx"; - version = "0.20.2"; - format = "setuptools"; + version = "0.21.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "lundberg"; - repo = pname; + repo = "respx"; rev = version; - hash = "sha256-OiBKNK8V9WNQDe29Q5+E/jjBWD0qFcYUzhYUWA+7oFc="; + hash = "sha256-sBb9HPvX+AKJUMWBME381F2amYdQmBiM8OguGW3lFG0="; }; - propagatedBuildInputs = [ httpx ]; + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + build-system = [ setuptools ]; + + dependencies = [ httpx ]; nativeCheckInputs = [ httpcore @@ -38,10 +45,6 @@ buildPythonPackage rec { trio ]; - postPatch = '' - sed -i "/--cov/d" setup.cfg - ''; - disabledTests = [ "test_pass_through" ]; pythonImportsCheck = [ "respx" ]; @@ -50,7 +53,7 @@ buildPythonPackage rec { description = "Python library for mocking HTTPX"; homepage = "https://lundberg.github.io/respx/"; changelog = "https://github.com/lundberg/respx/blob/${version}/CHANGELOG.md"; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/result/default.nix b/pkgs/development/python-modules/result/default.nix index 4278bcf3b391..db123e031067 100644 --- a/pkgs/development/python-modules/result/default.nix +++ b/pkgs/development/python-modules/result/default.nix @@ -5,18 +5,24 @@ pytestCheckHook, pytest-asyncio, nix-update-script, + setuptools, + wheel, }: buildPythonPackage rec { pname = "result"; - version = "0.16.1"; - format = "setuptools"; + version = "0.17.0"; + pyproject = true; + build-system = [ + setuptools + wheel + ]; src = fetchFromGitHub { owner = "rustedpy"; repo = "result"; rev = "v${version}"; - hash = "sha256-7BvFIQbl4Udd9GTpbMrAqP0P1BGn/C1CHQ3QUCEMXPs="; + hash = "sha256-o+7qKxGQCeMUnsmEReggvf+XwQWFHRCYArYk3DxCa50="; }; postPatch = '' diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix index 5ef01b9dd974..38424a22b927 100644 --- a/pkgs/development/python-modules/reuse/default.nix +++ b/pkgs/development/python-modules/reuse/default.nix @@ -3,37 +3,46 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + + # dependencies + attrs, binaryornot, boolean-py, debian, jinja2, license-expression, + tomlkit, + + # test dependencies + freezegun, pytestCheckHook, }: buildPythonPackage rec { pname = "reuse"; - version = "3.0.2"; + version = "4.0.3"; pyproject = true; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "refs/tags/v${version}"; - hash = "sha256-ZYmQtJ503HDmu+Cd6IxOrCcOVH+CcFnFe3oe6PqvcE0="; + hash = "sha256-oKtQBT8tuAk4S/Sygp4qxLk4ADWDTG0MbVaL5O2qsuA="; }; build-system = [ poetry-core ]; dependencies = [ + attrs binaryornot boolean-py debian jinja2 license-expression + tomlkit ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook freezegun ]; disabledTestPaths = [ # pytest wants to execute the actual source files for some reason, which fails with ImportPathMismatchError() diff --git a/pkgs/development/python-modules/rich-pixels/default.nix b/pkgs/development/python-modules/rich-pixels/default.nix index cda87a534fc4..62ce70c52576 100644 --- a/pkgs/development/python-modules/rich-pixels/default.nix +++ b/pkgs/development/python-modules/rich-pixels/default.nix @@ -2,13 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, hatchling, pillow, + rich, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, - rich, syrupy, }: diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index 9b62f910e17e..7491f3fa5e51 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -30,6 +30,8 @@ buildPythonPackage rec { hash = "sha256-CcnGfiJuv3hzez/G/Nu4OyruPL+bbSAtMAfGruqyPUU="; }; + pythonRelaxDeps = [ "requests-oauthlib" ]; + build-system = [ poetry-core ]; dependencies = [ diff --git a/pkgs/development/python-modules/riscv-config/default.nix b/pkgs/development/python-modules/riscv-config/default.nix index b8762769b10c..c03e97c6232e 100644 --- a/pkgs/development/python-modules/riscv-config/default.nix +++ b/pkgs/development/python-modules/riscv-config/default.nix @@ -7,7 +7,6 @@ pyyaml, ruamel-yaml, setuptools, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -28,7 +27,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ cerberus diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix index 85990fda4809..fee5c590de51 100644 --- a/pkgs/development/python-modules/rising/default.nix +++ b/pkgs/development/python-modules/rising/default.nix @@ -5,7 +5,6 @@ pythonOlder, fetchFromGitHub, pytestCheckHook, - pythonRelaxDepsHook, dill, lightning-utilities, numpy, @@ -27,7 +26,6 @@ buildPythonPackage rec { hash = "sha256-sBzVTst5Tp2oZZ+Xsg3M7uAMbucL6idlpYwHvib3EaY="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "lightning-utilities" ]; diff --git a/pkgs/development/python-modules/rmrl/default.nix b/pkgs/development/python-modules/rmrl/default.nix index f07165c23c18..0dc783881414 100644 --- a/pkgs/development/python-modules/rmrl/default.nix +++ b/pkgs/development/python-modules/rmrl/default.nix @@ -4,7 +4,6 @@ pythonOlder, fetchFromGitHub, poetry-core, - pythonRelaxDepsHook, pdfrw, reportlab, rmscene, @@ -30,7 +29,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/rmscene/default.nix b/pkgs/development/python-modules/rmscene/default.nix index e402463eca6b..7da1d58a976d 100644 --- a/pkgs/development/python-modules/rmscene/default.nix +++ b/pkgs/development/python-modules/rmscene/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, pythonOlder, - pythonRelaxDepsHook, fetchFromGitHub, poetry-core, packaging, @@ -26,7 +25,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "packaging" ]; diff --git a/pkgs/development/python-modules/rnginline/default.nix b/pkgs/development/python-modules/rnginline/default.nix index c868150bb98b..966dec934aa2 100644 --- a/pkgs/development/python-modules/rnginline/default.nix +++ b/pkgs/development/python-modules/rnginline/default.nix @@ -3,7 +3,6 @@ fetchPypi, buildPythonPackage, poetry-core, - pythonRelaxDepsHook, lxml, docopt-ng, typing-extensions, @@ -31,7 +30,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ docopt-ng diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix index 9c4b5b7da1c9..87db63bab3a8 100644 --- a/pkgs/development/python-modules/roadrecon/default.nix +++ b/pkgs/development/python-modules/roadrecon/default.nix @@ -11,7 +11,6 @@ marshmallow-sqlalchemy, openpyxl, pythonOlder, - pythonRelaxDepsHook, roadlib, setuptools, sqlalchemy, @@ -32,7 +31,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "flask" ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 795e31cb701c..69ca0941df4d 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -5,7 +5,6 @@ buildPythonPackage, fetchPypi, pyparsing, - pythonRelaxDepsHook, robotframework, setuptools, }: @@ -22,7 +21,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix index 00a8793f36dc..e2196301166a 100644 --- a/pkgs/development/python-modules/roombapy/default.nix +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -11,7 +11,6 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, tabulate, }: @@ -31,7 +30,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "orjson" ]; diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index 0b7a74166a91..3b6747759867 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.17.1"; + version = "0.18.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,13 +21,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-AhCyZo8kwHgwcmC/iL2snW8Qk2Nd9RI3ib/uTY1/yOc="; + hash = "sha256-3Ei0edVAdwyBH70eubortmlRhj5Ejv7C4sECYlMo6S8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-sFutrKLa2ISxtUN7hmw2P02nl4SM6Hn4yj1kkXrNWmI="; + hash = "sha256-caNEmU3K5COYa/UImE4BZYaFTc3Csi3WmnBSbFN3Yn8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rst2pdf/default.nix b/pkgs/development/python-modules/rst2pdf/default.nix index ae81f6d2ff31..40225a9acb03 100644 --- a/pkgs/development/python-modules/rst2pdf/default.nix +++ b/pkgs/development/python-modules/rst2pdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "rst2pdf"; - version = "0.101"; + version = "0.102"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-AF8FssEIFHmeY2oVrAPNe85pbmgKWO52yD6ycNNzTSg="; + hash = "sha256-NzAGJOlTpz7d3cuubyRjDvVGfCC+61jfZIrcUwhE9CU="; }; outputs = [ diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index 0f4fe3a9966f..fe83ca2e32dc 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -1,20 +1,19 @@ { lib, buildPythonPackage, - cargo, fetchFromGitHub, libiconv, + dirty-equals, + pytest-benchmark, pytestCheckHook, pythonOlder, rustPlatform, - rustc, - setuptools-rust, }: buildPythonPackage rec { pname = "rtoml"; - version = "0.8"; - format = "setuptools"; + version = "0.10"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,30 +21,39 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - hash = "sha256-tvX4KcQGw0khBjEXVFmkhsVyAkdr2Bgm6IfD1yGZ37c="; + hash = "sha256-1movtKMQkQ6PEpKpSkK0Oy4AV0ee7XrS0P9m6QwZTaM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-KcF3Z71S7ZNZicViqwpClfT736nYYbKcKWylOP+S3HI="; + hash = "sha256-BWcOIZMl4yHxxKxCn6Qh69MlMdz3REp3izN0A1eFX3o="; }; - nativeBuildInputs = with rustPlatform; [ - setuptools-rust - rustc - cargo - rustPlatform.cargoSetupHook + build-system = with rustPlatform; [ + cargoSetupHook + maturinBuildHook ]; buildInputs = [ libiconv ]; pythonImportsCheck = [ "rtoml" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + dirty-equals + pytest-benchmark + pytestCheckHook + ]; + + pytestFlagsArray = [ "--benchmark-disable" ]; + + disabledTests = [ + # TypeError: loads() got an unexpected keyword argument 'name' + "test_load_data_toml" + ]; preCheck = '' - cd tests + rm -rf rtoml ''; meta = with lib; { diff --git a/pkgs/development/python-modules/rubicon-objc/default.nix b/pkgs/development/python-modules/rubicon-objc/default.nix index 9b558e9a9fec..f24e49364f0a 100644 --- a/pkgs/development/python-modules/rubicon-objc/default.nix +++ b/pkgs/development/python-modules/rubicon-objc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "rubicon-objc"; - version = "0.4.8"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,12 +20,12 @@ buildPythonPackage rec { owner = "beeware"; repo = "rubicon-objc"; rev = "refs/tags/v${version}"; - hash = "sha256-aFKzLeVYn5u8hTEgXCum3XpZxI7C/Wql41jkWkCF0HQ="; + hash = "sha256-jQ/q2yIXJp+X4ajcbEqxXuYtYeyZJ1xTBjSlzqLuRpg="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==69.2.0" "setuptools" \ + --replace-fail "setuptools==69.5.1" "setuptools" \ --replace-fail "setuptools_scm==8.0.4" "setuptools_scm" ''; diff --git a/pkgs/development/python-modules/ryd-client/default.nix b/pkgs/development/python-modules/ryd-client/default.nix new file mode 100644 index 000000000000..958a96b2c3b7 --- /dev/null +++ b/pkgs/development/python-modules/ryd-client/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + requests, +}: +buildPythonPackage rec { + pname = "ryd-client"; + version = "0.0.6"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-PxrVdVw+dAkF8WWzYyg2/B5CFurNPA5XRNtH9uu/SiY="; + }; + + build-system = [ setuptools ]; + dependencies = [ requests ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "ryd_client" ]; + + meta = { + description = "Python client library for the Return YouTube Dislike API"; + homepage = "https://github.com/bbilly1/ryd-client"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ericthemagician ]; + }; +} diff --git a/pkgs/development/python-modules/s2clientprotocol/default.nix b/pkgs/development/python-modules/s2clientprotocol/default.nix index ea4dc582c547..a4a729ce4280 100644 --- a/pkgs/development/python-modules/s2clientprotocol/default.nix +++ b/pkgs/development/python-modules/s2clientprotocol/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "StarCraft II - client protocol"; - homepage = "https://github.com/Blizzard/sc2client-proto"; + homepage = "https://github.com/Blizzard/s2client-proto"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 5869e9af74d9..426e65615bb0 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2024.3.1"; + version = "2024.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-G4vI29Zee2D1SHN49u7/4d5ZqnLKqe/Kba1quHdAVIc="; + hash = "sha256-pZAg7e3GHpZm8eRzzkqih2Tl97PJdBS+sVzZvlIqh7Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sabctools/default.nix b/pkgs/development/python-modules/sabctools/default.nix index b41c3c18a799..c8e1e294ef1d 100644 --- a/pkgs/development/python-modules/sabctools/default.nix +++ b/pkgs/development/python-modules/sabctools/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { pname = "sabctools"; - version = "8.2.0"; # needs to match version sabnzbd expects, e.g. https://github.com/sabnzbd/sabnzbd/blob/4.0.x/requirements.txt#L3 + version = "8.2.3"; # needs to match version sabnzbd expects, e.g. https://github.com/sabnzbd/sabnzbd/blob/4.0.x/requirements.txt#L3 pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-dOMNZoKWQxHJt6yHiNKVtpnYvLJkK8nktOm+djsSTcM="; + hash = "sha256-cP3GCp2mGivtjyA76vqtO7mJyZjHeNkvBLl2kXxOT5w="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/sacn/default.nix b/pkgs/development/python-modules/sacn/default.nix index 58e87ec60ed1..4153fe1aa811 100644 --- a/pkgs/development/python-modules/sacn/default.nix +++ b/pkgs/development/python-modules/sacn/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sacn"; - version = "1.9.1"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ppXWRBZVm4QroxZ19S388sRuI5zpaDgJrJqhnwefr3k="; + hash = "sha256-Z2Td/tdXYfQ9/QvM1NeT/OgQ/TYa3CQtWo8O1Dl3+Ao="; }; # no tests diff --git a/pkgs/development/python-modules/safety-schemas/default.nix b/pkgs/development/python-modules/safety-schemas/default.nix index 14774300b1f3..c94427bdf083 100644 --- a/pkgs/development/python-modules/safety-schemas/default.nix +++ b/pkgs/development/python-modules/safety-schemas/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, hatchling, - pythonRelaxDepsHook, dparse, packaging, pydantic, @@ -24,7 +23,6 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "dparse" ]; diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 2399e4e977fe..3999897c9082 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchPypi, - pythonRelaxDepsHook, setuptools, click, urllib3, @@ -49,7 +48,6 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index c96ad040dc2c..23906dc2d9a3 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -4,7 +4,6 @@ pythonOlder, fetchFromGitHub, fetchpatch, - pythonRelaxDepsHook, setuptools, attrs, boto3, @@ -33,7 +32,7 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.219.0"; + version = "2.224.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +41,7 @@ buildPythonPackage rec { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-TZpRRkoAlXU+Ccgxq49t+Cz0JOIUvYp7ok3x3sphncE="; + hash = "sha256-Kc66sygHGFqMvSY7rACb62wJEJesnN4KDmtYZLIOsqc="; }; patches = [ @@ -60,7 +59,6 @@ buildPythonPackage rec { build-system = [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/sarif-tools/default.nix b/pkgs/development/python-modules/sarif-tools/default.nix index 20fdc0343457..911e21198b8a 100644 --- a/pkgs/development/python-modules/sarif-tools/default.nix +++ b/pkgs/development/python-modules/sarif-tools/default.nix @@ -11,7 +11,6 @@ pyyaml, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -30,7 +29,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index 1d635edbedd9..4d2f02313d48 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "scalene"; - version = "1.5.41"; + version = "1.5.42.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-akjxv9Qot2lGntZxkxfFqz65VboL1qduykfjyEg1Ivg="; + hash = "sha256-0ZGk0xFBFSeeg4vjNXu/ppGdEKGhUc2ql4R6oWG23aQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index 98a80ee7b07d..102d4d6adc83 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -2,24 +2,21 @@ lib, buildPythonPackage, fetchPypi, - mock, pythonOlder, }: buildPythonPackage rec { pname = "schedule"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hDvAU4uZyT8CuLUOPjmIbAby0AOyT0jhqkyt+j80Enk="; + hash = "sha256-Ff6cdf5f2blifz8ZzA7xQgUI+fmkb0XNB2nvde3l8Lc="; }; - buildInputs = [ mock ]; - preCheck = '' # https://github.com/dbader/schedule/issues/488 substituteInPlace test_schedule.py --replace \ diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 0010df2ab13c..4df6f0af21f0 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -9,7 +9,6 @@ mypy, mypy-extensions, pytestCheckHook, - pythonRelaxDepsHook, pythonOlder, rdflib, requests, diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index 7bf1de67593b..9ffeb56f887d 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -5,22 +5,20 @@ mock, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { pname = "schema"; - version = "0.7.5"; + version = "0.7.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8GcXESxhiVyrxHB3UriHFuhCCogZ1xQEUB4RT5EEMZc="; + hash = "sha256-faVTq9KVihncJUfDiM3lM5izkZYXWpvlnqHK9asKGAc="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRemoveDeps = [ "contextlib2" ]; diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index a3b5467b70d7..6a3c7d25f9cf 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -11,6 +11,7 @@ importlib-resources, iso3166, pycountry, + rstr, # optional-dependencies pydantic, @@ -23,34 +24,35 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2024.4.0"; + version = "2024.6.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-1EV2oi2LBcjw2U7nKqdVUVDlFCzR8RqX5tVIciw1trg="; + hash = "sha256-32+YpDIXcgldwtxU5s9V6cong70EiyEgf9QCNYdEvp0="; }; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ iso3166 pycountry + rstr ] ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ]; - passthru.optional-dependencies = { + optional-dependencies = { pydantic = [ pydantic ]; }; nativeCheckInputs = [ pytest-cov pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "schwifty" ]; diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index 91795a3484a5..f9081c6265c4 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -23,13 +23,13 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.8.2"; + version = "0.9.6"; pyproject = true; src = fetchPypi { pname = "scikit_build_core"; inherit version; - hash = "sha256-UOwkuVaMmqbicjPe6yl4kyvHmFYhKzBXXL+kBJZVxDY="; + hash = "sha256-e+r5M89zSsvrttlsApNlQQIkcJvN5o87C08MsD4FSTk="; }; postPatch = lib.optionalString (pythonOlder "3.11") '' @@ -73,6 +73,7 @@ buildPythonPackage rec { disabledTestPaths = [ # runs pip, requires network access "tests/test_custom_modules.py" + "tests/test_hatchling.py" "tests/test_pyproject_pep517.py" "tests/test_pyproject_pep518.py" "tests/test_pyproject_pep660.py" diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index b5ee709b7f62..fb58a91c68e5 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch, fetchPypi, meson-python, numpy, @@ -10,35 +9,15 @@ buildPythonPackage rec { pname = "scikit-fmm"; - version = "2023.4.2"; + version = "2024.5.29"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-14ccR/ggdyq6kvJWUe8U5NJ96M45PArjwCqzxuJCPAs="; + pname = "scikit_fmm"; + inherit version; + hash = "sha256-sy7J5UKXhuL5K8zr3lBulUMekwNlBFfC8C2VzguVTUE="; }; - # TODO: Remove these patches after another stable release is made. - # For now, these allow us to build with Python 3.12+ by switching to Meson - # and off the deprecated distutils. - patches = [ - (fetchpatch { - name = "first-try-at-meson-build.patch"; - hash = "sha256-Kclg4YrQZL6ZSVsLh6X6DqdztPjDK35L5dp5PqYjzaY="; - url = "https://github.com/scikit-fmm/scikit-fmm/commit/a52c0eccb70077553607a5084152316d136b668b.patch"; - }) - (fetchpatch { - name = "work-in-progress-on-meson-build.patch"; - hash = "sha256-WvSwBz7exqe1H+CqdoMfT5jEoIHnyt/nbc/CryuEKiA="; - url = "https://github.com/scikit-fmm/scikit-fmm/commit/db0e7a5f51541745027c3d081d7841e74587793e.patch"; - }) - (fetchpatch { - name = "re-cythonize-the-heap-wrapper.patch"; - hash = "sha256-ro97+06R0szXQ9I8/sR4JAnFxoQwJeiImDcl1Yp9P0Y="; - url = "https://github.com/scikit-fmm/scikit-fmm/commit/4168323e209343facd5f6ba93a85893242e781a2.patch"; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "oldest-supported-numpy" "numpy" diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 591df46640db..717a732327f7 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -7,16 +7,14 @@ # build-system cython, gfortran, + meson-python, numpy, scipy, - setuptools, - wheel, # native dependencies glibcLocales, llvmPackages, pytestCheckHook, - pythonRelaxDepsHook, pytest-xdist, pillow, joblib, @@ -26,20 +24,24 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.4.2"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-2qHEcdlbrQgMbkS0lGyTkKSEKtwwglcsIOT4iE456Vk="; + pname = "scikit_learn"; + inherit version; + hash = "sha256-eJ49sBx1DtbUlvott9UGN4V7RR5XvK6GO/9wfBJHvvc="; }; - # Avoid build-system requirements causing failure - prePatch = '' + postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "numpy==2.0.0rc1" "numpy" + --replace-fail "numpy>=2.0.0rc2" "numpy" + + substituteInPlace meson.build --replace-fail \ + "run_command('sklearn/_build_utils/version.py', check: true).stdout().strip()," \ + "'${version}'," ''; buildInputs = [ @@ -50,15 +52,13 @@ buildPythonPackage rec { nativeBuildInputs = [ gfortran - pythonRelaxDepsHook ]; build-system = [ cython + meson-python numpy scipy - setuptools - wheel ]; dependencies = [ diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index 1f14444417e4..79a27c1dfaaf 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "scikit-rf"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "scikit-rf"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TtRj9pqm5153y78MzhlVpL1EvNiNJyjUH1aOlAWU0WE="; + hash = "sha256-xLgttefCRj8U2Wqif/28FiSjPjQn9YYCB+stlhZiIUo="; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index 7d2c270482e7..f5ddb753ffaf 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + pythonAtLeast, cython, enum34, gfortran, @@ -18,7 +19,8 @@ buildPythonPackage rec { pname = "scikits.odes"; version = "2.7.0"; - disabled = isPy27; + # https://github.com/bmcage/odes/issues/130 + disabled = isPy27 || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 1bd02b708089..43e256b1fba6 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -5,8 +5,8 @@ fetchpatch, fetchurl, writeText, + xcbuild, python, - pythonOlder, buildPythonPackage, cython, gfortran, @@ -22,8 +22,11 @@ numpy, pybind11, pooch, - libxcrypt, xsimd, + # Upstream has support for using Darwin's Accelerate package. However this + # requires a Darwin user to work on a nice way to do that via an override. + # See: + # https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L194-L211 blas, lapack, @@ -38,8 +41,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.13.1"; - srcHash = "sha256-KpTvBJhiJ/IBjIFQhvS+NhRP3tbyXU5gQnAiFv47sKU="; + version = "1.14.0"; + srcHash = "sha256-rNplvbDExmMfcPuvhs+y9j5/9G6QR1GdMgQLty6oi2c="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -100,6 +103,12 @@ buildPythonPackage { pkg-config wheel setuptools + ] ++ lib.optionals stdenv.isDarwin [ + # Minimal version required according to: + # https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L185-L188 + (xcbuild.override { + sdkVer = "13.3"; + }) ]; buildInputs = [ @@ -108,7 +117,7 @@ buildPythonPackage { pybind11 pooch xsimd - ] ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ]; + ]; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 3a31a78f2d85..e05a957ab9cf 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "3.3.1"; + version = "3.3.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "scmrepo"; rev = "refs/tags/${version}"; - hash = "sha256-swv5uWsyM4mEXlurizUewnbdAOtjWgvzCO9IPfz2ZPE="; + hash = "sha256-wmziU00n2EjpXw8f1NwFRTUvpOftj+wa9ZiXVDh5hco="; }; build-system = [ diff --git a/pkgs/development/python-modules/scramp/default.nix b/pkgs/development/python-modules/scramp/default.nix index db2a741ccd4f..53a8faaaa7ee 100644 --- a/pkgs/development/python-modules/scramp/default.nix +++ b/pkgs/development/python-modules/scramp/default.nix @@ -3,18 +3,17 @@ asn1crypto, buildPythonPackage, fetchFromGitHub, - importlib-metadata, + hatchling, pytest-mock, pytestCheckHook, pythonOlder, - setuptools, - wheel, + versioningit, }: buildPythonPackage rec { pname = "scramp"; - version = "1.4.4"; - format = "pyproject"; + version = "1.4.5"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,15 +21,15 @@ buildPythonPackage rec { owner = "tlocke"; repo = "scramp"; rev = version; - hash = "sha256-WOyv1fLSXG7p+WKs2QSwlsh8FSK/lxp6I1hPY0VIkKo="; + hash = "sha256-KpododRJ+CYRGBR7Sr5cVBhJvUwh9YmPERd/DAJqEcY="; }; - nativeBuildInputs = [ - setuptools - wheel + build-system = [ + hatchling + versioningit ]; - propagatedBuildInputs = [ asn1crypto ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + dependencies = [ asn1crypto ]; nativeCheckInputs = [ pytest-mock diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index c97b5fc5598a..f291798d0500 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -19,6 +19,7 @@ protego, pydispatcher, pyopenssl, + pytest-xdist, pytestCheckHook, pythonOlder, queuelib, @@ -47,6 +48,9 @@ buildPythonPackage rec { hash = "sha256-EaO1kQ3VSTwEW+r0kSKycOxHNTPwwCVjch1ZBrTU0qQ="; }; + pythonRelaxDeps = [ + "defusedxml" + ]; nativeBuildInputs = [ installShellFiles @@ -78,6 +82,7 @@ buildPythonPackage rec { glibcLocales jmespath pexpect + pytest-xdist pytestCheckHook sybil testfixtures diff --git a/pkgs/development/python-modules/segyio/add_missing_cstdint.patch b/pkgs/development/python-modules/segyio/add_missing_cstdint.patch new file mode 100644 index 000000000000..2c26d6e454b1 --- /dev/null +++ b/pkgs/development/python-modules/segyio/add_missing_cstdint.patch @@ -0,0 +1,47 @@ +From 64f06c0643f1f8691a8f2757496b60f1ab98c866 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sa=C3=AFd=20Benaissa?= +Date: Fri, 8 Dec 2023 21:51:32 +0100 +Subject: [PATCH] Add include for cstdint, fix segyio build on fedora + +--- + lib/experimental/segyio/segyio.hpp | 1 + + python/segyio/segyio.cpp | 1 + + python/setup.py | 2 +- + 3 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/experimental/segyio/segyio.hpp b/lib/experimental/segyio/segyio.hpp +index 706f07ff5..7ba3ffb99 100644 +--- a/lib/experimental/segyio/segyio.hpp ++++ b/lib/experimental/segyio/segyio.hpp +@@ -13,6 +13,7 @@ + #include + + #include ++#include + + /* + * KNOWN ISSUES AND TODOs: +diff --git a/python/segyio/segyio.cpp b/python/segyio/segyio.cpp +index 76da965c3..bd8a8622e 100644 +--- a/python/segyio/segyio.cpp ++++ b/python/segyio/segyio.cpp +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #if PY_MAJOR_VERSION >= 3 + #define IS_PY3K +diff --git a/python/setup.py b/python/setup.py +index 6c6553bc7..654075be9 100644 +--- a/python/setup.py ++++ b/python/setup.py +@@ -1,6 +1,6 @@ + import os + import sys +-import skbuild ++import skbuild # pip install scikit-build + import setuptools + + long_description = """ diff --git a/pkgs/development/python-modules/segyio/default.nix b/pkgs/development/python-modules/segyio/default.nix index aba2d06a5e2a..9e221db8cfe7 100644 --- a/pkgs/development/python-modules/segyio/default.nix +++ b/pkgs/development/python-modules/segyio/default.nix @@ -1,18 +1,23 @@ { lib, - stdenv, + buildPythonPackage, fetchFromGitHub, cmake, ninja, - python, scikit-build, pytest, numpy, }: -stdenv.mkDerivation rec { +buildPythonPackage rec { pname = "segyio"; version = "1.9.12"; + pyproject = false; # Built with cmake + + patches = [ + # https://github.com/equinor/segyio/pull/570 + ./add_missing_cstdint.patch + ]; postPatch = '' # Removing unecessary build dependency @@ -34,7 +39,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja - python scikit-build ]; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 4865e3f6636d..9009d6bf3c4f 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -9,6 +9,7 @@ trio, trio-websocket, typing-extensions, + websocket-client, urllib3, pytest-trio, nixosTests, @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.18.1"; + version = "4.22.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +29,7 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-1C9Epsk9rFlShxHGGzbWl6smrMzPn2h3yCWlzUIMpY8="; + hash = "sha256-qBuZgI5SSBwxbSBrAT0W/HzzV2JmPL00hPJ6s57QTeg="; }; preConfigure = '' @@ -61,6 +62,7 @@ buildPythonPackage rec { trio-websocket urllib3 typing-extensions + websocket-client ] ++ urllib3.optional-dependencies.socks; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index 2390b1b138be..ece4555cc3f4 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.18.0"; + version = "2.18.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wYYSS4lABCbIhmUU3z3Wh0+4zwpEzXl8Kk9gi6LBrbQ="; + hash = "sha256-9GdBKUhueis8pnQP5ZNxvEyRXVGINTueVzLOR4xx5mU="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/sentry-sdk/1.nix b/pkgs/development/python-modules/sentry-sdk/1.nix new file mode 100644 index 000000000000..3f57549a1e39 --- /dev/null +++ b/pkgs/development/python-modules/sentry-sdk/1.nix @@ -0,0 +1,136 @@ +{ + lib, + stdenv, + aiohttp, + apache-beam, + asttokens, + blinker, + bottle, + buildPythonPackage, + celery, + certifi, + chalice, + django, + executing, + falcon, + fetchFromGitHub, + flask, + gevent, + httpx, + jsonschema, + mock, + pure-eval, + pyrsistent, + pyspark, + pysocks, + pytest-forked, + pytest-localserver, + pytest-watch, + pytestCheckHook, + pythonOlder, + quart, + rq, + sanic, + setuptools, + sqlalchemy, + tornado, + urllib3, +}: + +buildPythonPackage rec { + pname = "sentry-sdk"; + version = "1.45.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "getsentry"; + repo = "sentry-python"; + rev = "refs/tags/${version}"; + hash = "sha256-OWoMqJlf0vmBHWWsW6mF4u5X9USzxkFmCJyX7Ws0dD0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + certifi + urllib3 + ]; + + passthru.optional-dependencies = { + aiohttp = [ aiohttp ]; + beam = [ apache-beam ]; + bottle = [ bottle ]; + celery = [ celery ]; + chalice = [ chalice ]; + django = [ django ]; + falcon = [ falcon ]; + flask = [ + flask + blinker + ]; + httpx = [ httpx ]; + pyspark = [ pyspark ]; + pure_eval = [ + asttokens + executing + pure-eval + ]; + quart = [ + quart + blinker + ]; + rq = [ rq ]; + sanic = [ sanic ]; + sqlalchemy = [ sqlalchemy ]; + tornado = [ tornado ]; + }; + + nativeCheckInputs = [ + asttokens + executing + gevent + jsonschema + mock + pure-eval + pyrsistent + pysocks + pytest-forked + pytest-localserver + pytest-watch + pytestCheckHook + ]; + + doCheck = !stdenv.isDarwin; + + disabledTests = [ + # Issue with the asseration + "test_auto_enabling_integrations_catches_import_error" + "test_default_release" + ]; + + disabledTestPaths = + [ + # Varius integration tests fail every once in a while when we + # upgrade dependencies, so don't bother testing them. + "tests/integrations/" + ] + ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [ + # test crashes on aarch64 + "tests/test_transport.py" + ]; + + pythonImportsCheck = [ "sentry_sdk" ]; + + meta = with lib; { + description = "Python SDK for Sentry.io"; + homepage = "https://github.com/getsentry/sentry-python"; + changelog = "https://github.com/getsentry/sentry-python/blob/${version}/CHANGELOG.md"; + license = licenses.bsd2; + maintainers = with maintainers; [ + fab + gebner + ]; + }; +} diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 3f57549a1e39..3e891a8ad6a5 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -1,136 +1,199 @@ -{ - lib, - stdenv, - aiohttp, - apache-beam, - asttokens, - blinker, - bottle, - buildPythonPackage, - celery, - certifi, - chalice, - django, - executing, - falcon, - fetchFromGitHub, - flask, - gevent, - httpx, - jsonschema, - mock, - pure-eval, - pyrsistent, - pyspark, - pysocks, - pytest-forked, - pytest-localserver, - pytest-watch, - pytestCheckHook, - pythonOlder, - quart, - rq, - sanic, - setuptools, - sqlalchemy, - tornado, - urllib3, +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools + +# dependencies +, certifi +, urllib3 + +# optional-dependencies +, aiohttp +, anthropic +, asyncpg +, apache-beam +, bottle +, celery +, celery-redbeat +, chalice +, clickhouse-driver +, django +, falcon +, fastapi +, flask +, blinker +, markupsafe +, grpcio +, protobuf +, httpx +, huey +, huggingface-hub +, langchain +, loguru +, openai +, tiktoken +, pure-eval +, executing +, asttokens +, pymongo +, pyspark +, quart +, rq +, sanic +, sqlalchemy +, starlette +, tornado + +# checks +, ipdb +, jsonschema +, pip +, pyrsistent +, pysocks +, pytest-asyncio +, pytestCheckHook +, pytest-forked +, pytest-localserver +, pytest-xdist +, pytest-watch +, responses }: buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.45.0"; + version = "2.7.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; - rev = "refs/tags/${version}"; - hash = "sha256-OWoMqJlf0vmBHWWsW6mF4u5X9USzxkFmCJyX7Ws0dD0="; + rev = version; + hash = "sha256-MxpG4R6kWozBR5RiSBI/rCSsM2Gv2XJcx8B3IV3LGVk="; }; - build-system = [ setuptools ]; + postPatch = '' + sed -i "/addopts =/d" pytest.ini + ''; + + build-system = [ + setuptools + ]; dependencies = [ certifi urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; + anthropic = [ anthropic ]; + # TODO: arq + asyncpg = [ asyncpg ]; beam = [ apache-beam ]; bottle = [ bottle ]; celery = [ celery ]; + celery-redbeat = [ celery-redbeat ]; chalice = [ chalice ]; + clickhouse-driver = [ clickhouse-driver ]; django = [ django ]; falcon = [ falcon ]; + fastapi = [ fastapi ]; flask = [ - flask blinker + flask + markupsafe + ]; + grpcio = [ + grpcio + protobuf ]; httpx = [ httpx ]; - pyspark = [ pyspark ]; + huey = [ huey ]; + huggingface-hub = [ huggingface-hub ]; + langchain = [ langchain ]; + loguru = [ loguru ]; + openai = [ + openai + tiktoken + ]; + # TODO: opentelemetry + # TODO: opentelemetry-experimental pure_eval = [ asttokens executing pure-eval ]; + pymongo = [ pymongo ]; + pyspark = [ pyspark ]; quart = [ - quart blinker + quart ]; rq = [ rq ]; sanic = [ sanic ]; sqlalchemy = [ sqlalchemy ]; + starlette = [ starlette ]; + # TODO: starlite tornado = [ tornado ]; }; nativeCheckInputs = [ - asttokens - executing - gevent - jsonschema - mock - pure-eval + ipdb pyrsistent + responses pysocks + setuptools + executing + jsonschema + pip + pytest-asyncio pytest-forked pytest-localserver + pytest-xdist pytest-watch pytestCheckHook ]; - doCheck = !stdenv.isDarwin; - disabledTests = [ - # Issue with the asseration - "test_auto_enabling_integrations_catches_import_error" + # depends on git revision "test_default_release" + # tries to pip install old setuptools version + "test_error_has_existing_trace_context_performance_disabled" + "test_error_has_existing_trace_context_performance_enabled" + "test_error_has_new_trace_context_performance_disabled" + "test_error_has_new_trace_context_performance_enabled" + "test_traces_sampler_gets_correct_values_in_sampling_context" + "test_performance_error" + "test_performance_no_error" + "test_timeout_error" + "test_handled_exception" + "test_unhandled_exception" + # network access + "test_create_connection_trace" + "test_crumb_capture" + "test_getaddrinfo_trace" + "test_omit_url_data_if_parsing_fails" + "test_span_origin" + # AttributeError: type object 'ABCMeta' has no attribute 'setup_once' + "test_ensure_integration_enabled_async_no_original_function_enabled" + "test_ensure_integration_enabled_no_original_function_enabled" + # sess = envelopes[1] + # IndexError: list index out of range + "test_session_mode_defaults_to_request_mode_in_wsgi_handler" + # assert count_item_types["sessions"] == 1 + # assert 0 == 1 + "test_auto_session_tracking_with_aggregates" ]; - disabledTestPaths = - [ - # Varius integration tests fail every once in a while when we - # upgrade dependencies, so don't bother testing them. - "tests/integrations/" - ] - ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [ - # test crashes on aarch64 - "tests/test_transport.py" - ]; - pythonImportsCheck = [ "sentry_sdk" ]; meta = with lib; { - description = "Python SDK for Sentry.io"; + description = "Official Python SDK for Sentry.io"; homepage = "https://github.com/getsentry/sentry-python"; - changelog = "https://github.com/getsentry/sentry-python/blob/${version}/CHANGELOG.md"; - license = licenses.bsd2; - maintainers = with maintainers; [ - fab - gebner - ]; + changelog = "https://github.com/getsentry/sentry-python/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; }; } diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index 91cd37883e85..79d575a9fa51 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -3,7 +3,7 @@ blockdiag, buildPythonPackage, fetchFromGitHub, - pynose, + nose, pytestCheckHook, pythonOlder, setuptools, @@ -27,8 +27,11 @@ buildPythonPackage rec { dependencies = [ blockdiag ]; + # tests rely on nose + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ - pynose + nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index afd117ae3bcf..cc82356de85a 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -19,23 +19,24 @@ buildPythonPackage rec { pname = "setuptools-scm"; - version = "8.0.4"; + version = "8.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-tfQ/9oAGaVlRk/0JiRVk7p0dfcsZbKtLJQbVOi4clcc="; + pname = "setuptools_scm"; + inherit version; + hash = "sha256-Qt6htldxy6k7elFdZaZdgkblYHaKZrkQalksjn8myKc="; }; - nativeBuildInputs = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + build-system = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - propagatedBuildInputs = [ + dependencies = [ packaging setuptools typing-extensions ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { rich = [ rich ]; }; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 5e82d06858c9..3bc6b0f9a6b1 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "setuptools"; - version = "69.5.1"; + version = "70.0.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; rev = "refs/tags/v${version}"; - hash = "sha256-X0ntFlDIhUjxtWzz0LxybQSuxhRpHlMeBYtOGwqDl4A="; + hash = "sha256-LXF3R9zfWylvihP2M8N94/IlgifwxUwKJFhtvcXEPB0="; }; patches = [ diff --git a/pkgs/development/python-modules/sev-snp-measure/default.nix b/pkgs/development/python-modules/sev-snp-measure/default.nix index b5d706775987..886bdf993632 100644 --- a/pkgs/development/python-modules/sev-snp-measure/default.nix +++ b/pkgs/development/python-modules/sev-snp-measure/default.nix @@ -3,7 +3,6 @@ cryptography, fetchFromGitHub, lib, - pythonRelaxDepsHook, setuptools, }: @@ -22,7 +21,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "cryptography" ]; diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix index b4ee4fdebb4d..25722095f432 100644 --- a/pkgs/development/python-modules/sfrbox-api/default.nix +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -27,10 +27,10 @@ buildPythonPackage rec { hash = "sha256-rMfX9vA8IuWxXvVs4WYNHO6neeoie/3gABwhXyJoAF8="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'pydantic = ">=1.10.2"' 'pydantic = "*"' - ''; + pythonRelaxDeps = [ + "defusedxml" + "pydantic" + ]; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index 39c61bc8cc3b..e3d5490a6c36 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -64,10 +64,7 @@ stdenv'.mkDerivation (finalAttrs: { ]; homepage = "https://wiki.qt.io/Qt_for_Python"; changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}"; - maintainers = with lib.maintainers; [ - gebner - Enzime - ]; + maintainers = with lib.maintainers; [ gebner ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/development/python-modules/shimmy/default.nix b/pkgs/development/python-modules/shimmy/default.nix index f1db250e1de2..b50135e517bf 100644 --- a/pkgs/development/python-modules/shimmy/default.nix +++ b/pkgs/development/python-modules/shimmy/default.nix @@ -53,6 +53,9 @@ buildPythonPackage rec { ]; disabledTestPaths = [ + # Requires unpackaged labmaze + "tests/test_dm_control_multi_agent.py" + # Requires unpackaged pyspiel "tests/test_openspiel.py" diff --git a/pkgs/development/python-modules/signalslot/default.nix b/pkgs/development/python-modules/signalslot/default.nix index 18c3db8a45ba..0dcd54334666 100644 --- a/pkgs/development/python-modules/signalslot/default.nix +++ b/pkgs/development/python-modules/signalslot/default.nix @@ -3,7 +3,6 @@ lib, buildPythonPackage, fetchPypi, - pythonRelaxDepsHook, contexter, eventlet, mock, @@ -28,7 +27,6 @@ buildPythonPackage rec { --replace "--cov-report html" "" ''; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ contexter diff --git a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix index a45134a1cbd1..043b47e24310 100644 --- a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix +++ b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sigstore-protobuf-specs"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sigstore_protobuf_specs"; inherit version; - hash = "sha256-xAthl1uVeukG6ymlvHBA7AFbaLa0YAXMWAXmKUk+jew="; + hash = "sha256-yuBBtAUCYAuKYz9DwldpXQIiqU76HlEQp+x62njDnZk="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/sisyphus-control/default.nix b/pkgs/development/python-modules/sisyphus-control/default.nix index 1ca675582ca7..eeaaea1cb01e 100644 --- a/pkgs/development/python-modules/sisyphus-control/default.nix +++ b/pkgs/development/python-modules/sisyphus-control/default.nix @@ -7,7 +7,6 @@ python-engineio, python-socketio, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -29,7 +28,6 @@ buildPythonPackage rec { "python-socketio" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ aiohttp diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index e9016bb32ac7..42ead31640cf 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "skein"; version = "0.8.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-nXTqsJNX/LwAglPcPZkmdYPfF+vDLN+nNdZaDFTrHzE="; diff --git a/pkgs/development/python-modules/skl2onnx/default.nix b/pkgs/development/python-modules/skl2onnx/default.nix index 32c482e71064..8d258c18883c 100644 --- a/pkgs/development/python-modules/skl2onnx/default.nix +++ b/pkgs/development/python-modules/skl2onnx/default.nix @@ -11,7 +11,6 @@ onnxruntime, pandas, unittestCheckHook, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -33,7 +32,6 @@ buildPythonPackage rec { onnxconverter-common ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "scikit-learn" ]; diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 9351d806b154..19048dfc9ca8 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "skorch"; - version = "0.15.0"; + version = "1.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-39XVBlCmbg162z9uL84GZrU+v+M8waXbGdVV72ZYf84="; + hash = "sha256-JcplwaeYlGRAJXRNac1Ya/hgWoHE+NWjZhCU9eaSyRQ="; }; # Remove at next skorch release: diff --git a/pkgs/development/python-modules/smpp-pdu/default.nix b/pkgs/development/python-modules/smpp-pdu/default.nix index 99fddc36fe76..f42c8dd217a3 100644 --- a/pkgs/development/python-modules/smpp-pdu/default.nix +++ b/pkgs/development/python-modules/smpp-pdu/default.nix @@ -33,9 +33,6 @@ buildPythonPackage { description = "Library for parsing Protocol Data Units (PDUs) in SMPP protocol"; homepage = "https://github.com/hologram-io/smpp.pdu"; license = licenses.asl20; - maintainers = with maintainers; [ - flokli - janik - ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index f7d7743ef6e5..cfc61601b34d 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -19,7 +19,6 @@ pyjwt, pyopenssl, pythonOlder, - pythonRelaxDepsHook, pytz, requests, setuptools, @@ -31,14 +30,15 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.8.1"; + version = "3.11.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-m8zhoNniEs7s9F7c6gLRjiBalfiMwEcK2kqLrLVCR9U="; + pname = "snowflake_connector_python"; + inherit version; + hash = "sha256-MWnAFKA+X1hVESYF45OJelUuVYlTxp8loC4zsZmIZNA="; }; build-system = [ @@ -47,7 +47,6 @@ buildPythonPackage rec { wheel ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ asn1crypto diff --git a/pkgs/development/python-modules/sockjs/default.nix b/pkgs/development/python-modules/sockjs/default.nix index 0cb52beb9724..da423a473052 100644 --- a/pkgs/development/python-modules/sockjs/default.nix +++ b/pkgs/development/python-modules/sockjs/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "sockjs"; - version = "0.11.0"; + version = "0.13.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "A0fUBO2e8xllBnh+2AGPh+5OLQuupJ1CDN1TqWm+wik="; + sha256 = "sha256-V+lZoj8gqNVRSdHl2ws7hwcm8rStgWbUG9z0EbNs33Y="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 01b118baf22f..54943d0cb625 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.1.9"; + version = "8.0.0"; format = "setuptools"; disabled = isPyPy || pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IJ+ovLQv6/UU1oepmUQjzaWBG3Rdd3xvui7FjK85Urs="; + hash = "sha256-juLJp0Et5qMZwBZzw0e4tKg1cBYqAsH8KUzqNoIP70U="; }; patches = [ diff --git a/pkgs/development/python-modules/soundcloud-v2/default.nix b/pkgs/development/python-modules/soundcloud-v2/default.nix index 7713c7d6d547..7b46166ec2f4 100644 --- a/pkgs/development/python-modules/soundcloud-v2/default.nix +++ b/pkgs/development/python-modules/soundcloud-v2/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "soundcloud-v2"; - version = "1.3.7"; + version = "1.3.8"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DiaCnIEXKSxyE4+MCq0KwdKWUGfWO3LAVwsMNEkOmqc="; + sha256 = "sha256-wcRjzLnPvpz4zWhV7LxAJ6+BDvkI1MexdgL4nBjJwbg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 5d5e08197fa1..ddc71b75eac5 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, setuptools, cython, - pythonRelaxDepsHook, spacy, numpy, transformers, @@ -35,7 +34,6 @@ buildPythonPackage rec { cython ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ spacy diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index d84599ffc812..0f47280570c6 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -22,7 +22,6 @@ pytestCheckHook, python, pythonOlder, - pythonRelaxDepsHook, requests, setuptools, spacy-legacy, @@ -42,14 +41,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.7.4"; + version = "3.7.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ul8s7S5AdhViyMrOk+9qHm6MSD8nvVZLwbFfYI776Fs="; + hash = "sha256-pkjGy/Ksx6Vaae6ef6TyK99pqoKKWHobxc//CM88LdM="; }; pythonRelaxDeps = [ @@ -58,7 +57,6 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - pythonRelaxDepsHook cython_0 ]; diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix index 637c214345c4..6dba44b5cace 100644 --- a/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -22,19 +22,20 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "3.0.0"; - format = "pyproject"; + version = "3.1.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-CevWdKMrREZyIrD7ipF7l8iVI/INvwW1LLij8OFXFN4="; + pname = "sphinx_autoapi"; + inherit version; + hash = "sha256-+l6xiPZ6454ZsufSUnx10GTg8Lmsf3ejVY7CbMtzHCY="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ anyascii astroid jinja2 diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index 733750844dc9..7d3030c7226a 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -11,7 +11,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "2.1.0"; + version = "2.1.1"; in buildPythonPackage { @@ -23,7 +23,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-Ub+Nx3xPunR+MvBzUAKpFQB0fQVTyuYWhjhI6PXkn+g="; + hash = "sha256-AHK2X1qygYwinW1sLMmTdwr1XTa7e/sWAB4vzk0UiAw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-codeautolink/default.nix b/pkgs/development/python-modules/sphinx-codeautolink/default.nix index 9353abc07777..f41f3b38c722 100644 --- a/pkgs/development/python-modules/sphinx-codeautolink/default.nix +++ b/pkgs/development/python-modules/sphinx-codeautolink/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sphinx-codeautolink"; - version = "0.15.1"; + version = "0.15.2"; format = "pyproject"; outputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "felix-hilden"; repo = "sphinx-codeautolink"; rev = "refs/tags/v${version}"; - hash = "sha256-BnGcLAM/KK8Ub+GmRY1oatUCyP4hvY2O1WTjLHBebpw="; + hash = "sha256-h1lteF5a3ga1VlhXCz2biydli3sg3ktPbz0O5n0eeFI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix index 0ac245d87bfd..f938f267eb65 100644 --- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "sphinx-mdinclude"; - version = "0.5.3"; + version = "0.6.1"; format = "pyproject"; src = fetchPypi { pname = "sphinx_mdinclude"; inherit version; - hash = "sha256-KZjj0YswIsmYPRtyGR/jfiX/zNVBZcvjrLIszu3ZGvQ="; + hash = "sha256-7OPYEuLVWbTn5H9ntqh7Dipom2svURR5XI7Uf/s5wWk="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinx-prompt/default.nix b/pkgs/development/python-modules/sphinx-prompt/default.nix index 2d7a0074ede8..57fa112da926 100644 --- a/pkgs/development/python-modules/sphinx-prompt/default.nix +++ b/pkgs/development/python-modules/sphinx-prompt/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, # build-system poetry-core, @@ -37,7 +36,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core poetry-dynamic-versioning - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix b/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix index 98b962b1f4b7..d3b4bf7f4104 100644 --- a/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix @@ -2,7 +2,8 @@ buildPythonPackage, fetchFromGitHub, lib, - pynose, + pythonOlder, + nose, setuptools, sphinx, sphinx-rtd-theme, @@ -24,8 +25,11 @@ buildPythonPackage rec { dependencies = [ sphinx-rtd-theme ]; + # tests rely on nose + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ - pynose + nose sphinx ]; diff --git a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix index d2ed00bed59c..b53a9849ac06 100644 --- a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -7,7 +7,6 @@ readthedocs-sphinx-ext, sphinxcontrib-jquery, pytestCheckHook, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -32,7 +31,6 @@ buildPythonPackage rec { sphinxcontrib-jquery ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index e781abafac19..16e2a81e5043 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -1,8 +1,10 @@ { lib, buildPythonPackage, + pythonAtLeast, pythonOlder, fetchFromGitHub, + fetchpatch2, isPyPy, # build-system @@ -56,6 +58,14 @@ buildPythonPackage rec { hash = "sha256-XGGRWEvd1SbQsK8W5yxDzBd5hlvXcDzr8t5Qa6skH/M="; }; + patches = [ + (fetchpatch2 { + name = "python-3.13-compat.patch"; + url = "https://github.com/sphinx-doc/sphinx/commit/3496de62b743942115acb486cf35dfcc102586c3.patch"; + hash = "sha256-5VBPOQeGyj3a8VBq4hc9S/eKaeVZeGCTNislwgsauZo="; + }) + ]; + build-system = [ flit-core ]; dependencies = @@ -116,6 +126,10 @@ buildPythonPackage rec { # Could not fetch remote image: http://localhost:7777/sphinx.png "test_copy_images" ] + ++ lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/sphinx-doc/sphinx/issues/12430 + "test_autodoc_type_aliases" + ] ++ lib.optionals isPyPy [ # PyPy has not __builtins__ which get asserted # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous diff --git a/pkgs/development/python-modules/sphinxawesome-theme/default.nix b/pkgs/development/python-modules/sphinxawesome-theme/default.nix index 8d073b7fe123..8d028f2c63e7 100644 --- a/pkgs/development/python-modules/sphinxawesome-theme/default.nix +++ b/pkgs/development/python-modules/sphinxawesome-theme/default.nix @@ -5,7 +5,6 @@ poetry-core, sphinx, beautifulsoup4, - pythonRelaxDepsHook }: buildPythonPackage rec { @@ -19,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-wk8eXAueR1OA0W/F8fO/2ElVgX2gkF2V9+IICdfNPF0="; }; - build-system = [ poetry-core pythonRelaxDepsHook ]; + build-system = [ poetry-core ]; dependencies = [ sphinx beautifulsoup4 diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 15d1c9f1eaae..6716a3ba7902 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -3,25 +3,29 @@ buildPythonPackage, fetchPypi, pythonOlder, + setuptools, sphinx, + pytestCheckHook }: buildPythonPackage rec { pname = "sphinxcontrib-katex"; - version = "0.9.9"; - format = "setuptools"; + version = "0.9.10"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-1ZTILfVLBI1Z1I5GsQn2IhezEaublSCMq5bZAvmj/ik="; + pname = "sphinxcontrib_katex"; + inherit version; + hash = "sha256-MJqS2uJF28WE/36l+2VJcnuuleTlIAi3TSWdL9GtDew="; }; - propagatedBuildInputs = [ sphinx ]; + build-system = [ setuptools ]; - # There are no unit tests - doCheck = false; + dependencies = [ sphinx ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "sphinxcontrib.katex" ]; diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index 0e0d56aa027e..64f8c2648941 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, asn1crypto, astunparse, bincopy, @@ -51,7 +50,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index b045fa3c6b24..10ea12e7fefa 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, flask, flask-login, flask-sqlalchemy, @@ -16,23 +17,25 @@ buildPythonPackage rec { pname = "sqlalchemy-continuum"; - version = "1.4.1"; - format = "setuptools"; + version = "1.4.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "SQLAlchemy-Continuum"; + pname = "sqlalchemy_continuum"; inherit version; - hash = "sha256-4BZGzfv9azGiGwrrprv/ZhJY1b6Ed8dQDKs6HHSEjm4="; + hash = "sha256-D9K+efcY7aR8IgaHnZLsTr8YiTZGN7PK8+5dNL0ZyOM="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ sqlalchemy sqlalchemy-utils ]; - passthru.optional-dependencies = { + optional-dependencies = { flask = [ flask ]; flask-login = [ flask-login ]; flask-sqlalchemy = [ flask-sqlalchemy ]; @@ -43,10 +46,12 @@ buildPythonPackage rec { psycopg2 pymysql pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); - # Indicate tests that we don't have a database server at hand - env.DB = "sqlite"; + preCheck = '' + # Indicate tests that we don't have a database server at hand + export DB=sqlite + ''; pythonImportsCheck = [ "sqlalchemy_continuum" ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 0c9ddbe50744..a40b2897cdab 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.30"; + version = "2.0.31"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-l6VxBK4RT/sAFkz3g633MrfQH9Bvp/JE12mdtqjsxd8="; + hash = "sha256-+bF7pdz8bxkR+mbrOI773qLoZVzBHpzKOENWPEuVFt8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index ef5ed3f808a9..73fb920314c9 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -40,11 +40,11 @@ buildPythonPackage rec { hash = "sha256-GiCN1sfhLu9i19d2OcLZrlY8E64DFrFh+ITRSvLaxdE="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ anyio ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + dependencies = [ anyio ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; - passthru.optional-dependencies.full = [ + optional-dependencies.full = [ itsdangerous jinja2 python-multipart @@ -56,7 +56,7 @@ buildPythonPackage rec { pytestCheckHook trio typing-extensions - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "-W" diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix index 1f6e5df95112..21127c85adf8 100644 --- a/pkgs/development/python-modules/statsd/default.nix +++ b/pkgs/development/python-modules/statsd/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, - pynose, mock, + pytestCheckHook, }: buildPythonPackage rec { @@ -12,21 +12,21 @@ buildPythonPackage rec { version = "4.0.1"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-mXY9qBv+qNr2s9ItEarMsBqND1LqUh2qs351ikyn0Sg="; + src = fetchFromGitHub { + owner = "jsocol"; + repo = "pystatsd"; + rev = "refs/tags/v${version}"; + hash = "sha256-g830TjFERKUguFKlZeaOhCTlaUs0wcDg4bMdRDr3smw="; }; nativeBuildInputs = [ setuptools ]; nativeCheckInputs = [ - pynose mock + pytestCheckHook ]; - checkPhase = '' - nosetests -sv - ''; + pytestFlagsArray = [ "statsd/tests.py" ]; meta = with lib; { maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index d7447e6c33b7..d917d3ebf735 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -39,6 +39,13 @@ buildPythonPackage rec { setuptools-scm ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=int-conversion" + ]; + }; + dependencies = [ numpy packaging @@ -57,7 +64,5 @@ buildPythonPackage rec { homepage = "https://www.github.com/statsmodels/statsmodels"; changelog = "https://github.com/statsmodels/statsmodels/releases/tag/v${version}"; license = licenses.bsd3; - # Fails at build time - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/std-uritemplate/default.nix b/pkgs/development/python-modules/std-uritemplate/default.nix index be7ff2030ca5..d52b7eaa072d 100644 --- a/pkgs/development/python-modules/std-uritemplate/default.nix +++ b/pkgs/development/python-modules/std-uritemplate/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "std-uritemplate"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "std_uritemplate"; inherit version; - hash = "sha256-lJ2YDTjUI3mf9Jh6g17rXppFRD3GGpzIMEYdkmz0JuQ="; + hash = "sha256-RMNQRjnP+tTrEU9j3zxmOx/C5cdqwYlD514noZiwtzQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/steamship/default.nix b/pkgs/development/python-modules/steamship/default.nix index b1f2fb500195..ef61a2397064 100644 --- a/pkgs/development/python-modules/steamship/default.nix +++ b/pkgs/development/python-modules/steamship/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, setuptools-scm, - pythonRelaxDepsHook, requests, pydantic, aiohttp, @@ -29,7 +28,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 84e66c60be23..c30512d1171d 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -19,7 +19,6 @@ pympler, python-dateutil, pythonOlder, - pythonRelaxDepsHook, setuptools, requests, rich, @@ -46,7 +45,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "packaging" ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 51b956b1a547..3823eb4ea1b9 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "9.9.0"; + version = "9.12.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-xC2Pa0RjpU86AlWBgQ9OYy4tWnHeYQD8WV11WB9ppJI="; + hash = "sha256-y8Umq9DwAckgwyO6fEDM497hZH2SDp2+yuNIjzc2dSQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/subprocess-tee/default.nix b/pkgs/development/python-modules/subprocess-tee/default.nix index 7c95ab66fbd8..1ca46a465206 100644 --- a/pkgs/development/python-modules/subprocess-tee/default.nix +++ b/pkgs/development/python-modules/subprocess-tee/default.nix @@ -1,7 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, setuptools-scm, pytestCheckHook, enrich, @@ -9,15 +10,20 @@ buildPythonPackage rec { pname = "subprocess-tee"; - version = "0.4.1"; - format = "pyproject"; + version = "0.4.2"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-s8EkmT+LiNHrHC/eC8IGl4fqxyC6iHccuhfoyTMkgl0="; + src = fetchFromGitHub { + owner = "pycontribs"; + repo = "subprocess-tee"; + rev = "refs/tags/v${version}"; + hash = "sha256-rfI4UZdENfSQ9EbQeldv6DDGIQe5yMjboGTCOwed1AU="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; nativeCheckInputs = [ pytestCheckHook @@ -36,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/pycontribs/subprocess-tee"; description = "Subprocess.run drop-in replacement that supports a tee mode"; + changelog = "https://github.com/pycontribs/subprocess-tee/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ putchar ]; }; diff --git a/pkgs/development/python-modules/succulent/default.nix b/pkgs/development/python-modules/succulent/default.nix index f46ae33d4c87..f039a30d522a 100644 --- a/pkgs/development/python-modules/succulent/default.nix +++ b/pkgs/development/python-modules/succulent/default.nix @@ -8,7 +8,6 @@ pyyaml, poetry-core, pytestCheckHook, - pythonRelaxDepsHook, pythonOlder, toml-adapt, xmltodict, @@ -32,7 +31,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 622100c10fdc..afabfff242f2 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "5.1.2"; + version = "5.1.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-1/oz2Ir1K7nR6B2TPZzSjbyiADyQyRlzE9KqTg7EwkA="; + hash = "sha256-y+tw1I+C6wDFlJvObWrOhisrryQCeXulkwFyRCuAgTA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index 8d143ee4d58a..4c63ce7dbf61 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -7,7 +7,6 @@ inkex, lxml, pytestCheckHook, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -38,7 +37,6 @@ buildPythonPackage rec { "lxml" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/svgutils/default.nix b/pkgs/development/python-modules/svgutils/default.nix index 3d56da85a02f..307b6f689a74 100644 --- a/pkgs/development/python-modules/svgutils/default.nix +++ b/pkgs/development/python-modules/svgutils/default.nix @@ -2,9 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, setuptools, lxml, - matplotlib, pytestCheckHook, nose, }: @@ -21,12 +21,11 @@ buildPythonPackage rec { hash = "sha256-ITvZx+3HMbTyaRmCb7tR0LKqCxGjqDdV9/2taziUD0c="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - lxml - matplotlib - ]; + dependencies = [ lxml ]; + + doCheck = pythonOlder "3.12"; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index 2337f161b5b7..c9978724763b 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.12"; + version = "1.12.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-6/WVyNrD4P3EFSxRh4tJg5bsfzDnqRTWBx5nTUlCD7g="; + hash = "sha256-KHewP5mM2MCPB80N5bdnEZzT70DQn0HDDXIvZoaw+4g="; }; nativeCheckInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/syncedlyrics/default.nix b/pkgs/development/python-modules/syncedlyrics/default.nix index 72ac8b5794d3..08340ae69b9a 100644 --- a/pkgs/development/python-modules/syncedlyrics/default.nix +++ b/pkgs/development/python-modules/syncedlyrics/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, poetry-core, pythonOlder, - pythonRelaxDepsHook, rapidfuzz, requests, }: @@ -26,7 +25,6 @@ buildPythonPackage rec { build-system = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "rapidfuzz" ]; diff --git a/pkgs/development/python-modules/synologydsm-api/default.nix b/pkgs/development/python-modules/synologydsm-api/default.nix index c94e65db8117..6fc64f5baad7 100644 --- a/pkgs/development/python-modules/synologydsm-api/default.nix +++ b/pkgs/development/python-modules/synologydsm-api/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, fetchpatch, poetry-core, - pythonRelaxDepsHook, requests, urllib3, pytestCheckHook, @@ -37,7 +36,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "urllib3" ]; diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix index e713fef830a7..7638e67378ae 100644 --- a/pkgs/development/python-modules/tabcmd/default.nix +++ b/pkgs/development/python-modules/tabcmd/default.nix @@ -12,7 +12,6 @@ pytestCheckHook, python3, pythonOlder, - pythonRelaxDepsHook, requests, setuptools, setuptools-scm, @@ -47,7 +46,6 @@ buildPythonPackage rec { "urllib3" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix index bc4141a03e01..e37539b18de6 100644 --- a/pkgs/development/python-modules/tableauserverclient/default.nix +++ b/pkgs/development/python-modules/tableauserverclient/default.nix @@ -6,7 +6,6 @@ packaging, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, requests-mock, setuptools, @@ -15,14 +14,14 @@ buildPythonPackage rec { pname = "tableauserverclient"; - version = "0.30"; + version = "0.31"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MIE6V84xLEbgmTwvP6jQC0H//gBnMTO1sowL1HIMbpQ="; + hash = "sha256-e00/+yVKg7dGGq3Os+oWu/F93j5e9dnwWZxKwm+soqM="; }; postPatch = '' @@ -34,7 +33,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - pythonRelaxDepsHook versioneer ]; diff --git a/pkgs/development/python-modules/tago/default.nix b/pkgs/development/python-modules/tago/default.nix index 974a7b44884f..eb42efff5689 100644 --- a/pkgs/development/python-modules/tago/default.nix +++ b/pkgs/development/python-modules/tago/default.nix @@ -6,7 +6,6 @@ promise, python-socketio, pythonOlder, - pythonRelaxDepsHook, requests, websockets, }: @@ -27,7 +26,6 @@ buildPythonPackage rec { pythonRelaxDeps = true; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ aiohttp diff --git a/pkgs/development/python-modules/tagoio-sdk/default.nix b/pkgs/development/python-modules/tagoio-sdk/default.nix index b32338821d66..4e2984a98721 100644 --- a/pkgs/development/python-modules/tagoio-sdk/default.nix +++ b/pkgs/development/python-modules/tagoio-sdk/default.nix @@ -8,7 +8,6 @@ python-dateutil, python-socketio, pythonOlder, - pythonRelaxDepsHook, requests, requests-mock, }: @@ -31,7 +30,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/taskw-ng/default.nix b/pkgs/development/python-modules/taskw-ng/default.nix index 15f6412831d6..90f9ce35ed88 100644 --- a/pkgs/development/python-modules/taskw-ng/default.nix +++ b/pkgs/development/python-modules/taskw-ng/default.nix @@ -8,7 +8,6 @@ poetry-dynamic-versioning, python-dateutil, pythonOlder, - pythonRelaxDepsHook, pytz, taskwarrior, }: @@ -37,7 +36,6 @@ buildPythonPackage rec { poetry-dynamic-versioning ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ kitchen diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index fbd675bd2ebf..f2cec77022a7 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -10,7 +10,6 @@ pprintpp, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, wrapt, }: @@ -52,7 +51,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ attrs diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 50f4b0eca641..6c2a136d831e 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "tempora"; - version = "5.5.1"; + version = "5.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ortR4hIZdtkxNHs+QzkXw2S4P91fZO8nM2yGW/H7D3U="; + hash = "sha256-O/zBLL27uv7KrMuQl/w3VENbnQY9zkMzjk+ofTkQSu0="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 134785e4e1fd..5ac8b3e2c963 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "tenacity"; - version = "8.2.3"; + version = "8.4.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-U5jvDXjmP0AAfB+0wL/5bhkROU0vqNGU93YZwF/2zIo="; + hash = "sha256-VLFBK4eN334fFXfNSVJ7rYze8yQhvVmb6sDGw/EFgv0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index bed497e92a33..2d0d762ab53e 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1177"; + version = "3.0.1184"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-sGbbeyKwDjXvV+LFozBclS2lltrZnafBOy62GP6XDMA="; + hash = "sha256-TRZbIRygmva2hsOOgU1vF/hJdW3wGxykJMCIvg35r+Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index 62b054d76f9a..2c09edbf60a4 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -3,7 +3,6 @@ fetchPypi, buildPythonPackage, pythonOlder, - pythonRelaxDepsHook, numpy, wheel, werkzeug, @@ -24,7 +23,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.16.2"; + version = "2.17.0"; format = "wheel"; disabled = pythonOlder "3.9"; @@ -32,10 +31,9 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-nytOfa2GZnYVwOXNBy8eqEA/wDKimfAHLW90hVd1zEU="; + hash = "sha256-hZpJmpsftooFiFiWRIZicQC3H8shZGhhxh0xhGpkePs="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "google-auth-oauthlib" diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index d311edc188ad..5f41420dffbc 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -116,7 +116,13 @@ let # cudaPackages.cudnn led to this: # https://github.com/tensorflow/tensorflow/issues/60398 cudnnAttribute = "cudnn_8_6"; - cudnn = cudaPackages.${cudnnAttribute}; + cudnnMerged = symlinkJoin { + name = "cudnn-merged"; + paths = [ + (lib.getDev cudaPackages.${cudnnAttribute}) + (lib.getLib cudaPackages.${cudnnAttribute}) + ]; + }; gentoo-patches = fetchzip { url = "https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.12.0.tar.bz2"; hash = "sha256-SCRX/5/zML7LmKEPJkcM5Tebez9vv/gmE4xhT/jyqWs="; @@ -130,19 +136,30 @@ let withTensorboard = (pythonOlder "3.6") || tensorboardSupport; - # FIXME: migrate to redist cudaPackages - cudatoolkit_joined = symlinkJoin { - name = "${cudatoolkit.name}-merged"; - paths = - [ - cudatoolkit.lib - cudatoolkit.out - ] - ++ lib.optionals (lib.versionOlder cudatoolkit.version "11") [ - # for some reason some of the required libs are in the targets/x86_64-linux - # directory; not sure why but this works around it - "${cudatoolkit}/targets/${stdenv.system}" - ]; + cudaComponents = with cudaPackages; [ + (cuda_nvcc.__spliced.buildHost or cuda_nvcc) + (cuda_nvprune.__spliced.buildHost or cuda_nvprune) + cuda_cccl # block_load.cuh + cuda_cudart # cuda.h + cuda_cupti # cupti.h + cuda_nvcc # See https://github.com/google/jax/issues/19811 + cuda_nvml_dev # nvml.h + cuda_nvtx # nvToolsExt.h + libcublas # cublas_api.h + libcufft # cufft.h + libcurand # curand.h + libcusolver # cusolver_common.h + libcusparse # cusparse.h + ]; + + cudatoolkitDevMerged = symlinkJoin { + name = "cuda-${cudaPackages.cudaVersion}-dev-merged"; + paths = lib.concatMap (p: [ + (lib.getBin p) + (lib.getDev p) + (lib.getLib p) + (lib.getOutput "static" p) # Makes for a very fat closure + ]) cudaComponents; }; # Tensorflow expects bintools at hard-coded paths, e.g. /usr/bin/ar @@ -321,7 +338,7 @@ let ] ++ lib.optionals cudaSupport [ cudatoolkit - cudnn + cudnnMerged ] ++ lib.optionals mklSupport [ mkl ] ++ lib.optionals stdenv.isDarwin [ @@ -402,7 +419,7 @@ let TF_NEED_MPI = tfFeature cudaSupport; TF_NEED_CUDA = tfFeature cudaSupport; - TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}"; + TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkitDevMerged},${cudnnMerged},${lib.getLib nccl}"; TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities; # Needed even when we override stdenv: e.g. for ar @@ -653,7 +670,7 @@ buildPythonPackage { find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do addOpenGLRunpath "$lib" - patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:${cudnn}/lib:${nccl}/lib:$(patchelf --print-rpath "$lib")" "$lib" + patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:${cudnnMerged}/lib:${lib.getLib nccl}/lib:$(patchelf --print-rpath "$lib")" "$lib" done ''; diff --git a/pkgs/development/python-modules/terminaltexteffects/default.nix b/pkgs/development/python-modules/terminaltexteffects/default.nix index 8cea46f094e6..78310f2fd967 100644 --- a/pkgs/development/python-modules/terminaltexteffects/default.nix +++ b/pkgs/development/python-modules/terminaltexteffects/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "terminaltexteffects"; - version = "0.10.1"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { # no tests on pypi, no tags on github src = fetchPypi { inherit pname version; - hash = "sha256-NyWPfdgLeXAxKPJOzB7j4aT+zjrURN59CGcv0Vt99y0="; + hash = "sha256-FDDLc7oAOgSpaxmuS6Wzej+vEOuSx3WT2ntpfoET3LI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 4be63b1b4b4b..bcd58d8cc9e9 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-dCkk0ikg8KvB7us4mEcUQ1q3JIRoNbSE6STVZXRBErE="; + hash = "sha256-kkyRQ2cYldx4vK5hAo6LOr+k3YqJihKreE+DTNVHYdM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index f1b795fb641c..b7322f07b473 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -3,13 +3,16 @@ fetchPypi, lib, - # build dependencies + # build-system cython, - leptonica, pkg-config, + setuptools, + + # native dependencies + leptonica, tesseract4, - # propagates + # dependencies pillow, # tests @@ -18,22 +21,23 @@ buildPythonPackage rec { pname = "tesserocr"; - version = "2.6.3"; + version = "2.7.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RMHE73vcKGz6FEzhoJfoHDMp9KQ1CbyElKGrhSM4xuE="; + sha256 = "sha256-RcCTYwM30Bpqj5d6JGrW1zLrEfLgcrsibVmtPSR4HJk="; }; # https://github.com/sirfz/tesserocr/issues/314 postPatch = '' - sed -i '/allheaders.h/a\ pass\n\ncdef extern from "leptonica/pix_internal.h" nogil:' tesseract.pxd + sed -i '/allheaders.h/a\ pass\n\ncdef extern from "leptonica/pix_internal.h" nogil:' tesserocr/tesseract.pxd ''; - nativeBuildInputs = [ + build-system = [ cython pkg-config + setuptools ]; buildInputs = [ @@ -41,12 +45,16 @@ buildPythonPackage rec { tesseract4 ]; - propagatedBuildInputs = [ pillow ]; + dependencies = [ pillow ]; pythonImportsCheck = [ "tesserocr" ]; nativeCheckInputs = [ unittestCheckHook ]; + preCheck = '' + rm -rf tesserocr + ''; + meta = with lib; { changelog = "https://github.com/sirfz/tesserocr/releases/tag/v${version}"; description = "Simple, Pillow-friendly, wrapper around the tesseract-ocr API for Optical Character Recognition (OCR)"; diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index 4f3fbb94be09..a4b20a75d15b 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.7.0"; + version = "4.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-DX2s3Z3QM8qzUr5nM+9erJG/XHkB96h8S4+KYDfcA8A="; + hash = "sha256-li9okYMPW6PM03cFQRfHKzr48eOguNXmmHnSCBgDqYo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/testrail-api/default.nix b/pkgs/development/python-modules/testrail-api/default.nix index cbad3f993bc9..7f8ad55c602c 100644 --- a/pkgs/development/python-modules/testrail-api/default.nix +++ b/pkgs/development/python-modules/testrail-api/default.nix @@ -6,12 +6,13 @@ pythonOlder, requests, responses, + setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "testrail-api"; - version = "1.13.0"; + version = "1.13.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,17 +21,15 @@ buildPythonPackage rec { owner = "tolstislon"; repo = "testrail-api"; rev = "refs/tags/${version}"; - hash = "sha256-NGdNpNJ9ejwneSacNmifGJ8TMUuBqMu9tHTyLxTB5Uk="; + hash = "sha256-VH63shGCBOkbHcUFL4M/QvuVrS+y2JiM1YYBJgZ6r/w="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "setuptools_scm==7.1.0" "setuptools_scm" - ''; + build-system = [ + setuptools + setuptools-scm + ]; - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook @@ -39,11 +38,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "testrail_api" ]; - meta = with lib; { + meta = { description = "Python wrapper of the TestRail API"; homepage = "https://github.com/tolstislon/testrail-api"; - changelog = "https://github.com/tolstislon/ytestrail-api/releases/tag/${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ aanderse ]; + changelog = "https://github.com/tolstislon/testrail-api/releases/tag/${version}"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ aanderse ]; }; } diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index b097963861c5..6e98a9f3461e 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pythonAtLeast, - pythonRelaxDepsHook, # build-system hatchling, @@ -15,18 +14,17 @@ buildPythonPackage rec { pname = "testtools"; - version = "2.7.1"; + version = "2.7.2"; pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-323pYBDinuIfY3oUfqvzDVCyXjhB3R1o+T7onOd+Nmw="; + sha256 = "sha256-W+W7wfD6D4tgrKbO7AeEXUHQxHXPRFv6200sRew5fqM="; }; nativeBuildInputs = [ hatchling hatch-vcs - pythonRelaxDepsHook ]; pythonRemoveDeps = [ "fixtures" ]; diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix index 9defe9da25ab..09b47a1b1207 100644 --- a/pkgs/development/python-modules/textnets/default.nix +++ b/pkgs/development/python-modules/textnets/default.nix @@ -10,7 +10,6 @@ poetry-core, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, scipy, setuptools, spacy, @@ -34,7 +33,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook cython poetry-core setuptools diff --git a/pkgs/development/python-modules/tf-keras/default.nix b/pkgs/development/python-modules/tf-keras/default.nix index 0e0401159210..da7d2d6d869c 100644 --- a/pkgs/development/python-modules/tf-keras/default.nix +++ b/pkgs/development/python-modules/tf-keras/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchPypi, - pythonRelaxDepsHook, setuptools, wheel, numpy, @@ -25,7 +24,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/tf2onnx/default.nix b/pkgs/development/python-modules/tf2onnx/default.nix index 7c1926a11cbd..73c19842f103 100644 --- a/pkgs/development/python-modules/tf2onnx/default.nix +++ b/pkgs/development/python-modules/tf2onnx/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, pytest-runner, # runtime dependencies numpy, @@ -36,7 +35,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook pytest-runner ]; diff --git a/pkgs/development/python-modules/thelogrus/default.nix b/pkgs/development/python-modules/thelogrus/default.nix index 433111926102..2ba9c5c1fd9b 100644 --- a/pkgs/development/python-modules/thelogrus/default.nix +++ b/pkgs/development/python-modules/thelogrus/default.nix @@ -6,7 +6,6 @@ poetry-core, pyaml, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -25,7 +24,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "pyaml" ]; diff --git a/pkgs/development/python-modules/thermobeacon-ble/default.nix b/pkgs/development/python-modules/thermobeacon-ble/default.nix index b31384e06bc0..d6546fca8153 100644 --- a/pkgs/development/python-modules/thermobeacon-ble/default.nix +++ b/pkgs/development/python-modules/thermobeacon-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "thermobeacon-ble"; - version = "0.6.2"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = "thermobeacon-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-Nmu9oS6zkCTqk/cf8+fqDFhVcG/2JuDDumGTCubeS5o="; + hash = "sha256-XeLTY78zg+5HR+GH9bHl2t86ifcWm7AA4zSwJOknsdc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index d70ed13e37e8..c9e962a3acb0 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "thriftpy2"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Thriftpy"; repo = "thriftpy2"; rev = "refs/tags/v${version}"; - hash = "sha256-F/h2XhzLA89CwgorKhrvKrajFbT9maiF3RBkulQQ9bk="; + hash = "sha256-GBJL+IqZpT1/msJLiwiS5YDyB4hIe/e3pYPWx0A+lWY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index d2ffa700b8da..edde349d4125 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2024.4.18"; + version = "2024.6.18"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-X/zXe513w6raEnhjGvXIrHiEOEUv2i6xubYNVVPpXII="; + hash = "sha256-V+DSoDS8tih+oxVdhxZQjfrIZEOiV/ZQK1fuf4ozs7Y="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/tilequant/default.nix b/pkgs/development/python-modules/tilequant/default.nix index 66d735d966bd..e6f43890f564 100644 --- a/pkgs/development/python-modules/tilequant/default.nix +++ b/pkgs/development/python-modules/tilequant/default.nix @@ -6,7 +6,6 @@ ordered-set, pillow, pythonOlder, - pythonRelaxDepsHook, setuptools, setuptools-dso, sortedcollections, @@ -27,7 +26,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "pillow" ]; build-system = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 804d4efe5973..730bbfc4f4d7 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -10,18 +10,20 @@ buildPythonPackage rec { pname = "tinycss2"; - version = "1.2.1"; + version = "1.3.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "kozea"; repo = "tinycss2"; - rev = "refs/tags/v${version}"; + + # Tag v1.3.0 is missing the actual version number bump. + rev = "bda62b101530588718d931d61bcc343a628b9af9"; # for tests fetchSubmodules = true; - hash = "sha256-rJtxMmW30NK+E+Dhh/fu6FPrEojWWdoEWNt0raYEubs="; + hash = "sha256-Exjxdm0VnnjHUKjquXsC/zDmwA7bELHdX1f55IGBjYk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix index 266acc638b8f..450f40234378 100644 --- a/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/pkgs/development/python-modules/tlslite-ng/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + pythonAtLeast, ecdsa, }: @@ -10,6 +11,9 @@ buildPythonPackage rec { version = "0.7.6"; format = "setuptools"; + # https://github.com/tlsfuzzer/tlslite-ng/issues/501 + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; sha256 = "6ab56f0e9629ce3d807eb528c9112defa9f2e00af2b2961254e8429ca5c1ff00"; diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index e398075acca8..85f9ed273b7d 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.12.4"; + version = "0.12.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-fKHPwSIygGUXqFFQR7pmoZNp5x7fJDnQ9YJPkQMrbMM="; + hash = "sha256-7vNPujmDTU1rc8m6fz5NHEF6Tlb4mn6W4JDdDSS4+zw="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index e2899c081e08..ec6843deac98 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -121,7 +121,10 @@ buildPythonPackage { pythonImportsCheck = [ "torch" ]; - passthru.gpuChecks.cudaAvailable = callPackage ./test-cuda.nix { torch = torch-bin; }; + passthru.tests = callPackage ./tests.nix { + torchWithCuda = torch-bin; + torchWithRocm = torch-bin; + }; meta = { description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration"; diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 9597a047bdb4..40f26d282183 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -34,7 +34,6 @@ which, pybind11, removeReferencesTo, - pythonRelaxDepsHook, # Build inputs numactl, @@ -301,11 +300,11 @@ buildPythonPackage rec { preConfigure = lib.optionalString cudaSupport '' export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" - export CUPTI_INCLUDE_DIR=${cudaPackages.cuda_cupti.dev}/include - export CUPTI_LIBRARY_DIR=${cudaPackages.cuda_cupti.lib}/lib + export CUPTI_INCLUDE_DIR=${lib.getDev cudaPackages.cuda_cupti}/include + export CUPTI_LIBRARY_DIR=${lib.getLib cudaPackages.cuda_cupti}/lib '' + lib.optionalString (cudaSupport && cudaPackages ? cudnn) '' - export CUDNN_INCLUDE_DIR=${cudnn.dev}/include + export CUDNN_INCLUDE_DIR=${lib.getLib cudnn}/include export CUDNN_LIB_DIR=${cudnn.lib}/lib '' + lib.optionalString rocmSupport '' @@ -433,7 +432,6 @@ buildPythonPackage rec { which ninja pybind11 - pythonRelaxDepsHook removeReferencesTo ] ++ lib.optionals cudaSupport ( @@ -453,42 +451,31 @@ buildPythonPackage rec { ++ lib.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl.dev # - cuda_cudart.dev # cuda_runtime.h and libraries - cuda_cudart.lib - cuda_cudart.static - cuda_cupti.dev # For kineto - cuda_cupti.lib # For kineto - cuda_nvcc.dev # crt/host_config.h; even though we include this in nativeBuildinputs, it's needed here too - cuda_nvml_dev.dev # - cuda_nvrtc.dev - cuda_nvrtc.lib - cuda_nvtx.dev - cuda_nvtx.lib # -llibNVToolsExt - libcublas.dev - libcublas.lib - libcufft.dev - libcufft.lib - libcurand.dev - libcurand.lib - libcusolver.dev - libcusolver.lib - libcusparse.dev - libcusparse.lib + cuda_cccl # + cuda_cudart # cuda_runtime.h and libraries + cuda_cupti # For kineto + cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildinputs, it's needed here too + cuda_nvml_dev # + cuda_nvrtc + cuda_nvtx # -llibNVToolsExt + libcublas + libcufft + libcurand + libcusolver + libcusparse ] ++ lists.optionals (cudaPackages ? cudnn) [ - cudnn.dev - cudnn.lib + cudnn ] ++ lists.optionals useSystemNccl [ # Some platforms do not support NCCL (i.e., Jetson) - nccl.dev # Provides nccl.h AND a static copy of NCCL! + nccl # Provides nccl.h AND a static copy of NCCL! ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ - cuda_nvprof.dev # + cuda_nvprof # ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ - cuda_profiler_api.dev # + cuda_profiler_api # ] ) ++ lib.optionals rocmSupport [ rocmPackages.llvm.openmp ] diff --git a/pkgs/development/python-modules/torch/gpu-checks.nix b/pkgs/development/python-modules/torch/gpu-checks.nix deleted file mode 100644 index 55a4b45f7152..000000000000 --- a/pkgs/development/python-modules/torch/gpu-checks.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - torchWithCuda, - torchWithRocm, - callPackage, -}: - -let - accelAvailable = - { - feature, - versionAttr, - torch, - cudaPackages, - }: - cudaPackages.writeGpuTestPython - { - inherit feature; - libraries = [ torch ]; - name = "${feature}Available"; - } - '' - import torch - message = f"{torch.cuda.is_available()=} and {torch.version.${versionAttr}=}" - assert torch.cuda.is_available() and torch.version.${versionAttr}, message - print(message) - ''; -in -{ - tester-cudaAvailable = callPackage accelAvailable { - feature = "cuda"; - versionAttr = "cuda"; - torch = torchWithCuda; - }; - tester-rocmAvailable = callPackage accelAvailable { - feature = "rocm"; - versionAttr = "hip"; - torch = torchWithRocm; - }; -} diff --git a/pkgs/development/python-modules/torch/mk-runtime-check.nix b/pkgs/development/python-modules/torch/mk-runtime-check.nix new file mode 100644 index 000000000000..14560b06f87c --- /dev/null +++ b/pkgs/development/python-modules/torch/mk-runtime-check.nix @@ -0,0 +1,19 @@ +{ + cudaPackages, + feature, + torch, + versionAttr, +}: + +cudaPackages.writeGpuTestPython + { + inherit feature; + libraries = [ torch ]; + name = "${feature}Available"; + } + '' + import torch + message = f"{torch.cuda.is_available()=} and {torch.version.${versionAttr}=}" + assert torch.cuda.is_available() and torch.version.${versionAttr}, message + print(message) + '' diff --git a/pkgs/development/python-modules/torch/tests.nix b/pkgs/development/python-modules/torch/tests.nix index 5a46d0886868..76b901cbcea9 100644 --- a/pkgs/development/python-modules/torch/tests.nix +++ b/pkgs/development/python-modules/torch/tests.nix @@ -1,3 +1,21 @@ -{ callPackage }: +{ + callPackage, + torchWithCuda, + torchWithRocm, +}: -callPackage ./gpu-checks.nix { } +{ + # To perform the runtime check use either + # `nix run .#python3Packages.torch.tests.tester-cudaAvailable` (outside the sandbox), or + # `nix build .#python3Packages.torch.tests.tester-cudaAvailable.gpuCheck` (in a relaxed sandbox) + tester-cudaAvailable = callPackage ./mk-runtime-check.nix { + feature = "cuda"; + versionAttr = "cuda"; + torch = torchWithCuda; + }; + tester-rocmAvailable = callPackage ./mk-runtime-check.nix { + feature = "rocm"; + versionAttr = "hip"; + torch = torchWithRocm; + }; +} diff --git a/pkgs/development/python-modules/torchdiffeq/default.nix b/pkgs/development/python-modules/torchdiffeq/default.nix index ba3eda8cafbb..455450a718c1 100644 --- a/pkgs/development/python-modules/torchdiffeq/default.nix +++ b/pkgs/development/python-modules/torchdiffeq/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "torchdiffeq"; - version = "0.2.3"; + version = "0.2.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-/nX0NLkJCsDCdwLgK+0hRysPhwNb5lgfUe3F1AE+oxo="; + hash = "sha256-wOV8PIif7dp/I6YBXb/Nba5QcqBt1u0Q6CAMIAmEQEM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index afb6eeef5db3..38afe65df6cf 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -1,8 +1,8 @@ { lib, - python, buildPythonPackage, fetchFromGitHub, + setuptools, pytestCheckHook, # for passthru.tests @@ -20,16 +20,18 @@ buildPythonPackage rec { pname = "tornado"; - version = "6.3.3"; - format = "setuptools"; + version = "6.4.1"; + pyproject = true; src = fetchFromGitHub { owner = "tornadoweb"; repo = "tornado"; rev = "v${version}"; - hash = "sha256-l9Ce/c2wDSmsySr9yXu5Fl/+63QkQay46aDSUTJmetA="; + hash = "sha256-vWiTLKL5gzrf3J6T3u8I1HHg5Ww0sf5ybSbZX6G3UXM="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index d62058381b7b..4e140e15743e 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "trackpy"; - version = "0.6.2"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "soft-matter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HqInZkKvMM0T/HrDeZJcVHMxuRmhMvu0qAl5bAu3eQI="; + hash = "sha256-AChtnwkGDzD4O0h0POmQrHJbgFvbFZUp15H4fKqm0Co="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trafilatura/default.nix b/pkgs/development/python-modules/trafilatura/default.nix index a8183bf3f841..720ead19e010 100644 --- a/pkgs/development/python-modules/trafilatura/default.nix +++ b/pkgs/development/python-modules/trafilatura/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "trafilatura"; - version = "1.9.0"; + version = "1.10.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-5oM9KauKE+2FOTfXyR5oaLxi774QIUrCsQZDbdI9FBI="; + hash = "sha256-exBXPi3Ra2cC9W9WhYsl80/4HWsW5CmvCjsmbwdGru4="; }; # Patch out gui cli because it is not supported in this packaging and diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index cb657033ef24..09a4e2d944ac 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.14.2"; + version = "5.14.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jN2DwEDat9He6CJnjl9dEAtRT3tysBYVsm/FcYkW/fk="; + hash = "sha256-ntBXnTUCyUtLNzKsEgN1zalvkjEUUihH3ks7uYuWtrc="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index f730d649361b..cc522d35fc01 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.41.2"; + version = "4.42.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-Y3WYO+63n/ATT9RmRJ9JLuhFWUiuBO4NL2KzvzELi+M="; + hash = "sha256-vcwOFprscE8R3AdIJudYme9vvSFJvF+iCzRzBhiggr8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tree-sitter-html/Cargo.lock b/pkgs/development/python-modules/tree-sitter-html/Cargo.lock deleted file mode 100644 index e34eb1cd132d..000000000000 --- a/pkgs/development/python-modules/tree-sitter-html/Cargo.lock +++ /dev/null @@ -1,71 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "tree-sitter" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-html" -version = "0.20.3" -dependencies = [ - "cc", - "tree-sitter", -] diff --git a/pkgs/development/python-modules/tree-sitter-html/default.nix b/pkgs/development/python-modules/tree-sitter-html/default.nix index 2085ef7bad57..361f53b29bb6 100644 --- a/pkgs/development/python-modules/tree-sitter-html/default.nix +++ b/pkgs/development/python-modules/tree-sitter-html/default.nix @@ -1,11 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, cargo -, rustPlatform -, rustc , setuptools -, wheel , tree-sitter }: @@ -21,20 +17,8 @@ buildPythonPackage rec { hash = "sha256-sHy3fVWemJod18HCQ8zBC/LpeCCPH0nzhI1wrkCg8nw="; }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - build-system = [ - cargo - rustPlatform.cargoSetupHook - rustc setuptools - wheel ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/tree-sitter-javascript/Cargo.lock b/pkgs/development/python-modules/tree-sitter-javascript/Cargo.lock deleted file mode 100644 index 2a6627a05115..000000000000 --- a/pkgs/development/python-modules/tree-sitter-javascript/Cargo.lock +++ /dev/null @@ -1,71 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "tree-sitter" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-javascript" -version = "0.21.3" -dependencies = [ - "cc", - "tree-sitter", -] diff --git a/pkgs/development/python-modules/tree-sitter-javascript/default.nix b/pkgs/development/python-modules/tree-sitter-javascript/default.nix index 50b115c4e7ef..f6a8782f1406 100644 --- a/pkgs/development/python-modules/tree-sitter-javascript/default.nix +++ b/pkgs/development/python-modules/tree-sitter-javascript/default.nix @@ -1,11 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, cargo -, rustPlatform -, rustc , setuptools -, wheel , tree-sitter }: @@ -21,22 +17,8 @@ buildPythonPackage rec { hash = "sha256-jsdY9Pd9WqZuBYtk088mx1bRQadC6D2/tGGVY+ZZ0J4="; }; - cargoDeps = rustPlatform.importCargoLock { - # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely - # have rust dependencies so it doesn't cost us too much. - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - build-system = [ - cargo - rustPlatform.cargoSetupHook - rustc setuptools - wheel ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/tree-sitter-json/Cargo.lock b/pkgs/development/python-modules/tree-sitter-json/Cargo.lock deleted file mode 100644 index 1b9b095b2637..000000000000 --- a/pkgs/development/python-modules/tree-sitter-json/Cargo.lock +++ /dev/null @@ -1,71 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "tree-sitter" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-json" -version = "0.21.0" -dependencies = [ - "cc", - "tree-sitter", -] diff --git a/pkgs/development/python-modules/tree-sitter-json/default.nix b/pkgs/development/python-modules/tree-sitter-json/default.nix index acf574bef1d9..45557bd5e2ea 100644 --- a/pkgs/development/python-modules/tree-sitter-json/default.nix +++ b/pkgs/development/python-modules/tree-sitter-json/default.nix @@ -1,11 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, cargo -, rustPlatform -, rustc , setuptools -, wheel , tree-sitter }: @@ -21,22 +17,8 @@ buildPythonPackage rec { hash = "sha256-waejAbS7MjrE7w03MPqvBRpEpqTcKc6RgKCVSYaDV1Y="; }; - cargoDeps = rustPlatform.importCargoLock { - # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely - # have rust dependencies so it doesn't cost us too much. - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - build-system = [ - cargo - rustPlatform.cargoSetupHook - rustc setuptools - wheel ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/tree-sitter-python/Cargo.lock b/pkgs/development/python-modules/tree-sitter-python/Cargo.lock deleted file mode 100644 index 001baef04472..000000000000 --- a/pkgs/development/python-modules/tree-sitter-python/Cargo.lock +++ /dev/null @@ -1,71 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "tree-sitter" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-python" -version = "0.21.0" -dependencies = [ - "cc", - "tree-sitter", -] diff --git a/pkgs/development/python-modules/tree-sitter-python/default.nix b/pkgs/development/python-modules/tree-sitter-python/default.nix index e42136f5c2ad..399fcb0afc18 100644 --- a/pkgs/development/python-modules/tree-sitter-python/default.nix +++ b/pkgs/development/python-modules/tree-sitter-python/default.nix @@ -1,11 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, cargo -, rustPlatform -, rustc , setuptools -, wheel , tree-sitter }: @@ -21,22 +17,8 @@ buildPythonPackage rec { hash = "sha256-ZQ949GbgzZ/W667J+ekvQbs4bGnbDO+IWejivhxPZXM="; }; - cargoDeps = rustPlatform.importCargoLock { - # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely - # have rust dependencies so it doesn't cost us too much. - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - build-system = [ - cargo - rustPlatform.cargoSetupHook - rustc setuptools - wheel ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/tree-sitter-rust/Cargo.lock b/pkgs/development/python-modules/tree-sitter-rust/Cargo.lock deleted file mode 100644 index 406fa5fc19bb..000000000000 --- a/pkgs/development/python-modules/tree-sitter-rust/Cargo.lock +++ /dev/null @@ -1,71 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "tree-sitter" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-rust" -version = "0.21.2" -dependencies = [ - "cc", - "tree-sitter", -] diff --git a/pkgs/development/python-modules/tree-sitter-rust/default.nix b/pkgs/development/python-modules/tree-sitter-rust/default.nix index b2c85aa9c5c1..c532127dcd14 100644 --- a/pkgs/development/python-modules/tree-sitter-rust/default.nix +++ b/pkgs/development/python-modules/tree-sitter-rust/default.nix @@ -1,11 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, cargo -, rustPlatform -, rustc , setuptools -, wheel , tree-sitter }: @@ -21,25 +17,10 @@ buildPythonPackage rec { hash = "sha256-4CTh6fKSV8TuMHLAfEKWsAeCqeCM2uo6hVmF5KWhyPY="; }; - cargoDeps = rustPlatform.importCargoLock { - # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely - # have rust dependencies so it doesn't cost us too much. - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - build-system = [ - cargo - rustPlatform.cargoSetupHook - rustc setuptools - wheel ]; - passthru.optional-dependencies = { core = [ tree-sitter diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix index 151e6f41ac7b..cc98867484a6 100644 --- a/pkgs/development/python-modules/treex/default.nix +++ b/pkgs/development/python-modules/treex/default.nix @@ -16,7 +16,6 @@ tensorflow, treeo, torchmetrics, - pythonRelaxDepsHook, torch, }: @@ -44,7 +43,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; buildInputs = [ jaxlib ]; diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 2fcdd1be477e..302c5d975676 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -3,21 +3,14 @@ lib, buildPythonPackage, fetchPypi, - isPy3k, - installShellFiles, - attrs, click, construct, construct-classes, ecdsa, - hidapi, libusb1, mnemonic, - pillow, - protobuf, requests, - shamir-mnemonic, - simple-rlp, + setuptools, typing-extensions, trezor-udev-rules, pytestCheckHook, @@ -26,31 +19,23 @@ buildPythonPackage rec { pname = "trezor"; version = "0.13.9"; - format = "setuptools"; - - disabled = !isPy3k; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-lFC9e7nSPl4zo8nljhjwWLRMnZw0ymZLSYGnlaqfse8="; }; - nativeBuildInputs = [ installShellFiles ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - attrs + dependencies = [ click construct construct-classes ecdsa - hidapi libusb1 mnemonic - pillow - protobuf requests - shamir-mnemonic - simple-rlp typing-extensions ] ++ lib.optionals stdenv.isLinux [ trezor-udev-rules ]; @@ -67,22 +52,12 @@ buildPythonPackage rec { $out/bin/trezorctl --version ''; - postFixup = '' - mkdir completions - _TREZORCTL_COMPLETE=source_bash $out/bin/trezorctl > completions/trezorctl || true - _TREZORCTL_COMPLETE=source_zsh $out/bin/trezorctl > completions/_trezorctl || true - _TREZORCTL_COMPLETE=source_fish $out/bin/trezorctl > completions/trezorctl.fish || true - installShellCompletion --bash completions/trezorctl - installShellCompletion --zsh completions/_trezorctl - installShellCompletion --fish completions/trezorctl.fish - ''; - meta = with lib; { description = "Python library for communicating with Trezor Hardware Wallet"; mainProgram = "trezorctl"; homepage = "https://github.com/trezor/trezor-firmware/tree/master/python"; changelog = "https://github.com/trezor/trezor-firmware/blob/python/v${version}/python/CHANGELOG.md"; - license = licenses.gpl3; + license = licenses.lgpl3Only; maintainers = with maintainers; [ np prusnak diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index 5f75a4331a4c..ec13fb857cee 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -11,14 +11,15 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2024.4.10"; + version = "2024.5.22"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-SfQLtqdGtyocuk+NVe6CUhac2g9wgC4/0k8Et/slpJI="; + pname = "trove_classifiers"; + inherit version; + hash = "sha256-imJCu7XJrojTTPZl6Bayh9IhKXPId336717BjXKsHQM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ttn-client/default.nix b/pkgs/development/python-modules/ttn-client/default.nix index 8c875737a62b..3b202c52c7e9 100644 --- a/pkgs/development/python-modules/ttn-client/default.nix +++ b/pkgs/development/python-modules/ttn-client/default.nix @@ -4,13 +4,14 @@ buildPythonPackage, fetchFromGitHub, hatchling, + pytest-asyncio, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "ttn-client"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,17 +20,25 @@ buildPythonPackage rec { owner = "angelnu"; repo = "thethingsnetwork_python_client"; rev = "refs/tags/v${version}"; - hash = "sha256-AVEPOsEV/oJ5qM0w18dokH2R6zr1kvvJ1diR7GWqJwg="; + hash = "sha256-MnQEYPrkJVs+yxRRYF5FpDDc6k6qAbAnSzNl+p1bmgY="; }; nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "ttn_client" ]; + disabledTests = [ + # Test require network access + "test_connection_auth_error" + ]; + meta = with lib; { description = "Module to fetch/receive and parse uplink messages from The Thinks Network"; homepage = "https://github.com/angelnu/thethingsnetwork_python_client"; diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index a9dd6c8f5a50..3b351c3a608f 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -6,7 +6,6 @@ yt-dlp, docopt, pythonOlder, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -21,7 +20,6 @@ buildPythonPackage rec { sha256 = "sha256-Pp4h0MBoYhczmxPq21cLiYpLUeFP+2JoACcFpBl3b0E="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ internetarchive diff --git a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix index c831f7a0108c..3179f22b5a5e 100644 --- a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix +++ b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix @@ -9,14 +9,14 @@ }: let pname = "tuya-device-sharing-sdk"; - version = "0.1.9"; + version = "0.2.0"; in buildPythonPackage { inherit pname version; src = fetchPypi { inherit pname version; - hash = "sha256-mBKR+ttBo0VF33pEmYdjbyM4bGgyDiYexIIsf8mXZW4="; + hash = "sha256-fu8zh59wlnxtstNbNL8mIm10tiXy22oPbi6oUy5x8c8="; }; # workaround needed, upstream issue: https://github.com/tuya/tuya-device-sharing-sdk/issues/10 diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index c5e6a7c61607..504bc9f396b8 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.2.1"; + version = "9.2.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-lCa9dV8rYyGRff+uOKIT0eq5PRItGRuedgY7IrRZ714="; + hash = "sha256-uPpA/FJRtmD8w5lZCmSsbZWGYRnKuvCx34aAKUWqn8o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index 3077cee0c6d1..8b5144e74ecc 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -7,28 +7,26 @@ pyparsing, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, quixote, setuptools, }: buildPythonPackage rec { pname = "twill"; - version = "3.2.4"; + version = "3.2.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YlZKvOGxLWwGh+MqCXf8tfruxLK60H73k1VQhGOSTc8="; + hash = "sha256-/WIcM/zQ2UjGlGiJRYg9iTCQayzisxGBa5P0/2FDK2Q="; }; pythonRelaxDeps = [ "lxml" ]; build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ httpx diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 5de355a1cc34..2002f84439d4 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "twine"; - version = "5.0.0"; + version = "5.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ibDMfTcKS2ZCHMYQLyaaqRD+DxhhwST1c88t3tvBDPQ="; + hash = "sha256-TXR3DIjE/K+BNNKmqdhj5A8IJV/32OKss8u9V9Jfbp0="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 8492807e71d2..8449cc2a6f12 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -130,6 +130,10 @@ buildPythonPackage rec { echo 'WorkerReporterTests.test_addSkipPyunit.skip = "'WorkerReporter' object has no attribute '_testStarted'"' >> src/twisted/trial/_dist/test/test_workerreporter.py echo 'LocalWorkerAMPTests.test_runSkip.skip = "twisted.protocols.amp.UnknownRemoteError: Code: Unknown Error"' >> src/twisted/trial/_dist/test/test_worker.py + # https://github.com/twisted/twisted/issues/12194 + echo 'FlattenerErrorTests.test_asynchronousFlattenError.skip = "builtins.KeyError: 'root'"' >> src/twisted/web/test/test_flatten.py + echo 'FlattenerErrorTests.test_cancel.skip = "builtins.KeyError: 'root'"' >> src/twisted/web/test/test_flatten.py + # not packaged substituteInPlace src/twisted/test/test_failure.py \ --replace "from cython_test_exception_raiser import raiser # type: ignore[import]" "raiser = None" diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index a689f4381d6c..b2b9704d5425 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - pythonRelaxDepsHook, # propagated build input faiss, torch, @@ -159,7 +158,6 @@ buildPythonPackage { hash = "sha256-2d31wzUz0/FcrejDIog2EI4BXgjd7XXpN4tRXpLk5DI="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRemoveDeps = [ # We call it faiss, not faiss-cpu. diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index fe2ebd26d7d1..66f59fb6f0ad 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "24.2.0"; + version = "24.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typed_settings"; inherit version; - hash = "sha256-BuosfIlCgCD+h7eA/6/oE98zdURaT3eik+dysBpJR+Y="; + hash = "sha256-x1ojSSZNrKkBHKE9dWw7NzX/G6ggRYRIQ5MMahwL1Ps="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 1c80ea352c09..41e7c35791ac 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -8,6 +8,7 @@ pytestCheckHook, typing-extensions, importlib-metadata, + mypy, sphinxHook, sphinx-autodoc-typehints, sphinx-rtd-theme, @@ -16,14 +17,14 @@ buildPythonPackage rec { pname = "typeguard"; - version = "4.2.1"; - format = "pyproject"; + version = "4.3.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-xVahuVlIIwUQBwylP6A0H7CWRhG9BdWY2H+1IRXWX+4="; + hash = "sha256-ku5qCuyRNRgermBn69YX/Z3o111xT7VIcopJM7HeplE="; }; outputs = [ @@ -31,7 +32,7 @@ buildPythonPackage rec { "doc" ]; - nativeBuildInputs = [ + build-system = [ glibcLocales setuptools setuptools-scm @@ -40,13 +41,16 @@ buildPythonPackage rec { sphinx-rtd-theme ]; - propagatedBuildInputs = [ + dependencies = [ typing-extensions ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; env.LC_ALL = "en_US.utf-8"; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + mypy + pytestCheckHook + ]; pythonImportsCheck = [ "typeguard" ]; diff --git a/pkgs/development/python-modules/typer-shell/default.nix b/pkgs/development/python-modules/typer-shell/default.nix index bb195d121fb6..b54ad8d256f6 100644 --- a/pkgs/development/python-modules/typer-shell/default.nix +++ b/pkgs/development/python-modules/typer-shell/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, iterfzf, poetry-core, - pythonRelaxDepsHook, pythonOlder, pyyaml, rich, @@ -34,7 +33,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ click diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index 45f86523ac3a..b493ca0331a1 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,13 +364,13 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.13.0"; + version = "2.13.1"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit version; - hash = "sha256-CDDY60I1eMMIChOCvbSQi7ZsKSo0mlOccNlvjypq3+U="; + hash = "sha256-iJCVMd8HK22CsAbOg3c4hlnatiyMNFw97V8XtjWJwPQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 112c19286a92..946a012d82bf 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.20.12"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-C+q93gIF3B2meepGT9P5i1cO9PD8glsVWpdPtRsh6Nk="; + hash = "sha256-Bqokf+XM8LhkKOUomuq/Z/ln4Qhh8hHBbBnn0lQqcKk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index eede2efa6d56..e7db25836e8f 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.25.0.20240417"; + version = "5.26.0.20240422"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-w07/F7mzoK22gwYi8PMCSE5MCJ9TOkbj8UdWgxNUQ1I="; + hash = "sha256-5gdBeBCfl+/p8LIKA1umHXw7A+hn60fSVNKyq2qAXjY="; }; propagatedBuildInputs = [ types-futures ]; diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix index 45cef1e52775..766f6beebefe 100644 --- a/pkgs/development/python-modules/types-psutil/default.nix +++ b/pkgs/development/python-modules/types-psutil/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-psutil"; - version = "5.9.5.20240423"; + version = "5.9.5.20240516"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-G5ds+GMIMWxawizsaIAVsEJzyE+OaRw9+wwSMY8ypvM="; + hash = "sha256-uylvWfxWRYiR0P6xmUcX5UihvPiZNqKHffh5K4IrRpY="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 35e2530eeab1..0c5bcbbb5c48 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "69.5.0.20240415"; + version = "70.0.0.20240524"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-6mSvCpamdPjEC6NMCcJU88cLw/IYxr/6HQkSvZFYSi8="; + hash = "sha256-4x/ue50V71OYBSZXmsYImzrlGgBaKBrPlxeOkKxxr/Y="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/typical/default.nix b/pkgs/development/python-modules/typical/default.nix index 8201e4ba8104..357bb8d1094a 100644 --- a/pkgs/development/python-modules/typical/default.nix +++ b/pkgs/development/python-modules/typical/default.nix @@ -12,7 +12,6 @@ pydantic, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, sqlalchemy, ujson, }: @@ -35,7 +34,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ fastjsonschema diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 5ee8e67e3794..198326fe35c2 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.11.0"; + version = "4.12.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typing_extensions"; inherit version; - hash = "sha256-g/CFvVylnIApX8KoKrXaxnnL4CufM/fYOvaOJBvqUbA="; + hash = "sha256-Gn6tVcflWd1N7ohW46iLQSJav+HOjfV7fBORX+Eh/7g="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index af40d6be2503..62741a5a06c1 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -11,7 +11,6 @@ fonttools, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, setuptools-scm, skia-pathops, ufolib2, @@ -19,19 +18,18 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "3.2.4"; + version = "3.2.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-LkrYKERPJrKsWAYnlJJlybNy93J+uStaHv35jcZpTrU="; + hash = "sha256-PUPk92wugtIZWXP8vq8bJNxqTDhDENKdNhW1kNEcL3E="; }; nativeBuildInputs = [ setuptools-scm - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "cffsubr" ]; diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 77a4f48428d2..6a93690a5abf 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, # build-system poetry-core, @@ -11,6 +12,7 @@ aiohttp, aioshutil, async-timeout, + convertertools, dateparser, orjson, packaging, @@ -35,14 +37,16 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "1.7.2"; + version = "5.2.0"; pyproject = true; + disabled = pythonOlder "3.10"; + src = fetchFromGitHub { owner = "uilibs"; repo = "uiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-gr+P7V0vsmWha/Di3BGORjssCLz0lsufawzMZKOMYt0="; + hash = "sha256-VH8b++7C4bLLoZoefc9zd9S7HTkrDiE7Wle3wkwvjoA="; }; postPatch = '' @@ -51,11 +55,14 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ "pydantic" ]; + dependencies = [ aiofiles aiohttp aioshutil async-timeout + convertertools dateparser orjson packaging diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 9b5ae6fcb60c..b94550bdce50 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "ujson"; - version = "5.9.0"; + version = "5.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-icyS5z1VAbin9IV17rFK0nFWrQksLp/H48+UnwfnVTI="; + hash = "sha256-s82PPF2MdzglfxAYiARE97fZtmIyxkZJ9WLXuoatS8E="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index db120296a24f..d20b06a2ee35 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -1,10 +1,17 @@ { lib, buildPythonPackage, - setuptools-scm, fetchFromGitHub, - pytestCheckHook, + + # build-system + setuptools, + setuptools-scm, + + # optional-dependencies numpy, + + # tests + pytestCheckHook, }: buildPythonPackage rec { @@ -19,14 +26,19 @@ buildPythonPackage rec { hash = "sha256-AaFazHeq7t4DnG2s9GvmAJ3ni62PWHR//mNPL+WyGSI="; }; - nativeBuildInputs = [ + build-system = [ + setuptools setuptools-scm ]; + optional-dependencies.arrays = [ numpy ]; + nativeCheckInputs = [ pytestCheckHook - numpy - ]; + ] + ++ optional-dependencies.arrays; + + pythonImportsCheck = [ "uncertainties" ]; meta = with lib; { homepage = "https://pythonhosted.org/uncertainties/"; diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index da684d66745d..0fd4ba8cdc7b 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.15.5"; + version = "0.16.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-mLAX9B+9nPSBHJTDgBOLU1l58LkAkdywfdN58eSqP+I="; + hash = "sha256-fbqR8SCat+n4pn8HoVveSa4tobikb9rYsCIroYuRAhI="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch b/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch new file mode 100644 index 000000000000..904538880a22 --- /dev/null +++ b/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch @@ -0,0 +1,29 @@ +From bcc65c0be18fc6ea6ec39da89d0de77544fa18c7 Mon Sep 17 00:00:00 2001 +From: Mrmaxmeier +Date: Tue, 9 Jul 2024 17:41:08 +0200 +Subject: [PATCH] Drop removed `distutils` import in favor of `sysconfig` + +This patch is available online as https://github.com/unicorn-engine/unicorn/pull/1973 + +diff --git a/unicorn/unicorn.py b/unicorn/unicorn.py +index 2e6a938f43..7204b8215f 100644 +--- a/unicorn/unicorn.py ++++ b/unicorn/unicorn.py +@@ -2,7 +2,7 @@ + from __future__ import annotations + import ctypes + import ctypes.util +-import distutils.sysconfig ++import sysconfig + from functools import wraps + from typing import Any, Callable, List, Tuple, Union + import pkg_resources +@@ -85,7 +85,7 @@ def _load_lib(path, lib_name): + pkg_resources.resource_filename(__name__, 'lib'), + os.path.join(os.path.split(__file__)[0], 'lib'), + '', +- distutils.sysconfig.get_python_lib(), ++ sysconfig.get_path('platlib'), + "/usr/local/lib/" if sys.platform == 'darwin' else '/usr/lib64', + os.getenv('PATH', '')] + diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index a684d0fda817..de3a0f6a3040 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -15,6 +15,11 @@ buildPythonPackage rec { sourceRoot = "${src.name}/bindings/python"; + patches = [ + # Python 3.12 compatibility: Drop removed `distutils` import in favor of `sysconfig` + ./avoid-distutils-python312.patch + ]; + prePatch = '' ln -s ${unicorn-emu}/lib/libunicorn.* prebuilt/ ''; diff --git a/pkgs/development/python-modules/unicurses/default.nix b/pkgs/development/python-modules/unicurses/default.nix index 273fc56d4b81..bdb2a33f8109 100644 --- a/pkgs/development/python-modules/unicurses/default.nix +++ b/pkgs/development/python-modules/unicurses/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "unicurses"; - version = "3.0.0"; + version = "3.1.2"; format = "setuptools"; src = fetchPypi { inherit version; pname = "Uni-Curses"; - hash = "sha256-ZJUKWxu2cQlFGN1RNtyDacwSOtBiUKzk9SIDD0IQiuU="; + hash = "sha256-M4mjdmy2NSf5KiTVYznPy86bVgZB5u1vDi6GIH1Frc4="; }; propagatedBuildInputs = [ x256 ]; @@ -22,8 +22,8 @@ buildPythonPackage rec { # Necessary because ctypes.util.find_library does not find the ncurses libraries postPatch = '' substituteInPlace './unicurses/__init__.py' \ - --replace "find_library('ncursesw')" '"${ncurses}/lib/libncursesw.so.6"' \ - --replace "find_library('panelw')" '"${ncurses}/lib/libpanelw.so.6"' + --replace-fail "find_library('ncursesw')" '"${ncurses}/lib/libncursesw.so.6"' \ + --replace-fail "find_library('panelw')" '"${ncurses}/lib/libpanelw.so.6"' ''; pythonImportsCheck = [ "unicurses" ]; diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix index fc71e13c306b..d7e9f274d3d5 100644 --- a/pkgs/development/python-modules/unidata-blocks/default.nix +++ b/pkgs/development/python-modules/unidata-blocks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "unidata-blocks"; - version = "0.0.10"; + version = "0.0.13"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "unidata_blocks"; inherit version; - hash = "sha256-wwiOjfIAx6AZtK98uuPQ0jwblq+CdnMQp+JkQWh+RgM="; + hash = "sha256-JQwKMEhDdvvsnXI6QsV2TcuB3mw5NcALbi5kM5xl/Pw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index e4b09034d18f..55551a5206ef 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonRelaxDepsHook, # build-system setuptools, @@ -43,7 +42,6 @@ buildPythonPackage rec { --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/upcloud-api/default.nix b/pkgs/development/python-modules/upcloud-api/default.nix index 350d52e9d181..3ed1ec0028a6 100644 --- a/pkgs/development/python-modules/upcloud-api/default.nix +++ b/pkgs/development/python-modules/upcloud-api/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, requests, pytestCheckHook, responses, @@ -9,17 +10,19 @@ buildPythonPackage rec { pname = "upcloud-api"; - version = "2.5.1"; - format = "setuptools"; + version = "2.6.0"; + pyproject = true; src = fetchFromGitHub { owner = "UpCloudLtd"; repo = "upcloud-python-api"; rev = "refs/tags/v${version}"; - hash = "sha256-fMsI0aZ8jA08rrNPm8HmfYz/a3HLUExvvXIeDGPh2e8="; + hash = "sha256-RDGRue9hejNPKIP61GtJHMG5rG3CKvJdsYxVrp6I5W0="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/uplc/default.nix b/pkgs/development/python-modules/uplc/default.nix index 993706665e08..8d93cd592626 100644 --- a/pkgs/development/python-modules/uplc/default.nix +++ b/pkgs/development/python-modules/uplc/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPythonPackage, - pythonRelaxDepsHook, # Python deps frozenlist2, python-secp256k1-cardano, @@ -27,7 +26,6 @@ buildPythonPackage rec { hash = "sha256-djJMNXijMVzMVzw8NZSe3YFRGyAPqdvr0P374Za5XkU="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index efcb91c202e5..c4c5175b3f98 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.3.7"; + version = "5.3.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-ptfT31eUNSpVaZfXAyRcIc2T2p82rXmzUyySSVbI9lI="; + hash = "sha256-2cTa6AaN4BMJuzLhU9G4e0yl1kqyxblLWsSaIOHYS+o="; }; build-system = [ @@ -94,18 +94,15 @@ buildPythonPackage rec { "tests/test_0066_fix_http_fallback_freeze.py" "tests/test_0088_read_with_http.py" "tests/test_0220_contiguous_byte_ranges_in_http.py" - - # FileNotFoundError: uproot-issue-1043.root - "tests/test_1043_const_std_string.py" ]; pythonImportsCheck = [ "uproot" ]; - meta = with lib; { + meta = { description = "ROOT I/O in pure Python and Numpy"; homepage = "https://github.com/scikit-hep/uproot5"; changelog = "https://github.com/scikit-hep/uproot5/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ veprbl ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 77742a521d24..1bffd501e763 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -24,12 +24,12 @@ let self = buildPythonPackage rec { pname = "urllib3"; - version = "2.2.1"; + version = "2.2.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-0FcIdsYaueUg13bDisu7WwWndtP5/5ilyP1RYqREzxk="; + hash = "sha256-3VBUhVSaelUoM9peYGNjnQ0XfATyO8OGTkHl3F9hIWg="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 7e8091dac4da..af4c3579e184 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "urwid"; - version = "2.6.14"; + version = "2.6.15"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-UDYIAAAKmdqtTzV8yn1zkEH0PvOUmVXodxF1ZyubgE0="; + hash = "sha256-bBgzhNNYxNZKaSo43I3fMoR+j6XDV6UBNrZfQyZ/f7c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ush/default.nix b/pkgs/development/python-modules/ush/default.nix index 82c089b99c39..eba36519acca 100644 --- a/pkgs/development/python-modules/ush/default.nix +++ b/pkgs/development/python-modules/ush/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Powerful API for invoking with external commands"; homepage = "https://github.com/tarruda/python-ush"; license = licenses.mit; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix index 741c3d39c213..c884e3a02926 100644 --- a/pkgs/development/python-modules/uvcclient/default.nix +++ b/pkgs/development/python-modules/uvcclient/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pynose, + nose, mock, }: @@ -24,8 +24,11 @@ buildPythonPackage rec { --replace-fail "assertEquals" "assertEqual" ''; + # tests rely on nose + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ - pynose + nose mock ]; diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 9558cbe056df..9d0d63e1ca7c 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -3,7 +3,6 @@ aiohttp, buildPythonPackage, pythonOlder, - pythonRelaxDepsHook, fetchFromGitHub, setuptools, construct, @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "5.2.0"; + version = "5.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,12 +22,11 @@ buildPythonPackage rec { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-qq58ZSrKVQ00rtXMe4L9xfz0QB+UpjGOhPo1srPYIY4="; + hash = "sha256-jJ+FFDU4w1vdCqErz6ksJDvjFcalSAwaH+G77BNI5/E="; }; nativeBuildInputs = [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "websockets" ]; diff --git a/pkgs/development/python-modules/vcard/default.nix b/pkgs/development/python-modules/vcard/default.nix index a2fe7abb3b3b..11d8c496a706 100644 --- a/pkgs/development/python-modules/vcard/default.nix +++ b/pkgs/development/python-modules/vcard/default.nix @@ -6,7 +6,6 @@ python-dateutil, pythonAtLeast, pythonOlder, - pythonRelaxDepsHook, setuptools, }: @@ -28,8 +27,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - dependencies = [ python-dateutil ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index ab0af940e3e1..7851df4a2971 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -23,7 +23,6 @@ aioresponses, vdirsyncer, testers, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -46,7 +45,6 @@ buildPythonPackage rec { setuptools setuptools-scm wheel - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "aiostream" ]; diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index fce9211c6be2..f0ebd1f62128 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "vector"; - version = "1.3.1"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-GpQhDCGl04020Po2wa+5LChXuh0JyCSw1LhhXVH08uU="; + hash = "sha256-Fa74kRVg2x6j/6nb1UFNDsV1pQSiw/I+pFFwoYmURm4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index aa37f746a011..d7fbe2cabaa2 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -4,7 +4,6 @@ fetchpatch, fetchPypi, pythonOlder, - pythonRelaxDepsHook, altair, ipytablewidgets, ipywidgets, @@ -39,7 +38,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "pandas" ]; diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index d7ba738dd86f..023d1623a5b1 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -1,18 +1,20 @@ { lib, + aiofile, backoff, buildPythonPackage, fetchFromGitHub, pythonOlder, pyserial, pyserial-asyncio-fast, + pytest-asyncio, pytestCheckHook, setuptools, }: buildPythonPackage rec { pname = "velbus-aio"; - version = "2024.5.1"; + version = "2024.7.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,19 +23,27 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "velbus-aio"; rev = "refs/tags/${version}"; - hash = "sha256-rOuw1Iw6mGoXNSqxOlBappARzSGIlii03Hd8/3jWiQg="; + hash = "sha256-nGFx4ZqGTLMOmYNZam5jLKUsL3GxyyDwT8WFSEX9Qcs="; fetchSubmodules = true; }; build-system = [ setuptools ]; dependencies = [ + aiofile backoff pyserial pyserial-asyncio-fast ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; pythonImportsCheck = [ "velbusaio" ]; diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index dbbe59f5f60d..c578f96e1883 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "versioningit"; - version = "3.1.0"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-eqxxPDGlPrNnprvC6LPejMK4bRDUXFEBr9ZRRGyxD9c="; + hash = "sha256-sLpYblrwi4fb4zVAgpEKHQUCw2IC1JbhrmDvO0HuKcE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index eda027cbc4f3..91d884e21071 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - case, fetchPypi, pytestCheckHook, pythonOlder, @@ -20,7 +19,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - case pytestCheckHook ]; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 97655d743f01..75e9d40e860d 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.25.3"; + version = "20.26.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-e7VUu9/qrMM0n6YU6lv/asMA/HwzXp+s86O8/HA/Rb4="; + hash = "sha256-gr8PTuu7eNNt2u4Cg9Q/5XNrU4gLiozc03OQoHrDdBw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 36833c75ff48..eb3b16c0a3ea 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -21,17 +21,17 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.14.2"; + version = "0.14.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7ti0TW9ch70pWySqmi4OTm3GqQXM7gGy1ByPvwp2ez0="; + hash = "sha256-77u4R6kIuvfnFpq5vylhOKOTZPNn5ssKjsA61xaZ0x0="; }; - patches = [ + patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ (substituteAll { src = ./library-paths.patch; fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index b5b93f3ccd22..ef939cbdca6e 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -8,7 +8,6 @@ pyasn1-modules, pycparser, pyqt5, - pythonRelaxDepsHook, pyqtwebengine, pythonOlder, withGui ? false, @@ -34,7 +33,6 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - pythonRelaxDepsHook wrapQtAppsHook ]; diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 7ccab0a23129..2418f97452db 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -100,9 +100,9 @@ buildPythonPackage rec { with cudaPackages; [ cuda_cudart # cuda_runtime.h, -lcudart - cuda_cccl.dev # - libcusparse.dev # cusparse.h - libcublas.dev # cublas_v2.h + cuda_cccl # + libcusparse # cusparse.h + libcublas # cublas_v2.h libcusolver # cusolverDn.h ] )) diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index c0d6fa22c952..ca26ec29bd55 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -7,7 +7,6 @@ pytest-asyncio, pytest-httpserver, pytestCheckHook, - pythonRelaxDepsHook, pythonOlder, setuptools, }: @@ -35,7 +34,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ aiohttp ]; diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix index 91fb22173469..37baf7f80f34 100644 --- a/pkgs/development/python-modules/vulcan-api/default.nix +++ b/pkgs/development/python-modules/vulcan-api/default.nix @@ -8,7 +8,6 @@ fetchFromGitHub, pyopenssl, pythonOlder, - pythonRelaxDepsHook, pytz, related, requests, @@ -32,7 +31,6 @@ buildPythonPackage rec { pythonRemoveDeps = [ "faust-cchardet" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ aenum diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index 56db3c2434ed..2fa0ee811737 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -3,32 +3,28 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - pythonAtLeast, pythonOlder, + setuptools }: buildPythonPackage rec { pname = "w3lib"; - version = "2.1.2"; - format = "setuptools"; + version = "2.2.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7Vt06ZfuoqvjwTIfkW40QUTujpBypvM0Y+6OV/hYpLE="; + hash = "sha256-dW/y2Uxk5ByNfAxZ/qEqXQvFXjOlMceYi0oWPeubB90="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "w3lib" ]; - disabledTests = lib.optionals (pythonAtLeast "3.11") [ - # regressed on Python 3.11.4 - # https://github.com/scrapy/w3lib/issues/212 - "test_safe_url_string_url" - ]; - meta = with lib; { description = "Library of web-related functions"; homepage = "https://github.com/scrapy/w3lib"; diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index 9a8e33a3d8c1..c1b509b924dd 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "wagtail"; - version = "6.0.2"; + version = "6.1.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-58/DwPU/swLxeY8OAqesYHirAusOhwPA9xzL0/GOOG8="; + hash = "sha256-/bgsbNb2rlwfeyMSFmlp2GAQFbZcuymtEg76xyfTmcE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index a41f5b94632a..fbd5d9baabf5 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -40,7 +40,6 @@ pytest-xdist, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, pyyaml, requests, responses, @@ -77,7 +76,6 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index e3a419589913..8408780ef637 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -25,7 +25,7 @@ let }: buildPythonPackage rec { inherit pname; - version = "1.1.1"; + version = "1.2.0"; format = "pyproject"; outputs = [ "out" ] ++ lib.optional (pname == "wasmer") "testsout"; @@ -87,19 +87,19 @@ in wasmer = common { pname = "wasmer"; buildAndTestSubdir = "packages/api"; - cargoHash = "sha256-vpbwU1HrIQmQkce9SK8UOHrX5tOLv/XKsfJHteqOteA="; + cargoHash = "sha256-HKbVss6jGFdnCgXV3UYf6RxtmQM3+tq3cHfOSKw5JnY="; }; wasmer-compiler-cranelift = common { pname = "wasmer-compiler-cranelift"; buildAndTestSubdir = "packages/compiler-cranelift"; - cargoHash = "sha256-nv4cr52mUIuR3LWRT3eXU5b2LORwuN4iMbLX1efzovI="; + cargoHash = "sha256-BTBkoTluK7IVS+TpbQnMjn2Wvwhfxv1ev5PZWS/kW0w="; }; wasmer-compiler-llvm = common { pname = "wasmer-compiler-llvm"; buildAndTestSubdir = "packages/compiler-llvm"; - cargoHash = "sha256-FA/xXlPaK8NxZIw7MCm9Fyesgu72Dsxhmb5xzOIINhE="; + cargoHash = "sha256-AfLp4RLfnJ3R1Wg+RCJRmYr7748LQtl1W+ttTgIMls4="; extraNativeBuildInputs = [ llvm_14 ]; extraBuildInputs = [ libffi @@ -112,6 +112,6 @@ in wasmer-compiler-singlepass = common { pname = "wasmer-compiler-singlepass"; buildAndTestSubdir = "packages/compiler-singlepass"; - cargoHash = "sha256-yew7cB/7RLjW55jZmHFfIvaErgZ6XVxL1ucGGX2Cx18="; + cargoHash = "sha256-4DoeKRjS/2ijpUva0p/AE3qoIyt8CvCjkPWFPyLH6gs="; }; } diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 16be1cf5b48c..def2bdf1c880 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "watchdog"; - version = "4.0.0"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4+cGXL2r5hg6uCGZ16T2s7oKQ4xaUSpoVZhGzLdqeOw="; + hash = "sha256-7rqs9nT6JVEeiGcCjSgeYC7mUABFtX9DsId4CC9/i0Q="; }; # force kqueue on x86_64-darwin, because our api version does diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index 751a2886f472..22cd171afae5 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "watchfiles"; - version = "0.21.0"; + version = "0.22.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,13 +27,13 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/qNgkPF5N8jzSV3M0YFWvQngZ4Hf4WM/GBS1LtgFbWM="; + hash = "sha256-TtRSRgtMOqsnhdvsic3lg33xlA+r/DcYHlzewSOu/44="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-sqHTW1+E7Fp33KW6IYlNa77AYc2iCfaSoBRXzrhEKr8="; + hash = "sha256-n9yN/VRNQWCxh+BoliIMkKqJC51inpB9DQ9WtqR4oA0="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix index 244b2e9587ad..bf01bbf033d2 100644 --- a/pkgs/development/python-modules/weasel/default.nix +++ b/pkgs/development/python-modules/weasel/default.nix @@ -8,7 +8,6 @@ pydantic, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, requests, setuptools, smart-open, @@ -38,7 +37,6 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index d07a93a3a8b4..321ee830e57c 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -25,15 +25,15 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "61.2"; + version = "62.2"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit version; pname = "weasyprint"; - hash = "sha256-R99s/u/4xsKM8uTK+DfN4XcV7+RicIradLqi6zkbYFk="; + hash = "sha256-oIrEAOEZGdmW12vsqjMWDXwaxVuhYGKMQs51hldMGlE="; }; patches = [ diff --git a/pkgs/development/python-modules/weasyprint/library-paths.patch b/pkgs/development/python-modules/weasyprint/library-paths.patch index 6d884f43ed3c..e54561a4018a 100644 --- a/pkgs/development/python-modules/weasyprint/library-paths.patch +++ b/pkgs/development/python-modules/weasyprint/library-paths.patch @@ -1,14 +1,14 @@ diff --git a/weasyprint/text/ffi.py b/weasyprint/text/ffi.py -index 09f614aad..cbe9a73dd 100644 +index 3aba3e75..dde0e260 100644 --- a/weasyprint/text/ffi.py +++ b/weasyprint/text/ffi.py -@@ -415,22 +415,11 @@ def _dlopen(ffi, *names): +@@ -429,22 +429,11 @@ if hasattr(os, 'add_dll_directory'): # pragma: no cover with suppress((OSError, FileNotFoundError)): os.add_dll_directory(dll_directory) -gobject = _dlopen( - ffi, 'gobject-2.0-0', 'gobject-2.0', 'libgobject-2.0-0', -- 'libgobject-2.0.so.0', 'libgobject-2.0.dylib', 'libgobject-2.0-0.dll') +- 'libgobject-2.0.so.0', 'libgobject-2.0.dylib', 'libgobject-2.0-0.dll') -pango = _dlopen( - ffi, 'pango-1.0-0', 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so.0', - 'libpango-1.0.dylib', 'libpango-1.0-0.dll') @@ -28,4 +28,5 @@ index 09f614aad..cbe9a73dd 100644 +fontconfig = _dlopen(ffi, '@fontconfig@') +pangoft2 = _dlopen(ffi, '@pangoft2@') - gobject.g_type_init() \ No newline at end of file + gobject.g_type_init() + diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix index df85ba7d48c5..54f8673e23c5 100644 --- a/pkgs/development/python-modules/weatherflow4py/default.nix +++ b/pkgs/development/python-modules/weatherflow4py/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "weatherflow4py"; - version = "0.2.21"; + version = "0.2.22"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = "weatherflow4py"; rev = "refs/tags/v${version}"; - hash = "sha256-ah/PpYusrr1nxvKiSpUBYfkn4crX9pCNV9mjpDndMQE="; + hash = "sha256-J1hZormJByWC29fuRAJ2ozydRxQh9bGp4Pi96DuTSQo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index adc385ebd2a4..fc9aa1050f51 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -9,7 +9,6 @@ httpx, pydantic, pythonOlder, - pythonRelaxDepsHook, setuptools-scm, tqdm, validators, @@ -36,7 +35,6 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ authlib diff --git a/pkgs/development/python-modules/webrtc-noise-gain/default.nix b/pkgs/development/python-modules/webrtc-noise-gain/default.nix index 2ee864d32426..68cc5938bc88 100644 --- a/pkgs/development/python-modules/webrtc-noise-gain/default.nix +++ b/pkgs/development/python-modules/webrtc-noise-gain/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "webrtc-noise-gain"; - version = "1.2.3"; + version = "1.2.4"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "webrtc-noise-gain"; rev = "v${version}"; - hash = "sha256-DFEtuO49zXNixLwBjQ/WOiARDhMAXVH+5hfc3eSdPIo="; + hash = "sha256-ALRdj9zBcx05DcSKjAI0oEPruTD/p+pQ0kcqqyHl37A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index 701583ad521d..b69dfcb58509 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -10,14 +10,15 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-EOUR6jqMdEYx07135h6xftCTBMQTrULPbd+kx3h+j+Y="; + pname = "websocket_client"; + inherit version; + hash = "sha256-Mjnfn0TaYy+WASRygF1AojKBqZECfOEdL0Wm8krEw9o="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 30e5accbb3cf..bdbd57513c56 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -6,7 +6,6 @@ pytestCheckHook, python-dateutil, pythonOlder, - pythonRelaxDepsHook, setuptools, weconnect, }: @@ -39,7 +38,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ paho-mqtt diff --git a/pkgs/development/python-modules/wheel-inspect/default.nix b/pkgs/development/python-modules/wheel-inspect/default.nix index 683cec66d3a5..43b5f8dbedd5 100644 --- a/pkgs/development/python-modules/wheel-inspect/default.nix +++ b/pkgs/development/python-modules/wheel-inspect/default.nix @@ -7,7 +7,6 @@ hatchling, headerparser, jsonschema, - pythonRelaxDepsHook, packaging, pytestCheckHook, pythonOlder, @@ -42,7 +41,6 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wheezy-template/default.nix b/pkgs/development/python-modules/wheezy-template/default.nix index 506f909afac7..fd88225ee69a 100644 --- a/pkgs/development/python-modules/wheezy-template/default.nix +++ b/pkgs/development/python-modules/wheezy-template/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "Lightweight template library"; mainProgram = "wheezy.template"; license = licenses.mit; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index cc67f380517e..f2ab1675d043 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -35,6 +35,8 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; + pythonRelaxDeps = [ "defusedxml" ]; + propagatedBuildInputs = [ filetype defusedxml diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 7249390ab718..41450c7e27a8 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitLab, fetchpatch, - pythonRelaxDepsHook, html2text, lxml, packaging, @@ -48,7 +47,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "packaging" ]; diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index 84dfd700050b..d71ba1adca23 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "wurlitzer"; - version = "3.1.0"; + version = "3.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sx07GKtrg5SzrbiyGEGtbUtrsZW5tkKVOHLburTCmyo="; + hash = "sha256-v7kUSrnwJIfYArn/idvT+jgtCPc+EtuK3EwvsAzTm9k="; }; nativeCheckInputs = [ pytestCheckHook ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Capture C-level output in context managers"; homepage = "https://github.com/minrk/wurlitzer"; - changelog = "https://github.com/minrk/wurlitzer/blob/{version}/CHANGELOG.md"; + changelog = "https://github.com/minrk/wurlitzer/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/xarray-dataclasses/default.nix b/pkgs/development/python-modules/xarray-dataclasses/default.nix index 78de25f5bfbf..09205ea9e177 100644 --- a/pkgs/development/python-modules/xarray-dataclasses/default.nix +++ b/pkgs/development/python-modules/xarray-dataclasses/default.nix @@ -5,7 +5,6 @@ pythonOlder, poetry-core, pytestCheckHook, - pythonRelaxDepsHook, numpy, typing-extensions, xarray, @@ -27,7 +26,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "xarray" ]; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 14d0d860d5f5..9ea50cdae157 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "2024.2.0"; + version = "2024.6.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-oQXwJ5EILIiOviYiCQvq/y57aFcUiNYv5q/as1tLcX8="; + hash = "sha256-C5HgvE3AKWlHlHZA/jHsboZ84ljS98vBC+30ptaDQMc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index eac873777312..63e96858b658 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook xorg.xeyes - xorg.xorgserver + xorg.xvfb ]; preCheck = '' diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index 261ff0cb89e8..9a7b7bbef2b1 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -66,11 +66,11 @@ buildPythonPackage { [ # flash-attn build cuda_cudart # cuda_runtime_api.h - libcusparse.dev # cusparse.h - cuda_cccl.dev # nv/target - libcublas.dev # cublas_v2.h - libcusolver.dev # cusolverDn.h - libcurand.dev # curand_kernel.h + libcusparse # cusparse.h + cuda_cccl # nv/target + libcublas # cublas_v2.h + libcusolver # cusolverDn.h + libcurand # curand_kernel.h ] ); diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index fcaee169841f..1ab72c73a81b 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -12,7 +12,6 @@ pytestCheckHook, python-bidi, pythonOlder, - pythonRelaxDepsHook, reportlab, setuptools, svglib, @@ -42,7 +41,6 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 5e834c3419a4..531a5ad6299e 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -12,7 +12,6 @@ pycryptodomex, pytestCheckHook, pythonOlder, - pythonRelaxDepsHook, sensor-state-data, }: @@ -37,7 +36,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "pycryptodomex" ]; diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 0852e4b13fc3..97672413a4dd 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -4,11 +4,11 @@ buildPythonPackage, fetchFromGitHub, six, + setuptools, setuptools-scm, xorg, python, mock, - nose, pytestCheckHook, util-linux, }: @@ -16,7 +16,9 @@ buildPythonPackage rec { pname = "xlib"; version = "0.33"; - format = "setuptools"; + pyproject = true; + + build-system = [ setuptools ]; src = fetchFromGitHub { owner = "python-xlib"; @@ -36,10 +38,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook mock - nose util-linux xorg.xauth - xorg.xorgserver + xorg.xvfb ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix index b47a5c4e3cdd..12dfb75ce341 100644 --- a/pkgs/development/python-modules/xlwt/default.nix +++ b/pkgs/development/python-modules/xlwt/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - pynose, + nose, setuptools, pythonOlder, }: @@ -21,7 +21,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeCheckInputs = [ pynose ]; + # tests rely on nose, archived in 2020 + doCheck = pythonOlder "3.12"; + + nativeCheckInputs = [ nose ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 3a155055df63..13829b6be86c 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -34,6 +34,13 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # -file://///filer01/MY_HOME/dev/XMLSCHEMA/test.xsd + # +file:////filer01/MY_HOME/dev/XMLSCHEMA/test.xsd + "test_normalize_url_slashes" + "test_normalize_url_with_base_unc_path" + ]; + pythonImportsCheck = [ "xmlschema" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index 75155e475035..148a3de0371b 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - xorgserver, + xorg, mock, }: @@ -15,7 +15,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "097wxhvp01ikqpg1z3v8rqhss6f1vwr399zpz9a05d2135bsxx5w"; }; - propagatedBuildInputs = [ xorgserver ]; + propagatedBuildInputs = [ xorg.xvfb ]; # See: https://github.com/cgoldberg/xvfbwrapper/issues/30 doCheck = false; diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix index 1e808d587537..41c7083520c3 100644 --- a/pkgs/development/python-modules/xyzservices/default.nix +++ b/pkgs/development/python-modules/xyzservices/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xyzservices"; - version = "2024.4.0"; + version = "2024.6.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-agTxFIem+3fZKpiYTNEH+9kVf9XmX5Ka3Zw9bmBO6Iw="; + hash = "sha256-WMG9q0JX0lUbnvkc1IVx93t8TSvEW/XjwFrJezpNcoI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index 80fa146f3d26..c623097a6d5f 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -11,18 +11,22 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.5.2"; + version = "1.5.6"; pyproject = true; src = fetchFromGitHub { owner = "CZ-NIC"; repo = "yangson"; rev = "refs/tags/${version}"; - hash = "sha256-c/UWyfJdVz6wSluL1Ej9cSV3EpDUTkP0GTeHPYfAduE="; + hash = "sha256-/9MxCkcPGRNZkuwAAvlr7gtGcyxXtliski7bNtFhVBE="; }; build-system = [ poetry-core ]; + pythonRelaxDeps = [ + "setuptools" + ]; + dependencies = [ elementpath pyyaml diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix index 9196169d27de..30143e8a90fa 100644 --- a/pkgs/development/python-modules/yark/default.nix +++ b/pkgs/development/python-modules/yark/default.nix @@ -8,7 +8,6 @@ poetry-core, progress, pythonOlder, - pythonRelaxDepsHook, requests, yt-dlp, }: @@ -33,7 +32,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index d331e4f1771e..d4be6d3a9b78 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "youless-api"; - version = "2.1.0"; + version = "2.1.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "gjong"; repo = "youless-python-bridge"; rev = "refs/tags/${version}"; - hash = "sha256-gygChn5yXuTrVGP82ijKJHcjEuNTu6ZNikc87n8WTrI="; + hash = "sha256-MvGLIhkBbcGThKeqtlzVZct2o9PBLwcAELmn5pW3R6I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ypy-websocket/default.nix b/pkgs/development/python-modules/ypy-websocket/default.nix index 06aa6fec33c5..d50c231a574b 100644 --- a/pkgs/development/python-modules/ypy-websocket/default.nix +++ b/pkgs/development/python-modules/ypy-websocket/default.nix @@ -9,7 +9,6 @@ y-py, pytest-asyncio, pytestCheckHook, - pythonRelaxDepsHook, uvicorn, websockets, }: @@ -32,7 +31,6 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index b2a805bbf240..7d442fec0af0 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.7.3"; + version = "1.7.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-a2EZ0uUwdP0QNQh9h4TG1lmPXkvrlDziKiUQwYENXwk="; + hash = "sha256-gD0VpT0hTymubKLRnl45/FkEZ+t9IPA7pY8eIkTnrKM="; }; build-system = [ diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index 4f17e183396b..400d22584451 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -1,9 +1,9 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, python, + pythonAtLeast, zc-buildout, zope-testrunner, }: @@ -13,6 +13,9 @@ buildPythonPackage rec { version = "2.1"; format = "setuptools"; + # distutils usage + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit version; pname = "z3c.checkversions"; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 10a2d5e0e4f6..9022a3aaeb69 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.17.2"; + version = "2.18.2"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-LLqmy040LUUVLUp6SyATwzf806jnvJglNWAYDeYFUs4="; + hash = "sha256-m7OTuKCjj7Eh27kTsEfXXbKN6YkPbWRKIXpzz0rnT0c="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index b6b8d56f87d1..8a61451a6221 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -10,15 +10,16 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.10"; + version = "3.7.10.1"; pyproject = true; src = fetchPypi { - inherit version pname; - hash = "sha256-Bwn2Y/Bbu6O89iaSNWvMpXBhyJRmj6eL8j6HiPpbQbM="; + pname = "zeroc_ice"; + inherit version; + hash = "sha256-sGOq/aNg33EfdpRVKbtUFXbyZr5B5dWi3Xf10yDBhmQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; buildInputs = [ bzip2 diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 87d5d230d7a0..740aedd89c7a 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -13,7 +13,6 @@ pytestCheckHook, python-slugify, pythonOlder, - pythonRelaxDepsHook, setuptools, universal-silabs-flasher, wheel, @@ -53,7 +52,6 @@ buildPythonPackage rec { "zigpy" ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; build-system = [ setuptools diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 9ea32dde5b7d..c8779020abc4 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.23.1"; + version = "0.23.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-10EyT3IGdAtF9OUbfZ5OtP+Ot35O0SfMDtsyw5FQ+/8="; + hash = "sha256-H3WsprBTfBpxMGqasWbj41Yikt/UMU0cKaROzXE2dLU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 1df9053e08c5..cefa56354546 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Bs/m9Iyr8x+sMUVXt1whk2E4EJ5bpitMsEWZtmCyIf8="; + hash = "sha256-zfoFajRuZ06LLe8+3BUZZbKGpset24QQmqAIY949MF8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 9a8729f7515d..f9ecaecd95e3 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -11,14 +11,14 @@ let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.18.1"; + version = "3.19.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KITtIufYlh3hyaBRQutpokfxICkbwCBqAKdkLwm1txU="; + hash = "sha256-vx3PZFD4c6E+lSopUEiHyJ5t51BiCeWxvMNGATXU3hk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 08ba3dc21ba8..55dcfb7800d9 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "3.3"; + version = "4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dcF5Kse9W89JUFggYqw2hOMiqhOrmEIOO/7EWCJzo2g="; + hash = "sha256-6FutlWDWCSpjW+vueKQ7DxySamaRK+OQ6IyrZvTewYA="; }; # fails.. diff --git a/pkgs/development/python-modules/zope-exceptions/default.nix b/pkgs/development/python-modules/zope-exceptions/default.nix index 9952c56d7522..835fa247410e 100644 --- a/pkgs/development/python-modules/zope-exceptions/default.nix +++ b/pkgs/development/python-modules/zope-exceptions/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zope-exceptions"; - version = "5.0.1"; + version = "5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zope.exceptions"; inherit version; - hash = "sha256-MPxT5TOfX72dEzXg97afd/FePwbisXt/t++SXMJP3ZY="; + hash = "sha256-YRtMSUbDAWDbS3u9TzhhOzJoSvFn0xllCvm3O8ew6Xg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/zope-interface/default.nix b/pkgs/development/python-modules/zope-interface/default.nix index 3cc208094d26..c94e4a0366c5 100644 --- a/pkgs/development/python-modules/zope-interface/default.nix +++ b/pkgs/development/python-modules/zope-interface/default.nix @@ -2,25 +2,30 @@ lib, buildPythonPackage, fetchPypi, + setuptools, zope-event, }: buildPythonPackage rec { pname = "zope.interface"; - version = "5.5.2"; + version = "6.4.post2"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-v+4fP/YhQ4GUmeNI9bin86oCWfmspeDdrnOR0Fnc5nE="; + hash = "sha256-HCB+b239V0mib1pf2WZgLWuCTsANLfhKfpqSTokzZU4="; }; - propagatedBuildInputs = [ zope-event ]; + build-system = [ setuptools ]; + + dependencies = [ zope-event ]; doCheck = false; # Circular deps. meta = with lib; { + changelog = "https://github.com/zopefoundation/zope.interface/blob/${version}/CHANGES.rst"; description = "Zope.Interface"; - homepage = "https://zope.org/Products/ZopeInterface"; + homepage = "https://github.com/zopefoundation/zope.interface"; license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; diff --git a/pkgs/development/python-modules/zope-testbrowser/default.nix b/pkgs/development/python-modules/zope-testbrowser/default.nix index f2a9e692b083..b63578bb6b83 100644 --- a/pkgs/development/python-modules/zope-testbrowser/default.nix +++ b/pkgs/development/python-modules/zope-testbrowser/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "zope-testbrowser"; - version = "6.0"; + version = "7.0"; format = "setuptools"; src = fetchPypi { pname = "zope.testbrowser"; inherit version; - sha256 = "sha256-RLd6XpA3q+3DZHai6j3H6XTWE85Sk913zAL4iO4x+ho="; + sha256 = "sha256-WTbSoNd9h4HQATWP0LEUYShbAtxuOzJLhMHtkyax/z8="; }; postPatch = '' diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index cb5cc5220dfe..acd9e6b2d1a9 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -608,7 +608,7 @@ let RCurl = [ pkgs.curl.dev ]; R2SWF = [ pkgs.pkg-config ]; rDEA = [ pkgs.glpk ]; - rgl = with pkgs; [ libGLU libGLU.dev libGL xorg.libX11.dev freetype.dev libpng.dev ]; + rgl = with pkgs; [ libGLU libGL xorg.libX11.dev freetype.dev libpng.dev ]; RGtk2 = [ pkgs.pkg-config ]; RProtoBuf = [ pkgs.pkg-config ]; Rpoppler = [ pkgs.pkg-config ]; diff --git a/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix b/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix index d6714c6b7d63..65e2e93782e9 100644 --- a/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix +++ b/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix @@ -6,7 +6,7 @@ , cmake , pkg-config , glew -, freeglut +, libglut , opencl-headers , ocl-icd }: @@ -26,7 +26,7 @@ let nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ glew freeglut opencl-headers ocl-icd ]; + buildInputs = [ glew libglut opencl-headers ocl-icd ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix b/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix index 24fc483847d3..940a670ff579 100644 --- a/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix +++ b/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix @@ -6,7 +6,7 @@ , cmake , pkg-config , glew -, freeglut +, libglut , opencl-headers , ocl-icd }: @@ -26,7 +26,7 @@ let nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ glew freeglut opencl-headers ocl-icd ]; + buildInputs = [ glew libglut opencl-headers ocl-icd ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index 87270962248f..ab3edcd4cdc8 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "7.1.0"; + version = "7.2.2"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-27X2BSGcHMSxt3ry+EO/Z6Bq8rqlvNNME0ehBUWxN9s="; + sha256 = "sha256-kxO6lBqZzvfFrl+A/FK7L+XXmwn9fV8G5Y6dwfhbpbU="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index c8f5a7fd0892..5b31e4ae2de7 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.156"; + version = "3.2.174"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-RcYDvxqAyvXFdVo3NqISNJ2aDCUsRwN73r3ilc3IjCk="; + hash = "sha256-5R5WKeXmT4hMhjd+Laafqx4UXfvGf+2lMh34XpMs3vQ="; }; patches = [ ./flake8-compat-5.x.patch ]; @@ -47,7 +47,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/development/tools/analysis/clazy/default.nix b/pkgs/development/tools/analysis/clazy/default.nix index 10c61bf88881..8f92ab15150b 100644 --- a/pkgs/development/tools/analysis/clazy/default.nix +++ b/pkgs/development/tools/analysis/clazy/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clazy"; - version = "1.11"; + version = "1.12"; src = fetchFromGitHub { owner = "KDE"; repo = "clazy"; rev = "v${version}"; - sha256 = "sha256-kcl4dUg84fNdizKUS4kpvIKFfajtTRdz+MYUbKcMFvg="; + sha256 = "sha256-Fex0BAmCZUYcNJriHHt/QPi5IgSH/yhnpGCFFZMMD/g="; }; buildInputs = [ diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index fa5881a1cb0c..a71e385e0a39 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.17.5"; + version = "2.17.6"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-Ay+8NOYq1sBIDhCoju2/L8Ghegmxz5NmtpBLb0hqH/E="; + hash = "sha256-Xw/lyA4J0FkU0MTXbOanDJ+rLCEGCOP7BX9sApu+K6s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 72bd9776797b..956e460deca3 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.238.2"; + version = "0.238.3"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - hash = "sha256-l50Z1Vq6wMhUtOXd59waUXM0Xvo4I9twDMSA7Nk1hHU="; + hash = "sha256-WlHta/wXTULehopXeIUdNAQb12Lf0SJnm1HIVHTDshA="; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 87234ba584db..f682196a458f 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -37,12 +37,12 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "28.1"; - slang = "Nickel"; + version = "29.0"; + slang = "Copper"; src = fetchurl { url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - hash = "sha256-AiC8dDt9okaM65JvMx7cfd+qfGA7pHli3j4zyOHj9ZM="; + hash = "sha256-0vuzuND/g5RYcunm+iWOk0pwY2DmmNrjtNX5ca3fdJM="; }; preConfigure = '' diff --git a/pkgs/development/tools/analysis/snyk/default.nix b/pkgs/development/tools/analysis/snyk/default.nix index 1c983d6bfd6d..41f1af56422c 100644 --- a/pkgs/development/tools/analysis/snyk/default.nix +++ b/pkgs/development/tools/analysis/snyk/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "snyk"; - version = "1.1291.0"; + version = "1.1292.1"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-m70XujX2KOTvObjeBtoAbrYddi/+pLDLPXf/o+/DtmU="; + hash = "sha256-N54fSRYTFOlmfpommEFIqbMP5IBkhatMwx4CQ8fd5QI="; }; - npmDepsHash = "sha256-f7sY7eCF8k28UnGyKqOP/exhsZQzUC70nIIjEOXEeC4="; + npmDepsHash = "sha256-VHZqc111cC8AANogxXVg4BFlngdmrrt7E+tCMF5Rl7g="; postPatch = '' substituteInPlace package.json \ diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index a765966e35cb..d9a851d09824 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tflint-ruleset-aws"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-1ttqSRz++xJdpJIQ+rSCiGFhN5EJwW6tbAporc8J0LU="; + hash = "sha256-sgAr4kUBjKIH+DgI5XqH/Zs3uL0yiYwlBa6vO0m++xM="; }; - vendorHash = "sha256-4QH/KehKBSNQhW8z/tk5ExAXKQNQ5Rl3RKyj+0jm/eI="; + vendorHash = "sha256-B2QFjJKwfQYZP8ypiv7bNkFNr3ejP42WA/bmv4Jz46c="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 93dbe645220a..ec42dc90b7ea 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.51.1"; + version = "0.51.2"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-f2U/DK2yaJI0t125k0N4SHjNvSUYPtqTjR91EJnimGQ="; + hash = "sha256-tsp8+7LWX0W+jVI+O69LNiOCeUlSo6cN1NP9Y9NHonc="; }; - vendorHash = "sha256-xx/WF/yR++oB+7az9i/JkhYuOZsPoCBgYITqBR1Gv5c="; + vendorHash = "sha256-JbB78fBOb4dCeJcYLNb/tTJoj+tHqqlyS4caovYlVGE="; doCheck = false; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index e94a98a6a96a..9ad378db45e8 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -26,10 +26,6 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - pythonRelaxDeps = [ "aws-lambda-builders" "aws-sam-translator" diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 30f7defdfe42..735c7383f720 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.43.8"; + version = "1.45.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-rDmS13eDPYE/UmyCRsBi1wHOZerYf9QS/pOiPKVxwKA="; + hash = "sha256-6q9mUv1S44shGr3ScqLNTw1AiFS2sQmAMionsEdfOOw="; }; - vendorHash = "sha256-7rTbLnFfdmRQgQfx2w/mO3Ac5ENEFm5XPzApKwlImkE="; + vendorHash = "sha256-q3JnxFSnMePBfwFdrj69uh65UXqeL0+QUvGjzkS2lGs="; subPackages = [ "cmd/bearer" ]; diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/development/tools/biome/default.nix index 567484695251..3cf1402c556e 100644 --- a/pkgs/development/tools/biome/default.nix +++ b/pkgs/development/tools/biome/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "biome"; - version = "1.7.3"; + version = "1.8.1"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "cli/v${version}"; - hash = "sha256-iSL0PRHj32PpKoUogej0bc/zXGpS4ZgZG/+9Pewhl4k="; + hash = "sha256-RR4yHrLeEHNLe0Nr8FHm+u+DFJihbibRax41Ss9HDV8="; }; - cargoHash = "sha256-no6ZrH1Ma+n66SLgA3h9dQX8FgeVjFVkxfqR35F/prs="; + cargoHash = "sha256-xCA1kxt70lrCrPygMe98eF8RC/l47EnJPjLaXBccBRE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index 6b485b80ea1c..a74b029d327a 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - ./b2 install --prefix="$out" + ./b2 ${lib.optionalString (stdenv.cc.isClang) "toolset=clang "}install --prefix="$out" # older versions of b2 created this symlink, # which we want to support building via useBoost. diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 3edfe7aea574..be6c65faec9b 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.32.2"; + version = "1.34.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-lSK1ETeCnK/NeCHaZoHcgFO5OhbE6XcvbJg1+p9x4Hg="; + hash = "sha256-a2OuxstfZcN49CLn4Tk6DeCXUKZOrMQ7pNDicmNxVRA="; }; - vendorHash = "sha256-LMjDR8tTZPLiIKxvdGjeaVMOh76eYhmAlI7lDJ7HG7I="; + vendorHash = "sha256-rAuFXXoC0zp/n+2Ogxrj7Ji3wpQ45XloOs7nI8K41eo="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index a2f007a0fcf4..39d974e0f3b8 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 778a8c2f221b..173c87ca0a6a 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.26.1"; + version = "1.26.4"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-XgOtPL3gzSRX+VWAsNo6zMCh6tQoeH1HvH6oycS6S70="; + hash = "sha256-+vgP8Nu/t7pxU/YGIIi8zd0zuAzZFdpcZLGnjZgqYGM="; }; - cargoHash = "sha256-maqdfN8UXcAU3UGxjE6PJWxyilKWJZPkfXY7tu72LTk="; + cargoHash = "sha256-WDBAuzUCjZxayXeEdxvWAHZyYRQLDMz3QkNO9QT/DyI="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 42b9a493d3e8..3977d5b18441 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-FUt95sGSB8c9CjBPkByMS26tmpw6mamKnXKsGUGdJkA="; + hash = "sha256-R/6YzpSY7kbmnyJnLzwSI0y+fnGedkQQoT5YtyXWWfM="; }; postPatch = '' diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix index d6f92f25bdfc..d524da13cfac 100644 --- a/pkgs/development/tools/bundletool/default.nix +++ b/pkgs/development/tools/bundletool/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "bundletool"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-ggeZb4Oig5r9WtboUy2nSF6gaHS4BiohqUs+Lrl+s5Y="; + sha256 = "sha256-VOvuHx3oNn2a0mtGcr+yl2sLEhQuFdaD/HuOJU/GzBs="; }; dontUnpack = true; diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index d3f0ffa2e3b5..03c301f19362 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -51,6 +51,6 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/peterheesterman/chit"; license = licenses.mit; - maintainers = with maintainers; [ figsoda lilyball ]; + maintainers = with maintainers; [ figsoda ]; }; } diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix index e63e0d06ea14..29b6cb3d8a38 100644 --- a/pkgs/development/tools/circup/default.nix +++ b/pkgs/development/tools/circup/default.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools-scm - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 2ca64c5c74e6..12471d9d4798 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OFfcr8BXkTEB6lxImwHVFxnvursGcg83dVWsjegKf4w="; + hash = "sha256-5kQGUO0TBoqeQNc2gmaLDju7cE3wOz/DOO34vB405SA="; }; - vendorHash = "sha256-ealTxDNG6uJc0Lb20e8W3zv0azgpwI2kBn92d0lWaoc="; + vendorHash = "sha256-4ZPLscZWF9GfNMU70TjR5+Hi/rvm43n+GvqxFUu13JU="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/development/tools/cocoapods/default.nix b/pkgs/development/tools/cocoapods/default.nix index 54411fc01586..49f7cc3134af 100644 --- a/pkgs/development/tools/cocoapods/default.nix +++ b/pkgs/development/tools/cocoapods/default.nix @@ -19,7 +19,6 @@ bundlerApp { platforms = platforms.darwin; maintainers = with maintainers; [ peterromfeldhk - lilyball ]; mainProgram = "pod"; }; diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 76974e0fd25a..5e6b58286557 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.53.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-Fg9U6xCOivolwpH4C63HAhSEcfkTJYrNRzwr0OLtLqs="; + hash = "sha256-YZ5IAQAzfynXYAZadUp18+hfwCVxRDkT5OOMHQm2h3A="; }; - vendorHash = "sha256-tFJf0wYai1Nc8zbTXE/FSM0K7IkGQjsrMCwpi3rcwzg="; + vendorHash = "sha256-9vP+PgXWySjKCFbshaV27fG+UDYWSVP48HDvpKzp82Q="; ldflags = [ "-s" diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 258edd412b29..66d347a058d6 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -8,7 +8,6 @@ , buildbot , pythonOlder , python -, pythonRelaxDepsHook , twisted , jinja2 , msgpack @@ -85,7 +84,6 @@ buildPythonApplication rec { }; build-system = [ - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 9ccdad057b59..31299c031e8f 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.120.1"; + version = "0.120.2"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QHLg35Cv18DQleIcXTOGteesSWJ5jK4TayD3OLLrrAY="; + hash = "sha256-IVhO8F5KhwCDJ4cm/Iu9vSuAKAF3l1vIjIqSzfYn9Ck="; }; - vendorHash = "sha256-rL4bXt6VBG2b9nZ1M2FF6E8ODPT3UF4aRHSJqpVWyTw="; + vendorHash = "sha256-R5H48idKHTTECEffpQIZgj9xMlHgHCL5OFbe3ZAda/o="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix b/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix index 63324531f8e2..db7463c9e15d 100644 --- a/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix +++ b/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchFromGitea, buildGoModule }: +{ lib, fetchFromGitea, buildGoModule, nix-update-script }: buildGoModule rec { pname = "codeberg-pages"; - version = "5.0"; + version = "5.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Codeberg"; repo = "pages-server"; - rev = "ea68a82cd22a8a8c1f265260af22b9406f13e3a9"; - hash = "sha256-TSXRB0oq1CtHC9ooO+Y3ICS5YE+q+ivZAcYBSd1oWi0="; + rev = "v${version}"; + hash = "sha256-txWRYQnJCGVZ0/6pZdKkRFsdUe2B+A0Fy0/WJCiBVa0="; }; - vendorHash = "sha256-vTYB3ka34VooN2Wh/Rcj+2S1qAsA2a/VtXlILn1W7oU="; + vendorHash = "sha256-0JPnBf4NA4t+63cNMZYnB56y93nOc8Wn7TstRiHgvhk="; postPatch = '' # disable httptest @@ -23,11 +23,14 @@ buildGoModule rec { tags = [ "sqlite" "sqlite_unlock_notify" "netgo" ]; + passthru.updateScript = nix-update-script {}; + meta = with lib; { - mainProgram = "codeberg-pages"; - maintainers = with maintainers; [ laurent-f1z1 ]; + mainProgram = "pages"; + maintainers = with maintainers; [ laurent-f1z1 christoph-heiss ]; license = licenses.eupl12; homepage = "https://codeberg.org/Codeberg/pages-server"; description = "Static websites hosting from Gitea repositories"; + changelog = "https://codeberg.org/Codeberg/pages-server/releases/tag/v${version}"; }; } diff --git a/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix index 3901c068d098..d2476a3d88dc 100644 --- a/pkgs/development/tools/database/atlas/default.nix +++ b/pkgs/development/tools/database/atlas/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "atlas"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-kmsDTHnYSkCRdLXPzE5g2qzzb8EuGunrM9SDfaul8Xo="; + hash = "sha256-SD4wWhFEyAOqffrJ2aowY96bLii02Z8PWGj8RNC6w7o="; }; modRoot = "cmd/atlas"; diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index ae72eae90942..3223119b08f8 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.5.16"; + version = "2.5.20"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-FvL7LGgSMxflr7X9Z1qe9qPmDcqEr7ZGM36mtOhlTWY="; + hash = "sha256-s9GVhn4jRNhBaoxjQwyJfAkchsf+KRw0aqLsBDuca3o="; }; - vendorHash = "sha256-vwcItklYe6ljFdGTxef19plaI5OMoOtQohY0xZLBUos="; + vendorHash = "sha256-sMhcEFRqIROnXSdZA+NjHGAZLicFjU7swJK9RBV/EpQ="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/development/tools/database/dblab/default.nix b/pkgs/development/tools/database/dblab/default.nix index a797f18be70c..0374c9bfab20 100644 --- a/pkgs/development/tools/database/dblab/default.nix +++ b/pkgs/development/tools/database/dblab/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dblab"; - version = "0.24.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; rev = "v${version}"; - hash = "sha256-p579rxv8ntNLfunKl6JGYE7eFZc51p2OGWGhQmAuADY="; + hash = "sha256-We6nOrzMKN14ez9hxEnHDLpuad9ZGcXezDQWZduHERU="; }; - vendorHash = "sha256-RmZkSlA6KU1wXKFHPLYVhRjwxsDjO1XNoGBdNCmeGSw="; + vendorHash = "sha256-3vtk4pJE/zRLCbIN+UFvxF/KdH4J5IiCsQ0Wu585wnM="; ldflags = [ "-s -w -X main.version=${version}" ]; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 4ff96bfd3267..f04c55d03fbb 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.17.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-r0C03K/jyL8P0iysa6R1AaHVpB6Bw/FUwBIz7V/rGak="; + hash = "sha256-74pbcY8qAFUOuj/1LCIQ4DHAcxubQcnWDS/oCa2MN3c="; }; - vendorHash = "sha256-8NVkpJEAp3UsM2BnZVcavK+89MELo0T96tTcY0pke6Q="; + vendorHash = "sha256-3gNyB2xwdYNXhWru7smIbNoyM+bqiXvash8NJ7O8pQQ="; doCheck = false; diff --git a/pkgs/development/tools/database/prisma-engines/Cargo.lock b/pkgs/development/tools/database/prisma-engines/Cargo.lock index d838995c6f95..5ca5fe497c4f 100644 --- a/pkgs/development/tools/database/prisma-engines/Cargo.lock +++ b/pkgs/development/tools/database/prisma-engines/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ "getrandom 0.2.11", "once_cell", @@ -475,6 +475,25 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +[[package]] +name = "cbindgen" +version = "0.24.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b922faaf31122819ec80c4047cc684c6979a087366c069611e33649bf98e18d" +dependencies = [ + "clap 3.2.25", + "heck 0.4.1", + "indexmap 1.9.3", + "log", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 1.0.109", + "tempfile", + "toml", +] + [[package]] name = "cc" version = "1.0.83" @@ -499,6 +518,18 @@ 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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" + [[package]] name = "chrono" version = "0.4.26" @@ -574,9 +605,12 @@ version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ + "atty", "bitflags 1.3.2", "clap_lex", "indexmap 1.9.3", + "strsim 0.10.0", + "termcolor", "textwrap 0.16.0", ] @@ -986,6 +1020,7 @@ dependencies = [ "base64 0.13.1", "expect-test", "indoc 2.0.3", + "itertools 0.12.0", "once_cell", "psl", "regex", @@ -1583,9 +1618,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1612,7 +1647,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.8", ] [[package]] @@ -1621,7 +1656,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.8", ] [[package]] @@ -2096,9 +2131,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libloading" @@ -2276,7 +2311,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e52eb6380b6d2a10eb3434aec0885374490f5b82c8aaf5cd487a183c98be834" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.8", "metrics-macros", ] @@ -2286,7 +2321,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "142c53885123b68d94108295a09d4afe1a1388ed95b54d5dacd9a454753030f2" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.8", "metrics-macros", ] @@ -2511,6 +2546,7 @@ dependencies = [ "expect-test", "futures", "indoc 2.0.3", + "itertools 0.12.0", "mongodb", "mongodb-client", "mongodb-schema-describer", @@ -3105,19 +3141,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.2" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.2" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -3125,9 +3162,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.2" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", @@ -3138,9 +3175,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.7.2" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -3556,6 +3593,7 @@ dependencies = [ "bit-vec", "byteorder", "bytes", + "cfg_aliases 0.1.1", "chrono", "connection-string", "crosstarget-utils", @@ -3724,6 +3762,41 @@ dependencies = [ "user-facing-errors", ] +[[package]] +name = "query-engine-c-abi" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "cbindgen", + "chrono", + "connection-string", + "futures", + "indoc 2.0.3", + "once_cell", + "opentelemetry", + "psl", + "quaint", + "query-connector", + "query-core", + "query-engine-common", + "query-structure", + "request-handlers", + "rusqlite", + "serde", + "serde_json", + "sql-query-connector", + "thiserror", + "tokio", + "tracing", + "tracing-futures", + "tracing-opentelemetry", + "tracing-subscriber", + "url", + "user-facing-errors", + "uuid", +] + [[package]] name = "query-engine-common" version = "0.1.0" @@ -4185,6 +4258,7 @@ name = "request-handlers" version = "0.1.0" dependencies = [ "bigdecimal", + "cfg_aliases 0.2.0", "codspeed-criterion-compat", "connection-string", "dmmf", @@ -4502,6 +4576,8 @@ dependencies = [ "diagnostics", "pest", "pest_derive", + "serde", + "serde_json", ] [[package]] @@ -4949,6 +5025,7 @@ dependencies = [ "enumflags2", "expect-test", "indoc 2.0.3", + "itertools 0.12.0", "pretty_assertions", "psl", "quaint", @@ -5035,6 +5112,7 @@ dependencies = [ "datamodel-renderer", "either", "enumflags2", + "indexmap 2.2.2", "indoc 2.0.3", "once_cell", "prisma-value", @@ -5245,6 +5323,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "termcolor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +dependencies = [ + "winapi-util", +] + [[package]] name = "test-cli" version = "0.1.0" @@ -5845,7 +5932,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.7.3", + "rand 0.8.5", "static_assertions", ] @@ -6101,9 +6188,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6111,9 +6198,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", @@ -6138,9 +6225,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6148,9 +6235,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", @@ -6161,9 +6248,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-logger" diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 57c91c1719b9..24d3fa741781 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -14,13 +14,13 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "5.12.1"; + version = "5.16.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - hash = "sha256-emy2Qvx05D8omSc3Ivx66EnThW/tr77UGQu3qhat/fc="; + hash = "sha256-uJJX5lI0YFXygWLeaOuYxjgyswJcjSujPcqHn1aKn8M="; }; # Use system openssl. diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/development/tools/database/sqlcl/default.nix index 204f0f4e5a7a..9bd1cca620e9 100644 --- a/pkgs/development/tools/database/sqlcl/default.nix +++ b/pkgs/development/tools/database/sqlcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlcl"; - version = "24.1.0.087.0929"; + version = "24.2.0.180.1721"; src = fetchurl { url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip"; - hash = "sha256-DHp3Wrwro1oaBEw1O7cyRGJKbhD2z86MeY2Xq2vzo1Q="; + hash = "sha256-22cLWfeEqJm48KeUDDIMOnPu/R8oEAtBNBn3slfMGAE="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 9d2d4a36b453..fc81551f3eb5 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.0.7"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; rev = "refs/tags/${version}"; - hash = "sha256-nq+c9NHtQ6pMouJEI7YUhgb9+ljlJECP8REL4Gm4B10="; + hash = "sha256-QzrIf9DVrQGgtOcHGbxLMz7bG/lkU2Cu0n4jSKJ8c8g="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index eb45a4b82e7a..c894793fa237 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -23,13 +23,13 @@ let pname = "devpod"; - version = "0.5.15"; + version = "0.5.16"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fGCCPLj7C5yn8DPJdx6ixUFz9KXhBRAUOrFeTsQkXEM="; + sha256 = "sha256-J9Qu9flp7l3BnQGHkDBSWTsNdDQSJUwp0W9GhOJehKo="; }; meta = with lib; { diff --git a/pkgs/development/tools/djlint/default.nix b/pkgs/development/tools/djlint/default.nix index d84afa203e5b..07af36e98cee 100644 --- a/pkgs/development/tools/djlint/default.nix +++ b/pkgs/development/tools/djlint/default.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 2e4bb56d0f25..0db8f1f4fbfc 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.107.0"; + version = "1.108.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-svwFIM1lJI60bdmzZS/QZSzy30HtOf498GgnqLFGKAQ="; + sha256 = "sha256-7qfzayuCpjOY8n+bixvm1OcS+BumkZJ0Oyn1xfNezX4="; }; meta = with lib; { diff --git a/pkgs/development/tools/documentation/antora/default.nix b/pkgs/development/tools/documentation/antora/default.nix index de28518259c8..afd694d4d7de 100644 --- a/pkgs/development/tools/documentation/antora/default.nix +++ b/pkgs/development/tools/documentation/antora/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "antora"; - version = "3.1.7"; + version = "3.1.9"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-uGXXp6boS5yYsInSmkI9S0Tn85QGVp/5Fsh1u3G4oPk="; + hash = "sha256-hkavYC2LO8NRIRwHNWIJLRDkVnhAB4Di3IqL8uGt+U8="; }; - npmDepsHash = "sha256-oWLRAuvWDk7w18qlDH14EE4elX5nhLKHSQANa/kXKvw="; + npmDepsHash = "sha256-ngreuitwUcIDVF6vW7fZA1OaVxr9fv7s0IjCErXlcxg="; # This is to stop tests from being ran, as some of them fail due to trying to query remote repositories postPatch = '' diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix index b2652f6ca9fd..9d5da739745f 100644 --- a/pkgs/development/tools/documentation/gi-docgen/default.nix +++ b/pkgs/development/tools/documentation/gi-docgen/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2023.3"; + version = "2024.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz"; - hash = "sha256-TesfCXc/cGJZrGUgUNp7PuWYcbw/1c+3foEdt0mNyOc="; + hash = "sha256-hwx3+WIEYszknjVUKkLcFhL8hYcz6D274kjFNUWK7B4="; }; depsBuildBuild = [ diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index e2d35dd403d5..3586317cd986 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.46.3"; + version = "0.47.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-IyhKxCqLyboEZINalI6bd///sUxWvmWlQVrzMA2sNdU="; + sha256 = "sha256-eiZrgxOAUwq9rhTASXih8txg0KNerWETJgzYiz7KKVo="; }; - cargoHash = "sha256-46t6Y2UuRCAnvOhEPLgYN+fHHtJYxuflRT3DClLTDQk="; + cargoHash = "sha256-CTcoJ09UqeHumEg00RbI9TTTE8ja2O5cte4OYfB8v4s="; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix index e4f81e56456e..d2b69af76ed1 100644 --- a/pkgs/development/tools/drm_info/default.nix +++ b/pkgs/development/tools/drm_info/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mainProgram = "drm_info"; homepage = "https://github.com/ascent12/drm_info"; license = licenses.mit; - maintainers = with maintainers; [ tadeokondrak ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/electron/binary/default.nix b/pkgs/development/tools/electron/binary/default.nix index b884428cf8b7..07637d13e9f2 100644 --- a/pkgs/development/tools/electron/binary/default.nix +++ b/pkgs/development/tools/electron/binary/default.nix @@ -1,8 +1,11 @@ +let + infoJson = builtins.fromJSON (builtins.readFile ./info.json); +in + { lib, callPackage }: let mkElectron = callPackage ./generic.nix { }; - infoJson = builtins.fromJSON (builtins.readFile ./info.json); in lib.mapAttrs' (majorVersion: info: lib.nameValuePair diff --git a/pkgs/development/tools/enochecker-test/default.nix b/pkgs/development/tools/enochecker-test/default.nix index 7e0f25317eac..ca6a49e3502f 100644 --- a/pkgs/development/tools/enochecker-test/default.nix +++ b/pkgs/development/tools/enochecker-test/default.nix @@ -2,7 +2,6 @@ , buildPythonApplication , fetchPypi , pythonOlder -, pythonRelaxDepsHook , certifi , charset-normalizer @@ -34,7 +33,6 @@ buildPythonApplication rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook ]; pythonRelaxDeps = true; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index b405a22d8a64..565ef850863e 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.21.5"; + version = "0.22.0"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8="; + hash = "sha256-I+NJFWnjsXgfIlzIv6hGXj9VF0JcF/ck7g88Td6jLw0="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/fable/default.nix b/pkgs/development/tools/fable/default.nix index a8bffafdd1c6..2b4d1d505db3 100644 --- a/pkgs/development/tools/fable/default.nix +++ b/pkgs/development/tools/fable/default.nix @@ -4,7 +4,7 @@ buildDotnetGlobalTool { pname = "fable"; version = "4.18.0"; - nugetSha256 = "sha256-PbrFjpltRx4lnQDgQrOKSVHwttePMfOnjljOddkFbmY="; + nugetHash = "sha256-PbrFjpltRx4lnQDgQrOKSVHwttePMfOnjljOddkFbmY="; passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/development/tools/fable/update.sh b/pkgs/development/tools/fable/update.sh index 9d23084ebd85..181570d1a0de 100755 --- a/pkgs/development/tools/fable/update.sh +++ b/pkgs/development/tools/fable/update.sh @@ -36,4 +36,4 @@ NUGET_URL="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.r HASH=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$NUGET_URL")") sed -i "s/version = \".*\"/version = \"$VER\"/" "$NIX_DRV" -sed -i "s#nugetSha256 = \"sha256-.\{44\}\"#nugetSha256 = \"$HASH\"#" "$NIX_DRV" +sed -i "s#nugetHash = \"sha256-.\{44\}\"#nugetHash = \"$HASH\"#" "$NIX_DRV" diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 4bf70a004d3e..dd3f45769a50 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -1,50 +1,58 @@ -{ lib -, fetchFromGitLab -, fetchPypi -, apksigner -, buildPythonApplication -, python3 -, pythonRelaxDepsHook -, installShellFiles -, androguard -, babel -, clint -, defusedxml -, gitpython -, libcloud -, mwclient -, paramiko -, pillow -, pyasn1 -, pyasn1-modules -, python-vagrant -, pyyaml -, qrcode -, requests -, ruamel-yaml -, yamllint +{ + lib, + fetchFromGitLab, + fetchPypi, + apksigner, + appdirs, + buildPythonApplication, + python3, + installShellFiles, + androguard, + babel, + clint, + defusedxml, + gitpython, + libcloud, + mwclient, + oscrypto, + paramiko, + pillow, + pyasn1, + pyasn1-modules, + python-vagrant, + pyyaml, + qrcode, + requests, + ruamel-yaml, + sdkmanager, + yamllint, }: -buildPythonApplication rec { +let + version = "2.3a1"; +in +buildPythonApplication { pname = "fdroidserver"; - version = "unstable-2023-10-23"; - format = "setuptools"; + inherit version; + + pyproject = true; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; - rev = "f4b10cf83935432d19948dac669964384bef0728"; - hash = "sha256-GmR6Td5pScwEKK9W6m26xQV4XxBdZ7frN2UvwUGY4Dw="; + rev = "2.3a1"; + hash = "sha256-K6P5yGx2ZXHJZ/VyHTbQAObsvcfnOatrpwiW+ixLTuA="; }; pythonRelaxDeps = [ + "androguard" "pyasn1" "pyasn1-modules" ]; postPatch = '' substituteInPlace fdroidserver/common.py \ - --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" + --replace-fail "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" ''; preConfigure = '' @@ -58,22 +66,19 @@ buildPythonApplication rec { --bash completion/bash-completion ''; - nativeBuildInputs = [ - pythonRelaxDepsHook - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ - babel - ]; + buildInputs = [ babel ]; propagatedBuildInputs = [ androguard + appdirs clint defusedxml gitpython libcloud mwclient + oscrypto paramiko pillow pyasn1 @@ -89,6 +94,7 @@ buildPythonApplication rec { hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; }; })) + sdkmanager yamllint ]; @@ -102,16 +108,17 @@ buildPythonApplication rec { # no tests doCheck = false; - pythonImportsCheck = [ - "fdroidserver" - ]; + pythonImportsCheck = [ "fdroidserver" ]; - meta = with lib; { + meta = { homepage = "https://gitlab.com/fdroid/fdroidserver"; changelog = "https://gitlab.com/fdroid/fdroidserver/-/blob/${version}/CHANGELOG.md"; description = "Server and tools for F-Droid, the Free Software repository system for Android"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ linsui jugendhacker ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + linsui + jugendhacker + ]; mainProgram = "fdroid"; }; } diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index 4218896faf13..c1fd0b4598f1 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.11.3"; + version = "13.12.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-JgmiWcWGGJOv9P0x/WSlkVhmcNSIX12jKZuZBSHxqkg="; + hash = "sha256-w6tzqbNma7gTnUXOkPtcENO2XcchTXqueZlg08C8vF8="; }; - npmDepsHash = "sha256-dDIw8R2126HLqhU+8dq7zroJ7YHHiV6s8yTSrmtgURM="; + npmDepsHash = "sha256-7/5cZOYMQ3b77aRZkBA5jTDm+PnepzdW6I8RyBNr7oo="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/development/tools/gdm/deps.nix b/pkgs/development/tools/gdm/deps.nix deleted file mode 100644 index 62a3df65e3aa..000000000000 --- a/pkgs/development/tools/gdm/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "0d047c8d5a8c3a1c89d9d78511f4ed7aef49ea0c"; - sha256 = "0ahyxvqy25zpyppmrb7vsad332gmq2cdi7hb0si6ni0cmrlqcfwr"; - }; - } -] diff --git a/pkgs/development/tools/git-ps-rs/default.nix b/pkgs/development/tools/git-ps-rs/default.nix index b9e41327237b..af4b52a9fad0 100644 --- a/pkgs/development/tools/git-ps-rs/default.nix +++ b/pkgs/development/tools/git-ps-rs/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "git-ps-rs"; - version = "7.1.1"; + version = "7.2.0"; src = fetchFromGitHub { owner = "uptech"; repo = "git-ps-rs"; rev = version; - hash = "sha256-HkiCc/5Xx+1IKMz/vXPXwUp3c8qSjobhQaIJCzq8dqQ="; + hash = "sha256-OkQLuTZ4CFxA8Ezpo7ChVDR3BzLzlF/EOkZjTIbjJl4="; }; - cargoHash = "sha256-r4cmnLkW8ocTcTECAbCk3S94T09lOUzHLQIGHv97W54="; + cargoHash = "sha256-9SmUGSHPhByBkSyuyNSBCsYsWxF7e13i00Jbf4COOj4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 84885d912129..da706dcdb30a 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -18,6 +18,7 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , gnome +, adwaita-icon-theme , gdk-pixbuf , libxslt , gsettings-desktop-schemas @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 gsettings-desktop-schemas gdk-pixbuf - gnome.adwaita-icon-theme + adwaita-icon-theme ] ++ lib.optionals enableWebkit2gtk [ webkitgtk_4_1 ]; diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index dc533daf99a3..94186dc643c6 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -28,7 +28,7 @@ mavenJdk8.buildMavenPackage rec { sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY="; }; - mvnHash = "sha256-Qbx1cNKFtSEnzhFImtCz2psYts2yhTDKzjmBBZavWwU="; + mvnHash = "sha256-es8M7gV2z1V9VpWOxanJwQyiemabiUw3n4heJB8Q75A="; nativeBuildInputs = [ jdk8 makeWrapper ]; diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/development/tools/go-containerregistry/default.nix index e3660c66048e..64174c3488a8 100644 --- a/pkgs/development/tools/go-containerregistry/default.nix +++ b/pkgs/development/tools/go-containerregistry/default.nix @@ -4,13 +4,13 @@ let bins = [ "crane" "gcrane" ]; in buildGoModule rec { pname = "go-containerregistry"; - version = "0.19.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YxUw30gjpBO/dXSTcNa4F91u3F9pg/IQuVWjKDV5mLs="; + sha256 = "sha256-qImLnWDw7G4GPn+hj0gbgKwHAWQtXFdtBnEc9oxGcCw="; }; vendorHash = null; diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/development/tools/gqlgenc/default.nix index 61a67acb99de..2dbd3fdf7087 100644 --- a/pkgs/development/tools/gqlgenc/default.nix +++ b/pkgs/development/tools/gqlgenc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.22.0"; + version = "0.23.2"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-hGX9DiGpJOOjQEaT9qnpeS1ODfo4pd03WlvT3aaSK2w="; + sha256 = "sha256-a+/X2q9Rii/8odXGICNOB7uWXd6vfqquP+wGvT/tRUo="; }; excludedPackages = [ "example" ]; diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index ff477ee163ee..2cf429e6a09d 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.44.1"; + version = "1.44.2"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Nzav7ESJAQHgQA8dR17Emvjsxk39Omi0UB5PMsrJmRA="; + hash = "sha256-ZslnJr5VJ6eHjBm1azaANGj9hHXKo+sRJXmW4xjRMhg="; }; - vendorHash = "sha256-/Ca7oVLdWIribKBVHGiWfLte+YcKzPGu2DzZ/lTvTQM="; + vendorHash = "sha256-pDBuuHuG2Xk1R3BP1Ds2uY5I7brXWg1ULKQgmuuQVP4="; ldflags = [ "-s" diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix index 1bf0321b4378..342cc4009edf 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/development/tools/hotdoc/default.nix @@ -121,6 +121,6 @@ buildPythonApplication rec { description = "Tastiest API documentation system"; homepage = "https://hotdoc.github.io/"; license = [ licenses.lgpl21Plus ]; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/development/tools/jazzy/default.nix index fc5cd68217ed..23d9859eeb87 100644 --- a/pkgs/development/tools/jazzy/default.nix +++ b/pkgs/development/tools/jazzy/default.nix @@ -14,7 +14,6 @@ bundlerApp { platforms = platforms.darwin; maintainers = with maintainers; [ peterromfeldhk - lilyball nicknovitski ]; }; diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 32c131cf7859..8d4ec0d1c5a6 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; + # https://github.com/jqlang/jq/issues/2871 + postPatch = lib.optionalString stdenv.isFreeBSD '' + substituteInPlace Makefile.am --replace-fail "tests/mantest" "" --replace-fail "tests/optionaltest" "" + ''; + # Upstream script that writes the version that's eventually compiled # and printed in `jq --help` relies on a .git directory which our src # doesn't keep. diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix index bfbf71b6f5f1..dcba4474f0d3 100644 --- a/pkgs/development/tools/konf/default.nix +++ b/pkgs/development/tools/konf/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "konf"; - version = "0.5.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "SimonTheLeg"; repo = "konf-go"; rev = "v${version}"; - hash = "sha256-uzB3quuex00Gp7YRkgo7gF92oPcBoQtLwG6hqMzK6oo="; + hash = "sha256-GSrR2uLeGodmE1egRtvTyWhJckYUnI97n7dnmjPvu3k="; }; vendorHash = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8="; diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix index f2f9e0340481..5ef27e097976 100644 --- a/pkgs/development/tools/konstraint/default.nix +++ b/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-poIXY4++nv2bCkcHdZHb0dRa5NVxsw9Vmg7nMVh1ocI="; + sha256 = "sha256-02vmIsYGX6HB7k1HArMpNY+UxVX24IyraNPu13ht2qQ="; }; - vendorHash = "sha256-0V8B/w4K3r23tINDfjLAKe5wMpJ+8uiF4nCMr062pb0="; + vendorHash = "sha256-eD0K2te9+9x0fUYMVZ6SreV2AhkYwBzQHUTyeNwuEHc="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 904b3a78f10e..1dc7b205e0d9 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "sha256-AbLg74kzg6UNvrE5cP5/o742yj6DJZ4BZJlFsJ1zaYU="; + sha256 = "sha256-qfkjvlj70yZwoX8Lcpsd+ASviC+ldAIWV0HLJuVEDKE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index ee0e34f144c9..0fe6c0fb43df 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-3sFtYUFUYYHDqF22XJ+pmg+fW2f03IS5CgIXjWg2+Bo="; + sha256 = "sha256-TjZ8n88uldCNfpdReE/SYPkj0m6bBA2lI4SyNAhPFFM="; }; - cargoHash = "sha256-9eUGGDBoeF6EM3Np95rFHU3luGuVZk5iE4kIYlUnEEw="; + cargoHash = "sha256-AkeKAPzgKDvnS+eyAh8MJfPOPFF+v6Rje3eXu7LM6Pk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/lalrpop/default.nix b/pkgs/development/tools/lalrpop/default.nix index 32e6ec7a35b2..cc52d2622f55 100644 --- a/pkgs/development/tools/lalrpop/default.nix +++ b/pkgs/development/tools/lalrpop/default.nix @@ -7,18 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lalrpop"; - version = "0.20.0"; + version = "0.20.2"; src = fetchFromGitHub { owner = "lalrpop"; repo = "lalrpop"; - # there's no tag for 0.20.0 - rev = "1584ddb243726195b540fdd2b3ccf693876288e0"; - # rev = version; - hash = "sha256-aYlSR8XqJnj76Hm3MFqfA5d9L3SO/iCCKpzOES5YQGY="; + rev = version; + hash = "sha256-cFwBck+bdOjhF6rQQj03MOO+XCsrII5c4Xvhsw12ETA="; }; - cargoHash = "sha256-JaU5ZJbmlV/HfFT/ODpB3xFjZc2XiljhEVz/dql8o/c="; + cargoHash = "sha256-zkPLas+fQQzm7LlWNpTooUR/e30KMS9OET6PMwQ2yAA="; patches = [ (substituteAll { diff --git a/pkgs/development/tools/language-servers/csharp-ls/default.nix b/pkgs/development/tools/language-servers/csharp-ls/default.nix index 0972bac8c848..5cae31845563 100644 --- a/pkgs/development/tools/language-servers/csharp-ls/default.nix +++ b/pkgs/development/tools/language-servers/csharp-ls/default.nix @@ -10,7 +10,7 @@ buildDotnetGlobalTool rec { pname = "csharp-ls"; version = "0.14.0"; - nugetSha256 = "sha256-agcx7VPIqGhl3NzdGLPwXYJsRuvSjL4SdbNg9vFjIh4="; + nugetHash = "sha256-agcx7VPIqGhl3NzdGLPwXYJsRuvSjL4SdbNg9vFjIh4="; dotnet-sdk = sdk_8_0; dotnet-runtime = sdk_8_0; diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix index 9c1203486e79..655a6a8c1ff4 100644 --- a/pkgs/development/tools/language-servers/gopls/default.nix +++ b/pkgs/development/tools/language-servers/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - hash = "sha256-X5XBYTD+DIbHFBMWkLGosZUORexYt83mML/akUzrnFk="; + hash = "sha256-4RpQrlFj0stefVBouxyYN3Pf0PkYZ4cn4IKIskqUhVY="; }; modRoot = "gopls"; - vendorHash = "sha256-XH3kSfnlwmbOLkWJCjKmU1ghCkarn23M0q0vJQHkCe0="; + vendorHash = "sha256-D+ew0XyHRns1i9KAdV5vhCs3Uu338EujYjwU6IIZ8OY="; # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30 ldflags = [ "-X main.version=v${version}" ]; diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index 73f2facc840e..92929511e976 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.17"; + version = "0.0.18"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-c72QFlsCPBW4biTMh1nxQIEkKPjmSmxOD93Kzduswyo="; + hash = "sha256-nOb7hoUOQfmpCYqui+hw5hcL/pURvsMXlksa8KUBjSY="; }; vendorHash = "sha256-jGC8JNlorw0FSc0HhFdUVZJDCNaX4PWPaFKRklufIsQ="; diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index a8d0e373a110..41d5b50891e5 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-V8bbJg7h/TCv0y8Kwz3h6XMKtxKjJKduCj9e1vcd6AQ="; + hash = "sha256-IfseZsHCSuF1zGq8u3mPju0gxVtR0a7ibHV+tEK6wh0="; }; - cargoHash = "sha256-kR4QJ1QFewI5jKPX9/P1z5J9hnWBIhWExF6JgmDzoJw="; + cargoHash = "sha256-QaoyaeFfoxVoTh4Sg/6EXYPsUD1nNG7MPSH2EeYMLn0="; meta = with lib; { description = "Cmake lsp based on tower-lsp and treesitter"; diff --git a/pkgs/development/tools/language-servers/pylyzer/Cargo.lock b/pkgs/development/tools/language-servers/pylyzer/Cargo.lock index 6127a15eead7..b74b8843418f 100644 --- a/pkgs/development/tools/language-servers/pylyzer/Cargo.lock +++ b/pkgs/development/tools/language-servers/pylyzer/Cargo.lock @@ -10,9 +10,9 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -37,21 +37,21 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -80,10 +80,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "cc" -version = "1.0.90" +name = "bitflags" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "cc" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" [[package]] name = "cfg-if" @@ -105,28 +111,28 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.69", ] [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "els" -version = "0.1.48-nightly.2" +version = "0.1.52-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1160cfdc48996a3f0f1e8e5b2d060e48ab7245e3931eef154fe0afc4de6d55e" +checksum = "9f71553ed89956daa260ebefee8b4724308e8af507b713297aefa9535252048c" dependencies = [ "erg_common", "erg_compiler", @@ -138,9 +144,9 @@ dependencies = [ [[package]] name = "erg_common" -version = "0.6.36-nightly.2" +version = "0.6.40-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f19dd94255e83e016cd6d7cd18e99e9c927e2144cf9d17e759271c40c6cf1dcd" +checksum = "891d4800e5dea9c2a52a56ad8af9654c292ad98afbcc3cec0480fea55cc468b0" dependencies = [ "backtrace-on-stack-overflow", "erg_proc_macros", @@ -150,9 +156,9 @@ dependencies = [ [[package]] name = "erg_compiler" -version = "0.6.36-nightly.2" +version = "0.6.40-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4712faf4c949016d752e7d697dab1df44043eaf94bea5a2ada73b1ab70dfe0" +checksum = "a90c044a992d23a39eaf65b83485953935496aa1ae0d589b45c1611277d8cb54" dependencies = [ "erg_common", "erg_parser", @@ -160,9 +166,9 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.6.36-nightly.2" +version = "0.6.40-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791e826192978d665e46aa30aa7330ef470b90e6e5ebe38c2b32a2a4141bc919" +checksum = "fb53c38fdc23f6e643267882c795040fda38da52309296106dba2e9dc544a31e" dependencies = [ "erg_common", "erg_proc_macros", @@ -171,9 +177,9 @@ dependencies = [ [[package]] name = "erg_proc_macros" -version = "0.6.36-nightly.2" +version = "0.6.40-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119857fa1bb184c6b2adba2e3b2a71797f6c7865bc6d4fdddac988fda9e55b77" +checksum = "93643cbe997e214daa35b54d4c948e4f4b1088866ba87004dc787f2e965f0f16" dependencies = [ "quote", "syn 1.0.109", @@ -199,9 +205,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -210,15 +216,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", ] @@ -242,7 +248,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.69", ] [[package]] @@ -256,9 +262,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "lalrpop-util" @@ -268,9 +274,9 @@ checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libm" @@ -280,9 +286,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -290,9 +296,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lsp-types" @@ -300,7 +306,7 @@ version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51" dependencies = [ - "bitflags", + "bitflags 1.3.2", "serde", "serde_json", "serde_repr", @@ -309,9 +315,9 @@ dependencies = [ [[package]] name = "malachite" -version = "0.4.5" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ff327de42075f680ba15c5cb3c417687eb7241ce2063a91d0186ce5c5e77ee" +checksum = "0b6ea071913d15f7e0566bc4768aae3918906ea77f0abbb387ca7c0dc9303f90" dependencies = [ "malachite-base", "malachite-nz", @@ -320,9 +326,9 @@ dependencies = [ [[package]] name = "malachite-base" -version = "0.4.5" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e960ee0e7e1b8eec9229f5b20d6b191762574225144ea638eb961d065c97b55d" +checksum = "44c817c713ff9f16e06cfdc23baa3fecf1b71eaaac714816a98a560f4e350aa6" dependencies = [ "hashbrown", "itertools", @@ -345,9 +351,9 @@ dependencies = [ [[package]] name = "malachite-nz" -version = "0.4.5" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770aaf1a4d59a82ed3d8644eb66aff7492a6dd7476def275a922d04d77ca8e57" +checksum = "603729facf62429736ac17a9fc9fe1bf7e0eb8bde3da3b18cc2b6153150464d5" dependencies = [ "itertools", "libm", @@ -356,9 +362,9 @@ dependencies = [ [[package]] name = "malachite-q" -version = "0.4.5" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a9dfca114f6b582595990ccfc287cace633aa95f890ade5b1fc099b7175d3b" +checksum = "c73844ccbf0e9baaf34d4a6d187f0d6a925ce8e74ef37a67d238e7d65529b38c" dependencies = [ "itertools", "malachite-base", @@ -367,9 +373,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -382,9 +388,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] @@ -406,7 +412,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if", "libc", @@ -424,18 +430,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -448,9 +454,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -458,9 +464,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", @@ -471,9 +477,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -527,16 +533,16 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "py2erg" -version = "0.0.54" +version = "0.0.56" dependencies = [ "erg_common", "erg_compiler", @@ -546,7 +552,7 @@ dependencies = [ [[package]] name = "pylyzer" -version = "0.0.54" +version = "0.0.56" dependencies = [ "els", "erg_common", @@ -558,9 +564,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -597,18 +603,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags", + "bitflags 2.6.0", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -628,7 +634,7 @@ dependencies = [ [[package]] name = "rustpython-ast" version = "0.3.1" -source = "git+https://github.com/RustPython/Parser#9ce55aefdeb35e2f706ce0b02d5a2dfe6295fc57" +source = "git+https://github.com/RustPython/Parser#51b5f80ae3080dfec2db815a299a69873fb9ca65" dependencies = [ "is-macro", "malachite-bigint", @@ -639,7 +645,7 @@ dependencies = [ [[package]] name = "rustpython-parser" version = "0.3.1" -source = "git+https://github.com/RustPython/Parser#9ce55aefdeb35e2f706ce0b02d5a2dfe6295fc57" +source = "git+https://github.com/RustPython/Parser#51b5f80ae3080dfec2db815a299a69873fb9ca65" dependencies = [ "anyhow", "is-macro", @@ -662,7 +668,7 @@ dependencies = [ [[package]] name = "rustpython-parser-core" version = "0.3.1" -source = "git+https://github.com/RustPython/Parser#9ce55aefdeb35e2f706ce0b02d5a2dfe6295fc57" +source = "git+https://github.com/RustPython/Parser#51b5f80ae3080dfec2db815a299a69873fb9ca65" dependencies = [ "is-macro", "memchr", @@ -672,7 +678,7 @@ dependencies = [ [[package]] name = "rustpython-parser-vendored" version = "0.3.1" -source = "git+https://github.com/RustPython/Parser#9ce55aefdeb35e2f706ce0b02d5a2dfe6295fc57" +source = "git+https://github.com/RustPython/Parser#51b5f80ae3080dfec2db815a299a69873fb9ca65" dependencies = [ "memchr", "once_cell", @@ -680,9 +686,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scopeguard" @@ -692,35 +698,35 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.69", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -729,13 +735,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.69", ] [[package]] @@ -746,9 +752,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "static_assertions" @@ -769,9 +775,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" dependencies = [ "proc-macro2", "quote", @@ -799,9 +805,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22" dependencies = [ "tinyvec_macros", ] @@ -887,9 +893,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -921,9 +927,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -945,13 +951,14 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -960,62 +967,68 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +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" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.69", ] diff --git a/pkgs/development/tools/language-servers/pylyzer/default.nix b/pkgs/development/tools/language-servers/pylyzer/default.nix index 95814084800d..cddcf712647c 100644 --- a/pkgs/development/tools/language-servers/pylyzer/default.nix +++ b/pkgs/development/tools/language-servers/pylyzer/default.nix @@ -8,23 +8,26 @@ , writeScriptBin , darwin , which +, nix-update-script +, testers +, pylyzer }: rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.54"; + version = "0.0.56"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-GUZMzV0yztlLcxvuTAuRoQ4eQhoMMyqjdu3cfOCJCJE="; + hash = "sha256-t/v9Ghnfsnwvo05PnvRInXRCbA0fi9ZQkIrrvtzBSCg="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "rustpython-ast-0.3.1" = "sha256-q9N+z3F6YICQuUMp3a10OS792tCq0GiSSlkcaLxi3Gs="; + "rustpython-ast-0.3.1" = "sha256-KjglE3KvA9F7eg9pPTV6+PrLxiWnCgtkMOsFsoPC5N8="; }; }; @@ -65,11 +68,17 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/pylyzer --set ERG_PATH $out/lib/erg ''; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = pylyzer; }; + }; + + meta = { description = "Fast static code analyzer & language server for Python"; homepage = "https://github.com/mtshiba/pylyzer"; changelog = "https://github.com/mtshiba/pylyzer/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "pylyzer"; }; } diff --git a/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/pkgs/development/tools/language-servers/ruff-lsp/default.nix index cf14e0243544..be327cae1ba0 100644 --- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.53"; + version = "0.0.54"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "astral-sh"; repo = "ruff-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-gtMqIsgGCzSBo5D4+Ne8tUloDV9+MufYkN96yr7XVd4="; + hash = "sha256-VSuEjrRiHWA78DWQgbj0D+GFjhXrREUOHUcQpFqflcw="; }; postPatch = '' @@ -32,11 +32,11 @@ buildPythonPackage rec { sed -i '/"ruff>=/d' pyproject.toml ''; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ packaging pygls lsprotocol @@ -63,12 +63,12 @@ buildPythonPackage rec { "--unset PYTHONPATH" ]; - meta = with lib; { + meta = { changelog = "https://github.com/astral-sh/ruff-lsp/releases/tag/v${version}"; description = "Language Server Protocol implementation for Ruff"; homepage = "https://github.com/astral-sh/ruff-lsp"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "ruff-lsp"; - maintainers = with maintainers; [ figsoda kalekseev ]; + maintainers = with lib.maintainers; [ figsoda kalekseev ]; }; } diff --git a/pkgs/development/tools/language-servers/verible/default.nix b/pkgs/development/tools/language-servers/verible/default.nix index 6e6c7d621cbd..ac3d34264dc7 100644 --- a/pkgs/development/tools/language-servers/verible/default.nix +++ b/pkgs/development/tools/language-servers/verible/default.nix @@ -2,7 +2,7 @@ , stdenv , buildBazelPackage , fetchFromGitHub -, bazel_5 +, bazel_6 , jdk , bison , flex @@ -18,8 +18,8 @@ buildBazelPackage rec { # These environment variables are read in bazel/build-version.py to create # a build string shown in the tools --version output. # If env variables not set, it would attempt to extract it from .git/. - GIT_DATE = "2024-02-01"; - GIT_VERSION = "v0.0-3515-g2d841599"; + GIT_DATE = "2024-07-07"; + GIT_VERSION = "v0.0-3722-g3b927214"; # Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345" version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION))); @@ -28,18 +28,16 @@ buildBazelPackage rec { owner = "chipsalliance"; repo = "verible"; rev = "${GIT_VERSION}"; - hash = "sha256-D/blcex/St1nLKvjzuKnmAJE8HVlGy8ampmXIxKK11M="; + hash = "sha256-/YQRC8Y8ucufqfgvCzvYYEQMksUMIw3ly37P090nm4s="; }; - bazel = bazel_5; + bazel = bazel_6; bazelFlags = [ "--//bazel:use_local_flex_bison" - "--java_runtime_version=local_jdk" - "--tool_java_runtime_version=local_jdk" ]; fetchAttrs = { - sha256 = "sha256-2YruKvU7OZQ7mKNrqYITat+cmf/DEytDElYw7CvkxJk="; + sha256 = "sha256-bKASgc5KftCWtMvJkGA4nweBAtgdnyC9uXIJxPjKYS0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/pkgs/development/tools/language-servers/vhdl-ls/default.nix index dabd9484499a..791b3365b1f8 100644 --- a/pkgs/development/tools/language-servers/vhdl-ls/default.nix +++ b/pkgs/development/tools/language-servers/vhdl-ls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "vhdl-ls"; - version = "0.81.0"; + version = "0.82.0"; src = fetchFromGitHub { owner = "VHDL-LS"; repo = "rust_hdl"; rev = "v${version}"; - hash = "sha256-iF8HIfxC7WM5YT85HfCTM5hu5yCFnHpDposGDAO3qJI="; + hash = "sha256-nAtC0AFNexI7gdVjroP2GlsES7d+E2RZY0d4VMddvXI="; }; - cargoHash = "sha256-hkmaMzeQLd3l6A3xyLAZk+MrEeUKPd7H2N4Nsz7nBmk="; + cargoHash = "sha256-oM5cROdSHEoGbn7eF/gvu+f0ymhxADR9u7uRB8iH1qc="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ diff --git a/pkgs/development/tools/language-servers/yaml-language-server/default.nix b/pkgs/development/tools/language-servers/yaml-language-server/default.nix index 90aae9d0d82b..585ea255ef7d 100644 --- a/pkgs/development/tools/language-servers/yaml-language-server/default.nix +++ b/pkgs/development/tools/language-servers/yaml-language-server/default.nix @@ -1,10 +1,14 @@ { lib -, mkYarnPackage -, fetchYarnDeps , fetchFromGitHub +, fetchYarnDeps +, fixup-yarn-lock +, makeWrapper +, nodejs +, stdenv +, yarn }: -mkYarnPackage rec { +stdenv.mkDerivation rec { pname = "yaml-language-server"; version = "1.15.0"; @@ -15,21 +19,54 @@ mkYarnPackage rec { hash = "sha256-Y3Q/y9UIiy7US8Jl4vxT0Pfw8h3hiXK+Cu9TEQHyAaA="; }; - packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; hash = "sha256-zHcxZ4VU6CGux72Nsy0foU4gFshK1wO/LTfnwOoirmg="; }; + nativeBuildInputs = [ + makeWrapper + fixup-yarn-lock + yarn + ]; + + buildInputs = [ + nodejs + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$offlineCache" + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + buildPhase = '' runHook preBuild - export HOME=$(mktemp -d) - yarn --offline build + yarn --offline compile + yarn --offline build:libs runHook postBuild ''; + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p $out/bin $out/lib/node_modules/yaml-language-server + cp -r . $out/lib/node_modules/yaml-language-server + ln -s $out/lib/node_modules/yaml-language-server/bin/yaml-language-server $out/bin/ + + runHook postInstall + ''; + meta = { changelog = "https://github.com/redhat-developer/yaml-language-server/blob/${src.rev}/CHANGELOG.md"; description = "Language Server for YAML Files"; diff --git a/pkgs/development/tools/manifest-tool/default.nix b/pkgs/development/tools/manifest-tool/default.nix index e4688cb60d8b..fe85fb0c451c 100644 --- a/pkgs/development/tools/manifest-tool/default.nix +++ b/pkgs/development/tools/manifest-tool/default.nix @@ -9,14 +9,14 @@ buildGoModule rec { pname = "manifest-tool"; - version = "2.1.6"; + version = "2.1.7"; modRoot = "v2"; src = fetchFromGitHub { owner = "estesp"; repo = "manifest-tool"; rev = "v${version}"; - hash = "sha256-/u60hi/KnPVWlNh6nxjXpH0ct5PLVE44deGxhzbayD0="; + hash = "sha256-f3rl4ktqvZlqIBmk9WeZ0IUil2bEAdusdCIvtqm9Gwk="; leaveDotGit = true; postFetch = '' git -C $out rev-parse HEAD > $out/.git-revision diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index a8c253e4333c..1c91797b9dd9 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.63"; + version = "0.2.64"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-umYP/U1UjqWbF1YDZYbQrlMubhxr80FFBDS1NeiI9wI="; + hash = "sha256-r/d961IQVZgKh1eT7tFE1KFVwMhp7E8z+jV1AaqBtiQ="; }; - vendorHash = "sha256-Dt6V1zngSra4ZMSboHzreqwxgH5ovMIB+Bq3eWK6tjA="; + vendorHash = "sha256-FveFo78LuTFKEch/5uqdwksS6c7MLbl+xQvZGSVmTko="; doCheck = false; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 139233ef1f76..9912736cf31a 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.5"; + version = "3.5.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-3vwct7+oY77EcOg2wldDmhGZyiyLE6ZSoyf9eMj1kjw="; + hash = "sha256-dHoVlcvZeX2+r4SgKDaUHOiNYpSNMFG/WNdL4N10ojQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/misc/binutils/0001-libtool.m4-update-macos-version-detection-block.patch b/pkgs/development/tools/misc/binutils/0001-libtool.m4-update-macos-version-detection-block.patch index e601be3a3308..f487ed708333 100644 --- a/pkgs/development/tools/misc/binutils/0001-libtool.m4-update-macos-version-detection-block.patch +++ b/pkgs/development/tools/misc/binutils/0001-libtool.m4-update-macos-version-detection-block.patch @@ -1,47 +1,24 @@ -From 33a8dc728eb5da3e1d3439c96810d1f6b2660b89 Mon Sep 17 00:00:00 2001 -From: Andrew Childs -Date: Tue, 22 Feb 2022 12:24:46 +0900 +From 368f26bfece3899a8c992cfec66427266918ab80 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Thu, 4 Jul 2024 12:20:34 -0400 Subject: [PATCH] libtool.m4: update macos version detection block -Includes upstream change -9e8c882517082fe5755f2524d23efb02f1522490 --- - libtool.m4 | 21 ++++++++------------- - 1 file changed, 8 insertions(+), 13 deletions(-) + libtool.m4 | 1 + + 1 file changed, 1 insertion(+) diff --git a/libtool.m4 b/libtool.m4 -index 7a711249304..f452efb4300 100644 +index e36fdd3c0e2..dd4725f8cd1 100644 --- a/libtool.m4 +++ b/libtool.m4 -@@ -996,20 +996,15 @@ _LT_EOF - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; - darwin1.*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- darwin*) # darwin 5.x on -- # if running on 10.5 or later, the deployment target defaults -- # to the OS version, if on x86, and 10.4, the deployment -- # target defaults to 10.4. Don't you love it? -- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- 10.[[012]][[,.]]*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- 10.*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; -+ darwin*) -+ case $MACOSX_DEPLOYMENT_TARGET,$host in -+ 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) -+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; -+ *) -+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - esac +@@ -1011,6 +1011,7 @@ _LT_EOF + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + *) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}dynamic_lookup' + ;; + esac ;; - esac -- -2.34.1 +2.45.1 diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index a60457e73591..308ac9d5913f 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -16,6 +16,7 @@ in , perl , substitute , zlib +, CoreServices , enableGold ? withGold stdenv.targetPlatform , enableGoldDefault ? false @@ -33,12 +34,12 @@ assert enableGoldDefault -> enableGold; let inherit (stdenv) buildPlatform hostPlatform targetPlatform; - version = "2.41"; + version = "2.42"; srcs = { normal = fetchurl { url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - hash = "sha256-pMS+wFL3uDcAJOYDieGUN38/SLVmGEGOpRBn9nqqsws="; + hash = "sha256-qlSFDr2lBkxyzU7C2bBWwpQlKZFIY1DZqXqypt/frxI="; }; vc4-none = fetchFromGitHub { owner = "itszor"; @@ -66,11 +67,6 @@ stdenv.mkDerivation (finalAttrs: { # fetchpatch! All mutable patches (generated by GitHub or cgit) that are # needed here should be included directly in Nixpkgs as files. patches = [ - # Upstream patch to fix llvm testsuite failure when loading powerpc - # objects: - # https://sourceware.org/PR30794 - ./gold-powerpc-for-llvm.patch - # Make binutils output deterministic by default. ./deterministic.patch @@ -80,9 +76,6 @@ stdenv.mkDerivation (finalAttrs: { ./0001-Revert-libtool.m4-fix-the-NM-nm-over-here-B-option-w.patch ./0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch - # Required for newer macos versions - ./0001-libtool.m4-update-macos-version-detection-block.patch - # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's # not clear why this behavior was decided upon but it has the unfortunate # consequence that the linker will fail to find transitive dependencies of @@ -95,6 +88,11 @@ stdenv.mkDerivation (finalAttrs: { # not need to know binutils' BINDIR at all. It's an absolute path # where libraries are stored. ./plugins-no-BINDIR.patch + ] ++ lib.optionals buildPlatform.isDarwin [ + # Note: Conditional to avoid Linux rebuilds on staging-next. Remove the conditional with the next update. + # ld64 needs `-undefined dynamic_lookup` to link `libctf-nobfd.dylib`, but the Darwin + # version detection in `libtool.m4` fails to detect the Darwin version correctly. + ./0001-libtool.m4-update-macos-version-detection-block.patch ] ++ lib.optional targetPlatform.isiOS ./support-ios.patch # Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution @@ -128,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals targetPlatform.isVc4 [ flex ] ; - buildInputs = [ zlib gettext ]; + buildInputs = [ zlib gettext ] ++ lib.optionals buildPlatform.isDarwin [ CoreServices ]; inherit noSysDirs; diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index e562a6aec078..4460d3dd8b20 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.6"; + version = "2.28.7"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "IeeBIW0yvyWawBOL1nzbL/KsVF79eskKili7jL+i40A="; + sha256 = "XovtaEOUy67KyfYsF0KmzDNef7Jt01gkWrAq+xPS3uQ="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "LrDqaGeR9g4m/MSdYFqEigyR58U/4lThA/+YbI+Lsa8="; + sha256 = "C4LutO/wGjFOIOsulCoAmeHSkLCPgNGVd5vRclwoP9g="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "nLDJ6Nf+Zo8hoiHXlKJ1qGMmuT3LHsLkRDpQ43qYX1k="; + sha256 = "FBuwu1EYjDTMSW/slt94kxsXzSqhqPdUspM5XYNzHsw="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "3xYrGJZjnIUTZiKnoTBDtfvJ9+jN9RntcqiHBhcsiIU="; + sha256 = "g7fsG6sWdRmXvL1S9vI3yNHDKSWOdzLrp7Ydpw1jNss="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "YOWlxKEFRVtcw2HauIMGVTEter0jmKH6Yp2pQ0NGHlA="; + sha256 = "Ht3K297MExglKmtws/RvhQHFPhf1bTkIoNRvT/yJ+CM="; }; }; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index c30dde82aaa6..fb2bf3964bdb 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -14,47 +14,47 @@ assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions let phpMajor = lib.versions.majorMinor php.version; - version = "1.92.17"; + version = "1.92.18"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-BhAoC4q29toEq281aC2NRZ4uUhUDsl5QyiCh1dXpsLA="; - "8.2" = "sha256-jgqTRr9fOQQ/+bbJvXKq6kPeFGvUTs7gfBpkpeeFhWs="; - "8.3" = "sha256-McWJ+Ruyb7ySgDo8u7umgCjbh6dVd08wHYAxDMqjVGQ="; + "8.1" = "sha256-5PVYDcyjarTG8RZaqEMvS8FK4DOw9goSaz9WZQtjvFo="; + "8.2" = "sha256-2E+LmM0ZAkE4iIyo6Mxu8jJjX1aLHelsJRzM9Yo9D4g="; + "8.3" = "sha256-Rm1E+ouUz50Wq4bjGnBwDpVN9C3JXu9zF6jmcrn6Xzg="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-LRYSUZUqkSbjs5UZzNGGQKvf1aGyixqRQV1SYa7ica0="; - "8.2" = "sha256-VuPod48wx6rCSsZEV98AzqrD+a0t+yI0+9EifLjcROE="; - "8.3" = "sha256-r7+IVjLx0hpPWPL0sRSIUd4sBye1avQ0IW00fLIhfEY="; + "8.1" = "sha256-iJucmU/ytes45VJAhsJHsvovbZ/mHtj+ChVv1vsL/XU="; + "8.2" = "sha256-0Xc6d6ibfnkHEwwkseNWj52DesxVmBRD9oRZRS36XOI="; + "8.3" = "sha256-x89Ub3LDstdzqdMDcF0mMpwDGufNDNRAp2yeZLNXnoQ="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-JQTqbWbFC3kEHuYQTXL70T7clIPZTje0E6LBAjyBQdc="; - "8.2" = "sha256-uhm8SlbOwzd2HKUXha9jWoxYPzDEbiOo4GXQDby4BYA="; - "8.3" = "sha256-w99LTLpkk6rvTXZU2Qwi5DA40Zyw2/c4060Beusfebk="; + "8.1" = "sha256-wESvg1iqPMvT9EjTNLJk5GtzgW80UigmR0m4Rr8VVaQ="; + "8.2" = "sha256-/1hlgAVITlLM2i7aa3cIF/eci/q68rDT+wsB+zBxIzg="; + "8.3" = "sha256-oABuQk6uZxC/Ry1DcpKbULso5CzEZEIod0GECxbLROk="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-sXxVKZSEL1VVFoh41hWwF1KR9hX2R7SwUQ4et+ouJYs="; - "8.2" = "sha256-wA9oTpbUX967crg4Gq+AI04HtWmitodgTKNm1EEWltI="; - "8.3" = "sha256-l7C7k/6tYfkUJ2qkeY52XjP6uDfXm0Mk/xM0hoRvsEM="; + "8.1" = "sha256-hLPM07WVu1jPaaxR8YPeGcL05nrDG8LTVUJ9IoMKLWE="; + "8.2" = "sha256-2gUmMr55r2FBMlmd/dyXQaXMEfod9tG8/QY0fo0NJxc="; + "8.3" = "sha256-H+y1+671+V60GHHKP/0ss+A8t/h2HdGkRgARsqyJJ3M="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-SDS7JaktrW9z9R0jDwd+Q3W13KnPknuIoKaaJddORW8="; - "8.2" = "sha256-pwFI4A4eUZKEZ5tDDlFTz5O+as7LXuyWdESgZI6soHQ="; - "8.3" = "sha256-H++ksK3IjHDCbGD3BaVpWlKx8OH0G3Luktx2pu0GCj0="; + "8.1" = "sha256-Mm+CiC6dBb1JOs+Z/3dPSJNdKqvRLruYEFihsY52bpI="; + "8.2" = "sha256-OXemTJV4exlTQj6MGBxMOA8TuXw3e6iXTD2i/gott2A="; + "8.3" = "sha256-VtGUwhKAXr+P6+sn65Hyo8Dxh+Iyd/K3dwlqQmH0ElI="; }; }; }; diff --git a/pkgs/development/tools/misc/direvent/default.nix b/pkgs/development/tools/misc/direvent/default.nix index bc7b7b5160a1..3e3de9f26676 100644 --- a/pkgs/development/tools/misc/direvent/default.nix +++ b/pkgs/development/tools/misc/direvent/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "direvent"; - version = "5.3"; + version = "5.4"; src = fetchurl { url = "mirror://gnu/direvent/direvent-${version}.tar.gz"; - sha256 = "sha256-lAWop32kn+krvkrxi/kl/5H20zdMELfXAKAxusuUxJc="; + sha256 = "sha256-HbvGGSqrZ+NFclFIYD1XDGooKDgMlkIVdir5FSTXlbo="; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 983576a75334..954312b729b5 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -17,8 +17,11 @@ let sha256 = "0zjba1090awxkmgifr9jnjkxf41zhzc4f6mrnbayn3v6s77ca9x4"; }; - nativeBuildInputs = [ pkg-config autoconf automake ]; - buildInputs = [popt avahi python3 gtk3 which procps libiberty_static]; + nativeBuildInputs = [ + pkg-config autoconf automake which + (python3.withPackages (p: [ p.setuptools ])) + ]; + buildInputs = [ popt avahi gtk3 procps libiberty_static ]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 66560a91fcab..aa9bed97069d 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = "v${version}"; - hash = "sha256-jqaYJmezekSKdwg8gNdU/DH6S83dPc5WmTU3nfvKjwo="; + hash = "sha256-HgWfR0kOtP2cSSRGMPuy1qGqcS/4QAWPeBU+lwHnYqI="; }; - vendorHash = "sha256-mPYxBqM4VoSmhtobKAn6p3BXIFGrUzs8gA9x97SmbTw="; + vendorHash = "sha256-P5lOx9CH37Z7mkDshbwS+XJZQdQiqNKl71wR1iUvpm8="; doCheck = false; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index d75cb7f8bc9e..7c3eb4e19423 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "editorconfig-core-c"; - version = "0.12.8"; + version = "0.12.9"; outputs = [ "out" "dev" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "editorconfig"; repo = "editorconfig-core-c"; rev = "v${finalAttrs.version}"; - hash = "sha256-zhWq87X8n7iyp5HBmV2ZTjcN09zQ/sBXPrGmQT0iRr4="; + hash = "sha256-myJNJxKwgmgm+P2MqnYmW8OC0oYcInL+Suyf/xwX9xo="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 757c4269e79b..7f3d79f6a3d7 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -6,11 +6,11 @@ let pygments = python3Packages.pygments; in stdenv.mkDerivation rec { pname = "global"; - version = "6.6.12"; + version = "6.6.13"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - hash = "sha256-VCpbBoQOFOylSLS7YLRMCtzwECTmjrNi+L9xYAeIWQE="; + hash = "sha256-lF80lzDaAfd4VNmBHKj4AWaclGE5WimWbY2Iy2cDNHs="; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 29d0a94e301f..996bfeacb2d1 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -24,14 +24,14 @@ with two "luarocks" derivations. }: stdenv.mkDerivation (finalAttrs: { - pname = "luarocks"; - version = "3.11.0"; + pname = "luarocks_bootstrap"; + version = "3.11.1"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; rev = "v${finalAttrs.version}"; - hash = "sha256-mSwwBuLWoMT38iYaV/BTdDmmBz4heTRJzxBHC0Vrvc4="; + hash = "sha256-GglygI8HP+aDFEuucOkjQ2Pgfv4+jW+og+2vL3KoZCQ="; }; patches = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* substituteInPlace $out/etc/luarocks/* \ - --replace '${lua.luaOnBuild}' '${lua}' + --replace-fail '${lua.luaOnBuild}' '${lua}' '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd luarocks \ diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix index e0b65b4ccc75..0249c098de5c 100644 --- a/pkgs/development/tools/misc/nrfutil/default.nix +++ b/pkgs/development/tools/misc/nrfutil/default.nix @@ -1,12 +1,10 @@ -{ lib -, stdenv -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: -with python3.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "nrfutil"; version = "6.1.7"; @@ -17,7 +15,7 @@ buildPythonApplication rec { sha256 = "sha256-WiXqeQObhXszDcLxJN8ABd2ZkxsOUvtZQSVP8cYlT2M="; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ click crcmod ecdsa @@ -32,9 +30,9 @@ buildPythonApplication rec { tqdm ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ behave - nose + pytestCheckHook ]; # Workaround: pythonRelaxDepsHook doesn't work for this. @@ -43,13 +41,15 @@ buildPythonApplication rec { substituteInPlace requirements.txt \ --replace "libusb1==1.9.3" "libusb1" \ --replace "protobuf >=3.17.3, < 4.0.0" "protobuf" + substituteInPlace nordicsemi/dfu/tests/test_signing.py \ + --replace "self.assertEqual(expected_vk_pem, vk_pem)" "" ''; - meta = with lib; { + meta = { description = "Device Firmware Update tool for nRF chips"; homepage = "https://github.com/NordicSemiconductor/pc-nrfutil"; - license = licenses.unfreeRedistributable; - platforms = platforms.unix; - maintainers = with maintainers; [ gebner ]; + license = lib.licenses.unfreeRedistributable; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ gebner ]; }; } diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 77a8842c1b57..cf1f713848e9 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "0.18.0-unstable-2024-01-15"; + version = "0.18.0-unstable-2024-06-15"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "7c2f768bf9601268a4e71c2ebe91e2011918a70f"; - sha256 = "sha256-PPXqKY2hJng4DBVE0I4xshv/vGLUskL7jl53roB8UdU="; + rev = "a0f54334df36770b335c051e540ba40afcbf8378"; + sha256 = "sha256-FSoxTcRZMGHNJh8dNtKOkcUtjhmhU6yQXcZZfUPLhQM="; }; # Drop test that fails on musl (?) diff --git a/pkgs/development/tools/misc/python-launcher/default.nix b/pkgs/development/tools/misc/python-launcher/default.nix index a9531fbad6de..854f1e39e1a2 100644 --- a/pkgs/development/tools/misc/python-launcher/default.nix +++ b/pkgs/development/tools/misc/python-launcher/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "python-launcher"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "brettcannon"; repo = pname; rev = "v${version}"; - sha256 = "1r2pmli4jsdjag9zsgd9q1qlj3hxxjj2bni6yybjh1a10fcqxzzv"; + sha256 = "sha256-wRKTBvLLo0Vvvh1GtF9hOnUHNpOeX950y1U+8JYBGoE="; }; - cargoSha256 = "sha256-2lgWybEPi6HEUMYuGDRWMjWoc94CrFHPP5IeKUjj0q4="; + cargoHash = "sha256-+FtfL5jAGJrpnZaJDnDMvWC0D3Af0L466v9nqJkb+uA="; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index eca2f5ccf0aa..346ae27a76ec 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.18.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-ZmkT6LDdAxYKjwKWxz+hKtmCq2u7R5X9Nn+DNIN3CZg="; + hash = "sha256-SdsmDZcMjRvXzGMOnhObZYeTtn6R++wiWf/kDfBffHE="; }; - vendorHash = "sha256-hYS6i9G4rzw1zRxaKo1D5vxKVu+bEkJsoNhm9RD0nYU="; + vendorHash = "sha256-binXUA5oHtNrZwiBMVoBgbnW2xYjhJJFZ7TO9Vii3Cs="; doCheck = false; diff --git a/pkgs/development/tools/misc/terser/default.nix b/pkgs/development/tools/misc/terser/default.nix index 9fe2e386b7ce..efb4a364a68e 100644 --- a/pkgs/development/tools/misc/terser/default.nix +++ b/pkgs/development/tools/misc/terser/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "terser"; - version = "5.31.0"; + version = "5.31.1"; src = fetchFromGitHub { owner = "terser"; repo = "terser"; rev = "v${version}"; - hash = "sha256-rZYzeNBUaimetn/NRugsx6Czc0NxMzAKN58DRcae7pM="; + hash = "sha256-yKJPV6JGZTNCMjHh8v+MgnhaMuGF5cVHGEIJei896Hg="; }; - npmDepsHash = "sha256-SKL//hww6I3RDkqEUBrM0xDSuoPOCArvKKiBz68JtRo="; + npmDepsHash = "sha256-E50RrEllhmluWe726KRmD2pcXbD2bSkWz8x6FeF+kOU="; meta = with lib; { description = "JavaScript parser, mangler and compressor toolkit for ES6+"; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 475b280c925a..7a2613644729 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.17.0"; + version = "5.18.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-4yMZxhq8Y3RFZHOlulG5hqj3bJSIYVycrtnmsbx+4bs="; + hash = "sha256-qE845LurpjJbprPPAA6aVxSDiaBbjeT3Ousx/5f8bMU="; }; - cargoHash = "sha256-/qT/mxKjVvyA6XAB0Oa6jpKss0YtIL6cvGwBHM8Bt4M="; + cargoHash = "sha256-E8GvkdNQhWsLkWHveWT0c21AdBK6YWg/6VtINxDcjqQ="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 8d9a63fcf550..2008d134b538 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/XAMPPRocky/tokei"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ gebner lilyball ]; + maintainers = with maintainers; [ gebner ]; mainProgram = "tokei"; }; } diff --git a/pkgs/development/tools/misc/unixbench/default.nix b/pkgs/development/tools/misc/unixbench/default.nix index 4edd464a763d..d5f060af82cf 100644 --- a/pkgs/development/tools/misc/unixbench/default.nix +++ b/pkgs/development/tools/misc/unixbench/default.nix @@ -6,7 +6,7 @@ , installShellFiles , perl , xorg -, libGL +, libGLX , coreutils , unixtools , targetPackages @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ] ++ lib.optionals withGL [ xorg.libX11 xorg.libXext - libGL + libGLX ]; runtimeDependencies = [ diff --git a/pkgs/development/tools/nasmfmt/default.nix b/pkgs/development/tools/nasmfmt/default.nix index eda6940f079f..e57dcffac2c0 100644 --- a/pkgs/development/tools/nasmfmt/default.nix +++ b/pkgs/development/tools/nasmfmt/default.nix @@ -24,6 +24,6 @@ buildGoModule rec { mainProgram = "nasmfmt"; homepage = "https://github.com/yamnikov-oleg/nasmfmt"; license = licenses.mit; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/nest-cli/default.nix b/pkgs/development/tools/nest-cli/default.nix index 65a6020545ec..b45fe3cfb20a 100644 --- a/pkgs/development/tools/nest-cli/default.nix +++ b/pkgs/development/tools/nest-cli/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "nest-cli"; - version = "10.3.2"; + version = "10.4.0"; src = fetchFromGitHub { owner = "nestjs"; repo = pname; rev = version; - hash = "sha256-FSI87oeHiNqL8FhGavPtqurOr/1Y5iGawSwhBhLB2Ls="; + hash = "sha256-0zml5gaDL7szlDob7xQOxWcSr1gwp05nhBZHlR2kM70="; }; - npmDepsHash = "sha256-RqotLpMISfB2xE9zng0TkapJ0y1fuVWP/0nY2VcMVRU="; + npmDepsHash = "sha256-9Eze3z2eBpE8CtKkqMXrWPyLnpSZEVZN6UmdHhOkO28="; env = { npm_config_build_from_source = true; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 769c39769e3f..6028cc4015bd 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -87,7 +87,7 @@ let extraOutputsToInstall = [ "lib" "out" ]; }; - version = "0.88.0"; + version = "0.89.0"; in stdenv.mkDerivation { pname = "nwjs"; @@ -98,10 +98,10 @@ stdenv.mkDerivation { in fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-${flavor}v${version}-linux-${bits}.tar.gz"; hash = { - "sdk-ia32" = "sha256-pk8Fdzw8zBBF4xeU5BlmkF1gbf7HIn8jheSjbdV4hI0="; - "sdk-x64" = "sha256-51alZRf/+bpKfVLUQuy1VtLHCgkVuptQaJgupt7zxcU="; - "ia32" = "sha256-OLkOJo3xDZ6WKbf6zPeY+KcgzoEjYWMIV7YWWbESjPo="; - "x64" = "sha256-KSsaTs0W8m2dI+0ByLqU4H4ai/PXUt6LtroZIBeymgs="; + "sdk-ia32" = "sha256-gHZLxZRborfbwmblKQrgr6tf+Rwt1YqxrGELAHPM0so="; + "sdk-x64" = "sha256-NOQGS3jEdZumTwCmi0DUtnGlOaSAZi2rGYSLVioJDdg="; + "ia32" = "sha256-L3PGK2YZCUo+KfkakL9AjkPcnUWPFOn4S2GePi+rph0="; + "x64" = "sha256-epsbDjrpq4K7NnNDAcKoEJMcjfdehU2JjFcmA5exug8="; }."${flavor + bits}"; }; diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index fb9b46c00ce5..e55fd630cec9 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -21,23 +21,26 @@ let "4.12.1" = "4.7-412"; "4.13.0" = "4.7-413"; "4.13.1" = "4.7-413"; - "4.14.0" = "4.14-414"; - "4.14.1" = "4.14-414"; - "4.14.2" = "4.14-414"; + "4.14.0" = "4.16-414"; + "4.14.1" = "4.16-414"; + "4.14.2" = "4.16-414"; "5.0.0" = "4.14-500"; - "5.1.0" = "4.14-501"; - "5.1.1" = "4.14-501"; + "5.1.0" = "4.16-501"; + "5.1.1" = "4.16-501"; + "5.2.0" = "5.1-502"; }; hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU="; - "4.14-414" = "sha256-eQGMyqN8FQHdXE1c94vDQg1kGx6CRDZimBxUctlzmT0="; "4.14-500" = "sha256-7CPzJPh1UgzYiX8wPMbU5ZXz1wAJFNQQcp8WuGrR1w4="; - "4.14-501" = "sha256-t+npbpJAWMLOQpZCeIqi45ByDUQeIkU4vPSUplIDopI="; + "4.16-414" = "sha256-xekZdfPfVoSeGzBvNWwxcJorE519V2NLjSHkcyZvzy0="; + "4.16-501" = "sha256-2lvzCbBAZFwpKuRXLMagpwDb0rz8mWrBPI5cODbCHiY="; + "5.1-502" = "sha256-T9gIvCaSnP/MqOoGNEeQFZwQ4+r5yRTPRu956Rf8rhU="; }; version = lib.getAttr ocaml.version merlinVersions; + in if !lib.hasAttr ocaml.version merlinVersions @@ -47,7 +50,6 @@ else buildDunePackage { pname = "merlin"; inherit version; - duneVersion = "3"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-${version}.tbz"; diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index ef30a51a7e6a..28c77b902b4b 100644 --- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -3,8 +3,6 @@ buildDunePackage rec { pname = "dot-merlin-reader"; - duneVersion = "3"; - inherit (merlin) version src; minimalOCamlVersion = "4.06"; diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix index 6bf1ff212c26..0d1cb1955baf 100644 --- a/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/pkgs/development/tools/ocaml/obelisk/default.nix @@ -2,13 +2,13 @@ ocamlPackages.buildDunePackage rec { pname = "obelisk"; - version = "0.6.0"; + version = "0.7.0"; duneVersion = "3"; src = fetchFromGitHub { owner = "Lelio-Brun"; repo = pname; rev = "v${version}"; - sha256 = "1jjaqa2b7msl9qd3x7j34vdh1s9alq8hbvzk8a5srb4yyfyim15b"; + sha256 = "sha256-M/pQvuS8hlpeqd6QBDTHQzqIVFIqGUfj0igVPW2Xwwc="; }; strictDeps = true; diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 98a48c27742c..0c8fd4b4e7b4 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ocamlbuild"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocamlbuild"; rev = version; - sha256 = "sha256-dfcNu4ugOYu/M0rRQla7lXum/g1UzncdLGmpPYo0QUM="; + sha256 = "sha256-j4Nd5flyvshIo+XFtBS0fKqdd9YcxYsjE7ty6rZLDRc="; }; createFindlibDestdir = true; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 06161d95c4b2..891733635cce 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -2,6 +2,7 @@ , stdenv , buildGoModule , fetchFromGitHub +, fetchpatch , installShellFiles , enableWasmEval ? false @@ -20,6 +21,15 @@ buildGoModule rec { hash = "sha256-fx7k6KvL0uy2NXLDLpCnN1ux9MGEO1CbX6TdLweVzag="; }; + patches = [ + # fix tests in 1.22.5 + # https://github.com/open-policy-agent/opa/pull/6845 + (fetchpatch { + url = "https://github.com/open-policy-agent/opa/commit/956358516c23b1f33f6667961e20aca65b91355b.patch"; + hash = "sha256-1nfMwJwbYfdLg9j4ppP1IWdDeFq6vhXcDKr6uprP53U="; + }) + ]; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index f622e11b14d0..2fe91c46bcd3 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; rev = version; - sha256 = "sha256-FcrymV0n/Bv0cS9Dx6sG+ifilBiPfaG+xpQvH9mvylQ="; + sha256 = "sha256-ENMFhIVQhPL4FDW9Ne2YGR3sXjvW55NN1bErfr/kDZg="; }; nativeBuildInputs = [ cmake pkg-config python3 ]; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index d2fad639aa21..50d56bf9ec9c 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "packer"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - hash = "sha256-LU3URVklSjpsQas9xtvIU2OcyMZHqkcA7WaUYCQHfns="; + hash = "sha256-GjC8nc8gpYQ3v0IYJc6vz0809PD6kTWx/HE1UOhTYc0="; }; - vendorHash = "sha256-ipinfk+nFAeyND1HNOehHd+0l5meOPOgbkmCzJlvw+A="; + vendorHash = "sha256-Xmmc30W1ZfMc7YSQswyCjw1KyDA5qi8W+kZ1L7cM3cQ="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 311be4ccdc29..f06a2b5424ef 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -35,7 +35,10 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { + # Skip non-release tags like `python-experimental`. + extraArgs = [ "--version-regex" "([0-9.]+)" ]; + }; tests = { inherit ninja php spamassassin; }; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 27386cc1d690..dd65dbe34221 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -3,6 +3,8 @@ , python3 , fetchFromGitHub , installShellFiles +, pipenv +, runCommand }: with python3.pkgs; @@ -24,14 +26,14 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2023.10.24"; + version = "2024.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "pipenv"; rev = "refs/tags/v${version}"; - hash = "sha256-b1EqCrgGygdG08zzastgcYGnXDKoEYNvm5xjDLzlAXo="; + hash = "sha256-IyjJrIEcKHm7TpZk26MYI///ZIB/7ploTBzvms1gDmI="; }; env.LC_ALL = "en_US.UTF-8"; @@ -66,14 +68,29 @@ in buildPythonApplication rec { ]; disabledTests = [ - "test_convert_deps_to_pip" + # this test wants access to the internet "test_download_file" ]; disabledTestPaths = [ + # many of these tests want access to the internet "tests/integration" ]; + passthru.tests = { + verify-venv-patch = runCommand "${pname}-test-verify-venv-patch" {} '' + export PIPENV_VENV_IN_PROJECT=1 + + # "pipenv install" should be able to create a venv + ${pipenv}/bin/pipenv install + + # the venv exists + [ -d .venv ] + + touch $out + ''; + }; + postInstall = '' installShellCompletion --cmd pipenv \ --bash <(_PIPENV_COMPLETE=bash_source $out/bin/pipenv) \ diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index d6a47cfebf4b..6ef6fb3c5f72 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -8,8 +8,8 @@ let hash = "sha256-aR/hdu6pqKgN8g5JdvPftEoEhBzriFY4/iomF0+B5l4="; }; "9" = { - version = "9.3.0"; - hash = "sha256-4fno0aFmB6Rt08FYtfen3HlFUB0cYiLUVNY9Az0dkY8="; + version = "9.4.0"; + hash = "sha256-tv0L/aVV5+WErX5WswxosB1aBPnuk5ifS5PKhHPEnHQ="; }; }; diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix index 598b2570600e..58fab74c9884 100644 --- a/pkgs/development/tools/prospector/default.nix +++ b/pkgs/development/tools/prospector/default.nix @@ -27,7 +27,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/development/tools/protoc-gen-go/default.nix index cd2d261aa721..52a54fbeeaa1 100644 --- a/pkgs/development/tools/protoc-gen-go/default.nix +++ b/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.34.1"; + version = "1.34.2"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - hash = "sha256-xbfqN/t6q5dFpg1CkxwxAQkUs8obfckMDqytYzuDwF4="; + hash = "sha256-467+AhA3tADBg6+qbTd1SvLW+INL/1QVR8PzfAMYKFA="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index 57485de36f67..5088c01b4882 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-ujbJrF7QDd2DIsZGEoJrM3VA2WNpkJNe4BZVcPokXRg="; + hash = "sha256-0MMPbn6BaIn623nHYuNYsiMIFF0y2fAYmjxZ/XESyTg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 100aba324db3..700d855a8874 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.9.3"; + version = "3.11.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-8K+awKsSQotPqVJg7SkpPCjenU6a/cqEZogqwQAe0I8="; + hash = "sha256-Hr4ZC9tqrzUh+v+skyrx5xmU7dusIKoATuoNLd0tqUg="; }; - cargoHash = "sha256-2KNSPn0zrx5zwF9g29x3/L/ptza+NstBu4Lc1PR4ymE="; + cargoHash = "sha256-7l9a/2jUtNg2LzGTXj//znJmeyMTuEcS1tlzoNos/jA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index a11f60bf99c4..f5b2b5a36198 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2024.06.17.00"; + version = "2024.07.01.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; rev = "refs/tags/v${version}"; - hash = "sha256-J3ZrlX83TE63Go4qp+lMhexkuaV0ZgHNYga8qxZF0wI="; + hash = "sha256-eA2eD/762/hJQ7p/V/Hw1dYzkqnqXZymdg8ef2wi8to="; }; - cargoHash = "sha256-xqDMfGNvlyFo3v9GmESfRG+WyQKbzTojOqtYK/tMPxo="; + cargoHash = "sha256-hyySKUDeZ7aPXQ7f4grgYY3cTkhE82rrh2EFasrnGX0="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 6d910ad0ab5a..fc0c35f53759 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -376,7 +376,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -617,7 +617,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.66", + "syn", ] [[package]] @@ -628,7 +628,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -691,17 +691,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "drop_bomb" version = "0.1.5" @@ -765,6 +754,17 @@ dependencies = [ "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 = "eyre" version = "0.6.12" @@ -977,124 +977,6 @@ 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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" -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.66", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1103,14 +985,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "icu_normalizer", - "icu_properties", - "smallvec", - "utf8_iter", + "unicode-bidi", + "unicode-normalization", ] [[package]] @@ -1260,7 +1140,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -1386,14 +1266,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2ae40017ac09cd2c6a53504cb3c871c7f2b41466eac5bc66ba63f39073b467b" dependencies = [ "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "libmimalloc-sys" -version = "0.1.38" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7bb23d733dfcc8af652a78b7bf232f0e967710d044732185e561e47c0336b6" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", @@ -1421,12 +1301,6 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" -[[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" @@ -1496,9 +1370,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mimalloc" -version = "0.1.42" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9186d86b79b52f4a77af65604b51225e8db1d6ee7e3f41aec1e40829c71a176" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] @@ -1859,9 +1733,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1973,24 +1847,38 @@ dependencies = [ "dashmap", "hashbrown 0.14.5", "indexmap", - "insta", "is-macro", "notify", "parking_lot", "rayon", - "red_knot_python_semantic", + "red_knot_module_resolver", "ruff_index", "ruff_notebook", "ruff_python_ast", "ruff_python_parser", - "ruff_python_stdlib", "ruff_text_size", - "rustc-hash", + "rustc-hash 2.0.0", "smol_str", "tempfile", "tracing", "tracing-subscriber", "tracing-tree", +] + +[[package]] +name = "red_knot_module_resolver" +version = "0.0.0" +dependencies = [ + "anyhow", + "insta", + "path-slash", + "ruff_db", + "ruff_python_stdlib", + "rustc-hash 2.0.0", + "salsa", + "smol_str", + "tempfile", + "tracing", "walkdir", "zip", ] @@ -2003,17 +1891,16 @@ dependencies = [ "bitflags 2.5.0", "hashbrown 0.14.5", "indexmap", + "red_knot_module_resolver", "ruff_db", "ruff_index", "ruff_python_ast", "ruff_python_parser", - "ruff_python_stdlib", "ruff_text_size", - "rustc-hash", - "salsa-2022", + "rustc-hash 2.0.0", + "salsa", "smallvec", "smol_str", - "tempfile", "tracing", ] @@ -2098,7 +1985,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.4.10" +version = "0.5.0" dependencies = [ "anyhow", "argfile", @@ -2133,7 +2020,7 @@ dependencies = [ "ruff_source_file", "ruff_text_size", "ruff_workspace", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "serde_json", "shellexpand", @@ -2189,14 +2076,14 @@ dependencies = [ "countme", "dashmap", "filetime", - "itertools 0.13.0", + "insta", "once_cell", "ruff_python_ast", "ruff_python_parser", "ruff_source_file", "ruff_text_size", - "rustc-hash", - "salsa-2022", + "rustc-hash 2.0.0", + "salsa", "tracing", "zip", ] @@ -2227,7 +2114,6 @@ dependencies = [ "ruff_python_parser", "ruff_python_stdlib", "ruff_python_trivia", - "ruff_text_size", "ruff_workspace", "schemars", "serde", @@ -2260,7 +2146,7 @@ dependencies = [ "ruff_cache", "ruff_macros", "ruff_text_size", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "static_assertions", @@ -2278,7 +2164,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.4.10" +version = "0.5.0" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2320,7 +2206,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "serde_json", @@ -2345,7 +2231,7 @@ dependencies = [ "proc-macro2", "quote", "ruff_python_trivia", - "syn 2.0.66", + "syn", ] [[package]] @@ -2379,7 +2265,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash", + "rustc-hash 2.0.0", "serde", ] @@ -2426,7 +2312,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "serde_json", @@ -2472,7 +2358,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash", + "rustc-hash 2.0.0", "static_assertions", "unicode-ident", "unicode-normalization", @@ -2502,7 +2388,7 @@ dependencies = [ "ruff_python_stdlib", "ruff_source_file", "ruff_text_size", - "rustc-hash", + "rustc-hash 2.0.0", ] [[package]] @@ -2558,7 +2444,7 @@ dependencies = [ "ruff_source_file", "ruff_text_size", "ruff_workspace", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "serde_json", "shellexpand", @@ -2618,7 +2504,7 @@ version = "0.0.0" dependencies = [ "anyhow", "colored", - "dirs 5.0.1", + "etcetera", "glob", "globset", "ignore", @@ -2637,7 +2523,7 @@ dependencies = [ "ruff_python_ast", "ruff_python_formatter", "ruff_source_file", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "shellexpand", @@ -2662,6 +2548,12 @@ 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.34" @@ -2719,9 +2611,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] -name = "salsa-2022" -version = "0.1.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=05b4e3ebdcdc47730cdd359e7e97fb2470527279#05b4e3ebdcdc47730cdd359e7e97fb2470527279" +name = "salsa" +version = "0.18.0" +source = "git+https://github.com/salsa-rs/salsa.git?rev=f706aa2d32d473ee633a77c1af01d180c85da308#f706aa2d32d473ee633a77c1af01d180c85da308" dependencies = [ "arc-swap", "crossbeam", @@ -2731,21 +2623,22 @@ dependencies = [ "indexmap", "log", "parking_lot", - "rustc-hash", - "salsa-2022-macros", + "rustc-hash 1.1.0", + "salsa-macros", "smallvec", ] [[package]] -name = "salsa-2022-macros" -version = "0.1.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=05b4e3ebdcdc47730cdd359e7e97fb2470527279#05b4e3ebdcdc47730cdd359e7e97fb2470527279" +name = "salsa-macros" +version = "0.18.0" +source = "git+https://github.com/salsa-rs/salsa.git?rev=f706aa2d32d473ee633a77c1af01d180c85da308#f706aa2d32d473ee633a77c1af01d180c85da308" dependencies = [ "eyre", "heck 0.4.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn", + "synstructure", ] [[package]] @@ -2778,7 +2671,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.66", + "syn", ] [[package]] @@ -2827,7 +2720,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -2838,7 +2731,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -2860,7 +2753,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -2901,7 +2794,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -2955,12 +2848,6 @@ 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" @@ -2990,9 +2877,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] @@ -3007,7 +2894,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn", ] [[package]] @@ -3018,20 +2905,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "1.0.109" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -3046,7 +2922,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3102,7 +2978,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3113,7 +2989,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", "test-case-core", ] @@ -3134,7 +3010,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3167,16 +3043,6 @@ dependencies = [ "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" @@ -3256,7 +3122,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3370,6 +3236,12 @@ dependencies = [ "unic-common", ] +[[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" @@ -3387,9 +3259,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode_names2" @@ -3444,9 +3316,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -3454,18 +3326,6 @@ dependencies = [ "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" @@ -3492,7 +3352,7 @@ checksum = "9881bea7cbe687e36c9ab3b778c36cd0487402e270304e8b1296d5085303c1a2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3577,7 +3437,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn", "wasm-bindgen-shared", ] @@ -3611,7 +3471,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3644,7 +3504,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3881,18 +3741,6 @@ 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 = "0.5.1" @@ -3908,30 +3756,6 @@ 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.66", - "synstructure", -] - [[package]] name = "zerocopy" version = "0.7.32" @@ -3949,28 +3773,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", -] - -[[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.66", - "synstructure", + "syn", ] [[package]] @@ -3979,28 +3782,6 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" -[[package]] -name = "zerovec" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "zip" version = "0.6.6" diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index a58eadf632ff..6a68f3a7b820 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.4.10"; + version = "0.5.0"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; - rev = "refs/tags/v${version}"; - hash = "sha256-FRBuvXtnbxRWoI0f8SM0U0Z5TRyX5Tbgq3d34Oh2bG4="; + rev = "refs/tags/${version}"; + hash = "sha256-OjMoa247om4DLPZ6u0XPMd5L+LYlVzHL39plCCr/fYE="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ="; - "salsa-2022-0.1.0" = "sha256-mt+X1hO+5ZrCAgy6N4aArnixJ9GjY/KwM0uIMUSrDsg="; + "salsa-0.18.0" = "sha256-keVEmSwV1Su1RlOTaIu253FZidk279qA+rXcCeuOggc="; }; }; @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec { "--skip=semantic::types::infer::tests::resolve_visible_def" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ruff \ --bash <($out/bin/ruff generate-shell-completion bash) \ --fish <($out/bin/ruff generate-shell-completion fish) \ @@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Extremely fast Python linter"; homepage = "https://github.com/astral-sh/ruff"; - changelog = "https://github.com/astral-sh/ruff/releases/tag/v${version}"; + changelog = "https://github.com/astral-sh/ruff/releases/tag/${version}"; license = lib.licenses.mit; mainProgram = "ruff"; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index 693b92d74676..27c60b403901 100644 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-iXqYaRDRaqmI7Y3oEE1fFKYFX/+7Rt3qpzpQ5+l8Z3w="; + hash = "sha256-fJJMbibX/i/l1Qc/V4+loHJ+G/+nnstB0a1dlXkJjk0="; }; - cargoHash = "sha256-LRE18jzgx/aONJkeqzEyDWrWNyp/FmxUGmOy3A9vA7Q="; + cargoHash = "sha256-SelvLaI+vG4PzBcxphBpeFM0nRtaQoTHvuS/8P8/Cig="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 2599d963d3c0..e8a97f906d05 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-2P+AS4/nNZ9bYzpJSinw7xJb+RuUbnxvX+wxPvV1BKw="; + hash = "sha256-r7f4Ev/ucOFo4cu8zy+UDb2aJh35IMjgwuQ96j0pnw8="; }; - cargoHash = "sha256-205TOqFp/LwCapH9ClgFrMLA+VSV2P0jDdPTo0ku87M="; + cargoHash = "sha256-GvzYoCbpn/q+jXyIfNgZ7j0cyCiJk7ipICAeGgMfkyw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index e712518ece89..1a54ba51a9a6 100644 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "24.5.0"; + version = "24.7.0"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-qKgHlFb7sraXTpqf6QsOspzHGWtVZAUSOl3rl6pqQJk="; + hash = "sha256-cDwNjPuXa6cpgGUDAAZVWZulcAYM6p5vUQrCs9njuUs="; }; - cargoHash = "sha256-h9nhE7pSwxE2NKJQtlA6Exwh36pC6Lp0y3u0AEh39N4="; + cargoHash = "sha256-6igY0LzjwPNmVxXTgj+RE5GpK/EyBRhv0yqHp15051s="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-run-bin/default.nix b/pkgs/development/tools/rust/cargo-run-bin/default.nix index a12ebb8caf9b..e72f5d074273 100644 --- a/pkgs/development/tools/rust/cargo-run-bin/default.nix +++ b/pkgs/development/tools/rust/cargo-run-bin/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-run-bin"; - version = "1.7.2"; + version = "1.7.3"; src = fetchCrate { inherit pname version; - hash = "sha256-VhDCOTabj/HHc6bYdAUOErvxXOzyY3+e7GccZcb1cSQ="; + hash = "sha256-VMlia5EEnNiNkOzwdTZwoaKtAxHz5xAxxnGlGoSbD80="; }; - cargoHash = "sha256-riWWxv3FsBrgzVUWGtKvV4WjhgsXImLpiS9EJ40kCn8="; + cargoHash = "sha256-DFsDUoYq+TE8ifwQIl5YfoeUl8udIf1z35rFmLe/4To="; # multiple impurities in tests doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index 1278a60cf213..02823914e15a 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.37"; + version = "0.2.38"; src = fetchCrate { inherit pname version; - hash = "sha256-doN4oL7ZRuORgVsPFMY57zRFwz4m2BqgEgNvnf4t5cU="; + hash = "sha256-CYnW6wv4aL/Qs6IwPaRi9w8/iNMo5to0J3z4zTdgHaE="; }; - cargoHash = "sha256-QWMsDUBJZgXXd20FYDpJYXxofhT7YohTV0hiHePww1o="; + cargoHash = "sha256-jRsxP4b1URTDcnp8VsZvSTaPNOBBwq570eCn2jfQSGg="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 6a41db928fc5..828f50e467c3 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.47"; + version = "1.0.48"; src = fetchCrate { inherit pname version; - hash = "sha256-G52Nr+Cc6h/26T0HxQ691PRgHUUC2TuoRstNdibGJ1Q="; + hash = "sha256-BrWJKM7Vkvjlkn3PCBe45epQc2SkjKVlttQF0/AHSls="; }; - cargoHash = "sha256-WFh7bfkcDMBkowP4YsMxy95PXYKhA4uVW4MYyT22E0o="; + cargoHash = "sha256-Dkz3QJchUAn4/kQsmQcSfxVrRdiCA2qJSOTszfvE4No="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index db1a2821de96..d6bc6ed75407 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -17,20 +17,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.6.8"; + version = "1.7.1"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - hash = "sha256-6GUgxSfuy2v38lYVdjsN0vd63/Aci0ERgG2kF2E2AFA="; + hash = "sha256-xQsj+NjfWc4nU/MKPzWal6n+YZpruypPoUm926JiI7k="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-HC+6AoBx51ahK6QA1Ug7jaKftkE5W3FS629uQ0yrV3Q="; + cargoHash = "sha256-xcytn3cV1Tw6O9glihbyCvERuUBA1yioR4PIbL1T53Q="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index e54021554004..7aca9708590b 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.47"; + version = "0.1.49"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1XnCGbOkAmQycwAAEbkoX9xHqBZWYM9v5fp8BdFv7RM="; + sha256 = "sha256-XIr1erxW2S7Ok0DqsDtLn9wRT874o7tIWrt+HrjHACs="; }; - cargoHash = "sha256-awEqrvmu9Kgqlz43/yJFM45WfUXZPLix5LKLtwiXV7U="; + cargoHash = "sha256-x++h5FOb5LXV9miRYZjnZcmp2Djn0P2gdBLAOO977IU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix deleted file mode 100644 index a32a76aeb898..000000000000 --- a/pkgs/development/tools/rust/crate2nix/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, makeWrapper - -, cargo -, nix -, nix-prefetch-git -}: - -rustPlatform.buildRustPackage rec { - pname = "crate2nix"; - version = "0.14.0"; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = pname; - rev = version; - hash = "sha256-rGT3CW64cJS9nlnWPFWSc1iEa3dNZecVVuPVGzcsHe8="; - }; - - sourceRoot = "${src.name}/crate2nix"; - - cargoHash = "sha256-YoE6wrQNQcRo/yaiVpASU2VOmHCPM4pDgTejn0ovOVY="; - - nativeBuildInputs = [ makeWrapper ]; - - # Tests use nix(1), which tries (and fails) to set up /nix/var inside the - # sandbox - doCheck = false; - - postFixup = '' - wrapProgram $out/bin/crate2nix \ - --suffix PATH ":" ${lib.makeBinPath [ cargo nix nix-prefetch-git ]} - - rm -rf $out/lib $out/bin/crate2nix.d - mkdir -p \ - $out/share/bash-completion/completions \ - $out/share/zsh/vendor-completions - $out/bin/crate2nix completions -s 'bash' -o $out/share/bash-completion/completions - $out/bin/crate2nix completions -s 'zsh' -o $out/share/zsh/vendor-completions - ''; - - meta = with lib; { - description = "Nix build file generator for Rust crates"; - mainProgram = "crate2nix"; - longDescription = '' - Crate2nix generates Nix files from Cargo.toml/lock files - so that you can build every crate individually in a Nix sandbox. - ''; - homepage = "https://github.com/nix-community/crate2nix"; - license = licenses.asl20; - maintainers = with maintainers; [ kolloch cole-h ]; - platforms = platforms.all; - }; -} - diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index f7c213c13dd5..266cd54fdfd2 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-3rID2epV1pCwpofFf9Wuafs1SlBWH7e7/4HPaSUAriQ="; + hash = "sha256-cKX5fDPQElNLAur2PF6J5050QnMNrazMTCVtGmjwmxQ="; }; - cargoHash = "sha256-hPyPMQm/Oege0PPjYIrd1fEDOGqoQ1ffS2l6o8je4t4="; + cargoHash = "sha256-EuMPcJAGz564cC9UWrlihBxRUJCtqw4jvP/SQgx2L/0="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/development/tools/rust/panamax/default.nix index 4eb496376039..0073c6087736 100644 --- a/pkgs/development/tools/rust/panamax/default.nix +++ b/pkgs/development/tools/rust/panamax/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "panamax"; - version = "1.0.12"; + version = "1.0.14"; src = fetchCrate { inherit pname version; - sha256 = "sha256-nHAsKvNEhGDVrLx8K7xnm7TuCxaZcYwlQ6xjVRvDdSk="; + sha256 = "sha256-gIgw6JMGpHNXE/PZoz3jRdmjIWy4hETYf24Nd7/Jr/g="; }; - cargoSha256 = "sha256-ydZ0KM/g9k0ux7Zr4crlxnKCC9N/qPzn1wmzbTIyz7o="; + cargoHash = "sha256-doEBlUVmXxbuPkDgliWr+LfG5KAMVEGpvLyQpoCzSTc="; nativeBuildInputs = [ pkg-config ]; @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { zlib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; meta = with lib; { diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/development/tools/rye/Cargo.lock index e2d27c9eade6..b47b73256b2c 100644 --- a/pkgs/development/tools/rye/Cargo.lock +++ b/pkgs/development/tools/rye/Cargo.lock @@ -1799,7 +1799,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.35.0" +version = "0.36.0" dependencies = [ "age", "anyhow", diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix index 8414cd5f59c0..1051561b0887 100644 --- a/pkgs/development/tools/rye/default.nix +++ b/pkgs/development/tools/rye/default.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-mkBp9iFoN1LanJrcm4VdZ9k8cWNaRZIYl10ukT4Rfqc="; + hash = "sha256-dQgiEvnf5LreHCNV5ZXXehONG2Btj1MbGL0dBABZIXE="; }; cargoLock = { diff --git a/pkgs/development/tools/sem/default.nix b/pkgs/development/tools/sem/default.nix index 81ae332a66e5..e8cd2256a59b 100644 --- a/pkgs/development/tools/sem/default.nix +++ b/pkgs/development/tools/sem/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sem"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "semaphoreci"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-ZizmDuEu3D8cVOMw0k1yBXlLft+nzOPnqv5Yi6vk5AM="; + sha256 = "sha256-bShQ+paDM9AdrdPrtwyQ5Mytf/SNZ4fVMDT2ZNswt3o="; }; vendorHash = "sha256-p8+M+pRp12P7tYlFpXjU94JcJOugQpD8rFdowhonh74="; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 8c56bb08a976..deab8539ef14 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeSetupHook, fetchFromGitHub, libelf, which, pkg-config, freeglut +{ lib, stdenv, makeSetupHook, fetchFromGitHub, libelf, which, pkg-config, libglut , avrgcc, avrlibc , libGLU, libGL , GLUT }: @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ which pkg-config avrgcc ] ++ lib.optional stdenv.isDarwin setupHookDarwin; - buildInputs = [ libelf freeglut libGLU libGL ] + buildInputs = [ libelf libglut libGLU libGL ] ++ lib.optional stdenv.isDarwin GLUT; # remove forbidden references to $TMPDIR diff --git a/pkgs/development/tools/skjold/default.nix b/pkgs/development/tools/skjold/default.nix index 75de1dfe1eb2..bbd5f57a778d 100644 --- a/pkgs/development/tools/skjold/default.nix +++ b/pkgs/development/tools/skjold/default.nix @@ -20,7 +20,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ click diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index 0bd4d805a143..dba5da20c263 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.3.0"; + version = "3.3.1"; src = fetchzip { url = "mirror://maven/org/springframework/boot/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}-bin.zip"; - hash = "sha256-dTTTcmR4C9UiYEfiKHr0sJBtHg/+sJcGIdrXSOoK1mw="; + hash = "sha256-3Mlid+hvHVjAw5pE6vyieSHWH8Zkoty3GuwE1gB5yQM="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index b37324eba9cd..89ae716020b9 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.169.5"; + version = "1.183.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-H0y/eBmUG5nT/EsF1iC5hbhRBhR8jwwxlYav4Q7bSqM="; + hash = "sha256-IQB3CGH7l8hHvZ6+wPyW3eDkbNWkT5SFz2xkak9Yao0="; }; - vendorHash = "sha256-wZ+yYPwmePKMfYTve3Ha7teSx1mlHLnc1ZaZE6ZEdu4="; + vendorHash = "sha256-BK1ryal5ptOQ4Z0SyaNj452QFH871igiuMJKg/w5IiU="; ldflags = [ "-s" @@ -31,7 +31,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - rm $out/bin/{codegen,docs,listdep} + rm $out/bin/{docs,listdep} mv $out/bin/{cli,supabase} installShellCompletion --cmd supabase \ diff --git a/pkgs/development/tools/twitch-cli/default.nix b/pkgs/development/tools/twitch-cli/default.nix index d9eab6a35691..2aa819a0a4dd 100644 --- a/pkgs/development/tools/twitch-cli/default.nix +++ b/pkgs/development/tools/twitch-cli/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "twitch-cli"; - version = "1.1.22"; + version = "1.1.23"; src = fetchFromGitHub { owner = "twitchdev"; repo = pname; rev = "v${version}"; - hash = "sha256-9tbU9gR8UHg98UKZ9ganapAz1bar18xb7ISvKoeuwe4="; + hash = "sha256-BAVnXxkUXCKYq5hCPRtZu33andYm2ic4Vbx9an0MwFw="; }; patches = [ ./application-name.patch ]; - vendorHash = "sha256-1uUokMeI0D/apDFJLq+Go5BQp1JMYxJQF8nKvw52E7o="; + vendorHash = "sha256-Z5bWS4oqjkEfOsvBzupKKnF6rJPU0TLVdwxDkIKcBQY="; ldflags = [ "-s" diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index cff5a27f87b6..62b6b615385a 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.22.9"; + version = "1.23.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-FD9Sn1NwiahrYv99avwC2wtoTlwnqiuE7dCNPsD0+y4="; + hash = "sha256-46WXCImBqWmU82zIgulVyoB2/aGWXYunWDdQDsxMlOs="; }; - cargoHash = "sha256-NmF2pBru3iCOfl5q3Td9HBxi9VGmilUK3q3JckUeu/o="; + cargoHash = "sha256-29F4n9yuyGxQSZY4tJ8KaHXKLmpCPuUKDwOoyWBfmgk="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index b6afbdf4df71..1a1cd76c5acb 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vultr-cli"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - hash = "sha256-iMd/PXcLa3Z5yNsebub0MSZvionm6ERNlBJANvymP7Y="; + hash = "sha256-Gn2N/v3qFqxI2ZU94GNuzpHoXgPeJaAO+ODjb5ff1aI="; }; - vendorHash = "sha256-sBG6T+wVEFvgNdPJt5Fe7SIzetkxAqGW7VgyXV7wUSs="; + vendorHash = "sha256-kglG6Mhe1XUqblt+0ZR8FPPTrBKjxb1xG8bPXQrrzxE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/web-ext/default.nix b/pkgs/development/tools/web-ext/default.nix index 2c1688e38c02..bfbfbdf5c1c8 100644 --- a/pkgs/development/tools/web-ext/default.nix +++ b/pkgs/development/tools/web-ext/default.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "web-ext"; - version = "8.0.0"; + version = "8.2.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "web-ext"; rev = version; - hash = "sha256-lMfvD5EVWpDcX54nJI3eReF/EMMuZYxtKdHKwk4Lrxk="; + hash = "sha256-5q1vB1EN+Qmss6o6qn4BAaNSwLJBhC8joFJVzncBx6k="; }; - npmDepsHash = "sha256-RVyIpzVom48/avot9bbjXYg2E5+b3GlCHaKNfMEk968="; + npmDepsHash = "sha256-MGuLCuTTUdh2L64j41K6GvCdquCDYPPPEk1Z/9R6sNA="; npmBuildFlags = [ "--production" ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 0bbaf69a7315..6f2831b68d8d 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -58,8 +58,8 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-eytY45LcgeI9m9amHd8hfE7Lz7ET7p19h37Bi4yUHBM="; }; "x86_64-darwin" = fetchurl { - url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-bF/yg7C2tsdPjotC4DKISZRWEUUmUha22tWJynearEM="; + url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; + hash = "sha256-SKD/nJSDCPEQPekbkHkEew0mw2E55/L2hPjlz3fu3J8="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix index e97400703624..e9352822b3bb 100644 --- a/pkgs/development/web/cog/default.nix +++ b/pkgs/development/web/cog/default.nix @@ -11,7 +11,7 @@ , webkitgtk , makeWrapper , wrapGAppsHook3 -, gnome +, adwaita-icon-theme , gdk-pixbuf }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { webkitgtk glib-networking gdk-pixbuf - gnome.adwaita-icon-theme + adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index a635dd913300..cde017c71e5d 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.75"; + version = "0.2.79"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-7qJDlMy2LmrUMxeacH6n/JP8Zg4ln12iC1BGysejMws="; + hash = "sha256-mnLBSTzeDcxmKNile4Kfe0AABoLgK3EL9HU8r8OPsuc="; }; vendorHash = "sha256-RSLwEOtZsYfTgBdkZIxccxehz8lbozWJV5UdKiMeoLU="; diff --git a/pkgs/development/web/function-runner/default.nix b/pkgs/development/web/function-runner/default.nix index 0494bb1e0593..7c492135fdc7 100644 --- a/pkgs/development/web/function-runner/default.nix +++ b/pkgs/development/web/function-runner/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "function-runner"; - version = "5.1.2"; + version = "5.1.3"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D8XqWVgW2pdNDwgWTpDG5FXlVHTWyKSx6ugJ9eqOl0U="; + sha256 = "sha256-U47kA2D2dvJu8ym1OT/ThSsNC22b5hJ0Kqxerg8RPSI="; }; - cargoHash = "sha256-F+QArzUBgCg7yWL3Vcn+u+G/Hi6OmArCBB+4yYQYIVY="; + cargoHash = "sha256-pznA7aTLrc4I5uElh+4Oxp3lXHRfV5YMn9abcaJSHIc="; meta = with lib; { description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 4df54b13a15a..bff154879034 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "minify"; - version = "2.20.34"; + version = "2.20.35"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - hash = "sha256-x6xeAFy96Ur+Kc1ODQxpX/lgK2CJWn34HgZzGSmcwqE="; + hash = "sha256-eSU+AxCy7FIfMfKJXb3x4Iv1T7IgU0EHwDKHEBOW674="; }; vendorHash = "sha256-LT39GYDcFL3hjiYwvbSYjV8hcg0KNgQmLMRWcdz4T48="; diff --git a/pkgs/development/web/nodejs/bin-sh-node-run-v22.patch b/pkgs/development/web/nodejs/bin-sh-node-run-v22.patch new file mode 100644 index 000000000000..3fd142a3e440 --- /dev/null +++ b/pkgs/development/web/nodejs/bin-sh-node-run-v22.patch @@ -0,0 +1,14 @@ +Fixes test/parallel/test-node-run.js subtest. + +Note that this techinically depends on an impurity during build, see +also https://github.com/NixOS/nix/issues/6081. Currently stdenv allows +/bin/sh as an impure host dependency on Darwin, so we are guaranteed to +have it to certain degree, although it is very hacky. + +--- a/test/fixtures/run-script/node_modules/.bin/positional-args ++++ b/test/fixtures/run-script/node_modules/.bin/positional-args +@@ -1,3 +1,3 @@ +-#!/bin/bash ++#!/bin/sh + echo "Arguments: '$@'" + echo "The total number of arguments are: $#" diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 962bc3e246be..28fef6832bef 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -7,6 +7,7 @@ , gnupg , darwin, xcbuild , procps, icu +, installShellFiles }: { enableNpm ? true, version, sha256, patches ? [] } @args: @@ -69,7 +70,7 @@ let buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ zlib libuv openssl http-parser icu bash ]; - nativeBuildInputs = [ which pkg-config python ] + nativeBuildInputs = [ installShellFiles pkg-config python which ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; outputs = [ "out" "libv8" ]; @@ -137,14 +138,25 @@ let "build-node-api-tests" "tooltest" "cctest" + "test-ci-js" ]; - # Do not create __pycache__ when running tests. - checkFlags = [ "PYTHONDONTWRITEBYTECODE=1" ]; + checkFlags = [ + # Do not create __pycache__ when running tests. + "PYTHONDONTWRITEBYTECODE=1" + "FLAKY_TESTS=skip" + # Skip some tests that are not passing in this context + "CI_SKIP_TESTS=test-setproctitle,test-tls-cli-max-version-1.3,test-tls-client-auth,test-child-process-exec-env,test-fs-write-stream-eagain,test-tls-sni-option,test-https-foafssl,test-child-process-uid-gid,test-process-euid-egid,test-process-initgroups,test-process-uid-gid,test-process-setgroups" + ]; postInstall = '' HOST_PATH=$out/bin patchShebangs --host $out + ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + $out/bin/${self.meta.mainProgram} --completion-bash > ${self.meta.mainProgram}.bash + installShellCompletion ${self.meta.mainProgram}.bash + ''} + ${lib.optionalString (enableNpm) '' mkdir -p $out/share/bash-completion/completions ln -s $out/lib/node_modules/npm/lib/utils/completion.sh \ @@ -206,7 +218,7 @@ let homepage = "https://nodejs.org"; changelog = "https://github.com/nodejs/node/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu cko aduh95 ]; + maintainers = with maintainers; [ goibhniu aduh95 ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "node"; knownVulnerabilities = optional (versionOlder version "18") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/."; diff --git a/pkgs/development/web/nodejs/use-correct-env-in-tests.patch b/pkgs/development/web/nodejs/use-correct-env-in-tests.patch new file mode 100644 index 000000000000..d2fda8d2cead --- /dev/null +++ b/pkgs/development/web/nodejs/use-correct-env-in-tests.patch @@ -0,0 +1,24 @@ +`/usr/bin/env` is not available. + +--- old/test/common/assertSnapshot.js ++++ new/test/common/assertSnapshot.js +@@ -81,2 +81,2 @@ async function spawnAndAssert(filename, transform = (x) => x, { tty = false, ... +- const executable = tty ? 'tools/pseudo-tty.py' : process.execPath; +- const args = tty ? [process.execPath, ...flags, filename] : [...flags, filename]; ++ const executable = tty ? 'python3' : process.execPath; ++ const args = tty ? ['tools/pseudo-tty.py', process.execPath, ...flags, filename] : [...flags, filename]; +--- old/test/parallel/test-child-process-default-options.js ++++ new/test/parallel/test-child-process-default-options.js +@@ -35 +35 @@ if (isWindows) { +- child = spawn('/usr/bin/env', [], {}); ++ child = spawn('env', [], {}); +--- old/test/parallel/test-child-process-env.js ++++ new/test/parallel/test-child-process-env.js +@@ -51 +51 @@ if (isWindows) { +- child = spawn('/usr/bin/env', [], { env }); ++ child = spawn('env', [], { env }); +--- old/test/parallel/test-child-process-exec-env.js ++++ new/test/parallel/test-child-process-exec-env.js +@@ -47 +47 @@ if (!isWindows) { +- child = exec('/usr/bin/env', { env: { 'HELLO': 'WORLD' } }, after); ++ child = exec('env', { env: { 'HELLO': 'WORLD' } }, after); diff --git a/pkgs/development/web/nodejs/v18-openssl-3.0.14.patch b/pkgs/development/web/nodejs/v18-openssl-3.0.14.patch new file mode 100644 index 000000000000..b63fb8ad1303 --- /dev/null +++ b/pkgs/development/web/nodejs/v18-openssl-3.0.14.patch @@ -0,0 +1,24 @@ +diff --git a/test/parallel/test-tls-alpn-server-client.js b/test/parallel/test-tls-alpn-server-client.js +index 522dd34ad2..3f0ee2a0f9 100644 +--- a/test/parallel/test-tls-alpn-server-client.js ++++ b/test/parallel/test-tls-alpn-server-client.js +@@ -195,7 +195,8 @@ function TestALPNCallback() { + + // Callback picks 2nd preference => undefined => ALPN rejected: + assert.strictEqual(results[1].server, undefined); +- assert.strictEqual(results[1].client.error.code, 'ECONNRESET'); ++ const allowedErrors = ['ECONNRESET', 'ERR_SSL_TLSV1_ALERT_NO_APPLICATION_PROTOCOL']; ++ assert.ok(allowedErrors.includes(results[1].client.error.code), `'${results[1].client.error.code}' was not one of ${allowedErrors}.`); + + TestBadALPNCallback(); + }); +@@ -218,7 +219,8 @@ function TestBadALPNCallback() { + runTest(clientsOptions, serverOptions, function(results) { + // Callback returns 'http/5' => doesn't match client ALPN => error & reset + assert.strictEqual(results[0].server, undefined); +- assert.strictEqual(results[0].client.error.code, 'ECONNRESET'); ++ const allowedErrors = ['ECONNRESET', 'ERR_SSL_TLSV1_ALERT_NO_APPLICATION_PROTOCOL']; ++ assert.ok(allowedErrors.includes(results[0].client.error.code), `'${results[0].client.error.code}' was not one of ${allowedErrors}.`); + + TestALPNOptionsCallback(); + }); diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 6b3ca7635e43..b44dbc8e51d2 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python3, enableNpm ? true }: +{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python311, fetchpatch2, enableNpm ? true }: let # Clang 16+ cannot build Node v18 due to -Wenum-constexpr-conversion errors. @@ -14,7 +14,7 @@ let inherit openssl; stdenv = ensureCompatibleCC pkgs; buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; }; - python = python3; + python = python311; }; in buildNodejs { @@ -27,5 +27,11 @@ buildNodejs { ./revert-arm64-pointer-auth.patch ./node-npm-build-npm-package-logic.patch ./trap-handler-backport.patch + ./use-correct-env-in-tests.patch + ./v18-openssl-3.0.14.patch + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/534c122de166cb6464b489f3e6a9a544ceb1c913.patch"; + hash = "sha256-4q4LFsq4yU1xRwNsM1sJoNVphJCnxaVe2IyL6AeHJ/I="; + }) ]; } diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index b716f9bdd1ed..1fb2d61fba21 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -8,12 +8,20 @@ let in buildNodejs { inherit enableNpm; - version = "20.12.2"; - sha256 = "sha256-18vMX7+zHpAB8/AVC77aWavl3XE3qqYnOVjNWc41ztc="; + version = "20.14.0"; + sha256 = "sha256-CGVQKPDYQ26IFj+RhgRNY10/Nqhe5Sjza9BbbF5Gwbs="; patches = [ - ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch ./node-npm-build-npm-package-logic.patch + ./use-correct-env-in-tests.patch + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/534c122de166cb6464b489f3e6a9a544ceb1c913.patch"; + hash = "sha256-4q4LFsq4yU1xRwNsM1sJoNVphJCnxaVe2IyL6AeHJ/I="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/14863e80584e579fd48c55f6373878c821c7ff7e.patch"; + hash = "sha256-I7Wjc7DE059a/ZyXAvAqEGvDudPjxQqtkBafckHCFzo="; + }) ]; } diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index ec5cc40cc9c2..4bc7c46c15ba 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -14,5 +14,13 @@ buildNodejs { ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch ./node-npm-build-npm-package-logic.patch + ./use-correct-env-in-tests.patch + ./bin-sh-node-run-v22.patch + (fetchpatch2 { + # Fixes OpenSSL 3.0.14 compatibility in tests. + # See https://github.com/nodejs/node/pull/53373 + url = "https://github.com/nodejs/node/commit/14863e80584e579fd48c55f6373878c821c7ff7e.patch"; + hash = "sha256-I7Wjc7DE059a/ZyXAvAqEGvDudPjxQqtkBafckHCFzo="; + }) ]; } diff --git a/pkgs/development/web/postman/linux.nix b/pkgs/development/web/postman/linux.nix index 3784cca31ae5..bc1119103c44 100644 --- a/pkgs/development/web/postman/linux.nix +++ b/pkgs/development/web/postman/linux.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { name = "postman"; - exec = "postman"; + exec = "postman %U"; icon = "postman"; comment = "API Development Environment"; desktopName = "Postman"; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 4391e21ce810..ee2e8b3016fb 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { description = "Free, open-source game of ancient warfare"; homepage = "https://play0ad.com/"; license = with licenses; [ - gpl2 lgpl21 mit cc-by-sa-30 + gpl2Plus lgpl21 mit cc-by-sa-30 licenses.zlib # otherwise masked by pkgs.zlib ]; maintainers = with maintainers; [ chvp ]; diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix index 819f238806b2..c41fff3d59a9 100644 --- a/pkgs/games/airstrike/default.nix +++ b/pkgs/games/airstrike/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "2d dogfighting game"; mainProgram = "airstrike"; homepage = "https://icculus.org/airstrike/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index 445c86c3bd16..63fa8a62365b 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast-paced, polished OpenGL demonstration by Excess"; homepage = "https://packages.qa.debian.org/a/amoeba.html"; - license = licenses.gpl2; # Engine is GPLv2, data files in amoeba-data nonfree + license = licenses.gpl2Only; # Engine is GPLv2, data files in amoeba-data nonfree maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; }; diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 3cd9174f3e8a..54e4fff299d6 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Single-player roguelike dungeon exploration game"; mainProgram = "angband"; maintainers = [ maintainers.kenran ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; }; }) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 0d9465b77060..a75cc801257e 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -15,22 +15,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "24.06.2"; + version = "24.06.3"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-A7/R7nQUt0L4fKFadPvKyi1sCEUIXcOZSW+Yr1ty63c="; + hash = "sha256-/oyQy4QHU9DCqYplcuINy5y0d2/n+fJCpgwNDURguYU="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-tZjR5ebzbm9w5m66Q2cy8Oe1VtqGEDpLfjpgbUh07Lo="; + hash = "sha256-UQRdp/GhiRGfsBF+mV6hCKpEQGFv/I9D9KTtc1p776o="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-/SVtyvsPWv5EGiNTbfHbPtguLi/oNytO16JPnD7IaCM="; + hash = "sha256-zi9yjJirNxFFD7wGa4++J+mDaE5dYZW+X0UUddGkjTU="; }; }; @@ -59,6 +59,7 @@ let license homepage description + mainProgram longDescription ; platforms = [ diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index f50739d114a0..54fbf7a1c8b0 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -1,33 +1,70 @@ -{ fetchurl, lib, stdenv, cmake, xorg, libGLU, libGL, SDL, openal, fontconfig, freealut, freetype, libogg, libvorbis, runtimeShell }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, ninja +, makeWrapper +, xorg +, libGLU +, libGL +, SDL2 +, openal +, fontconfig +, freealut +, freetype +, libogg +, libvorbis +, runtimeShell +}: stdenv.mkDerivation rec { pname = "astromenace"; - version = "1.4.1"; + version = "1.4.2"; - src = fetchurl { - url = "mirror://sourceforge/openastromenace/astromenace-src-${version}.tar.bz2"; - sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv"; + src = fetchFromGitHub { + owner = "viewizard"; + repo = "astromenace"; + rev = "v${version}"; + hash = "sha256-VFFFYHsBxkURHqOBeuRuIxRKsy8baw2izOZ/qXUkiW8="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ xorg.libICE xorg.libX11 xorg.libXinerama libGLU libGL SDL openal fontconfig freealut freetype libogg libvorbis ]; + patches = [ + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/astromenace/raw/5e6bc02d115a53007dc47ef8223d8eaa25607588/f/astromenace-gcc13.patch"; + hash = "sha256-pkmTVR86vS+KCICxAp+d7upNWVnSNxwdKmxnbtqIvgU="; + }) + ]; - postBuild = '' - ./AstroMenace --pack --rawdata=../RAW_VFS_DATA - ''; + nativeBuildInputs = [ + cmake + ninja + makeWrapper + ]; + + buildInputs = [ + xorg.libICE + xorg.libX11 + xorg.libXinerama + libGLU + libGL + SDL2 + openal + fontconfig + freealut + freetype + libogg + libvorbis + ]; installPhase = '' - mkdir -p $out/bin - - cp AstroMenace $out - cp gamedata.vfs $out - - cat > $out/bin/AstroMenace << EOF - #!${runtimeShell} - $out/AstroMenace --dir=$out - EOF - - chmod 755 $out/bin/AstroMenace + runHook preInstall + mkdir -p $out/share/astromenace + install -Dm644 gamedata.vfs $out/share/astromenace/gamedata.vfs + install -Dm755 astromenace $out/bin/astromenace + wrapProgram $out/bin/astromenace \ + --add-flags "--dir=$out/share/astromenace" + runHook postInstall ''; meta = with lib; { @@ -35,6 +72,7 @@ stdenv.mkDerivation rec { homepage = "https://www.viewizard.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; - mainProgram = "AstroMenace"; + mainProgram = "astromenace"; + maintainers = with maintainers; [ fgaz ]; }; } diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix index 8a77be6f16eb..2d38e909168e 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://atanks.sourceforge.net/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/games/braincurses/default.nix b/pkgs/games/braincurses/default.nix index 2e3b54cb8710..bf346b44816e 100644 --- a/pkgs/games/braincurses/default.nix +++ b/pkgs/games/braincurses/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bderrly/braincurses"; description = "Version of the classic game Mastermind"; mainProgram = "braincurses"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.linux; }; diff --git a/pkgs/games/chromium-bsu/default.nix b/pkgs/games/chromium-bsu/default.nix index f3dfb41c7792..135110028f43 100644 --- a/pkgs/games/chromium-bsu/default.nix +++ b/pkgs/games/chromium-bsu/default.nix @@ -6,7 +6,7 @@ , SDL2_mixer , fontconfig , freealut -, freeglut +, libglut , ftgl , gettext , glpng @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { SDL2_mixer fontconfig freealut - freeglut + libglut ftgl glpng libGL diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index f4e3c6a4504a..0f57b8cf8918 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/gerstrong/Commander-Genius"; maintainers = with maintainers; [ hce ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 4c9419a54c65..c4d4c50df393 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -5,7 +5,7 @@ , xorgproto , libGL ? null , libGLU ? null -, freeglut ? null +, libglut ? null }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 zlib xorgproto ] ++ lib.optional (libGL != null) libGL ++ lib.optional (libGLU != null) libGLU - ++ lib.optional (freeglut != null) freeglut; + ++ lib.optional (libglut != null) libglut; preConfigure = '' substituteInPlace src/Makefile.in \ diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 4f037f72a38c..d3d347066462 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, freeglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, libglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }: stdenv.mkDerivation rec { pname = "crack-attack"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 freeglut SDL SDL_mixer libGLU libGL libXi libXmu ]; + buildInputs = [ gtk2 libglut SDL SDL_mixer libGLU libGL libXi libXmu ]; hardeningDisable = [ "format" ]; enableParallelBuilding = true; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!"; mainProgram = "crack-attack"; homepage = "https://www.nongnu.org/crack-attack/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index 0ad930ca26cb..29aa64c3459e 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { mainProgram = "crrcsim"; maintainers = with lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" ]; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }; } diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 955baea28be8..678e7d6d59b8 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -109,7 +109,8 @@ stdenv.mkDerivation rec { "-DCLIENT=${if buildClient then "ON" else "OFF"}" ]; - doCheck = true; + # Tests loop forever on Darwin for some reason + doCheck = !stdenv.isDarwin; checkTarget = "run_tests"; postInstall = lib.optionalString (!buildClient) '' diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index d1647eb6a46a..232a8d7b23c8 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -4,6 +4,7 @@ , jdk8 , jre , ant +, stripJavaArchivesHook , makeWrapper , makeDesktopItem , copyDesktopItems @@ -41,6 +42,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ jdk8 ant + stripJavaArchivesHook makeWrapper copyDesktopItems ]; @@ -71,7 +73,6 @@ in stdenv.mkDerivation { cp -r build/game/* $out/share/domination/ # Reimplement the two launchers mentioned in Unix_shortcutSpec.xml with makeWrapper - mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/domination \ --chdir "$out/share/domination" \ --add-flags "-jar $out/share/domination/Domination.jar" @@ -83,6 +84,11 @@ in stdenv.mkDerivation { runHook postInstall ''; + preFixup = '' + # remove extra metadata files for jar files which break stripJavaArchivesHook + find $out/share/domination/lib -type f -name '._*.jar' -delete + ''; + passthru.tests = { domination-starts = nixosTests.domination; }; @@ -101,7 +107,8 @@ in stdenv.mkDerivation { fromSource binaryBytecode # source bundles dependencies as jars ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; + mainProgram = "domination"; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; diff --git a/pkgs/games/doom-ports/doomseeker/default.nix b/pkgs/games/doom-ports/doomseeker/default.nix index 11aec59bf4db..6f83fa130459 100644 --- a/pkgs/games/doom-ports/doomseeker/default.nix +++ b/pkgs/games/doom-ports/doomseeker/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { homepage = "http://doomseeker.drdteam.org/"; description = "Multiplayer server browser for many Doom source ports"; mainProgram = "doomseeker"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index 3bcf14190601..9e2d8ab4216f 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -33,7 +33,8 @@ let buildInputs = [ sfml libX11 glm SDL2 ]; cmakeFlags = [ - "-DFETCHCONTENT_SOURCE_DIR_BASIS=${basis-universal}" + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_BASIS" "${basis-universal}") + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DGLM_ENABLE_EXPERIMENTAL") ]; meta = with lib; { @@ -63,15 +64,16 @@ stdenv.mkDerivation { buildInputs = [ serious-proton sfml glew libX11 python3 glm SDL2 ninja ]; cmakeFlags = [ - "-DSERIOUS_PROTON_DIR=${serious-proton.src}" - "-DCPACK_PACKAGE_VERSION=${version.emptyepsilon}" - "-DCPACK_PACKAGE_VERSION_MAJOR=${major}" - "-DCPACK_PACKAGE_VERSION_MINOR=${minor}" - "-DCPACK_PACKAGE_VERSION_PATCH=${patch.emptyepsilon}" - "-DFETCHCONTENT_SOURCE_DIR_BASIS=${basis-universal}" - "-DFETCHCONTENT_SOURCE_DIR_MESHOPTIMIZER=${meshoptimizer.src}" - "-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar" - "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib" + (lib.cmakeFeature "SERIOUS_PROTON_DIR" "${serious-proton.src}") + (lib.cmakeFeature "CPACK_PACKAGE_VERSION" "${version.emptyepsilon}") + (lib.cmakeFeature "CPACK_PACKAGE_VERSION_MAJOR" "${major}") + (lib.cmakeFeature "CPACK_PACKAGE_VERSION_MINOR" "${minor}") + (lib.cmakeFeature "CPACK_PACKAGE_VERSION_PATCH" "${patch.emptyepsilon}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_BASIS" "${basis-universal}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MESHOPTIMIZER" "${meshoptimizer.src}") + (lib.cmakeFeature "CMAKE_AR" "${stdenv.cc.cc}/bin/gcc-ar") + (lib.cmakeFeature "CMAKE_RANLIB" "${stdenv.cc.cc}/bin/gcc-ranlib") + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DGLM_ENABLE_EXPERIMENTAL") "-G Ninja" ]; diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 7fb175344592..0539720ad452 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "endless-sky"; - version = "0.10.6"; + version = "0.10.8"; src = fetchFromGitHub { owner = "endless-sky"; repo = "endless-sky"; rev = "v${version}"; - sha256 = "sha256-3mprmW6K8pYs7J2q71fohsh9fZEP2RZjN1rSWUAwbhg="; + sha256 = "sha256-bqhltxkoqDdmddOBZ1f3I29AxGm5buUXpjjFwefemEM="; }; patches = [ diff --git a/pkgs/games/enigma/default.nix b/pkgs/games/enigma/default.nix index 8deac27e579f..256a65ed9425 100644 --- a/pkgs/games/enigma/default.nix +++ b/pkgs/games/enigma/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Puzzle game inspired by Oxyd on the Atari ST and Rock'n'Roll on the Amiga"; mainProgram = "enigma"; - license = with licenses; [ gpl2 free ]; # source + bundles libs + art + license = with licenses; [ gpl2Plus free ]; # source + bundles libs + art platforms = platforms.unix; broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ iblech ]; diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index a1322499ea6a..8e774a63ee54 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libGLU, libGL, libX11, xorgproto, tcl, freeglut, freetype +{ lib, stdenv, fetchurl, libGLU, libGL, libX11, xorgproto, tcl, libglut, freetype , sfml, libXi , libXmu, libXext, libXt, libSM, libICE , libpng, pkg-config, gettext, intltool @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ - libGLU libGL libX11 xorgproto tcl freeglut freetype + libGLU libGL libX11 xorgproto tcl libglut freetype sfml libXi libXmu libXext libXt libSM libICE libpng gettext diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 202102bb38ed..4cc6bd2258b5 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://ezquake.com/"; description = "Modern QuakeWorld client focused on competitive online play"; mainProgram = "ezquake"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ edwtjo ]; }; diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index e32801b76974..0e436ed4a741 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.107.tar.xz", + "name": "factorio_alpha_x64-1.1.109.tar.xz", "needsAuth": true, - "sha256": "16hkyfwp02zcijka4yslifz62ry6hrvk0w9960618kqdw3gr7p82", + "sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.107/alpha/linux64", - "version": "1.1.107" + "url": "https://factorio.com/get-download/1.1.109/alpha/linux64", + "version": "1.1.109" }, "stable": { - "name": "factorio_alpha_x64-1.1.107.tar.xz", + "name": "factorio_alpha_x64-1.1.109.tar.xz", "needsAuth": true, - "sha256": "16hkyfwp02zcijka4yslifz62ry6hrvk0w9960618kqdw3gr7p82", + "sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.107/alpha/linux64", - "version": "1.1.107" + "url": "https://factorio.com/get-download/1.1.109/alpha/linux64", + "version": "1.1.109" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.107.tar.xz", + "name": "factorio_demo_x64-1.1.109.tar.xz", "needsAuth": false, - "sha256": "0qc36n6h4wcbnj9rnq162bsml4x3ag1dkjmywqz8f4ydaf86gyjw", + "sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.107/demo/linux64", - "version": "1.1.107" + "url": "https://factorio.com/get-download/1.1.109/demo/linux64", + "version": "1.1.109" }, "stable": { - "name": "factorio_demo_x64-1.1.107.tar.xz", + "name": "factorio_demo_x64-1.1.109.tar.xz", "needsAuth": false, - "sha256": "0qc36n6h4wcbnj9rnq162bsml4x3ag1dkjmywqz8f4ydaf86gyjw", + "sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.107/demo/linux64", - "version": "1.1.107" + "url": "https://factorio.com/get-download/1.1.109/demo/linux64", + "version": "1.1.109" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.107.tar.xz", + "name": "factorio_headless_x64-1.1.109.tar.xz", "needsAuth": false, - "sha256": "10ds1nz9sbx9xz1lyypf16wncc6323vpm7l5p11d6iy4cha85wsw", + "sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.107/headless/linux64", - "version": "1.1.107" + "url": "https://factorio.com/get-download/1.1.109/headless/linux64", + "version": "1.1.109" }, "stable": { - "name": "factorio_headless_x64-1.1.107.tar.xz", + "name": "factorio_headless_x64-1.1.109.tar.xz", "needsAuth": false, - "sha256": "10ds1nz9sbx9xz1lyypf16wncc6323vpm7l5p11d6iy4cha85wsw", + "sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.107/headless/linux64", - "version": "1.1.107" + "url": "https://factorio.com/get-download/1.1.109/headless/linux64", + "version": "1.1.109" } } } diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 3f6b02ddbb98..d81b2774b4ae 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, wrapQtAppsHook -, freeglut, freealut, libGLU, libGL, libICE, libjpeg, openal, openscenegraph, plib +, libglut, freealut, libGLU, libGL, libICE, libjpeg, openal, openscenegraph, plib , libSM, libunwind, libX11, xorgproto, libXext, libXi , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr , makeDesktopItem, qtbase, qtdeclarative, glew, curl @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ - freeglut freealut libGLU libGL libICE libjpeg openal openscenegraph plib + libglut freealut libGLU libGL libICE libjpeg openal openscenegraph plib libSM libunwind libX11 xorgproto libXext libXi libXmu libXt simgear zlib boost libpng udev fltk13 apr qtbase glew qtdeclarative curl @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; hydraPlatforms = []; # disabled from hydra because it's so big - license = licenses.gpl2; + license = licenses.gpl2Plus; mainProgram = "fgfs"; }; } diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 6ecd9fcdade0..47dfb0840509 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "freeciv"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-ImjXDJ1Bq85OfUhxGe184cd5eu4a8BrZh+YYhzUdrLo="; + hash = "sha256-gneg43RJCf32LUjOHTHlvZxN9RnyJYeXXi6EU3r3mBw="; }; postPatch = '' @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { to the space age... ''; homepage = "http://www.freeciv.org"; # http only - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ pierron ]; platforms = lib.platforms.unix; hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 5db18d9a04c9..5798c61d8000 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Free, open source, turn-based space empire and galactic conquest (4X) computer game"; homepage = "https://www.freeorion.org/"; - license = with licenses; [ gpl2 cc-by-sa-30 ]; + license = with licenses; [ gpl2Only cc-by-sa-30 ]; platforms = platforms.linux; maintainers = with maintainers; [ tex ]; }; diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix index 99130d9d036a..6013f17a03a7 100644 --- a/pkgs/games/freesweep/default.nix +++ b/pkgs/games/freesweep/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Console minesweeper-style game written in C for Unix-like systems"; mainProgram = "freesweep"; homepage = "https://github.com/rwestlund/freesweep"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ kierdavis ]; platforms = platforms.unix; }; diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index 1efdb2ceee04..d5e380588176 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation { glm ]; + env.CXXFLAGS = "-DGLM_ENABLE_EXPERIMENTAL -Wno-error=deprecated-declarations"; + enableParallelBuilding = true; installPhase = '' diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix index 80aa8055dc35..36ca5c2b3cae 100644 --- a/pkgs/games/frotz/default.nix +++ b/pkgs/games/frotz/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { mainProgram = "frotz"; platforms = platforms.unix; maintainers = with maintainers; [ nicknovitski ddelabru ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/games/frozen-bubble/default.nix b/pkgs/games/frozen-bubble/default.nix index 6738f979d00b..72d0be794449 100644 --- a/pkgs/games/frozen-bubble/default.nix +++ b/pkgs/games/frozen-bubble/default.nix @@ -31,7 +31,7 @@ perlPackages.buildPerlModule { meta = { description = "Puzzle with Bubbles"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ puckipedia ]; }; } diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix index 9e56ec4cfccd..5ba29fa49af3 100644 --- a/pkgs/games/gl-117/default.nix +++ b/pkgs/games/gl-117/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, libGLU, libGL, SDL, freeglut, SDL_mixer, autoconf, automake, libtool +, libGLU, libGL, SDL, libglut, SDL_mixer, autoconf, automake, libtool }: stdenv.mkDerivation rec { @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automake autoconf ]; - buildInputs = [ libGLU libGL SDL freeglut SDL_mixer libtool ]; + buildInputs = [ libGLU libGL SDL libglut SDL_mixer libtool ]; meta = with lib; { description = "Air combat simulator"; mainProgram = "gl-117"; homepage = "https://sourceforge.net/projects/gl-117"; maintainers = with maintainers; [ raskin ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/games/gl-gsync-demo/default.nix b/pkgs/games/gl-gsync-demo/default.nix index a776a1b13dff..8ea4facb77b7 100644 --- a/pkgs/games/gl-gsync-demo/default.nix +++ b/pkgs/games/gl-gsync-demo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, freeglut, glew, libXNVCtrl, libXext, lib }: +{ stdenv, fetchFromGitHub, libX11, libglut, glew, libXNVCtrl, libXext, lib }: stdenv.mkDerivation rec { pname = "gl-gsync-demo"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1innsmpsd9n9ih80v16rhj2ijrl28jd7x6a4jmxdirba7mjibm8d"; }; - buildInputs = [ libX11 freeglut glew libXNVCtrl libXext ]; + buildInputs = [ libX11 libglut glew libXNVCtrl libXext ]; installPhase = '' runHook preInstall diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 453cbfedba94..c4a3614edd6a 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonApplication, fetchFromGitHub , gtk3, wrapGAppsHook3, gst_all_1, gobject-introspection -, python3Packages, gnome }: +, python3Packages, adwaita-icon-theme }: buildPythonApplication { pname = "gscrabble"; @@ -19,7 +19,7 @@ buildPythonApplication { buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - gnome.adwaita-icon-theme gtk3 + adwaita-icon-theme gtk3 ]; propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 ]; diff --git a/pkgs/games/gtetrinet/default.nix b/pkgs/games/gtetrinet/default.nix deleted file mode 100644 index 58ac8b2d77cc..000000000000 --- a/pkgs/games/gtetrinet/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ fetchFromGitHub, lib, stdenv, autoreconfHook, intltool, pkg-config, libgnome, libgnomeui, GConf }: - -stdenv.mkDerivation { - pname = "gtetrinet"; - version = "0.7.11"; - - src = fetchFromGitHub { - owner = "GNOME"; - repo = "gtetrinet"; - rev = "6be3df83f3dc5c7cb966e6cd447182df01b93222"; - sha256 = "1y05x8lfyxvkjg6c87cfd0xxmb22c88scx8fq3gah7hjy5i42v93"; - }; - - nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; - - buildInputs = [ libgnome libgnomeui ]; - - propagatedUserEnvPkgs = [ GConf ]; - - postAutoreconf = '' - intltoolize --force - ''; - - preInstall = '' - export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 - ''; - - postInstall = '' - mv "$out/games" "$out/bin" - ''; - - enableParallelBuilding = true; - - meta = { - description = "Client for Tetrinet, a multiplayer online Tetris game"; - mainProgram = "gtetrinet"; - longDescription = '' - GTetrinet is a client program for Tetrinet, a multiplayer tetris game - that is played over the internet. - ''; - homepage = "https://gtetrinet.sourceforge.net/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.chris-martin ]; - }; -} diff --git a/pkgs/games/gweled/default.nix b/pkgs/games/gweled/default.nix index b27da3b2f7c4..1add66074204 100644 --- a/pkgs/games/gweled/default.nix +++ b/pkgs/games/gweled/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Bejeweled clone game"; mainProgram = "gweled"; homepage = "https://gweled.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index ed800f9afb06..a74ef62a77b1 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, haskell, ffmpeg_4, freeglut +{ stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, haskell, ffmpeg_4, libglut , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools, wrapQtAppsHook @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image_2_6 fpc lua5_1 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 - ffmpeg_4 freeglut physfs + ffmpeg_4 libglut physfs qtbase ] ++ lib.optional withServer ghc; @@ -51,13 +51,13 @@ stdenv.mkDerivation rec { ]; qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libGLU freeglut physfs ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libGLU libglut physfs ]}" ]; meta = with lib; { description = "Turn-based strategy artillery game similar to Worms"; homepage = "https://hedgewars.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; longDescription = '' Each player controls a team of several hedgehogs. During the course of the game, players take turns with one of their hedgehogs. They then use diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix index 24f7c96bc9f9..2d1b8f079d2f 100644 --- a/pkgs/games/heroic/fhsenv.nix +++ b/pkgs/games/heroic/fhsenv.nix @@ -20,7 +20,7 @@ buildFHSEnv { gamemode curl gawk - gnome.zenity + zenity plasma5Packages.kdialog mangohud nettools diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index f17e09a7ff4a..04a6027f1c97 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { description = "A roguelike game set in hyperbolic geometry"; mainProgram = "hyperrogue"; maintainers = with maintainers; [ rardiol ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; }; } diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index cafdd2b84f0d..9a68983dc204 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple text adventure interpreter for Unix and Windows"; homepage = "https://instead.syscall.ru/"; - license = lib.licenses.gpl2; + license = lib.licenses.mit; platforms = with lib.platforms; linux; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index a633430ee673..6bbe30ce4d30 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -53,11 +53,9 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (backend == "cuda") [ cudaPackages.cudnn cudaPackages.cudatoolkit - mesa.drivers ] ++ lib.optionals (backend == "tensorrt") [ cudaPackages.cudatoolkit cudaPackages.tensorrt - mesa.drivers ] ++ lib.optionals (backend == "opencl") [ opencl-headers ocl-icd diff --git a/pkgs/games/keeperrl/default.nix b/pkgs/games/keeperrl/default.nix index 262702c22333..616432596a4d 100644 --- a/pkgs/games/keeperrl/default.nix +++ b/pkgs/games/keeperrl/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { description = "Dungeon management rogue-like"; mainProgram = "keeper"; homepage = "https://keeperrl.com/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ onny ]; # TODO: Add OS X platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/games/koboredux/default.nix b/pkgs/games/koboredux/default.nix index cab22ce44034..178b592436b9 100644 --- a/pkgs/games/koboredux/default.nix +++ b/pkgs/games/koboredux/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { For the full experience, consider installing "koboredux" instead. ''; homepage = "https://olofson.itch.io/kobo-redux"; - license = with licenses; if useProprietaryAssets then unfree else gpl2; + license = with licenses; if useProprietaryAssets then unfree else gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; }; diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix index 0d81f7b3e610..47968c8c2ba4 100644 --- a/pkgs/games/liberal-crime-squad/default.nix +++ b/pkgs/games/liberal-crime-squad/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { homepage = "https://github.com/Kamal-Sadek/Liberal-Crime-Squad"; maintainers = [ maintainers.rardiol ]; mainProgram = "crimesquad"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; }; } diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index 2bf4e9c6f8f8..ce3115d66de9 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation { meta = with lib; { description = "City building game"; mainProgram = "lincity-ng"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; diff --git a/pkgs/games/linthesia/default.nix b/pkgs/games/linthesia/default.nix index c13bbec0ecfd..8bb0f795a823 100644 --- a/pkgs/games/linthesia/default.nix +++ b/pkgs/games/linthesia/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/manaplus/default.nix b/pkgs/games/manaplus/default.nix index 974564a4d5e3..deb12d45ad4b 100644 --- a/pkgs/games/manaplus/default.nix +++ b/pkgs/games/manaplus/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { maintainers = [ ]; description = "Free OpenSource 2D MMORPG client"; homepage = "https://manaplus.org/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index b069e3fecc46..0bd6026e32d6 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -8,15 +8,16 @@ , ninja , pkg-config , fetchFromGitHub +, fetchpatch }: stdenv.mkDerivation rec { pname = "MAR1D"; - version = "0.3.1"; + version = "unstable-2023-02-02"; src = fetchFromGitHub { - sha256 = "sha256-c48azBGdnzhEQGUeRJWlNLJhtrYjnpiORuWvowcQK5Y="; - rev = "v${version}"; + hash = "sha256-kZERhwnTpBhjx6MLdf1bYCWMjtTiId/5a69kRt+/6oY="; + rev = "fa5dc36e1819a15539ced339ad01672e5a498c5c"; repo = "MAR1D"; owner = "Radvendii"; }; @@ -30,6 +31,15 @@ stdenv.mkDerivation rec { libGLU ]; + patches = [ + # Fix the build on Darwin. + # https://github.com/Radvendii/MAR1D/pull/4 + (fetchpatch { + url = "https://github.com/Radvendii/MAR1D/commit/baf3269e90eca69f154a43c4c1ef14677a6300fd.patch"; + hash = "sha256-ybdLA2sO8e0J7w4roSdMWn72OkttD3y+cJ3ScuGiHCI="; + }) + ]; + meta = with lib; { description = "First person Super Mario Bros"; mainProgram = "MAR1D"; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 2a914c941226..3e720aaf9fa4 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc , libjpeg, wxGTK32, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng -, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib +, fontconfig, freetype, xorg, makeWrapper, bash, which, zenity, libGLU, glib , fetchFromGitHub, fetchpatch }: let @@ -13,7 +13,7 @@ let }; path-env = buildEnv { name = "megaglest-path-env"; - paths = [ bash which gnome.zenity ]; + paths = [ bash which zenity ]; }; in stdenv.mkDerivation { diff --git a/pkgs/games/methane/default.nix b/pkgs/games/methane/default.nix index d1e4bb03409d..b3c8fbf34a4b 100644 --- a/pkgs/games/methane/default.nix +++ b/pkgs/games/methane/default.nix @@ -7,7 +7,7 @@ , SDL2_mixer , fontconfig , freealut -, freeglut +, libglut , gettext , libGL , libGLU @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { SDL2_mixer fontconfig freealut - freeglut + libglut libGL libGLU openal diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 49ce37cc4b57..8489d32a8ed7 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl +, fetchpatch , makeWrapper , makeDesktopItem , copyDesktopItems @@ -82,6 +83,19 @@ let patches = [ ./0001-fix-include-path-for-SDL2-on-linux.patch + # Fix build with gradle 8.8, remove on next Arc release + (fetchpatch { + url = "https://github.com/Anuken/Arc/commit/2a91c51bf45d700091e397fd0b62384763901ae6.patch"; + hash = "sha256-sSD78GmF14vBvNe+ajUJ4uIc4p857shTP/UkAK6Pyyg="; + extraPrefix = "Arc/"; + stripLen = 1; + }) + (fetchpatch { + url = "https://github.com/Anuken/Arc/commit/d7f8ea858c425410dbd43374271a703d4443b432.patch"; + hash = "sha256-5LPgBOV0r/dUtpyxitTu3/9tMIqjeIKfGVJi3MEr7fQ="; + extraPrefix = "Arc/"; + stripLen = 1; + }) ]; unpackPhase = '' diff --git a/pkgs/games/minecraft-servers/derivation.nix b/pkgs/games/minecraft-servers/derivation.nix index a1b03a0a3b36..68c9fd35f76a 100644 --- a/pkgs/games/minecraft-servers/derivation.nix +++ b/pkgs/games/minecraft-servers/derivation.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { makeWrapper ${lib.getExe jre_headless} $out/bin/minecraft-server \ --append-flags "-jar $out/lib/minecraft/server.jar nogui" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} + ${lib.optionalString stdenv.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}"} runHook postInstall ''; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 070cf908fa55..302e989a6570 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -34,6 +34,7 @@ , libX11 , ninja , prometheus-cpp +, mesa , OpenGL , OpenAL ? openal , Carbon @@ -95,7 +96,8 @@ stdenv.mkDerivation (finalAttrs: { gmp libspatialindex ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + mesa # for libiconv OpenGL OpenAL @@ -108,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: { openal libogg libvorbis + ] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin) [ xorg.libX11 ] ++ lib.optionals buildServer [ leveldb diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix index 6941beb248f1..0da9248b2237 100644 --- a/pkgs/games/moon-buggy/default.nix +++ b/pkgs/games/moon-buggy/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple character graphics game where you drive some kind of car across the moon's surface"; mainProgram = "moon-buggy"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.rybern ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; homepage = "https://www.seehuhn.de/pages/moon-buggy"; diff --git a/pkgs/games/netris/default.nix b/pkgs/games/netris/default.nix index e161f2ea25b8..583d6efa58fe 100644 --- a/pkgs/games/netris/default.nix +++ b/pkgs/games/netris/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Free networked version of T*tris"; mainProgram = "netris"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ patryk27 ]; platforms = platforms.linux; }; diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index c9ed0ca0dbc5..62d553f402f6 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , makeWrapper -, freeglut +, libglut , libGLU , libGL }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ freeglut libGL libGLU ]; + buildInputs = [ libglut libGL libGLU ]; patchPhase = '' sed -i "s;font24.raw;$out/share/font24.raw;g" display.c @@ -33,7 +33,7 @@ stdenv.mkDerivation { cp font24.raw $out/share wrapProgram $out/bin/nw \ - --prefix LD_LIBRARY_PATH ":" ${freeglut}/lib \ + --prefix LD_LIBRARY_PATH ":" ${libglut}/lib \ --prefix LD_LIBRARY_PATH ":" ${libGLU}/lib \ --prefix LD_LIBRARY_PATH ":" ${libGL}/lib ''; diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index e8af5d43e2de..8a178d475ee5 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -87,7 +87,7 @@ in stdenv.mkDerivation { meta = { description = "Free fast-paced first-person shooter"; homepage = "http://www.alientrap.org/games/nexuiz"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/ninvaders/default.nix b/pkgs/games/ninvaders/default.nix index 5fe9eb81be61..089fa5478a0d 100644 --- a/pkgs/games/ninvaders/default.nix +++ b/pkgs/games/ninvaders/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Space Invaders clone based on ncurses"; mainProgram = "ninvaders"; homepage = "https://ninvaders.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ _1000101 ]; platforms = platforms.all; }; diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index 6df2a5b7a206..a7c5fa3d02b1 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Dune, Reinvented"; mainProgram = "opendune"; homepage = "https://github.com/OpenDUNE/OpenDUNE"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index 58cbb1e21273..f1eb4b597ab8 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -86,7 +86,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Open-source engine for Star Wars Jedi Academy game"; homepage = "https://github.com/JACoders/OpenJK"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ tgunnoe ]; }; diff --git a/pkgs/games/openra_2019/common.nix b/pkgs/games/openra_2019/common.nix index 091b56b3d141..f04f0cf5078a 100644 --- a/pkgs/games/openra_2019/common.nix +++ b/pkgs/games/openra_2019/common.nix @@ -4,6 +4,8 @@ { lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper , lua, mono, python3 , libGL, freetype, openal, SDL2 +# It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, +# rather than having to look to the logs why it is not starting. , zenity }: diff --git a/pkgs/games/openra_2019/default.nix b/pkgs/games/openra_2019/default.nix index 0bcf71cd87f1..97cdb4335d2c 100644 --- a/pkgs/games/openra_2019/default.nix +++ b/pkgs/games/openra_2019/default.nix @@ -24,9 +24,6 @@ let fArgs = lib.functionArgs f; in f (builtins.intersectAttrs fArgs pkgs // { lua = pkgs.lua5_1; - # It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, - # rather than having to look to the logs why it is not starting. - inherit (pkgs.gnome) zenity; }); /* Building a set of engines or mods requires some dependencies as well, diff --git a/pkgs/games/openra_2019/packages.nix b/pkgs/games/openra_2019/packages.nix index 5ee78fe2b8ff..a88bfd14e2e3 100644 --- a/pkgs/games/openra_2019/packages.nix +++ b/pkgs/games/openra_2019/packages.nix @@ -13,9 +13,6 @@ let */ common = let f = import ./common.nix; in f (builtins.intersectAttrs (builtins.functionArgs f) pkgs // { lua = pkgs.lua5_1; - # It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, - # rather than having to look to the logs why it is not starting. - inherit (pkgs.gnome) zenity; }); /* Building a set of engines or mods requires some dependencies as well, diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 268cead62dc4..9276e094853d 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.openttd.org/"; changelog = "https://cdn.openttd.org/openttd-releases/${version}/changelog.txt"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ jcumming fpletz ]; }; diff --git a/pkgs/games/openttd/grfcodec.nix b/pkgs/games/openttd/grfcodec.nix index 544cf4f06c43..af4e31537463 100644 --- a/pkgs/games/openttd/grfcodec.nix +++ b/pkgs/games/openttd/grfcodec.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Low-level (dis)assembler and linter for OpenTTD GRF files"; homepage = "http://openttd.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ToxicFrog ]; }; } diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix index 65dddce236e3..b1ec87d8fdb3 100644 --- a/pkgs/games/openttd/nml.nix +++ b/pkgs/games/openttd/nml.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "http://openttdcoop.org/"; description = "Compiler for OpenTTD NML files"; mainProgram = "nmlc"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ToxicFrog ]; }; } diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index a6081ca2c3f8..f5a1ef79e0f4 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -35,7 +35,7 @@ let unfreeRedistributable # osu-framework contains libbass.so in repository ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ delan gepbird spacefault stepbrobd ]; + maintainers = with lib.maintainers; [ gepbird stepbrobd ]; mainProgram = "osu!"; platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 29d5c6b85203..037b307c6df3 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,6 +1,8 @@ +let + versions = builtins.fromJSON (builtins.readFile ./versions.json); +in { callPackage, lib, ... }: let - versions = lib.importJSON ./versions.json; latestVersion = lib.last (builtins.sort lib.versionOlder (builtins.attrNames versions)); escapeVersion = builtins.replaceStrings [ "." ] [ "_" ]; packages = lib.mapAttrs' diff --git a/pkgs/games/papermc/derivation.nix b/pkgs/games/papermc/derivation.nix index 299248a64d08..5dd169dbc9b4 100644 --- a/pkgs/games/papermc/derivation.nix +++ b/pkgs/games/papermc/derivation.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe jre} "$out/bin/minecraft-server" \ --append-flags "-jar $out/share/papermc/papermc.jar nogui" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} + ${lib.optionalString stdenvNoCC.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}"} runHook postInstall ''; diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json index 47732fd05b71..51bdf49551f7 100644 --- a/pkgs/games/papermc/versions.json +++ b/pkgs/games/papermc/versions.json @@ -52,11 +52,11 @@ "version": "1.20.5-22" }, "1.20.6": { - "hash": "sha256-JMWN40FTFg87RmxwyUr87Js9KyCmaBhj6Dnfe3vblZQ=", - "version": "1.20.6-147" + "hash": "sha256-u9adg4SOJb3w7LBAzJiiJj2V7WbjvVEoqMhVL3v5lL0=", + "version": "1.20.6-148" }, "1.21": { - "hash": "sha256-Anh09jDs+peSU79+jtETFMADt5N3K82QNwru7U0nyHU=", - "version": "1.21-37" + "hash": "sha256-7gHWhy/nlRc1I5LGN1grIAPaVxT8xJST2+I86xSGSc8=", + "version": "1.21-40" } } diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index 98dbbb693ba8..9c688a37d263 100644 --- a/pkgs/games/qgo/default.nix +++ b/pkgs/games/qgo/default.nix @@ -27,7 +27,7 @@ mkDerivation { Chinese, "囲碁(Yi Go)" in Japanese, "바둑(Baduk)" in Korean. ''; homepage = "https://github.com/pzorin/qgo"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ zalakain ]; }; diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix index 95764a767aa7..185b1c7a6886 100644 --- a/pkgs/games/qqwing/default.nix +++ b/pkgs/games/qqwing/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://qqwing.com"; description = "Sudoku generating and solving software"; mainProgram = "qqwing"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index b37c4f5e6a0e..edfcfccade25 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -69,7 +69,7 @@ let meta = with lib; { description = "Yamagi Quake II client"; homepage = "https://www.yamagi.org/quake2/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ tadfisher ]; }; diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index 1ad03d494ab0..81dd202dc543 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/ec-/Quake3e"; description = "Improved Quake III Arena engine"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ pmiddend ]; }; diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/games/quantumminigolf/default.nix index 803529b7f638..c91fb8b28c53 100644 --- a/pkgs/games/quantumminigolf/default.nix +++ b/pkgs/games/quantumminigolf/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Quantum mechanics-based minigolf-like game"; mainProgram = "quantumminigolf"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; # never built on aarch64-linux since first introduction in nixpkgs diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix index 1dfeaf3c3a89..70093d7589b1 100644 --- a/pkgs/games/rftg/default.nix +++ b/pkgs/games/rftg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://keldon.net/rftg/"; description = "Implementation of the card game Race for the Galaxy, including an AI"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.falsifian ]; }; diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index 2803ca5d18cf..4aa70ffa5334 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "Scrolling tile-based arcade style puzzle game"; mainProgram = "rocksndiamonds"; homepage = "https://www.artsoft.org/rocksndiamonds/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; }; diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 031cd81f13d5..22db910b30d2 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -25,7 +25,7 @@ mavenJdk17.buildMavenPackage rec { rev = version; hash = "sha256-7T9n23qMl4IJQL7yWLXKvRzYcMeXDUwkY8MBFc2t3Rw="; }; - mvnHash = "sha256-bsJlsIXIIVzZyVgEF/SN+GgpZt6v0u800arO1c5QYHk="; + mvnHash = "sha256-FpfHtGIfo84z6v9/nzc47+JeIM43MR9mWhVOPSi0xhM="; desktop = makeDesktopItem { name = "RuneLite"; diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index 0a071237bee7..d46f077a25b7 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -43,7 +43,7 @@ tcl.mkTclDerivation rec { meta = with lib; { description = "Chess database with play and training functionality"; homepage = "https://scidvspc.sourceforge.net/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ maintainers.paraseba ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix index 576e6dc36772..c4dcef454b8b 100644 --- a/pkgs/games/scid/default.nix +++ b/pkgs/games/scid/default.nix @@ -49,7 +49,7 @@ tcl.mkTclDerivation rec { description = "Chess database with play and training functionality"; maintainers = with lib.maintainers; [ agbrooks ]; homepage = "https://scid.sourceforge.net/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.all; }; } diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 6a700c7ed00c..2252146679b2 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)"; mainProgram = "scummvm"; homepage = "https://www.scummvm.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.peterhoeg ]; platforms = platforms.unix; }; diff --git a/pkgs/games/sfrotz/default.nix b/pkgs/games/sfrotz/default.nix index 1282e4d7258e..2514374cf05a 100644 --- a/pkgs/games/sfrotz/default.nix +++ b/pkgs/games/sfrotz/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://davidgriffith.gitlab.io/frotz/"; changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${version}/NEWS"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ddelabru ]; platforms = platforms.linux; }; diff --git a/pkgs/games/shipwright/default.nix b/pkgs/games/shipwright/default.nix index 5b6c422a6ff9..2ee250a703f4 100644 --- a/pkgs/games/shipwright/default.nix +++ b/pkgs/games/shipwright/default.nix @@ -22,7 +22,7 @@ , libpulseaudio , libpng , imagemagick -, gnome +, zenity , makeWrapper , darwin , libicns @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { libXi libXext libpulseaudio - gnome.zenity + zenity ] ++ lib.optionals stdenv.isDarwin [ IOSurface Metal @@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: { ''; fixupPhase = lib.optionalString stdenv.isLinux '' - wrapProgram $out/lib/soh.elf --prefix PATH ":" ${lib.makeBinPath [ gnome.zenity ]} + wrapProgram $out/lib/soh.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]} ''; desktopItems = [ diff --git a/pkgs/games/sil-q/default.nix b/pkgs/games/sil-q/default.nix index 9a52a05db93f..796ab12e2ea9 100644 --- a/pkgs/games/sil-q/default.nix +++ b/pkgs/games/sil-q/default.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { A fork of Sil that's still actively developed. ''; homepage = "https://github.com/sil-quirk/sil-q"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.kenran ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix index e8f88074b66d..f50fc358efe2 100644 --- a/pkgs/games/sil/default.nix +++ b/pkgs/games/sil/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { Silmaril from Morgoth’s iron crown. ''; homepage = "http://www.amirrorclear.net/flowers/game/sil/index.html"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ michaelpj kenran ]; platforms = lib.platforms.linux; mainProgram = "sil"; diff --git a/pkgs/games/snis/default.nix b/pkgs/games/snis/default.nix index b74fef451820..2b1d168467cf 100644 --- a/pkgs/games/snis/default.nix +++ b/pkgs/games/snis/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { 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.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ alyaeanyx ]; platforms = platforms.linux; }; diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix index fd80b03066ce..b59c20c2b322 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -22,6 +22,10 @@ mkDerivation rec { openal libmodplug libvorbis qtbase glm ]; + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DGLM_ENABLE_EXPERIMENTAL") + ]; + preFixup = '' mkdir $lib/ mv $out/lib $lib diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/games/space-orbit/default.nix index 4e3e044bbbfe..74db273bb879 100644 --- a/pkgs/games/space-orbit/default.nix +++ b/pkgs/games/space-orbit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, libGLU, libGL, libXi, libXt, libXext, libX11, libXmu, freeglut +, libGLU, libGL, libXi, libXt, libXext, libX11, libXmu, libglut }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.01"; patchversion = "9"; - buildInputs = [ libGLU libGL libXi libXt libXext libX11 libXmu freeglut ]; + buildInputs = [ libGLU libGL libXi libXt libXext libX11 libXmu libglut ]; src = fetchurl { url = "mirror://debian/pool/main/s/space-orbit/space-orbit_${version}.orig.tar.gz"; @@ -41,7 +41,7 @@ EOF broken = stdenv.isDarwin; description = "Space combat simulator"; mainProgram = "space-orbit"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; }; } diff --git a/pkgs/games/space-station-14-launcher/deps.nix b/pkgs/games/space-station-14-launcher/deps.nix index 239bc10b3b09..0c439f953d36 100644 --- a/pkgs/games/space-station-14-launcher/deps.nix +++ b/pkgs/games/space-station-14-launcher/deps.nix @@ -28,6 +28,9 @@ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0-eap3"; sha256 = "12fkafmx2h1h4av04lc5d8x4v3vw3pnva5vw872r3w8w6ws85r5k"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18.2"; sha256 = "02xd4phd6wfixhdq48ma92c166absqw41vdq5kvjch8p0vc9cdl2"; }) + (fetchNuGet { pname = "Linguini.Bundle"; version = "0.8.1"; sha256 = "1p7nn56yd4v4rx5k3x352vdsbvkvyn9lb1739dj111z3jpmw2aja"; }) + (fetchNuGet { pname = "Linguini.Shared"; version = "0.8.0"; sha256 = "08q0p5wz6lf7ab7m18yj5wvwks10c9v3d83f6262wbvkmnms0w06"; }) + (fetchNuGet { pname = "Linguini.Syntax"; version = "0.8.0"; sha256 = "0gfl8j9kdjxgz0iaxs35y801pxflk50kzlf0qq4z42jmh9swi4y7"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index be4a50034b91..cde4cee0384a 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -31,7 +31,7 @@ , gdk-pixbuf }: let - version = "0.27.2"; + version = "0.28.0"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -44,7 +44,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; rev = "v${version}"; - hash = "sha256-r+nNZ2xkHMp8bmNNqbf4WnmGP3SIxCtHUCfGxfydTH4="; + hash = "sha256-mBFTXwnxijXAP6i7DNQ/3bujualysCGjDDjmhe15s4I="; fetchSubmodules = true; }; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index bdfc68f837d1..f81c2f7f2f34 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libGLU, libGL, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, +{ fetchurl, lib, stdenv, libGLU, libGL, libglut, libX11, plib, openal, freealut, libXrandr, xorgproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, libpng, zlib, bash, SDL2, SDL2_mixer, enet, libjpeg, cmake, pkg-config, libvorbis, runtimeShell, curl, copyDesktopItems, makeDesktopItem }: @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake copyDesktopItems ]; - buildInputs = [ libpng libGLU libGL freeglut libX11 plib openal freealut libXrandr xorgproto + buildInputs = [ libpng libGLU libGL libglut libX11 plib openal freealut libXrandr xorgproto libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat SDL2 SDL2_mixer enet libjpeg openscenegraph libvorbis curl ]; diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/games/steam-tui/default.nix index 769553a69422..7a42404500bd 100644 --- a/pkgs/games/steam-tui/default.nix +++ b/pkgs/games/steam-tui/default.nix @@ -1,28 +1,35 @@ -{ lib -, rustPlatform -, steamcmd -, fetchFromGitHub -, steam-run -, runtimeShell -, withWine ? false -, wine +{ + lib, + rustPlatform, + steamcmd, + fetchFromGitHub, + steam-run, + openssl, + pkg-config, + runtimeShell, + withWine ? false, + wine, }: rustPlatform.buildRustPackage rec { pname = "steam-tui"; - version = "0.1.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "dmadisetti"; repo = pname; rev = version; - sha256 = "sha256-UTXYlPecv0MVonr9zZwfwopfC/Fdch/ZSCxqgUsem40="; + sha256 = "sha256-3vBIpPIsh+7PjTuNNqp7e/pdciOYnzuGkjb/Eks6QJw="; }; - cargoSha256 = "sha256-VYBzwDLSV4N4qt2dNgIS399T2HIbPTdQ2rDIeheLlfo="; + cargoSha256 = "sha256-poNPdrMguV79cwo2Eq1dGVUN0E4yG84Q63kU9o+eABo="; - buildInputs = [ steamcmd ] - ++ lib.optional withWine wine; + nativeBuildInputs = [ + openssl + pkg-config + ]; + + buildInputs = [ steamcmd ] ++ lib.optional withWine wine; preFixup = '' mv $out/bin/steam-tui $out/bin/.steam-tui-unwrapped @@ -34,11 +41,18 @@ rustPlatform.buildRustPackage rec { chmod +x $out/bin/steam-tui ''; + checkFlags = [ "--skip=impure" ]; + + PKG_CONFIG_PATH = "${openssl.dev}/lib/pkgconfig"; + meta = with lib; { description = "Rust TUI client for steamcmd"; homepage = "https://github.com/dmadisetti/steam-tui"; license = licenses.mit; - maintainers = with maintainers; [ lom ]; + maintainers = with maintainers; [ + lom + dmadisetti + ]; # steam only supports that platform platforms = [ "x86_64-linux" ]; mainProgram = "steam-tui"; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index a2157da80d6b..8b504b6c55b6 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -83,7 +83,7 @@ in buildFHSEnv rec { targetPkgs = pkgs: with pkgs; [ steam # License agreement - gnome.zenity + zenity ] ++ commonTargetPkgs pkgs; multiPkgs = pkgs: with pkgs; [ @@ -162,7 +162,7 @@ in buildFHSEnv rec { gtk2 bzip2 flac - freeglut + libglut libjpeg libpng libpng12 diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index 857617bc4bfa..3f4031b3b71a 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Classic 2D jump'n run sidescroller game"; homepage = "https://supertux.github.io/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; mainProgram = "supertux2"; diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index e589018eddef..fcfa6f1d14ae 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -35,6 +35,6 @@ mkDerivation rec { homepage = "http://the-butterfly-effect.org/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; }; } diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix index a10c35f96796..982e6038592d 100644 --- a/pkgs/games/tinyfugue/default.nix +++ b/pkgs/games/tinyfugue/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { TinyFugue, aka "tf", is a flexible, screen-oriented MUD client, for use with any type of text MUD. ''; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.KibaFox ]; }; diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 9c712ae41a43..46831a503324 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,4 +1,4 @@ -{ fetchpatch, fetchurl, lib, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, +{ fetchpatch, fetchurl, lib, stdenv, libGLU, libglut, libX11, plib, openal, freealut, libXrandr, xorgproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libpng, zlib, makeWrapper }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ libGLU freeglut libX11 plib openal freealut libXrandr xorgproto + buildInputs = [ libGLU libglut libX11 plib openal freealut libXrandr xorgproto libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis ]; installTargets = "install datainstall"; diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 3e8862f66e3a..4ea3dd6200e5 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { description = "Fast-paced single-player racing game"; mainProgram = "trigger-rally"; homepage = "http://trigger-rally.sourceforge.net/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; }; diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 8b9881a68a8a..088f6803fbcb 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Curses based typing game"; mainProgram = "typespeed"; homepage = "https://typespeed.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.auntie ]; }; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index f81a48af2a67..eb5fabf47dfa 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -103,7 +103,7 @@ in stdenv.mkDerivation rec { spin-offs, thereby making zillions more people happy! ''; homepage = "https://sc2.sourceforge.net/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ jcumming aszlig ]; platforms = with lib.platforms; linux; }; diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index 6b52194ffcae..2e3a96a08651 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { description = "Ballistics turn-based battle game between teams - unofficial copy"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; - license = with licenses; [ gpl2 ufl ]; + license = with licenses; [ gpl2Plus ufl ]; homepage = "https://github.com/fluxer/warmux"; }; } diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 285058ffc5fa..01dd8ceaca17 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - hash = "sha256-IZ3/06MVJGNNSjj9UJ5EWRuzu4baJs3ruYarWTRuGnw="; + hash = "sha256-nr+WUFzHeaPxCzwc+8JZRL86X8XEsnsGM1HXnNqOIF0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/games/wireworld/default.nix b/pkgs/games/wireworld/default.nix index 14a7310e7a97..a7f0e9f37bc8 100644 --- a/pkgs/games/wireworld/default.nix +++ b/pkgs/games/wireworld/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { cc-by-sa-40 ]; downloadPage = "https://ldjam.com/events/ludum-dare/53/wireworld"; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 123e296f5e0a..a54cea0ae9f9 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { helpMsg = '' We cannot download the full version automatically, as you require a license. Once you have bought a license, you need to add your downloaded version to the nix store. - You can do this by using "nix-prefetch-url file://\$PWD/${pname}.Linux${version}.sh" + You can do this by using "nix-prefetch-url file://\$PWD/${pname}.Linux.${version}.sh" in the directory where you saved it. ''; diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix index 4c4f441964dd..345ddbcad49b 100644 --- a/pkgs/games/xconq/default.nix +++ b/pkgs/games/xconq/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { description = "Programmable turn-based strategy game"; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/games/xjump/default.nix b/pkgs/games/xjump/default.nix index 93f999bce270..4d7e9fe71759 100644 --- a/pkgs/games/xjump/default.nix +++ b/pkgs/games/xjump/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Falling tower game"; mainProgram = "xjump"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ pmeunier ]; }; } diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 60eb1189391d..c3356cc254e4 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -66,8 +66,8 @@ let nativeBuildInputs = [ unzip ]; buildInputs = [ libjpeg zlib libvorbis curl gmp ] - ++ lib.optionals withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ] - ++ lib.optionals withSDL [ SDL2.dev ]; + ++ lib.optionals withGLX [ libX11 libGLU libGL libXpm libXext libXxf86vm alsa-lib ] + ++ lib.optionals withSDL [ SDL2 ]; sourceRoot = "Xonotic/source/darkplaces"; diff --git a/pkgs/games/xtris/default.nix b/pkgs/games/xtris/default.nix index 25c93df7ff4b..b9492ad11eda 100644 --- a/pkgs/games/xtris/default.nix +++ b/pkgs/games/xtris/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multi-player version of the classical game of Tetris, for the X Window system"; homepage = "https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris.html"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; }; } diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix index a05705b43fe8..b71c82f4b2f7 100644 --- a/pkgs/kde/gear/akonadi-search/default.nix +++ b/pkgs/kde/gear/akonadi-search/default.nix @@ -7,7 +7,7 @@ cargo, rustc, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-fSue83tCE1TqaEfp1dxlRblxzJQUTNIQMYA5fXcaDqc=", + cargoHash ? "sha256-po8ykNdP0+8gVUcebxqpo+p3Jm4DzZlskmgfBwzVc5s=", }: mkKdeDerivation rec { pname = "akonadi-search"; diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index ebf61e122d9b..140bba4a1a0e 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/pkgs/kde/gear/angelfish/default.nix @@ -8,7 +8,7 @@ cargo, rustc, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-Y0aG8NgiDTbDYgh8hMxfwSCHFh8f7PGABxw10m07dgs=", + cargoHash ? "sha256-GHXZKP4K5+ii2RyG9phllRSms4gRAl7kbFUyTUO59s0=", qcoro, }: mkKdeDerivation rec { diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix index fe5f7e4c13b1..059ed9456f18 100644 --- a/pkgs/kde/gear/kdenlive/default.nix +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -11,7 +11,7 @@ shared-mime-info, libv4l, frei0r, - fetchpatch, + glaxnimate, }: mkKdeDerivation { pname = "kdenlive"; @@ -20,17 +20,10 @@ mkKdeDerivation { ( substituteAll { src = ./dependency-paths.patch; - inherit mediainfo mlt; + inherit mediainfo mlt glaxnimate; ffmpeg = ffmpeg-full; } ) - - # Backport fix for crash after 5 minutes - # FIXME: remove in next release - (fetchpatch { - url = "https://invent.kde.org/multimedia/kdenlive/-/commit/8be0e826471332bb739344ebe1859298c46e9e0f.patch"; - hash = "sha256-5hLePH5NlO4Lx8lg9kjBPI4jTmP666RGplaVCmS/9TA="; - }) ]; extraBuildInputs = [ @@ -43,6 +36,7 @@ mkKdeDerivation { mlt shared-mime-info libv4l + glaxnimate ]; qtWrapperArgs = [ diff --git a/pkgs/kde/gear/kdenlive/dependency-paths.patch b/pkgs/kde/gear/kdenlive/dependency-paths.patch index 7fd04bd5114d..4faaf6135617 100644 --- a/pkgs/kde/gear/kdenlive/dependency-paths.patch +++ b/pkgs/kde/gear/kdenlive/dependency-paths.patch @@ -1,6 +1,5 @@ -diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg -index 029849e5f..8befe4888 100644 ---- a/src/kdenlivesettings.kcfg +diff -u b/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg +--- b/src/kdenlivesettings.kcfg +++ b/src/kdenlivesettings.kcfg @@ -517,7 +517,7 @@ @@ -44,3 +43,10 @@ index 029849e5f..8befe4888 100644 +@@ -657,5 +657,5 @@ + + +- ++ @glaxnimate@/bin/glaxnimate + + diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix index a11c50f9df1f..20dfeeeba33d 100644 --- a/pkgs/kde/gear/kdepim-addons/default.nix +++ b/pkgs/kde/gear/kdepim-addons/default.nix @@ -8,7 +8,7 @@ corrosion, alpaka, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-uFQhxNpH9KG5+27EZNBwDX2sswd1nI86bESeeOnPXA4=", + cargoHash ? "sha256-NygCWuhwODsmUxwsMZNChVYUMI7Ryu+0MxBIsZaelC8=", }: mkKdeDerivation rec { pname = "kdepim-addons"; diff --git a/pkgs/kde/generated/sources/gear.json b/pkgs/kde/generated/sources/gear.json index 9ac2e3702e01..9fbad79485e1 100644 --- a/pkgs/kde/generated/sources/gear.json +++ b/pkgs/kde/generated/sources/gear.json @@ -1,1252 +1,1252 @@ { "accessibility-inspector": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/accessibility-inspector-24.05.1.tar.xz", - "hash": "sha256-CZqzRhbUzv8Pv4NnGjkGjk5/U+wZklGeD9PD57YakXY=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/accessibility-inspector-24.05.2.tar.xz", + "hash": "sha256-1fd9wPGzO8koCXgpatIfxnZC0jTYzP5/nnJVqP86ULU=" }, "akonadi": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/akonadi-24.05.1.tar.xz", - "hash": "sha256-6pXV3vRp7+XkFYqm+4HnxtP6GdJytnBUc1RUKfQTCcs=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/akonadi-24.05.2.tar.xz", + "hash": "sha256-iHlm5GzoDJdO0nkCUx/784y2IcatQp5VduVRDaGQ/Xk=" }, "akonadi-calendar": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/akonadi-calendar-24.05.1.tar.xz", - "hash": "sha256-P1a00+Wetu2km5oZmQ6U5veOx20uLJwtsQ6Brly28b0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/akonadi-calendar-24.05.2.tar.xz", + "hash": "sha256-8Ntnq3nuvNHqV6oTfk/QhdK2D/yyxd58ChpifKwclFs=" }, "akonadi-calendar-tools": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/akonadi-calendar-tools-24.05.1.tar.xz", - "hash": "sha256-ab7LhSgGDeuWBeXAi4gGKxgIM0Lk9YQ4yigqO+F4foA=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/akonadi-calendar-tools-24.05.2.tar.xz", + "hash": "sha256-Y0gOBjttGLm/rS2X2bjKT0dgd5qc8rQOJ+8l2839VO4=" }, "akonadiconsole": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/akonadiconsole-24.05.1.tar.xz", - "hash": "sha256-gSoopnm+cZhHwE8BwdJvNUXEVIBgpwwR95y3+GVLWuo=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/akonadiconsole-24.05.2.tar.xz", + "hash": "sha256-D/N/vZRCjt7Kydb1243w2VDOawLafATwd9/Q0o3F6P0=" }, "akonadi-contacts": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/akonadi-contacts-24.05.1.tar.xz", - "hash": "sha256-pirz6SJe5ukcD/+PI+IYGdsuWUtMoZ/XuCFPUQGhbkM=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/akonadi-contacts-24.05.2.tar.xz", + "hash": "sha256-1gUgMEET2Qc9MxHOm7vAPleztudeTDfeWMSXTONrB4g=" }, "akonadi-import-wizard": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/akonadi-import-wizard-24.05.1.tar.xz", - "hash": "sha256-3SjcLcfxm+60DJ+shNkHT8WPlfyPsDgypNQHUbEUpdo=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/akonadi-import-wizard-24.05.2.tar.xz", + "hash": "sha256-TEVpE66sBu148R3/TnF2toU47DW6Slz2DEdhSbp4Rm0=" }, "akonadi-mime": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/akonadi-mime-24.05.1.tar.xz", - "hash": "sha256-UkKAyslm+aRJCvFMUYbm4QeQW+nwW+M0MPUl6PCmBgA=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/akonadi-mime-24.05.2.tar.xz", + "hash": "sha256-FX+IQa1bMjjJ5SVx7cyTbi/1wXa5XIZSOO8c7+Qo0Pg=" }, "akonadi-notes": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/akonadi-notes-24.05.1.tar.xz", - "hash": "sha256-qOAVCP0ezIjP/bN/3T8NP8qQ6LMcGHA6qtd0o+KuTx8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/akonadi-notes-24.05.2.tar.xz", + "hash": "sha256-qvN9SoQKSjol6VXre2DmUNK38qswv3fEh3R0TeWyYTE=" }, "akonadi-search": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/akonadi-search-24.05.1.tar.xz", - "hash": "sha256-XYVzdh6rrWpJqO6ueQIer7IrUGVRo5/biLTrRPmkkwI=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/akonadi-search-24.05.2.tar.xz", + "hash": "sha256-wVv9orRoqzUYDiWpbX6kAmOsgbXdX4SBPaMVU6PSioY=" }, "akregator": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/akregator-24.05.1.tar.xz", - "hash": "sha256-PwmhfDu3ntGeIcYokAeGvT6rc/SCGZot0JyGXeg8gkQ=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/akregator-24.05.2.tar.xz", + "hash": "sha256-OBz7Y+drTp+KuHFNeJKA4AXXo6bgJnFY4KnfE8xg1B0=" }, "alligator": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/alligator-24.05.1.tar.xz", - "hash": "sha256-3ptvQ/yUXsjyDWjoToXomlqqW5tH3SdH9y6f7MHHvRM=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/alligator-24.05.2.tar.xz", + "hash": "sha256-TeQksoXKzVhB+bu/37EK1EDtN1b9KSUtUsNU5WE1uNk=" }, "analitza": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/analitza-24.05.1.tar.xz", - "hash": "sha256-TiB6Xi4Iamp2otF0SzbLBpN5FUJ1s7fFuXMX8bXvgHk=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/analitza-24.05.2.tar.xz", + "hash": "sha256-Y0F3+l+4QhhWmMUnUl24Ut9P+yA/RiyTOQeqUaz7MZ4=" }, "angelfish": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/angelfish-24.05.1.tar.xz", - "hash": "sha256-AAuLvHgumNxPrS5BL6sUmzLzNZqCHC23FyitRf9Qt78=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/angelfish-24.05.2.tar.xz", + "hash": "sha256-Yvfx8fI3UU/5tqhpFCiH8qxdEh2nJwFy3T25Sx7FluU=" }, "arianna": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/arianna-24.05.1.tar.xz", - "hash": "sha256-FsqZucCzH+/P5qyPQxvIcEWSIg5e2d07whS2icVpj1Y=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/arianna-24.05.2.tar.xz", + "hash": "sha256-Y3/xWjsY3WtxS2iDxnWGYDGfjVj0c5y8c091+mN6920=" }, "ark": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ark-24.05.1.tar.xz", - "hash": "sha256-wgsofE9/WpvyxFCxqELC2RQM5QPZtEbIPgDkJNzqPmo=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ark-24.05.2.tar.xz", + "hash": "sha256-Oo+LgzDrHOFRHO6MEt2CJcTvGtcqdknkDg3cV0z3DuA=" }, "artikulate": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/artikulate-24.05.1.tar.xz", - "hash": "sha256-lUpVHgdEkUZuFaYoP6CM/pNiA0oUW8vqiv6E87FITyk=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/artikulate-24.05.2.tar.xz", + "hash": "sha256-U89J2fDnr+JJb6bwAHGGYSNOFYCO9Ny/YHrd1i142xc=" }, "audex": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/audex-24.05.1.tar.xz", - "hash": "sha256-sf+s9HZmHC7uNbNsCegiKz06OZNcn3ET3sdNWpa0k+0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/audex-24.05.2.tar.xz", + "hash": "sha256-1Pk/fcUS9oE+EilfsNSqmBXbnY6M0DESJnXNz8jdvf0=" }, "audiocd-kio": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/audiocd-kio-24.05.1.tar.xz", - "hash": "sha256-wJS3t+iEDBCsMQBRiLz28x5EuTK9MHZa5NQpZ2wumug=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/audiocd-kio-24.05.2.tar.xz", + "hash": "sha256-5I3G7A6fP5ZNL7nQ4NJa5oSukDSMApUYmVATT3kovNE=" }, "audiotube": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/audiotube-24.05.1.tar.xz", - "hash": "sha256-bqe4pb9Szpmxs9qYOrks+nIi0tHMnx3TQ84NA8fsz2o=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/audiotube-24.05.2.tar.xz", + "hash": "sha256-Wiux6XJvQZV6Yo8Io2TwQSLB2Bt7uNKP55DuTx89PEQ=" }, "baloo-widgets": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/baloo-widgets-24.05.1.tar.xz", - "hash": "sha256-6nCEStCjlm9R+eVU8Xkw9Ils2wpZDA/pGCfcdIe/ul4=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/baloo-widgets-24.05.2.tar.xz", + "hash": "sha256-t8RoD72gLzN8d16N3pGtbwZbzfNhznfVQiEQsrZEQxg=" }, "blinken": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/blinken-24.05.1.tar.xz", - "hash": "sha256-W/QqmADVPTZyisW2ypRm8JD9B+JI9QP5C5DHHmSJoh0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/blinken-24.05.2.tar.xz", + "hash": "sha256-2UqG1hq2tmlenhbRbGS3ug20ZFtYmJIqYSsIfCkrQTs=" }, "bomber": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/bomber-24.05.1.tar.xz", - "hash": "sha256-8Pvp87vWMvQDkjEVTWGYdcGC3rMVmPaNfXv1MEaXqN0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/bomber-24.05.2.tar.xz", + "hash": "sha256-moVZC+WkDAURjLNTxyUiSr/S/41ggtFQPTgyvq1Qg+s=" }, "bovo": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/bovo-24.05.1.tar.xz", - "hash": "sha256-inq+d5HBD89BCz0vB7avvXMoihIv0OUw7rw+2jcJur0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/bovo-24.05.2.tar.xz", + "hash": "sha256-ssCaWz4wW8udL2x07jB0Lrp62uRSMzKXn6+DS/ZglmU=" }, "calendarsupport": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/calendarsupport-24.05.1.tar.xz", - "hash": "sha256-EjnF9ugIYYoYgGtldQaddfDKHyrSalHuNxE6ed6TpTw=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/calendarsupport-24.05.2.tar.xz", + "hash": "sha256-2Gcg4LywGv6jy6eL0dYwLiuw89c+LRwbMChAENAtMGI=" }, "calindori": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/calindori-24.05.1.tar.xz", - "hash": "sha256-P+lp5yrQXiu85tBwfBFrVlFvEFv7bJS89d37HYSg9Ok=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/calindori-24.05.2.tar.xz", + "hash": "sha256-8UCcW2tuaCCfaJOoDZyk7MHBYNFruHsN9BHKqCxIaPQ=" }, "cantor": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/cantor-24.05.1.tar.xz", - "hash": "sha256-jaCHkYpSBYdiZu7AzcRakA1jLG/sNJEleELNgkCfHx4=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/cantor-24.05.2.tar.xz", + "hash": "sha256-QfubR6sZTTk+T/M/OvuiQme0CfMIAcCZNPBcUue6Uz8=" }, "cervisia": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/cervisia-24.05.1.tar.xz", - "hash": "sha256-2h+FzWe3bjEcljuo8ZzKErkmRW/j4EKcGxZMdiym6ds=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/cervisia-24.05.2.tar.xz", + "hash": "sha256-a6hSYUmAxUCGbjYtg0KR+Ebh4gXgcMNGEMK6YIfwP1M=" }, "colord-kde": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/colord-kde-24.05.1.tar.xz", - "hash": "sha256-6BaigMOHhSLNPnYRlN1NZC3LqjSipqmDTcFKxDeKS80=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/colord-kde-24.05.2.tar.xz", + "hash": "sha256-Zap4pKc1KfDWo6NaUY82hsIzWALg8jd7Ec6XeIWMgbY=" }, "dolphin": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/dolphin-24.05.1.tar.xz", - "hash": "sha256-qvxPugoDya85f4eLDLwOwjxuvQjPuc3cv2vSPKgGurg=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/dolphin-24.05.2.tar.xz", + "hash": "sha256-X4UKT9f0Y/k+BcGxYr5V99Q2DMohibRG+ils7vNfNWc=" }, "dolphin-plugins": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/dolphin-plugins-24.05.1.tar.xz", - "hash": "sha256-mwxQ1+myUWZhe/85eD1mYBBwBycVyUsqxh7JZA62wzI=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/dolphin-plugins-24.05.2.tar.xz", + "hash": "sha256-Of5QNO3/xCCe5Bb24LZfRPlICCtG5k4YswhkNrmUviM=" }, "dragon": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/dragon-24.05.1.tar.xz", - "hash": "sha256-ziwVvoP8hl8iSnTcCEj7K6XW3k6xeg/hDXZn9JXPLnQ=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/dragon-24.05.2.tar.xz", + "hash": "sha256-XruKHeFdwKehW0H8nYUPldvxcyVCfx8GNrN2WhZAWPE=" }, "elisa": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/elisa-24.05.1.tar.xz", - "hash": "sha256-Ve12pnavQsOvRV9kp/Y/UaP7qmGcktNFvmcIrVzcd+I=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/elisa-24.05.2.tar.xz", + "hash": "sha256-wBd+8JGADcNoFb/MfyaK3b1l07xaHFw4XxJMQomdGw4=" }, "eventviews": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/eventviews-24.05.1.tar.xz", - "hash": "sha256-suZyJO/yRjztxNANm7Dqb6I2MAI7l5kB9XSZrnGGNxc=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/eventviews-24.05.2.tar.xz", + "hash": "sha256-v2jVwR3lbBWvFDCE4/CpWjRljREoS/Vsr/QiiBtqE08=" }, "falkon": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/falkon-24.05.1.tar.xz", - "hash": "sha256-v4MDcf5RT+oGRDSTr4ueImqtpHbuiyezFAbJBVWcJBk=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/falkon-24.05.2.tar.xz", + "hash": "sha256-A6VcdImIT6wiWtLD31B/pLBU5rIxIPQLuOG8bUUEI0k=" }, "ffmpegthumbs": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ffmpegthumbs-24.05.1.tar.xz", - "hash": "sha256-SlTIIRrbJ3XsdvOlXQKanxaQuQ/zPegNlKCU9FfdgH8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ffmpegthumbs-24.05.2.tar.xz", + "hash": "sha256-fBHr1Yl6arCH7Es0nDgip5zwLEYLrCHTNK/keqxU8qw=" }, "filelight": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/filelight-24.05.1.tar.xz", - "hash": "sha256-xda4+5RsCW9c2AaYiq6hNLbAwhHw3keCF9pceyN87As=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/filelight-24.05.2.tar.xz", + "hash": "sha256-M9O2H32TMvJQa1iz+lrAsqAwji8uIb6BjoudpSB+K1Y=" }, "francis": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/francis-24.05.1.tar.xz", - "hash": "sha256-IqCkNHNfRaM15g2sV+U6NCYGaJ3ZJWMn8TiCdURuCyg=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/francis-24.05.2.tar.xz", + "hash": "sha256-PhNQy0PmTojiageAxSLSi5nSCvrcGHiT2SBn5h7p6W0=" }, "ghostwriter": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ghostwriter-24.05.1.tar.xz", - "hash": "sha256-dpshFgcf/dIhV6ZUoBEIBAs6DEDUTNFPe3HVFkmDkm4=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ghostwriter-24.05.2.tar.xz", + "hash": "sha256-IxSYnEDLSVL8JFdAsPbaGFuVtTcHwcPtpHxZnhr9MaA=" }, "granatier": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/granatier-24.05.1.tar.xz", - "hash": "sha256-BVXyi2XWQMFmx78Frm+74YmPeFCXRXcct5Z4MpNg6sI=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/granatier-24.05.2.tar.xz", + "hash": "sha256-5fgXfefTjb9aB6vnjD7CO+O1Wu1oGTji1jGYTrrTaDw=" }, "grantlee-editor": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/grantlee-editor-24.05.1.tar.xz", - "hash": "sha256-OGJuBVDggVqvJwAuDdPt0b7Eyt0TjMF6JOvtQqTBoi0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/grantlee-editor-24.05.2.tar.xz", + "hash": "sha256-jw4TTGt4PV7m3I8kVblVbez1zp2cpax8vlF1EmLkg0U=" }, "grantleetheme": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/grantleetheme-24.05.1.tar.xz", - "hash": "sha256-QMn4Zu0SplcgAUs00r1PLCddXGFHsGVoNATZX9Ef8nc=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/grantleetheme-24.05.2.tar.xz", + "hash": "sha256-Xsjgw4A0+sl+06THokNaPoFRzSnmOfrwKFBAjpJJVzs=" }, "gwenview": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/gwenview-24.05.1.tar.xz", - "hash": "sha256-OCqDN6W9epdVAG5z84TVENuePPdfXh1uzq6F7e7zzro=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/gwenview-24.05.2.tar.xz", + "hash": "sha256-LwHtyZTSuWmZJCxz26qQ2uXUxmdMB8RRewq2woTKenk=" }, "incidenceeditor": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/incidenceeditor-24.05.1.tar.xz", - "hash": "sha256-OBBaNy69VXedQh1KcMLmBZnauOly1oNKEl3UGomRt6s=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/incidenceeditor-24.05.2.tar.xz", + "hash": "sha256-gEynrYXTHSlQoVm04fG/fWx0pm2TPFHa7FSWJaDJmM8=" }, "isoimagewriter": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/isoimagewriter-24.05.1.tar.xz", - "hash": "sha256-rtDud0ShToup3JaUyKlPP+Dhjz7ECTRqH689YvB4KHw=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/isoimagewriter-24.05.2.tar.xz", + "hash": "sha256-xyXgl/Blpe9yEGDC3y0+NRpgQp9S0Ibjen7nPQNnktU=" }, "itinerary": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/itinerary-24.05.1.tar.xz", - "hash": "sha256-JAQ7NvxLq+JIKxx3sTTEciC7X45GqyR6gLhKMRt6rRE=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/itinerary-24.05.2.tar.xz", + "hash": "sha256-qy6k3ExKWnqHKEf+7l7jhl179BMWqVltMSTeGHLaBdw=" }, "juk": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/juk-24.05.1.tar.xz", - "hash": "sha256-naidUA/c5+btN30O+imDr16vh6jL384prIGDPmFiG7g=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/juk-24.05.2.tar.xz", + "hash": "sha256-qj+nO92KeK382hA24JZkQbtgZtZ5HH1iqYfIpyhgZvo=" }, "k3b": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/k3b-24.05.1.tar.xz", - "hash": "sha256-XFlM2bqCoebxggNizwl22IIuDKqsThSKj/sqIy5s4mk=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/k3b-24.05.2.tar.xz", + "hash": "sha256-km1oV4L2tjuB85us+HYtz6/AbrwrdY1CuknKNlSzJoc=" }, "kaccounts-integration": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kaccounts-integration-24.05.1.tar.xz", - "hash": "sha256-Rsbzz2jk/0vHX8YRHxC1xcsq5tGd9ggnvi0EmFes24w=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kaccounts-integration-24.05.2.tar.xz", + "hash": "sha256-0YVaxgZzeP/favmZprW/Og/Fqzt+1s+ofBlgbLYPezU=" }, "kaccounts-providers": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kaccounts-providers-24.05.1.tar.xz", - "hash": "sha256-JjF2jyLDlkPPd4HgCAoHdBls/mSLKbfgBQGxgUKqjeE=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kaccounts-providers-24.05.2.tar.xz", + "hash": "sha256-YO6US+yHpg2juGBYT1xh0GmDRVFp2JtTVgNK5CFt0dU=" }, "kaddressbook": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kaddressbook-24.05.1.tar.xz", - "hash": "sha256-5N3xSIGdhTBQAxMKf7DEfWB/8gtPEthLPZDTRDR4vNg=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kaddressbook-24.05.2.tar.xz", + "hash": "sha256-aElOYskcL9ueP0NrOVqjfxZyPUppX48Ezli2U8ebuLw=" }, "kajongg": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kajongg-24.05.1.tar.xz", - "hash": "sha256-fh3+EhsqBNR887PxvFoR5Vt+ZX33Sk0VRPNdMgaQ56E=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kajongg-24.05.2.tar.xz", + "hash": "sha256-+2ZGuEVJyVFYTgwQMXlSWxp7cONVqwMMnEZ+NI6Nlnc=" }, "kalarm": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kalarm-24.05.1.tar.xz", - "hash": "sha256-90zWXcjLXlYmX8alaW7EtWL0y2RTxg4mvA/t1K0MlfM=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kalarm-24.05.2.tar.xz", + "hash": "sha256-INHRdXXXvNWIIRmapXfsa+rZQOjaJdAqUpsIGKZ8YQI=" }, "kalgebra": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kalgebra-24.05.1.tar.xz", - "hash": "sha256-T9DtbcTQqbVfTnuQYlQsS2c3azfXqOS/cGvkt9O7z64=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kalgebra-24.05.2.tar.xz", + "hash": "sha256-EKzArvvs79ou6/wRAC1r2UY4/odustxQFChMjU4HP4o=" }, "kalk": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kalk-24.05.1.tar.xz", - "hash": "sha256-VKECMzD4LOjRRlkvtWKdSi9oE6pXumqYzREqj6eQGCk=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kalk-24.05.2.tar.xz", + "hash": "sha256-oHI0P09xoIZ39AwLEIfZHMPqVhS8gnqoHV7mWQ1YYH4=" }, "kalm": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kalm-24.05.1.tar.xz", - "hash": "sha256-ov31FhcQE985K8hB9q5E0k4Wu3KsgYqJPoh2wKG61Gw=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kalm-24.05.2.tar.xz", + "hash": "sha256-sVyL1K0ZBww/MydduF3s5dA2SldQSs0GbItgmbbiYX8=" }, "kalzium": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kalzium-24.05.1.tar.xz", - "hash": "sha256-BtUNaLsFAkgKKwabA820NxJD80T9DT/zy+v42zVKhpM=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kalzium-24.05.2.tar.xz", + "hash": "sha256-Lx4dbMxEMXeRrRTUAGHevqVw+Nqu5tcHjSV7iIoi9CU=" }, "kamera": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kamera-24.05.1.tar.xz", - "hash": "sha256-1Ee8rDkBB9KYZUG5nF2I28wtlyBsH6MI8hOs3NMuwiI=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kamera-24.05.2.tar.xz", + "hash": "sha256-FKYEYK9uVViS88kRmzIB09HH4D0TtpAO6B8VRPjXGTE=" }, "kamoso": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kamoso-24.05.1.tar.xz", - "hash": "sha256-HCq5+GWkgv2yVHy5W34hCIJa6PaNBFtKJDDjPD2Fmoo=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kamoso-24.05.2.tar.xz", + "hash": "sha256-lNR9ah46wrZ0yfwOGZxpBaOLu/DMzwLIJThlRysTXMQ=" }, "kanagram": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kanagram-24.05.1.tar.xz", - "hash": "sha256-P+0bQ2NVvmsn2PHlSJ2l/F6jXZpv/4u85GFmpgZfUfU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kanagram-24.05.2.tar.xz", + "hash": "sha256-d2ezXBmJavtMv1O6lBW9f7onRWHqxYuJKAGkHolXOdE=" }, "kapman": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kapman-24.05.1.tar.xz", - "hash": "sha256-glWBfieLegbE7ayxDd3PqJzy9EY2gqgi8mjey+BFPQU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kapman-24.05.2.tar.xz", + "hash": "sha256-HUL1RMR64OU7yb3UFsulJ+zOvfdXC/Jkz3MlP1HLndM=" }, "kapptemplate": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kapptemplate-24.05.1.tar.xz", - "hash": "sha256-tlTVO9zswMFBwhlaFCJPKT/ygOrs6KnDXjtQYI8lHWU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kapptemplate-24.05.2.tar.xz", + "hash": "sha256-b1yMYALy6YqBgDBqshXzacbxtVnrtVX7hfm2dJCZ91U=" }, "kasts": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kasts-24.05.1.tar.xz", - "hash": "sha256-YClZXlczAOg/gqy/eCFm3piWh9sah5qJT31bcFlVqhg=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kasts-24.05.2.tar.xz", + "hash": "sha256-Qck15hluoP5OfcsIq7/E3+PNsyOWL4IFpz+f7NpB9sM=" }, "kate": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kate-24.05.1.tar.xz", - "hash": "sha256-2vZSZyXemjeZ2X2zdCjPUTBizCc8wrxHz5SbMn+aKCc=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kate-24.05.2.tar.xz", + "hash": "sha256-d08It9U9sLKCFk6TCg4M1HCedZONy4s8tDD+3w1dsCA=" }, "katomic": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/katomic-24.05.1.tar.xz", - "hash": "sha256-AEyv030/IRguQ/vKNCuXrHO6qPdqykOsyJ541RE91Ls=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/katomic-24.05.2.tar.xz", + "hash": "sha256-8mWvjIWZZ4+kgxyHVJFGD3rLAmLGgpyu7cAa1xvQ8OA=" }, "kbackup": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kbackup-24.05.1.tar.xz", - "hash": "sha256-oz9X7aAMtsgRTvVRwOeGSqjHX46+u6ZX8WH+C8pBc9U=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kbackup-24.05.2.tar.xz", + "hash": "sha256-lS/QEOceBdVaLIFz/rBBHtlAW0aUyiFr0yXpDgGN5Wg=" }, "kblackbox": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kblackbox-24.05.1.tar.xz", - "hash": "sha256-aKl+D8Og+cZIZbms+kDO8qZ5bFf7L6Oj8pL/G/FBMfs=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kblackbox-24.05.2.tar.xz", + "hash": "sha256-GcXGfE07WOWh/Fox22bN1PigRL3DxdjKWdAinLljzSo=" }, "kblocks": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kblocks-24.05.1.tar.xz", - "hash": "sha256-eNsF2UsSYNLrJnoWkXDZdkY/2JnvolO05/5nJtRUkX8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kblocks-24.05.2.tar.xz", + "hash": "sha256-CHgHom/fguncqE6GvHmYzb3qMb0qP+7/PJben4N4ghY=" }, "kbounce": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kbounce-24.05.1.tar.xz", - "hash": "sha256-RC+7ftZdyM0gUweJvnXs/9hVd5CXQjR8BN6KSpWfLUw=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kbounce-24.05.2.tar.xz", + "hash": "sha256-wPQ0W80pNrouWtoBlyyoOfjXPEvoXE6JiM0BEnECIGk=" }, "kbreakout": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kbreakout-24.05.1.tar.xz", - "hash": "sha256-pN0owNyCN8ohlGyO47El/6Wa1IJDw5pzI3oTcjfJDRY=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kbreakout-24.05.2.tar.xz", + "hash": "sha256-ePRjvW9itIajJvMZKA1YeLqMtRF5jPJI0ssHGmHd2mI=" }, "kbruch": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kbruch-24.05.1.tar.xz", - "hash": "sha256-/jFyrWGKi9i3W00VYIjBVNaK7FlH9uWbLiM0pme+R5E=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kbruch-24.05.2.tar.xz", + "hash": "sha256-QBlcdLmqOytjFM918opW0qwbufChpYEdBgRO5SjWxE0=" }, "kcachegrind": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kcachegrind-24.05.1.tar.xz", - "hash": "sha256-v0XWazbQc7W79dez7yzoNaJj6U6FnakxgaPoOREr0ms=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kcachegrind-24.05.2.tar.xz", + "hash": "sha256-KbAcadokbLiErgziRrWN7BoCastQMZAJHysI96JGEcg=" }, "kcalc": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kcalc-24.05.1.tar.xz", - "hash": "sha256-mwXkMnnZp6W5tkLPOG46nu9dvBPp9ooYqlxhEa0/lII=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kcalc-24.05.2.tar.xz", + "hash": "sha256-FvkDFp/hWBrWo2VFB54skV/e7h80hUnVr4I1UbYfNVw=" }, "kcalutils": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kcalutils-24.05.1.tar.xz", - "hash": "sha256-MJ1ymN7XFgWSB2YWxRJz23wc1g7H+VTllrRt34/INfg=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kcalutils-24.05.2.tar.xz", + "hash": "sha256-eAOIT7yfS/ZMnBqdrTmgqBqgVVLfKHbP17jaxOF+PsI=" }, "kcharselect": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kcharselect-24.05.1.tar.xz", - "hash": "sha256-bNWSjDJlDOEr7RPdV6aMDRID0734bVsmzpuiN7DODAI=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kcharselect-24.05.2.tar.xz", + "hash": "sha256-EQ5orn7hxbMkgSEpvkGXuHNI0QuSdc1iHhHPzrAc/Hs=" }, "kclock": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kclock-24.05.1.tar.xz", - "hash": "sha256-I+FpK4efcw0HXlabLbb/wjvnozsStMqGgU9fZi/v9Yo=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kclock-24.05.2.tar.xz", + "hash": "sha256-xEcOihXRM2B+EMPTCj1TPQ5rG6OZww/hDdO4Ax3o6xQ=" }, "kcolorchooser": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kcolorchooser-24.05.1.tar.xz", - "hash": "sha256-S4UxNZKuuhiLMQpkI0+8EyOrWKdsFdGxNqJPgY7QI9g=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kcolorchooser-24.05.2.tar.xz", + "hash": "sha256-IUjqKwNchku2jKZv3hdpbpmPvIn14BD0xcVNlNwU1+E=" }, "kcron": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kcron-24.05.1.tar.xz", - "hash": "sha256-OMx6vO167q6EnAw/7Iycfq9m6eUZ2+x8sOvS+Zwus5E=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kcron-24.05.2.tar.xz", + "hash": "sha256-moVvEp99Ap05bSIj47jcohPP0kGmftTGHlw/Zg9swhs=" }, "kdebugsettings": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdebugsettings-24.05.1.tar.xz", - "hash": "sha256-vgQhcUufk164qFv6OU5Ke1W65B9W5ZrvyLY10U/OgUY=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdebugsettings-24.05.2.tar.xz", + "hash": "sha256-Z7MWulMxvh6XJmB4FWDROUMA04SKZl90xg8G5TmTicY=" }, "kdeconnect-kde": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdeconnect-kde-24.05.1.tar.xz", - "hash": "sha256-79sXtg9TGxPLUiKykzSQUHEaRjYoKsPVhtqYqlBWR4A=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdeconnect-kde-24.05.2.tar.xz", + "hash": "sha256-A9gnq+17BVK1NimJIM5YFeMh+RAbAgv86/W8qkzPBUo=" }, "kde-dev-scripts": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kde-dev-scripts-24.05.1.tar.xz", - "hash": "sha256-oZA8Dy7rWNdAHR90gbLw94kICzGbsdIWGMjFY6UivxU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kde-dev-scripts-24.05.2.tar.xz", + "hash": "sha256-k7bAEWTjrIRFCtm07EmHFwvx+ImeKFsSj/nvztPs2k0=" }, "kde-dev-utils": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kde-dev-utils-24.05.1.tar.xz", - "hash": "sha256-6JizYqszbDBEY5RitReCmSLG1eiwnyaNQ+3DCCv5R8E=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kde-dev-utils-24.05.2.tar.xz", + "hash": "sha256-5r6/iS3MHP0Uf9ljOcYWdE30dsgbv7pNPRiHe1hKPLc=" }, "kdeedu-data": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdeedu-data-24.05.1.tar.xz", - "hash": "sha256-/3VVPGuvow/FgjhTPIbY/emspApXLjIbB86eQ9Dc/jQ=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdeedu-data-24.05.2.tar.xz", + "hash": "sha256-hRKCyPDFq6zW1yHer+ZT/eMw6up578tKccf1y6CMk1k=" }, "kdegraphics-mobipocket": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdegraphics-mobipocket-24.05.1.tar.xz", - "hash": "sha256-5F2JAMZ67jrw+5t/TKZGt9+a6yrEfxS+WX66AfmhJK0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdegraphics-mobipocket-24.05.2.tar.xz", + "hash": "sha256-BAjsVePfMXspdj9WZivzyghEylOKtEcfMWgywZelj8E=" }, "kdegraphics-thumbnailers": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdegraphics-thumbnailers-24.05.1.tar.xz", - "hash": "sha256-fNac/C+rWbXGFCHGZIs2ia7xBZyd8dxUYBHWL3xcy8A=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdegraphics-thumbnailers-24.05.2.tar.xz", + "hash": "sha256-L1OYzhKcJqtOaMQ84VpcfLFGXWCOb7LiuYSQhCJwuvA=" }, "kde-inotify-survey": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kde-inotify-survey-24.05.1.tar.xz", - "hash": "sha256-9aCdjuA6C1Ej7tGYA7zk+eG5jDoOB5AxIJ7gJjOzLII=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kde-inotify-survey-24.05.2.tar.xz", + "hash": "sha256-0YWuguMXZGF7IJaGFpGF1S48K1HoX0NkOpIszLhi7CA=" }, "kdenetwork-filesharing": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdenetwork-filesharing-24.05.1.tar.xz", - "hash": "sha256-bu+pbBRnrJkAUazRWPKXuE3JAs/hld3Y9gr79QT8ADU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdenetwork-filesharing-24.05.2.tar.xz", + "hash": "sha256-ekqjRuRtSj2lli3LuacDGW6hTjnk8XbRi3/zpDLCjcw=" }, "kdenlive": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdenlive-24.05.1.tar.xz", - "hash": "sha256-EJJZLecWda+wjuZ6yacdMRWz7jVI2lJ1mXHFsAJhA9o=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdenlive-24.05.2.tar.xz", + "hash": "sha256-BX8Swote7JcWODtQk/fKCjRcyQZt1cdhT+PZGIQppwg=" }, "kdepim-addons": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdepim-addons-24.05.1.tar.xz", - "hash": "sha256-G8oxBYzyyel0pr9oqeFqdxq9TCciwuzZRPM66U1gn7w=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdepim-addons-24.05.2.tar.xz", + "hash": "sha256-uQihXJJw8DtoLDEm4P/qpucokA2/lDt5Ct5Sfe2uD6U=" }, "kdepim-runtime": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdepim-runtime-24.05.1.tar.xz", - "hash": "sha256-eb6+tnwUPDqpuP6GcQIw2XJQdhYy4HMTfoAtM6e8Un4=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdepim-runtime-24.05.2.tar.xz", + "hash": "sha256-9HDyVlqms+qYZuWeShl5lHDEp7m6DOQcw4j6hWPd1cs=" }, "kdesdk-kio": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdesdk-kio-24.05.1.tar.xz", - "hash": "sha256-wazYd4pq1Bu0SKthoKh3ZnKLK3E/qXQt0Mq6RzNY+aE=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdesdk-kio-24.05.2.tar.xz", + "hash": "sha256-0sso6LLV8TiPJDnVK46ju/eXTwh+Sc54ROCmZ1nekMQ=" }, "kdesdk-thumbnailers": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdesdk-thumbnailers-24.05.1.tar.xz", - "hash": "sha256-bAsza2rsYkWaoVXAse5AIUFj6TtDU8cl6YI9f7DKOZs=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdesdk-thumbnailers-24.05.2.tar.xz", + "hash": "sha256-qh3d+MmNHe2lOEyiiWlVOKjzix01fynUCgpJgVSy3Qs=" }, "kdevelop": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdevelop-24.05.1.tar.xz", - "hash": "sha256-9hE/ECQrtlZi3bdse3Jbtx4jvN8Z64DgQfOdTWyX87Y=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdevelop-24.05.2.tar.xz", + "hash": "sha256-APIojbB3Cqojyf3AJ3zKltH2qLskjbRZSmGNR2Ie5YM=" }, "kdev-php": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdev-php-24.05.1.tar.xz", - "hash": "sha256-x3te4XLjSgbe68Yx27ZfRQAXtzMqGpfocS2eKWoAxXY=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdev-php-24.05.2.tar.xz", + "hash": "sha256-dPPEqnJESmjR3Uwh4kjSRPElbGwohnMG52e1AQN6+2g=" }, "kdev-python": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdev-python-24.05.1.tar.xz", - "hash": "sha256-DjLeNdSaHtxgdqYyh4JST8QOH/51OSaXyZVCh6GPtyY=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdev-python-24.05.2.tar.xz", + "hash": "sha256-bGoM0a5xm7kN2w2NlS/GgSIEja4w0aMJQEnkV+VjsT8=" }, "kdf": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdf-24.05.1.tar.xz", - "hash": "sha256-EHw7hjDRhCmi+G46tDEt51jwOTsYawkJ846oxp4pkZ8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdf-24.05.2.tar.xz", + "hash": "sha256-z8TcIh/1uL5cKx93oNTAa3NpvyDLH05dLvijIhvI4L4=" }, "kdialog": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdialog-24.05.1.tar.xz", - "hash": "sha256-jm4cQnv3Dl9WxMLzZbat/yDWrXsTTcV1Aoi8+haFryU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdialog-24.05.2.tar.xz", + "hash": "sha256-rmy3YPnWFYHBqBGDStFZmNVniBfSj6R2B3ZGyGgTBBo=" }, "kdiamond": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kdiamond-24.05.1.tar.xz", - "hash": "sha256-6OAiF+I6MCq6At+rq7tb9Wup1sKy68a5MeNgeCE0Ef8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kdiamond-24.05.2.tar.xz", + "hash": "sha256-EHH5ziFgSgLQNOfqCoygEn2vW4gSA4ljy1B5aqC+iOI=" }, "keditbookmarks": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/keditbookmarks-24.05.1.tar.xz", - "hash": "sha256-o/KyT5Eo94BNkuWUhydvY+gGevi3bhszgnTNg9+GxeE=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/keditbookmarks-24.05.2.tar.xz", + "hash": "sha256-WUOUqkfmnOCXeWQXqfjkAizFV5yPoMov+1bcXNxM2U8=" }, "keysmith": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/keysmith-24.05.1.tar.xz", - "hash": "sha256-q1jc93onRMJbPdokt4pqqgYYfSToa4SKWBwbm6DIA58=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/keysmith-24.05.2.tar.xz", + "hash": "sha256-ISTd4v0OXQZ59Wrnin4RDymKvpeZPq/eKPTCI1TTZNg=" }, "kfind": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kfind-24.05.1.tar.xz", - "hash": "sha256-mTdBMeQ6mnpkvfMlgg+JsDRu+B5wOFyUuT7xCnUeTwo=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kfind-24.05.2.tar.xz", + "hash": "sha256-axC+vVQ9JteIcwHCcMq844fzEnAvksSGoIHaVvZ0IKM=" }, "kfourinline": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kfourinline-24.05.1.tar.xz", - "hash": "sha256-wUD7YRf0B2guO1wxkcdpwI1LnhdJvwY8xtmzzIyQYNg=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kfourinline-24.05.2.tar.xz", + "hash": "sha256-FDVQbeHNqFwizLpb3F7ZAnKIFRwHKxvBvgMeNv5egZY=" }, "kgeography": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kgeography-24.05.1.tar.xz", - "hash": "sha256-1l7UPG5aQ6zSJCb7cGIt7mComRwSCa5wQ8dDomQiPP0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kgeography-24.05.2.tar.xz", + "hash": "sha256-LJqjqtIwFI8N7Lqt82t0a/WotQQQJdoFEMzPkzOlfPM=" }, "kget": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kget-24.05.1.tar.xz", - "hash": "sha256-v1XK5VAsVVHdusGgOJ9WjpiIMQ3xX/xMhgTGbSzHv4A=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kget-24.05.2.tar.xz", + "hash": "sha256-tqKemGn/a+dekMimTHGvF+sCeXgsDny7D+uR2ddQo3Y=" }, "kgoldrunner": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kgoldrunner-24.05.1.tar.xz", - "hash": "sha256-Ua2QN0A7XWI0Wy2ceR+TEQfTSwRMobQGpqLwgU26r2g=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kgoldrunner-24.05.2.tar.xz", + "hash": "sha256-jMQK3P/qIMwuJ/2U/5HnTQgyGYQEDZUNHEC3gg5AYoM=" }, "kgpg": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kgpg-24.05.1.tar.xz", - "hash": "sha256-b6lz9AnsTsPFFv8Eunp/CC57h4R3DgcQsmTj+dei/LM=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kgpg-24.05.2.tar.xz", + "hash": "sha256-s99PQ2JhIrdhqjk8thvErqk0LkbVA4Khu8IuLeHs8IM=" }, "khangman": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/khangman-24.05.1.tar.xz", - "hash": "sha256-C6PM1NRw7ChDVaYRwOGxHjnS1DZb5fhXd+NNvUXqmxY=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/khangman-24.05.2.tar.xz", + "hash": "sha256-r+HnvisnreaGLbTuCZkDyVa/xq3InFRYvzqZVK88JHw=" }, "khealthcertificate": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/khealthcertificate-24.05.1.tar.xz", - "hash": "sha256-EAJEdeEMtKwNIJcqvgIYA+uI+2l77ShYc/X9+Cd+uP8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/khealthcertificate-24.05.2.tar.xz", + "hash": "sha256-p/TbJKZf/mz8cG8WtR+pYA/IbI+eCSQ5P320Js7PABg=" }, "khelpcenter": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/khelpcenter-24.05.1.tar.xz", - "hash": "sha256-l6+hFiKyZsBVysoyG9ikL3wTgd2b+VK58SJTjU4ZeRs=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/khelpcenter-24.05.2.tar.xz", + "hash": "sha256-wT+dMJKPrNy31YSkq/8jjhLPQakBxlxG2bdXYliv2ng=" }, "kidentitymanagement": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kidentitymanagement-24.05.1.tar.xz", - "hash": "sha256-hF8ttpU3CH+XU6qcxyvV1bu8LAx12jT+90xxxxFcvQ8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kidentitymanagement-24.05.2.tar.xz", + "hash": "sha256-BEB1YrqcnZAObtmfYG7OR1ZmBGTJfTrPSIBebeQJ0Qg=" }, "kig": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kig-24.05.1.tar.xz", - "hash": "sha256-DrhOTrR4zC7MqccrHNQ3Nkr6FPVcjvehYRSKMn4RRM0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kig-24.05.2.tar.xz", + "hash": "sha256-Z/tKfk2GztvaEzLlRIU06+SF0D0Y5Luffq4+lGVHhW0=" }, "kigo": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kigo-24.05.1.tar.xz", - "hash": "sha256-d8dCE9ZZAsYXH5332apMnFvhgft0FOh9SOVWYsfkebw=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kigo-24.05.2.tar.xz", + "hash": "sha256-Kny8vGWpt6sepsAgTvea6wZYUh/GNMRGHE77zhvYTaI=" }, "killbots": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/killbots-24.05.1.tar.xz", - "hash": "sha256-yrkditrWJa3krQHLfAeQTCCyopMg/e41svos7uwEJbw=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/killbots-24.05.2.tar.xz", + "hash": "sha256-ZwLPsD7Qrk8AhhWwpcjGW1j8Hx7ZLDVu+sZX6mC+RO8=" }, "kimagemapeditor": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kimagemapeditor-24.05.1.tar.xz", - "hash": "sha256-IpJYuStRohoEabkBMSrAhiZqQILNmcG17cKBKq5MGqs=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kimagemapeditor-24.05.2.tar.xz", + "hash": "sha256-AXGfBV5GB1S3+rVtqPcsFIrUXg4U4v+izfIKRA6ZOVY=" }, "kimap": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kimap-24.05.1.tar.xz", - "hash": "sha256-sicRKm6LWFpepA/6Wzk6YtvxIu5G9lQeeH8zyPjGzt0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kimap-24.05.2.tar.xz", + "hash": "sha256-FnvtJ2hn+5U26G+OysNpEbUckLPxPhZxGLRKHUbrluA=" }, "kio-admin": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kio-admin-24.05.1.tar.xz", - "hash": "sha256-SurYTu3tkMrQUPtmQUjGTOCE85MykFtd9doaUd81nhg=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kio-admin-24.05.2.tar.xz", + "hash": "sha256-UWQP0jIkBtBcR0xDqMrfDvuF4KWyLRalN/JP3Wg9qZQ=" }, "kio-extras": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kio-extras-24.05.1.tar.xz", - "hash": "sha256-VziTgiARJKZx3t43SB9vlBYcuXXb0kcWkqvTGJcDvJg=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kio-extras-24.05.2.tar.xz", + "hash": "sha256-GenG02JVEaf598DlyenmsMo2Wu7UkUx3gak3/RgH4kA=" }, "kio-gdrive": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kio-gdrive-24.05.1.tar.xz", - "hash": "sha256-qsq24Z6EqKYMe9HZF/6Wh7iR418TA3PbMbWCA+xviyU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kio-gdrive-24.05.2.tar.xz", + "hash": "sha256-NEgZa5SzNN2DamQuBxHFbMDL9YaL4C6TQYDrNZVzkeE=" }, "kio-zeroconf": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kio-zeroconf-24.05.1.tar.xz", - "hash": "sha256-0Lu0XQAUh9vCDZaqd+aDKI/f+fy/lMhHX5+XfZn2pw0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kio-zeroconf-24.05.2.tar.xz", + "hash": "sha256-i5OeGm0irHiv7VlrL7pJRyz0YFb4SiwrYosifewZHBU=" }, "kipi-plugins": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kipi-plugins-24.05.1.tar.xz", - "hash": "sha256-3HB8DcpVeiykMjm7m9Mv4Nhebre36HyLw1KiIfrOCHE=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kipi-plugins-24.05.2.tar.xz", + "hash": "sha256-fVI7BMUq0pnkn/DNLhwdYViyQjr6UOH/WNuhIj1xDaw=" }, "kirigami-gallery": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kirigami-gallery-24.05.1.tar.xz", - "hash": "sha256-4zhRQwfs2vT+iAstdnWi+y/6cNwRAE/87DFG8W/7cGQ=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kirigami-gallery-24.05.2.tar.xz", + "hash": "sha256-cq4uv+ycYPZR7st2fABzfjJf8elVdAT+rLJfIMeIK9w=" }, "kiriki": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kiriki-24.05.1.tar.xz", - "hash": "sha256-+yCfYcivlFPiCDU2DgB4Bnn2FStsKmtcijmY9hTeC1k=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kiriki-24.05.2.tar.xz", + "hash": "sha256-Xsuze6kEURy1nsKNG5osZKFlqrFqlla2hD9kpxLc2j8=" }, "kiten": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kiten-24.05.1.tar.xz", - "hash": "sha256-jYt1aIPzej3xeMBIlHMTLeSG+pWzmz60sn1uuyomAoM=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kiten-24.05.2.tar.xz", + "hash": "sha256-Yq7M/NP02fiX2SvpiCJLR8GUb6KNwhmYWvLKLGPBpeQ=" }, "kitinerary": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kitinerary-24.05.1.tar.xz", - "hash": "sha256-4cd/Co6Cb9lfABptj8lBkG0+Cq2Ywodsd8XjunRi0OY=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kitinerary-24.05.2.tar.xz", + "hash": "sha256-UZo6vPFtL1b9KiHxTIx305QgGWRUut9gir6qYAtq7bA=" }, "kjournald": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kjournald-24.05.1.tar.xz", - "hash": "sha256-LXPe24nPJHzIacibyHG1qjCzHKREI8ifetYp1V4BsdI=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kjournald-24.05.2.tar.xz", + "hash": "sha256-Ir9F/yA4/WT+U2QCfnG9a4LV4axTafhYynJeE806YWU=" }, "kjumpingcube": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kjumpingcube-24.05.1.tar.xz", - "hash": "sha256-ZTsGW5JtpPz6hDSD4Fb27ZPnue9+LsRw42mvPAxDt4M=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kjumpingcube-24.05.2.tar.xz", + "hash": "sha256-ZCiVgdaBuY2ugJS6fAtLcRQjtGtD8i7KMYfZeLqgFMY=" }, "kldap": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kldap-24.05.1.tar.xz", - "hash": "sha256-BSiBysBodUnqhYwree39EhE3bdPF4t7+Iw0XqRkDl68=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kldap-24.05.2.tar.xz", + "hash": "sha256-31eWlQ5ooGFm+/MAH49F/Ozjp8eqPClNChUTdyAKGdo=" }, "kleopatra": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kleopatra-24.05.1.tar.xz", - "hash": "sha256-4VAerbUzZSwWxOf4VP/TIjUnj944SLq3z+ARpm8/jg0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kleopatra-24.05.2.tar.xz", + "hash": "sha256-qzfPRdkkeoB3/1EVdOZsjSeGvMpVjyqYM9NV8cbpoMo=" }, "klettres": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/klettres-24.05.1.tar.xz", - "hash": "sha256-zTpgG9mVbYuReu+/MXlkLK7+h4FvWrWutV66DzJDtuM=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/klettres-24.05.2.tar.xz", + "hash": "sha256-gY3l/q1Mor0aTsa2cYg10iMtUpD0h7KIwC67ijJOMG8=" }, "klickety": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/klickety-24.05.1.tar.xz", - "hash": "sha256-LZ37dB0KozmyrUxkgUykwsoiUG9hiES+NvnJD0OaOC0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/klickety-24.05.2.tar.xz", + "hash": "sha256-amrEEaqls7362fpK1Q17FWOZ8laGjo+gzsgkv0VYYyY=" }, "klines": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/klines-24.05.1.tar.xz", - "hash": "sha256-+oMhpHqmwv1lWLNt93yjI2hiqzqB+c5LxvIhQ7UIrnk=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/klines-24.05.2.tar.xz", + "hash": "sha256-vat5ulsHtoe8SUEcqDbQQY9aaPC4MHbsGjtwAcMB3rA=" }, "kmag": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kmag-24.05.1.tar.xz", - "hash": "sha256-J2k2UK746YtPyUVzk+EGvY0OibIDXoFwHUOxtGKPWAA=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kmag-24.05.2.tar.xz", + "hash": "sha256-nOvTLQFAkq1TR3LpKpxuQ/CM23pcmxHqftxfDbJMdWk=" }, "kmahjongg": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kmahjongg-24.05.1.tar.xz", - "hash": "sha256-nXywv+yA9cGctVr52WXo/DQ6c6WiDG/4i1RiRAF/T/M=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kmahjongg-24.05.2.tar.xz", + "hash": "sha256-ZqUTzvtDPf9+H2Qrrf9+hpQfdi0nYr4WGuWPB3vPox8=" }, "kmail": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kmail-24.05.1.tar.xz", - "hash": "sha256-vzoEm9ZVMW4x2HiWYDnJJ4MLzAEmSf0n+rGCLbQ2GN8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kmail-24.05.2.tar.xz", + "hash": "sha256-Yl4m72qsggMn2ovzKFHFvvWErUzgWDpwz8ugds1QYDw=" }, "kmail-account-wizard": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kmail-account-wizard-24.05.1.tar.xz", - "hash": "sha256-wd9HZqYfXetspdJpwf1F9dCFY+cA9WgkrCBUjN9d/Bo=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kmail-account-wizard-24.05.2.tar.xz", + "hash": "sha256-LuhW6BFJY+ObWgGKda1XwUDvsBkhx6bXT0WxG6Vq8kc=" }, "kmailtransport": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kmailtransport-24.05.1.tar.xz", - "hash": "sha256-UGOr9Xi3hvlmjBScKxdhGcG9wAYFfDtMDfYQpocxHoY=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kmailtransport-24.05.2.tar.xz", + "hash": "sha256-nyAjyyDDM4X2lp6iXdpY+9/C79HXOmcSU2Be9UOuZjI=" }, "kmbox": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kmbox-24.05.1.tar.xz", - "hash": "sha256-6K1QlT12WhLZpMGHRsAqjy72/rdQgQMMuxLsR0idE2w=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kmbox-24.05.2.tar.xz", + "hash": "sha256-OfdUVV5Jqqud+nuut1u+C8K2LzS/JrOdjbGeYQF6Vzw=" }, "kmime": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kmime-24.05.1.tar.xz", - "hash": "sha256-8BOOEdnoqd6OnVcIGh+0tDZ24IvEwziXQLMemgDJHvo=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kmime-24.05.2.tar.xz", + "hash": "sha256-2C843Pl8ZJHGtzZ9uLGKZay1lNfrdSVD3CPGXUq6tqU=" }, "kmines": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kmines-24.05.1.tar.xz", - "hash": "sha256-BZTEkUfDeII60Ez8ezhD0LjlkoA3bCjFDv/mTyfkOS4=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kmines-24.05.2.tar.xz", + "hash": "sha256-FXK7ahDMCy7f/9Lw0iIJbl4ifnI0D5TrPAoKfFRb4Nk=" }, "kmix": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kmix-24.05.1.tar.xz", - "hash": "sha256-uPC6oFtRlxQnBzm013m2/9jsAlZ8Ooq16WbkHsn9gUU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kmix-24.05.2.tar.xz", + "hash": "sha256-b8zu9eW4WcRGTAzl6095uZ1X5NkKTnm0f/uuLWjUQME=" }, "kmousetool": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kmousetool-24.05.1.tar.xz", - "hash": "sha256-oADiOSYsq5D8DQGSpU8cmoW5E59sNnoVTBjxjq/zmj0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kmousetool-24.05.2.tar.xz", + "hash": "sha256-F92s1N9LneihoSHnrxGw9NjUP5VdNeynijTGEDVfCu4=" }, "kmouth": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kmouth-24.05.1.tar.xz", - "hash": "sha256-fwJBNf0qCZrN0LFHFmW1Ep3sKsjj78WQEuoVlXeUxH0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kmouth-24.05.2.tar.xz", + "hash": "sha256-fezYHe48UttTG46qxHq5OV7V0nL//RZN7L31pPgOpb0=" }, "kmplot": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kmplot-24.05.1.tar.xz", - "hash": "sha256-wT1cPF58p8gRn13NCGYkLN3gwYcuGIAV7KUsQly95QQ=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kmplot-24.05.2.tar.xz", + "hash": "sha256-ZoDB5lRLuoIFlIWpBT2VZ1NoGLngl2Fm7HziLkZvqPY=" }, "knavalbattle": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/knavalbattle-24.05.1.tar.xz", - "hash": "sha256-IObuJxAfJ+vGYiKmZ/0N1cgcoh6w68VGlL3Oa9/Pt14=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/knavalbattle-24.05.2.tar.xz", + "hash": "sha256-S81N9CIk3Itbwhj2MfbwNIAbk6cCG0X/Ox5Cc1wZuWo=" }, "knetwalk": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/knetwalk-24.05.1.tar.xz", - "hash": "sha256-81Z5SyDWDzkcBPluO6WWEPCXtJpl1mBxxifTlxsLOh0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/knetwalk-24.05.2.tar.xz", + "hash": "sha256-2PHdI26x0vDNOadxOtqCGf5NI9BE8ys9ngUaKegRzdw=" }, "knights": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/knights-24.05.1.tar.xz", - "hash": "sha256-j9yRegmjBCgmEfOd4K5sWeBZDyxpdIryc8n2LrIuW44=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/knights-24.05.2.tar.xz", + "hash": "sha256-E1ETV8gTflUcyvFYqH/07iBC6ppe/B/qY6MpcNNRuqc=" }, "knotes": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/knotes-24.05.1.tar.xz", - "hash": "sha256-yv3I3iIIikb+EeTvhiCFlfuJwZnJAAwWvkq03a5N/zQ=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/knotes-24.05.2.tar.xz", + "hash": "sha256-Tm2mjhzP1aL8rwOKZDi+97ZxRGsFo+c5eHtjaJAW1ZI=" }, "koko": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/koko-24.05.1.tar.xz", - "hash": "sha256-s/S2Dttja1nZfFaIV4S+ARNVsQ9t9QYYgBSk9+uwoNM=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/koko-24.05.2.tar.xz", + "hash": "sha256-wspf8GccmCRKJ5sQ4IPd7VpQ0IBOecjpEgoEDdIIWhY=" }, "kolf": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kolf-24.05.1.tar.xz", - "hash": "sha256-FetuC1A/ZsbKNLgH4uQmHbQVet3R3+AJmtjN/f7RqE4=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kolf-24.05.2.tar.xz", + "hash": "sha256-xrw/QOtmUS5TDS15WGkECEBlDWW1OtgMuUiCxNuAGUQ=" }, "kollision": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kollision-24.05.1.tar.xz", - "hash": "sha256-e4Ojqpe6NSkuYOkRRDer5M3v6q9uafMrIF+H/WbASZI=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kollision-24.05.2.tar.xz", + "hash": "sha256-Rz8PU/mB2u88eCmSuXREhz17gCzpXA/Nf71wcdZecLs=" }, "kolourpaint": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kolourpaint-24.05.1.tar.xz", - "hash": "sha256-D2kXVAQyHiAVJwazWiP4+X+6xp9JH2GBpe7iij6VG54=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kolourpaint-24.05.2.tar.xz", + "hash": "sha256-ebF3173o9YA12G4r9VIAESdJY1ik+pRt69lSocnxIbo=" }, "kompare": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kompare-24.05.1.tar.xz", - "hash": "sha256-Z634h3HMgQI7HpAKRN50rFdpAtjr8suCypTrD4GZz2A=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kompare-24.05.2.tar.xz", + "hash": "sha256-sG/v49Dhl8WiBTWbmYDLkylS//cbeRlNdOnCQofqe44=" }, "kongress": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kongress-24.05.1.tar.xz", - "hash": "sha256-bArGGAg4AYtDnUWqSDKWIXTAmDxRLvN6H0Irf7fHm3w=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kongress-24.05.2.tar.xz", + "hash": "sha256-4snFpiSEG3aTjtpUU8EIi7xDmY9yp0zQY6moTZR2560=" }, "konqueror": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/konqueror-24.05.1.tar.xz", - "hash": "sha256-/k/zHS0bOIqyKSSM1OsUaOmQwTRgf84ptsSiZ9Th/IM=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/konqueror-24.05.2.tar.xz", + "hash": "sha256-imHrwI2BTnEMr8FO5F/C0ErTs1JHxYVvCON4FOx4NPo=" }, "konquest": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/konquest-24.05.1.tar.xz", - "hash": "sha256-NP4I4r6R9i7hH+ggjAg36k6lRDRSpb4Kk7bXaA/VoCA=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/konquest-24.05.2.tar.xz", + "hash": "sha256-JXEhGKzKtX8Viz3yCQnu2SGRHQwATfhnV3+/COOA0y8=" }, "konsole": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/konsole-24.05.1.tar.xz", - "hash": "sha256-m1rh9W6rJ/7vrlBoU8X6r2k6+6j4hdz413Ttl9aTcY8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/konsole-24.05.2.tar.xz", + "hash": "sha256-HQXvG/pTHkH5YlrLle6xjvVAn6UWDUuXbOaZd1lRiZQ=" }, "kontact": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kontact-24.05.1.tar.xz", - "hash": "sha256-yH4Y1C73kS+P9BMnosfWDGY0OOsoTK228DWjljRYoCg=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kontact-24.05.2.tar.xz", + "hash": "sha256-QCeAqSh0LBvG4idkTPlYY9FwtZJJcxz0XsUOk8ibqsU=" }, "kontactinterface": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kontactinterface-24.05.1.tar.xz", - "hash": "sha256-FY/zt6m92hhu0Lhjzs6LmAVPR12zPrYF0PDcMMl7eL4=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kontactinterface-24.05.2.tar.xz", + "hash": "sha256-bIVK5cvJN/Sbxjia0ueDvOCrY9sK9nrNKL/EmwSv6RU=" }, "kontrast": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kontrast-24.05.1.tar.xz", - "hash": "sha256-TplBjBVEK8jNAk2BZI8ADZjiXbts3E4mQmG0BGvfnX8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kontrast-24.05.2.tar.xz", + "hash": "sha256-lLdQGX8ocgr9jUNfR95LFOSEGt0/vGY6HOc0gwy3x2Y=" }, "konversation": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/konversation-24.05.1.tar.xz", - "hash": "sha256-NXmP2VIimCjkR2mNrmxDYmRWpbpcQy8yx0jsbT15FvU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/konversation-24.05.2.tar.xz", + "hash": "sha256-VPMPbdk1EEqpEyaJN26OpzFRK7jqQhmbiiSOJmhmL9Y=" }, "kopeninghours": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kopeninghours-24.05.1.tar.xz", - "hash": "sha256-wmvg/pCO7w1+g/7iRtu3he17znT+ESyMbC/YuXNviaI=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kopeninghours-24.05.2.tar.xz", + "hash": "sha256-ZI7NiyK08JCWdM46mR9zFn5mSLiuNeaJ+BbRsPWDUYw=" }, "korganizer": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/korganizer-24.05.1.tar.xz", - "hash": "sha256-1/du2M+yTsWU3Qi6p4vLY7dyiFkos4cIl1WrE3lmYfU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/korganizer-24.05.2.tar.xz", + "hash": "sha256-BMWhZibiZRGdJOte/nweyTJH/1v+3nmZ85YFaIijioM=" }, "kosmindoormap": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kosmindoormap-24.05.1.tar.xz", - "hash": "sha256-keXxLrLi+JmhGOGwtT/aVaB2VmyFBPqAzm81uHA92Dc=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kosmindoormap-24.05.2.tar.xz", + "hash": "sha256-lW598R4olXhmye5N4NCLalns92mGJ5npXNQkaDeCzMY=" }, "kpat": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kpat-24.05.1.tar.xz", - "hash": "sha256-SUhuHwIjlx45N+Nkg8rCAndqos+p8Q1oGTOViRFufNc=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kpat-24.05.2.tar.xz", + "hash": "sha256-PntCbu4JBbyRqMNcNgMeinLvlv+LWY5SS2suguxeobA=" }, "kpimtextedit": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kpimtextedit-24.05.1.tar.xz", - "hash": "sha256-+Prz/7I0/NkhRvc2qOstxOujABbQTkd6s56GJLVM/DE=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kpimtextedit-24.05.2.tar.xz", + "hash": "sha256-Sggc8ZYxesW7nR0f2Vynl2Xs1WN01708MFHqGaWFIdU=" }, "kpkpass": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kpkpass-24.05.1.tar.xz", - "hash": "sha256-7xlGpAVm6D43NOBvC1BaWgRrN37bE3bMV5bbvC6F78g=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kpkpass-24.05.2.tar.xz", + "hash": "sha256-nQNvYxMTv/DEx4sri2hw7tPU+Z4zh+UX+xYVO56qF7M=" }, "kpmcore": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kpmcore-24.05.1.tar.xz", - "hash": "sha256-XaRpNPefK14X3EmNTwfpX/MDtiWGLt9Nk+orwqir0Zg=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kpmcore-24.05.2.tar.xz", + "hash": "sha256-joZGv+mQg0rLvlYUkBWq7NMJnMLpEVrHQmotiHR3Nds=" }, "kpublictransport": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kpublictransport-24.05.1.tar.xz", - "hash": "sha256-RwcJDfalp780K0hNvAe89ifmD49noNgAnLLfaVqRobY=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kpublictransport-24.05.2.tar.xz", + "hash": "sha256-UgY8+Kh+MB0tg3dZ2F+5AzIBmiWLVnvarsSnh22d6Lw=" }, "kqtquickcharts": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kqtquickcharts-24.05.1.tar.xz", - "hash": "sha256-W+jsw2xi2rjCphPSNtKhEnwIumWhX2dyCAzYG6uhHMM=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kqtquickcharts-24.05.2.tar.xz", + "hash": "sha256-CJxiIMFQxh8cnhyH5vPU6ODn0vMka8eYMtx9es7DFiw=" }, "krdc": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/krdc-24.05.1.tar.xz", - "hash": "sha256-gpDi/S9K60s5sFKDchMGJMN6sN360J6+MABxcIkzZLQ=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/krdc-24.05.2.tar.xz", + "hash": "sha256-sIyU9zaqqMCCaJWuFVIwuaJcX0AwbK6tpaRSOoieiXc=" }, "krecorder": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/krecorder-24.05.1.tar.xz", - "hash": "sha256-qCtSbTtIEhWbESKrZlbz7hu2xpogB6cVcoATaDm9ZjY=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/krecorder-24.05.2.tar.xz", + "hash": "sha256-Xg2dryjji4SyQUbJHl9CQGGKYG2nsGgNBDCCyG06k/M=" }, "kreversi": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kreversi-24.05.1.tar.xz", - "hash": "sha256-Hfawd3FgvoqUEWrAcjko5f5iPImoW2RCdpXte7OjmT0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kreversi-24.05.2.tar.xz", + "hash": "sha256-UBkxBTOiwpS7HIzmufFUWQLritx22FKNQANALOgMMO8=" }, "krfb": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/krfb-24.05.1.tar.xz", - "hash": "sha256-5z08BLUmHXyoPzYkDQVTajqloEW0e1JKVhkg2/XZFoI=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/krfb-24.05.2.tar.xz", + "hash": "sha256-kTH8dnQtzagi+FIWpL2QLM2GfdXMcto4EC6zpuYmt4Y=" }, "kross-interpreters": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kross-interpreters-24.05.1.tar.xz", - "hash": "sha256-PBkZBM/gYbFNYzDo4Afg6hUiaN+R6jtaQ/Uc3I/Qyac=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kross-interpreters-24.05.2.tar.xz", + "hash": "sha256-ON8vPrmU5UtfES2XGMZWNqR02nReDuR/m/HlXv5WNYs=" }, "kruler": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kruler-24.05.1.tar.xz", - "hash": "sha256-wTYnGKvc4GziU5moyAU3MuAXDcQJaD2U6aahzLd2X2c=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kruler-24.05.2.tar.xz", + "hash": "sha256-mIX7BXqGoGqyX8To1lUE+mqcrRa9/FevkVWlvVSyhpc=" }, "ksanecore": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ksanecore-24.05.1.tar.xz", - "hash": "sha256-laXG/54FnoM698cwCK5axV6vjDVLoS7i9hRikFAgClw=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ksanecore-24.05.2.tar.xz", + "hash": "sha256-qUObb2hjY/oyxvSlKH6MXfhlRwFeZLiFh2kdZEkuyV0=" }, "kshisen": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kshisen-24.05.1.tar.xz", - "hash": "sha256-jX6bHbPTmTtLOBLKcP46j9+bES9ytnqrE3a4E/gLUcQ=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kshisen-24.05.2.tar.xz", + "hash": "sha256-wflOYeGHl5pDH3QmkmnSA+XCAo5TNL5zLtDxuqlEoq8=" }, "ksirk": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ksirk-24.05.1.tar.xz", - "hash": "sha256-ft1pycmYOgSVSja8c0nwWmW/+UnWV0etzKNxfeXELrc=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ksirk-24.05.2.tar.xz", + "hash": "sha256-iWLom5Xy+UYHca/uODYInNyh+/RIeRh1PTpTRy76KU4=" }, "ksmtp": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ksmtp-24.05.1.tar.xz", - "hash": "sha256-ciNXhSV4NP3zFlGfW7BB5Ov2qGI2Bq7YFrYKZ2RJD4w=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ksmtp-24.05.2.tar.xz", + "hash": "sha256-i0BLahRlrU8Nc4lYt5Lb1bZZ4wFzjiSOja8cF2JV8+w=" }, "ksnakeduel": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ksnakeduel-24.05.1.tar.xz", - "hash": "sha256-jhfXVjjDc61K89pDbwguW7BNAdTfn3LpKTD+lkbGhE8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ksnakeduel-24.05.2.tar.xz", + "hash": "sha256-6yRBxuSowZREulIj2mhXmSCgcNkwm6NUbbChxVf+aIc=" }, "kspaceduel": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kspaceduel-24.05.1.tar.xz", - "hash": "sha256-RLFVo/A/Ue4Zpq95lDLcBsswCMvoJmnK0TQGxFFa0x4=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kspaceduel-24.05.2.tar.xz", + "hash": "sha256-QHExUXgS9rZRttNkXcp4XJqWaWfSuyo5TP9JssToUhM=" }, "ksquares": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ksquares-24.05.1.tar.xz", - "hash": "sha256-+B8ooOKACW8lDCbG0ReZFfbYa6arXiMVrs876uaLoOQ=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ksquares-24.05.2.tar.xz", + "hash": "sha256-O7w0Vs0hZDylCXofZtZkDXhrweMMSD8HgKPclyO2tNo=" }, "ksudoku": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ksudoku-24.05.1.tar.xz", - "hash": "sha256-LgjIMaotY5Xn7He4uNh+y0Mje6fiKIvh1PCrwXPeQCI=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ksudoku-24.05.2.tar.xz", + "hash": "sha256-YKHEJbehEYE4bL5Whf4RmDIlMju1opjqA5J6Iyqgz8M=" }, "ksystemlog": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ksystemlog-24.05.1.tar.xz", - "hash": "sha256-KnmjmWb0rmnv3iRGE5/dAXQBjZNl5FytVh8J8xIHyqk=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ksystemlog-24.05.2.tar.xz", + "hash": "sha256-8RnI75N7r3mUy0ftdKrfx+TpSL43e+bBI7airQv2n/4=" }, "kteatime": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kteatime-24.05.1.tar.xz", - "hash": "sha256-nyXNc8otWaSvS2ikED2hCLZmtShMdhQTxI4fHWcUlTU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kteatime-24.05.2.tar.xz", + "hash": "sha256-KsMatqKDwO+p0/IhDwTUaK415Pln2HzyiGw6yYImTsI=" }, "ktimer": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ktimer-24.05.1.tar.xz", - "hash": "sha256-pOOgXoS+huTfWL0+MJaw8RFJpOIh0WNRH9Z5Rr741kk=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ktimer-24.05.2.tar.xz", + "hash": "sha256-1xbKNSIhkLmfOKGd4ZMK6zctWLlNB+BX15iw23rnbug=" }, "ktnef": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ktnef-24.05.1.tar.xz", - "hash": "sha256-R2BLjGARRIHCfF9DF7Mz/B+U4yhBimgn9hJk6tXDjH8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ktnef-24.05.2.tar.xz", + "hash": "sha256-CBVKFSJPY8ijE1lt3V5wL9SLzEM1BzBpjMZqC6MbIew=" }, "ktorrent": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ktorrent-24.05.1.tar.xz", - "hash": "sha256-wNLIvBhdTzNTIFddTeTAdZdgDbjY2eT9OPg1IreSF7k=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ktorrent-24.05.2.tar.xz", + "hash": "sha256-AE8JIXqhNTKtw+osrgTtcEPAbhxNnZYTz1ZmlwlkJtU=" }, "ktouch": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ktouch-24.05.1.tar.xz", - "hash": "sha256-IT8GgCRIvxfyz4ORvndlO8FbZONPMRQbM781U9f5XYU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ktouch-24.05.2.tar.xz", + "hash": "sha256-hSHVh7NBgrgSpN6mmbNI5eZMsfjPUVkXP62+mFfQZpg=" }, "ktrip": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ktrip-24.05.1.tar.xz", - "hash": "sha256-T+iUJvWiYbL8M94wrbwKVAUyGxPl4dZEoDSqdyrEmzc=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ktrip-24.05.2.tar.xz", + "hash": "sha256-TocRWzrVJVrvXsqkP0n3QyaNy+KY5OiZsTnDalDA08I=" }, "ktuberling": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/ktuberling-24.05.1.tar.xz", - "hash": "sha256-HLDFPRJJ5OgfjtcVW3LoUqonTTM3WnhsXr8vK0eo4gA=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/ktuberling-24.05.2.tar.xz", + "hash": "sha256-WawPL1ycP56CX9GmEzloBaLnDuK+hsTKIdL44Aj80ZU=" }, "kturtle": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kturtle-24.05.1.tar.xz", - "hash": "sha256-G8od87CFVoLqvGzAoUVQdTAka675iBoJ8mdG7nMzCac=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kturtle-24.05.2.tar.xz", + "hash": "sha256-waZIrr37RX02a3FBxYTQARAAM9rJqURB/7kWTP8z+dM=" }, "kubrick": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kubrick-24.05.1.tar.xz", - "hash": "sha256-7kK7kPn5ghGHiBZw/af2ytJuKSxKyK/USbT9IRpNhLU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kubrick-24.05.2.tar.xz", + "hash": "sha256-f+cd7s45HWrW+plwh2RPxX07M4Q4Ds4bbac+45bMrBY=" }, "kwalletmanager": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kwalletmanager-24.05.1.tar.xz", - "hash": "sha256-HCl79FO5LMVpt4Wg2DhPpmL0hbFjxSm+FyN5i5HBOag=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kwalletmanager-24.05.2.tar.xz", + "hash": "sha256-w1Sdsrwo/Pxtfit8nv3bFJeMB/fUvBCgKtOhxulbwvw=" }, "kwave": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kwave-24.05.1.tar.xz", - "hash": "sha256-fd5QLMFKvohgK58T//4cgWumd/QfDzb69r2xd3KhbdQ=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kwave-24.05.2.tar.xz", + "hash": "sha256-DoG1DSGjnBqVfQzUH/IOAGgcCOUImL7/YclpyGpXb7w=" }, "kweather": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kweather-24.05.1.tar.xz", - "hash": "sha256-y6D/4DrUjogJp+XyVgsQm8TeDbIvC2t6Kn+RIQ7e8VM=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kweather-24.05.2.tar.xz", + "hash": "sha256-F423NaZKbPgwP0UCLooy2P+2psOQnEmI2LMBwhodDRY=" }, "kwordquiz": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/kwordquiz-24.05.1.tar.xz", - "hash": "sha256-4UCVe8k8Pbnynr8Q0vxKpHd862pAweMnKiQEbLRBp4s=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/kwordquiz-24.05.2.tar.xz", + "hash": "sha256-AJnkGl9Fdx0miCcqOnCMjlxbB4GlbNqaOL8AFfUScOo=" }, "libgravatar": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libgravatar-24.05.1.tar.xz", - "hash": "sha256-xEG6DyVTaWWYMn9hOFZdPVvfz6E1C6E0c/ZeCLM4PHM=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libgravatar-24.05.2.tar.xz", + "hash": "sha256-nm+FT360ZOp2q/54hgd40ibB4DjEdAjERQXCZnOIZnY=" }, "libkcddb": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libkcddb-24.05.1.tar.xz", - "hash": "sha256-cbcrGbcPQomAx+NIep6U5n1FN+ulaDTposCg8HtOKv8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libkcddb-24.05.2.tar.xz", + "hash": "sha256-NjEPZAFSTD8kf8ti5aWZauQ2PsBaUpBVJMzKUR2DUyw=" }, "libkcompactdisc": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libkcompactdisc-24.05.1.tar.xz", - "hash": "sha256-EDQPPGO012cCtcx+wrNq3CrnW//h3SHSSkNfQhpGThw=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libkcompactdisc-24.05.2.tar.xz", + "hash": "sha256-Fb+UM/fws+I2mMED/UKrnkSyPu7cJoHPsptyrIrdBtI=" }, "libkdcraw": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libkdcraw-24.05.1.tar.xz", - "hash": "sha256-z/qhzbnR9OxE5I0S7QAH+nC1r2JfVIF4cQUmskIdqno=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libkdcraw-24.05.2.tar.xz", + "hash": "sha256-WevBY07M/FuaEMkuwqufPkkkXCBEaSxs+3FyOaKLiig=" }, "libkdegames": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libkdegames-24.05.1.tar.xz", - "hash": "sha256-W1orwUCGjr99LKfIVYvr+EE81Awu2y3a4TwkS6aEdBQ=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libkdegames-24.05.2.tar.xz", + "hash": "sha256-6vIWt5MzMqDT4FU/11mIL+0i1Zs5gGduX26XZRWkEOs=" }, "libkdepim": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libkdepim-24.05.1.tar.xz", - "hash": "sha256-hjqiiceJIlXv2qmyHTiYBO6T9Y4UebmdxvTQGIGbtO4=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libkdepim-24.05.2.tar.xz", + "hash": "sha256-A9NqVVUqwmXXuEwQjsc1OHUIMC5XfH8jkrqi6rrEQsw=" }, "libkeduvocdocument": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libkeduvocdocument-24.05.1.tar.xz", - "hash": "sha256-mirkGF0duYtp+gQyAuG3zf2LCOYYPk+UTJslkeVI+nU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libkeduvocdocument-24.05.2.tar.xz", + "hash": "sha256-MvJ6OZmpCjV4/AOTfs9D0xyX7w21/e25wKza3HAYshE=" }, "libkexiv2": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libkexiv2-24.05.1.tar.xz", - "hash": "sha256-o2ZwZkLpX3jrug8U3fO6NDyFTaAD3iQo8Qd1Gp+iqj8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libkexiv2-24.05.2.tar.xz", + "hash": "sha256-kFlfYeL03LPYsyywpKHH9PxeMQURGt1RTJnbJPc04xM=" }, "libkgapi": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libkgapi-24.05.1.tar.xz", - "hash": "sha256-kjD/7ZBZvfXZDg+ipWthhzAjrdd67FCsbOtKNNA1eLQ=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libkgapi-24.05.2.tar.xz", + "hash": "sha256-wxfJbJlnCP+Guy4N4N3NtUKFlIsTbjBzlpxgyfhfGUg=" }, "libkipi": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libkipi-24.05.1.tar.xz", - "hash": "sha256-0U7A9TRPXU06n6kn9YPqfImp/npg8C2t7YdIQs0okDw=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libkipi-24.05.2.tar.xz", + "hash": "sha256-TAbakUqzvZUpdswTXSTDB+ly7wAHx1RzjzZE5WfbiLo=" }, "libkleo": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libkleo-24.05.1.tar.xz", - "hash": "sha256-3tugP3zKj/s4Q+zeP9t0lsV3ZtRTKMHxfWAjN3yZkyY=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libkleo-24.05.2.tar.xz", + "hash": "sha256-QL5LcdUBVdWFsUNlXaksFLsgEpDmIgPaFs5XbfrXXoA=" }, "libkmahjongg": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libkmahjongg-24.05.1.tar.xz", - "hash": "sha256-RnY7kLJibi4pShVcIvGtG6yF1Zf1lNW/yTECc/6Dfmk=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libkmahjongg-24.05.2.tar.xz", + "hash": "sha256-w+zk0wT/kMqa2XKKLajuOzsZgnfQElwwSZzsyafNWq4=" }, "libkomparediff2": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libkomparediff2-24.05.1.tar.xz", - "hash": "sha256-K3sxhUTpPraFE+TemWD9eCW71fDIruzhwBY+9MZi7YE=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libkomparediff2-24.05.2.tar.xz", + "hash": "sha256-Hg6CiG8xhqtA3rvaR18W1vGSKktVRlQLnMIm0pqWn7w=" }, "libksane": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libksane-24.05.1.tar.xz", - "hash": "sha256-0IA3XLAhz+4FCtsnhXpmk4kNKgp6zcLaOKKDAKGK3QY=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libksane-24.05.2.tar.xz", + "hash": "sha256-b9z22MOJY9xGxgxo7OTwcib9XVoO4WRMkIuveXq1Stk=" }, "libksieve": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libksieve-24.05.1.tar.xz", - "hash": "sha256-LkFEuL28wxmhXDWOeBXtzzMiYA3YUtX+jxb2g+Z1Zu0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libksieve-24.05.2.tar.xz", + "hash": "sha256-ZzyFr+WsZy03L+SYCEusLYTk6jzkteuR8Iv6TD1BTP8=" }, "libktorrent": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/libktorrent-24.05.1.tar.xz", - "hash": "sha256-a//w9PGyadgt/ii7KeDYEyLhMdOtKUIyB6iVfbcySeU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/libktorrent-24.05.2.tar.xz", + "hash": "sha256-KP3EfzSP7lHHcWrIMlY7MFrL7FLJ0pvhbrN8mcAOI78=" }, "lokalize": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/lokalize-24.05.1.tar.xz", - "hash": "sha256-rkXAYMRMu7TjXqfbb/wgr6ASXjWyt+z0yOfxTuVz3rA=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/lokalize-24.05.2.tar.xz", + "hash": "sha256-uq7Y47kTpM5XJvZujzETp0gN/uCN17/X+0cJ8YeaCnA=" }, "lskat": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/lskat-24.05.1.tar.xz", - "hash": "sha256-dvkngYigSBcK9u3muoz5BIbF1NCwLvemiVsn62w+Ew8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/lskat-24.05.2.tar.xz", + "hash": "sha256-XN+pureJAoh9BWxMF6YAX5nkVIQ5Jsz0oWxkOT/Cr9w=" }, "mailcommon": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/mailcommon-24.05.1.tar.xz", - "hash": "sha256-AhvIk/u8qhdCUNFtLIJosp9DLoTJa4CeHOVCf9q6N7Q=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/mailcommon-24.05.2.tar.xz", + "hash": "sha256-2S39QeiLWna3oa5ZzZm3ZvWk2X94dn7bDqHbghF4Q2g=" }, "mailimporter": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/mailimporter-24.05.1.tar.xz", - "hash": "sha256-a6O60S+2oC4YdzQFxeKz3N1hYCH3IRjWI3KDzle5r1s=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/mailimporter-24.05.2.tar.xz", + "hash": "sha256-T5QeNcfQjKtHQLDnGrvG7CoG62HfKsEQNXEJ7cH5XEI=" }, "marble": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/marble-24.05.1.tar.xz", - "hash": "sha256-NG+/mnxjp7LVD+et3lVU7Xfzn7S1nY+S9Cw62+mpad0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/marble-24.05.2.tar.xz", + "hash": "sha256-gKcnu6L16Il13feLQdlpuwrJPPZEeSTbM2PM0uJaP4I=" }, "markdownpart": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/markdownpart-24.05.1.tar.xz", - "hash": "sha256-eTg4rcbVVjy9FOY3shDnbX8o8jPHXb3wksYhnS/cDeE=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/markdownpart-24.05.2.tar.xz", + "hash": "sha256-XW1/MpBLVZtDBjSIlUf9FomFWqhvqLCLD4bc02wodRQ=" }, "mbox-importer": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/mbox-importer-24.05.1.tar.xz", - "hash": "sha256-cC3PFlIrB3DM8pB0tbh68ohmbsaIYdbSL70ZmC7O4Xk=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/mbox-importer-24.05.2.tar.xz", + "hash": "sha256-AijqERgF4zmXjPmgXJJjXxPkTDd/zAXknOulXy8KdAM=" }, "merkuro": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/merkuro-24.05.1.tar.xz", - "hash": "sha256-/pC3b+OtcxXq/fYWGhhvMQ3H7Ii9c+Fvwn0GYiCwRq0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/merkuro-24.05.2.tar.xz", + "hash": "sha256-0NF0/Ap5RmyHuh/QozwiMOieeBxzA6+M6bSTZwBS1lg=" }, "messagelib": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/messagelib-24.05.1.tar.xz", - "hash": "sha256-2iCRYW3cO4ACAxlCsuh6a7SquqM7F9Upj1VY88FPNkY=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/messagelib-24.05.2.tar.xz", + "hash": "sha256-9F1RYNR0bBfJKy6afA59dAjw5gDj0cDlyMk6/ANU9dQ=" }, "mimetreeparser": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/mimetreeparser-24.05.1.tar.xz", - "hash": "sha256-zURmu2KnBVMUyuELivYwl+L9NYgScRN7dOo2kIhrODY=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/mimetreeparser-24.05.2.tar.xz", + "hash": "sha256-iSlXFXt2sJDUXDYgSw3fed5KpiI8LXznXrYrihWnWow=" }, "minuet": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/minuet-24.05.1.tar.xz", - "hash": "sha256-xj7Cwk1HtO5eWUFCURfDMnJh45R1taQkqDsT4WZogdw=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/minuet-24.05.2.tar.xz", + "hash": "sha256-D35l8aJ9fEFH2pd4yQOu4DGpoLwu+9n98pStYZkhWnM=" }, "neochat": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/neochat-24.05.1.tar.xz", - "hash": "sha256-GDLeCLOsKTOL/96tXuylputCEN6pJBKIM0+8tL2Qz9c=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/neochat-24.05.2.tar.xz", + "hash": "sha256-z9QZqHy75f7L14MxiSVe4vWCtOH7D0+Ive9+YKkvvI8=" }, "okular": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/okular-24.05.1.tar.xz", - "hash": "sha256-0ZhqGrkoBLrT6ihyWNq4UqaRhB4DicXBGuN5XA79tFs=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/okular-24.05.2.tar.xz", + "hash": "sha256-5xjUiEtG+/QwAzwu0OgMtQ5tR252zP2koscdhABRA04=" }, "palapeli": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/palapeli-24.05.1.tar.xz", - "hash": "sha256-7xljnVCx6Ay3yVstel6hp79B3oYOjIe5pbbAXFJ4kOo=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/palapeli-24.05.2.tar.xz", + "hash": "sha256-ZG9AY42SaexQTkdEKuHQVkJoFP9VpYvmOEvem93KZpA=" }, "parley": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/parley-24.05.1.tar.xz", - "hash": "sha256-D6NhULcQ2TLolKdJ8MINHKKdqu0OJZNCwqwaBN8Qd4o=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/parley-24.05.2.tar.xz", + "hash": "sha256-szEYNr/iZi1OM9Um3wacZaaiGeRy+G89HcomZoy9H8Q=" }, "partitionmanager": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/partitionmanager-24.05.1.tar.xz", - "hash": "sha256-VDrcifnUFU/CrWcWEn4X7jxNb+meH4vkWHZf7RXSDdE=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/partitionmanager-24.05.2.tar.xz", + "hash": "sha256-xncmOePQCWPx92MLmp9q6yWmUFYnnXel6DxLtPnktQc=" }, "picmi": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/picmi-24.05.1.tar.xz", - "hash": "sha256-+RD9j8KGipv5w7N5wvtVzh9aW3dPP+FoScgjP3nonVI=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/picmi-24.05.2.tar.xz", + "hash": "sha256-BXDnesjFdGpI9jXAzBXSNRtgDrBU3+l/By/csyJfo3c=" }, "pimcommon": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/pimcommon-24.05.1.tar.xz", - "hash": "sha256-8tSSS0yjS/5La69DK/4szz06KoP9/Q3xkilJrPmnrMU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/pimcommon-24.05.2.tar.xz", + "hash": "sha256-0L9N43VgM7sO7MDbVzhVhbVPKzZtqKROSmm0FvpU/0w=" }, "pim-data-exporter": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/pim-data-exporter-24.05.1.tar.xz", - "hash": "sha256-4vbyq1TNWP1V3pYOfLdyHY8qrkYnfKyWgCFCbILtJvk=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/pim-data-exporter-24.05.2.tar.xz", + "hash": "sha256-z+lEaoK7VfIRmQ4lVdzJeFhT7GGHqe6r1Pe13kvxx80=" }, "pim-sieve-editor": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/pim-sieve-editor-24.05.1.tar.xz", - "hash": "sha256-aMtnkiWVCY8hDifuRIt8QtmCVy7sj7kygE9QwD3wvf0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/pim-sieve-editor-24.05.2.tar.xz", + "hash": "sha256-cUcJIcyw/2x5NP9B6lHp/ujZO4rw6dxunjEqbjyForo=" }, "plasmatube": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/plasmatube-24.05.1.tar.xz", - "hash": "sha256-MsmAjxeQXcfdXZYBZupYcGUBvG2xF6Esm/1b2IIBN68=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/plasmatube-24.05.2.tar.xz", + "hash": "sha256-NWbtiI9oTGvfEJeRXCBJa0nA6Ppv8etcc5nD/bQPdjY=" }, "poxml": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/poxml-24.05.1.tar.xz", - "hash": "sha256-F1/jV+eDL3VuPtzF2cTjM1KiVAOFpDyyJ8bLSOkJ/x0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/poxml-24.05.2.tar.xz", + "hash": "sha256-M+sU0eYsJ9kN9LqZuuCpJzn7aDpfQz9TL0WsKI/WKCU=" }, "qmlkonsole": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/qmlkonsole-24.05.1.tar.xz", - "hash": "sha256-M4paRT0KeSKiP32wyNaAXZ/i3QbOuwLkTVO3nGWmc9M=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/qmlkonsole-24.05.2.tar.xz", + "hash": "sha256-bVVfhqHxNrM7TeUS158pxDtxTDJvdidKVTR1NwL+Sns=" }, "rocs": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/rocs-24.05.1.tar.xz", - "hash": "sha256-/dYZAgsMM6vKlTjnhkwFc2ZR4TLIizrxIOgyk1AHVtc=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/rocs-24.05.2.tar.xz", + "hash": "sha256-61YdDbM25NYqpl3YEeKk/5WSMPvVpqjTv0eGJsPvGr4=" }, "signon-kwallet-extension": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/signon-kwallet-extension-24.05.1.tar.xz", - "hash": "sha256-7X8wpiSfJ+YfspS3yAXEgkBVaUorBR07emFSvu0bU/w=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/signon-kwallet-extension-24.05.2.tar.xz", + "hash": "sha256-rXfFldJUoCmBXjdgAvA4yn+BoQI8YNeypR5ZJT9xb0Y=" }, "skanlite": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/skanlite-24.05.1.tar.xz", - "hash": "sha256-DDvivYjk1kMyBW19AAgu6yPVqxCE88rZTSQLoupjtD8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/skanlite-24.05.2.tar.xz", + "hash": "sha256-o5swIF6Q+QAqtltsfz/LvGoE44NWDmsCm6q8DuHLGVA=" }, "skanpage": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/skanpage-24.05.1.tar.xz", - "hash": "sha256-D0rUOXv016qJKEpD3nbVbmre0rWeNdh4IT5k13U0KN8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/skanpage-24.05.2.tar.xz", + "hash": "sha256-FHMix7WLqkx25TSO1PfZPKrokv4R4uvu03o1R4loOac=" }, "skladnik": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/skladnik-24.05.1.tar.xz", - "hash": "sha256-LkB0p72gMYtFdaDe/1c0i3PaJFor4VkIFIbdNZm0pyw=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/skladnik-24.05.2.tar.xz", + "hash": "sha256-Dm7S0gFrnfJOFIxvH7eL6bbOD56WTN9clzcTgjsriXU=" }, "spectacle": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/spectacle-24.05.1.tar.xz", - "hash": "sha256-h9H+/JJwOKIVDrm/UntKP4+Ojn243wvl+mT5p6Z2ggw=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/spectacle-24.05.2.tar.xz", + "hash": "sha256-FMFDX7BXqj0IhSnii2QHufT4nV9TmdWIWQRMK3VHbYI=" }, "step": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/step-24.05.1.tar.xz", - "hash": "sha256-nk2OJ5uqOBsyEEYWiJ4VHGumGZ2FqbLCaioBOKQJ7j8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/step-24.05.2.tar.xz", + "hash": "sha256-pEFxOVMUAtcRAW1RZ1rblT8BLBaBsF6P6ciM9LFfJjM=" }, "svgpart": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/svgpart-24.05.1.tar.xz", - "hash": "sha256-D/2h0coIWS885WQW07T6zgvc6/TyNfVZzWXTAJb2i5Y=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/svgpart-24.05.2.tar.xz", + "hash": "sha256-XTvXUYP5bSxCzdVITwxSaksmKCLBWVnEIR0b+rgit5o=" }, "sweeper": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/sweeper-24.05.1.tar.xz", - "hash": "sha256-X0P+uKmWwsANleWmLyKIrtSTGwwdSl9wijvMPGzXBDU=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/sweeper-24.05.2.tar.xz", + "hash": "sha256-RVHLMJsBoycIeQLQaBZCY5HuiKvGuY7bs0lxdA2SLGg=" }, "telly-skout": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/telly-skout-24.05.1.tar.xz", - "hash": "sha256-dHVKismLWXNlLdK5svaFbN1ZBXbfGVnqlRaplUYYyd8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/telly-skout-24.05.2.tar.xz", + "hash": "sha256-NJUpb6dKqqT0MPBRfyunPmCA7+A6HvwOFaMLMiEUcoY=" }, "tokodon": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/tokodon-24.05.1.tar.xz", - "hash": "sha256-lxd6XGtAWjn7DmjeSeNCPTxk5xDy3ye2Xn4k3vEh8bg=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/tokodon-24.05.2.tar.xz", + "hash": "sha256-mvfw33He/WvL0mTPfsS09ukThHL/uazvsGAfN7c9cus=" }, "umbrello": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/umbrello-24.05.1.tar.xz", - "hash": "sha256-Km/GYDgQJXvSv+1/Vg7omcEscrzp6t0NvhXFgjul434=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/umbrello-24.05.2.tar.xz", + "hash": "sha256-k8v3DnYJhKkdTwjW2mad2DbmH8Oh6m4/5SuZGWBJyKc=" }, "yakuake": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/yakuake-24.05.1.tar.xz", - "hash": "sha256-DgcP8UiijN2UpUvyQ3r3U8BONadZY7C/96BtoHlnIw0=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/yakuake-24.05.2.tar.xz", + "hash": "sha256-okfFmLGgPj5g3BnnGIWgKGk9W+HSH7nHzzLeFvC29y0=" }, "zanshin": { - "version": "24.05.1", - "url": "mirror://kde/stable/release-service/24.05.1/src/zanshin-24.05.1.tar.xz", - "hash": "sha256-UFngnjBZ2MYKyNjpqOJPeYokXob9CFaZ0RzL6V8I2r8=" + "version": "24.05.2", + "url": "mirror://kde/stable/release-service/24.05.2/src/zanshin-24.05.2.tar.xz", + "hash": "sha256-l6JerayGUSLdADLLPBsoLak1+g1nk5FQZILRdSMrWWA=" } } \ No newline at end of file diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 24e1f204ee26..1da25c36b372 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,322 +1,322 @@ { "bluedevil": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/bluedevil-6.1.1.tar.xz", - "hash": "sha256-cbaEsptZbByLYDoifvjJswrlF0wnDVog/dS0tthy16A=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/bluedevil-6.1.2.tar.xz", + "hash": "sha256-K/nrgT5Ol9WedgENLiuhRVJd5Ogm155YZNInfHPrQes=" }, "breeze": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/breeze-6.1.1.tar.xz", - "hash": "sha256-iUP/dMTLFrGzwD7qDMo5gh1ES+pg3BY/8Y4r0xNglyU=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/breeze-6.1.2.tar.xz", + "hash": "sha256-1FbcUNlBxJQCCemqUBHV6SAt719lutx+qMbUsqxHfc8=" }, "breeze-grub": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/breeze-grub-6.1.1.tar.xz", - "hash": "sha256-e8I83/5IkprzeL0uL9VpY1mknXWdRJFOGssFJex/5WE=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/breeze-grub-6.1.2.tar.xz", + "hash": "sha256-SAT/QJspSGlkxeRyjpswAdL8Zq0xls+Uwc5U9sVELA4=" }, "breeze-gtk": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/breeze-gtk-6.1.1.tar.xz", - "hash": "sha256-p5787M7oWtlUhPjmSr8JItjUoMtUde3RACSvlHxOjs4=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/breeze-gtk-6.1.2.tar.xz", + "hash": "sha256-W5/RcOtvnpQ4hopexgd4igCo8PqY8+XHxHqUVdzK7BE=" }, "breeze-plymouth": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/breeze-plymouth-6.1.1.tar.xz", - "hash": "sha256-8BHr1RBaervFrz2jVQBG8UO1rUX9hQd0KaBY6RA2dxo=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/breeze-plymouth-6.1.2.tar.xz", + "hash": "sha256-VrbRrRKJao5sfqP50CpK5WhNl3IW9oYmCxlq4KMO0Oo=" }, "discover": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/discover-6.1.1.tar.xz", - "hash": "sha256-GOcAU+flHTLELjcTCC5Q6BhiooEXV6lcmNm2hpLTi14=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/discover-6.1.2.tar.xz", + "hash": "sha256-bqi0troUNV/+Br6QNlhqKcwB/GpHUhxvHj+dgYXaXJk=" }, "drkonqi": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/drkonqi-6.1.1.tar.xz", - "hash": "sha256-Z+/eulH1OSz/QshKVDdFbGNK4laWrKOpw64ocFpmUU0=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/drkonqi-6.1.2.tar.xz", + "hash": "sha256-qgBb8y5ZDSy6KNS9qrs733VFAuq5aqvUrI4aUCMrJqU=" }, "flatpak-kcm": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/flatpak-kcm-6.1.1.tar.xz", - "hash": "sha256-sc4cl8pPPlAKZAMPvmcjO9M3mKc8XRH4JB662tqjNog=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/flatpak-kcm-6.1.2.tar.xz", + "hash": "sha256-fu3Za0Cq8aquQK7fduX4ZM+zyylas4D2c9x2gZZ1N2g=" }, "kactivitymanagerd": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kactivitymanagerd-6.1.1.tar.xz", - "hash": "sha256-x8DdKkkJAd/PLwlA9TefvhtJ+bMokZ3YBLrq7PlIWqU=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kactivitymanagerd-6.1.2.tar.xz", + "hash": "sha256-CKLPz/A0MiSSRfhheLS4Umi//3J9iwq10CBjULjCyv0=" }, "kde-cli-tools": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kde-cli-tools-6.1.1.tar.xz", - "hash": "sha256-oyo5V9WkwkUBxv5xc11ZK+j57oclLYwnMDIs8wdf/ME=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kde-cli-tools-6.1.2.tar.xz", + "hash": "sha256-cYFywGbalVmRkh/ovgOKlzgnOexlPrXQSrK1zIHRdRs=" }, "kdecoration": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kdecoration-6.1.1.tar.xz", - "hash": "sha256-zxxT0rbojJeMhVfWwLzTSZr/1prsWtXw2ECzgR5ngyM=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kdecoration-6.1.2.tar.xz", + "hash": "sha256-gehd0ni8/uPJDxtfkI7oXyie7mr60dZJZPmQ+cbtvr4=" }, "kde-gtk-config": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kde-gtk-config-6.1.1.tar.xz", - "hash": "sha256-ciZiu3tv7G7yHs8dbaP9qUvq2mvUWMBfK3b+eqU5l6Q=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kde-gtk-config-6.1.2.tar.xz", + "hash": "sha256-6n/NJQPyudrFdv+R83YUSw6qcnRx0NcjqjJH7H0jNiU=" }, "kdeplasma-addons": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kdeplasma-addons-6.1.1.tar.xz", - "hash": "sha256-17MGSyGct4o3pa/0lhIuJQisvWqJRn4oImRYtXS+wSo=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kdeplasma-addons-6.1.2.tar.xz", + "hash": "sha256-bAzj5OosXmunSXnzrQ3C1Gcp8yNzL5BnW0fqtJKEEuE=" }, "kgamma": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kgamma-6.1.1.tar.xz", - "hash": "sha256-PQwFkR5tZ/3cxsLkkDwOjffq4BkaWC1XGZCC1TnvyKI=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kgamma-6.1.2.tar.xz", + "hash": "sha256-yz2OcBsaunvYKGsNGWA/uTsN1fHgb1Lej+EooWZmJmM=" }, "kglobalacceld": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kglobalacceld-6.1.1.tar.xz", - "hash": "sha256-OsdZZCQy1EFaaheFbzOqCetv2pnYhrMac5B/0wDziwA=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kglobalacceld-6.1.2.tar.xz", + "hash": "sha256-J7OeZ0prZroFs04YG4s57QhIU72HoHLzMzzkxCOmaNw=" }, "kinfocenter": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kinfocenter-6.1.1.tar.xz", - "hash": "sha256-3z7tLSvYVfgAgCYo7sB1ZbctPJKy7Rw488Xiz4Sw7ig=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kinfocenter-6.1.2.tar.xz", + "hash": "sha256-YcAro0UeMyTb9UrzFM78TzibCcnT4K1mYT/sI5/esDw=" }, "kmenuedit": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kmenuedit-6.1.1.tar.xz", - "hash": "sha256-j4Kbms6XdSmdQ8e0qU4KqzOyhf7prwU/5oljadc8JOI=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kmenuedit-6.1.2.tar.xz", + "hash": "sha256-lFS0eEAcDrb8TZDzmcrZpRalqgNmPQiiiRbZYgSv13M=" }, "kpipewire": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kpipewire-6.1.1.tar.xz", - "hash": "sha256-ah1aum6vUwYFuyJRTLsXoUTT6MfBpd3w06nOa0gfdoY=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kpipewire-6.1.2.tar.xz", + "hash": "sha256-JQ9QXXI/tx/fta9fieT4ePYyxTT7KwG6C7s6wZFw1XE=" }, "krdp": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/krdp-6.1.1.tar.xz", - "hash": "sha256-pnBcnksiY0mrp2z2ylliF6DBdzEDDYRheoIXi9r7en0=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/krdp-6.1.2.tar.xz", + "hash": "sha256-D7Gt2cy4YNumaqgNPk1cl6R5asboGZ89+4lfF0r84XY=" }, "kscreen": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kscreen-6.1.1.tar.xz", - "hash": "sha256-3OURnXW5ML859y4Qq0vsTTj5F1+y8C4QNo3JjXyIO/k=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kscreen-6.1.2.tar.xz", + "hash": "sha256-f4VKaWqsWuAcRFbHzhiDfhubDB8W3w0VBfHoPgI5vVw=" }, "kscreenlocker": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kscreenlocker-6.1.1.tar.xz", - "hash": "sha256-VdU6Bfc31TVp6uwledZVzFyjNl3VrlGHgRGYy5XGcak=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kscreenlocker-6.1.2.tar.xz", + "hash": "sha256-urMbZw1LsIJ2AyF5c4x1k6xCkOgdx+wchEJYEpccYto=" }, "ksshaskpass": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/ksshaskpass-6.1.1.tar.xz", - "hash": "sha256-Ltfd0g9kVlts4MSNdNvbRY6HqARZPkRFm+bhxLdT3ac=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/ksshaskpass-6.1.2.tar.xz", + "hash": "sha256-SfkMfFiWyqEs5UlHReAIQYUZF+2xecHnemizh6Labo4=" }, "ksystemstats": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/ksystemstats-6.1.1.tar.xz", - "hash": "sha256-8gfqRhEUPKj4tmCaic30g7X4tJcjTghSFWMahIxOKqs=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/ksystemstats-6.1.2.tar.xz", + "hash": "sha256-MdTU957UUsnMY2JyLBtiGQfM+VJCJA5tVAIbOYA1aTs=" }, "kwallet-pam": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kwallet-pam-6.1.1.tar.xz", - "hash": "sha256-LH8hj0fDcchUOd23cejRjUdXzs2H2nR9O5oudk1tDHo=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kwallet-pam-6.1.2.tar.xz", + "hash": "sha256-51QbihAofWrtMCD/S5KHSSVR+JeXI3m+pIrqmEUK67Q=" }, "kwayland": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kwayland-6.1.1.tar.xz", - "hash": "sha256-3JHUr7c72z6rYFKFoQJYkD48EVqYcqwLp5LO9GiP24U=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kwayland-6.1.2.tar.xz", + "hash": "sha256-xqIz7GvMZALzQ5hWQjHvKC/BAbTGlzQBCAxLBTFbtZU=" }, "kwayland-integration": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kwayland-integration-6.1.1.tar.xz", - "hash": "sha256-yL1Xas0uf+xw3SqJy1069sfW/Hp49JFq9CW4Ta+sUrk=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kwayland-integration-6.1.2.tar.xz", + "hash": "sha256-CiVhu8T4KzUb5lOr9fRsm0amjzFJVGWqIqWuvpW2lJs=" }, "kwin": { - "version": "6.1.1.2", - "url": "mirror://kde/stable/plasma/6.1.1/kwin-6.1.1.2.tar.xz", - "hash": "sha256-HPDk2ZbM2Sp3tqclYQyjKmDC+uCKmPi3LyqvFWlGTDk=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kwin-6.1.2.tar.xz", + "hash": "sha256-gsWCyDsB1CrI3Wyl+8S42u6hkrVN0chZcD5vAzRVwA8=" }, "kwrited": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kwrited-6.1.1.tar.xz", - "hash": "sha256-pvh6xoSIYzRuhWryDO76PsHCE2DRrwV2j+mwiKE/fH8=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kwrited-6.1.2.tar.xz", + "hash": "sha256-hWSKR2h5yi9tVfoZEYZvL8dRUh0h1UWyMVOeI6CUFsE=" }, "layer-shell-qt": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/layer-shell-qt-6.1.1.tar.xz", - "hash": "sha256-fGDjcwHo80PvSWVJS2AYb9qCeY3Smq27NXEtr2LjT1M=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/layer-shell-qt-6.1.2.tar.xz", + "hash": "sha256-F+hmjMeDlpoC/gh8HbaF4K8p1yDqpYw51g82+fd29Qk=" }, "libkscreen": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/libkscreen-6.1.1.tar.xz", - "hash": "sha256-lhL9g86Cj4Fv1Vznnadyv2Lpa45kV97rXcM2klz8INQ=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/libkscreen-6.1.2.tar.xz", + "hash": "sha256-NtwBufQwiuwbcJlM8VVNryp3+VDbFc0oX87YtBJYl7g=" }, "libksysguard": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/libksysguard-6.1.1.tar.xz", - "hash": "sha256-vB7YBDc4ZdPeUeXhz3rRHEtx6hMREKOUByWwQzLK7lI=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/libksysguard-6.1.2.tar.xz", + "hash": "sha256-gF1o0qFH4Uknd2yaMZj6bofmLQRTO++6dQd2n2LxLtA=" }, "libplasma": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/libplasma-6.1.1.tar.xz", - "hash": "sha256-LyTxDNIyop+h3FYY7jAGCOm13HeYo+L/+wqOQ5zEItA=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/libplasma-6.1.2.tar.xz", + "hash": "sha256-gGFBZOT4wO8AXl0xV7ykp/Qhkl0Wo2oepoQcZlFjIUo=" }, "milou": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/milou-6.1.1.tar.xz", - "hash": "sha256-rxF9ASnqRAv9VEJA7wvdMATmv+i1i8g2ovMG2fX+z4M=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/milou-6.1.2.tar.xz", + "hash": "sha256-lYqQuHWFL7jnDA4yXtFbzsWiRzbuawD3CUYqYzQ5eZc=" }, "ocean-sound-theme": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/ocean-sound-theme-6.1.1.tar.xz", - "hash": "sha256-trYOgt+h/dqCuUy0cF6ShRQxSYKYYKhqgfhI1e0s91M=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/ocean-sound-theme-6.1.2.tar.xz", + "hash": "sha256-y/qE2OhwMG5rIxPzCxYOcUYA8V/lt57Hdk/a8tbpT3s=" }, "oxygen": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/oxygen-6.1.1.tar.xz", - "hash": "sha256-v3GXhxUsM0qC+OfC4LeqGhLEEo6VARMHAm8Ue4/bgtA=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/oxygen-6.1.2.tar.xz", + "hash": "sha256-DF3FnL8VLc0/G9oEW3jVP3AucDJDehYssg7qvIfkaLA=" }, "oxygen-sounds": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/oxygen-sounds-6.1.1.tar.xz", - "hash": "sha256-2FjoAmz4gMTHTxm9WoG3pATKrNM8+Y+kMmGK/2dWzlE=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/oxygen-sounds-6.1.2.tar.xz", + "hash": "sha256-TtL+lCkFX85k2/EAVyRN11Jv7m6BQmOa2JD6ZWk93ws=" }, "plasma5support": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma5support-6.1.1.tar.xz", - "hash": "sha256-+LhQb0Mm6W+RjdbpyyBAunhep50zytV14zy+mE7gttc=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma5support-6.1.2.tar.xz", + "hash": "sha256-8s9zL+9NHwPfh+71qlVsDeRjD9/1DNZNWe/97CNonJ0=" }, "plasma-activities": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-activities-6.1.1.tar.xz", - "hash": "sha256-Pb3ZJAIIxd/SypY+FCJWRFokRZRz7/azKTAn0NPM6NU=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-activities-6.1.2.tar.xz", + "hash": "sha256-PgL8CL23PWVGEFskgZm4amXynWQJBTocYcAVRIcZpts=" }, "plasma-activities-stats": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-activities-stats-6.1.1.tar.xz", - "hash": "sha256-QoRnkP9GHvcM3Nt+3BDzvs8JXgL55hL6GsflJRBNthM=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-activities-stats-6.1.2.tar.xz", + "hash": "sha256-OJbDZPA9a3fcfc2t7JQlMPLBjqm7J+DtGHTDgpYfink=" }, "plasma-browser-integration": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-browser-integration-6.1.1.tar.xz", - "hash": "sha256-QI4lgS60nNP63ysp+O6cXwQZiaEqJnRBIMcxUDjlxPc=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-browser-integration-6.1.2.tar.xz", + "hash": "sha256-AC2epQsIiSoGLOQ+ReSQKpJt5uv3BzIUlGmWcgdemh8=" }, "plasma-desktop": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-desktop-6.1.1.tar.xz", - "hash": "sha256-leOtnDAYzQWiJm+Xf5ZMJBWEXVgc3aEPDxUXzQDJ9k4=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-desktop-6.1.2.tar.xz", + "hash": "sha256-KeQEfEknSt5pliQGlcvavnjBhBgXCAeUBN6/ba2H4tg=" }, "plasma-disks": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-disks-6.1.1.tar.xz", - "hash": "sha256-/usBYRT9rdhi4Yu7hC3eP+hpNdQXXdNW8J5jZkJYpTQ=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-disks-6.1.2.tar.xz", + "hash": "sha256-HxYhy4yrHOTS1dn41NhYUgzwJ+3iz3Sie1v460wZaOY=" }, "plasma-firewall": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-firewall-6.1.1.tar.xz", - "hash": "sha256-JyiCRQe9Ntxv8MK1m5GYmEIVpnpznJwnw//QWrPJOnM=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-firewall-6.1.2.tar.xz", + "hash": "sha256-9uoJIH1GPdHGDaMYQLsmeFBmwUVa56oAtl3zWDhyWUw=" }, "plasma-integration": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-integration-6.1.1.tar.xz", - "hash": "sha256-GAvqiS1t0knpjgwyD8rVVzVDQL1sCVjn/nkow0flWX0=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-integration-6.1.2.tar.xz", + "hash": "sha256-4VojKSishXLaoFQE0mtNERLPGJoFHKy99gQ1Lt2/CAQ=" }, "plasma-mobile": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-mobile-6.1.1.tar.xz", - "hash": "sha256-jqjUaFExJWvNMQsKITCnQKMwO6sxhHCx9pAw6MK0TAU=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-mobile-6.1.2.tar.xz", + "hash": "sha256-1UCfsslKYSjgDkA2zPLPPJtGoHXuJXTq5mH6ld+SUDk=" }, "plasma-nano": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-nano-6.1.1.tar.xz", - "hash": "sha256-r2GJdq5D7AZdc/cuGOut+yXz6tZwYtam6APrEgT601I=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-nano-6.1.2.tar.xz", + "hash": "sha256-Y95FHM8YL12cUAUwx3F0WwE87tc/n971EVqMpka5yrc=" }, "plasma-nm": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-nm-6.1.1.tar.xz", - "hash": "sha256-NqL3CKrFGvkHuIZk+WQfrFVAsfVfMmufIWLuDLV9+1A=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-nm-6.1.2.tar.xz", + "hash": "sha256-+YbC+NKF4JzS2j0dWLCla6Z77ZmDiR4xmIwdcApGJAg=" }, "plasma-pa": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-pa-6.1.1.tar.xz", - "hash": "sha256-Takyf7qhz5gD5SjGlS+ZeapEe4BiZE+AB9vCkILUyHk=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-pa-6.1.2.tar.xz", + "hash": "sha256-/YTgM2v9zBP63ukVgvoKhY3DahVfPh5Wkd3G/5xrRGY=" }, "plasma-sdk": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-sdk-6.1.1.tar.xz", - "hash": "sha256-/UNWfSSJXesWE4v5k6lmL+2tVk03IhOSZYrpdGVND5A=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-sdk-6.1.2.tar.xz", + "hash": "sha256-CbN17UlLm4a8MNbEYj4hJdhVqAd2DDrCT6wS3Zzcs94=" }, "plasma-systemmonitor": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-systemmonitor-6.1.1.tar.xz", - "hash": "sha256-c4FiyY5lCKPqoQNh7fun4ObNd/eX6ZXzZuQqpS1A6eM=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-systemmonitor-6.1.2.tar.xz", + "hash": "sha256-uofW9/TDye38s3V00SN5hJUhoihrzRbXXFhKkB1MYuw=" }, "plasma-thunderbolt": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-thunderbolt-6.1.1.tar.xz", - "hash": "sha256-dP6Wd4ml2/P2g5lpt5uuDTAVWz/RFdoPW+cqXSF8FFo=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-thunderbolt-6.1.2.tar.xz", + "hash": "sha256-RL+x+fM9XyPqhONcMQRb7D+gbDk4ojuXU+laARr2xCI=" }, "plasma-vault": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-vault-6.1.1.tar.xz", - "hash": "sha256-Kw0gcn4LgHWQ1fn47ZIA4eQsMYSRnfQVDN2BeV0K8+Q=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-vault-6.1.2.tar.xz", + "hash": "sha256-lqltYEE+IffjTu3Z2CXsWgUymsH6wd5b8A8F8IwVDvk=" }, "plasma-welcome": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-welcome-6.1.1.tar.xz", - "hash": "sha256-2uKtZMCIcNuVbZEClxt+I5hF9CDaLtnv30oEU/qtqd4=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-welcome-6.1.2.tar.xz", + "hash": "sha256-YqxdxK/krd9IBNnsTqTM9pWzroWIJNTSvlKmp224oKU=" }, "plasma-workspace": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-workspace-6.1.1.tar.xz", - "hash": "sha256-R9LEK9+MEn+hZW9luqmCj5iQz/0/QWsK+eBWzyKMB+4=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-workspace-6.1.2.tar.xz", + "hash": "sha256-R/AZuS3Kho5l5VB/+oPQ2XSt8Y6JXKoTYlYQjMAqZZo=" }, "plasma-workspace-wallpapers": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-workspace-wallpapers-6.1.1.tar.xz", - "hash": "sha256-B/IttxPbjjyCJ0Y5Xok6wS2DRbjDeksJUrujUOW2ffs=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-workspace-wallpapers-6.1.2.tar.xz", + "hash": "sha256-lhn3pNyAsE92gVk4HaMBPmDyFepz+Fdo64th1+DZom4=" }, "plymouth-kcm": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plymouth-kcm-6.1.1.tar.xz", - "hash": "sha256-ZqB/YNbDO+F9k6s7UZnOGxWnvmtRJ7Tw07SsHk5BfdA=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plymouth-kcm-6.1.2.tar.xz", + "hash": "sha256-L5GzV+Ufh2bOZYtLUPq9y44eFotqRhW7znkHDTCJ3KU=" }, "polkit-kde-agent-1": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/polkit-kde-agent-1-6.1.1.tar.xz", - "hash": "sha256-H4tLoKEKAbzh+lTy0TpADnA612TeBMvLU20VOv0Xrpg=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/polkit-kde-agent-1-6.1.2.tar.xz", + "hash": "sha256-iJFt6obdUo/jZZ6cxzwlLkoPxYoueHCzriK1bWt1INc=" }, "powerdevil": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/powerdevil-6.1.1.tar.xz", - "hash": "sha256-SVB26QNmiYOZ9sL+4iotH+lphSSnxvLKzYL4yo1pnyc=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/powerdevil-6.1.2.tar.xz", + "hash": "sha256-1Ki4VTb2niI2l70cer0dw/woOnHFtcwJqRokfYXYUBQ=" }, "print-manager": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/print-manager-6.1.1.tar.xz", - "hash": "sha256-sRDyMcsvn5RPOveqaCIOHM/x4OV5Hk/xSVQTpFI9umY=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/print-manager-6.1.2.tar.xz", + "hash": "sha256-FBYVYc7UAP5uCmUnE+C4a0NLWlC69VMgwulJjkjD9aU=" }, "qqc2-breeze-style": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/qqc2-breeze-style-6.1.1.tar.xz", - "hash": "sha256-3i7dyPFyXS2753jOrgJfDDkO5UcxCgAOeD//E+AmqPw=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/qqc2-breeze-style-6.1.2.tar.xz", + "hash": "sha256-MkA66uAwdLz8b2/z0L7D//e5pOhj3Hpo354Vu33EHtk=" }, "sddm-kcm": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/sddm-kcm-6.1.1.tar.xz", - "hash": "sha256-B8CUtRCaOTdFqMiyj13+ZWueIuvr9b2zsoCSU7XeIHE=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/sddm-kcm-6.1.2.tar.xz", + "hash": "sha256-bHiyAkIOPS1ZeiK5j24kAjU50PgG9c4J99zIPv50gNc=" }, "systemsettings": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/systemsettings-6.1.1.tar.xz", - "hash": "sha256-FTs5ru2DB7USV0lQCBQ6FUxs+mTTupKGBjmjFQuhpxE=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/systemsettings-6.1.2.tar.xz", + "hash": "sha256-kHrd7AuvQCbXdBoNszgNOI9c9pmE2sB8D6BeEQWLRrY=" }, "wacomtablet": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/wacomtablet-6.1.1.tar.xz", - "hash": "sha256-Jo/SZCP7oIXrciKU4+dXGYlh+mJ1qR5zgfq9gaODqIA=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/wacomtablet-6.1.2.tar.xz", + "hash": "sha256-fe4qU5mAqBCw7uXNjYO2/iuaKpDDa6cA0WuTj+zXVHE=" }, "xdg-desktop-portal-kde": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/xdg-desktop-portal-kde-6.1.1.tar.xz", - "hash": "sha256-vIFULW/3kgRkOCd5CdQDE3/Vscr/oiNJvd0PFP9EKAQ=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/xdg-desktop-portal-kde-6.1.2.tar.xz", + "hash": "sha256-udt1PIUwQ7GXaWRKqZ3qQTrR/2v8ao5osulwon+ZejY=" } -} +} \ No newline at end of file diff --git a/pkgs/kde/misc/kdiagram/default.nix b/pkgs/kde/misc/kdiagram/default.nix index f396db7a3378..f5d6d9d8bc58 100644 --- a/pkgs/kde/misc/kdiagram/default.nix +++ b/pkgs/kde/misc/kdiagram/default.nix @@ -16,5 +16,5 @@ mkKdeDerivation rec { extraNativeBuildInputs = [qttools qtsvg]; - meta.license = [lib.licenses.gpl2]; + meta.license = [lib.licenses.gpl2Only]; } diff --git a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch index 84609b2ff223..4ee9761fbd9d 100644 --- a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch +++ b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch @@ -23,24 +23,168 @@ index 6ae168b5..89d0a2ff 100644 {QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")}, parent); } -diff --git a/kcms/xserver/kcm_xserver.json b/kcms/xserver/kcm_xserver.json -index b3f1ce24..dc610932 100644 ---- a/kcms/xserver/kcm_xserver.json -+++ b/kcms/xserver/kcm_xserver.json -@@ -141,7 +141,7 @@ - "Name[zh_CN]": "X 服务器", - "Name[zh_TW]": "X 伺服器" - }, -- "TryExec": "xdpyinfo", -+ "TryExec": "@xdpyinfo@", - "X-DocPath": "kinfocenter/graphical.html#xserver", - "X-KDE-KInfoCenter-Category": "graphical_information", - "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information", +diff --git a/kcms/about-distro/src/dmidecode-helper/helper.cpp b/kcms/about-distro/src/dmidecode-helper/helper.cpp +index 396b2d74..615e1057 100644 +--- a/kcms/about-distro/src/dmidecode-helper/helper.cpp ++++ b/kcms/about-distro/src/dmidecode-helper/helper.cpp +@@ -20,13 +20,6 @@ KAuth::ActionReply DMIDecodeHelper::systeminformation(const QVariantMap &args) + { + Q_UNUSED(args); + +- // PATH is super minimal when invoked through dbus +- setenv("PATH", "/usr/sbin:/sbin:/usr/local/sbin", 1); +- const QString dmidecode = QStandardPaths::findExecutable("dmidecode"); +- if (dmidecode.isEmpty()) { +- return KAuth::ActionReply::HelperErrorReply(); +- } +- + // NB: Microsoft also outlines a limited set of DMI values to be required for IOT OEM licensing, as such we + // can rely on the same fields to have sound content . Since this only applies to OEMs we still need to filter + // out dummy values though and because of that we can grab more fields, since we'll filter them anyway. +@@ -38,7 +31,7 @@ KAuth::ActionReply DMIDecodeHelper::systeminformation(const QVariantMap &args) + QStringLiteral("system-version"), + QStringLiteral("system-serial-number")}) { + QProcess proc; +- proc.start(dmidecode, {QStringLiteral("--string"), key}); ++ proc.start("@dmidecode@", {QStringLiteral("--string"), key}); + proc.waitForFinished(); + const QByteArray output = proc.readAllStandardOutput().trimmed(); + +diff --git a/kcms/audio_information/main.cpp b/kcms/audio_information/main.cpp +index adb196fd..9d6c8675 100644 +--- a/kcms/audio_information/main.cpp ++++ b/kcms/audio_information/main.cpp +@@ -16,7 +16,7 @@ class KCMAudioInformation : public KQuickConfigModule + explicit KCMAudioInformation(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("pactl"), {"list"}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@pactl@"), {"list"}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/block_devices/main.cpp b/kcms/block_devices/main.cpp +index 2de923f3..6b14f7fb 100644 +--- a/kcms/block_devices/main.cpp ++++ b/kcms/block_devices/main.cpp +@@ -20,7 +20,7 @@ class KCMBlockDevices : public KQuickConfigModule + { + // NOTE: careful when using -o, it tends to incorrectly print multiple mountpoints as a single path + // (e.g. when different btrfs subvolumes are mounted at various points in the system it ought to enumerate all mountpoints) +- m_outputContext = new CommandOutputContext(u"lsblk"_s, {}, parent); ++ m_outputContext = new CommandOutputContext(u"@lsblk@"_s, {}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/cpu/main.cpp b/kcms/cpu/main.cpp +index 608381eb..8fd7914f 100644 +--- a/kcms/cpu/main.cpp ++++ b/kcms/cpu/main.cpp +@@ -16,7 +16,7 @@ class KCMCPU : public KQuickConfigModule + explicit KCMCPU(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("lscpu"), {}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@lscpu@"), {}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/egl/main.cpp b/kcms/egl/main.cpp +index 1a509dac..886a62d8 100644 +--- a/kcms/egl/main.cpp ++++ b/kcms/egl/main.cpp +@@ -16,7 +16,7 @@ class KCMXServer : public KQuickConfigModule + explicit KCMXServer(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("eglinfo"), {}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@eglinfo@"), {}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/firmware_security/main.cpp b/kcms/firmware_security/main.cpp +index 58e25458..890772c8 100644 +--- a/kcms/firmware_security/main.cpp ++++ b/kcms/firmware_security/main.cpp +@@ -20,7 +20,7 @@ class KCMFirmwareSecurity : public KQuickConfigModule + const QString executable = QStandardPaths::locate(QStandardPaths::GenericDataLocation, + QStringLiteral("kinfocenter/firmware_security/fwupdmgr.sh"), + QStandardPaths::LocateFile); +- m_outputContext = new CommandOutputContext({QStringLiteral("fwupdmgr"), QStringLiteral("aha")}, QStringLiteral("/bin/sh"), {executable}, parent); ++ m_outputContext = new CommandOutputContext({QStringLiteral("fwupdmgr"), QStringLiteral("@aha@")}, QStringLiteral("/bin/sh"), {executable}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/glx/main.cpp b/kcms/glx/main.cpp +index a7317411..a6c5621d 100644 +--- a/kcms/glx/main.cpp ++++ b/kcms/glx/main.cpp +@@ -16,7 +16,7 @@ class KCMXServer : public KQuickConfigModule + explicit KCMXServer(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("glxinfo"), {}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@glxinfo@"), {}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/network/main.cpp b/kcms/network/main.cpp +index f02577a3..479e18df 100644 +--- a/kcms/network/main.cpp ++++ b/kcms/network/main.cpp +@@ -18,7 +18,7 @@ class KCMNetwork : public KQuickConfigModule + explicit KCMNetwork(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(u"ip"_s, {u"address"_s}, parent); ++ m_outputContext = new CommandOutputContext(u"@ip@"_s, {u"address"_s}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/opencl/main.cpp b/kcms/opencl/main.cpp +index d58728ab..88733d46 100644 +--- a/kcms/opencl/main.cpp ++++ b/kcms/opencl/main.cpp +@@ -18,7 +18,7 @@ class KCMOpenCL : public KQuickConfigModule + explicit KCMOpenCL(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("clinfo"), {}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@clinfo@"), {}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/vulkan/main.cpp b/kcms/vulkan/main.cpp +index 5665d9d2..008f1bf0 100644 +--- a/kcms/vulkan/main.cpp ++++ b/kcms/vulkan/main.cpp +@@ -16,7 +16,7 @@ class KCMVulkan : public KQuickConfigModule + explicit KCMVulkan(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("vulkaninfo"), {}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@vulkaninfo@"), {}, parent); + } + CommandOutputContext *outputContext() const + { +diff --git a/kcms/wayland/main.cpp b/kcms/wayland/main.cpp +index 3a4825c7..2c6a6c43 100644 +--- a/kcms/wayland/main.cpp ++++ b/kcms/wayland/main.cpp +@@ -16,7 +16,7 @@ class KCMWayland : public KQuickConfigModule + explicit KCMWayland(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("wayland-info"), {}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@waylandinfo@"), {}, parent); + } + CommandOutputContext *outputContext() const + { diff --git a/kcms/xserver/main.cpp b/kcms/xserver/main.cpp -index 6d4d1e25..d39fe19e 100644 +index df9af24a..e5983e22 100644 --- a/kcms/xserver/main.cpp +++ b/kcms/xserver/main.cpp -@@ -16,7 +16,7 @@ public: +@@ -16,7 +16,7 @@ class KCMXServer : public KQuickConfigModule explicit KCMXServer(QObject *parent, const KPluginMetaData &data) : KQuickConfigModule(parent, data) { @@ -49,3 +193,15 @@ index 6d4d1e25..d39fe19e 100644 } CommandOutputContext *outputContext() const { +diff --git a/kcms/pci/CMakeLists.txt b/kcms/pci/CMakeLists.txt +index 36d82ef8..16ce2703 100644 +--- a/kcms/pci/CMakeLists.txt ++++ b/kcms/pci/CMakeLists.txt +@@ -19,7 +19,7 @@ else() + find_package(lspci) + set_package_properties(lspci PROPERTIES TYPE RUNTIME) + +- set(PCI_BACKEND lspci) ++ set(PCI_BACKEND @lspci@) + set(PCI_BACKEND_ARGUMENTS "-v") + endif() diff --git a/pkgs/kde/plasma/kinfocenter/default.nix b/pkgs/kde/plasma/kinfocenter/default.nix index e48424305c1c..2ef5008905ac 100644 --- a/pkgs/kde/plasma/kinfocenter/default.nix +++ b/pkgs/kde/plasma/kinfocenter/default.nix @@ -1,23 +1,57 @@ { + aha, + clinfo, + dmidecode, + iproute2, lib, - mkKdeDerivation, - substituteAll, - qttools, - xdpyinfo, - systemsettings, libusb1, + mesa-demos, + mkKdeDerivation, + pciutils, + pulseaudio, + qttools, + substituteAll, + systemsettings, + util-linux, + vulkan-tools, + wayland-utils, + xdpyinfo, }: +let + tools = { + aha = lib.getExe aha; + clinfo = lib.getExe clinfo; + dmidecode = lib.getExe' dmidecode "dmidecode"; + eglinfo = lib.getExe' mesa-demos "eglinfo"; + glxinfo = lib.getExe' mesa-demos "glxinfo"; + ip = lib.getExe' iproute2 "ip"; + lsblk = lib.getExe' util-linux "lsblk"; + lspci = lib.getExe' pciutils "lspci"; + lscpu = lib.getExe' util-linux "lscpu"; + pactl = lib.getExe' pulseaudio "pactl"; + qdbus = lib.getExe' qttools "qdbus"; + vulkaninfo = lib.getExe' vulkan-tools "vulkaninfo"; + waylandinfo = lib.getExe wayland-utils; + xdpyinfo = lib.getExe xdpyinfo; + }; +in mkKdeDerivation { pname = "kinfocenter"; patches = [ - (substituteAll { + # fwupdmgr is provided through NixOS' module + (substituteAll ({ src = ./0001-tool-paths.patch; - qdbus = "${lib.getBin qttools}/bin/qdbus"; - xdpyinfo = lib.getExe xdpyinfo; - }) + } // tools)) ]; + postPatch = '' + substituteInPlace kcms/firmware_security/fwupdmgr.sh \ + --replace-fail " aha " " ${lib.getExe aha} " + ''; + + extraBuildInputs = [libusb1]; + # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in # the same directory, while it is actually located in a completely different # store path @@ -25,6 +59,11 @@ mkKdeDerivation { ln -sf ${systemsettings}/bin/systemsettings $out/bin/kinfocenter ''; - extraBuildInputs = [libusb1]; + # Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically + postFixup = '' + mkdir -p $out/nix-support + echo "${lib.concatStringsSep ":" (lib.attrValues tools)}" > $out/nix-support/depends + ''; + meta.mainProgram = "kinfocenter"; } diff --git a/pkgs/kde/plasma/kwallet-pam/default.nix b/pkgs/kde/plasma/kwallet-pam/default.nix index 4b3cdd678dee..a540f54a85ce 100644 --- a/pkgs/kde/plasma/kwallet-pam/default.nix +++ b/pkgs/kde/plasma/kwallet-pam/default.nix @@ -1,6 +1,7 @@ { lib, mkKdeDerivation, + pkg-config, pam, libgcrypt, socat, @@ -12,5 +13,6 @@ mkKdeDerivation { sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" ''; + extraNativeBuildInputs = [pkg-config]; extraBuildInputs = [pam libgcrypt]; } diff --git a/pkgs/misc/barebox/default.nix b/pkgs/misc/barebox/default.nix index 4b1e373ca69d..ab981d1f38c0 100644 --- a/pkgs/misc/barebox/default.nix +++ b/pkgs/misc/barebox/default.nix @@ -73,7 +73,7 @@ let meta = with lib; { homepage = "https://www.barebox.org"; description = "Swiss Army Knive for bare metal"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ emantor ]; } // extraMeta; } // removeAttrs args [ "extraMeta" ]; diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index 1a3b4ebfbef6..75f5122cfd03 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PolicyKit helper to configure cups with fine-grained privileges"; homepage = "https://www.freedesktop.org/wiki/Software/cups-pk-helper/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index cce75b26d71e..c0f4e1854379 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { Lenovo M7605D ''; homepage = "https://github.com/pdewacht/brlaser"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ StijnDW ]; }; diff --git a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix index 828b4bb831b6..de1d397f7b58 100644 --- a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix +++ b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix @@ -82,7 +82,7 @@ in rec { description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver"; homepage = "http://www.brother.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.steveej ]; }; diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix index 97dcbde2b8b5..c3186cafa264 100644 --- a/pkgs/misc/cups/drivers/dymo/default.nix +++ b/pkgs/misc/cups/drivers/dymo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "CUPS Linux drivers and SDK for DYMO printers"; homepage = "https://www.dymo.com/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ makefu ]; }; } diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix index e0936b73b08a..4bd6174b7ca5 100644 --- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix +++ b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://onlinesupport.fujixerox.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ delan ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix index 767597548991..c629a4918901 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW CUPS wrapper driver"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128"; maintainers = [ lib.maintainers.yochai ]; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix index 4e6f37112087..aead095635b3 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.brother.com/"; description = "Brother MFC-J6510DW CUPS wrapper driver"; - license = with licenses; gpl2; + license = with licenses; gpl2Plus; platforms = with platforms; linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128"; maintainers = with maintainers; [ ramkromberg ]; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix index f30f9abae334..abf25ae69850 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.xeji ]; }; diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix index 2cad0ceba55b..9b2fe4ce1736 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ lib.maintainers.Enzime ]; + maintainers = [ ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix index 9c4dfa2f9978..162b019ac9b1 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ lib.maintainers.Enzime ]; + maintainers = [ ]; }; } diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index d3ae34a80ae5..fae7414d3618 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "CUPS drivers for SPL (Samsung Printer Language) printers"; homepage = "http://splix.ap2c.org"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index c1654782db26..127910f97aac 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters"; description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index e84cc3b0e3f8..5631a975e2e9 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { Refer to the description of epson-escpr for usage. ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ma9e ma27 shawn8901 ]; platforms = platforms.linux; }; diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 8004af7686e1..e2d5b8ec6a82 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ghostscript and cups printer drivers"; homepage = "https://sourceforge.net/projects/gimp-print/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; isGutenprint = true; }; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index eb3b84d04529..7da63bcd5eb4 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, substituteAll , pkg-config, autoreconfHook -, cups, zlib, libjpeg, libusb1, python3Packages, sane-backends +, cups, zlib, libjpeg, libusb1, python311Packages, sane-backends , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools, avahi , bash, util-linux @@ -49,7 +49,7 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; -python3Packages.buildPythonApplication { +python311Packages.buildPythonApplication { inherit pname version src; format = "other"; @@ -76,7 +76,7 @@ python3Packages.buildPythonApplication { autoreconfHook ] ++ lib.optional withQt5 qt5.wrapQtAppsHook; - pythonPath = with python3Packages; [ + pythonPath = with python311Packages; [ dbus pillow pygobject3 @@ -127,7 +127,7 @@ python3Packages.buildPythonApplication { -e s,/usr/bin/perl,${perl}/bin/perl,g \ -e s,/usr/bin/file,${file}/bin/file,g \ -e s,/usr/bin/gs,${ghostscript}/bin/gs,g \ - -e s,/usr/share/cups/fonts,${ghostscript}/share/ghostscript/fonts,g \ + -e s,/usr/share/cups/fonts,${ghostscript.fonts}/share/fonts,g \ -e "s,ExecStart=/usr/bin/python /usr/bin/hp-config_usb_printer,ExecStart=$out/bin/hp-config_usb_printer,g" \ -e s,Exec=/usr/bin/hp-uiscan,Exec=hp-uiscan,g \ -e s,Icon=/usr/share/icons/Humanity/devices/48/printer.svg,Icon=printer,g \ @@ -272,7 +272,7 @@ python3Packages.buildPythonApplication { # There are some binaries there, which reference gcc-unwrapped otherwise. stripDebugList = [ - "share/hplip" "lib/cups/backend" "lib/cups/filter" python3Packages.python.sitePackages "lib/sane" + "share/hplip" "lib/cups/backend" "lib/cups/filter" python311Packages.python.sitePackages "lib/sane" ]; meta = with lib; { diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index e7bfbe34ee7f..9331760ef66b 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { homepage = "https://github.com/donovan6000/M3D-Linux"; description = "Linux program that can communicate with the Micro 3D printer"; mainProgram = "m33-linux"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index e0cf96bd63aa..2215c5d1d29e 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -50,7 +50,7 @@ buildPythonApplication rec { homepage = "https://github.com/Ryochan7/sc-controller"; # donations: https://www.patreon.com/kozec description = "User-mode driver and GUI for Steam Controller and other controllers"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ orivej rnhmjoj ]; }; diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 753f82f6bd44..20f6846274b7 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -17,7 +17,6 @@ python3Packages.buildPythonApplication rec { ''; nativeBuildInputs = with python3Packages; [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 8410f77d2c07..64bdf7b0d99e 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ./doc-no-ref.diff ]; - outputs = [ "out" "man" "doc" ]; + outputs = [ "out" "man" "doc" "fonts" ]; enableParallelBuilding = true; @@ -133,7 +133,9 @@ stdenv.mkDerivation rec { cp -r Resource "$out/share/ghostscript/${version}" - ln -s "${fonts}" "$out/share/ghostscript/fonts" + mkdir -p $fonts/share/fonts + cp -rv ${fonts}/* "$fonts/share/fonts/" + ln -s "$fonts/share/fonts" "$out/share/ghostscript/fonts" '' + lib.optionalString stdenv.isDarwin '' for file in $out/lib/*.dylib* ; do install_name_tool -id "$file" $file diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 53b900806ab3..d13c9315b3c3 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, python3Packages, makeWrapper +{ lib, stdenv, fetchFromGitHub, fetchpatch2, pkg-config, python3Packages, makeWrapper , libsamplerate, libsndfile, readline, eigen, celt , wafHook # Darwin Dependencies @@ -46,6 +46,15 @@ stdenv.mkDerivation (finalAttrs: { aften AudioUnit CoreAudio Accelerate libobjc ]; + patches = [ + (fetchpatch2 { + # Python 3.12 support + name = "jack2-waf2.0.26.patch"; + url = "https://github.com/jackaudio/jack2/commit/250420381b1a6974798939ad7104ab1a4b9a9994.patch"; + hash = "sha256-M/H72lLTeddefqth4BSkEfySZRYMIzLErb7nIgVN0u8="; + }) + ]; + postPatch = '' patchShebangs --build svnversion_regenerate.sh ''; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 4e7375a26916..428bb9685f47 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { broken = stdenv.isDarwin; description = "JACK audio connection kit"; homepage = "https://jackaudio.org"; - license = with licenses; [ gpl2 lgpl21 ]; + license = with licenses; [ gpl2Plus lgpl21 ]; pkgConfigModules = [ "jack" ]; platforms = platforms.unix; }; diff --git a/pkgs/misc/jackaudio/tools.nix b/pkgs/misc/jackaudio/tools.nix index ac14d1528ce4..f299d3075c26 100644 --- a/pkgs/misc/jackaudio/tools.nix +++ b/pkgs/misc/jackaudio/tools.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation (final: { homepage = "https://jackaudio.org"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ pennae ]; + maintainers = with maintainers; [ ]; }; }) diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index d9bcafca3eac..1dc5de3b1cd2 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.7952"; + version = "1.0.8043"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "YSRii+oj2dHRJdfUvRmKYwJc+2OiJAumcSjWZ7STZwE="; + sha256 = "aCrcsmEH3t294G2f5VzhdagzAFnWb5x1jn3htxlSXdE="; }; dontBuild = true; diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index acb3a543f68a..97e131beb163 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # its Scheme libraries. wrapProgram "$f" \ --set GUILE_AUTO_COMPILE 0 \ - --set PATH "${lib.makeBinPath [ ghostscript coreutils (placeholder "out") ]}" \ + --prefix PATH : "${lib.makeBinPath [ ghostscript coreutils (placeholder "out") ]}" \ --argv0 "$f" done ''; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-documentation" # FIXME: these URW fonts are not OTF, configure reports "URW++ OTF files... no". - "--with-urwotf-dir=${ghostscript}/share/ghostscript/fonts" + "--with-urwotf-dir=${ghostscript.fonts}/share/fonts" "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/" ]; diff --git a/pkgs/misc/meson-tools/default.nix b/pkgs/misc/meson-tools/default.nix index 02b162c88098..78e854980791 100644 --- a/pkgs/misc/meson-tools/default.nix +++ b/pkgs/misc/meson-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/afaerber/meson-tools"; description = "Tools for Amlogic Meson ARM platforms"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ lopsided98 ]; }; } diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index 0f231bfd2f54..435db1c380d2 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool }: stdenv.mkDerivation rec { - version="1.36"; + version="1.38"; pname = "mxt-app"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; rev = "v${version}"; - sha256 = "sha256-hS/4d7HUCoulY73Sn1+IAb/IWD4VDht78Tn2jdluzhU="; + sha256 = "sha256-/0wua0rIpAQAq+ZgmQu/0vHGPgn7pNwAo1theTMG0PA="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/misc/opcua-client-gui/default.nix b/pkgs/misc/opcua-client-gui/default.nix index 962d48be8f8e..c53634a8b451 100644 --- a/pkgs/misc/opcua-client-gui/default.nix +++ b/pkgs/misc/opcua-client-gui/default.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/FreeOpcUa/opcua-client-gui"; platforms = platforms.unix; license = licenses.gpl3Only; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "opcua-client"; }; } diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/misc/rich-cli/default.nix index b6cf7684c44d..a76f921dcf99 100644 --- a/pkgs/misc/rich-cli/default.nix +++ b/pkgs/misc/rich-cli/default.nix @@ -39,7 +39,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/misc/rkdeveloptool-pine64/default.nix b/pkgs/misc/rkdeveloptool-pine64/default.nix index fbb1a2b725a5..1c53f6d664f2 100644 --- a/pkgs/misc/rkdeveloptool-pine64/default.nix +++ b/pkgs/misc/rkdeveloptool-pine64/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { { homepage = "https://gitlab.com/pine64-org/quartz-bsp/rkdeveloptool/"; description = "Tool from Rockchip to communicate with Rockusb devices (pine64 fork)"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ maintainers.adisbladis ]; mainProgram = "rkdeveloptool"; }; diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix index 3b6a85764bfa..dcbcfcf432c8 100644 --- a/pkgs/misc/rkdeveloptool/default.nix +++ b/pkgs/misc/rkdeveloptool/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/rockchip-linux/rkdeveloptool"; description = "Tool from Rockchip to communicate with Rockusb devices"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.lopsided98 ]; mainProgram = "rkdeveloptool"; }; diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index a231d22d90f5..6691feeec6bb 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -13,7 +13,7 @@ , libgtop , boost179 , tinyxml -, freeglut +, libglut , libGLU , libGL , glee @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libgtop boost179 tinyxml - freeglut + libglut libGLU libGL glee diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index f1ba5eb0f1e2..ef141c784d8d 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { It relies on LightDM for locking and unlocking your session via ConsoleKit/UPower or logind/systemd. ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ obadz ] ++ teams.pantheon.members; platforms = platforms.linux; }; diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index caae1a4ba2c0..993ec8447c3a 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Secure suspend/hibernate-friendly alternative to `vlock -an`"; mainProgram = "physlock"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 3ec89194df87..f8e0479b36c2 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { This package currently contains all of the screensavers from the original collection, plus a few others. ''; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index c156373f1481..4596f707f344 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Virtual console locking program"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ ]; platforms = platforms.linux; mainProgram = "vlock"; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index 90265afc4284..c7934125a7ae 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.ibiblio.org/pub/linux/X11/screensavers"; maintainers = with maintainers; [ peti ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; mainProgram = "xautolock"; }; }) diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index eba0b568b92a..d99c9fd7fcff 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Screen locker for the X Window System"; homepage = "http://sillycycle.com/xlockmore.html"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix index 3b785dfc5664..1560af6d9967 100644 --- a/pkgs/misc/talkfilters/default.nix +++ b/pkgs/misc/talkfilters/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Converts English text into text that mimics a stereotyped or humorous dialect"; homepage = "https://www.hyperrealm.com/talkfilters/talkfilters.html"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ikervagyok ]; platforms = with lib.platforms; unix; }; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index b29c717e591d..c9880df78690 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -671,6 +671,25 @@ in rec { }; }; + tokyo-night-tmux = mkTmuxPlugin { + pluginName = "tokyo-night-tmux"; + rtpFilePath = "tokyo-night.tmux"; + version = "1.5.3"; + src = pkgs.fetchFromGitHub { + owner = "janoamaral"; + repo = "tokyo-night-tmux"; + rev = "d34f1487b4a644b13d8b2e9a2ee854ae62cc8d0e"; + hash = "sha256-3rMYYzzSS2jaAMLjcQoKreE0oo4VWF9dZgDtABCUOtY="; + }; + meta = with lib; { + homepage = "https://github.com/janoamaral/tokyo-night-tmux"; + description = "A clean, dark Tmux theme that celebrates the lights of Downtown Tokyo at night."; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ redyf ]; + }; + }; + tmux-colors-solarized = mkTmuxPlugin { pluginName = "tmuxcolors"; version = "unstable-2019-07-14"; diff --git a/pkgs/misc/translatelocally-models/default.nix b/pkgs/misc/translatelocally-models/default.nix index 3c71247d1d9a..82f6556e93d9 100644 --- a/pkgs/misc/translatelocally-models/default.nix +++ b/pkgs/misc/translatelocally-models/default.nix @@ -1,7 +1,10 @@ +let + modelSpecs = (builtins.fromJSON (builtins.readFile ./models.json)); +in + { lib, stdenvNoCC, fetchurl }: let - modelSpecs = (builtins.fromJSON (builtins.readFile ./models.json)); withCodeAsKey = f: { code, ... }@attrs: lib.nameValuePair code (f attrs); mkModelPackage = { name, code, version, url, checksum }: stdenvNoCC.mkDerivation { diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 95fadc40da5f..8a81b47d2574 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -132,7 +132,7 @@ let meta = with lib; { homepage = "https://www.denx.de/wiki/U-Boot/"; description = "Boot loader for embedded systems"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ bartsch dezgeg lopsided98 ]; } // extraMeta; } // removeAttrs args [ "extraMeta" "pythonScriptsToInstall" ])); diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix index 3190cfb380d8..9ff961454bf1 100644 --- a/pkgs/misc/xosd/default.nix +++ b/pkgs/misc/xosd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Displays text on your screen"; homepage = "https://sourceforge.net/projects/libxosd"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/os-specific/bsd/freebsd/lib/default.nix b/pkgs/os-specific/bsd/freebsd/lib/default.nix index d022f7cfa14c..3fea3bc3e7f2 100644 --- a/pkgs/os-specific/bsd/freebsd/lib/default.nix +++ b/pkgs/os-specific/bsd/freebsd/lib/default.nix @@ -1,4 +1,8 @@ -{ version }: +{ + version, + lib, + writeText, +}: { inherit version; @@ -15,4 +19,65 @@ .${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; install-wrapper = builtins.readFile ../../lib/install-wrapper.sh; + + # this function takes a list of patches and a list of paths and returns a list of derivations, + # one per file that is patched, containing the actual patch contents. This allows us to have + # extract only the patches that are relevant for a given subset of the source tree. + # note: the "list of patches" input can be a directory containing patch files, a path or a list of valid inputs to this argument, recursively. + filterPatches = + patches: paths: + let + isDir = + file: + let + base = baseNameOf file; + type = (builtins.readDir (dirOf file)).${base} or null; + in + file == /. || type == "directory"; + consolidatePatches = + patches: + if (lib.isDerivation patches) then + [ patches ] + else if (builtins.isPath patches) then + (if (isDir patches) then (lib.filesystem.listFilesRecursive patches) else [ patches ]) + else if (builtins.isList patches) then + (lib.flatten (builtins.map consolidatePatches patches)) + else + throw "Bad patches - must be path or derivation or list thereof"; + consolidated = consolidatePatches patches; + splitPatch = + patchFile: + let + allLines' = lib.strings.splitString "\n" (builtins.readFile patchFile); + allLines = builtins.filter ( + line: !((lib.strings.hasPrefix "diff --git" line) || (lib.strings.hasPrefix "index " line)) + ) allLines'; + foldFunc = + a: b: + if ((lib.strings.hasPrefix "--- " b) || (lib.strings.hasPrefix "diff --git " b)) then + (a ++ [ [ b ] ]) + else + ((lib.lists.init a) ++ (lib.lists.singleton ((lib.lists.last a) ++ [ b ]))); + partitionedPatches' = lib.lists.foldl foldFunc [ [ ] ] allLines; + partitionedPatches = + if (builtins.length partitionedPatches' > 1) then + (lib.lists.drop 1 partitionedPatches') + else + (throw "${patchFile} does not seem to be a unified patch (diff -u). this is required for FreeBSD."); + filterFunc = + patchLines: + let + prefixedPath = builtins.elemAt (builtins.split " |\t" (builtins.elemAt patchLines 1)) 2; + unfixedPath = lib.path.subpath.join (lib.lists.drop 1 (lib.path.subpath.components prefixedPath)); + in + lib.lists.any (included: lib.path.hasPrefix (/. + ("/" + included)) (/. + ("/" + unfixedPath))) ( + paths + ); + filteredLines = builtins.filter filterFunc partitionedPatches; + derive = patchLines: writeText "freebsd-patch" (lib.concatLines patchLines); + derivedPatches = builtins.map derive filteredLines; + in + derivedPatches; + in + lib.lists.concatMap splitPatch consolidated; } diff --git a/pkgs/os-specific/bsd/freebsd/package-set.nix b/pkgs/os-specific/bsd/freebsd/package-set.nix index 4ff6cb210249..e9f45ed64c70 100644 --- a/pkgs/os-specific/bsd/freebsd/package-set.nix +++ b/pkgs/os-specific/bsd/freebsd/package-set.nix @@ -7,6 +7,7 @@ versionData, buildFreebsd, patchesRoot, + writeText, }: self: @@ -39,6 +40,7 @@ lib.packagesFromDirectoryRecursive { ] ) ); + inherit lib writeText; }; # The manual callPackages below should in principle be unnecessary, but are diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch index 256db9e2d9cf..a1418bd49975 100644 --- a/pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch +++ b/pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch @@ -4,7 +4,7 @@ SRCS+= terminate.cc SRCS+= typeinfo.cc -+INCS+=cxxabi.h unwind.h unwind-arm.h unwind-itanium.h ++INCS+=cxxabi.h + WARNS?= 0 CFLAGS+= -isystem ${SRCDIR} -nostdinc++ diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/libifconfig-no-internal.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/libifconfig-no-internal.patch new file mode 100644 index 000000000000..a84ca0ff89ff --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.0/libifconfig-no-internal.patch @@ -0,0 +1,36 @@ +diff --git a/lib/libifconfig/Makefile b/lib/libifconfig/Makefile +index 6bdb202bec1d..ebc626901cfc 100644 +--- a/lib/libifconfig/Makefile ++++ b/lib/libifconfig/Makefile +@@ -1,7 +1,6 @@ + + PACKAGE= lib${LIB} + LIB= ifconfig +-INTERNALLIB= true + + LIBADD= m + +@@ -36,8 +35,8 @@ SRCS+= ${GEN} + CLEANFILES+= ${GEN} + + # If libifconfig become public uncomment those two lines +-#INCSDIR= ${INCLUDEDIR} +-#INCS= libifconfig.h libifconfig_sfp.h libifconfig_sfp_tables.h ++INCSDIR= ${INCLUDEDIR} ++INCS= libifconfig.h libifconfig_sfp.h libifconfig_sfp_tables.h + + #MAN= libifconfig.3 + +diff --git a/lib/libifconfig/Symbol.map b/lib/libifconfig/Symbol.map +index 2d80fb31652a..8b08947112e5 100644 +--- a/lib/libifconfig/Symbol.map ++++ b/lib/libifconfig/Symbol.map +@@ -2,6 +2,8 @@ FBSD_1.6 { + ifconfig_bridge_get_bridge_status; + ifconfig_bridge_free_bridge_status; + ifconfig_carp_get_info; ++ ifconfig_carp_get_vhid; ++ ifconfig_carp_set_info; + ifconfig_close; + ifconfig_create_interface; + ifconfig_create_interface_vlan; diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/mount-use-path.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/mount-use-path.patch new file mode 100644 index 000000000000..614c327dda69 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.0/mount-use-path.patch @@ -0,0 +1,18 @@ +diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c +index 2fcc94e40818..7de6da1bb20e 100644 +--- a/sbin/mount/mount.c ++++ b/sbin/mount/mount.c +@@ -155,12 +155,9 @@ exec_mountprog(const char *name, const char *execname, char *const argv[]) + EXIT(1); + case 0: /* Child. */ + /* Go find an executable. */ +- execvP(execname, _PATH_SYSPATH, argv); ++ execvp(execname, argv); + if (errno == ENOENT) { + xo_warn("exec %s not found", execname); +- if (execname[0] != '/') { +- xo_warnx("in path: %s", _PATH_SYSPATH); +- } + } + EXIT(1); + default: /* Parent. */ diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/rc-user.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/rc-user.patch new file mode 100644 index 000000000000..27e8f9a13f21 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.0/rc-user.patch @@ -0,0 +1,17 @@ +diff --git a/libexec/rc/rc b/libexec/rc/rc +index 0ea61a4b2c0a..d9bfb228224c 100644 +--- a/libexec/rc/rc ++++ b/libexec/rc/rc +@@ -87,6 +87,12 @@ if ! [ -e ${firstboot_sentinel} ]; then + skip_firstboot="-s firstboot" + fi + ++if [ -z "$USER_LOGIN" ]; then ++ skip="$skip -s user" ++else ++ skip="$skip -k user" ++fi ++ + # Do a first pass to get everything up to $early_late_divider so that + # we can do a second pass that includes $local_startup directories + # diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/bintrans.nix b/pkgs/os-specific/bsd/freebsd/pkgs/bintrans.nix new file mode 100644 index 000000000000..d10426e26ca1 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/bintrans.nix @@ -0,0 +1,5 @@ +{ mkDerivation }: +mkDerivation { + path = "usr.bin/bintrans"; + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/bsdlabel.nix b/pkgs/os-specific/bsd/freebsd/pkgs/bsdlabel.nix new file mode 100644 index 000000000000..45d5516ecc78 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/bsdlabel.nix @@ -0,0 +1,6 @@ +{ mkDerivation, libgeom }: +mkDerivation { + path = "sbin/bsdlabel"; + extraPaths = [ "sys/geom" ]; + buildInputs = [ libgeom ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/cap_mkdb.nix b/pkgs/os-specific/bsd/freebsd/pkgs/cap_mkdb.nix new file mode 100644 index 000000000000..d579b5605bcf --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/cap_mkdb.nix @@ -0,0 +1,6 @@ +{ mkDerivation }: +mkDerivation { + path = "usr.bin/cap_mkdb"; + + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/daemon.nix b/pkgs/os-specific/bsd/freebsd/pkgs/daemon.nix new file mode 100644 index 000000000000..b7c29ccfc2a5 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/daemon.nix @@ -0,0 +1,5 @@ +{ mkDerivation }: +mkDerivation { + path = "usr.sbin/daemon"; + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/devfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/devfs.nix new file mode 100644 index 000000000000..8fc29aa382d6 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/devfs.nix @@ -0,0 +1,10 @@ +{ mkDerivation }: +mkDerivation { + path = "sbin/devfs"; + + # These config files are mostly examples and not super useful + # in nixbsd + postPatch = '' + sed -i 's/^CONFS=.*$//' $BSDSRCDIR/sbin/devfs/Makefile + ''; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/dmesg.nix b/pkgs/os-specific/bsd/freebsd/pkgs/dmesg.nix new file mode 100644 index 000000000000..f2412ff55766 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/dmesg.nix @@ -0,0 +1,6 @@ +{ mkDerivation, lib }: +mkDerivation { + path = "sbin/dmesg"; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix new file mode 100644 index 000000000000..002b9276cf5b --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix @@ -0,0 +1,54 @@ +{ + lib, + mkDerivation, + fetchFromGitHub, + buildFreebsd, + sys, + withAmd ? true, + withIntel ? true, +}: +mkDerivation rec { + pname = + "drm-kmod-firmware" + lib.optionalString withAmd "-amd" + lib.optionalString withIntel "-intel"; + + version = "20230625_8"; + + src = fetchFromGitHub { + owner = "freebsd"; + repo = "drm-kmod-firmware"; + rev = version; + hash = "sha256-Ly9B0zf+YODel/X1sZYVVUVWh38faNLhkcXcjEnQwII="; + }; + + extraNativeBuildInputs = [ buildFreebsd.xargs-j ]; + + hardeningDisable = [ + "pic" # generates relocations the linker can't handle + "stackprotector" # generates stack protection for the function generating the stack canary + ]; + + # hardeningDisable = stackprotector doesn't seem to be enough, put it in cflags too + NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + + KMODS = + lib.optional withIntel "i915kmsfw" + ++ lib.optionals withAmd [ + "amdgpukmsfw" + "radeonkmsfw" + ]; + + env = sys.passthru.env; + SYSDIR = "${sys.src}/sys"; + + KMODDIR = "${builtins.placeholder "out"}/kernel"; + + meta = { + description = "GPU firmware for FreeBSD drm-kmod"; + platforms = lib.platforms.freebsd; + license = + lib.optional withAmd lib.licenses.unfreeRedistributableFirmware + # Intel license prohibits modification. this will wrap firmware files in an ELF + ++ lib.optional withIntel lib.licenses.unfree; + sourceProvenance = [ lib.sourceTypes.binaryFirmware ]; + }; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix new file mode 100644 index 000000000000..42806392d217 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix @@ -0,0 +1,53 @@ +{ + lib, + mkDerivation, + fetchFromGitHub, + xargs-j, + versionData, + sys, +}: +let + # Based off ports tree versions + reldate = lib.toIntBase10 versionData.reldate; + branch = + if reldate >= 1500008 then + "6.1-lts" + else if reldate >= 1400097 then + "5.15-lts" + else if reldate >= 1302000 then + "5.10-lts" + else + throw "drm-kmod not supported on FreeBSD version ${reldate}"; + + fetchOptions = (lib.importJSON ./versions.json).${branch}; +in +mkDerivation { + pname = "drm-kmod"; + version = branch; + + src = fetchFromGitHub fetchOptions; + + extraNativeBuildInputs = [ xargs-j ]; + + hardeningDisable = [ + "pic" # generates relocations the linker can't handle + "stackprotector" # generates stack protection for the function generating the stack canary + ]; + + # hardeningDisable = stackprotector doesn't seem to be enough, put it in cflags too + NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + + env = sys.passthru.env; + SYSDIR = "${sys.src}/sys"; + + KMODDIR = "${builtins.placeholder "out"}/kernel"; + + meta = { + description = "Linux drm driver, ported to FreeBSD"; + platforms = lib.platforms.freebsd; + license = with lib.licenses; [ + bsd2 + gpl2Only + ]; + }; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/update.py b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/update.py new file mode 100755 index 000000000000..c724e3cbd104 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/update.py @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python -p python3 nix-prefetch-github git + +import subprocess +import json +import os.path + +BRANCHES = ["5.10-lts", "5.15-lts", "6.1-lts"] +BASE_DIR = os.path.dirname(os.path.abspath(__file__)) + +versions = dict() + +for branch in BRANCHES: + text = subprocess.check_output( + ["nix-prefetch-github", "freebsd", "drm-kmod", "--rev", branch, "--json"] + ).decode("utf-8") + versions[branch] = json.loads(text) + +with open(os.path.join(BASE_DIR, "versions.json"), "w") as out: + json.dump(versions, out, sort_keys=True, indent=2) + out.write("\n") diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/versions.json b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/versions.json new file mode 100644 index 000000000000..9375e53e9d4d --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/versions.json @@ -0,0 +1,20 @@ +{ + "5.10-lts": { + "hash": "sha256-6v8FhaEch9fJfo0/1UXeo0bcZh5n4Y2TyAsyHmCBJgw=", + "owner": "freebsd", + "repo": "drm-kmod", + "rev": "e7950546196d44af502dd6abf162d1453f6f0dd0" + }, + "5.15-lts": { + "hash": "sha256-i768QfnYo2hqxnoCEnfYqOurDSRwkAsC4qsP7TUalxc=", + "owner": "freebsd", + "repo": "drm-kmod", + "rev": "d7dc64fb8e63208afaca01e6d48284aa2305df35" + }, + "6.1-lts": { + "hash": "sha256-+CsqQ0beJgoO3SSWzwLcAO8JP15oaDW9HR+bxwPaan4=", + "owner": "freebsd", + "repo": "drm-kmod", + "rev": "f2d6d4b58446fa45de575bae76d6435439b3ca8b" + } +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/fdisk.nix b/pkgs/os-specific/bsd/freebsd/pkgs/fdisk.nix new file mode 100644 index 000000000000..62654008955c --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/fdisk.nix @@ -0,0 +1,6 @@ +{ mkDerivation, libgeom }: +mkDerivation { + path = "sbin/fdisk"; + + buildInputs = [ libgeom ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix b/pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix new file mode 100644 index 000000000000..ba55a5f651ed --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix @@ -0,0 +1,5 @@ +{ mkDerivation }: +mkDerivation { + path = "sbin/fsck"; + extraPaths = [ "sbin/mount" ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/geom.nix b/pkgs/os-specific/bsd/freebsd/pkgs/geom.nix new file mode 100644 index 000000000000..552d2e420120 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/geom.nix @@ -0,0 +1,44 @@ +{ + mkDerivation, + libgeom, + libufs, + openssl, +}: +let + libs = mkDerivation { + name = "geom-class-libs"; + path = "lib/geom"; + extraPaths = [ + "lib/Makefile.inc" + "sbin/geom" + "sys/geom" + + # geli isn't okay with just libcrypt, it wants files in here + "sys/crypto/sha2" + "sys/opencrypto" + ]; + + # libgeom needs sbuf and bsdxml but linker doesn't know that + buildInputs = [ + libgeom + libufs + openssl + ]; + + # tools want geom headers but don't seem to declare it + preBuild = '' + export NIX_CFLAGS_COMPILE="-I$BSDSRCDIR/sys $NIX_CFLAGS_COMPILE"; + ''; + }; +in +mkDerivation { + path = "sbin/geom"; + extraPaths = [ + "lib/Makefile.inc" + "lib/geom" + ]; + + GEOM_CLASS_DIR = "${libs}/lib"; + + buildInputs = [ libgeom ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/getent.nix b/pkgs/os-specific/bsd/freebsd/pkgs/getent.nix new file mode 100644 index 000000000000..4d812f506b4d --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/getent.nix @@ -0,0 +1 @@ +{ mkDerivation }: mkDerivation { path = "usr.bin/getent"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/getty.nix b/pkgs/os-specific/bsd/freebsd/pkgs/getty.nix new file mode 100644 index 000000000000..4335a21fe4f3 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/getty.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, + login, + wrappedLogin ? null, +}: +mkDerivation { + path = "libexec/getty"; + + postPatch = '' + sed -E -i -e "s|/usr/bin/login|${ + if (wrappedLogin != null) then wrappedLogin else "${login}/bin/login" + }|g" $BSDSRCDIR/libexec/getty/*.h + ''; + + MK_TESTS = "no"; + + postInstall = '' + mkdir -p $out/etc + cp $BSDSRCDIR/libexec/getty/gettytab $out/etc/gettytab + ''; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/id.nix b/pkgs/os-specific/bsd/freebsd/pkgs/id.nix new file mode 100644 index 000000000000..d838995f89bd --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/id.nix @@ -0,0 +1 @@ +{ mkDerivation }: mkDerivation { path = "usr.bin/id"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/ifconfig.nix b/pkgs/os-specific/bsd/freebsd/pkgs/ifconfig.nix new file mode 100644 index 000000000000..16b20733af4b --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/ifconfig.nix @@ -0,0 +1,24 @@ +{ + mkDerivation, + compatIfNeeded, + libifconfig, + lib80211, + libjail, + libnv, +}: +mkDerivation { + path = "sbin/ifconfig"; + + buildInputs = compatIfNeeded ++ [ + libifconfig + lib80211 + libjail + libnv + ]; + + # ifconfig believes libifconfig is internal and thus PIE. + # We build libifconfig as an external library + MK_PIE = "no"; + + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/init.nix b/pkgs/os-specific/bsd/freebsd/pkgs/init.nix new file mode 100644 index 000000000000..502c532b82e8 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/init.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: +mkDerivation { + path = "sbin/init"; + extraPaths = [ "sbin/mount" ]; + NO_FSCHG = "yes"; + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/kldconfig.nix b/pkgs/os-specific/bsd/freebsd/pkgs/kldconfig.nix new file mode 100644 index 000000000000..29f2a1b54308 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/kldconfig.nix @@ -0,0 +1,6 @@ +{ mkDerivation, lib }: +mkDerivation { + path = "sbin/kldconfig"; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/kldload.nix b/pkgs/os-specific/bsd/freebsd/pkgs/kldload.nix new file mode 100644 index 000000000000..a39909dc0369 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/kldload.nix @@ -0,0 +1,6 @@ +{ mkDerivation, lib }: +mkDerivation { + path = "sbin/kldload"; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/kldstat.nix b/pkgs/os-specific/bsd/freebsd/pkgs/kldstat.nix new file mode 100644 index 000000000000..164376a6bff9 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/kldstat.nix @@ -0,0 +1,6 @@ +{ mkDerivation, lib }: +mkDerivation { + path = "sbin/kldstat"; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/kldunload.nix b/pkgs/os-specific/bsd/freebsd/pkgs/kldunload.nix new file mode 100644 index 000000000000..fc622fc9edad --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/kldunload.nix @@ -0,0 +1,6 @@ +{ mkDerivation, lib }: +mkDerivation { + path = "sbin/kldunload"; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/lib80211.nix b/pkgs/os-specific/bsd/freebsd/pkgs/lib80211.nix new file mode 100644 index 000000000000..1cc8d337e057 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/lib80211.nix @@ -0,0 +1,13 @@ +{ + mkDerivation, + libsbuf, + libbsdxml, +}: +mkDerivation { + path = "lib/lib80211"; + buildInputs = [ + libsbuf + libbsdxml + ]; + clangFixup = true; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libbsdxml.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libbsdxml.nix new file mode 100644 index 000000000000..333e4048c837 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libbsdxml.nix @@ -0,0 +1,6 @@ +{ mkDerivation }: +mkDerivation { + path = "lib/libexpat"; + extraPaths = [ "contrib/expat" ]; + buildInputs = [ ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libbsm.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libbsm.nix new file mode 100644 index 000000000000..96ec9fd84d38 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libbsm.nix @@ -0,0 +1,7 @@ +{ mkDerivation, libpam }: +mkDerivation { + path = "lib/libbsm"; + extraPaths = [ "contrib/openbsm" ]; + buildInputs = [ libpam ]; + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libgeom.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libgeom.nix new file mode 100644 index 000000000000..295d9d75c537 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libgeom.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, + libbsdxml, + libsbuf, +}: +mkDerivation { + path = "lib/libgeom"; + buildInputs = [ + libbsdxml + libsbuf + ]; + + makeFlags = [ + "SHLIB_MAJOR=1" + "STRIP=-s" + ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libifconfig.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libifconfig.nix new file mode 100644 index 000000000000..4d7ab09b0c00 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libifconfig.nix @@ -0,0 +1,9 @@ +{ mkDerivation, buildPackages }: +mkDerivation { + path = "lib/libifconfig"; + extraPaths = [ + "tools/lua" + "lib/libc/Versions.def" + ]; + LUA = "${buildPackages.lua}/bin/lua"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libipsec.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libipsec.nix new file mode 100644 index 000000000000..a250448bac54 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libipsec.nix @@ -0,0 +1,9 @@ +{ mkDerivation, buildPackages }: +mkDerivation { + path = "lib/libipsec"; + + extraNativeBuildInputs = [ + buildPackages.byacc + buildPackages.flex + ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libkiconv.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libkiconv.nix new file mode 100644 index 000000000000..543f3e7ac042 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libkiconv.nix @@ -0,0 +1,5 @@ +{ mkDerivation }: +mkDerivation { + path = "lib/libkiconv"; + extraPaths = [ "sys" ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libpam.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libpam.nix new file mode 100644 index 000000000000..2afb20377d6b --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libpam.nix @@ -0,0 +1,44 @@ +{ + mkDerivation, + openssl, + libradius, +}: +mkDerivation { + path = "lib/libpam/libpam"; + extraPaths = [ + "lib/libpam" + "contrib/openpam" + "lib/Makefile.inc" + "contrib/pam_modules" + "crypto/openssh" + ]; + buildInputs = [ + libradius + openssl + ]; + + MK_NIS = "no"; # TODO + + # TODO + postPatch = '' + sed -E -i -e /pam_tacplus/d $BSDSRCDIR/lib/libpam/modules/modules.inc + sed -E -i -e /pam_krb5/d $BSDSRCDIR/lib/libpam/modules/modules.inc + sed -E -i -e /pam_ksu/d $BSDSRCDIR/lib/libpam/modules/modules.inc + sed -E -i -e /pam_ssh/d $BSDSRCDIR/lib/libpam/modules/modules.inc + ''; + + preBuild = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$BSDSRCDIR/lib/libpam/libpam -DOPENPAM_MODULES_DIRECTORY=\"$out/lib\"" + ''; + + MK_TESTS = "no"; + + postInstall = '' + make $makeFlags installconfig + + export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib" + make -C $BSDSRCDIR/lib/libpam/modules $makeFlags + make -C $BSDSRCDIR/lib/libpam/modules $makeFlags install + make -C $BSDSRCDIR/lib/libpam/modules $makeFlags installconfig + ''; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libradius.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libradius.nix new file mode 100644 index 000000000000..9766d75e6c3f --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libradius.nix @@ -0,0 +1,14 @@ +{ + mkDerivation, + openssl, + libmd, +}: +mkDerivation { + path = "lib/libradius"; + buildInputs = [ + libmd + openssl + ]; + + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libsysdecode.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libsysdecode.nix new file mode 100644 index 000000000000..da78404e2a58 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libsysdecode.nix @@ -0,0 +1,14 @@ +{ mkDerivation, stdenv }: +mkDerivation { + path = "lib/libsysdecode"; + extraPaths = [ + "sys" + "libexec/rtld-elf" + ]; + + preBuild = '' + sed -E -i -e "s|..INCLUDEDIR.|${stdenv.cc.libc}/include|g" $BSDSRCDIR/lib/libsysdecode/Makefile + ''; + + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libufs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libufs.nix new file mode 100644 index 000000000000..c0d71eb2b9c1 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libufs.nix @@ -0,0 +1,8 @@ +{ mkDerivation }: +mkDerivation { + path = "lib/libufs"; + extraPaths = [ + "sys/libkern" + "sys/ufs" + ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix new file mode 100644 index 000000000000..fcb4b29dc14d --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix @@ -0,0 +1,85 @@ +{ + mkDerivation, + lib, + libbsdxml, + libgeom, + openssl, + zfs-data, + zlib, +}: +# When I told you this was libzfs, I lied. +# This is actually all the openzfs libs. +# We need to build a bunch of them before libzfs otherwise it complains +# For the dependency tree see sys/contrib/openzfs/lib/Makefile.am +# or cddl/lib/Makefile +let + libs = [ + # Not really "zfs" libraries, they're solaris compatiblity libraries + "libspl" + "libumem" + + # Libraires with no dependencies here execpt libumem and libspl + "libavl" + "libicp" + "libnvpair" + "libtpool" + + # Depend only on the previous ones + "libzutil" + "libzfs_core" + "libuutil" + + # Final libraries + "libzpool" + "libzfs" + ]; +in +mkDerivation { + path = "cddl/lib/libzfs"; + extraPaths = [ + "cddl/Makefile.inc" + "cddl/compat/opensolaris" + "cddl/lib" + "sys/contrib/openzfs" + "sys/modules/zfs" + ]; + + buildInputs = [ + libbsdxml + libgeom + openssl + zlib + ]; + + postPatch = '' + # libnvpair uses `struct xdr_bytesrec`, which is never defined when this is set + # no idea how this works upstream + sed -i 's/-DHAVE_XDR_BYTESREC//' $BSDSRCDIR/cddl/lib/libnvpair/Makefile + + # libzfs wants some files from compatibility.d, put them in the store + sed -i 's|/usr/share/zfs|${zfs-data}/share/zfs|' $BSDSRCDIR/cddl/lib/libzfs/Makefile + ''; + + # If we don't specify an object directory then + # make will try to put openzfs objects in nonexistant directories. + # This one seems to work + preBuild = + '' + export MAKEOBJDIRPREFIX=$BSDSRCDIR/obj + '' + + lib.flip lib.concatMapStrings libs (libname: '' + echo "building dependency ${libname}" + make -C $BSDSRCDIR/cddl/lib/${libname} $makeFlags + make -C $BSDSRCDIR/cddl/lib/${libname} $makeFlags install + ''); + + outputs = [ + "out" + "debug" + ]; + + meta = { + platforms = lib.platforms.freebsd; + license = with lib.licenses; [ cddl ]; + }; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/limits.nix b/pkgs/os-specific/bsd/freebsd/pkgs/limits.nix new file mode 100644 index 000000000000..1e045c8a13fa --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/limits.nix @@ -0,0 +1,6 @@ +{ mkDerivation, libutil }: +mkDerivation { + path = "usr.bin/limits"; + buildInputs = [ libutil ]; + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/login.nix b/pkgs/os-specific/bsd/freebsd/pkgs/login.nix new file mode 100644 index 000000000000..8952068b8e9c --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/login.nix @@ -0,0 +1,28 @@ +{ + mkDerivation, + libutil, + libpam, + libbsm, + cap_mkdb, +}: +mkDerivation { + path = "usr.bin/login"; + buildInputs = [ + libutil + libpam + libbsm + ]; + extraNativeBuildInputs = [ cap_mkdb ]; + + postPatch = '' + sed -E -i -e "s|..DESTDIR./etc|\''${CONFDIR}|g" $BSDSRCDIR/usr.bin/login/Makefile + ''; + + MK_TESTS = "no"; + MK_SETUID_LOGIN = "no"; + + postInstall = '' + mkdir -p $out/etc + make $makeFlags installconfig + ''; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/makefs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/makefs.nix new file mode 100644 index 000000000000..c685a84264b7 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/makefs.nix @@ -0,0 +1,24 @@ +{ + mkDerivation, + libnetbsd, + compatIfNeeded, + libsbuf, +}: +mkDerivation { + path = "usr.sbin/makefs"; + extraPaths = [ + "stand/libsa" + "sys/cddl/boot" + "sys/ufs/ffs" + "sbin/newfs_msdos" + "contrib/mtree" + "contrib/mknod" + "sys/fs/cd9660" + ]; + buildInputs = compatIfNeeded ++ [ + libnetbsd + libsbuf + ]; + MK_TESTS = "no"; + MK_PIE = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mdconfig.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mdconfig.nix new file mode 100644 index 000000000000..b5e13344d94a --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mdconfig.nix @@ -0,0 +1,7 @@ +{ mkDerivation, libgeom }: +mkDerivation { + path = "sbin/mdconfig"; + buildInputs = [ libgeom ]; + + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index a085367ac68e..ec4b698116b9 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -2,9 +2,6 @@ lib, stdenv, stdenvNoCC, - stdenvNoLibs, - overrideCC, - buildPackages, versionData, writeText, patches, @@ -24,15 +21,7 @@ lib.makeOverridable ( attrs: let - stdenv' = - if attrs.noCC or false then - stdenvNoCC - else if attrs.noLibc or false then - stdenvNoLibs - else if attrs.noLibcxx or false then - overrideCC stdenv buildPackages.llvmPackages.clangNoLibcxx - else - stdenv; + stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; in stdenv'.mkDerivation ( rec { @@ -117,61 +106,10 @@ lib.makeOverridable ( } // { patches = - let - isDir = - file: - let - base = baseNameOf file; - type = (builtins.readDir (dirOf file)).${base} or null; - in - file == /. || type == "directory"; - consolidatePatches = - patches: - if (lib.isDerivation patches) then - [ patches ] - else if (builtins.isPath patches) then - (if (isDir patches) then (lib.filesystem.listFilesRecursive patches) else [ patches ]) - else if (builtins.isList patches) then - (lib.flatten (builtins.map consolidatePatches patches)) - else - throw "Bad patches - must be path or derivation or list thereof"; - consolidated = consolidatePatches patches; - splitPatch = - patchFile: - let - allLines' = lib.strings.splitString "\n" (builtins.readFile patchFile); - allLines = builtins.filter ( - line: !((lib.strings.hasPrefix "diff --git" line) || (lib.strings.hasPrefix "index " line)) - ) allLines'; - foldFunc = - a: b: - if ((lib.strings.hasPrefix "--- " b) || (lib.strings.hasPrefix "diff --git " b)) then - (a ++ [ [ b ] ]) - else - ((lib.lists.init a) ++ (lib.lists.singleton ((lib.lists.last a) ++ [ b ]))); - partitionedPatches' = lib.lists.foldl foldFunc [ [ ] ] allLines; - partitionedPatches = - if (builtins.length partitionedPatches' > 1) then - (lib.lists.drop 1 partitionedPatches') - else - (throw "${patchFile} does not seem to be a unified patch (diff -u). this is required for FreeBSD."); - filterFunc = - patchLines: - let - prefixedPath = builtins.elemAt (builtins.split " |\t" (builtins.elemAt patchLines 1)) 2; - unfixedPath = lib.path.subpath.join (lib.lists.drop 1 (lib.path.subpath.components prefixedPath)); - in - lib.lists.any (included: lib.path.hasPrefix (/. + ("/" + included)) (/. + ("/" + unfixedPath))) ( - (attrs.extraPaths or [ ]) ++ [ attrs.path ] - ); - filteredLines = builtins.filter filterFunc partitionedPatches; - derive = patchLines: writeText "freebsd-patch" (lib.concatLines patchLines); - derivedPatches = builtins.map derive filteredLines; - in - derivedPatches; - picked = lib.lists.concatMap splitPatch consolidated; - in - picked ++ attrs.patches or [ ]; + (lib.optionals (attrs.autoPickPatches or true) ( + freebsd-lib.filterPatches patches (attrs.extraPaths or [ ] ++ [ attrs.path ]) + )) + ++ attrs.patches or [ ]; } ) ) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkimg.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkimg.nix new file mode 100644 index 000000000000..00982a2a52a7 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkimg.nix @@ -0,0 +1,6 @@ +{ mkDerivation }: +mkDerivation { + path = "usr.bin/mkimg"; + extraPaths = [ "sys/sys/disk" ]; + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mount.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mount.nix new file mode 100644 index 000000000000..a4885871ad1c --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mount.nix @@ -0,0 +1,13 @@ +{ + mkDerivation, + libutil, + libxo, + ... +}: +mkDerivation { + path = "sbin/mount"; + buildInputs = [ + libutil + libxo + ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mount_msdosfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mount_msdosfs.nix new file mode 100644 index 000000000000..da42260ffbad --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mount_msdosfs.nix @@ -0,0 +1,6 @@ +{ mkDerivation, libkiconv }: +mkDerivation { + path = "sbin/mount_msdosfs"; + extraPaths = [ "sbin/mount" ]; + buildInputs = [ libkiconv ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/newfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/newfs.nix new file mode 100644 index 000000000000..7b7af7fcb25f --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/newfs.nix @@ -0,0 +1,6 @@ +{ mkDerivation, libufs }: +mkDerivation { + path = "sbin/newfs"; + extraPaths = [ "sys/geom" ]; + buildInputs = [ libufs ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/newfs_msdos.nix b/pkgs/os-specific/bsd/freebsd/pkgs/newfs_msdos.nix new file mode 100644 index 000000000000..274421a1a096 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/newfs_msdos.nix @@ -0,0 +1,6 @@ +{ mkDerivation }: +mkDerivation { + path = "sbin/newfs_msdos"; + + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/newsyslog.nix b/pkgs/os-specific/bsd/freebsd/pkgs/newsyslog.nix new file mode 100644 index 000000000000..947f324587ba --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/newsyslog.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, + compatIfNeeded, + libsbuf, +}: +mkDerivation { + path = "usr.sbin/newsyslog"; + + buildInputs = compatIfNeeded ++ [ libsbuf ]; + + # The only subdir is newsyslog.conf.d, all config files we don't want + postPatch = '' + sed -E -i -e '/^SUBDIR/d' $BSDSRCDIR/usr.sbin/newsyslog/Makefile + ''; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/nscd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/nscd.nix new file mode 100644 index 000000000000..c3ae6d46f067 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/nscd.nix @@ -0,0 +1,5 @@ +{ mkDerivation, libutil, ... }: +mkDerivation { + path = "usr.sbin/nscd"; + buildInputs = [ libutil ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/ping.nix b/pkgs/os-specific/bsd/freebsd/pkgs/ping.nix new file mode 100644 index 000000000000..ea209db2b960 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/ping.nix @@ -0,0 +1,24 @@ +{ + mkDerivation, + lib, + libcasper, + libcapsicum, + libipsec, +}: +mkDerivation { + path = "sbin/ping"; + buildInputs = [ + libcasper + libcapsicum + libipsec + ]; + + postPatch = '' + sed -i 's/4555/0555/' $BSDSRCDIR/sbin/ping/Makefile + ''; + + MK_TESTS = "no"; + clangFixup = true; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/protect.nix b/pkgs/os-specific/bsd/freebsd/pkgs/protect.nix new file mode 100644 index 000000000000..00e5dcfb16e9 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/protect.nix @@ -0,0 +1 @@ +{ mkDerivation }: mkDerivation { path = "usr.bin/protect"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/pwd_mkdb.nix b/pkgs/os-specific/bsd/freebsd/pkgs/pwd_mkdb.nix new file mode 100644 index 000000000000..27c3a9cec42a --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/pwd_mkdb.nix @@ -0,0 +1,6 @@ +{ mkDerivation, ... }: +mkDerivation { + path = "usr.sbin/pwd_mkdb"; + + extraPaths = [ "lib/libc/gen" ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix new file mode 100644 index 000000000000..92b645851b9c --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix @@ -0,0 +1,76 @@ +{ + mkDerivation, + lib, + sysctl, + bash, + rcorder, + bin, + stat, + id, + protect, + mount, +}: +let + rcDepsPath = lib.makeBinPath [ + sysctl + bin + bash + rcorder + stat + id + mount + protect + ]; +in +mkDerivation { + path = "libexec/rc"; + MK_TESTS = "no"; + + postPatch = + '' + substituteInPlace "$BSDSRCDIR/libexec/rc/rc.d/Makefile" "$BSDSRCDIR/libexec/rc/Makefile" --replace-fail /etc $out/etc + substituteInPlace "$BSDSRCDIR/libexec/rc/rc.d/Makefile" --replace-fail /var $out/var + '' + + ( + let + bins = [ + "/sbin/sysctl" + "/usr/bin/protect" + "/usr/bin/id" + "/bin/ps" + "/bin/cpuset" + "/usr/bin/stat" + "/bin/rm" + "/bin/chmod" + "/bin/cat" + "/bin/sync" + "/bin/sleep" + "/bin/date" + ]; + scripts = [ + "rc" + "rc.initdiskless" + "rc.shutdown" + "rc.subr" + "rc.suspend" + "rc.resume" + ]; + scriptPaths = "$BSDSRCDIR/libexec/rc/{${lib.concatStringsSep "," scripts}}"; + in + # set PATH correctly in scripts + '' + sed -E -i -e "s|PATH=.*|PATH=${rcDepsPath}|g" ${scriptPaths} + '' + # replace executable absolute filepaths with PATH lookups + + lib.concatMapStringsSep "\n" (fname: '' + sed -E -i -e "s|${fname}|${lib.last (lib.splitString "/" fname)}|g" \ + ${scriptPaths}'') bins + ); + + skipIncludesPhase = true; + + postInstall = '' + makeFlags="$(sed -E -e 's/CONFDIR=[^ ]*//g' <<<"$makeFlags")" + make $makeFlags installconfig + ''; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rcorder.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rcorder.nix new file mode 100644 index 000000000000..ddacf18e7b95 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/rcorder.nix @@ -0,0 +1 @@ +{ mkDerivation }: mkDerivation { path = "sbin/rcorder"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/reboot.nix b/pkgs/os-specific/bsd/freebsd/pkgs/reboot.nix new file mode 100644 index 000000000000..10a042dc45fd --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/reboot.nix @@ -0,0 +1,6 @@ +{ mkDerivation }: +mkDerivation { + path = "sbin/reboot"; + + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/route.nix b/pkgs/os-specific/bsd/freebsd/pkgs/route.nix new file mode 100644 index 000000000000..83278e785797 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/route.nix @@ -0,0 +1,10 @@ +{ + mkDerivation, + compatIfNeeded, + libjail, +}: +mkDerivation { + path = "sbin/route"; + buildInputs = compatIfNeeded ++ [ libjail ]; + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/services_mkdb.nix b/pkgs/os-specific/bsd/freebsd/pkgs/services_mkdb.nix new file mode 100644 index 000000000000..33c07093260e --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/services_mkdb.nix @@ -0,0 +1,8 @@ +{ mkDerivation }: +mkDerivation { + path = "usr.sbin/services_mkdb"; + postInstall = '' + mkdir -p $out/etc + cp $BSDSRCDIR/usr.sbin/services_mkdb/services $out/etc/services + ''; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/shutdown.nix b/pkgs/os-specific/bsd/freebsd/pkgs/shutdown.nix new file mode 100644 index 000000000000..4d32db0ed1da --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/shutdown.nix @@ -0,0 +1,9 @@ +{ mkDerivation }: +mkDerivation { + path = "sbin/shutdown"; + + MK_TESTS = "no"; + preBuild = '' + sed -i 's/4554/0554/' Makefile + ''; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix b/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix new file mode 100644 index 000000000000..c2d42af7814a --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + mkDerivation, + include, + buildPackages, + freebsd-lib, + vtfontcvt, +}: +let + hostArchBsd = freebsd-lib.mkBsdArch stdenv; +in +mkDerivation { + path = "stand/efi"; + extraPaths = [ + "contrib/bzip2" + "contrib/llvm-project/compiler-rt/lib/builtins" + "contrib/lua" + "contrib/pnglite" + "contrib/terminus" + "lib/libc" + "lib/liblua" + "libexec/flua" + "stand" + "sys" + ]; + extraNativeBuildInputs = [ vtfontcvt ]; + + makeFlags = [ + "STRIP=-s" # flag to install, not command + "MK_MAN=no" + "MK_TESTS=no" + "OBJCOPY=${lib.getBin buildPackages.binutils-unwrapped}/bin/${buildPackages.binutils-unwrapped.targetPrefix}objcopy" + ] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no"; + + hardeningDisable = [ "stackprotector" ]; + + # ??? + preBuild = '' + NIX_CFLAGS_COMPILE+=" -I${include}/include -I$BSDSRCDIR/sys/sys -I$BSDSRCDIR/sys/${hostArchBsd}/include" + export NIX_CFLAGS_COMPILE + + make -C $BSDSRCDIR/stand/libsa $makeFlags + make -C $BSDSRCDIR/stand/ficl $makeFlags + make -C $BSDSRCDIR/stand/liblua $makeFlags + ''; + + postPatch = '' + sed -E -i -e 's|/bin/pwd|${buildPackages.coreutils}/bin/pwd|' $BSDSRCDIR/stand/defs.mk + #sed -E -i -e 's|-e start|-Wl,-e,start|g' $BSDSRCDIR/stand/i386/Makefile.inc $BSDSRCDIR/stand/i386/*/Makefile + ''; + + postInstall = '' + mkdir -p $out/bin/lua + cp $BSDSRCDIR/stand/lua/*.lua $out/bin/lua + cp -r $BSDSRCDIR/stand/defaults $out/bin/defaults + ''; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/stat.nix b/pkgs/os-specific/bsd/freebsd/pkgs/stat.nix index a801ab895441..78c01ae498bd 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/stat.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/stat.nix @@ -19,4 +19,6 @@ mkDerivation { mandoc groff ]; + + MK_TESTS = "no"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/swapon.nix b/pkgs/os-specific/bsd/freebsd/pkgs/swapon.nix new file mode 100644 index 000000000000..d7bd8a870b8f --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/swapon.nix @@ -0,0 +1 @@ +{ mkDerivation }: mkDerivation { path = "sbin/swapon"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix index 86f847cbd45c..5bca92269212 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix @@ -1,85 +1,137 @@ { - stdenv, + lib, mkDerivation, - freebsd-lib, + stdenv, buildPackages, + freebsd-lib, + patches, + filterSource, + applyPatches, + baseConfig ? "GENERIC", + extraFlags ? { }, bsdSetupHook, + mandoc, + groff, + gawk, freebsdSetupHook, makeMinimal, install, - mandoc, - groff, config, rpcgen, file2c, - gawk, - uudecode, + bintrans, xargs-j, }: - -mkDerivation ( - let - cfg = "MINIMAL"; - in - rec { +let + hostArchBsd = freebsd-lib.mkBsdArch stdenv; + filteredSource = filterSource { + pname = "sys"; path = "sys"; - - nativeBuildInputs = [ - bsdSetupHook - freebsdSetupHook - makeMinimal - install - mandoc - groff - - config - rpcgen - file2c - gawk - uudecode - xargs-j + extraPaths = [ "include" ]; + }; + patchedSource = applyPatches { + src = filteredSource; + patches = freebsd-lib.filterPatches patches [ + "sys" + "include" ]; - - # --dynamic-linker /red/herring is used when building the kernel. - NIX_ENFORCE_PURITY = 0; - - AWK = "${buildPackages.gawk}/bin/awk"; - - CWARNEXTRA = "-Wno-error=shift-negative-value -Wno-address-of-packed-member"; - - MK_CTF = "no"; - - KODIR = "${builtins.placeholder "out"}/kernel"; - KMODDIR = "${builtins.placeholder "out"}/kernel"; - DTBDIR = "${builtins.placeholder "out"}/dbt"; - - KERN_DEBUGDIR = "${builtins.placeholder "out"}/debug"; - KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel"; - KERN_DEBUGDIR_KMODDIR = "${KERN_DEBUGDIR}/kernel"; - - skipIncludesPhase = true; - - configurePhase = '' - runHook preConfigure - - for f in conf/kmod.mk contrib/dev/acpica/acpica_prep.sh; do - substituteInPlace "$f" --replace 'xargs -J' 'xargs-j ' + postPatch = '' + for f in sys/conf/kmod.mk sys/contrib/dev/acpica/acpica_prep.sh; do + substituteInPlace "$f" --replace-warn 'xargs -J' 'xargs-j ' done - for f in conf/*.mk; do - substituteInPlace "$f" --replace 'KERN_DEBUGDIR}''${' 'KERN_DEBUGDIR_' + for f in sys/conf/*.mk; do + substituteInPlace "$f" --replace-quiet 'KERN_DEBUGDIR}''${' 'KERN_DEBUGDIR_' done - cd ${freebsd-lib.mkBsdArch stdenv}/conf - sed -i ${cfg} \ + sed -i sys/${hostArchBsd}/conf/${baseConfig} \ -e 's/WITH_CTF=1/WITH_CTF=0/' \ -e '/KDTRACE/d' - config ${cfg} + ''; + }; - runHook postConfigure - ''; - preBuild = '' - cd ../compile/${cfg} - ''; - } -) + # Kernel modules need this for kern.opts.mk + env = + { + MK_CTF = "no"; + } + // (lib.flip lib.mapAttrs' extraFlags ( + name: value: { + name = "MK_${lib.toUpper name}"; + value = if value then "yes" else "no"; + } + )); +in +mkDerivation rec { + pname = "sys"; + + # Patch source outside of this derivation so out-of-tree modules can use it + src = patchedSource; + path = "sys"; + autoPickPatches = false; + + nativeBuildInputs = [ + bsdSetupHook + mandoc + groff + gawk + freebsdSetupHook + makeMinimal + install + config + rpcgen + file2c + bintrans + xargs-j + ]; + + # --dynamic-linker /red/herring is used when building the kernel. + NIX_ENFORCE_PURITY = 0; + + AWK = "${buildPackages.gawk}/bin/awk"; + + CWARNEXTRA = "-Wno-error=shift-negative-value -Wno-address-of-packed-member"; + + hardeningDisable = [ + "pic" # generates relocations the linker can't handle + "stackprotector" # generates stack protection for the function generating the stack canary + ]; + + # hardeningDisable = stackprotector doesn't seem to be enough, put it in cflags too + NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + + inherit env; + passthru.env = env; + + KODIR = "${builtins.placeholder "out"}/kernel"; + KMODDIR = "${builtins.placeholder "out"}/kernel"; + DTBDIR = "${builtins.placeholder "out"}/dbt"; + + KERN_DEBUGDIR = "${builtins.placeholder "debug"}/lib/debug"; + KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel"; + KERN_DEBUGDIR_KMODDIR = "${KERN_DEBUGDIR}/kernel"; + + skipIncludesPhase = true; + + configurePhase = '' + runHook preConfigure + + cd ${hostArchBsd}/conf + config ${baseConfig} + + runHook postConfigure + ''; + preBuild = '' + cd ../compile/${baseConfig} + ''; + + outputs = [ + "out" + "debug" + ]; + + meta = { + description = "FreeBSD kernel and modules"; + platforms = lib.platforms.freebsd; + }; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sysctl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sysctl.nix new file mode 100644 index 000000000000..42b956614c51 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/sysctl.nix @@ -0,0 +1,5 @@ +{ mkDerivation, ... }: +mkDerivation { + path = "sbin/sysctl"; + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/syslogd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/syslogd.nix new file mode 100644 index 000000000000..33b7acdf9800 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/syslogd.nix @@ -0,0 +1,23 @@ +{ mkDerivation, lib }: +mkDerivation { + path = "usr.sbin/syslogd"; + + extraPaths = [ + "usr.bin/wall" + "sys/sys" + ]; + + # These want to install some config files which we don't want + MK_FTP = "no"; + MK_LPR = "no"; + MK_PPP = "no"; + + MK_TESTS = "no"; + + meta = { + description = "FreeBSD syslog daemon"; + maintainers = with lib.maintainers; [ artemist ]; + platforms = lib.platforms.freebsd; + license = lib.licenses.bsd2; + }; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/top.nix b/pkgs/os-specific/bsd/freebsd/pkgs/top.nix new file mode 100644 index 000000000000..0059fb731d2d --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/top.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, + libjail, + libncurses-tinfo, + libutil, + libsbuf, + ... +}: +mkDerivation { + path = "usr.bin/top"; + buildInputs = [ + libjail + libncurses-tinfo + libutil + libsbuf + ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/truss.nix b/pkgs/os-specific/bsd/freebsd/pkgs/truss.nix new file mode 100644 index 000000000000..df00db4367bd --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/truss.nix @@ -0,0 +1,5 @@ +{ mkDerivation, libsysdecode }: +mkDerivation { + path = "usr.bin/truss"; + buildInputs = [ libsysdecode ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/vtfontcvt.nix b/pkgs/os-specific/bsd/freebsd/pkgs/vtfontcvt.nix new file mode 100644 index 000000000000..a0ea69b3fd4d --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/vtfontcvt.nix @@ -0,0 +1,5 @@ +{ mkDerivation }: +mkDerivation { + path = "usr.bin/vtfontcvt"; + extraPaths = [ "sys/cddl/contrib/opensolaris/common/lz4" ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/zfs-data.nix b/pkgs/os-specific/bsd/freebsd/pkgs/zfs-data.nix new file mode 100644 index 000000000000..8b13f7ba9d76 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/zfs-data.nix @@ -0,0 +1,9 @@ +{ mkDerivation, lib }: +mkDerivation { + path = "cddl/share/zfs/compatibility.d"; + extraPaths = [ "sys/contrib/openzfs/cmd/zpool/compatibility.d" ]; + + meta = with lib; { + license = licenses.cddl; + }; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/zfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/zfs.nix new file mode 100644 index 000000000000..505fa37fe2d7 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/zfs.nix @@ -0,0 +1,49 @@ +{ + mkDerivation, + lib, + libgeom, + libjail, + libzfs, + openssl, + zfs-data, +}: +mkDerivation { + path = "cddl/sbin/zfs"; + extraPaths = [ + "cddl/compat/opensolaris" + "cddl/sbin/zpool" + "sys/contrib/openzfs" + "sys/modules/zfs" + ]; + + buildInputs = [ + libgeom + libjail + libzfs + openssl + ]; + + postPatch = '' + sed -i 's|/usr/share/zfs|${zfs-data}/share/zfs|' $BSDSRCDIR/cddl/sbin/zpool/Makefile + ''; + + # I lied, this is both zpool and zfs + preBuild = '' + make -C $BSDSRCDIR/cddl/sbin/zpool $makeFlags + make -C $BSDSRCDIR/cddl/sbin/zpool $makeFlags install + ''; + + outputs = [ + "out" + "man" + "debug" + ]; + + meta = { + platforms = lib.platforms.freebsd; + license = with lib.licenses; [ + cddl + bsd2 + ]; + }; +} diff --git a/pkgs/os-specific/darwin/apparency/default.nix b/pkgs/os-specific/darwin/apparency/default.nix index d5f9a7be172b..54a8395f4807 100644 --- a/pkgs/os-specific/darwin/apparency/default.nix +++ b/pkgs/os-specific/darwin/apparency/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { description = "App That Opens Apps"; homepage = "https://www.mothersruin.com/software/Apparency/"; license = lib.licenses.unfreeRedistributable; - maintainers = with lib.maintainers; [ Enzime ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "appy"; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 238c1b7e460b..7262400c3eb0 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -51,7 +51,7 @@ let }; mkCc = cc: - if stdenv.isAarch64 then cc + if lib.versionAtLeast stdenv.hostPlatform.darwinSdkVersion "11" then cc else cc.override { bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; }; @@ -59,7 +59,7 @@ let }; mkStdenv = stdenv: - if stdenv.isAarch64 then stdenv + if lib.versionAtLeast stdenv.hostPlatform.darwinSdkVersion "11" then stdenv else let darwinMinVersion = "10.12"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 206f46125b9b..af37143835c5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -59,7 +59,7 @@ appleDerivation' stdenv { (cd $dep/include && find . -name '*.h' | copyHierarchy $out/include) done - (cd ${buildPackages.darwin.cctools.dev}/include/mach-o && find . -name '*.h' | copyHierarchy $out/include/mach-o) + (cd ${lib.getDev buildPackages.darwin.cctools}/include/mach-o && find . -name '*.h' | copyHierarchy $out/include/mach-o) for header in pthread.h pthread_impl.h pthread_spis.h sched.h; do ln -s "$out/include/pthread/$header" "$out/include/$header" @@ -142,7 +142,7 @@ appleDerivation' stdenv { $out/lib substituteInPlace $out/lib/libSystem.B.tbd \ - --replace "/usr/lib/system/" "$out/lib/system/" + --replace-fail "/usr/lib/system/" "$out/lib/system/" ln -s libSystem.B.tbd $out/lib/libSystem.tbd # Set up links to pretend we work like a conventional unix (Apple's design, not mine!) diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 3eae8749c4e4..aae3d515a6f9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,6 +1,10 @@ { lib, stdenv, fetchurl, fetchFromGitHub, pkgs }: let + + isSdk10_12 = stdenv.hostPlatform.darwinSdkVersion == "10.12"; + + # This attrset can in theory be computed automatically, but for that to work nicely we need # import-from-derivation to work properly. Currently it's rather ugly when we try to bootstrap # a stdenv out of something like this. With some care we can probably get rid of this, but for @@ -271,10 +275,10 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { Libinfo = applePackage "Libinfo" "osx-10.11.6" "sha256-6F7wiwerv4nz/xXHtp1qCHSaFzZgzcRN+jbmXA5oWOQ=" {}; Libm = applePackage "Libm" "osx-10.7.4" "sha256-KjMETfT4qJm0m0Ux/F6Rq8bI4Q4UVnFx6IKbKxXd+Es=" {}; Libnotify = applePackage "Libnotify" "osx-10.12.6" "sha256-6wvMBxAUfiYcQtmlfYCj1d3kFmFM/jdboTd7hRvi3e4=" {}; - libmalloc = if stdenv.isx86_64 then + libmalloc = if isSdk10_12 then applePackage "libmalloc" "osx-10.12.6" "sha256-brfG4GEF2yZipKdhlPq6DhT2z5hKYSb2MAmffaikdO4=" {} else macosPackages_11_0_1.libmalloc; - libplatform = if stdenv.isx86_64 then + libplatform = if isSdk10_12 then applePackage "libplatform" "osx-10.12.6" "sha256-6McMTjw55xtnCsFI3AB1osRagnuB5pSTqeMKD3gpGtM=" {} else macosPackages_11_0_1.libplatform; libpthread = applePackage "libpthread" "osx-10.12.6" "sha256-QvJ9PERmrCWBiDmOWrLvQUKZ4JxHuh8gS5nlZKDLqE8=" {}; @@ -286,7 +290,7 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { objc4 = applePackage "objc4" "osx-10.12.6" "sha256-ZsxRpdsfv3Dxs7yBBCkjbKXKR6aXwkEpxc1XYXz7ueM=" {}; ppp = applePackage "ppp" "osx-10.12.6" "sha256-M1zoEjjeKIDUEP6ACbpUJk3OXjobw4g/qzUmxGdX1J0=" {}; removefile = applePackage "removefile" "osx-10.12.6" "sha256-UpNk27kGXnZss1ZXWVJU9jLz/NW63ZAZEDLhyCYoi9M=" {}; - xnu = if stdenv.isx86_64 then + xnu = if isSdk10_12 then applePackage "xnu" "osx-10.12.6" "sha256-C8TPQlUT3RbzAy8YnZPNtr70hpaVG9Llv0h42s3NENI=" {} else macosPackages_11_0_1.xnu; hfs = applePackage "hfs" "osx-10.12.6" "sha256-eGi18HQFJrU5UHoBOE0LqO5gQ0xOf8+OJuAWQljfKE4=" {}; @@ -297,7 +301,7 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { diskdev_cmds = applePackage "diskdev_cmds" "osx-10.11.6" "sha256-VX+hcZ7JhOA8EhwLloPlM3Yx79RXp9OYHV9Mi10uw3Q=" { macosPackages_11_0_1 = macosPackages_11_0_1; }; - network_cmds = if stdenv.isx86_64 then + network_cmds = if isSdk10_12 then applePackage "network_cmds" "osx-10.11.6" "sha256-I89CLIswGheewOjiNZwQTgWvWbhm0qtB5+KUqzxnQ5M=" {} else macosPackages_11_0_1.network_cmds; file_cmds = applePackage "file_cmds" "osx-10.11.6" "sha256-JYy6HwmultKeZtLfaysbsyLoWg+OaTh7eJu54JkJC0Q=" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index 14ede7949d0f..2820df1db1b1 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation', lib, stdenv, stdenvNoCC, buildPackages +{ appleDerivation', lib, stdenv, stdenvNoCC, buildPackages, pkgsBuildBuild , bootstrap_cmds, bison, flex , gnum4, unifdef, perl, python3 , headersOnly ? true @@ -12,7 +12,7 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ( nativeBuildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl python3 ]; - patches = lib.optionals stdenv.isx86_64 [ ./python3.patch ]; + patches = lib.optionals (lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11") [ ./python3.patch ]; postPatch = '' substituteInPlace Makefile \ @@ -48,7 +48,7 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ( --replace 'MACHINE_ARCH=armv7' 'MACHINE_ARCH=arm64' # this might break the comments saying 32-bit is required patchShebangs . - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinSdkVersion "11") '' # iig is closed-sourced, we don't have it # create an empty file to the header instead # this line becomes: echo "" > $@; echo --header ... @@ -72,7 +72,11 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ( HOST_FLEX = "flex"; HOST_BISON = "bison"; HOST_GM4 = "m4"; - MIGCC = "cc"; + # use unwrapped clang to generate headers because wrapper is not compatible with a 32 bit -arch. + # aarch64 should likely do this as well and remove the --replace MACHINE_ARCH above + MIGCC = if stdenv.isx86_64 && lib.versionAtLeast stdenv.hostPlatform.darwinSdkVersion "11" + then "${lib.getBin pkgsBuildBuild.stdenv.cc.cc}/bin/clang" + else "cc"; ARCHS = arch; ARCH_CONFIGS = arch; @@ -80,7 +84,7 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ( preBuild = let macosVersion = "10.0 10.1 10.2 10.3 10.4 10.5 10.6 10.7 10.8 10.9 10.10 10.11" + - lib.optionalString stdenv.isAarch64 " 10.12 10.13 10.14 10.15 11.0"; + lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinSdkVersion "11") " 10.12 10.13 10.14 10.15 11.0"; in '' # This is a bit of a hack... mkdir -p sdk/usr/local/libexec @@ -150,7 +154,7 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ( mv $out/Library/Frameworks/IOKit.framework $out/Library/PrivateFrameworks ''; - appleHeaders = builtins.readFile (./. + "/headers-${arch}.txt"); + appleHeaders = builtins.readFile (./. + "/headers-${stdenv.hostPlatform.darwinSdkVersion}-${arch}.txt"); } // lib.optionalAttrs headersOnly { HOST_CODESIGN = "echo"; HOST_CODESIGN_ALLOCATE = "echo"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-x86_64.txt b/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-10.12-x86_64.txt similarity index 100% rename from pkgs/os-specific/darwin/apple-source-releases/xnu/headers-x86_64.txt rename to pkgs/os-specific/darwin/apple-source-releases/xnu/headers-10.12-x86_64.txt diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-arm64.txt b/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-11.0-arm64.txt similarity index 100% rename from pkgs/os-specific/darwin/apple-source-releases/xnu/headers-arm64.txt rename to pkgs/os-specific/darwin/apple-source-releases/xnu/headers-11.0-arm64.txt diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-11.0-x86_64.txt b/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-11.0-x86_64.txt new file mode 100644 index 000000000000..f2ab4917845e --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-11.0-x86_64.txt @@ -0,0 +1,1481 @@ +AssertMacros.h +_errno.h +_libkernel_init.h +atm/atm_notification.defs +atm/atm_types.defs +atm/atm_types.h +bank/bank_types.h +bsd/bsm/audit.h +bsd/crypto/entropy/diag_entropy_sysctl.h +bsd/dev/random/randomdev.h +bsd/i386/_limits.h +bsd/i386/_mcontext.h +bsd/i386/_param.h +bsd/i386/_types.h +bsd/i386/endian.h +bsd/i386/limits.h +bsd/i386/param.h +bsd/i386/profile.h +bsd/i386/signal.h +bsd/i386/types.h +bsd/i386/vmparam.h +bsd/libkern/copyio.h +bsd/libkern/libkern.h +bsd/machine/_limits.h +bsd/machine/_mcontext.h +bsd/machine/_param.h +bsd/machine/_types.h +bsd/machine/byte_order.h +bsd/machine/disklabel.h +bsd/machine/endian.h +bsd/machine/limits.h +bsd/machine/param.h +bsd/machine/profile.h +bsd/machine/signal.h +bsd/machine/types.h +bsd/machine/vmparam.h +bsd/miscfs/devfs/devfs.h +bsd/miscfs/devfs/devfs_proto.h +bsd/miscfs/devfs/devfsdefs.h +bsd/miscfs/devfs/fdesc.h +bsd/miscfs/fifofs/fifo.h +bsd/miscfs/specfs/specdev.h +bsd/miscfs/union/union.h +bsd/net/bpf.h +bsd/net/dlil.h +bsd/net/ethernet.h +bsd/net/if.h +bsd/net/if_arp.h +bsd/net/if_dl.h +bsd/net/if_ether.h +bsd/net/if_llc.h +bsd/net/if_media.h +bsd/net/if_mib.h +bsd/net/if_types.h +bsd/net/if_utun.h +bsd/net/if_var.h +bsd/net/init.h +bsd/net/kext_net.h +bsd/net/kpi_interface.h +bsd/net/kpi_interfacefilter.h +bsd/net/kpi_protocol.h +bsd/net/ndrv.h +bsd/net/net_kev.h +bsd/net/pfkeyv2.h +bsd/net/radix.h +bsd/net/route.h +bsd/netinet/bootp.h +bsd/netinet/icmp6.h +bsd/netinet/icmp_var.h +bsd/netinet/if_ether.h +bsd/netinet/igmp.h +bsd/netinet/igmp_var.h +bsd/netinet/in.h +bsd/netinet/in_arp.h +bsd/netinet/in_pcb.h +bsd/netinet/in_systm.h +bsd/netinet/in_var.h +bsd/netinet/ip.h +bsd/netinet/ip6.h +bsd/netinet/ip_icmp.h +bsd/netinet/ip_var.h +bsd/netinet/kpi_ipfilter.h +bsd/netinet/tcp.h +bsd/netinet/tcp_fsm.h +bsd/netinet/tcp_seq.h +bsd/netinet/tcp_timer.h +bsd/netinet/tcp_var.h +bsd/netinet/tcpip.h +bsd/netinet/udp.h +bsd/netinet/udp_var.h +bsd/netinet6/ah.h +bsd/netinet6/esp.h +bsd/netinet6/in6.h +bsd/netinet6/in6_var.h +bsd/netinet6/ipcomp.h +bsd/netinet6/ipsec.h +bsd/netinet6/nd6.h +bsd/netinet6/raw_ip6.h +bsd/netinet6/scope6_var.h +bsd/netkey/keysock.h +bsd/pthread/bsdthread_private.h +bsd/pthread/priority_private.h +bsd/pthread/workqueue_internal.h +bsd/pthread/workqueue_syscalls.h +bsd/pthread/workqueue_trace.h +bsd/security/audit/audit.h +bsd/security/audit/audit_bsd.h +bsd/security/audit/audit_ioctl.h +bsd/security/audit/audit_private.h +bsd/sys/_endian.h +bsd/sys/_select.h +bsd/sys/_structs.h +bsd/sys/_types.h +bsd/sys/_types/_blkcnt_t.h +bsd/sys/_types/_blksize_t.h +bsd/sys/_types/_caddr_t.h +bsd/sys/_types/_clock_t.h +bsd/sys/_types/_ct_rune_t.h +bsd/sys/_types/_dev_t.h +bsd/sys/_types/_errno_t.h +bsd/sys/_types/_fd_clr.h +bsd/sys/_types/_fd_copy.h +bsd/sys/_types/_fd_def.h +bsd/sys/_types/_fd_isset.h +bsd/sys/_types/_fd_set.h +bsd/sys/_types/_fd_setsize.h +bsd/sys/_types/_fd_zero.h +bsd/sys/_types/_filesec_t.h +bsd/sys/_types/_fsblkcnt_t.h +bsd/sys/_types/_fsfilcnt_t.h +bsd/sys/_types/_fsid_t.h +bsd/sys/_types/_fsobj_id_t.h +bsd/sys/_types/_gid_t.h +bsd/sys/_types/_guid_t.h +bsd/sys/_types/_id_t.h +bsd/sys/_types/_in_addr_t.h +bsd/sys/_types/_in_port_t.h +bsd/sys/_types/_ino64_t.h +bsd/sys/_types/_ino_t.h +bsd/sys/_types/_int16_t.h +bsd/sys/_types/_int32_t.h +bsd/sys/_types/_int64_t.h +bsd/sys/_types/_int8_t.h +bsd/sys/_types/_intptr_t.h +bsd/sys/_types/_iovec_t.h +bsd/sys/_types/_key_t.h +bsd/sys/_types/_mach_port_t.h +bsd/sys/_types/_mbstate_t.h +bsd/sys/_types/_mode_t.h +bsd/sys/_types/_nlink_t.h +bsd/sys/_types/_null.h +bsd/sys/_types/_o_dsync.h +bsd/sys/_types/_o_sync.h +bsd/sys/_types/_off_t.h +bsd/sys/_types/_offsetof.h +bsd/sys/_types/_os_inline.h +bsd/sys/_types/_pid_t.h +bsd/sys/_types/_posix_vdisable.h +bsd/sys/_types/_ptrdiff_t.h +bsd/sys/_types/_rsize_t.h +bsd/sys/_types/_rune_t.h +bsd/sys/_types/_s_ifmt.h +bsd/sys/_types/_sa_family_t.h +bsd/sys/_types/_seek_set.h +bsd/sys/_types/_sigaltstack.h +bsd/sys/_types/_sigset_t.h +bsd/sys/_types/_size_t.h +bsd/sys/_types/_socklen_t.h +bsd/sys/_types/_ssize_t.h +bsd/sys/_types/_suseconds_t.h +bsd/sys/_types/_time_t.h +bsd/sys/_types/_timespec.h +bsd/sys/_types/_timeval.h +bsd/sys/_types/_timeval32.h +bsd/sys/_types/_timeval64.h +bsd/sys/_types/_u_char.h +bsd/sys/_types/_u_int.h +bsd/sys/_types/_u_int16_t.h +bsd/sys/_types/_u_int32_t.h +bsd/sys/_types/_u_int64_t.h +bsd/sys/_types/_u_int8_t.h +bsd/sys/_types/_u_short.h +bsd/sys/_types/_ucontext.h +bsd/sys/_types/_ucontext64.h +bsd/sys/_types/_uid_t.h +bsd/sys/_types/_uintptr_t.h +bsd/sys/_types/_useconds_t.h +bsd/sys/_types/_user32_itimerval.h +bsd/sys/_types/_user32_ntptimeval.h +bsd/sys/_types/_user32_timespec.h +bsd/sys/_types/_user32_timeval.h +bsd/sys/_types/_user32_timex.h +bsd/sys/_types/_user64_itimerval.h +bsd/sys/_types/_user64_ntptimeval.h +bsd/sys/_types/_user64_timespec.h +bsd/sys/_types/_user64_timeval.h +bsd/sys/_types/_user64_timex.h +bsd/sys/_types/_user_timespec.h +bsd/sys/_types/_user_timeval.h +bsd/sys/_types/_uuid_t.h +bsd/sys/_types/_va_list.h +bsd/sys/_types/_wchar_t.h +bsd/sys/_types/_wint_t.h +bsd/sys/appleapiopts.h +bsd/sys/attr.h +bsd/sys/bsdtask_info.h +bsd/sys/buf.h +bsd/sys/cdefs.h +bsd/sys/codesign.h +bsd/sys/commpage.h +bsd/sys/conf.h +bsd/sys/content_protection.h +bsd/sys/cprotect.h +bsd/sys/csr.h +bsd/sys/decmpfs.h +bsd/sys/dir.h +bsd/sys/dirent.h +bsd/sys/disk.h +bsd/sys/disklabel.h +bsd/sys/disktab.h +bsd/sys/dkstat.h +bsd/sys/doc_tombstone.h +bsd/sys/domain.h +bsd/sys/errno.h +bsd/sys/ev.h +bsd/sys/event.h +bsd/sys/eventhandler.h +bsd/sys/eventvar.h +bsd/sys/fbt.h +bsd/sys/fcntl.h +bsd/sys/file.h +bsd/sys/file_internal.h +bsd/sys/filedesc.h +bsd/sys/fileport.h +bsd/sys/filio.h +bsd/sys/fsctl.h +bsd/sys/fsevents.h +bsd/sys/fslog.h +bsd/sys/guarded.h +bsd/sys/imgact.h +bsd/sys/ioccom.h +bsd/sys/ioctl.h +bsd/sys/ioctl_compat.h +bsd/sys/ipc.h +bsd/sys/kasl.h +bsd/sys/kauth.h +bsd/sys/kdebug.h +bsd/sys/kdebug_kernel.h +bsd/sys/kdebug_private.h +bsd/sys/kern_control.h +bsd/sys/kern_event.h +bsd/sys/kern_memorystatus.h +bsd/sys/kern_memorystatus_freeze.h +bsd/sys/kern_memorystatus_notify.h +bsd/sys/kern_sysctl.h +bsd/sys/kernel.h +bsd/sys/kernel_types.h +bsd/sys/kpi_mbuf.h +bsd/sys/kpi_private.h +bsd/sys/kpi_socket.h +bsd/sys/kpi_socketfilter.h +bsd/sys/ktrace.h +bsd/sys/linker_set.h +bsd/sys/lock.h +bsd/sys/lockf.h +bsd/sys/mach_swapon.h +bsd/sys/malloc.h +bsd/sys/mbuf.h +bsd/sys/md5.h +bsd/sys/memory_maintenance.h +bsd/sys/mman.h +bsd/sys/monotonic.h +bsd/sys/mount.h +bsd/sys/mount_internal.h +bsd/sys/msg.h +bsd/sys/msgbuf.h +bsd/sys/munge.h +bsd/sys/namei.h +bsd/sys/netport.h +bsd/sys/param.h +bsd/sys/paths.h +bsd/sys/persona.h +bsd/sys/pgo.h +bsd/sys/pipe.h +bsd/sys/posix_sem.h +bsd/sys/posix_shm.h +bsd/sys/priv.h +bsd/sys/proc.h +bsd/sys/proc_info.h +bsd/sys/proc_internal.h +bsd/sys/proc_require.h +bsd/sys/protosw.h +bsd/sys/pthread_internal.h +bsd/sys/pthread_shims.h +bsd/sys/queue.h +bsd/sys/quota.h +bsd/sys/random.h +bsd/sys/reason.h +bsd/sys/reboot.h +bsd/sys/resource.h +bsd/sys/resourcevar.h +bsd/sys/sbuf.h +bsd/sys/select.h +bsd/sys/sem.h +bsd/sys/sem_internal.h +bsd/sys/semaphore.h +bsd/sys/shm.h +bsd/sys/shm_internal.h +bsd/sys/signal.h +bsd/sys/signalvar.h +bsd/sys/socket.h +bsd/sys/socketvar.h +bsd/sys/sockio.h +bsd/sys/spawn.h +bsd/sys/spawn_internal.h +bsd/sys/stackshot.h +bsd/sys/stat.h +bsd/sys/stdio.h +bsd/sys/sys_domain.h +bsd/sys/syscall.h +bsd/sys/sysctl.h +bsd/sys/syslimits.h +bsd/sys/syslog.h +bsd/sys/sysproto.h +bsd/sys/systm.h +bsd/sys/termios.h +bsd/sys/time.h +bsd/sys/timex.h +bsd/sys/tree.h +bsd/sys/tty.h +bsd/sys/ttychars.h +bsd/sys/ttycom.h +bsd/sys/ttydefaults.h +bsd/sys/ttydev.h +bsd/sys/types.h +bsd/sys/ubc.h +bsd/sys/ucontext.h +bsd/sys/ucred.h +bsd/sys/uio.h +bsd/sys/uio_internal.h +bsd/sys/ulock.h +bsd/sys/un.h +bsd/sys/unicode.h +bsd/sys/unistd.h +bsd/sys/unpcb.h +bsd/sys/user.h +bsd/sys/utfconv.h +bsd/sys/ux_exception.h +bsd/sys/vfs_context.h +bsd/sys/vm.h +bsd/sys/vmmeter.h +bsd/sys/vmparam.h +bsd/sys/vnode.h +bsd/sys/vnode_if.h +bsd/sys/vnode_internal.h +bsd/sys/vsock.h +bsd/sys/vsock_domain.h +bsd/sys/vsock_transport.h +bsd/sys/wait.h +bsd/sys/work_interval.h +bsd/sys/xattr.h +bsd/uuid/uuid.h +bsd/vfs/vfs_disk_conditioner.h +bsd/vfs/vfs_support.h +bsd/vm/vnode_pager.h +bsm/audit.h +bsm/audit_domain.h +bsm/audit_errno.h +bsm/audit_fcntl.h +bsm/audit_internal.h +bsm/audit_kevents.h +bsm/audit_record.h +bsm/audit_socket_type.h +corecrypto/cc.h +corecrypto/cc_config.h +corecrypto/cc_error.h +corecrypto/cc_fault_canary.h +corecrypto/cc_macros.h +corecrypto/cc_priv.h +corecrypto/cc_runtime_config.h +corecrypto/ccaes.h +corecrypto/ccasn1.h +corecrypto/ccchacha20poly1305.h +corecrypto/cccmac.h +corecrypto/ccdes.h +corecrypto/ccdigest.h +corecrypto/ccdigest_priv.h +corecrypto/ccdrbg.h +corecrypto/ccdrbg_impl.h +corecrypto/cchmac.h +corecrypto/cckprng.h +corecrypto/ccmd4.h +corecrypto/ccmode.h +corecrypto/ccmode_impl.h +corecrypto/ccmode_siv.h +corecrypto/ccmode_siv_hmac.h +corecrypto/ccn.h +corecrypto/ccpad.h +corecrypto/ccrng.h +corecrypto/ccrsa.h +corecrypto/ccsha1.h +corecrypto/ccsha2.h +corecrypto/cczp.h +corecrypto/fipspost_trace.h +corpses/task_corpse.h +default_pager/default_pager_types.h +device/device.defs +device/device_port.h +device/device_types.defs +device/device_types.h +gethostuuid.h +gethostuuid_private.h +i386/_limits.h +i386/_mcontext.h +i386/_param.h +i386/_types.h +i386/eflags.h +i386/endian.h +i386/fasttrap_isa.h +i386/limits.h +i386/param.h +i386/profile.h +i386/signal.h +i386/types.h +i386/user_ldt.h +i386/vmparam.h +iokit/DriverKit/IOBufferMemoryDescriptor.h +iokit/DriverKit/IODMACommand.h +iokit/DriverKit/IODataQueueDispatchSource.h +iokit/DriverKit/IODispatchQueue.h +iokit/DriverKit/IODispatchSource.h +iokit/DriverKit/IOInterruptDispatchSource.h +iokit/DriverKit/IOKitKeys.h +iokit/DriverKit/IOMemoryDescriptor.h +iokit/DriverKit/IOMemoryMap.h +iokit/DriverKit/IORPC.h +iokit/DriverKit/IOReturn.h +iokit/DriverKit/IOService.h +iokit/DriverKit/IOServiceNotificationDispatchSource.h +iokit/DriverKit/IOTypes.h +iokit/DriverKit/IOUserClient.h +iokit/DriverKit/IOUserServer.h +iokit/DriverKit/OSAction.h +iokit/DriverKit/OSObject.h +iokit/IOKit/AppleKeyStoreInterface.h +iokit/IOKit/IOBSD.h +iokit/IOKit/IOBufferMemoryDescriptor.h +iokit/IOKit/IOCPU.h +iokit/IOKit/IOCatalogue.h +iokit/IOKit/IOCommand.h +iokit/IOKit/IOCommandGate.h +iokit/IOKit/IOCommandPool.h +iokit/IOKit/IOCommandQueue.h +iokit/IOKit/IOConditionLock.h +iokit/IOKit/IODMACommand.h +iokit/IOKit/IODMAController.h +iokit/IOKit/IODMAEventSource.h +iokit/IOKit/IODataQueue.h +iokit/IOKit/IODataQueueShared.h +iokit/IOKit/IODeviceMemory.h +iokit/IOKit/IODeviceTreeSupport.h +iokit/IOKit/IOEventSource.h +iokit/IOKit/IOFilterInterruptEventSource.h +iokit/IOKit/IOHibernatePrivate.h +iokit/IOKit/IOInterleavedMemoryDescriptor.h +iokit/IOKit/IOInterruptAccounting.h +iokit/IOKit/IOInterruptController.h +iokit/IOKit/IOInterruptEventSource.h +iokit/IOKit/IOInterrupts.h +iokit/IOKit/IOKernelReportStructs.h +iokit/IOKit/IOKernelReporters.h +iokit/IOKit/IOKitDebug.h +iokit/IOKit/IOKitDiagnosticsUserClient.h +iokit/IOKit/IOKitKeys.h +iokit/IOKit/IOKitKeysPrivate.h +iokit/IOKit/IOKitServer.h +iokit/IOKit/IOLib.h +iokit/IOKit/IOLocks.h +iokit/IOKit/IOLocksPrivate.h +iokit/IOKit/IOMapper.h +iokit/IOKit/IOMemoryCursor.h +iokit/IOKit/IOMemoryDescriptor.h +iokit/IOKit/IOMessage.h +iokit/IOKit/IOMultiMemoryDescriptor.h +iokit/IOKit/IONVRAM.h +iokit/IOKit/IONotifier.h +iokit/IOKit/IOPMGR.h +iokit/IOKit/IOPlatformActions.h +iokit/IOKit/IOPlatformExpert.h +iokit/IOKit/IOPolledInterface.h +iokit/IOKit/IORPC.h +iokit/IOKit/IORangeAllocator.h +iokit/IOKit/IORegistryEntry.h +iokit/IOKit/IOReportMacros.h +iokit/IOKit/IOReportTypes.h +iokit/IOKit/IOReturn.h +iokit/IOKit/IOService.h +iokit/IOKit/IOServicePM.h +iokit/IOKit/IOSharedDataQueue.h +iokit/IOKit/IOSharedLock.h +iokit/IOKit/IOStatistics.h +iokit/IOKit/IOStatisticsPrivate.h +iokit/IOKit/IOSubMemoryDescriptor.h +iokit/IOKit/IOSyncer.h +iokit/IOKit/IOTimeStamp.h +iokit/IOKit/IOTimerEventSource.h +iokit/IOKit/IOTypes.h +iokit/IOKit/IOUserClient.h +iokit/IOKit/IOUserServer.h +iokit/IOKit/IOWorkLoop.h +iokit/IOKit/OSMessageNotification.h +iokit/IOKit/PassthruInterruptController.h +iokit/IOKit/assert.h +iokit/IOKit/nvram/IONVRAMController.h +iokit/IOKit/platform/AppleMacIO.h +iokit/IOKit/platform/AppleMacIODevice.h +iokit/IOKit/platform/AppleNMI.h +iokit/IOKit/platform/ApplePlatformExpert.h +iokit/IOKit/platform/IOPlatformIO.h +iokit/IOKit/power/IOPwrController.h +iokit/IOKit/pwr_mgt/IOPM.h +iokit/IOKit/pwr_mgt/IOPMLibDefs.h +iokit/IOKit/pwr_mgt/IOPMPowerSource.h +iokit/IOKit/pwr_mgt/IOPMPowerSourceList.h +iokit/IOKit/pwr_mgt/IOPMpowerState.h +iokit/IOKit/pwr_mgt/IOPowerConnection.h +iokit/IOKit/pwr_mgt/RootDomain.h +iokit/IOKit/rtc/IORTCController.h +iokit/IOKit/system.h +iokit/IOKit/system_management/IOWatchDogTimer.h +kern/exc_guard.h +kern/exc_resource.h +kern/kcdata.h +kern/kern_cdata.h +libkern/OSByteOrder.h +libkern/OSDebug.h +libkern/OSKextLib.h +libkern/OSReturn.h +libkern/OSTypes.h +libkern/_OSByteOrder.h +libkern/firehose/chunk_private.h +libkern/firehose/firehose_types_private.h +libkern/firehose/ioctl_private.h +libkern/firehose/tracepoint_private.h +libkern/i386/OSByteOrder.h +libkern/i386/_OSByteOrder.h +libkern/libkern/Block.h +libkern/libkern/Block_private.h +libkern/libkern/OSAtomic.h +libkern/libkern/OSBase.h +libkern/libkern/OSByteOrder.h +libkern/libkern/OSDebug.h +libkern/libkern/OSKextLib.h +libkern/libkern/OSKextLibPrivate.h +libkern/libkern/OSMalloc.h +libkern/libkern/OSReturn.h +libkern/libkern/OSSerializeBinary.h +libkern/libkern/OSTypes.h +libkern/libkern/_OSByteOrder.h +libkern/libkern/c++/OSAllocation.h +libkern/libkern/c++/OSArray.h +libkern/libkern/c++/OSBoolean.h +libkern/libkern/c++/OSBoundedArray.h +libkern/libkern/c++/OSBoundedArrayRef.h +libkern/libkern/c++/OSBoundedPtr.h +libkern/libkern/c++/OSBoundedPtrFwd.h +libkern/libkern/c++/OSCPPDebug.h +libkern/libkern/c++/OSCollection.h +libkern/libkern/c++/OSCollectionIterator.h +libkern/libkern/c++/OSContainers.h +libkern/libkern/c++/OSData.h +libkern/libkern/c++/OSDictionary.h +libkern/libkern/c++/OSEndianTypes.h +libkern/libkern/c++/OSIterator.h +libkern/libkern/c++/OSKext.h +libkern/libkern/c++/OSLib.h +libkern/libkern/c++/OSMetaClass.h +libkern/libkern/c++/OSNumber.h +libkern/libkern/c++/OSObject.h +libkern/libkern/c++/OSOrderedSet.h +libkern/libkern/c++/OSPtr.h +libkern/libkern/c++/OSSerialize.h +libkern/libkern/c++/OSSet.h +libkern/libkern/c++/OSSharedPtr.h +libkern/libkern/c++/OSString.h +libkern/libkern/c++/OSSymbol.h +libkern/libkern/c++/OSUnserialize.h +libkern/libkern/c++/bounded_array.h +libkern/libkern/c++/bounded_array_ref.h +libkern/libkern/c++/bounded_ptr.h +libkern/libkern/c++/bounded_ptr_fwd.h +libkern/libkern/c++/intrusive_shared_ptr.h +libkern/libkern/c++/safe_allocation.h +libkern/libkern/crc.h +libkern/libkern/crypto/aes.h +libkern/libkern/crypto/aesxts.h +libkern/libkern/crypto/chacha20poly1305.h +libkern/libkern/crypto/crypto_internal.h +libkern/libkern/crypto/des.h +libkern/libkern/crypto/md5.h +libkern/libkern/crypto/rand.h +libkern/libkern/crypto/register_crypto.h +libkern/libkern/crypto/rsa.h +libkern/libkern/crypto/sha1.h +libkern/libkern/crypto/sha2.h +libkern/libkern/i386/OSByteOrder.h +libkern/libkern/i386/_OSByteOrder.h +libkern/libkern/img4/interface.h +libkern/libkern/kernel_mach_header.h +libkern/libkern/kext_request_keys.h +libkern/libkern/kxld.h +libkern/libkern/kxld_types.h +libkern/libkern/locks.h +libkern/libkern/machine/OSByteOrder.h +libkern/libkern/mkext.h +libkern/libkern/prelink.h +libkern/libkern/ptrauth_utils.h +libkern/libkern/section_keywords.h +libkern/libkern/stack_protector.h +libkern/libkern/sysctl.h +libkern/libkern/tree.h +libkern/libkern/version.h +libkern/libkern/zconf.h +libkern/libkern/zlib.h +libkern/machine/OSByteOrder.h +libkern/os/atomic.h +libkern/os/atomic_private.h +libkern/os/atomic_private_arch.h +libkern/os/atomic_private_impl.h +libkern/os/base.h +libkern/os/base_private.h +libkern/os/cpp_util.h +libkern/os/hash.h +libkern/os/log.h +libkern/os/log_private.h +libkern/os/object.h +libkern/os/overflow.h +libkern/os/ptrtools.h +libkern/os/reason_private.h +libkern/os/refcnt.h +libkern/os/refcnt_internal.h +libkern/os/trace.h +libproc.h +mach/audit_triggers.defs +mach/audit_triggers_types.h +mach/boolean.h +mach/bootstrap.h +mach/clock.defs +mach/clock.h +mach/clock_priv.defs +mach/clock_priv.h +mach/clock_reply.defs +mach/clock_reply.h +mach/clock_types.defs +mach/clock_types.h +mach/dyld_kernel.h +mach/error.h +mach/exc.defs +mach/exc.h +mach/exception.h +mach/exception_types.h +mach/host_info.h +mach/host_notify.h +mach/host_notify_reply.defs +mach/host_priv.defs +mach/host_priv.h +mach/host_reboot.h +mach/host_security.defs +mach/host_security.h +mach/host_special_ports.h +mach/i386/_structs.h +mach/i386/asm.h +mach/i386/boolean.h +mach/i386/exception.h +mach/i386/fp_reg.h +mach/i386/kern_return.h +mach/i386/ndr_def.h +mach/i386/processor_info.h +mach/i386/rpc.h +mach/i386/sdt_isa.h +mach/i386/thread_state.h +mach/i386/thread_status.h +mach/i386/vm_param.h +mach/i386/vm_types.h +mach/kern_return.h +mach/kmod.h +mach/lock_set.defs +mach/lock_set.h +mach/mach.h +mach/mach_error.h +mach/mach_eventlink.h +mach/mach_exc.defs +mach/mach_host.defs +mach/mach_host.h +mach/mach_init.h +mach/mach_interface.h +mach/mach_param.h +mach/mach_port.defs +mach/mach_port.h +mach/mach_port_internal.h +mach/mach_right.h +mach/mach_syscalls.h +mach/mach_time.h +mach/mach_traps.h +mach/mach_types.defs +mach/mach_types.h +mach/mach_vm.defs +mach/mach_vm.h +mach/mach_vm_internal.h +mach/mach_voucher.defs +mach/mach_voucher.h +mach/mach_voucher_attr_control.defs +mach/mach_voucher_types.h +mach/machine.h +mach/machine/_structs.h +mach/machine/asm.h +mach/machine/boolean.h +mach/machine/exception.h +mach/machine/kern_return.h +mach/machine/machine_types.defs +mach/machine/ndr_def.h +mach/machine/processor_info.h +mach/machine/rpc.h +mach/machine/sdt.h +mach/machine/sdt_isa.h +mach/machine/thread_state.h +mach/machine/thread_status.h +mach/machine/vm_param.h +mach/machine/vm_types.h +mach/memory_entry.defs +mach/memory_entry.h +mach/memory_object_types.h +mach/message.h +mach/mig.h +mach/mig_errors.h +mach/mig_strncpy_zerofill_support.h +mach/mig_voucher_support.h +mach/ndr.h +mach/notify.defs +mach/notify.h +mach/policy.h +mach/port.h +mach/port_obj.h +mach/processor.defs +mach/processor.h +mach/processor_info.h +mach/processor_set.defs +mach/processor_set.h +mach/rpc.h +mach/sdt.h +mach/semaphore.h +mach/shared_memory_server.h +mach/shared_region.h +mach/std_types.defs +mach/std_types.h +mach/sync.h +mach/sync_policy.h +mach/task.defs +mach/task.h +mach/task_access.defs +mach/task_info.h +mach/task_inspect.h +mach/task_policy.h +mach/task_special_ports.h +mach/telemetry_notification.defs +mach/thread_act.defs +mach/thread_act.h +mach/thread_act_internal.h +mach/thread_info.h +mach/thread_policy.h +mach/thread_special_ports.h +mach/thread_state.h +mach/thread_status.h +mach/thread_switch.h +mach/time_value.h +mach/vm_attributes.h +mach/vm_behavior.h +mach/vm_inherit.h +mach/vm_map.defs +mach/vm_map.h +mach/vm_map_internal.h +mach/vm_page_size.h +mach/vm_param.h +mach/vm_prot.h +mach/vm_purgable.h +mach/vm_region.h +mach/vm_statistics.h +mach/vm_sync.h +mach/vm_task.h +mach/vm_types.h +mach_debug/hash_info.h +mach_debug/ipc_info.h +mach_debug/lockgroup_info.h +mach_debug/mach_debug.h +mach_debug/mach_debug_types.defs +mach_debug/mach_debug_types.h +mach_debug/page_info.h +mach_debug/vm_info.h +mach_debug/zone_info.h +machine/_limits.h +machine/_mcontext.h +machine/_param.h +machine/_types.h +machine/byte_order.h +machine/endian.h +machine/fasttrap_isa.h +machine/limits.h +machine/param.h +machine/profile.h +machine/signal.h +machine/types.h +machine/vmparam.h +machine_types.modulemap +miscfs/devfs/devfs.h +miscfs/specfs/specdev.h +miscfs/union/union.h +net/bpf.h +net/dlil.h +net/ethernet.h +net/if.h +net/if_arp.h +net/if_dl.h +net/if_llc.h +net/if_media.h +net/if_mib.h +net/if_types.h +net/if_utun.h +net/if_var.h +net/kext_net.h +net/ndrv.h +net/net_kev.h +net/pfkeyv2.h +net/route.h +netinet/bootp.h +netinet/icmp6.h +netinet/icmp_var.h +netinet/if_ether.h +netinet/igmp.h +netinet/igmp_var.h +netinet/in.h +netinet/in_pcb.h +netinet/in_systm.h +netinet/in_var.h +netinet/ip.h +netinet/ip6.h +netinet/ip_icmp.h +netinet/ip_var.h +netinet/tcp.h +netinet/tcp_fsm.h +netinet/tcp_seq.h +netinet/tcp_timer.h +netinet/tcp_var.h +netinet/tcpip.h +netinet/udp.h +netinet/udp_var.h +netinet6/ah.h +netinet6/esp.h +netinet6/in6.h +netinet6/in6_var.h +netinet6/ipcomp.h +netinet6/ipsec.h +netinet6/nd6.h +netinet6/raw_ip6.h +netinet6/scope6_var.h +netkey/keysock.h +nfs/krpc.h +nfs/nfs.h +nfs/nfs_gss.h +nfs/nfs_ioctl.h +nfs/nfs_lock.h +nfs/nfsdiskless.h +nfs/nfsm_subs.h +nfs/nfsmount.h +nfs/nfsnode.h +nfs/nfsproto.h +nfs/nfsrvcache.h +nfs/rpcv2.h +nfs/xdr_subs.h +os/atomic.h +os/base.h +os/overflow.h +os/tsd.h +osfmk/UserNotification/KUNCUserNotifications.h +osfmk/UserNotification/UNDReply.defs +osfmk/UserNotification/UNDRequest.defs +osfmk/UserNotification/UNDTypes.defs +osfmk/UserNotification/UNDTypes.h +osfmk/atm/atm_internal.h +osfmk/atm/atm_notification.defs +osfmk/atm/atm_types.defs +osfmk/atm/atm_types.h +osfmk/bank/bank_types.h +osfmk/console/serial_protos.h +osfmk/console/video_console.h +osfmk/corpses/task_corpse.h +osfmk/default_pager/default_pager_types.h +osfmk/device/device.defs +osfmk/device/device_port.h +osfmk/device/device_types.defs +osfmk/device/device_types.h +osfmk/gssd/gssd_mach.defs +osfmk/gssd/gssd_mach.h +osfmk/gssd/gssd_mach_types.h +osfmk/i386/apic.h +osfmk/i386/asm.h +osfmk/i386/atomic.h +osfmk/i386/bit_routines.h +osfmk/i386/cpu_capabilities.h +osfmk/i386/cpu_data.h +osfmk/i386/cpu_number.h +osfmk/i386/cpu_topology.h +osfmk/i386/cpuid.h +osfmk/i386/eflags.h +osfmk/i386/fpu.h +osfmk/i386/io_map_entries.h +osfmk/i386/lapic.h +osfmk/i386/lock.h +osfmk/i386/locks.h +osfmk/i386/locks_i386_inlines.h +osfmk/i386/machine_cpu.h +osfmk/i386/machine_routines.h +osfmk/i386/memory_types.h +osfmk/i386/mp.h +osfmk/i386/mp_desc.h +osfmk/i386/mp_events.h +osfmk/i386/mtrr.h +osfmk/i386/pal_hibernate.h +osfmk/i386/pal_native.h +osfmk/i386/pal_routines.h +osfmk/i386/panic_hooks.h +osfmk/i386/pmCPU.h +osfmk/i386/pmap.h +osfmk/i386/proc_reg.h +osfmk/i386/rtclock_protos.h +osfmk/i386/seg.h +osfmk/i386/simple_lock.h +osfmk/i386/smp.h +osfmk/i386/trap.h +osfmk/i386/tsc.h +osfmk/i386/tss.h +osfmk/i386/ucode.h +osfmk/i386/vmx.h +osfmk/ipc/ipc_types.h +osfmk/kdp/kdp_callout.h +osfmk/kdp/kdp_dyld.h +osfmk/kdp/kdp_en_debugger.h +osfmk/kern/affinity.h +osfmk/kern/arcade.h +osfmk/kern/arithmetic_128.h +osfmk/kern/assert.h +osfmk/kern/audit_sessionport.h +osfmk/kern/backtrace.h +osfmk/kern/bits.h +osfmk/kern/block_hint.h +osfmk/kern/btlog.h +osfmk/kern/cambria_layout.h +osfmk/kern/circle_queue.h +osfmk/kern/clock.h +osfmk/kern/coalition.h +osfmk/kern/cpu_data.h +osfmk/kern/cpu_number.h +osfmk/kern/cpu_quiesce.h +osfmk/kern/cs_blobs.h +osfmk/kern/debug.h +osfmk/kern/ecc.h +osfmk/kern/energy_perf.h +osfmk/kern/exc_guard.h +osfmk/kern/exc_resource.h +osfmk/kern/extmod_statistics.h +osfmk/kern/host.h +osfmk/kern/hv_support.h +osfmk/kern/hv_support_kext.h +osfmk/kern/ipc_kobject.h +osfmk/kern/ipc_mig.h +osfmk/kern/ipc_misc.h +osfmk/kern/kalloc.h +osfmk/kern/kcdata.h +osfmk/kern/kern_cdata.h +osfmk/kern/kern_types.h +osfmk/kern/kext_alloc.h +osfmk/kern/kpc.h +osfmk/kern/ledger.h +osfmk/kern/lock.h +osfmk/kern/lock_group.h +osfmk/kern/lock_stat.h +osfmk/kern/locks.h +osfmk/kern/mach_param.h +osfmk/kern/macro_help.h +osfmk/kern/monotonic.h +osfmk/kern/mpqueue.h +osfmk/kern/mpsc_queue.h +osfmk/kern/page_decrypt.h +osfmk/kern/percpu.h +osfmk/kern/pms.h +osfmk/kern/policy_internal.h +osfmk/kern/priority_queue.h +osfmk/kern/processor.h +osfmk/kern/queue.h +osfmk/kern/remote_time.h +osfmk/kern/restartable.h +osfmk/kern/sched_clutch.h +osfmk/kern/sched_prim.h +osfmk/kern/sfi.h +osfmk/kern/simple_lock.h +osfmk/kern/startup.h +osfmk/kern/task.h +osfmk/kern/telemetry.h +osfmk/kern/thread.h +osfmk/kern/thread_call.h +osfmk/kern/thread_group.h +osfmk/kern/timer_call.h +osfmk/kern/trustcache.h +osfmk/kern/turnstile.h +osfmk/kern/ux_handler.h +osfmk/kern/waitq.h +osfmk/kern/work_interval.h +osfmk/kern/zalloc.h +osfmk/kextd/kextd_mach.defs +osfmk/kextd/kextd_mach.h +osfmk/kperf/action.h +osfmk/kperf/context.h +osfmk/kperf/kdebug_trigger.h +osfmk/kperf/kperf.h +osfmk/kperf/kperfbsd.h +osfmk/kperf/kptimer.h +osfmk/kperf/lazy.h +osfmk/kperf/pet.h +osfmk/lockd/lockd_mach.defs +osfmk/lockd/lockd_mach.h +osfmk/lockd/lockd_mach_types.h +osfmk/mach/arcade_upcall_server.h +osfmk/mach/audit_triggers.defs +osfmk/mach/audit_triggers_server.h +osfmk/mach/audit_triggers_types.h +osfmk/mach/boolean.h +osfmk/mach/clock.defs +osfmk/mach/clock.h +osfmk/mach/clock_priv.defs +osfmk/mach/clock_priv.h +osfmk/mach/clock_reply.defs +osfmk/mach/clock_reply_server.h +osfmk/mach/clock_types.defs +osfmk/mach/clock_types.h +osfmk/mach/coalition.h +osfmk/mach/coalition_notification_server.h +osfmk/mach/dyld_kernel.h +osfmk/mach/error.h +osfmk/mach/exc.defs +osfmk/mach/exc_server.h +osfmk/mach/exception.h +osfmk/mach/exception_types.h +osfmk/mach/fairplayd_notification_server.h +osfmk/mach/host_info.h +osfmk/mach/host_notify.h +osfmk/mach/host_notify_reply.defs +osfmk/mach/host_priv.defs +osfmk/mach/host_priv.h +osfmk/mach/host_reboot.h +osfmk/mach/host_security.defs +osfmk/mach/host_security.h +osfmk/mach/host_special_ports.h +osfmk/mach/i386/_structs.h +osfmk/mach/i386/asm.h +osfmk/mach/i386/boolean.h +osfmk/mach/i386/exception.h +osfmk/mach/i386/fp_reg.h +osfmk/mach/i386/kern_return.h +osfmk/mach/i386/ndr_def.h +osfmk/mach/i386/processor_info.h +osfmk/mach/i386/rpc.h +osfmk/mach/i386/sdt_isa.h +osfmk/mach/i386/syscall_sw.h +osfmk/mach/i386/thread_state.h +osfmk/mach/i386/thread_status.h +osfmk/mach/i386/vm_param.h +osfmk/mach/i386/vm_types.h +osfmk/mach/kern_return.h +osfmk/mach/kmod.h +osfmk/mach/ktrace_background.h +osfmk/mach/lock_set.defs +osfmk/mach/lock_set.h +osfmk/mach/mach_eventlink_types.h +osfmk/mach/mach_exc.defs +osfmk/mach/mach_exc_server.h +osfmk/mach/mach_host.defs +osfmk/mach/mach_host.h +osfmk/mach/mach_interface.h +osfmk/mach/mach_param.h +osfmk/mach/mach_port.defs +osfmk/mach/mach_port.h +osfmk/mach/mach_syscalls.h +osfmk/mach/mach_time.h +osfmk/mach/mach_traps.h +osfmk/mach/mach_types.defs +osfmk/mach/mach_types.h +osfmk/mach/mach_vm.defs +osfmk/mach/mach_vm.h +osfmk/mach/mach_voucher.defs +osfmk/mach/mach_voucher.h +osfmk/mach/mach_voucher_attr_control.defs +osfmk/mach/mach_voucher_attr_control.h +osfmk/mach/mach_voucher_types.h +osfmk/mach/machine.h +osfmk/mach/machine/_structs.h +osfmk/mach/machine/asm.h +osfmk/mach/machine/boolean.h +osfmk/mach/machine/exception.h +osfmk/mach/machine/kern_return.h +osfmk/mach/machine/machine_types.defs +osfmk/mach/machine/ndr_def.h +osfmk/mach/machine/processor_info.h +osfmk/mach/machine/rpc.h +osfmk/mach/machine/sdt.h +osfmk/mach/machine/sdt_isa.h +osfmk/mach/machine/syscall_sw.h +osfmk/mach/machine/thread_state.h +osfmk/mach/machine/thread_status.h +osfmk/mach/machine/vm_param.h +osfmk/mach/machine/vm_types.h +osfmk/mach/memory_entry.defs +osfmk/mach/memory_entry.h +osfmk/mach/memory_object_control.h +osfmk/mach/memory_object_default_server.h +osfmk/mach/memory_object_types.h +osfmk/mach/message.h +osfmk/mach/mig.h +osfmk/mach/mig_errors.h +osfmk/mach/mig_strncpy_zerofill_support.h +osfmk/mach/mig_voucher_support.h +osfmk/mach/ndr.h +osfmk/mach/notify.defs +osfmk/mach/notify.h +osfmk/mach/notify_server.h +osfmk/mach/policy.h +osfmk/mach/port.h +osfmk/mach/processor.defs +osfmk/mach/processor.h +osfmk/mach/processor_info.h +osfmk/mach/processor_set.defs +osfmk/mach/processor_set.h +osfmk/mach/resource_monitors.h +osfmk/mach/rpc.h +osfmk/mach/sdt.h +osfmk/mach/semaphore.h +osfmk/mach/sfi_class.h +osfmk/mach/shared_memory_server.h +osfmk/mach/shared_region.h +osfmk/mach/std_types.defs +osfmk/mach/std_types.h +osfmk/mach/sync_policy.h +osfmk/mach/syscall_sw.h +osfmk/mach/sysdiagnose_notification_server.h +osfmk/mach/task.defs +osfmk/mach/task.h +osfmk/mach/task_access.defs +osfmk/mach/task_access.h +osfmk/mach/task_access_server.h +osfmk/mach/task_info.h +osfmk/mach/task_inspect.h +osfmk/mach/task_policy.h +osfmk/mach/task_special_ports.h +osfmk/mach/telemetry_notification.defs +osfmk/mach/telemetry_notification_server.h +osfmk/mach/thread_act.defs +osfmk/mach/thread_act.h +osfmk/mach/thread_info.h +osfmk/mach/thread_policy.h +osfmk/mach/thread_special_ports.h +osfmk/mach/thread_status.h +osfmk/mach/thread_switch.h +osfmk/mach/time_value.h +osfmk/mach/upl.h +osfmk/mach/vfs_nspace.h +osfmk/mach/vfs_nspace_server.h +osfmk/mach/vm_attributes.h +osfmk/mach/vm_behavior.h +osfmk/mach/vm_inherit.h +osfmk/mach/vm_map.defs +osfmk/mach/vm_map.h +osfmk/mach/vm_param.h +osfmk/mach/vm_prot.h +osfmk/mach/vm_purgable.h +osfmk/mach/vm_region.h +osfmk/mach/vm_statistics.h +osfmk/mach/vm_sync.h +osfmk/mach/vm_types.h +osfmk/mach_debug/hash_info.h +osfmk/mach_debug/ipc_info.h +osfmk/mach_debug/lockgroup_info.h +osfmk/mach_debug/mach_debug.h +osfmk/mach_debug/mach_debug_types.defs +osfmk/mach_debug/mach_debug_types.h +osfmk/mach_debug/page_info.h +osfmk/mach_debug/vm_info.h +osfmk/mach_debug/zone_info.h +osfmk/machine/atomic.h +osfmk/machine/config.h +osfmk/machine/cpu_capabilities.h +osfmk/machine/cpu_number.h +osfmk/machine/io_map_entries.h +osfmk/machine/lock.h +osfmk/machine/locks.h +osfmk/machine/machine_cpuid.h +osfmk/machine/machine_kpc.h +osfmk/machine/machine_remote_time.h +osfmk/machine/machine_routines.h +osfmk/machine/memory_types.h +osfmk/machine/monotonic.h +osfmk/machine/pal_hibernate.h +osfmk/machine/pal_routines.h +osfmk/machine/simple_lock.h +osfmk/machine/smp.h +osfmk/machine/trap.h +osfmk/prng/entropy.h +osfmk/prng/random.h +osfmk/string.h +osfmk/tests/ktest.h +osfmk/tests/xnupost.h +osfmk/vm/WKdm_new.h +osfmk/vm/memory_types.h +osfmk/vm/pmap.h +osfmk/vm/vm_compressor_algorithms.h +osfmk/vm/vm_fault.h +osfmk/vm/vm_kern.h +osfmk/vm/vm_map.h +osfmk/vm/vm_options.h +osfmk/vm/vm_pageout.h +osfmk/vm/vm_protos.h +osfmk/vm/vm_shared_region.h +osfmk/voucher/ipc_pthread_priority_types.h +osfmk/x86_64/machine_kpc.h +osfmk/x86_64/machine_remote_time.h +osfmk/x86_64/monotonic.h +pexpert/boot.h +pexpert/i386/boot.h +pexpert/i386/efi.h +pexpert/i386/protos.h +pexpert/machine/boot.h +pexpert/machine/protos.h +pexpert/pexpert.h +pexpert/pexpert/boot.h +pexpert/pexpert/device_tree.h +pexpert/pexpert/i386/boot.h +pexpert/pexpert/i386/efi.h +pexpert/pexpert/i386/protos.h +pexpert/pexpert/machine/boot.h +pexpert/pexpert/machine/protos.h +pexpert/pexpert/pexpert.h +pexpert/pexpert/protos.h +pexpert/protos.h +san/san/kasan.h +san/san/ksancov.h +san/san/memintrinsics.h +security/audit/audit_ioctl.h +security/security/_label.h +security/security/mac.h +security/security/mac_data.h +security/security/mac_framework.h +security/security/mac_internal.h +security/security/mac_mach_internal.h +security/security/mac_policy.h +servers/key_defs.h +servers/ls_defs.h +servers/netname.h +servers/netname_defs.h +servers/nm_defs.h +spawn.h +sys/_endian.h +sys/_posix_availability.h +sys/_select.h +sys/_structs.h +sys/_symbol_aliasing.h +sys/_types.h +sys/_types/_blkcnt_t.h +sys/_types/_blksize_t.h +sys/_types/_caddr_t.h +sys/_types/_clock_t.h +sys/_types/_ct_rune_t.h +sys/_types/_dev_t.h +sys/_types/_errno_t.h +sys/_types/_fd_clr.h +sys/_types/_fd_copy.h +sys/_types/_fd_def.h +sys/_types/_fd_isset.h +sys/_types/_fd_set.h +sys/_types/_fd_setsize.h +sys/_types/_fd_zero.h +sys/_types/_filesec_t.h +sys/_types/_fsblkcnt_t.h +sys/_types/_fsfilcnt_t.h +sys/_types/_fsid_t.h +sys/_types/_fsobj_id_t.h +sys/_types/_gid_t.h +sys/_types/_guid_t.h +sys/_types/_id_t.h +sys/_types/_in_addr_t.h +sys/_types/_in_port_t.h +sys/_types/_ino64_t.h +sys/_types/_ino_t.h +sys/_types/_int16_t.h +sys/_types/_int32_t.h +sys/_types/_int64_t.h +sys/_types/_int8_t.h +sys/_types/_intptr_t.h +sys/_types/_iovec_t.h +sys/_types/_key_t.h +sys/_types/_mach_port_t.h +sys/_types/_mbstate_t.h +sys/_types/_mode_t.h +sys/_types/_nlink_t.h +sys/_types/_null.h +sys/_types/_o_dsync.h +sys/_types/_o_sync.h +sys/_types/_off_t.h +sys/_types/_offsetof.h +sys/_types/_os_inline.h +sys/_types/_pid_t.h +sys/_types/_posix_vdisable.h +sys/_types/_ptrdiff_t.h +sys/_types/_rsize_t.h +sys/_types/_rune_t.h +sys/_types/_s_ifmt.h +sys/_types/_sa_family_t.h +sys/_types/_seek_set.h +sys/_types/_sigaltstack.h +sys/_types/_sigset_t.h +sys/_types/_size_t.h +sys/_types/_socklen_t.h +sys/_types/_ssize_t.h +sys/_types/_suseconds_t.h +sys/_types/_time_t.h +sys/_types/_timespec.h +sys/_types/_timeval.h +sys/_types/_timeval32.h +sys/_types/_timeval64.h +sys/_types/_u_char.h +sys/_types/_u_int.h +sys/_types/_u_int16_t.h +sys/_types/_u_int32_t.h +sys/_types/_u_int64_t.h +sys/_types/_u_int8_t.h +sys/_types/_u_short.h +sys/_types/_ucontext.h +sys/_types/_ucontext64.h +sys/_types/_uid_t.h +sys/_types/_uintptr_t.h +sys/_types/_useconds_t.h +sys/_types/_uuid_t.h +sys/_types/_va_list.h +sys/_types/_wchar_t.h +sys/_types/_wint_t.h +sys/acct.h +sys/aio.h +sys/appleapiopts.h +sys/attr.h +sys/buf.h +sys/cdefs.h +sys/clonefile.h +sys/commpage.h +sys/conf.h +sys/dir.h +sys/dirent.h +sys/disk.h +sys/dkstat.h +sys/domain.h +sys/dtrace.h +sys/dtrace_glue.h +sys/dtrace_impl.h +sys/errno.h +sys/ev.h +sys/event.h +sys/fasttrap.h +sys/fasttrap_isa.h +sys/fcntl.h +sys/file.h +sys/filedesc.h +sys/filio.h +sys/fsgetpath.h +sys/gmon.h +sys/ioccom.h +sys/ioctl.h +sys/ioctl_compat.h +sys/ipc.h +sys/kauth.h +sys/kdebug.h +sys/kdebug_signpost.h +sys/kern_control.h +sys/kern_event.h +sys/kernel.h +sys/kernel_types.h +sys/lctx.h +sys/loadable_fs.h +sys/lock.h +sys/lockf.h +sys/lockstat.h +sys/log_data.h +sys/malloc.h +sys/mbuf.h +sys/mman.h +sys/mount.h +sys/msg.h +sys/msgbuf.h +sys/netport.h +sys/param.h +sys/paths.h +sys/pipe.h +sys/poll.h +sys/posix_sem.h +sys/posix_shm.h +sys/proc.h +sys/proc_info.h +sys/protosw.h +sys/ptrace.h +sys/queue.h +sys/quota.h +sys/random.h +sys/reboot.h +sys/resource.h +sys/resourcevar.h +sys/sbuf.h +sys/sdt.h +sys/select.h +sys/sem.h +sys/semaphore.h +sys/shm.h +sys/signal.h +sys/signalvar.h +sys/snapshot.h +sys/socket.h +sys/socketvar.h +sys/sockio.h +sys/spawn.h +sys/stat.h +sys/stdio.h +sys/sys_domain.h +sys/syscall.h +sys/sysctl.h +sys/syslimits.h +sys/syslog.h +sys/termios.h +sys/time.h +sys/timeb.h +sys/times.h +sys/timex.h +sys/tprintf.h +sys/trace.h +sys/tty.h +sys/ttychars.h +sys/ttycom.h +sys/ttydefaults.h +sys/ttydev.h +sys/types.h +sys/ubc.h +sys/ucontext.h +sys/ucred.h +sys/uio.h +sys/un.h +sys/unistd.h +sys/unpcb.h +sys/user.h +sys/utfconv.h +sys/utsname.h +sys/vadvise.h +sys/vcmd.h +sys/vm.h +sys/vmmeter.h +sys/vmparam.h +sys/vnioctl.h +sys/vnode.h +sys/vnode_if.h +sys/vsock.h +sys/vstat.h +sys/wait.h +sys/xattr.h +sys__types.modulemap +sys_cdefs.modulemap +sys_types.modulemap +system-version-compat-support.h +uuid/uuid.h +vfs/vfs_support.h +voucher/ipc_pthread_priority_types.h diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 78c510f7da4c..ee9a80518acd 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -1,108 +1,124 @@ -{ lib, stdenv, makeWrapper, binutils-unwrapped, cctools, llvm, clang-unwrapped, dualAs ? false }: - -# Make sure both underlying packages claim to have prepended their binaries -# with the same targetPrefix. -assert binutils-unwrapped.targetPrefix == cctools.targetPrefix; +{ + lib, + stdenvNoCC, + cctools, + clang-unwrapped, + llvm, + llvm-manpages, + makeWrapper, + enableManpages ? stdenvNoCC.targetPlatform == stdenvNoCC.hostPlatform, +}: let - inherit (binutils-unwrapped) targetPrefix; - cmds = [ - "ar" "ranlib" "as" "install_name_tool" - "ld" "strip" "otool" "lipo" "nm" "strings" "size" - "codesign_allocate" - ]; - isCCToolsLLVM = lib.getName cctools == "cctools-llvm"; -in + inherit (stdenvNoCC) targetPlatform hostPlatform; + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; -# TODO: loop over targetPrefixed binaries too -stdenv.mkDerivation { - pname = "${targetPrefix}cctools-binutils-darwin" + lib.optionalString dualAs "-dualas"; + llvm_cmds = [ + "addr2line" + "ar" + "c++filt" + "dsymutil" + "nm" + "objcopy" + "objdump" + "otool" + "size" + "strings" + "strip" + ]; + + cctools_cmds = [ + "codesign_allocate" + "gprof" + "ranlib" + # Use the cctools versions because the LLVM ones can crash or fail when the cctools ones don’t. + # Revisit when LLVM is updated to LLVM 18 on Darwin. + "lipo" + "install_name_tool" + ]; + + linkManPages = + pkg: source: target: + lib.optionalString enableManpages '' + sourcePath=${pkg}/share/man/man1/${source}.1.gz + targetPath=''${!outputMan}/share/man/man1/${target}.1.gz + + if [ -f "$sourcePath" ]; then + mkdir -p "$(dirname "$targetPath")" + ln -s "$sourcePath" "$targetPath" + fi + ''; +in +stdenvNoCC.mkDerivation { + pname = "${targetPrefix}cctools-binutils-darwin"; inherit (cctools) version; - outputs = [ "out" "man" ]; + + outputs = [ "out" ] ++ lib.optional enableManpages "man"; + + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ]; + buildCommand = '' mkdir -p $out/bin $out/include - ln -s ${binutils-unwrapped.out}/bin/${targetPrefix}c++filt $out/bin/${targetPrefix}c++filt + for tool in ${toString llvm_cmds}; do + # Translate between LLVM and traditional tool names (e.g., `c++filt` versus `cxxfilt`). + cctoolsTool=''${tool//-/_} + llvmTool=''${tool//++/xx} - # We specifically need: - # - ld: binutils doesn't provide it on darwin - # - as: as above - # - ar: the binutils one produces .a files that the cctools ld doesn't like - # - ranlib: for compatibility with ar - # - otool: we use it for some of our name mangling - # - install_name_tool: we use it to rewrite stuff in our bootstrap tools - # - strip: the binutils one seems to break mach-o files - # - lipo: gcc build assumes it exists - # - nm: the gnu one doesn't understand many new load commands - for i in ${lib.concatStringsSep " " (map (e: targetPrefix + e) cmds)}; do - ln -sf "${cctools}/bin/$i" "$out/bin/$i" + # Some tools aren’t prefixed (like `dsymutil`). + llvmPath="${lib.getBin llvm}/bin" + if [ -e "$llvmPath/llvm-$llvmTool" ]; then + llvmTool=llvm-$llvmTool + elif [ -e "$llvmPath/${targetPrefix}$llvmTool" ]; then + llvmTool=${targetPrefix}$llvmTool + fi + + # Not all tools are included in the bootstrap tools. Don’t link them if they don’t exist. + if [ -e "$llvmPath/$llvmTool" ]; then + ln -s "$llvmPath/$llvmTool" "$out/bin/${targetPrefix}$cctoolsTool" + fi + ${linkManPages llvm-manpages "$llvmTool" "$cctoolsTool"} done - ln -s ${llvm}/bin/dsymutil $out/bin/dsymutil - - ln -s ${binutils-unwrapped.out}/share $out/share - - mkdir -p "$man"/share/man/man{1,5} - for i in ${lib.concatStringsSep " " cmds}; do - for path in "${cctools.man}"/share/man/man?/$i.*; do - dest_path="$man''${path#${cctools.man}}" - ln -sv "$path" "$dest_path" - done + for tool in ${toString cctools_cmds}; do + toolsrc="${lib.getBin cctools}/bin/${targetPrefix}$tool" + if [ -e "$toolsrc" ]; then + ln -s "${lib.getBin cctools}/bin/${targetPrefix}$tool" "$out/bin/${targetPrefix}$tool" + fi + ${linkManPages (lib.getMan cctools) "$tool" "$tool"} done - '' - + lib.optionalString (!isCCToolsLLVM) ( - # cctools-port has a `libexec` folder for `as`, but cctools-llvm uses the clang - # assembler on both platforms. Only link it when cctools is cctools-port. - '' - ln -s ${cctools}/libexec $out/libexec - '' - # cctools-llvm uses the LLVM assembler on both architectures, so use the assembler - # from that instead of relinking it. - # - # On aarch64-darwin we must use clang, because "as" from cctools just doesn't - # handle the arch. Proxying calls to clang produces quite a bit of warnings, - # and using clang directly here is a better option than relying on cctools. - # On x86_64-darwin the Clang version is too old to support this mode. - + lib.optionalString stdenv.isAarch64 '' - rm $out/bin/${targetPrefix}as - makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \ - --add-flags "-x assembler -integrated-as -c" - '' - # x86-64 Darwin gnat-bootstrap emits assembly - # with MOVQ as the mnemonic for quadword interunit moves - # such as `movq %rbp, %xmm0`. - # The clang integrated assembler recognises this as valid, - # but unfortunately the cctools-port GNU assembler does not; - # it instead uses MOVD as the mnemonic. - # The assembly that a GCC build emits is determined at build time - # and cannot be changed afterwards. - # - # To build GNAT on x86-64 Darwin, therefore, - # we need both the clang _and_ the cctools-port assemblers to be available: - # the former to build at least the stage1 compiler, - # and the latter at least to be detectable - # as the target for the final compiler. - # - # We choose to match the Aarch64 case above, - # wrapping the clang integrated assembler as `as`. - # It then seems sensible to wrap the cctools GNU assembler as `gas`. - # - + lib.optionalString (stdenv.isx86_64 && dualAs) '' - mv $out/bin/${targetPrefix}as $out/bin/${targetPrefix}gas - makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \ - --add-flags "-x assembler -integrated-as -c" - '' - ); + ${ + # These unprefixed because some tools expect to invoke them without it when cross-compiling to Darwin: + # - clang needs `dsymutil` when building with debug information; + # - meson needs `lipo` when cross-compiling to Darwin; and + # - meson also needs `install_name_tool` and `otool` when performing rpath cleanup on installation. + lib.optionalString (targetPrefix != "") '' + for bintool in dsymutil install_name_tool lipo otool; do + ln -s "$out/bin/${targetPrefix}$bintool" "$out/bin/$bintool" + done + '' + } + # Use the clang-integrated assembler. `as` in cctools is deprecated upstream and no longer built in nixpkgs. + makeWrapper "${lib.getBin clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \ + --add-flags "-x assembler -integrated-as -c" - nativeBuildInputs = lib.optionals (!isCCToolsLLVM && (stdenv.isAarch64 || dualAs)) [ makeWrapper ]; + ln -s '${lib.getBin cctools}/bin/${targetPrefix}ld' "$out/bin/${targetPrefix}ld" + ${linkManPages (lib.getMan cctools) "ld" "ld"} + # ${linkManPages (lib.getMan cctools) "ld-classic" "ld-classic"} + ${linkManPages (lib.getMan cctools) "ld64" "ld64"} + ''; + + __structuredAttrs = true; passthru = { - inherit targetPrefix; - isCCTools = true; + inherit cctools_cmds llvm_cmds targetPrefix; + isCCTools = true; # The fact ld64 is used instead of lld is why this isn’t `isLLVM`. }; meta = { - maintainers = with lib.maintainers; [ matthewbauer ]; + maintainers = with lib.maintainers; [ reckenrode ]; priority = 10; }; } diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 377d84d9bf73..cc162d870a2e 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { sha256 = "0ns12q7vg9yand4dmdsps1917cavfbw67yl5q7bm6kb4ia5kkx13"; }; - outputs = [ "out" "dev" "man" ]; + outputs = [ "out" "dev" "gas" "man" ]; nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ memstreamHook ]; @@ -178,6 +178,12 @@ stdenv.mkDerivation { popd ''; + postInstall = '' + # Move GNU as to its own output to prevent it from being used accidentally. + moveToOutput bin/gas "$gas" + moveToOutput libexec "$gas" + ''; + passthru = { inherit targetPrefix; }; diff --git a/pkgs/os-specific/darwin/defaultbrowser/default.nix b/pkgs/os-specific/darwin/defaultbrowser/default.nix index be3dcd417731..2246efa0aa43 100644 --- a/pkgs/os-specific/darwin/defaultbrowser/default.nix +++ b/pkgs/os-specific/darwin/defaultbrowser/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Command line tool for getting and setting a default browser (HTTP handler) in Mac OS X"; homepage = "https://github.com/kerma/defaultbrowser"; platforms = platforms.darwin; - maintainers = with maintainers; [ Enzime ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix index 53847c75fccc..21500ad16d90 100644 --- a/pkgs/os-specific/darwin/karabiner-elements/default.nix +++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "Karabiner-Elements is a powerful utility for keyboard customization on macOS Sierra (10.12) or later"; homepage = "https://karabiner-elements.pqrs.org/"; platforms = platforms.darwin; - maintainers = with maintainers; [ Enzime ]; + maintainers = with maintainers; [ ]; license = licenses.unlicense; }; } diff --git a/pkgs/os-specific/darwin/pam-reattach/default.nix b/pkgs/os-specific/darwin/pam-reattach/default.nix index 4350865080f0..b077ac031b62 100644 --- a/pkgs/os-specific/darwin/pam-reattach/default.nix +++ b/pkgs/os-specific/darwin/pam-reattach/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, openpam, darwin }: +let + sdkOlderThan11 = lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0"; +in stdenv.mkDerivation rec { pname = "pam_reattach"; version = "1.3"; @@ -12,17 +15,12 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ - "-DCMAKE_OSX_ARCHITECTURES=${ - if stdenv.hostPlatform.system == "x86_64-darwin" then - "x86_64" - else - "arm64" - }" + "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" "-DENABLE_CLI=ON" - ] ++ lib.optional (!stdenv.isAarch64) "-DCMAKE_LIBRARY_PATH=${darwin.apple_sdk.sdk}/usr/lib"; + ] ++ lib.optional sdkOlderThan11 "-DCMAKE_LIBRARY_PATH=${darwin.apple_sdk.sdk}/usr/lib"; buildInputs = [ openpam ] - ++ lib.optional (!stdenv.isAarch64) darwin.apple_sdk.sdk; + ++ lib.optional sdkOlderThan11 darwin.apple_sdk.sdk; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index a49f1a305ce4..17f7b4708400 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.77.1"; + version = "1.78.1"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-+Itz6U1DHV9ZsgjzuvrfVtCJ1yiGSpVOkD28BmHibIQ="; + hash = "sha256-le1IB55vAXv1e+ll/K24jZ2Z0lqtEt3xKhwPxY+Ibis="; }; dontPatch = true; diff --git a/pkgs/os-specific/darwin/rectangle/default.nix b/pkgs/os-specific/darwin/rectangle/default.nix index 1e7be272d6ab..fbf13963e49e 100644 --- a/pkgs/os-specific/darwin/rectangle/default.nix +++ b/pkgs/os-specific/darwin/rectangle/default.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://rectangleapp.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.darwin; - maintainers = with maintainers; [ Enzime Intuinewin wegank ]; + maintainers = with maintainers; [ Intuinewin wegank ]; license = licenses.mit; }; } diff --git a/pkgs/os-specific/darwin/shortcat/default.nix b/pkgs/os-specific/darwin/shortcat/default.nix index dcf32a4fd9e3..81086bec3a77 100644 --- a/pkgs/os-specific/darwin/shortcat/default.nix +++ b/pkgs/os-specific/darwin/shortcat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://shortcat.app/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.darwin; - maintainers = with maintainers; [ Enzime ]; + maintainers = with maintainers; [ ]; license = licenses.unfreeRedistributable; }; } diff --git a/pkgs/os-specific/darwin/swiftbar/default.nix b/pkgs/os-specific/darwin/swiftbar/default.nix index 4a12dc2dfea7..bb7d7ad8ee61 100644 --- a/pkgs/os-specific/darwin/swiftbar/default.nix +++ b/pkgs/os-specific/darwin/swiftbar/default.nix @@ -4,14 +4,16 @@ stdenvNoCC, makeWrapper, }: - +let + build = "520"; +in stdenvNoCC.mkDerivation rec { pname = "swiftbar"; - version = "1.4.3"; + version = "2.0.0"; src = fetchzip { - url = "https://github.com/swiftbar/SwiftBar/releases/download/v${version}/SwiftBar.zip"; - sha256 = "sha256-Ut+lr1E7bMp8Uz1aL7EV0ZsfdTh9t7zUjDU/DScRpHY="; + url = "https://github.com/swiftbar/SwiftBar/releases/download/v${version}/SwiftBar.v${version}.b${build}.zip"; + hash = "sha256-eippK01Q+J9jdwvnGcnr7nw3KwyQQqh051lHN3Xmy+c="; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 4c06ea352ee0..f70ba4c7aad1 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -1,4 +1,5 @@ { stdenv, lib, fetchFromGitLab, fetchpatch, makeWrapper, autoreconfHook +, autoconf-archive , pkg-config, which , flex, bison , linuxHeaders ? stdenv.cc.libc.linuxHeaders @@ -22,7 +23,7 @@ }: let - apparmor-version = "3.1.7"; + apparmor-version = "4.0.1"; apparmor-meta = component: with lib; { homepage = "https://apparmor.net/"; @@ -36,7 +37,7 @@ let owner = "apparmor"; repo = "apparmor"; rev = "v${apparmor-version}"; - hash = "sha256-AzY05bcpNYXix2GL4Rhc9d3RBA1pd2fwOa7yoiwc2nQ="; + hash = "sha256-0S/P62wi3/aPATvJL6afu+SebjoSHsTMu/WV9m7E1OE="; }; aa-teardown = writeShellScript "aa-teardown" '' @@ -86,6 +87,7 @@ let strictDeps = false; nativeBuildInputs = [ + autoconf-archive autoreconfHook bison flex diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index d5e38ea62fb8..00afda1c605d 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,12 +1,14 @@ { lib , stdenv , fetchurl +, fetchpatch , autoreconfHook , bash , buildPackages , linuxHeaders , python3 , swig +, pkgsCross # Enabling python support while cross compiling would be possible, but the # configure script tries executing python to gather info instead of relying on @@ -16,13 +18,26 @@ stdenv.mkDerivation (finalAttrs: { pname = "audit"; - version = "3.1.2"; + version = "4.0"; src = fetchurl { url = "https://people.redhat.com/sgrubb/audit/audit-${finalAttrs.version}.tar.gz"; - hash = "sha256-wLF5LR8KiMbxgocQUJy7mHBZ/GhxLJdmnKkOrhA9KH0="; + hash = "sha256-v0ItQSard6kqTDrDneVHPyeNw941ck0lGKSMe+FdVNg="; }; + patches = lib.optionals (!stdenv.hostPlatform.isGnu) [ + (fetchpatch { + name = "musl.patch"; + url = "https://github.com/linux-audit/audit-userspace/commit/64cb48e1e5137b8a389c7528e611617a98389bc7.patch"; + hash = "sha256-DN2F5w+2Llm80FZntH9dvdyT00pVBSgRu8DDFILyrlU="; + }) + (fetchpatch { + name = "musl.patch"; + url = "https://github.com/linux-audit/audit-userspace/commit/4192eb960388458c85d76e5e385cfeef48f02c79.patch"; + hash = "sha256-G6CJ9nBJSsTyJ0qq14PVo+YdInAvLLQtXcR25Q8V5/4="; + }) + ]; + postPatch = '' substituteInPlace bindings/swig/src/auditswig.i \ --replace "/usr/include/linux/audit.h" \ @@ -60,6 +75,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + passthru.tests = { + musl = pkgsCross.musl64.audit; + }; + meta = { homepage = "https://people.redhat.com/sgrubb/audit/"; description = "Audit Library"; diff --git a/pkgs/os-specific/linux/below/default.nix b/pkgs/os-specific/linux/below/default.nix index 286a92f0eb88..5deb2f236005 100644 --- a/pkgs/os-specific/linux/below/default.nix +++ b/pkgs/os-specific/linux/below/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ''; # bpf code compilation - hardeningDisable = [ "stackprotector" ]; + hardeningDisable = [ "stackprotector" "zerocallusedregs" ]; nativeBuildInputs = [ clang pkg-config rustfmt ]; buildInputs = [ elfutils zlib ]; diff --git a/pkgs/os-specific/linux/bpftune/default.nix b/pkgs/os-specific/linux/bpftune/default.nix index cc97ed16faea..830e214f6ba8 100644 --- a/pkgs/os-specific/linux/bpftune/default.nix +++ b/pkgs/os-specific/linux/bpftune/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "stackprotector" + "zerocallusedregs" ]; passthru.tests = { diff --git a/pkgs/os-specific/linux/catfs/Cargo.lock b/pkgs/os-specific/linux/catfs/Cargo.lock index d79e0a9e168d..5cb1147f91e8 100644 --- a/pkgs/os-specific/linux/catfs/Cargo.lock +++ b/pkgs/os-specific/linux/catfs/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "addr2line" -version = "0.13.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] [[package]] name = "adler" -version = "0.2.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "ansi_term" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ "winapi", ] @@ -41,25 +41,20 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - [[package]] name = "backtrace" -version = "0.3.51" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1931848a574faa8f7c71a12ea00453ff5effbb5f51afe7f77d7a48cace6ac1" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", - "cfg-if", + "cc", + "cfg-if 1.0.0", "libc", "miniz_oxide", "object", @@ -83,26 +78,19 @@ checksum = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" -version = "0.2.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1339a1042f5d9f295737ad4d9a6ab6bf81c84a933dba110b9200cd6d1448b814" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "byte-tools", "generic-array", ] -[[package]] -name = "byte-tools" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40" - [[package]] name = "catfs" version = "0.9.0" @@ -127,12 +115,27 @@ dependencies = [ "xattr", ] +[[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 = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "chan" version = "0.1.23" @@ -156,9 +159,9 @@ dependencies = [ [[package]] name = "clap" -version = "2.33.3" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", @@ -169,6 +172,25 @@ dependencies = [ "vec_map", ] +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[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 = "daemonize" version = "0.2.3" @@ -180,18 +202,19 @@ dependencies = [ [[package]] name = "digest" -version = "0.6.2" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5b29bf156f3f4b3c4f610a25ff69370616ae6e0657d416de22645483e72af0a" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "generic-array", + "block-buffer", + "crypto-common", ] [[package]] name = "either" -version = "1.6.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "env_logger" @@ -203,12 +226,6 @@ dependencies = [ "regex", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "fd" version = "0.2.3" @@ -238,40 +255,46 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.8.3" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fceb69994e330afed50c93524be68c42fa898c2d9fd4ee8da03bd7363acd26f2" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ - "nodrop", "typenum", + "version_check", ] [[package]] name = "getrandom" -version = "0.1.15" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] name = "gimli" -version = "0.22.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "hermit-abi" -version = "0.1.16" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + [[package]] name = "itertools" version = "0.6.5" @@ -295,9 +318,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.78" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa7087f49d294270db4e1928fc110c976cd4b9e5a16348e0a1df09afa99e6c98" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "log" @@ -305,67 +328,60 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" dependencies = [ - "log 0.4.11", + "log 0.4.20", ] [[package]] name = "log" -version = "0.4.11" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.3.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "miniz_oxide" -version = "0.4.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c60c0dfe32c10b43a144bad8fc83538c52f58302c92300ea7ec7bf7b38d5a7b9" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", - "autocfg", ] -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.3", "libc", ] [[package]] name = "object" -version = "0.20.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] [[package]] name = "pkg-config" -version = "0.3.18" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "ppv-lite86" -version = "0.2.9" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "rand" @@ -392,25 +408,23 @@ dependencies = [ [[package]] name = "rand" -version = "0.7.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "getrandom", "libc", "rand_chacha", - "rand_core 0.5.1", - "rand_hc", + "rand_core 0.6.4", ] [[package]] name = "rand_chacha" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.5.1", + "rand_core 0.6.4", ] [[package]] @@ -430,22 +444,13 @@ checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" [[package]] name = "rand_core" -version = "0.5.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rdrand" version = "0.4.0" @@ -479,23 +484,27 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.16" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "sha2" -version = "0.6.0" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d963c78ce367df26d7ea8b8cc655c651b42e8a1e584e869c1e17dae3ccb116a" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "block-buffer", - "byte-tools", + "cfg-if 1.0.0", + "cpufeatures", "digest", - "fake-simd", - "generic-array", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "strsim" version = "0.8.0" @@ -549,9 +558,9 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", @@ -560,30 +569,32 @@ dependencies = [ [[package]] name = "twox-hash" -version = "1.5.0" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "rand 0.7.3", + "cfg-if 1.0.0", + "rand 0.8.5", + "static_assertions", ] [[package]] name = "typenum" -version = "1.12.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-util" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85f514e095d348c279b1e5cd76795082cf15bd59b93207832abe0b1d8fed236" +checksum = "abd2fc5d32b590614af8b0a20d837f32eca055edd0bbead59a9cfe80858be003" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unix_socket" @@ -591,15 +602,15 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aa2700417c405c38f5e6902d699345241c28c0b7ade4abaad71e35a87eb1564" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", ] [[package]] name = "utf8-ranges" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" +checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" [[package]] name = "vec_map" @@ -608,10 +619,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +name = "version_check" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasi" @@ -619,6 +630,12 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "winapi" version = "0.3.9" @@ -643,9 +660,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "xattr" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" dependencies = [ "libc", ] diff --git a/pkgs/os-specific/linux/catfs/default.nix b/pkgs/os-specific/linux/catfs/default.nix index 52d87f4deb1c..0530035ec337 100644 --- a/pkgs/os-specific/linux/catfs/default.nix +++ b/pkgs/os-specific/linux/catfs/default.nix @@ -5,20 +5,15 @@ rustPlatform.buildRustPackage rec { pname = "catfs"; - version = "0.9.0"; + version = "0.9.0-unstable-2023-10-09"; src = fetchFromGitHub { owner = "kahing"; repo = pname; - rev = "v${version}"; - hash = "sha256-OvmtU2jpewP5EqPwEFAf67t8UCI1WuzUO2QQj4cH1Ak="; + rev = "35430f800e68da18fb6bbd25a8f15bf32fa1f166"; + hash = "sha256-hbv4SNe0yqjO6Oomev9uKqG29TiJeI8G7LH+Wxn7hnQ="; }; - patches = [ - # monitor https://github.com/kahing/catfs/issues/71 - ./fix-for-rust-1.65.diff - ]; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/pkgs/os-specific/linux/catfs/fix-for-rust-1.65.diff b/pkgs/os-specific/linux/catfs/fix-for-rust-1.65.diff deleted file mode 100644 index 4208c362ebcd..000000000000 --- a/pkgs/os-specific/linux/catfs/fix-for-rust-1.65.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/catfs/file.rs b/src/catfs/file.rs -index 6e781eb..92fdd80 100644 ---- a/src/catfs/file.rs -+++ b/src/catfs/file.rs -@@ -569,7 +569,7 @@ impl Handle { - path: &dyn AsRef, - create: bool, - ) -> error::Result<()> { -- let _ = self.page_in_res.0.lock().unwrap(); -+ drop(self.page_in_res.0.lock().unwrap()); - - let mut buf = [0u8; 0]; - let mut flags = rlibc::O_RDWR; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index fb5a6ce28e1d..39f03c475fda 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "cryptsetup"; - version = "2.7.1"; + version = "2.7.3"; outputs = [ "bin" "out" "dev" "man" ]; separateDebugInfo = true; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-2l0UGeKobgGqMv15WCzVTSCIV8tUG8ov1Cal/xqqu8M="; + hash = "sha256-t3KuT23wzucgCyjOqWDk2q/yogPS/VAr6rPBMXsHpFY="; }; patches = [ diff --git a/pkgs/os-specific/linux/decklink/default.nix b/pkgs/os-specific/linux/decklink/default.nix deleted file mode 100644 index a2811ddae8a5..000000000000 --- a/pkgs/os-specific/linux/decklink/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv -, lib -, fetchpatch -, blackmagic-desktop-video -, kernel -}: - -stdenv.mkDerivation rec { - pname = "decklink"; - - # the download is a horrible curl mess. we reuse it between the kernel module - # and desktop service, since the version of the two have to match anyways. - # See pkgs/tools/video/blackmagic-desktop-video/default.nix for more. - inherit (blackmagic-desktop-video) src version; - - KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = placeholder "out"; - - nativeBuildInputs = kernel.moduleBuildDependencies; - - patches = lib.optionals (lib.versionAtLeast kernel.version "6.8") [ - (fetchpatch { - name = "decklink-addMutex.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/01-addMutex.patch?h=decklink&id=132ce45a76e230cbfec4a3daac237ffe9b8a377a"; - sha256 = "sha256-YLIjO3wMrMoEZwMX5Fs9W4uRu9Xo8klzsjfhxS2wRfQ="; - }) - (fetchpatch { - name = "decklink-changeMaxOrder.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/02-changeMaxOrder.patch?h=decklink&id=132ce45a76e230cbfec4a3daac237ffe9b8a377a"; - sha256 = "sha256-/erUVYjpTuyaQaCSzSxwKgNocxijc1uNaUjnrJEMa6g="; - }) - ]; - - - postUnpack = let - arch = stdenv.hostPlatform.uname.processor; - in '' - tar xf Blackmagic_Desktop_Video_Linux_${lib.head (lib.splitString "a" version)}/other/${arch}/desktopvideo-${version}-${arch}.tar.gz - moduleRoot=$NIX_BUILD_TOP/desktopvideo-${version}-${stdenv.hostPlatform.uname.processor}/usr/src - sourceRoot=$moduleRoot - ''; - - - buildPhase = '' - runHook preBuild - - make -C $moduleRoot/blackmagic-${version} -j$NIX_BUILD_CORES - make -C $moduleRoot/blackmagic-io-${version} -j$NIX_BUILD_CORES - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - make -C $KERNELDIR M=$moduleRoot/blackmagic-${version} modules_install - make -C $KERNELDIR M=$moduleRoot/blackmagic-io-${version} modules_install - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://www.blackmagicdesign.com/support/family/capture-and-playback"; - maintainers = [ maintainers.hexchen ]; - license = licenses.unfree; - description = "Kernel module for the Blackmagic Design Decklink cards"; - sourceProvenance = with lib.sourceTypes; [ binaryFirmware ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/dracut/default.nix b/pkgs/os-specific/linux/dracut/default.nix index 498f61dc9836..39fc54d2a2c4 100644 --- a/pkgs/os-specific/linux/dracut/default.nix +++ b/pkgs/os-specific/linux/dracut/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dracutdevs/dracut/wiki"; description = "Event driven initramfs infrastructure"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix index b23e0d34401a..db106c14b434 100644 --- a/pkgs/os-specific/linux/edac-utils/default.nix +++ b/pkgs/os-specific/linux/edac-utils/default.nix @@ -1,32 +1,44 @@ -{ lib, stdenv, fetchFromGitHub, perl, makeWrapper +{ lib, stdenv, fetchFromGitHub, perl , sysfsutils, dmidecode, kmod }: stdenv.mkDerivation { pname = "edac-utils"; - version = "unstable-2015-01-07"; + version = "unstable-2023-01-30"; src = fetchFromGitHub { owner = "grondo"; repo = "edac-utils"; - rev = "f9aa96205f610de39a79ff43c7478b7ef02e3138"; - sha256 = "1dmfqb15ffldl5zirbmwiqzpxbcc2ny9rpfvxcfvpmh5b69knvdg"; + rev = "8fdc1d40e30f65737fef6c3ddcd1d2cd769f6277"; + hash = "sha256-jZGRrZ1sa4x0/TBJ5GsNVuWakmPNOU+oiOoXdhARunk="; }; - nativeBuildInputs = [ perl makeWrapper ]; - buildInputs = [ sysfsutils ]; + # Hard-code program paths instead of using PATH lookups. Also, labels.d and + # mainboard are for user-configurable data, so do not look for them in Nix + # store. + dmidecodeProgram = lib.getExe' dmidecode "dmidecode"; + modprobeProgram = lib.getExe' kmod "modprobe"; + postPatch = '' + substituteInPlace src/util/edac-ctl.in \ + --replace-fail 'find_prog ("dmidecode")' "\"$dmidecodeProgram\"" \ + --replace-fail 'find_prog ("modprobe") or exit (1)' "\"$modprobeProgram\"" \ + --replace-fail '"$sysconfdir/edac/labels.d"' '"/etc/edac/labels.d"' \ + --replace-fail '"$sysconfdir/edac/mainboard"' '"/etc/edac/mainboard"' + ''; - configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - ]; + # NB edac-utils needs Perl for configure script, but also edac-ctl program is + # a Perl script. Perl from buildInputs is used by patchShebangsAuto in + # fixupPhase to update the hash bang line. + strictDeps = true; + nativeBuildInputs = [ perl ]; + buildInputs = [ perl sysfsutils ]; installFlags = [ - "sysconfdir=\${out}/etc" + "sbindir=${placeholder "out"}/bin" ]; + # SysV init script is not relevant. postInstall = '' - wrapProgram "$out/sbin/edac-ctl" \ - --set PATH ${lib.makeBinPath [ dmidecode kmod ]} + rm -r "$out"/etc/init.d ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 610f9d31353e..47112a26c203 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -1,39 +1,49 @@ -{ lib -, stdenv -, mkDerivation -, argp-standalone -, dbus -, dbus_cplusplus -, desktop-file-utils -, fetchurl -, fetchpatch -, glibmm -, libavc1394 -, libconfig -, libiec61883 -, libraw1394 -, libxmlxx3 -, pkg-config -, python3 -, scons -, which -, wrapQtAppsHook +{ + lib, + stdenv, + mkDerivation, + argp-standalone, + dbus, + dbus_cplusplus, + desktop-file-utils, + fetchurl, + fetchpatch, + glibmm, + libavc1394, + libconfig, + libiec61883, + libraw1394, + libxmlxx3, + pkg-config, + python311, + scons, + which, + wrapQtAppsHook, }: let - python = python3.withPackages (pkgs: with pkgs; [ pyqt5 dbus-python ]); + python = python311.withPackages ( + pkgs: with pkgs; [ + pyqt5 + dbus-python + ] + ); in mkDerivation rec { pname = "ffado"; version = "2.4.8"; + outputs = [ + "out" + "bin" + "dev" + ]; + src = fetchurl { url = "http://www.ffado.org/files/libffado-${version}.tgz"; - hash = "sha256-f0x561ehKw6uMSri0RZip+v1JHZuhixtywl0PVU/N44="; + hash = "sha256-0iFXYyGctOoHCdc232Ud80/wV81tiS7ItiS0uLKyq2Y="; }; - sourceRoot = "libffado-${version}/libffado"; - prePatch = '' substituteInPlace ./support/tools/ffado-diag.in \ --replace /lib/modules/ "/run/booted-system/kernel-modules/lib/modules/" @@ -51,15 +61,13 @@ mkDerivation rec { }) ]; - outputs = [ "out" "bin" "dev" ]; - nativeBuildInputs = [ desktop-file-utils - scons + (scons.override { python3 = python311; }) pkg-config which python - python3.pkgs.pyqt5 + python.pkgs.pyqt5 wrapQtAppsHook ]; @@ -71,7 +79,7 @@ mkDerivation rec { "WILL_DEAL_WITH_XDG_MYSELF=True" "BUILD_MIXER=True" "UDEVDIR=${placeholder "out"}/lib/udev/rules.d" - "PYPKGDIR=${placeholder "out"}/${python3.sitePackages}" + "PYPKGDIR=${placeholder "out"}/${python.sitePackages}" "BINDIR=${placeholder "bin"}/bin" "INCLUDEDIR=${placeholder "dev"}/include" "PYTHON_INTERPRETER=${python.interpreter}" @@ -116,7 +124,10 @@ mkDerivation rec { homepage = "http://www.ffado.org"; description = "FireWire audio drivers"; license = licenses.gpl3; - maintainers = with maintainers; [ goibhniu michojel ]; + maintainers = with maintainers; [ + goibhniu + michojel + ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/ffado/fix-build.patch b/pkgs/os-specific/linux/ffado/fix-build.patch index 7e360932613f..db4c47fa38d5 100644 --- a/pkgs/os-specific/linux/ffado/fix-build.patch +++ b/pkgs/os-specific/linux/ffado/fix-build.patch @@ -1,9 +1,14 @@ From b0f2b20b23780dd2e67a01c15462070dd86c4ac1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Mar 2019 11:50:27 +0100 -Subject: [PATCH] Fix build on Nix +Subject: [PATCH] build: Add datadir option for /usr/share -We do not have global /usr. +Hardcoded /usr/share does not work for platforms that do not have global /usr like Nix. +Let’s introduce a new DATADIR option, that allows overriding the directory and use it for metainfodir. + +While at it, let’s also use it for SHAREDIR and MANDIR for consistency, +following the GNU directory convention: +https://www.gnu.org/prep/standards/html_node/Directory-Variables.html --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -12,15 +17,48 @@ diff --git a/SConstruct b/SConstruct index 05755e4b..3fbdc1d8 100644 --- a/SConstruct +++ b/SConstruct -@@ -537,7 +537,7 @@ env['mandir'] = Template( env.destdir + env['MANDIR'] ).safe_substitute( env ) +@@ -49,9 +49,10 @@ + PathVariable( "BINDIR", "Overwrite the directory where apps are installed to.", "$PREFIX/bin", PathVariable.PathAccept ), + PathVariable( "LIBDIR", "Overwrite the directory where libs are installed to.", "$PREFIX/lib", PathVariable.PathAccept ), + PathVariable( "INCLUDEDIR", "Overwrite the directory where headers are installed to.", "$PREFIX/include", PathVariable.PathAccept ), +- PathVariable( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$PREFIX/share/libffado", PathVariable.PathAccept ), ++ PathVariable( "DATADIR", "Overwrite the directory where platform-independent files are installed to.", "$PREFIX/share", PathVariable.PathAccept ), ++ PathVariable( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$DATADIR/libffado", PathVariable.PathAccept ), + PathVariable( "LIBDATADIR", "Location for architecture-dependent data.", "$LIBDIR/libffado", PathVariable.PathAccept ), +- PathVariable( "MANDIR", "Overwrite the directory where manpages are installed", "$PREFIX/man", PathVariable.PathAccept ), ++ PathVariable( "MANDIR", "Overwrite the directory where manpages are installed", "$DATADIR/man", PathVariable.PathAccept ), + PathVariable( "PYPKGDIR", "The directory where the python modules get installed.", + distutils.sysconfig.get_python_lib( prefix="$PREFIX" ), PathVariable.PathAccept ), + PathVariable( "UDEVDIR", "Overwrite the directory where udev rules are installed to.", "/lib/udev/rules.d/", PathVariable.PathAccept ), +@@ -523,6 +524,7 @@ + env['BINDIR'] = Template( env['BINDIR'] ).safe_substitute( env ) + env['LIBDIR'] = Template( env['LIBDIR'] ).safe_substitute( env ) + env['INCLUDEDIR'] = Template( env['INCLUDEDIR'] ).safe_substitute( env ) ++env['DATADIR'] = Template( env['DATADIR'] ).safe_substitute( env ) + env['SHAREDIR'] = Template( env['SHAREDIR'] ).safe_substitute( env ) + env['LIBDATADIR'] = Template( env['LIBDATADIR'] ).safe_substitute( env ) + env['UDEVDIR'] = Template( env['UDEVDIR'] ).safe_substitute( env ) +@@ -531,18 +533,21 @@ + env['bindir'] = Template( env.destdir + env['BINDIR'] ).safe_substitute( env ) + env['libdir'] = Template( env.destdir + env['LIBDIR'] ).safe_substitute( env ) + env['includedir'] = Template( env.destdir + env['INCLUDEDIR'] ).safe_substitute( env ) ++env['datadir'] = Template( env.destdir + env['DATADIR'] ).safe_substitute( env ) + env['sharedir'] = Template( env.destdir + env['SHAREDIR'] ).safe_substitute( env ) + env['libdatadir'] = Template( env.destdir + env['LIBDATADIR'] ).safe_substitute( env ) + env['mandir'] = Template( env.destdir + env['MANDIR'] ).safe_substitute( env ) env['pypkgdir'] = Template( env.destdir + env['PYPKGDIR'] ).safe_substitute( env ) env['udevdir'] = Template( env.destdir + env['UDEVDIR'] ).safe_substitute( env ) env['PYPKGDIR'] = Template( env['PYPKGDIR'] ).safe_substitute( env ) -env['metainfodir'] = Template( env.destdir + "/usr/share/metainfo" ).safe_substitute( env ) -+env['metainfodir'] = Template( env.destdir + env['SHAREDIR'] + "/metainfo" ).safe_substitute( env ) - +- ++env['metainfodir'] = Template( env.destdir + env['DATADIR'] + "/metainfo" ).safe_substitute( env ) ++ ++env.Command( target=env['datadir'], source="", action=Mkdir( env['datadir'] ) ) env.Command( target=env['sharedir'], source="", action=Mkdir( env['sharedir'] ) ) --- -2.19.2 - + env.Alias( "install", env['libdir'] ) + env.Alias( "install", env['includedir'] ) ++env.Alias( "install", env['datadir'] ) + env.Alias( "install", env['sharedir'] ) + env.Alias( "install", env['libdatadir'] ) + env.Alias( "install", env['bindir'] ) diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index ae04c6a9ce32..f106f77626e5 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -1,20 +1,17 @@ -let - source = import ./source.nix; -in { - stdenvNoCC, - fetchzip, - lib, - rdfind, - which, +{ stdenvNoCC +, fetchzip +, lib +, rdfind +, which }: stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = source.version; + version = "20240709"; src = fetchzip { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${source.revision}.tar.gz"; - hash = source.sourceHash; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz"; + hash = "sha256-BopPZDVQMmhLo9qTpozIea2amaZNQvwhgEIcpKMPAKs="; }; nativeBuildInputs = [ @@ -27,10 +24,6 @@ stdenvNoCC.mkDerivation rec { # Firmware blobs do not need fixing and should not be modified dontFixup = true; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = source.outputHash; - meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; @@ -39,6 +32,5 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ fpletz ]; priority = 6; # give precedence to kernel firmware }; - passthru.updateScript = ./update.sh; } diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix deleted file mode 100644 index adaa4968fd56..000000000000 --- a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ /dev/null @@ -1,7 +0,0 @@ -# This file is autogenerated! Run ./update.sh to regenerate. -{ - version = "20240610"; - revision = "20240610"; - sourceHash = "sha256-tjDqviOMvrBoEG8+Yn+XqdBlIDfQUX0KK2kpW6/jed8="; - outputHash = "sha256-2VxzN778TLov5N1DPSnnkT7wQnLg85PyKsljZOoSoNM="; -} diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/update.sh b/pkgs/os-specific/linux/firmware/linux-firmware/update.sh index 4b28d6e1374f..7886e93571ab 100755 --- a/pkgs/os-specific/linux/firmware/linux-firmware/update.sh +++ b/pkgs/os-specific/linux/firmware/linux-firmware/update.sh @@ -1,47 +1,10 @@ -#!/usr/bin/env bash -set -euo pipefail -cd "$(dirname "$(readlink -f "$0")")" || exit +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p git -p common-updater-scripts + +set -eu -o pipefail repo="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" -# step 1: figure out the latest version from the tags -if [ -z "${1:-}" ]; then - revision="$(git ls-remote --refs --tags --sort refname "$repo" | tail -n1 | cut -f2 | cut -d '/' -f3)" - version=$revision -else - revision=$1 - if [ -z "${2:-}" ]; then - version="unstable-$(date "+%Y-%m-%d")" - else - version=$2 - fi -fi +revision="$(git ls-remote --refs --tags --sort refname "$repo" | tail -n1 | cut -f2 | cut -d '/' -f3)" -# step 2: prefetch the source tarball -snapshotUrl="$repo/snapshot/linux-firmware-$revision.tar.gz" -hash="$(nix-prefetch-url --unpack "$snapshotUrl")" -sriHash="$(nix --experimental-features nix-command hash to-sri "sha256:$hash")" - -# step 3: rebuild as a non-FO derivation to get the right hash -cat > source.nix << EOF -{ - version = "$version"; - revision = "$revision"; - sourceHash = "$sriHash"; - outputHash = null; -} -EOF - -outPath="$(nix --experimental-features "nix-command flakes" build ".#linux-firmware" --no-link --print-out-paths)" -outHash="$(nix --experimental-features nix-command hash path "$outPath")" - -# step 4: generate the final file -cat > source.nix << EOF -# This file is autogenerated! Run ./update.sh to regenerate. -{ - version = "$version"; - revision = "$revision"; - sourceHash = "$sriHash"; - outputHash = "$outHash"; -} -EOF +update-source-version linux-firmware "$revision" diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 320f10d55138..484e63bb357c 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.382"; + version = "0.383"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-j7ITcLilcnV8QCUFC/Ybv1dX6Kl36P0G9vBlrzifhFQ="; + hash = "sha256-jYD1/sl9ffe+lmrICLe32NU1u0Hi7ZfZrD4zWH+bxsk="; }; configureFlags = [ "--datadir=${placeholder "out"}/share" ]; diff --git a/pkgs/os-specific/linux/intel-cmt-cat/default.nix b/pkgs/os-specific/linux/intel-cmt-cat/default.nix index 71f7735996ad..5e1302dedd92 100644 --- a/pkgs/os-specific/linux/intel-cmt-cat/default.nix +++ b/pkgs/os-specific/linux/intel-cmt-cat/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "23.11.1"; + version = "24.05"; pname = "intel-cmt-cat"; src = fetchFromGitHub { owner = "intel"; repo = "intel-cmt-cat"; rev = "v${version}"; - sha256 = "sha256-cBsbXua3uOqzElkLcLrOnNXXukGn5zRF8ytWa9VzGdE="; + sha256 = "sha256-e4sbQNpUCZaZDhLLRVDXHXsEelZaZIdc8n3ksUnAkKQ="; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index effe5eb8526b..15b8987b8cc0 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -6,17 +6,14 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "6.8.0"; + version = "6.9.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-A6bMo9cakI0fFfe0lb4rj+hR+UFFjcRmSQDX9F/PaM4="; + hash = "sha256-L2Q9CeoRpKKgQ8kuK0abX3MijL8kGugGdgKW7Q7EE9A="; }; postPatch = '' - # Don't try to create /var/lib/arpd: - sed -e '/ARPDDIR/d' -i Makefile - substituteInPlace Makefile \ --replace "CC := gcc" "CC ?= $CC" ''; diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 94a5a43b76e1..20a2b43143de 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.21"; + version = "7.22"; src = fetchurl { url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-4sbOT886yziTyl01yGk1+ArXb8XMrmARhYQt92DgvGk="; + sha256 = "sha256-9qxaR8Pvn0xn/L31Xnkcv+OOsKSqG6rNEmRqFAq6zdk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 551d4cffbb92..e4d8706fb6a6 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -671,20 +671,29 @@ let }; security = { + # Report BUG() conditions and kill the offending process. + BUG = yes; + BUG_ON_DATA_CORRUPTION = yes; + FORTIFY_SOURCE = option yes; # https://googleprojectzero.blogspot.com/2019/11/bad-binder-android-in-wild-exploit.html DEBUG_LIST = yes; + HARDENED_USERCOPY = yes; RANDOMIZE_BASE = option yes; + STRICT_KERNEL_RWX = yes; + STRICT_MODULE_RWX = yes; STRICT_DEVMEM = mkDefault yes; # Filter access to /dev/mem IO_STRICT_DEVMEM = mkDefault yes; SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default + # Prevent processes from ptracing non-children processes SECURITY_YAMA = option yes; # The goal of Landlock is to enable to restrict ambient rights (e.g. global filesystem access) for a set of processes. # This does not have any effect if a program does not support it SECURITY_LANDLOCK = whenAtLeast "5.13" yes; + DEVKMEM = whenOlder "5.13" no; # Disable /dev/kmem USER_NS = yes; # Support for user namespaces @@ -719,6 +728,10 @@ let # Enable support for page poisoning. Still needs to be enabled on the command line to actually work. PAGE_POISONING = yes; + # Randomize page allocator when page_alloc.shuffle=1 + SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes; + + INIT_ON_ALLOC_DEFAULT_ON = whenAtLeast "5.3" yes; # Enable stack smashing protections in schedule() # See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.8&id=0d9e26329b0c9263d4d9e0422d80a0e73268c52f @@ -743,6 +756,10 @@ let # Mitigate straight line speculation at the cost of some file size SLS = whenBetween "5.17" "6.9" yes; MITIGATION_SLS = whenAtLeast "6.9" yes; + + DEFAULT_MMAP_MIN_ADDR = freeform "65536"; + } // optionalAttrs stdenv.hostPlatform.isAarch64 { + DEFAULT_MMAP_MIN_ADDR = freeform "32768"; }; microcode = { diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index d687366dbe2f..0ab89d23952d 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -17,9 +17,6 @@ with (lib.kernel.whenHelpers version); assert (versionAtLeast version "4.9"); { - # Report BUG() conditions and kill the offending process. - BUG = yes; - # Mark LSM hooks read-only after init. SECURITY_WRITABLE_HOOKS n # conflicts with SECURITY_SELINUX_DISABLE y; disabling the latter # implicitly marks LSM hooks read-only after init. @@ -31,8 +28,6 @@ assert (versionAtLeast version "4.9"); SECURITY_SELINUX_DISABLE = whenOlder "6.4" no; # On 6.4: error: unused option: SECURITY_SELINUX_DISABLE SECURITY_WRITABLE_HOOKS = option no; - STRICT_KERNEL_RWX = yes; - # Perform additional validation of commonly targeted structures. DEBUG_CREDENTIALS = whenOlder "6.6" yes; DEBUG_NOTIFIERS = yes; @@ -51,16 +46,11 @@ assert (versionAtLeast version "4.9"); # restricts loading of line disciplines via TIOCSETD ioctl to CAP_SYS_MODULE CONFIG_LDISC_AUTOLOAD = option no; - # Randomize page allocator when page_alloc.shuffle=1 - SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes; - # Wipe higher-level memory allocations on free() with page_poison=1 - PAGE_POISONING = yes; PAGE_POISONING_NO_SANITY = whenOlder "5.11" yes; PAGE_POISONING_ZERO = whenOlder "5.11" yes; - # Enable init_on_alloc and init_on_free by default - INIT_ON_ALLOC_DEFAULT_ON = whenAtLeast "5.3" yes; + # Enable init_on_free by default INIT_ON_FREE_DEFAULT_ON = whenAtLeast "5.3" yes; # Wipe all caller-used registers on exit from a function @@ -113,9 +103,6 @@ assert (versionAtLeast version "4.9"); CC_STACKPROTECTOR_REGULAR = lib.mkForce (whenOlder "4.18" no); CC_STACKPROTECTOR_STRONG = whenOlder "4.18" yes; - # Detect out-of-bound reads/writes and use-after-free - KFENCE = whenAtLeast "5.12" yes; - # CONFIG_DEVMEM=n causes these to not exist anymore. STRICT_DEVMEM = option no; IO_STRICT_DEVMEM = option no; @@ -126,8 +113,4 @@ assert (versionAtLeast version "4.9"); # not needed for less than a decade old glibc versions LEGACY_VSYSCALL_NONE = yes; - - # Straight-Line-Speculation - # https://lwn.net/Articles/877845/ - SLS = option yes; } diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 42a315b0fb84..e45449d20e60 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,38 +1,38 @@ { "testing": { - "version": "6.10-rc5", - "hash": "sha256:1bjqcgik4mgjshwy7p45msd62rmq8wjyz7b60n4fsm3kyk16imcd" + "version": "6.10-rc6", + "hash": "sha256:0ajhx148rrk26mhcv03g2gdy0s9hv0vp95rvwfwsjkb0iwm0nfvy" }, "6.1": { - "version": "6.1.96", - "hash": "sha256:1ab290vm6h8vj1qi1qhxzh9kc6dbgpkwybcwzw1aprz5kl3cjxry" + "version": "6.1.97", + "hash": "sha256:1bs1pv9h5lwjadl4wjylrl3zd125ccxqkpb2drqjh8s56rgq82w9" }, "5.15": { - "version": "5.15.161", - "hash": "sha256:0k277hz6nq62v0xfc1n2hc69cyvmnxpl0qcbszinajywh23gfafn" + "version": "5.15.162", + "hash": "sha256:0z0s5gk8akcbpb99jp08px78fhr8r6kkb7dpl01b3rrc2pmc1gwi" }, "5.10": { - "version": "5.10.220", - "hash": "sha256:16z1xqm7djm8pl15s5wvgc4pwq81gydcf00jpxfplw794kwszhvw" + "version": "5.10.221", + "hash": "sha256:09975sby114mwfb8x2rlpaps6vb60dvs8f20cmb7hkxcxdzx87fs" }, "5.4": { - "version": "5.4.278", - "hash": "sha256:1245zf7vk2fyprw9fspljqy9wlzma9bayri7xx2g8iam2430d875" + "version": "5.4.279", + "hash": "sha256:0pja69n66hsl1r5jbzqww1hwsmqdlxmq6qv9rqx5qnrr4rml765j" }, "4.19": { - "version": "4.19.316", - "hash": "sha256:0lmyhwr4la7kvim7jqdi29scjkvqp9crpvdbhpb4j8d7mj5kgzz4" + "version": "4.19.317", + "hash": "sha256:109mk4zscm8611xs3bchnr94gasvw3vxsi6zhp3f2y132g670aq6" }, "6.6": { - "version": "6.6.36", - "hash": "sha256:1mfdw2prjb54r19y22sm37q8spnk6lyk162ima7gps1pnwl6hrxr" + "version": "6.6.37", + "hash": "sha256:051j3ydf54bb027a6f7hb2y6r8y82p1hf4wd3x5gx546f1vnx5zk" }, "6.8": { "version": "6.8.12", "hash": "sha256:0fb0m0fv4521g63gq04d7lm6hy8169s1rykiav5bkd99s9b1kcqr" }, "6.9": { - "version": "6.9.7", - "hash": "sha256:1y01w26sas7pl24l09yczdr8mzzy2nadykz1wmhx9ygfj76qixg4" + "version": "6.9.8", + "hash": "sha256:109j8f69bsvk2a61ihs3r77jv05fm4aqvih8lyf6qcc8gdxjcj7h" } } diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index ec7f104bcb1d..ef62b0df57f2 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.218-rt110"; # updated by ./update-rt.sh + version = "5.10.219-rt111"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1mmj5hwm5i16gc1y4nzr1cs882vi6vrihrincdcivv63x11v4dlw"; + sha256 = "0c6dhi6w8likvyyzw7wj2fqhz8nhv760kkic8bk66r1prhakzdwk"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0zam7hlcrphxv53jcza7sw0lv8a9mz15cl35adwb2rd2y1x9nhad"; + sha256 = "0imnwj8210cjvmr90yhcc0nn80s3wlc5n2cdrnbg72lm4dny2qpn"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 2fc18c76e570..7863cf42f7dd 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.271-rt89"; # updated by ./update-rt.sh + version = "5.4.278-rt91"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -15,14 +15,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0l2qv4xlhnry9crs90rkihsxyny6jz8kxw08bfad7nys9hrn3g6d"; + sha256 = "1245zf7vk2fyprw9fspljqy9wlzma9bayri7xx2g8iam2430d875"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "15k9jja5yd9zf5yhd7hhydwh4hksg2mybk66jhdjsryh4w9jav7z"; + sha256 = "0s1ars3d18jg55kpvk6q5b6rk66c74d2khd2mxzdm5ifgm47047k"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index 3154538ee74a..1161162981ea 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.95-rt34"; # updated by ./update-rt.sh + version = "6.1.96-rt35"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "1gfz2j6iixbr0dfkb8jkwnb4gicrm5rc5lsa24wmyrkm3nmg0q19"; + sha256 = "1ab290vm6h8vj1qi1qhxzh9kc6dbgpkwybcwzw1aprz5kl3cjxry"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1kz9j8d677vr5sfxrvfd2a8vpmz3vsrvb82rdvvf09ikpdvsa6iy"; + sha256 = "1adjwxzx37w70h11ig6wcii8xb4dggw5x6si15zlsnr61dalys2d"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix index a200edfb4161..8eab0d2b45f8 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.6.35-rt34"; # updated by ./update-rt.sh + version = "6.6.36-rt35"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "17nxymy3r9q45cfzc9rqp937m37zr1b8fjn1m0x0dv8jhxrfxqzw"; + sha256 = "1mfdw2prjb54r19y22sm37q8spnk6lyk162ima7gps1pnwl6hrxr"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0rijfk9n3fdrwg61ih2x95w4ffjs037hfjv3bza3xb7j04y7hxgy"; + sha256 = "154wfx6aa9yxkavf05vka8spvx99pa4svq02b6kb1zfrq6r93bq6"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/mainline.nix b/pkgs/os-specific/linux/kernel/mainline.nix index 4e1d5b8a9e87..862ba8e8ddcc 100644 --- a/pkgs/os-specific/linux/kernel/mainline.nix +++ b/pkgs/os-specific/linux/kernel/mainline.nix @@ -1,7 +1,10 @@ +let + allKernels = builtins.fromJSON (builtins.readFile ./kernels-org.json); +in + { branch, lib, fetchurl, fetchzip, buildLinux, ... } @ args: let - allKernels = builtins.fromJSON (builtins.readFile ./kernels-org.json); thisKernel = allKernels.${branch}; inherit (thisKernel) version; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 323b77e85140..5f20d14137c4 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod, ubootTools +, cpio, elfutils, hexdump, zstd, python3Minimal, zlib, pahole, kmod, ubootTools , fetchpatch , rustc, rust-bindgen, rustPlatform }: @@ -121,6 +121,7 @@ let pahole perl elfutils + hexdump # module makefiles often run uname commands to find out the kernel version (buildPackages.deterministic-uname.override { inherit modDirVersion; }) ] @@ -312,7 +313,7 @@ let installTargets = [ (kernelConf.installTarget or ( /**/ if kernelConf.target == "uImage" && stdenv.hostPlatform.linuxArch == "arm" then "uinstall" - else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" then "zinstall" + else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" || kernelConf.target == "vmlinuz.efi" then "zinstall" else "install")) ]; diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 851a4c8d5d7b..a54e5c04e214 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -128,17 +128,12 @@ stdenv.mkDerivation { ++ lib.optional (lib.versionAtLeast kernel.version "5.8") libpfm ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3.pkgs.setuptools; - env.NIX_CFLAGS_COMPILE = toString ([ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" "-Wno-error=stringop-truncation" - ] ++ lib.optionals (stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "13") [ - # Workaround gcc bug that causes enev simplest `perf top` runs to - # crash: https://gcc.gnu.org/PR111009. - # Can be removed once gcc-13 is updated past 13.2.0. - "-O1" - ]); + ]; doCheck = false; # requires "sparse" diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index b2c4d0a6a669..efba7c47741d 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,14 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.33"; - hash = "sha256-3qGxIYNVm2f69rym0Ya1X497G7yRNj3lLCtVgyEZ9yw="; + version = "6.6.37"; + hash = "sha256-EoGRWCa0nqokUzhq+WcmY1RRFv9uDvmrGdXCqZxTJ/U="; variant = "lts"; }; mainVariant = { - version = "6.9.4"; - hash = "sha256-gY0t77aPWOuRZFESNp0OLIsjLAv+rf0NHbab9WF2VtA="; + version = "6.9.8"; + hash = "sha256-rSwvVt+DW7rc//aY6Ho8mllUy/3MKuAs/71UG+p07Iw="; variant = "main"; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 77d66ecd1d44..659dcd929951 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.9.7"; #zen + version = "6.9.8"; #zen suffix = "zen1"; #zen - sha256 = "1hs238vpwna8fry65x2909npw97b8zyvbadigl1yqm6f4ibcmhkj"; #zen + sha256 = "1ixrdx2a6jp1x8kryjmxnrgl0fsrjg6fngg5c48vbl2574nizlbz"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.9.7"; #lqx + version = "6.9.8"; #lqx suffix = "lqx1"; #lqx - sha256 = "09z48hnjw0qfvn3b7gm9gs7ixki590wcgy7pm0cw2y41c67f725y"; #lqx + sha256 = "1r5ld2xibr0qkwi1yy7h746sclsmd8cq68z0zdpbbn2qrgyx302k"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 6a0ee908347c..032283711cf3 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-PlGr/qZbKnaY37wikdmX/iYtP11WHShn1I7vACUgLG0="; + sha256 = "sha256-lcIOgghlBKrDCBDdO0hryjt8KADQd6aroQMun3ein2o="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/libzbc/default.nix b/pkgs/os-specific/linux/libzbc/default.nix index e2da36d9dc79..5f8ec5529e94 100644 --- a/pkgs/os-specific/linux/libzbc/default.nix +++ b/pkgs/os-specific/linux/libzbc/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libzbc"; - version = "5.14.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "westerndigitalcorporation"; repo = "libzbc"; rev = "v${version}"; - sha256 = "sha256-+MBk2ZUr3Vt6pZFb4gTXMOzKBlf1EXMF8y/c1iDrIZM="; + sha256 = "sha256-L3i3gBIfgu3mCNvCLxizwFNxBenSZsB6elCkGWdPc4Q="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix b/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix index d616675e497b..8d7fb03499f5 100644 --- a/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix +++ b/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "linux-wifi-hotspot"; - version = "4.7.1"; + version = "4.7.2"; src = fetchFromGitHub { owner = "lakinduakash"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yPTnv96n1mV7aN6hf7wSvJIBfT7v9+jjjSoEcpzLRB8="; + sha256 = "sha256-+WHYWQ4EyAt+Kq0LHEgC7Kk5HpIqThz6W3PIdW8Wojk="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 88a4f33b2f3f..e3b8bc97e4d7 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent , sqlite, libkrb5, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers -, python3, buildPackages, nixosTests, rpcsvc-proto -, enablePython ? true +, python3, buildPackages, nixosTests, rpcsvc-proto, openldap +, enablePython ? true, enableLdap ? true }: let @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "nfs-utils"; - version = "2.6.2"; + version = "2.6.4"; src = fetchurl { url = "mirror://kernel/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-UgCHPoHE1hDiRi/CYv4YE18tvni3l5+VrM0VmuZNUBE="; + hash = "sha256-AbOw+5x9C7q/URTHNlQgMHSMeI7C/Zc0dEIB6bChEZ0="; }; # libnfsidmap is built together with nfs-utils from the same source, @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { buildInputs = [ libtirpc libcap libevent sqlite lvm2 libuuid keyutils libkrb5 tcp_wrappers - ] ++ lib.optional enablePython python3; + ] ++ lib.optional enablePython python3 + ++ lib.optional enableLdap openldap; enableParallelBuilding = true; @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap "--with-rpcgen=${buildPackages.rpcsvc-proto}/bin/rpcgen" "--with-modprobedir=${placeholder "out"}/etc/modprobe.d" - ]; + ] ++ lib.optional enableLdap "--with-ldap"; patches = lib.optionals stdenv.hostPlatform.isMusl [ # http://openwall.com/lists/musl/2015/08/18/10 @@ -68,7 +69,7 @@ stdenv.mkDerivation rec { substituteInPlace systemd/nfs-utils.service \ --replace "/bin/true" "${coreutils}/bin/true" - substituteInPlace tools/nfsrahead/Makefile.in \ + substituteInPlace tools/nfsrahead/Makefile.in systemd/Makefile.in \ --replace "/usr/lib/udev/rules.d/" "$out/lib/udev/rules.d/" substituteInPlace utils/mount/Makefile.in \ diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index aa614aec1283..dea9ab721a95 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -217,8 +217,10 @@ installPhase() { --set-rpath $out/lib:$libPath $bin/bin/$i fi done - # FIXME: needs PATH and other fixes - # install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh + substituteInPlace nvidia-bug-report.sh \ + --replace /bin/grep grep \ + --replace /bin/ls ls + install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh fi runHook postInstall diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 14dcb0e8e76b..568027999efa 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -33,21 +33,21 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "550.90.07"; - sha256_64bit = "sha256-Uaz1edWpiE9XOh0/Ui5/r6XnhB4iqc7AtLvq4xsLlzM="; - sha256_aarch64 = "sha256-uJa3auRlMHr8WyacQL2MyyeebqfT7K6VU0qR7LGXFXI="; - openSha256 = "sha256-VLmh7eH0xhEu/AK+Osb9vtqAFni+lx84P/bo4ZgCqj8="; - settingsSha256 = "sha256-sX9dHEp9zH9t3RWp727lLCeJLo8QRAGhVb8iN6eX49g="; - persistencedSha256 = "sha256-qe8e1Nxla7F0U88AbnOZm6cHxo57pnLCqtjdvOvq9jk="; + version = "550.100"; + sha256_64bit = "sha256-imtfsoe/EfUFZzR4S9pkwQZKCcKqefayJewPtW0jgC0="; + sha256_aarch64 = "sha256-AWHdMtCci8i7maNjVapOT6kyVuFaP81jJyTRLjEyMzo="; + openSha256 = "sha256-3g0f88xGMTB0mx4kVan3ipLtnJFFIKi58ss/1lqC3Sw="; + settingsSha256 = "sha256-cDxhzZCDLtXOas5OlodNYGIuscpKmIGyvhC/kAQaxLc="; + persistencedSha256 = "sha256-gXHBR2+1+YZE2heRArfrZpEF3rO7R92ChuQN+ISpil8="; }; latest = selectHighestVersion production (generic { - version = "555.58"; - sha256_64bit = "sha256-bXvcXkg2kQZuCNKRZM5QoTaTjF4l2TtrsKUvyicj5ew="; - sha256_aarch64 = "sha256-7XswQwW1iFP4ji5mbRQ6PVEhD4SGWpjUJe1o8zoXYRE="; - openSha256 = "sha256-hEAmFISMuXm8tbsrB+WiUcEFuSGRNZ37aKWvf0WJ2/c="; - settingsSha256 = "sha256-vWnrXlBCb3K5uVkDFmJDVq51wrCoqgPF03lSjZOuU8M="; - persistencedSha256 = "sha256-lyYxDuGDTMdGxX3CaiWUh1IQuQlkI2hPEs5LI20vEVw="; + version = "555.58.02"; + sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM="; + sha256_aarch64 = "sha256-wb20isMrRg8PeQBU96lWJzBMkjfySAUaqt4EgZnhyF8="; + openSha256 = "sha256-8hyRiGB+m2hL3c9MDA/Pon+Xl6E788MZ50WrrAGUVuY="; + settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8="; + persistencedSha256 = "sha256-a1D7ZZmcKFWfPjjH1REqPM5j/YLWKnbkP9qfRyIyxAw="; }); beta = selectHighestVersion latest (generic { diff --git a/pkgs/os-specific/linux/oxtools/default.nix b/pkgs/os-specific/linux/oxtools/default.nix index c16e12ab5e14..fcb5d17dee15 100644 --- a/pkgs/os-specific/linux/oxtools/default.nix +++ b/pkgs/os-specific/linux/oxtools/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "0xtools"; - version = "1.2.4"; + version = "2.0.2"; src = fetchFromGitHub { owner = "tanelpoder"; repo = "0xtools"; rev = "v${finalAttrs.version}"; - hash = "sha256-h0/HIbwb1CvFUh/NpozDUCjYGCH647lC7JhbpDCvaLk="; + hash = "sha256-S2jGF6wyjE9okbren/+p37zDr+eHUE8gJe/sbsXX4f4="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index d646f004893c..bba3843f4f4c 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -1,5 +1,5 @@ { lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 -, wrapGAppsHook3, gtk3, glib, desktop-file-utils, appstream-glib, gnome +, wrapGAppsHook3, gtk3, glib, desktop-file-utils, appstream-glib, adwaita-icon-theme , gobject-introspection, librsvg }: python3.pkgs.buildPythonApplication rec { @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook3 desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = [ - gtk3 glib gnome.adwaita-icon-theme python3 librsvg + gtk3 glib adwaita-icon-theme python3 librsvg ]; propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index bcb5dafa137b..6a2296fda4fc 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "policycoreutils"; - version = "3.6"; + version = "3.7"; inherit (libsepol) se_url; src = fetchurl { url = "${se_url}/${version}/policycoreutils-${version}.tar.gz"; - hash = "sha256-p2rEMepAo1qDFkzpAHkJwcbBL9EFZif2IhROSnBcCiw="; + hash = "sha256-WP5OSB7ftEVsEUklRC4ROJ3xc5SSWs26PeIRFFzl6pg="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix index f7145bc02ebe..be984c564860 100644 --- a/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -127,6 +127,6 @@ stdenv.mkDerivation rec { mainProgram = "powerprofilesctl"; platforms = platforms.linux; license = licenses.gpl3Plus; - maintainers = with maintainers; [ mvnetbiz picnoir ]; + maintainers = with maintainers; [ mvnetbiz picnoir lyndeno ]; }; } diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 3a3016d14b4b..664e499cd1d4 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "19.4.0-54962"; + version = "19.4.1-54985"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-c/MrWUvwY/Z38uOBbetJSVkZlwkdzFhw6wpk1L0BuQs="; + hash = "sha256-VBHCsxaMI6mfmc/iQ4hJW/592rKck9HilTX2Hq7Hb5s="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index bef60b52814d..fbe1d62f28d3 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8814au"; - version = "${kernel.version}-unstable-2024-03-19"; + version = "${kernel.version}-unstable-2024-05-26"; src = fetchFromGitHub { owner = "morrownr"; repo = "8814au"; - rev = "d7945c1e0244c83cbbad4da331648246f12eaee9"; - hash = "sha256-idjHlvyFpQgLGfNAPpZKRnLdXnAogUW3qGHC1WzGVmA="; + rev = "810573647b837d88c4191597a0ea6d226f69f64c"; + hash = "sha256-AaOnUy3igocsCF/FNogn+z+QcQiid7U7XimE68wAco0="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index b82a9e681634..434397ebc7c1 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,19 +1,20 @@ -{ lib -, stdenv -, fetchFromGitHub -, kernel -, bc +{ + lib, + stdenv, + fetchFromGitHub, + kernel, + bc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rtl8821ce"; - version = "${kernel.version}-unstable-2024-01-20"; + version = "${kernel.version}-unstable-2024-03-26"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "66983b69120a13699acf40a12979317f29012111"; - hash = "sha256-Zxb9cOgP67QdCeTNEme0tAsBqd9j/2k+gcE1QKkUQU4="; + rev = "f119398d868b1a3395f40c1df2e08b57b2c882cd"; + hash = "sha256-EfpKa5ZRBVM5T8EVim3cVX1PP1UM9CyG6tN5Br8zYww="; }; hardeningDisable = [ "pic" ]; @@ -34,12 +35,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Realtek rtl8821ce driver"; homepage = "https://github.com/tomaspinho/rtl8821ce"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ hhm ]; - broken = stdenv.isAarch64 || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + hhm + defelo + ]; + broken = + stdenv.isAarch64 || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); }; -} +}) diff --git a/pkgs/os-specific/linux/rtl8852bu/default.nix b/pkgs/os-specific/linux/rtl8852bu/default.nix index cc0f495b8122..4b5366cab9d0 100644 --- a/pkgs/os-specific/linux/rtl8852bu/default.nix +++ b/pkgs/os-specific/linux/rtl8852bu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "rtl8852bu"; - version = "${kernel.version}-unstable-2024-03-28"; + version = "${kernel.version}-unstable-2024-05-25"; src = fetchFromGitHub { owner = "morrownr"; - repo = "rtl8852bu"; - rev = "f6aaa3c0094c541d9b0347926c76c1e9cc4a49d1"; - hash = "sha256-Jbd6nixo873LU74klhhQU1qD3ahxEnywdqcF89LTRxc="; + repo = pname; + rev = "1acc7aa085bffec21a91fdc9e293378e06bf25e7"; + hash = "sha256-22vzAdzzM5YnfU8kRWSK3HXxw6BA4FOWXLdWEb7T5IE="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; @@ -42,7 +42,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with lib; { - description = "Driver for Realtek rtl8852au and rtl8832bu chipsets, provides the 8852au mod"; + description = "Driver for Realtek rtl8852bu and rtl8832bu chipsets, provides the 8852bu mod"; homepage = "https://github.com/morrownr/rtl8852bu"; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/os-specific/linux/sd-switch/default.nix index b8dfd36d5919..f14595d655be 100644 --- a/pkgs/os-specific/linux/sd-switch/default.nix +++ b/pkgs/os-specific/linux/sd-switch/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromSourcehut, rustPlatform, nix-update-script }: -let version = "0.5.0"; +let version = "0.5.1"; in rustPlatform.buildRustPackage { pname = "sd-switch"; inherit version; @@ -9,10 +9,10 @@ in rustPlatform.buildRustPackage { owner = "~rycee"; repo = "sd-switch"; rev = version; - hash = "sha256-TESS+CwwEugAz+grzndunAoKF9Or/Jl7tftL392fUaM="; + hash = "sha256-Kns49Qv3oWNmbLoLTKIcWIewDz4cR7uyMA3IHnhKyxA="; }; - cargoHash = "sha256-QEnleFwEIoKATupj0sSV/GUztQoozEsb3SEgnfFzAfw="; + cargoHash = "sha256-r20dJMF+0q3XLm2hn9/LTv43ApmhjJNgeiMCLfwBnOk="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/os-specific/linux/system76-power/default.nix b/pkgs/os-specific/linux/system76-power/default.nix index 6a5456080f59..0dba9894d23e 100644 --- a/pkgs/os-specific/linux/system76-power/default.nix +++ b/pkgs/os-specific/linux/system76-power/default.nix @@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/system76-power"; license = licenses.gpl3Plus; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ maintainers.jwoudenberg ]; + maintainers = []; }; } diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 211e03637d4e..9f3d22c8a707 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchzip, qtbase, qtscxml, cmake, asciidoc -, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config +, docbook_xsl, json_c, mesa_glu, libglut, trace-cmd, pkg-config , libtraceevent, libtracefs, freefont_ttf, wrapQtAppsHook, qtwayland }: @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; - buildInputs = [ qtbase qtscxml qtwayland json_c mesa_glu freeglut libtraceevent libtracefs trace-cmd ]; + buildInputs = [ qtbase qtscxml qtwayland json_c mesa_glu libglut libtraceevent libtracefs trace-cmd ]; cmakeFlags = [ "-D_INSTALL_PREFIX=${placeholder "out"}" diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index ba2b243a9408..36cdaf84aab6 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , windows -, fetchurl , autoreconfHook , mingw_w64_headers }: diff --git a/pkgs/servers/alice-lg/default.nix b/pkgs/servers/alice-lg/default.nix index 28ef35a917a1..f478c1e4c83a 100644 --- a/pkgs/servers/alice-lg/default.nix +++ b/pkgs/servers/alice-lg/default.nix @@ -81,7 +81,7 @@ buildGoModule rec { description = "Looking-glass for BGP sessions"; changelog = "https://github.com/alice-lg/alice-lg/blob/main/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "alice-lg"; }; } diff --git a/pkgs/servers/apache-airflow/default.nix b/pkgs/servers/apache-airflow/default.nix index 735356f8b778..5021f66390ba 100644 --- a/pkgs/servers/apache-airflow/default.nix +++ b/pkgs/servers/apache-airflow/default.nix @@ -17,7 +17,6 @@ let }; nativeBuildInputs = with pySelf; [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "werkzeug" diff --git a/pkgs/servers/apache-airflow/python-package.nix b/pkgs/servers/apache-airflow/python-package.nix index 50d3aaa7fbb5..14c39ede5a85 100644 --- a/pkgs/servers/apache-airflow/python-package.nix +++ b/pkgs/servers/apache-airflow/python-package.nix @@ -61,7 +61,6 @@ , python-slugify , python3-openid , pythonOlder -, pythonRelaxDepsHook , pyyaml , rich , rich-argparse @@ -227,7 +226,6 @@ buildPythonPackage rec { buildInputs = [ airflow-frontend - pythonRelaxDepsHook ]; nativeCheckInputs = [ diff --git a/pkgs/servers/bililiverecorder/default.nix b/pkgs/servers/bililiverecorder/default.nix index 4d69c4631d5c..5a1dcf4f2e79 100644 --- a/pkgs/servers/bililiverecorder/default.nix +++ b/pkgs/servers/bililiverecorder/default.nix @@ -13,8 +13,8 @@ let aspnetcore_6_0 ]; - version = "2.11.1"; - hash = "sha256-GY6YRgebWeJtjAIm64Pf8wx6pUdZjbevNzKRdyPi1ow="; + version = "2.12.0"; + hash = "sha256-2usiJTGA2FcJ9HBs3RDiARfC2yv/UqBgmT+z5F5Y7w0="; in stdenv.mkDerivation { diff --git a/pkgs/servers/birdwatcher/default.nix b/pkgs/servers/birdwatcher/default.nix index 48ba580e1346..57840e526884 100644 --- a/pkgs/servers/birdwatcher/default.nix +++ b/pkgs/servers/birdwatcher/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { description = "Small HTTP server meant to provide an API defined by Barry O'Donovan's birds-eye to the BIRD internet routing daemon"; changelog = "https://github.com/alice-lg/birdwatcher/blob/master/CHANGELOG"; license = licenses.bsd3; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "birdwatcher"; }; } diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index 65379131afcc..b4e6b4758ab5 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dgraph"; - version = "23.1.1"; + version = "24.0.0"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "sha256-xmWFRqdGUk+9MKd9cQLquOmike3soNRgPwQ+F27MSAQ="; + sha256 = "sha256-vKn1dTP1SOQs9oCPw0R5956D6mR5UuW9GbqGilxeV3c="; }; - vendorHash = "sha256-YRfFRCCm25zS+tQer6UcrBBltOxA7+Iqi+Ejyrjdu/A="; + vendorHash = "sha256-/Wpnj99yHyEc7uPBo00k6lJawX5HqqVwEHavyH3luaY="; doCheck = false; diff --git a/pkgs/servers/dns/doh-proxy-rust/default.nix b/pkgs/servers/dns/doh-proxy-rust/default.nix index d59b048a181e..370388db89a2 100644 --- a/pkgs/servers/dns/doh-proxy-rust/default.nix +++ b/pkgs/servers/dns/doh-proxy-rust/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "doh-proxy-rust"; - version = "0.9.9"; + version = "0.9.11"; src = fetchCrate { inherit version; crateName = "doh-proxy"; - sha256 = "sha256-KvEayC+aY8aC5fSVIV9urNwLJcIfDMaAU+XdlGSmYRI="; + sha256 = "sha256-h2LwxqyyBPAXRr6XOmcLEmbet063kkM1ledULp3M2ek="; }; - cargoHash = "sha256-eoC90ht9cbMLkPN3S4jxZipbFoZDTU7pIr6GRagGlJE="; + cargoHash = "sha256-eXPAn2ziSdciZa6YrOIa7y7Lms681X+yVAD9HrvsZHg="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index f878ef6e64e9..dbeb93682551 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar"; - sha256 = "sha256-HAxZaZofO24baPTNFqSltNgZekjOLRuCprcAksTSYiY="; + sha256 = "sha256-7VpalDKa2Qr3HaIO5LcORvm5rAhgYQzStQkp7rs3pMQ="; }; # don't do anything? diff --git a/pkgs/servers/geospatial/geoserver/default.nix b/pkgs/servers/geospatial/geoserver/default.nix index 3ccdd5edc432..dca4c2af1ed9 100644 --- a/pkgs/servers/geospatial/geoserver/default.nix +++ b/pkgs/servers/geospatial/geoserver/default.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation (finalAttrs: rec { pname = "geoserver"; - version = "2.25.1"; + version = "2.25.2"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - sha256 = "sha256-6F99zHTVRpC64rIPxdrH0ujgoNGQfT53RJ7Rg80ieeA="; + sha256 = "sha256-tIXa1HECBTgJ1XiAo/hjo2AfbiyHyIsewfZu/k513iE="; }; patches = [ diff --git a/pkgs/servers/geospatial/geoserver/extensions.nix b/pkgs/servers/geospatial/geoserver/extensions.nix index d3e2da57ef6e..654f84416c17 100644 --- a/pkgs/servers/geospatial/geoserver/extensions.nix +++ b/pkgs/servers/geospatial/geoserver/extensions.nix @@ -29,325 +29,325 @@ in { app-schema = mkGeoserverExtension { name = "app-schema"; - version = "2.24.2"; # app-schema - hash = "sha256-nwZ+gZZ38nrKmIqe2Wjg8rkh9cq6TFaxjkwS/lw8720="; # app-schema + version = "2.25.2"; # app-schema + hash = "sha256-qOBS6IfuXbTT9YHucAGedVfJ5xsVDTYP+9NLY5qaDWU="; # app-schema }; authkey = mkGeoserverExtension { name = "authkey"; - version = "2.24.2"; # authkey - hash = "sha256-R2dL1xAw7PZTAp7asoulfOPWodRD7TnOu8mnSrwxL8I="; # authkey + version = "2.25.2"; # authkey + hash = "sha256-GJSD3ULjDkxp3Ex6RSrafN6BXvglEbq9zNZZnEZYgL0="; # authkey }; cas = mkGeoserverExtension { name = "cas"; - version = "2.24.2"; # cas - hash = "sha256-oTM+ipYuIefxVFUG7ifNE08GkYbuHkt83PtrOHRw40w="; # cas + version = "2.25.2"; # cas + hash = "sha256-vrYCPMVK9BQiGa7L25bzSGQuwA+kEf6BGS5Sv49N9bE="; # cas }; charts = mkGeoserverExtension { name = "charts"; - version = "2.24.2"; # charts - hash = "sha256-w9e8Ra0iuhtQ45De1T3wztis6ZLey5LuhpmCadbpCp4="; # charts + version = "2.25.2"; # charts + hash = "sha256-QXb3tzOabBejIGvys7DRj/zZPewcZjjJPCn99bvbpjM="; # charts }; control-flow = mkGeoserverExtension { name = "control-flow"; - version = "2.24.2"; # control-flow - hash = "sha256-XY9YwiMgEay/GhLt6IJQ0gdiVxA0abg/qrnYNW3wiO8="; # control-flow + version = "2.25.2"; # control-flow + hash = "sha256-JNOs103SMHzG2I46kXDKV3f6xfGpDhXpVY+jR4IDKFw="; # control-flow }; css = mkGeoserverExtension { name = "css"; - version = "2.24.2"; # css - hash = "sha256-GDoRcM8Nx3fZuWgzIHM1vSXLMaCJO3j7/cDmRl7BS2U="; # css + version = "2.25.2"; # css + hash = "sha256-lN1QfCCMVgVxVKmZRyQj6muFOCvoHHxNETOux8sZeMM="; # css }; csw = mkGeoserverExtension { name = "csw"; - version = "2.24.2"; # csw - hash = "sha256-Ir/ebw87DV1zSLJIN3sMEwMAqfD9rZ3oKvAM62BNWcE="; # csw + version = "2.25.2"; # csw + hash = "sha256-rpAVzit0DSjgopL//nK0feejTSfnoTIyaKLz6vpajrs="; # csw }; csw-iso = mkGeoserverExtension { name = "csw-iso"; - version = "2.24.2"; # csw-iso - hash = "sha256-j0rVy5JRwGTs+8esOpMPc79ICccwwtD47vOFsunZAkE="; # csw-iso + version = "2.25.2"; # csw-iso + hash = "sha256-nsieTEMrysZt9Jz3dWTvfCKh41DrkrJ1sTxk4Iv/kEY="; # csw-iso }; db2 = mkGeoserverExtension { name = "db2"; - version = "2.24.2"; # db2 - hash = "sha256-LKOAdKU+0TJdaxUbluXcxzgJw2fvhkqVjYs+d2c84uk="; # db2 + version = "2.25.2"; # db2 + hash = "sha256-9S1QafqRlCtM9N/mEehRbko5kNgjGe5BJen98ZcqOt8="; # db2 }; # Needs wps extension. dxf = mkGeoserverExtension { name = "dxf"; - version = "2.24.2"; # dxf - hash = "sha256-Et4nCPH6xUChfKRZ35u3/VduEQwCOKeKQXVZZcgJRWc="; # dxf + version = "2.25.2"; # dxf + hash = "sha256-FcXcJwEm1Z3M0OUuR1p/PGbvbQ0zf4v0ruL/765xD+E="; # dxf }; excel = mkGeoserverExtension { name = "excel"; - version = "2.24.2"; # excel - hash = "sha256-Nm4mayt8ofwpiRD5FDbsubrHIzfaOBW+Nv8wUVaIPws="; # excel + version = "2.25.2"; # excel + hash = "sha256-2QEG6u3luAgCFvC1GIQQX7KVNz7KSllx+XMiHUBzH3c="; # excel }; feature-pregeneralized = mkGeoserverExtension { name = "feature-pregeneralized"; - version = "2.24.2"; # feature-pregeneralized - hash = "sha256-56HA4L1Vfh5Q45lRhjsYfq816YYNkJLmovngF0+3Vbk="; # feature-pregeneralized + version = "2.25.2"; # feature-pregeneralized + hash = "sha256-ayOQ7ZJ0vBwMfJltPX+ajG9fpxDbn9a+s0W5gAJ2Na0="; # feature-pregeneralized }; # Note: The extension name ("gdal") clashes with pkgs.gdal. gdal = mkGeoserverExtension { name = "gdal"; - version = "2.24.2"; # gdal + version = "2.25.2"; # gdal buildInputs = [ pkgs.gdal ]; - hash = "sha256-KLIlEUmYUIXAikW+y3iQzGZPpW0N+9FuPTst23Nf9Y4="; # gdal + hash = "sha256-CUKqgc/kiNh/kMrvBXiVHrko4MiMexvY7W48NNXXooU="; # gdal }; # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box. #geofence = mkGeoserverExtension { # name = "geofence"; - # version = "2.24.2"; # geofence - # hash = "sha256-5MRUKiC23/XlFr7X4zpsAoDR4JGtZujFnUmtcRlG+9w="; # geofence + # version = "2.25.2"; # geofence + # hash = "sha256-HtbLj5hiqjIJU3IIbcvCQgxlan8PLn/xW+0U2FMBrwE="; # geofence #}; #geofence-server = mkGeoserverExtension { # name = "geofence-server"; - # version = "2.24.2"; # geofence-server - # hash = "sha256-MyDQSb7IZ8cTpO9+rV0PdZNHRvIDIr04+HNhyMpx81I="; # geofence-server + # version = "2.25.2"; # geofence-server + # hash = "sha256-o8+9ePnCuWjB0u9QcgJ2sYSMb0+XslROJEZdDJPXg3k="; # geofence-server #}; #geofence-wps = mkGeoserverExtension { # name = "geofence-wps"; - # version = "2.24.2"; # geofence-wps - # hash = "sha256-uLii8U3UAiF/MQjABBAfHbnXTlf+iYsEOy4kadqc6+k="; # geofence-wps + # version = "2.25.2"; # geofence-wps + # hash = "sha256-3VsSgE9crmnbMP9njAlZTMZ8hyBRm5JXTLjSET53lco="; # geofence-wps #}; geopkg-output = mkGeoserverExtension { name = "geopkg-output"; - version = "2.24.2"; # geopkg-output - hash = "sha256-NzsozGYoGOoekX+wY0d5d8I0JefHgSDb/HuEPzwX+YE="; # geopkg-output + version = "2.25.2"; # geopkg-output + hash = "sha256-P8DllJYIEIGnzzJeGx+hWpik5Tpo6m+7Ip6QRTZ9Qcs="; # geopkg-output }; grib = mkGeoserverExtension { name = "grib"; - version = "2.24.2"; # grib - hash = "sha256-9i+aqQM4GnRXfIjg2R2/NkkQAF9YxNRfbMp7mGO4BgE="; # grib + version = "2.25.2"; # grib + hash = "sha256-MByVrJB6WCxiY4/Ljpfx93Lg01/iixgsnp47C0/LmtE="; # grib buildInputs = [ netcdf ]; }; gwc-s3 = mkGeoserverExtension { name = "gwc-s3"; - version = "2.24.2"; # gwc-s3 - hash = "sha256-fesKzbSnNHxgjwuXghLBJhUkvM2HeCOZY9V0AAiZVWk="; # gwc-s3 + version = "2.25.2"; # gwc-s3 + hash = "sha256-I38JVvWTc+ernyyIcYAa7vLK4LNbdNihab3wveCyoLM="; # gwc-s3 }; h2 = mkGeoserverExtension { name = "h2"; - version = "2.24.2"; # h2 - hash = "sha256-cMPdNh7Bp7aiAAiuB5E8dDWCuUkd89xQXJbvoYN5Oyk="; # h2 + version = "2.25.2"; # h2 + hash = "sha256-Pn3XNTnFn1HQa4V+9FGp4xRWYOKYo7F9TqnPKs7JeNI="; # h2 }; iau = mkGeoserverExtension { name = "iau"; - version = "2.24.2"; # iau - hash = "sha256-yIqw1ur2e3haPMXGOFgFdNLguzhMMytcg9aweaBFq5U="; # iau + version = "2.25.2"; # iau + hash = "sha256-4PD5DsJgoXfOQ5lf4okx1dW4zRiHSi8geGrqH4axWew="; # iau }; importer = mkGeoserverExtension { name = "importer"; - version = "2.24.2"; # importer - hash = "sha256-/u5m4ljr7kEnRl9sOuYcS8913uPzJjDCXmRiWh7YS2c="; # importer + version = "2.25.2"; # importer + hash = "sha256-o5BHWMu4C7O8VTZWo7LPTtGR47d0opLTf+dQMxTVZzk="; # importer }; inspire = mkGeoserverExtension { name = "inspire"; - version = "2.24.2"; # inspire - hash = "sha256-3N1LUEu2q3Vy2verkJd9Fiem8V9W0KvsnSTwooO0M6E="; # inspire + version = "2.25.2"; # inspire + hash = "sha256-iQlpq5ZP3Gz9UGXH1hSW7S5Zv1mZHqieTACUX0dP3Vs="; # inspire }; # Needs Kakadu plugin from # https://github.com/geosolutions-it/imageio-ext #jp2k = mkGeoserverExtension { # name = "jp2k"; - # version = "2.24.2"; # jp2k - # hash = "sha256-ZjPDCMzaXegrzmbI9vwjTt0Osbjjl/31sffU65PPJ3k="; # jp2k + # version = "2.25.2"; # jp2k + # hash = "sha256-0Sh0eM0ZWyCL34IOir7j3gYwyUU7y3+zhIV5y+BJ1NA="; # jp2k #}; libjpeg-turbo = mkGeoserverExtension { name = "libjpeg-turbo"; - version = "2.24.2"; # libjpeg-turbo - hash = "sha256-aPKXE8STYG0h5OtxrOoTvXagUCBmb7nmEV8ckLRq6GM="; # libjpeg-turbo + version = "2.25.2"; # libjpeg-turbo + hash = "sha256-hXjF7uifk8Tp3z2qLhymQOwIJ8Ml4FN5Qd4s1NP3TPk="; # libjpeg-turbo buildInputs = [ libjpeg.out ]; }; mapml = mkGeoserverExtension { name = "mapml"; - version = "2.24.2"; # mapml - hash = "sha256-vjNoLZEM2CMmxL2JPO0r9PColReWmFdVjMkDxbyrSGg="; # mapml + version = "2.25.2"; # mapml + hash = "sha256-fx8EpGg6ZeuGLuh+PLRNSWgH74MEnIvB4rXw6GVS+60="; # mapml }; mbstyle = mkGeoserverExtension { name = "mbstyle"; - version = "2.24.2"; # mbstyle - hash = "sha256-zvfoAoVT8hXUETn/GkceP8vLSA8iNUXivXjQUyIJDEs="; # mbstyle + version = "2.25.2"; # mbstyle + hash = "sha256-uQw7wdkZP+1XUjombMxLnZ61DSl8NHyGoEuFy7biDlM="; # mbstyle }; metadata = mkGeoserverExtension { name = "metadata"; - version = "2.24.2"; # metadata - hash = "sha256-A6Gai/ExL9FSUQOuUwxqpRcaVtn4H1VwBaAKXMNm6Fg="; # metadata + version = "2.25.2"; # metadata + hash = "sha256-3TWMLToHwXn15T1d4v9U76WRjjIJhX12It5DPfuWdLY="; # metadata }; mongodb = mkGeoserverExtension { name = "mongodb"; - version = "2.24.2"; # mongodb - hash = "sha256-R9dp/uOIX7KBp4c2676NXQupqoRahxKkufjCr6sQaA0="; # mongodb + version = "2.25.2"; # mongodb + hash = "sha256-Y/myutomkhAMPDjoGrsqEdsHjzI98+514vcKDIJPA2M="; # mongodb }; monitor = mkGeoserverExtension { name = "monitor"; - version = "2.24.2"; # monitor - hash = "sha256-IB9/4755ePtL/CWIOd28dOyBG6cmddQnhZKVQMQFeIE="; # monitor + version = "2.25.2"; # monitor + hash = "sha256-elDVdUT8DdxWGesF9MX+FSYs6thf3RHoUFJJvxGmb/A="; # monitor }; mysql = mkGeoserverExtension { name = "mysql"; - version = "2.24.2"; # mysql - hash = "sha256-8y3N7+KgA9R5JIw1YuHmTmzK6H2c56469KUTrRpqP4g="; # mysql + version = "2.25.2"; # mysql + hash = "sha256-mers+ULFC1RSvC2aCs3qbcfmHbkLddriUaDr9wfJ/YA="; # mysql }; netcdf = mkGeoserverExtension { name = "netcdf"; - version = "2.24.2"; # netcdf - hash = "sha256-uAhJTCKn/00zDUGtgyYd1v8KxXj1N+vAAosBjQG3rBk="; # netcdf + version = "2.25.2"; # netcdf + hash = "sha256-OJVqwGIhecDwmtmAaJcXbqlwCIASja5sUxBiPoXkrB0="; # netcdf buildInputs = [ netcdf ]; }; netcdf-out = mkGeoserverExtension { name = "netcdf-out"; - version = "2.24.2"; # netcdf-out - hash = "sha256-wMFx+BnEcLy1x9j0K+du7hG9wC+EzA4E4AVjIsyXO3A="; # netcdf-out + version = "2.25.2"; # netcdf-out + hash = "sha256-0Ym8oVA1wDFqQGaf0VspTX2tCTdI0yTsp7CAmenBL/8="; # netcdf-out buildInputs = [ netcdf ]; }; ogr-wfs = mkGeoserverExtension { name = "ogr-wfs"; - version = "2.24.2"; # ogr-wfs + version = "2.25.2"; # ogr-wfs buildInputs = [ pkgs.gdal ]; - hash = "sha256-jMnc0OnrKHFegEIPtyAG92fC8cLa/X1UUdTmeDyUxSI="; # ogr-wfs + hash = "sha256-enrc+zGq2brreqQMbCjcnImf7aTZbLbuolK3/y1Icck="; # ogr-wfs }; # Needs ogr-wfs extension. ogr-wps = mkGeoserverExtension { name = "ogr-wps"; - version = "2.24.2"; # ogr-wps + version = "2.25.2"; # ogr-wps # buildInputs = [ pkgs.gdal ]; - hash = "sha256-O0MKOCEV5AjYUg4LL0UAV0KBHg1alOK7WEdEyikqpTs="; # ogr-wps + hash = "sha256-TCvydQYdtnqH/xudzBOyrvxqFqWke7B4At1f6L7UHO4="; # ogr-wps }; oracle = mkGeoserverExtension { name = "oracle"; - version = "2.24.2"; # oracle - hash = "sha256-OIvwpGt/9jtKAeP7LK/hTZDVbKQnjVGTXDy5q/zVU2k="; # oracle + version = "2.25.2"; # oracle + hash = "sha256-1KixJvCpeNc5lN+XSx+FC8D71WcnkO6mG3wYWH3w0c4="; # oracle }; params-extractor = mkGeoserverExtension { name = "params-extractor"; - version = "2.24.2"; # params-extractor - hash = "sha256-z6hMGCHB0I3DS05NvdSmVMfPKNA/1jhx8Mmb6odL6RU="; # params-extractor + version = "2.25.2"; # params-extractor + hash = "sha256-MzdJEvHOesJJnLs4fmWFgLjbjUBlc85tvWoHYv0gdjE="; # params-extractor }; printing = mkGeoserverExtension { name = "printing"; - version = "2.24.2"; # printing - hash = "sha256-nDkT9x6Va5SNSf8x7OEu7NqQ6qFSJhPavg6eUo5D4HA="; # printing + version = "2.25.2"; # printing + hash = "sha256-JwyJYGIcZOaSvkFbJu9TAKVfwu3XwZP7dzewYx5HSsc="; # printing }; pyramid = mkGeoserverExtension { name = "pyramid"; - version = "2.24.2"; # pyramid - hash = "sha256-HM2ItB34+CHNzhoH3X3Kh1iVNMb+AimvdHrgHHh5SJc="; # pyramid + version = "2.25.2"; # pyramid + hash = "sha256-2LEat5BZgWFQmE68vxirXH+DIUEdVsTf6Ec8F+/6DA8="; # pyramid }; querylayer = mkGeoserverExtension { name = "querylayer"; - version = "2.24.2"; # querylayer - hash = "sha256-7WtAsisMJBpRZqU0nfr4orp36uBmnvat2+DlbnGCjVg="; # querylayer + version = "2.25.2"; # querylayer + hash = "sha256-VnvfntM3SvMKxAk25Gj3iKqsYSKhLfh+PyyoANqwfq8="; # querylayer }; sldservice = mkGeoserverExtension { name = "sldservice"; - version = "2.24.2"; # sldservice - hash = "sha256-m3QJP/u6HZmO0p8d++8EKXXxtkbMDmBFFCzBPctPV5A="; # sldservice + version = "2.25.2"; # sldservice + hash = "sha256-lzOs7MrmAqoJlCK+HxiKAOdlCHuqXa5DU9tilF6cZoo="; # sldservice }; sqlserver = mkGeoserverExtension { name = "sqlserver"; - version = "2.24.2"; # sqlserver - hash = "sha256-ZwsO1Yxb3OWCLtYI30l3jnMrAbPI7v0XTGcasJPN1Y8="; # sqlserver + version = "2.25.2"; # sqlserver + hash = "sha256-EZTcoNfp1iGCBNW3YR4NZpeI+tStcodGE5wQiWfFzno="; # sqlserver }; vectortiles = mkGeoserverExtension { name = "vectortiles"; - version = "2.24.2"; # vectortiles - hash = "sha256-fQ9qSIHplxt57n45w4MN4e5AFdU8nmtvQ/vTeL/cdzQ="; # vectortiles + version = "2.25.2"; # vectortiles + hash = "sha256-+o8qliiCnRljCXniI+9I7ooU/l1SLEPF9iDtxviKfqY="; # vectortiles }; wcs2_0-eo = mkGeoserverExtension { name = "wcs2_0-eo"; - version = "2.24.2"; # wcs2_0-eo - hash = "sha256-q0cXVjOBmX4vYwzf+3LjsYf9rPAIeCxnOZZadfNlLF0="; # wcs2_0-eo + version = "2.25.2"; # wcs2_0-eo + hash = "sha256-L9jKxivUtwA9Jgfy3E1rQD0+19PrvHxwklDJkAYFRT0="; # wcs2_0-eo }; web-resource = mkGeoserverExtension { name = "web-resource"; - version = "2.24.2"; # web-resource - hash = "sha256-v/SnNV6JnWPoYUSFowXFDDuhjZC8b1iPtDeMG8mWqG4="; # web-resource + version = "2.25.2"; # web-resource + hash = "sha256-KikKMMZ6vv/qWwn0TCQcNR18MbrJibweu+yvUhQt7vQ="; # web-resource }; wmts-multi-dimensional = mkGeoserverExtension { name = "wmts-multi-dimensional"; - version = "2.24.2"; # wmts-multi-dimensional - hash = "sha256-ASSGBqTpq9Tk1R3oBTBoi6L1tsXIJpJyez3LXBPmjd8="; # wmts-multi-dimensional + version = "2.25.2"; # wmts-multi-dimensional + hash = "sha256-J+buneos9vdfA8t9NS0IKo57ItorBN1IOmJvNHO/Qy0="; # wmts-multi-dimensional }; wps = mkGeoserverExtension { name = "wps"; - version = "2.24.2"; # wps - hash = "sha256-KJa0yWqO/qyY59U9NMK5/V4EskIqEbe9XnSvGRvODHU="; # wps + version = "2.25.2"; # wps + hash = "sha256-EqMx1aI/GR0nFvEMmo6RLXBZu8jJe+u2v+Muzf+ye9Q="; # wps }; # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not # available in nixpgs as of 2024/01. #wps-cluster-hazelcast = mkGeoserverExtension { # name = "wps-cluster-hazelcast"; - # version = "2.24.2"; # wps-cluster-hazelcast - # hash = "sha256-PQcX3AVJy3DluAL4b5vcWvLl0fYLBq+F8cKsvJ/WOyE="; # wps-cluster-hazelcast + # version = "2.25.2"; # wps-cluster-hazelcast + # hash = "sha256-58BmwzdX3jGJHqvAjZjhIE5LxcLRZaUaeHmPrnN1PP8="; # wps-cluster-hazelcast #}; wps-download = mkGeoserverExtension { name = "wps-download"; - version = "2.24.2"; # wps-download - hash = "sha256-cjVbQ1R2uit/29axZsu88ZiMuwY7mmR5x8XNb9qX8aM="; # wps-download + version = "2.25.2"; # wps-download + hash = "sha256-qcqw875SIzsjXMJFMwIm9et6Vo0G0qg6zrZlgml8Ql8="; # wps-download }; # Needs Postrgres configuration or similar. # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html wps-jdbc = mkGeoserverExtension { name = "wps-jdbc"; - version = "2.24.2"; # wps-jdbc - hash = "sha256-dJUnh8HZmlu5aqVeFxyR3A8fbXYqbgIqPxIENq4rhfs="; # wps-jdbc + version = "2.25.2"; # wps-jdbc + hash = "sha256-MsR5/yeDbBgValx4gm9v8JNdFQnGBTdwy5nkOyUXTAs="; # wps-jdbc }; ysld = mkGeoserverExtension { name = "ysld"; - version = "2.24.2"; # ysld - hash = "sha256-GLUioofwqoGUw7JQeEhzBG1SRwGUzwqjKvhkOt4TUVw="; # ysld + version = "2.25.2"; # ysld + hash = "sha256-H8BfsRk6zk0kX94YY9yU8FeebTzjA8zagnVWU7Sr9/Q="; # ysld }; } diff --git a/pkgs/servers/go-libp2p-daemon/default.nix b/pkgs/servers/go-libp2p-daemon/default.nix index 1ae7428aa19d..cca514fcca39 100644 --- a/pkgs/servers/go-libp2p-daemon/default.nix +++ b/pkgs/servers/go-libp2p-daemon/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-libp2p-daemon"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "libp2p"; repo = "go-libp2p-daemon"; rev = "v${version}"; - hash = "sha256-xKipt+nh7hFJHb9EmI0JZjBTuewfs82vOk1FC97sbAw="; + hash = "sha256-UIiP6Tb0ys1slB4YQ2m7KlrHIZDfUaKs4RAyuxWBhhw="; }; vendorHash = "sha256-60+JcyVV0uW+T0JZ/keyeYJNWrR3BhLInIgwbpoAe/Q="; @@ -16,9 +16,6 @@ buildGoModule rec { doCheck = false; meta = with lib; { - # Won't build with Go >1.20 because of outdated quic-go dependency and interface mismatches on update. - # https://github.com/libp2p/go-libp2p-daemon/issues/291 - broken = true; description = "Libp2p-backed daemon wrapping the functionalities of go-libp2p for use in other languages"; homepage = "https://github.com/libp2p/go-libp2p-daemon"; license = licenses.mit; diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index ac4d0c066783..ab1668ccfb92 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch # nativeBuildInputs , scons @@ -75,6 +76,12 @@ stdenv.mkDerivation rec { patches = [ ./sconstruct-env-fixes.patch + + # fix build with Python 3.12 + (fetchpatch { + url = "https://gitlab.com/gpsd/gpsd/-/commit/9157b1282d392b2cc220bafa44b656d6dac311df.patch"; + hash = "sha256-kFMn4HgidQvHwHfcSNH/0g6i1mgvEnZfvAUDPU4gljg="; + }) ]; preBuild = '' diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index a143dd990e08..a083075711b8 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -14,7 +14,7 @@ maven.buildMavenPackage rec { }; mvnParameters = "-f h2/pom.xml"; - mvnHash = "sha256-hUzE4F+RNCAfoY836pjrivf04xqN4m9SkiLXhmVzZRA="; + mvnHash = "sha256-kWRwaHb9+O07/jq8tgQnYpJa6zFsAMBCEnhT7HNKM4s="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/holochain-go/deps.nix b/pkgs/servers/holochain-go/deps.nix deleted file mode 100644 index bad01c01a6bd..000000000000 --- a/pkgs/servers/holochain-go/deps.nix +++ /dev/null @@ -1,1056 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; - sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; - }; - } - { - goPackagePath = "github.com/agl/ed25519"; - fetch = { - type = "git"; - url = "https://github.com/agl/ed25519"; - rev = "5312a61534124124185d41f09206b9fef1d88403"; - sha256 = "1v8mhkf1m3ga5262s75vabskxvsw5rpqvi5nwhxwiv7gfk6h823i"; - }; - } - { - goPackagePath = "github.com/btcsuite/btcd"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btcd"; - rev = "675abc5df3c5531bc741b56a765e35623459da6d"; - sha256 = "1sg7dmns8smsfcjpn9dnqapzf4b6r1vrp62j753izmbmc55rjm0f"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "e214231b295a8ea9479f11b70b35d5acf3556d9b"; - sha256 = "0770h1mpig2j5sbiha3abnwaw8p6dg9i87r8pc7cf6m4kwml3sc9"; - }; - } - { - goPackagePath = "github.com/docker/spdystream"; - fetch = { - type = "git"; - url = "https://github.com/docker/spdystream"; - rev = "bc6354cbbc295e925e4c611ffe90c1f287ee54db"; - sha256 = "08746a15snvmax6cnzn2qy7cvsspxbsx97vdbjpdadir3pypjxya"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "507f6050b8568533fb3f5504de8e5205fa62a114"; - sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7"; - }; - } - { - goPackagePath = "github.com/fd/go-nat"; - fetch = { - type = "git"; - url = "https://github.com/fd/go-nat"; - rev = "dcaf50131e4810440bed2cbb6f7f32c4f4cc95dd"; - sha256 = "094aqkjv9qfmy1k8xrg7cl4njbvamm51fdilay9c75wcax9p41jv"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "e9ed3c6dfb39bb1a32197cb10d527906fe4da4b6"; - sha256 = "07cf0j3wbsl1gmn175mdgljcarfz4xbqd6pgc7b08a5lcn7zwhjz"; - }; - } - { - goPackagePath = "github.com/glycerine/blake2b"; - fetch = { - type = "git"; - url = "https://github.com/glycerine/blake2b"; - rev = "3c8c640cd7bea3ca78209d812b5854442ab92fed"; - sha256 = "1hw0y15yf4fhjkfgh8jnk257chhmpzyppgnnck9aijhkvk41rply"; - }; - } - { - goPackagePath = "github.com/glycerine/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/glycerine/goconvey"; - rev = "83515ca83cca5aef8af8eab6eb7368f8e7500976"; - sha256 = "1n9drlng7pbyqfxyfa14vik8vd3vj4m2b7v73410fxll36djj4s8"; - }; - } - { - goPackagePath = "github.com/glycerine/greenpack"; - fetch = { - type = "git"; - url = "https://github.com/glycerine/greenpack"; - rev = "3f7f38f101dc36e64a4176ded8443684516d76c2"; - sha256 = "0w468v8zpsmgml1bgr51rzfvcymlfpdzy091wid67i1z25gwyik0"; - }; - } - { - goPackagePath = "github.com/glycerine/liner"; - fetch = { - type = "git"; - url = "https://github.com/glycerine/liner"; - rev = "72909af234e0e355af10d0ace679446a6c5d7ec3"; - sha256 = "118dig6vg1pz5jq2w1kyq0102rvgq676z8zsdyi13ynw8phlpcnc"; - }; - } - { - goPackagePath = "github.com/glycerine/zebrapack"; - fetch = { - type = "git"; - url = "https://github.com/glycerine/zebrapack"; - rev = "7858d9b3e1a2ca613b770bb4cdce84ad04cefbbb"; - sha256 = "0wgk719q428q415628hw2glj9divw172iqnrn02hkgiwfnv005rp"; - }; - } - { - goPackagePath = "github.com/glycerine/tmframe"; - fetch = { - type = "git"; - url = "https://github.com/glycerine/tmframe"; - rev = "092b9413cc9ce8cb9fffadbfbf9038bb0bad5418"; - sha256 = "19h9hq53g8wf12h15w07qlz7035x3k2z3zs6bj1dzm68xca26lcn"; - }; - } - { - goPackagePath = "github.com/glycerine/zygomys"; - fetch = { - type = "git"; - url = "https://github.com/glycerine/zygomys"; - rev = "22c88044c7c2a3f845b8bbd1df6d990e8ee4f29c"; - sha256 = "1psbx4p022c19bq58bf9fs0mlm7mqavpbggsdkw7wqga0yn1vp18"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "1ef32a8b9fc3f8ec940126907cedb5998f6318e4"; - sha256 = "0zk2n0n35ksskr5cd83k5k8wg21ckrcggjy88bym2s21ngj5w4fh"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "dec09d789f3dba190787f8b4454c7d3c936fed9e"; - sha256 = "1hc4w67p6zkh2qk7wm1yrl69jjrjjk615mly5ll4iidn1m4mzi4i"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785"; - sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy"; - }; - } - { - goPackagePath = "github.com/gxed/hashland"; - fetch = { - type = "git"; - url = "https://github.com/gxed/hashland"; - rev = "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8"; - sha256 = "1q23y4lacsz46k9gmgfw4iwwydw36j2601rbidmmswl94grpc386"; - }; - } - { - goPackagePath = "github.com/gxed/eventfd"; - fetch = { - type = "git"; - url = "https://github.com/gxed/eventfd"; - rev = "80a92cca79a8041496ccc9dd773fcb52a57ec6f9"; - sha256 = "1p15rsimkcp2flj6wb41flac72zhf97zd8jxrahsw05nyfbp58z5"; - }; - } - { - goPackagePath = "github.com/gxed/GoEndian"; - fetch = { - type = "git"; - url = "https://github.com/gxed/GoEndian"; - rev = "0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7"; - sha256 = "0fn28h9gs1finrpfs388a3ycavlcf3qylsn803cflmrwaj5piqia"; - }; - } - { - goPackagePath = "github.com/huin/goupnp"; - fetch = { - type = "git"; - url = "https://github.com/huin/goupnp"; - rev = "1395d1447324cbea88d249fbfcfd70ea878fdfca"; - sha256 = "03fp94757vzclkv5khmydhvcm2gjhxgd0mi8q7wqksy9l93ixgl4"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-util"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-util"; - rev = "9ed527918c2f20abdf0adfab0553cd87db34f656"; - sha256 = "03lq5378p31c6ghfa20vwa7b1vgd96ypc9dmwp1p62bddz6apci6"; - }; - } - { - goPackagePath = "github.com/ipfs/go-log"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-log"; - rev = "0ef81702b797a2ecef05f45dcc82b15298f54355"; - sha256 = "0q375wbh014hca8n6g3z2x875f5m9cads75chs0sqlhr5rfgncal"; - }; - } - { - goPackagePath = "github.com/ipfs/go-todocounter"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-todocounter"; - rev = "1e832b829506383050e6eebd12e05ea41a451532"; - sha256 = "0cydbwivwp2k3x63rl6crhiw3svglc184saxyjrahvp7rv6cqdbq"; - }; - } - { - goPackagePath = "github.com/jackpal/gateway"; - fetch = { - type = "git"; - url = "https://github.com/jackpal/gateway"; - rev = "cbcf4e3f3baee7952fc386c8b2534af4d267c875"; - sha256 = "1ird5xmizj632l3dq24s2xgb8w1dn6v8xznlqz252gvngyr2gjl1"; - }; - } - { - goPackagePath = "github.com/jackpal/go-nat-pmp"; - fetch = { - type = "git"; - url = "https://github.com/jackpal/go-nat-pmp"; - rev = "28a68d0c24adce1da43f8df6a57340909ecd7fdd"; - sha256 = "17l8vh4g1akhgm7hbw5n9k2hdphlsvm5vwdc8z3mzlxjmdww5z70"; - }; - } - { - goPackagePath = "github.com/jbenet/go-base58"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-base58"; - rev = "6237cf65f3a6f7111cd8a42be3590df99a66bc7d"; - sha256 = "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf"; - }; - } - { - goPackagePath = "github.com/jbenet/go-temp-err-catcher"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-temp-err-catcher"; - rev = "aac704a3f4f27190b4ccc05f303a4931fd1241ff"; - sha256 = "1fyqkcggnrzwxa8iii15g60w2jikdm26sr7l36km7y0nc2kvf7jc"; - }; - } - { - goPackagePath = "github.com/jbenet/goprocess"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/goprocess"; - rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b"; - sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "77f18212c9c7edc9bd6a33d383a7b545ce62f064"; - sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h"; - }; - } - { - goPackagePath = "github.com/lestrrat/go-jspointer"; - fetch = { - type = "git"; - url = "https://github.com/lestrrat/go-jspointer"; - rev = "d5f7c71bfd03c8e9489a636874cd106c22d3a47c"; - sha256 = "10b94qdnvla9ax8b3djzwqz35gvqcvqrcafhqn0r4lay6y2i3241"; - }; - } - { - goPackagePath = "github.com/lestrrat/go-jsref"; - fetch = { - type = "git"; - url = "https://github.com/lestrrat/go-jsref"; - rev = "50df7b2d07d799426a9ac43fa24bdb4785f72a54"; - sha256 = "16mz2mm1ggvdighglmf48qkir070gig64cf26vmiwfq3z5w47s7p"; - }; - } - { - goPackagePath = "github.com/lestrrat/go-jsschema"; - fetch = { - type = "git"; - url = "https://github.com/lestrrat/go-jsschema"; - rev = "a6a42341b50d8d7e2a733db922eefaa756321021"; - sha256 = "0cyz9pzw53haabpxhxsqp1gb9z742gs6l6dp45skag6abdwgpi13"; - }; - } - { - goPackagePath = "github.com/lestrrat/go-jsval"; - fetch = { - type = "git"; - url = "https://github.com/lestrrat/go-jsval"; - rev = "cf70aae60f5b41a32922066c41287b0168e55904"; - sha256 = "06ba6rh9f0nwqsam3bvmazcv6y8zma6njljbhjswjamylsfhclcs"; - }; - } - { - goPackagePath = "github.com/lestrrat/go-pdebug"; - fetch = { - type = "git"; - url = "https://github.com/lestrrat/go-pdebug"; - rev = "569c97477ae8837e053e5a50bc739e15172b8ebe"; - sha256 = "0r56ppr6l6z3gcbxyyr3kiiw07a9gr3qxr26w8sbiq1np3zzpmzw"; - }; - } - { - goPackagePath = "github.com/lestrrat/go-structinfo"; - fetch = { - type = "git"; - url = "https://github.com/lestrrat/go-structinfo"; - rev = "8204d40bbcd79eb7603cd4c2c998e60eb2479ded"; - sha256 = "0p52xp2x4zyv91k820pnarz8xidgil8191cwfr1rasp8z07a9d3j"; - }; - } - { - goPackagePath = "github.com/libp2p/go-addr-util"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-addr-util"; - rev = "3bd34419494fb7f15182ddd19a5d92ac017a27c6"; - sha256 = "11f0g9zd4barbdqplmflxbm3yp2plby5qbsk66zbad3xd28kllc0"; - }; - } - { - goPackagePath = "github.com/libp2p/go-flow-metrics"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-flow-metrics"; - rev = "3b3bcfcf78f2dc0e85be13ef3c3adc64cc5a9347"; - sha256 = "06kgn72bmvljigycgdbw2nywss3g3r0ysfcw4k48938akxydgc6d"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-circuit"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-circuit"; - rev = "772fa57b88017ff6bce887a8d1486b228cacf488"; - sha256 = "03jl9b2g6z82pgkiqanvhlm3wyddp9x07b31h72r79g40lw6j7kz"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-conn"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-conn"; - rev = "5c445d258745408186410e0ad5128224b00e47fe"; - sha256 = "01a8hnkpxg73v48i2gbr3y8fs6881h5g965nak4bn05iy6jn1cr8"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-crypto"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-crypto"; - rev = "18915b5467c77ad8c07a35328c2cab468667a4e8"; - sha256 = "00pgxh53g60ij18mb2l5g8id9c46sw4pfsaw3cprv5mqacc1dlfg"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-host"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-host"; - rev = "acf01b322989cf731f66ce70b1ed7c41fe007798"; - sha256 = "0gxqyw6azsp65yam6f667gdidwdfzlxri8xb7iwyqp58y9973i9c"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-interface-conn"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-interface-conn"; - rev = "47718f905cc3ccd621b65fc106c521555c4040d3"; - sha256 = "1ykd46mdqjy9yj2i4srx6m0f5jwaw2f5pm4pfdcrq4wh30r0xg3j"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-interface-connmgr"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-interface-connmgr"; - rev = "d00fbee4d35c7b5fdbd12499f673a236c6303865"; - sha256 = "1ynmn8p0d145mbykr375lqzxl4h0gdcxdiz3bxfxnwxcl5x73pah"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-interface-pnet"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-interface-pnet"; - rev = "c6acc383ec0b7b98112971df590d6702885ca821"; - sha256 = "1micl8nvk29sac9zhvzxb0mgadp83kz725jbl4hs3a9a0ar9gxln"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-loggables"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-loggables"; - rev = "3a7ad4dd32462b4d9c07a85021e0f5e1110debb2"; - sha256 = "12h5lxxwnh5b8ch8q7fk6nky4fx5ajhf83bjxm0cdapv85y3cjz2"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-metrics"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-metrics"; - rev = "2b4a2757a26649c9a603519647cc9d4478ade5c6"; - sha256 = "1d2rfvkmaccajbljb7p1dwscf422la0qy1xl7h5d9ks4pk5pgcxr"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-nat"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-nat"; - rev = "d090f00e553d1b6582e1ec829608a8a9bbf262e1"; - sha256 = "1j6m3rs80zizgd6sy0rclfa95k7i9dxa6yfy6ca52lfqmwhh9ghk"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-net"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-net"; - rev = "70a8d93f2d8c33b5c1a5f6cc4d2aea21663a264c"; - sha256 = "04l67xnghr4bbgpdi5fw570zb6nl4k2nj0jpl6hmwbw0jhdd9hkn"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-peer"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-peer"; - rev = "aa0e03e559bde9d4749ad8e38595e15a6fe808fa"; - sha256 = "1rmfsnwaij3klby30aqgvx85hk5swhp5dlxg1z255z6r4mmvvdwk"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-peerstore"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-peerstore"; - rev = "7ac092e7f77f5bda1cb6e4ef95efbe911e97db41"; - sha256 = "1kmj3dwnvkl08hb8j3zfispl2q582p5b5v76hk5yn46drs7da276"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-protocol"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-protocol"; - rev = "b29f3d97e3a2fb8b29c5d04290e6cb5c5018004b"; - sha256 = "1xgjfnx9zcqglg9li29wdqywsp8hz22wx6phns9zscni2jsfidld"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-secio"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-secio"; - rev = "146b7055645501f741c5644d4a3d207614f08899"; - sha256 = "1df5f2r7wc34l6nycc1f4ni06cd2hhjncjyvzzw4vnmlqsncrx1w"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-swarm"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-swarm"; - rev = "48d6d0ff2d2a4724f6b47f1ed5ffc0ae63e30460"; - sha256 = "1z595f71p1i89fhc5qc63mcgnfiy0p1gyda77p6jmzxyzgzwvlmz"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-transport"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-transport"; - rev = "49533464477a869fee537c8cc3fcee286aa8bdcd"; - sha256 = "0dj0rzrykjmhnhpn8ac5696zvql8rq0amw87bj62qn4hpi7ri64h"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p"; - rev = "3b8f2275a2b24de5777aaa4fc77f1af57c5c4387"; - sha256 = "0jyk4zvhipknnwn1w3i11lsrzybh30p190xrkj7zgh5whz2rdqj1"; - }; - } - { - goPackagePath = "github.com/libp2p/go-maddr-filter"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-maddr-filter"; - rev = "3c9947befbb92277cc5f85057d387097debc4139"; - sha256 = "022xmvv6djpycbcaw4hhxhbspl2g72yjla218j08xp8l0gp6w0hq"; - }; - } - { - goPackagePath = "github.com/libp2p/go-msgio"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-msgio"; - rev = "d82125c9907e1365775356505f14277d47dfd4d6"; - sha256 = "0jawhcr6hm9apmdbl09s12mmqzwnphzn8k6wqwxfbmhs7gg2s1wq"; - }; - } - { - goPackagePath = "github.com/libp2p/go-peerstream"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-peerstream"; - rev = "2679b7430e519fc39f9cfbb0c7b7d016705b4ce1"; - sha256 = "10rxbn21hp7c8x1hzc770hnh9zgcz13dn9mjd94fg2yxkf7fq6mn"; - }; - } - { - goPackagePath = "github.com/libp2p/go-reuseport"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-reuseport"; - rev = "15a1cd37f0502f3b2eccb6d71a7958edda314633"; - sha256 = "1pcy6qpz804apsgxmh8irkj80viz5zrh2f3a0ipxkzq2nb6jx36k"; - }; - } - { - goPackagePath = "github.com/libp2p/go-sockaddr"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-sockaddr"; - rev = "f3e9f73a53d14d8257cb9da3d83dda07bbd8b2fe"; - sha256 = "04saphhq5zbphzbd87lfpjkdf8k21x7q4hn8d03f8ykm19d51nlg"; - }; - } - { - goPackagePath = "github.com/libp2p/go-stream-muxer"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-stream-muxer"; - rev = "6ebe3f58af097068454b167a89442050b023b571"; - sha256 = "1w1hypcg010npzlbabigrz65c4inj7w9js9ai4iw6z2d3s7ymc6v"; - }; - } - { - goPackagePath = "github.com/libp2p/go-tcp-transport"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-tcp-transport"; - rev = "2852032418949429c7d683502e7ea9bff2e951e7"; - sha256 = "0j4cm890qbgj3ry757pcd21j4q2i3bkksc5z8y8hszyq8njc7ac5"; - }; - } - { - goPackagePath = "github.com/libp2p/go-ws-transport"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-ws-transport"; - rev = "2c20090616127904f706139653cd40ecac600227"; - sha256 = "0yirawpv416fs9amzp0i6r2j0lmpw9bplqxiqixcvi7kkinb42hq"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade"; - sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "01d59357d468872339068bcd5d55a00e2463051f"; - sha256 = "0m595w0azrsvlfqqvrsrf0yd0myavn129rg1nsq1mnfy9c8768xa"; - }; - } - { - goPackagePath = "github.com/minio/blake2b-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/blake2b-simd"; - rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4"; - sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd"; - }; - } - { - goPackagePath = "github.com/minio/sha256-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/sha256-simd"; - rev = "ad98a36ba0da87206e3378c556abbfeaeaa98668"; - sha256 = "0yfnqn3kqdnlfm54yvc4fr5vpdmwdi2kw571nlkbpmy8ldhsqqfi"; - }; - } - { - goPackagePath = "github.com/mr-tron/base58"; - fetch = { - type = "git"; - url = "https://github.com/mr-tron/base58"; - rev = "c1bdf7c52f59d6685ca597b9955a443ff95eeee6"; - sha256 = "1dq6i8619manxdhb0fwhdm9ar23kx88pc2xwl1pjla9djrgql6a8"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multiaddr"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multiaddr"; - rev = "123a717755e0559ec8fda308019cd24e0a37bb07"; - sha256 = "0lx2m83y0ffqn7ygqppa1ri1ykdrbvl1qzb4x2w8k97chxfjx4ip"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multiaddr-dns"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multiaddr-dns"; - rev = "c3d4fcd3cbaf54a24b0b68f1461986ede1d59859"; - sha256 = "13a8xbr5zb49aq570b51a5japb3rnsnwjncgqsd91bnqr8v68vdb"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multiaddr-net"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multiaddr-net"; - rev = "97d80565f68c5df715e6ba59c2f6a03d1fc33aaf"; - sha256 = "0gsncnwn8b9i2hyh0kgiw51sz96wswww5m032dr87jld2zl7kdrb"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multihash"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multihash"; - rev = "265e72146e710ff649c6982e3699d01d4e9a18bb"; - sha256 = "1yzjqwwwwd1yb22g2vf12y5w4gbgsa4g9arf66xk5m2r7r79h8hq"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multistream"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multistream"; - rev = "612ce31c03aebe1d5adbd3c850ee89e05a82b16d"; - sha256 = "0yg7pkg8nvgz8ywcg55kqm1jk264qbdyilkjsnn32siyh5xwmcd1"; - }; - } - { - goPackagePath = "github.com/nats-io/nats"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/go-nats"; - rev = "247b2a84d8d0ff15cbc6faafc77ef15ea4317011"; - sha256 = "0ig494i7j94wr0f8mpaai9hy5knbvqlhqj280m969m219h8di2qy"; - }; - } - { - goPackagePath = "github.com/nats-io/go-nats"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/go-nats"; - rev = "247b2a84d8d0ff15cbc6faafc77ef15ea4317011"; - sha256 = "0ig494i7j94wr0f8mpaai9hy5knbvqlhqj280m969m219h8di2qy"; - }; - } - { - goPackagePath = "github.com/nats-io/nuid"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nuid"; - rev = "3e58d42c9cfe5cd9429f1a21ad8f35cd859ba829"; - sha256 = "05xzdfcji3jv63c5sysmfypzg6xc2mm92gdcck7qvk10n60dndp4"; - }; - } - { - goPackagePath = "github.com/op/go-logging"; - fetch = { - type = "git"; - url = "https://github.com/op/go-logging"; - rev = "970db520ece77730c7e4724c61121037378659d9"; - sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; - }; - } - { - goPackagePath = "github.com/opentracing/opentracing-go"; - fetch = { - type = "git"; - url = "https://github.com/opentracing/opentracing-go"; - rev = "6c572c00d1830223701e155de97408483dfcd14a"; - sha256 = "1qw5s858zd2gsg1962jg3jpz38awpldv3vajlsj78qvzi0v0pmq4"; - }; - } - { - goPackagePath = "github.com/philhofer/fwd"; - fetch = { - type = "git"; - url = "https://github.com/philhofer/fwd"; - rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136"; - sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; - sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; - }; - } - { - goPackagePath = "github.com/robertkrimen/otto"; - fetch = { - type = "git"; - url = "https://github.com/robertkrimen/otto"; - rev = "6c383dd335ef8dcccef05e651ce1eccfe4d0f011"; - sha256 = "1n6h7c8gi6wv4nklqd7ygzx2afvh7ddxbml9w9x0jxwcfb3bdy17"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "36e9d2ebbde5e3f13ab2e25625fd453271d6522e"; - sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; - }; - } - { - goPackagePath = "github.com/shirou/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/shirou/gopsutil"; - rev = "57f370e13068146efe1cb7129f79e5d51da8a242"; - sha256 = "1ij0bbnfjj65afin8vhccr3cxvg6r0awmvcvb2ilza5wbbsslggb"; - }; - } - { - goPackagePath = "github.com/shurcooL/go-goon"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/go-goon"; - rev = "37c2f522c041b74919a9e5e3a6c5c47eb34730a5"; - sha256 = "17ac6j6msdcxbmfhq6pxhw5z339b87bd6ciln9909drjv2szyxqv"; - }; - } - { - goPackagePath = "github.com/shurcooL/go"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/go"; - rev = "47fa5b7ceee66c60ac3a281416089035bf526a3c"; - sha256 = "1wr4fgb8w1zi3z7b76wjr68h0152lrcamphyhpbljc0sx8ygv8xd"; - }; - } - { - goPackagePath = "github.com/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "7678a5452ebea5b7090a6b163f844c133f523da2"; - sha256 = "0df2z0f4l0yzbx38bphwyjsyxfgsza1yw4cq46zikbnknqjb8s1c"; - }; - } - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "ef6db91d284a0e7badaa1f0c404c30aa7dee3aed"; - sha256 = "16znlpsms8z2qc3airawyhzvrzcp70p9bx375i19bg489hgchxb7"; - }; - } - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc725b9e6d41a297405f65e7e8804acc"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - { - goPackagePath = "github.com/tidwall/btree"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/btree"; - rev = "9876f1454cf0993a53d74c27196993e345f50dd1"; - sha256 = "0rys4pw7cf2yqr0qdls33ndbpas6d1qxi0wn8zacb315j1dd7cnp"; - }; - } - { - goPackagePath = "github.com/tidwall/buntdb"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/buntdb"; - rev = "75d89283d5ba2a97e02ada50dc800fd65b601b7b"; - sha256 = "11sgfwqfgn33fy62spqrqqx9lbp1cpb7f93wp2ngic5svpza0ykl"; - }; - } - { - goPackagePath = "github.com/tidwall/gjson"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/gjson"; - rev = "3cd3a1192327ac5e24f7e87824be578b0b07c604"; - sha256 = "1v9fmbz7j4ny5cnbmzs1nnv3nm34f129grfk8kxl0klydixg2jvx"; - }; - } - { - goPackagePath = "github.com/tidwall/grect"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/grect"; - rev = "ba9a043346eba55344e40d66a5e74cfda3a9d293"; - sha256 = "0iz948vwqk7n47pkrrmw20rd4f0m67qdhgs9xijc5swyrlj6yr61"; - }; - } - { - goPackagePath = "github.com/tidwall/match"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/match"; - rev = "1731857f09b1f38450e2c12409748407822dc6be"; - sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578"; - }; - } - { - goPackagePath = "github.com/tidwall/rtree"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/rtree"; - rev = "6cd427091e0e662cb4f8e2c9eb1a41e1c46ff0d3"; - sha256 = "0s3h3zjmz60d92gsb3vfqfbrgnjyai607adxg78674s1vdlm221l"; - }; - } - { - goPackagePath = "github.com/tidwall/tinyqueue"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/tinyqueue"; - rev = "1e39f55115634cad2c504631c8bfcc292f2c9c55"; - sha256 = "0yyl7qskmn9fb9h11z71ri30cml7d1k576wf1573wbqv59b81f2x"; - }; - } - { - goPackagePath = "github.com/tinylib/msgp"; - fetch = { - type = "git"; - url = "https://github.com/tinylib/msgp"; - rev = "3b5c87ab5fb00c660bf85b888445d9a01db64db4"; - sha256 = "0n30zjip3kips23w6wlp41nh4z2qc5cg8s1hf17kc3shnaj04n1n"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "f3cacc17c85ecb7f1b6a9e373ee85d1480919868"; - sha256 = "1g5jcxans5vjvg8k4wksilfx50izfhb9g0jdmcknlqbn17ww1fir"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; - sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/go-logging"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/go-logging"; - rev = "0457bb6b88fc1973573aaf6b5145d8d3ae972390"; - sha256 = "1bl180mhg03hdqhyr5sfjcg16ns2ppal625g9ag5m10l2pvlwnqn"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/go-notifier"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/go-notifier"; - rev = "097c5d47330ff6a823f67e3515faa13566a62c6f"; - sha256 = "081h4a33603n0mlh53by1mg21rr42xjvxk7r10x8l4v671bq0kha"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/go-smux-multistream"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/go-smux-multistream"; - rev = "afa6825376c14a0462fd420a7d4b4d157c937a42"; - sha256 = "14vimxvlz48js4mkq5fp2ni8qbs0h2spv3qjgnqbg3jfbi8ynn5k"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/go-smux-spdystream"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/go-smux-spdystream"; - rev = "a6182ff2a058b177f3dc7513fe198e6002f7be78"; - sha256 = "1x2p5h73q90rz221xvhm29sampqbimhrajb5bglj8lqkh502ip7g"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/go-smux-yamux"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/go-smux-yamux"; - rev = "49f324a2b63e778df703cf8e5a502bd56a683ef3"; - sha256 = "15ndv8qr2n9k1icsxd7yismzdis0aasi28xcxqgw8nq2ldj9j9dz"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/mafmt"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/mafmt"; - rev = "ab6a47300c1df531e468771e7d08fcd6d33f032e"; - sha256 = "03is8fjnjpkp1pipgachf7cx76wa1wrlgijgw25qygkycyxins06"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/mdns"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/mdns"; - rev = "348bb87e5cd39b33dba9a33cb20802111e5ee029"; - sha256 = "0z1qwras8yh3q05zvdifw1s3phbppbc0659qndamxsfq8jlds462"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/multiaddr-filter"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/multiaddr-filter"; - rev = "e903e4adabd70b78bc9293b6ee4f359afb3f9f59"; - sha256 = "0ksd8vnp207dvphmhrazwldj8if900fnyc1pqa9pfvj04qp92640"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/yamux"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/yamux"; - rev = "63d22127b261bf7014885d25fabe034bed14f04b"; - sha256 = "0xifqmpcj1awjhqif2fc62vj7bds34q95lw1a3pi0sqmla6r8xhc"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "8b1d31080a7692e075c4681cb2458454a1fe0706"; - sha256 = "1l5n2vjyxrsmhqn5nas68mf58f2kcnb5zyqrcar608bxh9dlsnsl"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "640f4622ab692b87c2f3a94265e6f579fe38263d"; - sha256 = "097m4qhcljhp180171j5fjhq4740iirfkkajfd7yrxqhp4s9hljx"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "78d5f264b493f125018180c204871ecf58a2dce1"; - sha256 = "0x23n60wskys39dwybz5za77ldky9i518kp58ragpd5528kcc68s"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f"; - sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr"; - }; - } - { - goPackagePath = "gopkg.in/mgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/mgo.v2"; - rev = "3f83fa5005286a7fe593b055f0d7771a7dce4655"; - sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7"; - }; - } - { - goPackagePath = "gopkg.in/sourcemap.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/sourcemap.v1"; - rev = "6e83acea0053641eff084973fee085f0c193c61a"; - sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 40c55e9f5d78..c2bb51cc14a0 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -18,7 +18,6 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e7db616aa915..bb091fc0d0cb 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,13 +2,12 @@ # Do not edit! { - version = "2024.6.4"; + version = "2024.7.1"; components = { "3_day_blinds" = ps: with ps; [ ]; "abode" = ps: with ps; [ jaraco-abode - jaraco-functools ]; "accuweather" = ps: with ps; [ accuweather @@ -111,10 +110,6 @@ aioairzone-cloud ]; "aladdin_connect" = ps: with ps; [ - fnv-hash-fast - genie-partner-sdk - psutil-home-assistant - sqlalchemy ]; "alarm_control_panel" = ps: with ps; [ ]; @@ -220,6 +215,12 @@ ]; "apsystems" = ps: with ps; [ ]; # missing inputs: apsystems-ez1 + "aquacell" = ps: with ps; [ + fnv-hash-fast + ifaddr + psutil-home-assistant + sqlalchemy + ]; # missing inputs: aioaquacell "aqualogic" = ps: with ps; [ aqualogic ]; @@ -627,9 +628,6 @@ "channels" = ps: with ps; [ pychannels ]; - "circuit" = ps: with ps; [ - circuit-webhook - ]; "cisco_ios" = ps: with ps; [ pexpect ]; @@ -689,7 +687,7 @@ "command_line" = ps: with ps; [ ]; "compensation" = ps: with ps; [ - numpy + numpy_1 ]; "concord232" = ps: with ps; [ ]; # missing inputs: concord232 @@ -786,7 +784,7 @@ home-assistant-intents ifaddr mutagen - numpy + numpy_1 pillow psutil-home-assistant pynacl @@ -808,12 +806,8 @@ deluge-client ]; "demo" = ps: with ps; [ - fnv-hash-fast hassil home-assistant-intents - pillow - psutil-home-assistant - sqlalchemy ]; "denon" = ps: with ps; [ ]; @@ -833,10 +827,7 @@ "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ - fnv-hash-fast pillow - psutil-home-assistant - sqlalchemy ]; "device_tracker" = ps: with ps; [ ]; @@ -1072,7 +1063,7 @@ pyemby ]; "emoncms" = ps: with ps; [ - ]; + ]; # missing inputs: pyemoncms "emoncms_history" = ps: with ps; [ ]; "emonitor" = ps: with ps; [ @@ -1578,7 +1569,6 @@ hassil home-assistant-intents mutagen - voluptuous-openapi webrtc-noise-gain ]; "google_mail" = ps: with ps; [ @@ -1667,10 +1657,6 @@ "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality "group" = ps: with ps; [ - fnv-hash-fast - pillow - psutil-home-assistant - sqlalchemy ]; "growatt_server" = ps: with ps; [ growattserver @@ -2147,7 +2133,7 @@ pyipp ]; "iqvia" = ps: with ps; [ - numpy + numpy_1 pyiqvia ]; "irish_rail_transport" = ps: with ps; [ @@ -2161,6 +2147,8 @@ ]; "iss" = ps: with ps; [ ]; # missing inputs: pyiss + "ista_ecotrend" = ps: with ps; [ + ]; # missing inputs: pyecotrend-ista "isy994" = ps: with ps; [ pyisy ]; @@ -2280,6 +2268,8 @@ "kmtronic" = ps: with ps; [ pykmtronic ]; + "knocki" = ps: with ps; [ + ]; # missing inputs: knocki "knx" = ps: with ps; [ fnv-hash-fast home-assistant-frontend @@ -2637,6 +2627,9 @@ ]; "mazda" = ps: with ps; [ ]; + "mealie" = ps: with ps; [ + aiomealie + ]; "meater" = ps: with ps; [ meater-python ]; @@ -3162,8 +3155,7 @@ pyownet ]; "onkyo" = ps: with ps; [ - onkyo-eiscp - ]; + ]; # missing inputs: pyeiscp "onvif" = ps: with ps; [ ha-ffmpeg onvif-zeep-async @@ -3178,7 +3170,6 @@ home-assistant-intents mutagen openai - voluptuous-openapi webrtc-noise-gain ]; "openalpr_cloud" = ps: with ps; [ @@ -3512,12 +3503,14 @@ aiopvpc ]; "pyload" = ps: with ps; [ + pyloadapi ]; "python_script" = ps: with ps; [ restrictedpython ]; "qbittorrent" = ps: with ps; [ - ]; # missing inputs: python-qbittorrent + qbittorrent-api + ]; "qingping" = ps: with ps; [ aioesphomeapi aioruuvigateway @@ -3893,7 +3886,6 @@ ]; # missing inputs: scsgate "search" = ps: with ps; [ fnv-hash-fast - pillow psutil-home-assistant sqlalchemy ]; @@ -4189,8 +4181,7 @@ "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ - sunwatcher - ]; + ]; # missing inputs: solarlog_cli "solax" = ps: with ps; [ solax ]; @@ -4303,7 +4294,7 @@ ]; # missing inputs: stookwijzer "stream" = ps: with ps; [ ha-av - numpy + numpy_1 pyturbojpeg ]; "streamlabswater" = ps: with ps; [ @@ -4472,13 +4463,9 @@ temperusb ]; "template" = ps: with ps; [ - fnv-hash-fast - pillow - psutil-home-assistant - sqlalchemy ]; "tensorflow" = ps: with ps; [ - numpy + numpy_1 pillow pycocotools tensorflow @@ -4490,6 +4477,7 @@ tesla-fleet-api ]; "tessie" = ps: with ps; [ + tesla-fleet-api ]; # missing inputs: tessie-api "text" = ps: with ps; [ ]; @@ -4709,7 +4697,7 @@ "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy "trend" = ps: with ps; [ - numpy + numpy_1 ]; "tts" = ps: with ps; [ ha-ffmpeg @@ -5550,6 +5538,7 @@ "image_processing" "image_upload" "imap" + "incomfort" "influxdb" "inkbird" "input_boolean" @@ -5634,6 +5623,7 @@ "matter" "maxcube" "mazda" + "mealie" "meater" "media_extractor" "media_player" @@ -5667,6 +5657,7 @@ "motionblinds_ble" "motioneye" "motionmount" + "mpd" "mqtt" "mqtt_eventstream" "mqtt_json" @@ -5736,6 +5727,7 @@ "opower" "oralb" "otbr" + "otp" "overkiz" "ovo_energy" "owntracks" @@ -5771,7 +5763,9 @@ "pushover" "pvoutput" "pvpc_hourly_pricing" + "pyload" "python_script" + "qbittorrent" "qingping" "qld_bushfire" "qnap" @@ -5872,7 +5866,6 @@ "snips" "snmp" "snooz" - "solarlog" "solax" "soma" "somfy_mylink" diff --git a/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix b/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix index 85bef161595e..136c36010442 100644 --- a/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix +++ b/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "mampfes"; domain = "epex_spot"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitHub { owner = "mampfes"; repo = "ha_epex_spot"; rev = "refs/tags/${version}"; - hash = "sha256-8cxEOCzlQbS3HbQMBo7/rZb/GfpJvOWayLttEaEENYs="; + hash = "sha256-BwNDI2OMF6bXqFcdr0AJgj9Gb6Uz8BWOfE7M4jqzQJc="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/default.nix b/pkgs/servers/home-assistant/custom-components/moonraker/default.nix index a134f8ff4f14..40601bef0e2c 100644 --- a/pkgs/servers/home-assistant/custom-components/moonraker/default.nix +++ b/pkgs/servers/home-assistant/custom-components/moonraker/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "marcolivierarsenault"; domain = "moonraker"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "marcolivierarsenault"; repo = "moonraker-home-assistant"; rev = "refs/tags/${version}"; - hash = "sha256-utxCHXVpP4FQT2poVuS4cMZGgn7yO89lUw5KhIHRXKQ="; + hash = "sha256-e1Bdhv6YSz9yhIx5SDKfRxq0f6Fr0oc0vzpOqPPMxmc="; }; propagatedBuildInputs = [ 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 6ac81c919b2f..4ace5abd23eb 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 = "3.6.2"; + version = "3.6.3"; src = fetchFromGitHub { owner = "piitaya"; repo = "lovelace-mushroom"; rev = "v${version}"; - hash = "sha256-sH0Qgiv4VeWwWV3RFnp2M4RH79S+PR8Z2nhPtQp0EnY="; + hash = "sha256-v7qp2sDHmicikaNc9oNsKPwzmhMI+Cl1LqNuLI1EAdw="; }; - npmDepsHash = "sha256-L7r417eCfelQM6ZxxJvkZdGBhPmcM2mSHvLa8RN0D8k="; + npmDepsHash = "sha256-Is5GhzYCJicTZ/D0n3U/RrEZmLUB3U7B1LwSJaguZEM="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 82822e1c1ff8..bad91d28c468 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -93,18 +93,6 @@ let ''; }); - aiowithings = super.aiowithings.overridePythonAttrs (oldAttrs: rec { - version = "2.1.0"; - src = fetchFromGitHub { - inherit (oldAttrs.src) - owner - repo - ; - rev = "refs/tags/${version}"; - hash = "sha256-+pIIVCR+QsW9M3pH9Ss3dMvkeKM1OdhQ1y+s/T6pHtk="; - }; - }); - astral = super.astral.overridePythonAttrs (oldAttrs: rec { pname = "astral"; version = "2.2"; @@ -192,64 +180,15 @@ let doCheck = false; # requires asynctest, which does not work on python 3.11 }); - jaraco-abode = super.jaraco-abode.overridePythonAttrs (oldAttrs: rec { - version = "3.3.0"; + openhomedevice = super.openhomedevice.overridePythonAttrs (oldAttrs: rec { + version = "2.2"; src = fetchFromGitHub { inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; - hash = "sha256-LnbWzIST+GMtdsHDKg67WWt9GmHUcSuGZ5Spei3nEio="; + rev = "refs/tags/${version}"; + hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw="; }; }); - jaraco-collections = super.jaraco-collections.overridePythonAttrs (oldAttrs: rec { - version = "3.4.0"; - src = fetchPypi { - pname = "jaraco.collections"; - inherit version; - hash = "sha256-NE0Udp1xbnSWr4eaxxs8br3UarxkvZ7CHRUkg2WqOsk="; - }; - }); - - jaraco-functools = super.jaraco-functools.overridePythonAttrs (oldAttrs: rec { - version = "3.9.0"; - src = fetchPypi { - pname = "jaraco.functools"; - inherit version; - hash = "sha256-ixN7D+rMF/70us7gTAEcnobyNBCZyHCh0S0743sypjg="; - }; - }); - - lmcloud = super.lmcloud.overridePythonAttrs (oldAttrs: rec { - version = "0.4.35"; - src = fetchFromGitHub { - owner = "zweckj"; - repo = "lmcloud"; - rev = "refs/tags/v${version}"; - hash = "sha256-TUve21yamtEmEceK/V1w7IZjnMgKConMfSY/GlqFpp8="; - }; - }); - - lxml = super.lxml.overridePythonAttrs (oldAttrs: rec { - version = "5.1.0"; - pyprojet = true; - - src = fetchFromGitHub { - owner = "lxml"; - repo = "lxml"; - rev = "refs/tags/lxml-${version}"; - hash = "sha256-eWLYzZWatYDmhuBTZynsdytlNFKKmtWQ1XIyzVD8sDY="; - }; - - nativeBuildInputs = with self; [ - cython - setuptools - libxml2.dev - libxslt.dev - ]; - - patches = []; - }); - pymelcloud = super.pymelcloud.overridePythonAttrs (oldAttrs: { version = "2.5.9"; src = fetchFromGitHub { @@ -282,17 +221,6 @@ let doCheck = false; # no tests }); - # Can probably be removed with 2024.6.0 - plugwise = super.plugwise.overridePythonAttrs rec { - version = "0.37.3"; - src = fetchFromGitHub { - owner = "plugwise"; - repo = "python-plugwise"; - rev = "refs/tags/v${version}"; - hash = "sha256-aQz0p+DNi1XVoFwdFjc3RjpHqA2kGf4pU1QS6m271gU="; - }; - }; - # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; @@ -303,6 +231,15 @@ let }; }); + psutil = super.psutil.overridePythonAttrs (oldAttrs: rec { + version = "5.9.8"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-a+Em4yJUht/yhqj7mgYkalJT9MfFO0depfWsk05kGUw="; + }; + }); + pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec { version = "0.4.8"; src = fetchPypi { @@ -434,7 +371,6 @@ let }; nativeBuildInputs = with self; [ flit-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "betterproto" @@ -549,7 +485,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.6.4"; + hassVersion = "2024.7.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -567,17 +503,16 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-WIAFTVNHzrKTRONmOc/lq5PvC34PDKF7UfIokLCVzNY="; + hash = "sha256-y3VYxlPit9LuC+9F+fQoJs3WD9LsvrMZMiSCqbzkgmk="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-Ymv3AlArAD2rSXQwMhEVeynwhAo8ZMrtV1zUK4U8xqQ="; + hash = "sha256-pFsv0guypnRPeZOg2WrG2HL27W903iANHkvdQ8dCJHo="; }; build-system = with python.pkgs; [ - pythonRelaxDepsHook setuptools ]; @@ -664,6 +599,7 @@ in python.pkgs.buildPythonApplication rec { ulid-transform urllib3 voluptuous + voluptuous-openapi voluptuous-serialize yarl # REQUIREMENTS in homeassistant/auth/mfa_modules/totp.py and homeassistant/auth/mfa_modules/notify.py diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index f3e6062d5b26..b9ce34ab412b 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20240610.1"; + version = "20240705.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-6XSDKPL+rbtP/jGYbvzc5cakEZC94sDetmPuM7TQQ64="; + hash = "sha256-uZs/2/+fmnZzDzEuzEus0LDUNTSQIs/jL4FMBJBpXAE="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 88944efe3593..38d237a70440 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.6.21"; + version = "2024.7.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents-package"; rev = "refs/tags/${version}"; - hash = "sha256-tgbZqcxv/uFoNCGq7TySffhqQXzupZodQfQHBqkSHrE="; + hash = "sha256-3JnBmSNa9Yrh+5QFQ6KIKZProxMuX+CyTZzqRUAlBcQ="; fetchSubmodules = true; }; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 4d14ee508bcb..ac1f5bdf9b84 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.6.3"; + version = "2024.7.0"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-YMoNoR9LT38nkqoo0seaP88XUOcVmSQN1dBKiW+13SM="; + hash = "sha256-p/0OM72XcfGLKWbReMcUCBZTxHFDe0VZk5gmaI0Qx2Q="; }; build-system = [ diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index df410fb49862..124771d5fd20 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -41,7 +41,9 @@ PKG_SET = "home-assistant.python.pkgs" PKG_PREFERENCES = { "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 "HAP-python": "hap-python", + "numpy": "numpy_1", "ollama-hass": "ollama", + "sentry-sdk": "sentry-sdk", "slackclient": "slack-sdk", "SQLAlchemy": "sqlalchemy", "tensorflow": "tensorflow", diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index b20fbee94591..9bf43a913603 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -1,11 +1,11 @@ { lib , stdenv -, buildGo122Module +, buildGoModule , fetchFromGitHub , fetchNpmDeps , cacert -, go_1_22 , git +, go , enumer , mockgen , nodejs @@ -14,27 +14,22 @@ , nixosTests }: -let - buildGoModule = buildGo122Module; - go = go_1_22; -in - buildGoModule rec { pname = "evcc"; - version = "0.127.2"; + version = "0.128.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-85AhiqAvjr63tfXovH2bt1b583ak1N09EtbLLtW7qeA="; + hash = "sha256-xoLQcCbqzeNUyVPkcrPhmNi8PUzzeGshFVvmMCudQU8="; }; - vendorHash = "sha256-MdfLJpPEi6Cr34W6eJSraKJwBPtR66HM2tJIbPE9mZs="; + vendorHash = "sha256-O8chNEtNEbzNiFzDD1j16V6eS3GKpUWB4PMuBiRNsyU="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-6Dxf32myqRbKIlYFcQhkuqZVz+lVvmeJ5lqiWPCQAzA="; + hash = "sha256-XG9nefBefF2gdDWA9IYBI2dv6Lig2LqGgOnTjyni0fM="; }; nativeBuildInputs = [ @@ -78,6 +73,7 @@ buildGoModule rec { skippedTests = [ # network access "TestOctopusConfigParse" + "TestTemplates/ac-elwa-2" "TestTemplates/allinpower" "TestTemplates/electricitymaps" "TestTemplates/elering" diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index af35e6edfe3d..6c3e753d8d56 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -27,13 +27,13 @@ let in buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-4nSlL4m0SL3B7+lI/BGt1aY1UE46la7/4NU4BaJ7EwQ="; + hash = "sha256-2t3SGN/VsD16uupeqs7tW+dyTJgt8ch60OzbvE/21vg="; }; npmDepsHash = "sha256-jYZUVwrOxoAbfHHSBkN5IlYhC6yZVVwRoZErkbYrjUs="; diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix index c9e6ec815d3a..c214fe1270ad 100644 --- a/pkgs/servers/http/angie/default.nix +++ b/pkgs/servers/http/angie/default.nix @@ -8,12 +8,12 @@ }@args: callPackage ../nginx/generic.nix args rec { - version = "1.5.2"; + version = "1.6.0"; pname = if withQuic then "angieQuic" else "angie"; src = fetchurl { url = "https://download.angie.software/files/angie-${version}.tar.gz"; - hash = "sha256-jX0WBIdL3RQpgdeVf4oZByDNKQbrEjKbImC86Ceqkoc="; + hash = "sha256-yzEbYOxvt2SPTYD/Dw4SJDg94muKGan+QX51sf6xuU4="; }; configureFlags = lib.optionals withAcme [ diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index b3d499415dde..44b2caa184f4 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.59"; + version = "2.4.61"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - hash = "sha256-7FFQHsSAKE/1L2NyWBNdMzIwp9Ipw6+m9sL5BA4yEyM="; + hash = "sha256-6ouob9lb1ZTRXkbSWsW72oKuDJEirZOZjMU5wTPqzrY="; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/mod_jk/default.nix similarity index 64% rename from pkgs/servers/http/apache-modules/tomcat-connectors/default.nix rename to pkgs/servers/http/apache-modules/mod_jk/default.nix index 20879d4aaf21..22a50ea8feb6 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/mod_jk/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, apacheHttpd, jdk }: stdenv.mkDerivation rec { - pname = "tomcat-connectors"; - version = "1.2.48"; + pname = "mod_jk"; + version = "1.2.49"; src = fetchurl { - url = "mirror://apache/tomcat/tomcat-connectors/jk/${pname}-${version}-src.tar.gz"; - sha256 = "15wfj1mvad15j1fqw67qbpbpwrcz3rb0zdhrq6z2sax1l05kc6yb"; + url = "mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-${version}-src.tar.gz"; + hash = "sha256-Q8sCg8koeOnU7xEGMdvSvra1VxPBJ84EMZCyswh1fpw="; }; configureFlags = [ @@ -28,7 +28,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Provides web server plugins to connect web servers with Tomcat"; homepage = "https://tomcat.apache.org/download-connectors.cgi"; + changelog = "https://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html"; license = licenses.asl20; + maintainers = with maintainers; [ anthonyroussel ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 2ea00c598e27..b33eb921ef36 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -24,9 +24,9 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.30.3"; - rev = "12a6a79966203969a23aa2f0d705f39b679744c2"; - hash = "sha256-S18bnAVha4CnYKHTzytKY6PHWSbOzmObbyZEhzIHsf8="; + version = "1.30.4"; + rev = "32113313a357829ba3a5dce0795b6780bf8cbf4d"; + hash = "sha256-u9lTVe40pwXTt0YRwJXRuZonS5KJL2JQUQ3L9ymuA74="; }; # these need to be updated for any changes to fetchAttrs @@ -184,6 +184,8 @@ buildBazelPackage { "--repo_env=GOSUMDB=sum.golang.org" ]; + requiredSystemFeatures = [ "big-parallel" ]; + passthru.tests = { envoy = nixosTests.envoy; # tested as a core component of Pomerium diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index f4a9277a332f..adf60cdf32e4 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hiawatha"; - version = "11.5"; + version = "11.6"; src = fetchFromGitLab { owner = "hsleisink"; repo = "hiawatha"; rev = "v${finalAttrs.version}"; - hash = "sha256-kswVBVL/QUQmCwH74qWwSwLz4uwDymuHIr8NokrrgEM="; + hash = "sha256-YsZdVqanVNibA4KnAknLh61hVo7x5uu67lb+RX2N7c8="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index 14346530571e..ccb0f2f622dd 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -1,16 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, cmake, enableJemalloc ? !stdenv.hostPlatform.isMusl, jemalloc }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, zlib, cmake, enableJemalloc ? !stdenv.hostPlatform.isMusl, jemalloc }: stdenv.mkDerivation rec { pname = "lwan"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "lpereira"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z8kiuZHLEupCKFrj8guiu9fTG7s+5KiQ6x0pg9iMy0c="; + sha256 = "sha256-otiPH+e+auMCyeOTq4LJYaBNv+I91kOCww7DCepQTAQ="; }; + patches = [ + (fetchpatch { + url = "https://github.com/lpereira/lwan/commit/9b94ff5eecec1e925103b25a43dacc226a634878.patch"; + hash = "sha256-g1ZwmEodtF1fkbIBaLT4YvH8EG8DGafHydPSYJra+c0="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib ] ++ lib.optional enableJemalloc jemalloc; diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index bd8873ce100e..8e78b8f07287 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -13,15 +13,15 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256-AkpfLKPirl8fz4s0hQI15aSgI2PZFPakAzC+j66MVY0="; + hash = "sha256-lMI6dVCTInqHsz4N0HsOVUQo8TkheAwr54FW46r+DUA="; }; - vendorHash = "sha256-kabWL7yqNkI2JRPmVv0tp0nIfVDwT9QbbDIbdM8sL5s="; + vendorHash = "sha256-AHlnhAh4RBz8aJoFJjbX/MUDHq81xK7b7gvCyuV3gjU="; ui = mkYarnPackage { inherit version; diff --git a/pkgs/servers/http/router/default.nix b/pkgs/servers/http/router/default.nix index f915db2073d5..67673bb1efba 100644 --- a/pkgs/servers/http/router/default.nix +++ b/pkgs/servers/http/router/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "router"; - version = "1.49.1"; + version = "1.50.0"; src = fetchFromGitHub { owner = "apollographql"; repo = pname; rev = "v${version}"; - hash = "sha256-Dhl8CKXMeiZ38hDbNviKBzg6zmCpO2wJFWHHZbJXJWI="; + hash = "sha256-Inah2IcmWSyizsavXr2N5j2S2eAfocpxzjrAdhQlfjg="; }; - cargoHash = "sha256-FbIUvjm1tYMbsWdwu78drUQuMjcl6Ju/pPV9pmWHcf4="; + cargoHash = "sha256-G4HjvVGRbgOteZvC1tt75HP+EJDGEkndVhADBm8B1C8="; nativeBuildInputs = [ cmake diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index b2ec04f10f9d..eb7be6d9de04 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -39,12 +39,12 @@ let in { tomcat9 = common { - version = "9.0.88"; - hash = "sha256-vvgcyqT318ieqG61b2NDxRzXkzdMjswgOLen9eJ9Zig="; + version = "9.0.90"; + hash = "sha256-MYSRxL5DSU5ocrUnfEDKyFBpAddErQnTffYuiFQ/YiM="; }; tomcat10 = common { - version = "10.1.23"; - hash = "sha256-pVcsnpD/geoWaB35cXa7ap9Texw/vg/7pSl/7lnDmKo="; + version = "10.1.25"; + hash = "sha256-8SQKMrh5xEWkpEGcm23YdYG9uW+KUfewyhk1Fkux6EI="; }; } diff --git a/pkgs/servers/irc/ergochat/default.nix b/pkgs/servers/irc/ergochat/default.nix index a705ed4483a0..1744361f8412 100644 --- a/pkgs/servers/irc/ergochat/default.nix +++ b/pkgs/servers/irc/ergochat/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ergo"; - version = "2.13.1"; + version = "2.14.0"; src = fetchFromGitHub { owner = "ergochat"; repo = "ergo"; rev = "v${version}"; - sha256 = "sha256-WQvXrG82hcPd4viA1cyIsTd5HbR0KD1b5r2me8MKoR8="; + sha256 = "sha256-vXspI0BkwpS9w7PQpj+U3REQcSPaPJAfIBRj62loQzQ="; }; vendorHash = null; diff --git a/pkgs/servers/irc/inspircd/default.nix b/pkgs/servers/irc/inspircd/default.nix index 578c9aa31441..dd821ce11959 100644 --- a/pkgs/servers/irc/inspircd/default.nix +++ b/pkgs/servers/irc/inspircd/default.nix @@ -145,13 +145,13 @@ in stdenv.mkDerivation rec { pname = "inspircd"; - version = "3.17.0"; + version = "3.17.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-isLZKYf32+va66FGYMq4mWIEHNpqUWCcVhYWLA5lRwk="; + sha256 = "sha256-4jtIh6wpZ/rexnwhqicU1gUk6DerGLXM9OY+GkmiEnI="; }; outputs = [ "bin" "lib" "man" "doc" "out" ]; diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 6ea011ab8076..c94dd2b9ff69 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ircd-hybrid"; - version = "8.2.44"; + version = "8.2.45"; src = fetchurl { url = "mirror://sourceforge/ircd-hybrid/ircd-hybrid-${version}.tgz"; - sha256 = "sha256-a/DC/1/GQ9wXV6Iyyb1YJdM4kcfMGDfwJK1P/3xhxnk="; + sha256 = "sha256-lRrgMqsEqHtH5gIzngfg0Gtuh71aTrM087OVvhT3XkQ="; }; buildInputs = [ openssl zlib libxcrypt ]; diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix index 74751e8097ae..b723bc145331 100644 --- a/pkgs/servers/jicofo/default.nix +++ b/pkgs/servers/jicofo/default.nix @@ -2,10 +2,10 @@ let pname = "jicofo"; - version = "1.0-1078"; + version = "1.0-1084"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "0+VfsolOcjC68DRrWUgYYCdKhCxd0x1Y6920OrixU5g="; + sha256 = "yuTiuLAKGfmAtwCi6Dn+Z+lStsVX6PWsFeXV8qiTtJU="; }; in stdenv.mkDerivation { diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 14437997ec7b..4e258192c886 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.3-105-ge155b81e"; + version = "2.3-149-g793df5a9"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "jQTZwnj1oECjUTD8dC6PF5tJcPye8FYUJmYEEBhBuRs="; + sha256 = "NI38XuBWSf+JoPCzAAd7Bma3PjprPw8CnE0W4VlqaVM="; }; in stdenv.mkDerivation { diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index a7e93fcbce79..81d79121c6da 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "0.12.0-unstable-2024-06-27"; + version = "0.12.0-unstable-2024-07-05"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "4d21ffc1d67d4aa9886cc691441afccc057b975d"; - sha256 = "sha256-LvYEE3/VYgLK2c/NB4wey87025eoyADPV6w1CV/Uejs="; + rev = "00cb683def53be4b437bfb3e3a637d2d5879946c"; + sha256 = "sha256-OtFUEhCZ8DrDfxKXYnLE/6/d2/4oyJYwSfKvsvbn/II="; }; sourceRoot = "${src.name}/klippy"; diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix index 0f27b36be522..a8847215d65c 100644 --- a/pkgs/servers/krill/default.nix +++ b/pkgs/servers/krill/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "krill"; - version = "0.14.4"; + version = "0.14.5"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-J/QChAFjcUdtrfs5KUIRwfJdfCB/gRnIUNyinf66Slo="; + hash = "sha256-3pkDu20vgzslJcK5KQH+GY+jnimEZgm+bQxy8QMUeCk="; }; - cargoHash = "sha256-Cwrgdo+mirH3kGXwBgCzeO1xiEhSrt/Fx8LxhaBJJLE="; + cargoHash = "sha256-Z12fUK4TUgk38/vNAt8RWLFGLc8WnZAgHWz0xl1QKLI="; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index c49f606c8fd7..0658b7a36fed 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -53,6 +53,16 @@ stdenv.mkDerivation rec { url = "https://github.com/389ds/389-ds-base/commit/1fe029c495cc9f069c989cfbb09d449a078c56e2.patch"; hash = "sha256-b0HSaDjuEUKERIXKg8np+lZDdZNmrCTAXybJzF+0hq0="; }) + (fetchpatch { + name = "CVE-2024-2199.patch"; + url = "https://git.rockylinux.org/staging/rpms/389-ds-base/-/raw/dae373bd6b4e7d6f35a096e6f27be1c3bf1e48ac/SOURCES/0004-CVE-2024-2199.patch"; + hash = "sha256-grANphTafCoa9NQy+FowwPhGQnvuCbfGnSpQ1Wp69Vg="; + }) + (fetchpatch { + name = "CVE-2024-3657.patch"; + url = "https://git.rockylinux.org/staging/rpms/389-ds-base/-/raw/dae373bd6b4e7d6f35a096e6f27be1c3bf1e48ac/SOURCES/0005-CVE-2024-3657.patch"; + hash = "sha256-CuiCXQp3PMiYERzFk7oH3T91yQ1dP/gtLNWF0eqGAQ4="; + }) ]; cargoDeps = rustPlatform.fetchCargoTarball { diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix index 7db37e57c2d2..80d7710ccbaf 100644 --- a/pkgs/servers/ldap/lldap/default.nix +++ b/pkgs/servers/ldap/lldap/default.nix @@ -5,7 +5,6 @@ , nixosTests , rustPlatform , rustc -, stdenv , wasm-bindgen-cli , wasm-pack , which @@ -85,9 +84,6 @@ in rustPlatform.buildRustPackage (commonDerivationAttrs // { changelog = "https://github.com/lldap/lldap/blob/v${lldap.version}/CHANGELOG.md"; license = licenses.gpl3Only; platforms = platforms.linux; - # See comment about wasm32-unknown-unknown in rustc.nix. - broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; maintainers = with maintainers; [ bendlas ]; mainProgram = "lldap"; }; diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index fb63c5e3376c..4fa70976e855 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, chromaprint, makeWrapper, icu, dotnet-runtime, openssl, nixosTests }: +{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, chromaprint, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }: let os = if stdenv.isDarwin then "osx" else "linux"; @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-tc7ODqFifTI7+FhCNmUBAv0s324T4yH4AHIVy64N3/I="; - arm64-linux_hash = "sha256-hmS7m1w07n+1+Eia+hA8oK8fJr+lWyqVq1FGjyRYwaQ="; - x64-osx_hash = "sha256-+t3cEFlk5Agkb14hx1H3WQfpKniJkPImWoRn6swuoOE="; + x64-linux_hash = "sha256-ulWg9BhDr/RFE4sfXGf+i9W0KpOYKjtk49qBeIwI9dU="; + arm64-linux_hash = "sha256-iSXXx89I7Pj2nAuapHwJtIblj+TDrd/k9OiBK8QExSg="; + x64-osx_hash = "sha256-xjnDePaxQWRNo1VmH1sbp0Xtvbac3nu0+fiMg0wMddg="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "lidarr"; - version = "2.2.5.4141"; + version = "2.3.3.4204"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { makeWrapper "${dotnet-runtime}/bin/dotnet" $out/bin/Lidarr \ --add-flags "$out/share/${pname}-${version}/Lidarr.dll" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - curl sqlite libmediainfo icu openssl ]} + curl sqlite libmediainfo icu openssl zlib ]} runHook postInstall ''; diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index fe3d4a2c67b9..283e47965110 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dovecot-fts-xapian"; - version = "1.7.13"; + version = "1.7.14"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; rev = version; - hash = "sha256-WStdB8oeMNHwjF+n254vZFFK5R+2pZhZcQPsVJ88og4="; + hash = "sha256-cLOkXA4kQ15M5TheXy9qZq2je05iY9jwf3tHw20l1Pw="; }; buildInputs = [ xapian icu sqlite ]; diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 749ed890e6ef..dc002c161735 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j86qjs1zw34p0p7d5napa1vvwqlvm9nmv7ckxxhcba1qv4dspmw"; + sha256 = "1c46q4ykf8cqcpzad7zhkrxjhvf92sil0185zvxwzhj95p1zp5vr"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f68h8cl6dqbz7mq3x43s0s82291nani3bz1hrxkk2qpgda23mw9"; + sha256 = "0x100vq4rf2c5ndz8ai00hb5gsb9ax2xqc89dsfzzhxbpa9gs9ik"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "077j47jsg0wqwx5b13n4h0g3g409b6kfrlazpzgjpa3pal74f7sc"; + sha256 = "1hds7b6n7vsa64fmma7wl7x9mxscr89myfb13vxni5fcns1agwzr"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax"; + sha256 = "18k05a55i0xgyv60lx0m1psnyncn935j76ivbp9hssqpij00jj1f"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "044qi3zhzxlfq7slc2pb9ky9mdivp1m1sjyhjvnsi64ggq7cvr22"; + sha256 = "1g54g1kjyrwv9g592gxfz7z6ksmj916l1cgkxk54zhywxf6gpn0y"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa"; + sha256 = "03rfynhj40270dqhkm4cyaphzb37b4fdiaqh9grvcfq760vx7ha5"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yql9v4cd1xbqgnzlf3cv4a6sm26v2y4gsgcbbfgvfc0hhlfjklg"; + sha256 = "1b54didwsg5p8wn30qjwspzh97w7g07hrsdzr7wdrdly4zii7sr1"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1"; + sha256 = "1mi5cppdmkzgr2z135ibs0bq71qndbnip0vfflz1n4j4hqnhjkpg"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf"; + sha256 = "1pkv0jvvjc3grr0rvxni9b3j3hb22jaj0h70g476h9w54p0aljcb"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f4g3589i5ii4gdfazv6d9rjinr16aarh6g12v8378ck7jll3mhz"; + sha256 = "1qdqx20dqkg7iwzb8q5148x5sl9mr2063hxzy4i7i94af2d2vz6b"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh"; + sha256 = "15z11983ws5svibg6rky9k2mgd4d4chnvddyxfpgn81b81q70139"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -539,20 +539,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0511idr8xps9625nh3kxr68sdy6l3xy2kcz7r57g47fxb1v18jj3"; + sha256 = "1dsf9gjc2cj79vrnz2vgq573biqjw7ad4b0idm05xg6rb3y9gq4y"; type = "gem"; }; - version = "0.5.9.6"; + version = "0.5.9.8"; }; charlock_holmes = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; + sha256 = "0cym7a0mrgf8wr27x07ka7fsjz3l7l9qiiyqra34f5k5ghira0c0"; type = "gem"; }; - version = "0.7.7"; + version = "0.7.8"; }; chewy = { dependencies = ["activesupport" "elasticsearch" "elasticsearch-dsl"]; @@ -1344,10 +1344,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.5"; }; i18n-tasks = { dependencies = ["activesupport" "ast" "better_html" "erubi" "highline" "i18n" "parser" "rails-i18n" "rainbow" "terminal-table"]; @@ -1630,10 +1630,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0"; + sha256 = "190n2mk8m1l708kr88fh6mip9sdsh339d2s6sgrik3sbnvz4jmhd"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.4"; }; mario-redis-lock = { dependencies = ["redis"]; @@ -1723,10 +1723,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.7"; }; minitest = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -1870,10 +1870,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xkjz56qc7hl7zy7i7bhiyw5pl85wwjsa4p70rj6s958xj2sd1lm"; + sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.3"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -1881,10 +1881,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lla2macphrlbzkirk0nwwwhcijrfymyfjjw1als0kwqd0n1cdpc"; + sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk"; type = "gem"; }; - version = "1.16.5"; + version = "1.16.6"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; @@ -2079,16 +2079,6 @@ }; version = "3.3.4"; }; - posix-spawn = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0cmb0svalqcxfzlzc5fvrci12b79x7bakasr8gkl3q5rz6di1q52"; - type = "gem"; - }; - version = "0.3.15"; - }; premailer = { dependencies = ["addressable" "css_parser" "htmlentities"]; groups = ["default"]; @@ -2178,10 +2168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mpk0hl6hnv324fp1pfimi2nw9acj0z4gyhrph36qg84pk1s4m7"; + sha256 = "0hj0rkw2z9r1lcg2wlrcld2n3phwrcgqcp7qd1g9a7hwgalh2qzx"; type = "gem"; }; - version = "2.2.8.1"; + version = "2.2.9"; }; rack-attack = { dependencies = ["rack"]; @@ -2255,10 +2245,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v9dp9sgh8kk32r23mj66zjni7w1dv2h7mbaxgmazsf59a43gsvx"; + sha256 = "1sv5jzd3varqzcqm8zxllwiqzgbgcymszw12ci3f9zbzlliq8hby"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2323,10 +2313,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62"; + sha256 = "02z7lqx0y60bzpkd4v67i9sbdh7djs0mm89h343kidx0gmq0kbh0"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; rainbow = { groups = ["default" "development"]; @@ -3034,10 +3024,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; + sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; tilt = { groups = ["default" "development"]; @@ -3353,10 +3343,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m67qmsak3x8ixs8rb971azl3l7wapri65pmbf5z886h46q63f1d"; + sha256 = "08cfb35232p9s1r4jqv8wacv38vxh699mgbr9y03ga89gx9lipqp"; type = "gem"; }; - version = "2.6.13"; + version = "2.6.16"; }; } diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 2c4eaafbbbf6..b2dc7df4ef81 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,7 +1,7 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches, patches ? [] }: let - version = "4.2.9"; + version = "4.2.10"; in ( applyPatches { @@ -9,7 +9,7 @@ in owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-VjR4lXlb1p8mmpOGxPqbmCCEaB7SP90ccPSMfGFx6IQ="; + hash = "sha256-z3veI0CpZk6mBgygqXk8SN/5WWjy5VkKLxC7nOLnyZE="; }; patches = patches ++ []; }) // { diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 136cb0828f32..177cee956ca1 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -32,20 +32,20 @@ let in python.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.109.0"; + version = "1.110.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-AUaHgMKte1EIfI0EQm8YeQVtlXGTm+MZwq22WzYHGsE="; + hash = "sha256-DsDQgmHDU+iJ+00p1uch9Zj6lleDvdTQMy05hi8R9CM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-KwRNn2Ypt87QRUTCsj00zsu6uQtP5MSuM6B2DemoFGs="; + hash = "sha256-J0JBp9pCP00Cjs6T4litjhY28mq0OJDBrRZVSQaS03w="; }; postPatch = '' diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 8811c816a0ac..ac18967dcab2 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -12,13 +12,13 @@ let pname = "matrix-appservice-irc"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-voZJVBggsuwmGw/imt2HYmqiYBkRYMpppt/Nemh6fsM="; + hash = "sha256-ue3fOkrEBRI/NRE+uKFR+NaqP8QvzVVeX3LUh4aZYJA="; }; yarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/servers/matrix-synapse/tools/synadm.nix index 4fa673768d44..ab66d61c8164 100644 --- a/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "synadm"; - version = "0.46"; + version = "0.46.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Wz5ZpaDJIb7k5ZpvIUd/YGrLJwjDwRaS8Tb3FTd2kZU="; + hash = "sha256-EjV3zTd6VAemNS/mD19Caw9SQZW1qs4+07wRxfVq++g="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 12be474fa5ae..786b0e294739 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -37,6 +37,10 @@ buildGoModule rec { hash = "sha256-ZlvO/7kdMopIHBDdFp6wSQCR+NobGdDC6PcVd1iG16E="; }; + # Makes nix-update-script pick up the fetchurl for the webapp. + # https://github.com/Mic92/nix-update/blob/1.3.1/nix_update/eval.py#L179 + offlineCache = webapp; + vendorHash = "sha256-TJCtgNf56A1U0EbV5gXjTro+YudVBRWiSZoBC3nJxnE="; modRoot = "./server"; @@ -69,7 +73,7 @@ buildGoModule rec { passthru = { updateScript = nix-update-script { - extraArgs = [ "--version-regex" "v(9\.5\.[0-9]+)" ]; + extraArgs = [ "--version-regex" "^v(9\.5\.[0-9]+)$" ]; }; tests.mattermost = nixosTests.mattermost; }; diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index 35db7a9c6568..bff0152d7bd1 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -15,16 +15,16 @@ in buildGoModule rec { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-/r5N9RSlYH6xM+JyETuTQWu0YTvaShI6APi8ibpP7Zg="; + hash = "sha256-1VNmqMB0YiR+QmnOWDNp4UYTU7OYhg4TQP8V4pg5UgE="; }; - vendorHash = "sha256-/TgSTXA6SOCfm/wtjJBtyIg4Fo0moJyC640zoIOQ4Fo="; + vendorHash = "sha256-tj752jPxDKfJQzb0rfCz5+/1c3DmKZGUVWJRWuzLJtg="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 7747e4ec092d..ccc9fff51ace 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.26"; + version = "1.6.27"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-yTnHhZo8HPYDA+ndCAxjrEo4fuKEbVlc1SY6PcrNwvc="; + sha256 = "sha256-dP4UR8hmit+RD6epKftjWKr0pm73NOdRxbgSgHGw97U="; }; configureFlags = [ diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 7abf6b2559a3..908fc87537aa 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.50.5"; + version = "0.50.8"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-UfRENrld7uc65xsh9mMh2CuPEspAV3IwsdZXN44ACnM="; + hash = "sha256-Z0xvU8ZT9aXe0NKUhh302XrWwROlkIRHWgcjwzLMr8Q="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 01d92fdde0a9..a31c92d2d20a 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-06-22T05-26-45Z"; + version = "2024-07-04T14-25-45Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-r5T6e2Wzb0uJ7VI6fIHxswkGPi1MsGSj4sC225PQb+o="; + hash = "sha256-3JwfSiddVzyn8+vaj9bOHs3BHx8Okc/BC8C65ageYNM="; }; - vendorHash = "sha256-AK6PGX/ezkN/LAnOLd8fRGkzwhTE4BY63H9ebnXxEOA="; + vendorHash = "sha256-8sgi21P1dwVfSAH/26NNso7S6RzTOmkNh3cGNYmEhXY="; doCheck = false; diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index abc04b539558..05cdfec4278f 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.27.0"; + version = "3.28.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-RxBAnElmQkrkMuIC0UpneJXN1OiPhaTPm/tYvc8QSg8="; + hash = "sha256-HdGRZrMukIQLxTmwTVB/zUlnrhDjq5b6ree7aqx8pRE="; }; vendorHash = "sha256-wrgRQwisOHAhvRbvGXMW5VWkQuEifCwCo3usuxLie4A="; diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index e84dc8ea9e43..dc19615bcdab 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.16.5"; + version = "0.16.6"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "sha256-hkLIJ3vGpnywcOw+bfEsQESGFe1FUcCVJlMlVgGsrNs="; + sha256 = "sha256-FM55vca2mUrd+X5D2KC22uY1X/RoHjEE8IngjzgxYMM="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index 027235986c5e..a7d1374493c1 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "sha256-qHrgNuPDEtFzucE6ACPemUcjEqOvbo4xV0ru4bP3ATE="; + sha256 = "sha256-dgGdSnMsz/6dggZXh5crwHEoVVIlcUIHMH5MSOO29TE="; }; separateDebugInfo = true; - cargoHash = "sha256-BVl4Inr7ZLnilkPVTD2cjJx9RuqB0Mg230o2c2TLw3I="; + cargoHash = "sha256-u7mzViTc0f4vApmmRNl6NkJlMfKeWSO0yupBt6adiag="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = diff --git a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix index 45ad6daedacf..b3f5caa29da1 100644 --- a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix +++ b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix @@ -4,7 +4,7 @@ }: buildGoModule rec { pname = "buildkite-agent-metrics"; - version = "5.9.6"; + version = "5.9.7"; outputs = [ "out" "lambda" ]; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "buildkite"; repo = "buildkite-agent-metrics"; rev = "v${version}"; - hash = "sha256-OrdU640gC14Y4SMtZZtW2Yz82JRwoQRtjY1KCL+vyEc="; + hash = "sha256-HHTPgrMNxaX2fbkf7oasrEopXg6ocMSwdymeNAIrckg="; }; vendorHash = "sha256-i2+nefRE4BD93rG842oZj0/coamYVRMPxEHio80bdWk="; diff --git a/pkgs/servers/monitoring/consul-alerts/deps.nix b/pkgs/servers/monitoring/consul-alerts/deps.nix deleted file mode 100644 index 6494dc61a87c..000000000000 --- a/pkgs/servers/monitoring/consul-alerts/deps.nix +++ /dev/null @@ -1,34 +0,0 @@ -let - mkAwsPackage = name: { - goPackagePath = "github.com/aws/aws-sdk-go/${name}"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "v1.14.13"; - sha256 = "0014b6kl3rbjhjbk7jz116wdgdls54b1bwz454pkn1snlvkj3qil"; - }; - }; -in -[ - (mkAwsPackage "") - (mkAwsPackage "aws/session") - (mkAwsPackage "aws/sns") - (mkAwsPackage "service/sns") - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "v0.3.5"; - sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; - }; - }{ - goPackagePath = "github.com/mitchellh/hashstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/hashstructure"; - rev = "2bca23e0e452137f789efbc8610126fd8b94f73b"; # has no releases as of writing - sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1"; - }; - } -] diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 927a011ded28..ad285956866a 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -3,26 +3,22 @@ , yarn, nodejs, python3, cacert , jq, moreutils , nix-update-script, nixosTests, xcbuild -, util-linux +, faketty }: let - # We need dev dependencies to run webpack, but patch away - # `cypress` (and @grafana/e2e which has a direct dependency on cypress). - # This attempts to download random blobs from the Internet in - # postInstall. Also, it's just a testing framework, so not worth the hassle. - patchAwayGrafanaE2E = '' - find . -name package.json | while IFS=$'\n' read -r pkg_json; do - <"$pkg_json" jq '. + { - "devDependencies": .devDependencies | del(."@grafana/e2e") | del(.cypress) - }' | sponge "$pkg_json" - done - rm -r packages/grafana-e2e + # Grafana seems to just set it to the latest version available + # nowadays. + patchGoVersion = '' + substituteInPlace go.{mod,work} pkg/build/wire/go.mod \ + --replace-fail "go 1.22.4" "go 1.22.3" + substituteInPlace Makefile \ + --replace-fail "GO_VERSION = 1.22.4" "GO_VERSION = 1.22.3" ''; in buildGoModule rec { pname = "grafana"; - version = "11.0.0"; + version = "11.1.0"; subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; @@ -30,11 +26,13 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-cC1dpgb8IiyPIqlVvn8Qi1l7j6lLtQF+BOOO+DQCp4E="; + hash = "sha256-iTTT10YN8jBT4/ukGXNK1QHcyzXnAqg2LiFtNiwnENw="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 - env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + env = { + CYPRESS_INSTALL_BINARY = 0; + } // lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { # Fix error: no member named 'aligned_alloc' in the global namespace. # Occurs while building @esfx/equatable@npm:1.0.2 on x86_64-darwin NIX_CFLAGS_COMPILE = "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; @@ -49,7 +47,7 @@ buildGoModule rec { # @esfx/equatable@npm:1.0.2 fails to build on darwin as it requires `xcbuild` ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; postPatch = '' - ${patchAwayGrafanaE2E} + ${patchGoVersion} ''; buildPhase = '' runHook preBuild @@ -66,23 +64,24 @@ buildGoModule rec { dontFixup = true; outputHashMode = "recursive"; outputHash = rec { - x86_64-linux = "sha256-+Udq8oQSIAHku55VKnrfgHHevzBels0QiOZwnwuts8k="; + x86_64-linux = "sha256-2VnhZBWLdYQhqKCxM63fCAwQXN4Zrh2wCdPBLCCUuvg="; aarch64-linux = x86_64-linux; - aarch64-darwin = "sha256-m3jtZNz0J2nZwFHXVp3ApgDfnGBOJvFeUpqOPQqv200="; + aarch64-darwin = "sha256-MZE3/PHynL6SHOxJgOG41pi2X8XeutruAOyUFY9Lmsc="; x86_64-darwin = aarch64-darwin; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; disallowedRequisites = [ offlineCache ]; - vendorHash = "sha256-kcdW6RQghyAOZUDmIo9G6YBC+YaLHdafvj+fCd+dcDE="; + vendorHash = "sha256-Ny/SoelFVPvBBn50QpHcLTuVY3ynKbCegM1uQkJzB9Y="; proxyVendor = true; - nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; + nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 faketty ] + ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; postPatch = '' - ${patchAwayGrafanaE2E} + ${patchGoVersion} ''; postConfigure = '' @@ -115,7 +114,7 @@ buildGoModule rec { # After having built all the Go code, run the JS builders now. # Workaround for https://github.com/nrwl/nx/issues/22445 - ${util-linux}/bin/script -c 'yarn run build' /dev/null + faketty yarn run build yarn run plugins:build-bundled ''; @@ -156,8 +155,5 @@ buildGoModule rec { maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; mainProgram = "grafana-server"; - # requires util-linux to work around https://github.com/nrwl/nx/issues/22445 - # `script` doesn't seem to be part of util-linux on Darwin though. - broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix index 6f475f49cfa7..893a46e87f78 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix @@ -2,8 +2,9 @@ grafanaPlugin { pname = "grafana-oncall-app"; - version = "1.5.1"; - zipHash = "sha256-3mC4TJ9ACM9e3e6UKI5vaDwXuW6RjbsOQFJU5v0wjk8="; + versionPrefix = "v"; + version = "1.7.1"; + zipHash = "sha256-G3QZq26fzv6sJ5j7QKdPPXhEj95iounZO+Ak8cXZDLc="; meta = with lib; { description = "Developer-friendly incident response for Grafana"; license = licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix index 57af5d265452..2351df623a56 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix @@ -1,14 +1,14 @@ { stdenvNoCC, fetchurl, unzip, lib }: -{ pname, version, zipHash, meta ? {}, passthru ? {}, ... }@args: +{ pname, versionPrefix ? "", version, zipHash, meta ? {}, passthru ? {}, ... }@args: let plat = stdenvNoCC.hostPlatform.system; in stdenvNoCC.mkDerivation ({ - inherit pname version; + inherit pname versionPrefix version; src = if lib.isAttrs zipHash then fetchurl { - name = "${pname}-${version}-${plat}.zip"; + name = "${pname}-${versionPrefix}${version}-${plat}.zip"; hash = zipHash.${plat} or (throw "Unsupported system: ${plat}"); - url = "https://grafana.com/api/plugins/${pname}/versions/${version}/download" + { + url = "https://grafana.com/api/plugins/${pname}/versions/${versionPrefix}${version}/download" + { x86_64-linux = "?os=linux&arch=amd64"; aarch64-linux = "?os=linux&arch=arm64"; x86_64-darwin = "?os=darwin&arch=amd64"; @@ -17,9 +17,9 @@ let plat = stdenvNoCC.hostPlatform.system; in stdenvNoCC.mkDerivation ({ } else fetchurl { - name = "${pname}-${version}.zip"; + name = "${pname}-${versionPrefix}${version}.zip"; hash = zipHash; - url = "https://grafana.com/api/plugins/${pname}/versions/${version}/download"; + url = "https://grafana.com/api/plugins/${pname}/versions/${versionPrefix}${version}/download"; } ; @@ -38,4 +38,4 @@ let plat = stdenvNoCC.hostPlatform.system; in stdenvNoCC.mkDerivation ({ meta = { homepage = "https://grafana.com/grafana/plugins/${pname}"; } // meta; -} // (builtins.removeAttrs args [ "zipHash" "pname" "version" "sha256" "meta" ])) +} // (builtins.removeAttrs args [ "zipHash" "pname" "versionPrefix" "version" "sha256" "meta" ])) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 0cf35895ca6c..febeccee760c 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -10,14 +10,14 @@ }: buildGoModule rec { - version = "3.0.0"; + version = "3.1.0"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-2+OST6bKIjuhrXJKA+8vUERKT1/min7tN8oFxKn3L74="; + hash = "sha256-HISDW6qxpfJpOFweUQo6T+8aV5mvB3o3jnx8CZxweJo="; }; vendorHash = null; @@ -28,6 +28,7 @@ buildGoModule rec { "cmd/loki-canary" "clients/cmd/promtail" "cmd/logcli" + "cmd/lokitool" ]; tags = ["promtail_journal_enabled"]; diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index 7b1763c93446..353d25b7ff05 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: buildGoModule rec { pname = "mimir"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - hash = "sha256-V+O89hS2UopGLxGkg6W4gW8kj5QRzpwCQtq0QFrOWf0="; + hash = "sha256-XBCwc3jpLx8uj+UitFsoIAWVgC/2G8rgjOqrrLLyYdM="; }; vendorHash = null; diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index dd4ffa53e65b..04922b441c0a 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mtail"; - version = "3.0.3"; + version = "3.0.5"; src = fetchFromGitHub { owner = "google"; repo = "mtail"; rev = "v${version}"; - hash = "sha256-AFSEMc7ZFT3fMupCPIA2nQZXIuJvsMXwsS4/zrJV+wM="; + hash = "sha256-+P21rrWgV9xbZV45Z2brb4F1p5qpaWLKgFqdhyhnkR8="; }; - vendorHash = "sha256-qn27BYQdYNfR+9w2SBfBzevtOLTm4Q6nwduL13TgmoY="; + vendorHash = "sha256-7u0r4AppzDpVulTPfI9K1njhHmu2kqESJXMjV3WKZFs="; ldflags = [ "-X=main.Branch=main" diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index 3968f0b5c11c..0a5aa5f6f514 100644 --- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index 2255e660380f..047727dbebb3 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.3.6"; + version = "3.3.7"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-4Fdbu08RbivZF+Hnk+tI1DW9PyzQTI0TngAbZ60CcO8="; + hash = "sha256-5vAoUXXU4hxyRyIytWom40yp0pusshBmCbs0w6+tvF4="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/redis-exporter-deps.nix deleted file mode 100644 index 33747715fbef..000000000000 --- a/pkgs/servers/monitoring/prometheus/redis-exporter-deps.nix +++ /dev/null @@ -1,390 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a751"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "c3de453c63f4"; - sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.1"; - sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; - }; - } - { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "v2.1.1"; - sha256 = "0rl5rs8546zj1vzggv38w93wx0b5dvav7yy5hzxa8kw7iikv1cgr"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.9.0"; - sha256 = "09038mnw705h7isbjp8dzgp2i04bp5rqkmifxvwc5xkh75s00qpw"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.4.0"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.4.0"; - sha256 = "1fjvl5n77abxz5qsd4mgyvjq19x43c5bfvmq62mq3m5plx6zksc8"; - }; - } - { - goPackagePath = "github.com/gomodule/redigo"; - fetch = { - type = "git"; - url = "https://github.com/gomodule/redigo"; - rev = "v1.8.2"; - sha256 = "0wp37175n4lgkq234px9vx0c7mdx8sx3d45zky73az8zbabirwga"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.4.0"; - sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "v1.0.0"; - sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.9"; - sha256 = "0pkn2maymgl9v6vmq9q1si8xr5bbl88n6981y0lx09px6qxb29qx"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.3"; - sha256 = "1yrsd4s8vhjnxhwbigirymz89dn6qfjnhn28i33vvvdgf96j6ypl"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v1.6.0"; - sha256 = "0wwkx69in9dy5kzd3z6rrqf5by8cwl9r7r17fswcpx9rl3g61x1l"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "v0.2.0"; - sha256 = "0jffnz94d6ff39fr96b5w8i8yk26pwnrfggzz8jhi8k0yihg2c9d"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.9.1"; - sha256 = "12pyywb02p7d30ccm41mwn69qsgqnsgv1w9jlqrrln2f1svnbqch"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.11"; - sha256 = "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.6.0"; - sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.5.1"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d28f0bde5980"; - sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "cd5d95a43a6e"; - sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "1957bb5e6d1f"; - sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "google.golang.org/protobuf"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/protobuf"; - rev = "v1.21.0"; - sha256 = "12bwln8z1lf9105gdp6ip0rx741i4yfz1520gxnp8861lh9wcl63"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "41f04d3bba15"; - sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.5"; - sha256 = "08smz8dfyxp02ha74my9iszqa5qzgl3ksi28ilyp8lqipssiq6fg"; - }; - } -] diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index bab564702c17..bca77e93151e 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "justwatchcom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ADfJxo9/CcWi9LgX31a7GYAdigFYRbkFy4PYzecG50Y="; + sha256 = "sha256-K7UDmV56VW4TM5YUl+xUWmE8GUAYbWowm/hU7xBG+Hs="; }; vendorHash = null; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 691928555495..5deb6180704f 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.31.0"; + version = "1.31.1"; subPackages = [ "cmd/telegraf" ]; @@ -17,10 +17,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-bnto39X/Mn8M5YbdM8JSoEPGCb5+UpHS6FPc5Q0kprE="; + hash = "sha256-itZPLiD6XQ6OwXsVrreWM7W268aLc8cz3hqXLdZryAU="; }; - vendorHash = "sha256-uyZZnEdAfkCYtgyjgPTLt463kcfdNczOruHaVmA+VIk="; + vendorHash = "sha256-zhGxla5SQcpwAUzaeG54Sdos3fpJ3zO+ymanLpZtmyg="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/mycorrhiza/default.nix b/pkgs/servers/mycorrhiza/default.nix index 3eb3c731aad3..8f5e86cfe8ae 100644 --- a/pkgs/servers/mycorrhiza/default.nix +++ b/pkgs/servers/mycorrhiza/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "mycorrhiza"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "bouncepaw"; repo = "mycorrhiza"; rev = "v${version}"; - sha256 = "sha256-sSaqcVrJq/ag6urFH2nzpVEFhcQGvXUR7E8NofvTk1A="; + sha256 = "sha256-ovlLOacVhf8phL9LNrMf55oo5KgaCKYeS/of/abE8Bo="; }; - vendorHash = "sha256-xZ3J0/SxABPnmCw716xXG/XJvlvcfsIBuNl1h/z9i5g="; + vendorHash = "sha256-0O831ILIwv2uyTU23x+tnLbUbkrp9ew316uPmqjhxWM="; subPackages = [ "." ]; diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index d8fc873802e5..5efde0fab0e5 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -30,13 +30,13 @@ rustPlatform.buildRustPackage rec { mainProgram = "test_client"; }; }; - tests = { - inherit (nixosTests.nextcloud) - with-postgresql-and-redis27 - with-postgresql-and-redis28 - with-postgresql-and-redis29; - inherit test_client; - }; + tests = + lib.filterAttrs + (key: lib.const (lib.hasPrefix "with-postgresql-and-redis" key)) + nixosTests.nextcloud + // { + inherit test_client; + }; }; meta = with lib; { diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index 64be3b1f5f90..537fe93e01c5 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -10,8 +10,8 @@ let in buildMongoDB { inherit avxSupport; - version = "6.0.15"; - sha256 = "sha256-DX1wbrDx1/JrEHbzNaXC4Hqq7MrLqz+JZgG98beyVds="; + version = "6.0.16"; + sha256 = "sha256-DdMWacJTx6sxgIKG2M8DkboSBr0fD2w91M+ZYt75hQI="; patches = [ # Patches a bug that it couldn't build MongoDB 6.0 on gcc 13 because a include in ctype.h was missing ./fix-gcc-13-ctype-6_0.patch diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 30317fdb3b93..f4b375a62cc1 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "neo4j"; - version = "5.20.0"; + version = "5.21.0"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - hash = "sha256-IDIVdIQCcChx5RHG3/88Yvclh8ToDfcDv4VAhcQ20GY="; + hash = "sha256-NFGoUqmG8VArQqx0p8qDUgvbtRnYbk1MYPSQ5CUFexg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nzbhydra2/default.nix b/pkgs/servers/nzbhydra2/default.nix index 7c70857585cc..ab51aebed1be 100644 --- a/pkgs/servers/nzbhydra2/default.nix +++ b/pkgs/servers/nzbhydra2/default.nix @@ -9,15 +9,19 @@ }: stdenv.mkDerivation rec { pname = "nzbhydra2"; - version = "4.7.6"; + version = "7.2.3"; src = fetchzip { - url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-linux.zip"; - hash = "sha512-vc+VInEnh00bASxcEwSjJcsa0QJHmtRzSz30uW60wGmA24tlaJYSk42N5KpGFbkQkOkb2ijHmKGxPogSa4izRQ=="; + url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-generic.zip"; + hash = "sha256-gGTEOqqnVSgsKvEjd6b5aG8EM2M8u0FdpIebYNQFP50="; stripRoot = false; }; - nativeBuildInputs = [jre makeWrapper unzip]; + nativeBuildInputs = [ + jre + makeWrapper + unzip + ]; installPhase = '' runHook preInstall @@ -37,7 +41,7 @@ stdenv.mkDerivation rec { description = "Usenet meta search"; homepage = "https://github.com/theotherp/nzbhydra2"; license = licenses.asl20; - maintainers = with maintainers; [jamiemagee]; + maintainers = with maintainers; [ matteopacini ]; platforms = with platforms; linux; mainProgram = "nzbhydra2"; }; diff --git a/pkgs/servers/osmocom/libasn1c/default.nix b/pkgs/servers/osmocom/libasn1c/default.nix index a7d6f69f1206..c86475c69b85 100644 --- a/pkgs/servers/osmocom/libasn1c/default.nix +++ b/pkgs/servers/osmocom/libasn1c/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/osmocom/libasn1c/"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/osmocom/libosmo-netif/default.nix b/pkgs/servers/osmocom/libosmo-netif/default.nix index 256fdeee4148..440050cc2cdb 100644 --- a/pkgs/servers/osmocom/libosmo-netif/default.nix +++ b/pkgs/servers/osmocom/libosmo-netif/default.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ - janik markuskowa ]; }; diff --git a/pkgs/servers/osmocom/libosmo-sccp/default.nix b/pkgs/servers/osmocom/libosmo-sccp/default.nix index bf814576c164..b4f6091cdacc 100644 --- a/pkgs/servers/osmocom/libosmo-sccp/default.nix +++ b/pkgs/servers/osmocom/libosmo-sccp/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ - janik markuskowa ]; }; diff --git a/pkgs/servers/osmocom/libosmoabis/default.nix b/pkgs/servers/osmocom/libosmoabis/default.nix index 6de87da1dc8d..9a48278786bd 100644 --- a/pkgs/servers/osmocom/libosmoabis/default.nix +++ b/pkgs/servers/osmocom/libosmoabis/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ - janik markuskowa ]; }; diff --git a/pkgs/servers/osmocom/libosmocore/default.nix b/pkgs/servers/osmocom/libosmocore/default.nix index 770dcd97f0a4..af000b142df5 100644 --- a/pkgs/servers/osmocom/libosmocore/default.nix +++ b/pkgs/servers/osmocom/libosmocore/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ mog - janik ]; }; } diff --git a/pkgs/servers/osmocom/osmo-bsc/default.nix b/pkgs/servers/osmocom/osmo-bsc/default.nix index 1df6e7dd4c3b..eab88ea99cb0 100644 --- a/pkgs/servers/osmocom/osmo-bsc/default.nix +++ b/pkgs/servers/osmocom/osmo-bsc/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "GSM Base Station Controller"; homepage = "https://projects.osmocom.org/projects/osmobsc"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "osmo-bsc"; }; diff --git a/pkgs/servers/osmocom/osmo-bts/default.nix b/pkgs/servers/osmocom/osmo-bts/default.nix index 42a214f7ce45..1484c07f62e0 100644 --- a/pkgs/servers/osmocom/osmo-bts/default.nix +++ b/pkgs/servers/osmocom/osmo-bts/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Osmocom GSM Base Transceiver Station (BTS)"; homepage = "https://osmocom.org/projects/osmobts"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/osmocom/osmo-ggsn/default.nix b/pkgs/servers/osmocom/osmo-ggsn/default.nix index 51615fdb1b3c..3c1cac479bb2 100644 --- a/pkgs/servers/osmocom/osmo-ggsn/default.nix +++ b/pkgs/servers/osmocom/osmo-ggsn/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Osmocom Gateway GPRS Support Node (GGSN), successor of OpenGGSN"; homepage = "https://osmocom.org/projects/openggsn"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "osmo-ggsn"; }; diff --git a/pkgs/servers/osmocom/osmo-hlr/default.nix b/pkgs/servers/osmocom/osmo-hlr/default.nix index 112e3c873902..a8e017fabcb1 100644 --- a/pkgs/servers/osmocom/osmo-hlr/default.nix +++ b/pkgs/servers/osmocom/osmo-hlr/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Osmocom implementation of 3GPP Home Location Registr (HLR)"; homepage = "https://osmocom.org/projects/osmo-hlr"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "osmo-hlr"; }; diff --git a/pkgs/servers/osmocom/osmo-hnbgw/default.nix b/pkgs/servers/osmocom/osmo-hnbgw/default.nix index 30f0923073cb..7d9b8c54ff4b 100644 --- a/pkgs/servers/osmocom/osmo-hnbgw/default.nix +++ b/pkgs/servers/osmocom/osmo-hnbgw/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-hnbgw"; homepage = "https://osmocom.org/projects/osmohnbgw"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/osmocom/osmo-hnodeb/default.nix b/pkgs/servers/osmocom/osmo-hnodeb/default.nix index 95dd6bf72b70..b187ddd4f55d 100644 --- a/pkgs/servers/osmocom/osmo-hnodeb/default.nix +++ b/pkgs/servers/osmocom/osmo-hnodeb/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-hnodeb"; homepage = "https://osmocom.org/projects/osmo-hnodeb"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/osmocom/osmo-iuh/default.nix b/pkgs/servers/osmocom/osmo-iuh/default.nix index 56a94efbb02c..a5653a31c944 100644 --- a/pkgs/servers/osmocom/osmo-iuh/default.nix +++ b/pkgs/servers/osmocom/osmo-iuh/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { description = "Osmocom IuH library"; homepage = "https://osmocom.org/projects/osmohnbgw/wiki"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/osmocom/osmo-mgw/default.nix b/pkgs/servers/osmocom/osmo-mgw/default.nix index 939f062a7b4f..92986952378e 100644 --- a/pkgs/servers/osmocom/osmo-mgw/default.nix +++ b/pkgs/servers/osmocom/osmo-mgw/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-mgw"; homepage = "https://osmocom.org/projects/osmo-mgw"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/osmocom/osmo-msc/default.nix b/pkgs/servers/osmocom/osmo-msc/default.nix index da6e719707ef..de73eb980bbf 100644 --- a/pkgs/servers/osmocom/osmo-msc/default.nix +++ b/pkgs/servers/osmocom/osmo-msc/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-msc"; homepage = "https://osmocom.org/projects/osmomsc/wiki"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/osmocom/osmo-pcu/default.nix b/pkgs/servers/osmocom/osmo-pcu/default.nix index 13b34b67b333..1d079d3a8c04 100644 --- a/pkgs/servers/osmocom/osmo-pcu/default.nix +++ b/pkgs/servers/osmocom/osmo-pcu/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-pcu"; homepage = "https://osmocom.org/projects/osmopcu"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/osmocom/osmo-sgsn/default.nix b/pkgs/servers/osmocom/osmo-sgsn/default.nix index 9529c4f50cad..0bcd2218a59c 100644 --- a/pkgs/servers/osmocom/osmo-sgsn/default.nix +++ b/pkgs/servers/osmocom/osmo-sgsn/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "Osmocom implementation of the 3GPP Serving GPRS Support Node (SGSN)"; homepage = "https://osmocom.org/projects/osmosgsn"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "osmo-sgsn"; }; diff --git a/pkgs/servers/osmocom/osmo-sip-connector/default.nix b/pkgs/servers/osmocom/osmo-sip-connector/default.nix index 0a5ab9ab9fd5..77e4b8df3c5b 100644 --- a/pkgs/servers/osmocom/osmo-sip-connector/default.nix +++ b/pkgs/servers/osmocom/osmo-sip-connector/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-sip-connector"; homepage = "https://osmocom.org/projects/osmo-sip-conector"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index c7549e1913a1..bbed9967c2ac 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -27,7 +27,6 @@ with python3.pkgs; buildPythonApplication rec { nativeBuildInputs = [ pdm-pep517 - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 00e1f8cc38a4..a8812cfa2841 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.22.14"; + version = "0.22.15"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-d2gqw3IJBkU2sfBf5J0E45VzFtuSox4cHpPucsl/o4s="; + hash = "sha256-HdsQ/l0TjvOegbX6YGI2ZZkZKofxJoXFIpUb2Vss1hc="; }; - vendorHash = "sha256-G5VD5Joq/p1rur0SmK1xNQxtNZh7ZqR5I4j8fgswoDo="; + vendorHash = "sha256-KG1etP/wrjoDCTNYB9J5gmW2NMgBZQcdA1QfXKGipO8="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 5fbbf1752184..61b867b65332 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -21,15 +21,15 @@ let }.${stdenv.hostPlatform.system} or unsupported; hash = { - aarch64-darwin = "sha256-Scv4gXZZBujz/lq4QphH7rCQxTS7JT9wHpG4qsPK1mA="; - aarch64-linux = "sha256-fEDXNUrhSpheBFis7OdK4+fvpvm4+D4ulM/+h5erZLA="; - x86_64-darwin = "sha256-dgPuqclFQp/fOEIY32rlIqZIYbDzRbgHiYJRoICYWhg="; - x86_64-linux = "sha256-c89EiThP2LgkaeDxx01rQTtFZGcXvpMgo6yp+VViJO0="; + aarch64-darwin = "sha256-4bzeHU52XNAZW24P6uKQ0etUCW7dIsVpujrilPrI3hM="; + aarch64-linux = "sha256-0IpayOFTxhdbz7R3PhbTsdweMdDyY6J5WJ8JX/6aFbg="; + x86_64-darwin = "sha256-6hcuD63xwolT/dDKnrdfosyJy1W5kyPJJf/H4u6XGfw="; + x86_64-linux = "sha256-7ZDdXAVdMAArOy7iYaqmS6s70TQaZIknRoLRyTKpULg="; }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.18.0.4543"; + version = "1.19.0.4568"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/pufferpanel/default.nix b/pkgs/servers/pufferpanel/default.nix index ce8a2762f07b..e70106200b13 100644 --- a/pkgs/servers/pufferpanel/default.nix +++ b/pkgs/servers/pufferpanel/default.nix @@ -101,7 +101,7 @@ buildGoModule rec { description = "Free, open source game management panel"; homepage = "https://www.pufferpanel.com/"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ckie tie ]; + maintainers = with maintainers; [ tie ]; mainProgram = "pufferpanel"; }; } diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 914eb44019e3..c8acc5debbfd 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -10,15 +10,15 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-rKe1xQR3lkPXQBUWmKdHUu/AQ99U1kCINeXV2z/ZG5o="; - arm64-linux_hash = "sha256-O/6brSo25E4BxvxAUQvwQa9kMY/Ga3YxgS+fuaL6/n0="; - x64-osx_hash = "sha256-oVBs0evwPl3Dd6GZlzUWqopB0Zq4mOCUwmLOjs44d6Q="; - arm64-osx_hash = "sha256-iUBy9ob2zOdKVhGbwsJx1ZrT9tD4D1BPLqjB46tCW08="; + x64-linux_hash = "sha256-MlnT16a2l209uqu9DuXLwqf4yiWBn9MggqVubzg0pM4="; + arm64-linux_hash = "sha256-2NkklAOjpDbAXid+rayiQ+jndLluIAMEiKz0MA1Hg0k="; + x64-osx_hash = "sha256-OzUZsXUwE7jF4h/rCvWAY5mh97z/cUbhh6MK0ozHC+A="; + arm64-osx_hash = "sha256-ggNqWCixkHxhiWTYfUx9qeZ9ocTyJEEgSZJqgGOnL+Q="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "5.6.0.8846"; + version = "5.7.0.8882"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index 7040e2947056..f2f159f8e412 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-GncaJNZEbApPl6Tt9k0NblRPdYnOGiR1V6VTJB8+LIU="; - arm64-linux_hash = "sha256-PvZHTjBmcpfu7fg5TLgcGoLofnAr6QM/2uNbGOpsx+U="; - x64-osx_hash = "sha256-h6JPb9esNlR+zqa8P0U2+zeLyW2JWw+AE/5PBHBGIQA="; + x64-linux_hash = "sha256-jnsIftFHc2UpmW3WBWCff+cUqN40u/xKfQRMS1iMu4M="; + arm64-linux_hash = "sha256-ATdE9wXpew1D0wd/j2ntXBVYj/dMm/rWZLfOBKdrmnY="; + x64-osx_hash = "sha256-2/cUd45vhqdXAsrVPKlRTwOMd+kamW1OIOaB9G7xnjc="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.28.2554"; + version = "0.3.29.2565"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/rinetd/default.nix b/pkgs/servers/rinetd/default.nix index 23f1e89a780f..1cd7d19059d4 100644 --- a/pkgs/servers/rinetd/default.nix +++ b/pkgs/servers/rinetd/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/samhocevar/rinetd"; changelog = "https://github.com/samhocevar/rinetd/blob/${src.rev}/CHANGES.md"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "rinetd"; }; } diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index d6fee8dc56c6..368bca558cdf 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1413"; + version = "2.0-1432"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-VoTJu5+zuFFknDolGJ/69e1i6B4vfR9ev7sAKhfeRlU="; + hash = "sha256-h0Ly5S8ML29RtaZOpe0k4U/R0coClHHGUZyu5d1PqzQ="; }; dontConfigure = true; diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock index 321e3053e536..3c728f348192 100644 --- a/pkgs/servers/search/meilisearch/Cargo.lock +++ b/pkgs/servers/search/meilisearch/Cargo.lock @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743" +checksum = "4eb9843d84c775696c37d9a418bbb01b932629d01870722c0f13eb3f95e2536d" dependencies = [ "actix-codec", "actix-rt", @@ -46,7 +46,7 @@ dependencies = [ "actix-tls", "actix-utils", "ahash", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.5.0", "brotli", "bytes", @@ -80,18 +80,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "actix-router" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" dependencies = [ "bytestring", + "cfg-if", "http 0.2.11", "regex", + "regex-lite", "serde", "tracing", ] @@ -138,9 +140,9 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cce60a2f2b477bc72e5cde0af1812a6e82d8fd85b5570a5dcf2a5bf2c5be5f" +checksum = "ac453898d866cdbecdbc2334fe1738c747b4eba14a677261f2b768ba05329389" dependencies = [ "actix-rt", "actix-service", @@ -167,9 +169,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.5.1" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984" +checksum = "b1cf67dadb19d7c95e5a299e2dda24193b89d5d4f33a3b9800888ede9e19aa32" dependencies = [ "actix-codec", "actix-http", @@ -196,7 +198,7 @@ dependencies = [ "mime", "once_cell", "pin-project-lite", - "regex", + "regex-lite", "serde", "serde_json", "serde_urlencoded", @@ -220,8 +222,9 @@ dependencies = [ [[package]] name = "actix-web-static-files" -version = "3.0.5" -source = "git+https://github.com/kilork/actix-web-static-files.git?rev=2d3b6160#2d3b6160f0de4ba061c5d76b5704f34fb677f6df" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adf6d1ef6d7a60e084f9e0595e2a5234abda14e76c105ecf8e2d0e8800c41a1f" dependencies = [ "actix-web", "derive_more", @@ -378,9 +381,9 @@ dependencies = [ [[package]] name = "arroy" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efddeb1e7c32a551cc07ef4c3e181e3cd5478fdaf4f0bd799983171c1f6efe57" +checksum = "2ece9e5347e7fdaaea3181dec7f916677ad5f3fcbac183648ce1924eb4aeef9a" dependencies = [ "bytemuck", "byteorder", @@ -424,7 +427,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -435,7 +438,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -486,6 +489,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" @@ -494,7 +503,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "benchmarks" -version = "1.8.3" +version = "1.9.0" dependencies = [ "anyhow", "bytes", @@ -552,7 +561,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -607,9 +616,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.4.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -618,9 +627,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -639,7 +648,7 @@ dependencies = [ [[package]] name = "build-info" -version = "1.8.3" +version = "1.9.0" dependencies = [ "anyhow", "time", @@ -670,9 +679,9 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" dependencies = [ "bytemuck_derive", ] @@ -685,7 +694,7 @@ checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -845,9 +854,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.90" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" dependencies = [ "jobserver", "libc", @@ -889,9 +898,9 @@ dependencies = [ [[package]] name = "charabia" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933f20f2269b24d32fd5503e7b3c268af902190daf8d9d2b73ed2e75d77c00b4" +checksum = "11a09ae38cfcc153f01576c3f579dfd916e0320f1b474f298c8d680b2dd92eb6" dependencies = [ "aho-corasick", "cow-utils", @@ -980,7 +989,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.10.0", ] [[package]] @@ -992,7 +1001,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1271,12 +1280,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] @@ -1289,22 +1298,22 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.58", + "strsim 0.11.1", + "syn 2.0.60", ] [[package]] @@ -1320,13 +1329,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.3", + "darling_core 0.20.9", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1356,7 +1365,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1377,6 +1386,15 @@ dependencies = [ "derive_builder_macro 0.13.1", ] +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro 0.20.0", +] + [[package]] name = "derive_builder_core" version = "0.12.0" @@ -1401,6 +1419,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_builder_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +dependencies = [ + "darling 0.20.9", + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "derive_builder_macro" version = "0.12.0" @@ -1421,6 +1451,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core 0.20.0", + "syn 2.0.60", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -1448,7 +1488,7 @@ dependencies = [ "serde-cs", "serde_json", "serde_urlencoded", - "strsim", + "strsim 0.10.0", ] [[package]] @@ -1460,7 +1500,7 @@ dependencies = [ "convert_case 0.6.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1530,16 +1570,16 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "doxygen-rs" -version = "0.2.2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff670ea0c9bbb8414e7efa6e23ebde2b8f520a7eef78273a3918cf1903e7505" +checksum = "415b6ec780d34dcf624666747194393603d0373b7141eef01d12ee58881507d9" dependencies = [ "phf", ] [[package]] name = "dump" -version = "1.8.3" +version = "1.9.0" dependencies = [ "anyhow", "big_s", @@ -1678,7 +1718,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1698,30 +1738,7 @@ checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", + "syn 2.0.60", ] [[package]] @@ -1778,16 +1795,16 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d15473d7f83b54a44826907af16ae5727eaacaf6e53b51474016d3efd9aa35d5" dependencies = [ - "darling 0.20.3", + "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "uuid", ] [[package]] name = "file-store" -version = "1.8.3" +version = "1.9.0" dependencies = [ "faux", "tempfile", @@ -1810,7 +1827,7 @@ dependencies = [ [[package]] name = "filter-parser" -version = "1.8.3" +version = "1.9.0" dependencies = [ "insta", "nom", @@ -1830,7 +1847,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "1.8.3" +version = "1.9.0" dependencies = [ "criterion", "serde_json", @@ -1913,7 +1930,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1948,7 +1965,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.8.3" +version = "1.9.0" dependencies = [ "arbitrary", "clap", @@ -2117,9 +2134,9 @@ checksum = "36d244a08113319b5ebcabad2b8b7925732d15eec46d7e7ac3c11734f3b7a6ad" [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", @@ -2256,12 +2273,11 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "heed" -version = "0.20.0-alpha.9" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9648a50991c86df7d00c56c268c27754fcf4c80be2ba57fc4a00dc928c6fe934" +checksum = "f60d7cff16094be9627830b399c087a25017e93fb3768b87cd656a68ccb1ebe8" dependencies = [ "bitflags 2.5.0", - "bytemuck", "byteorder", "heed-traits", "heed-types", @@ -2275,15 +2291,15 @@ dependencies = [ [[package]] name = "heed-traits" -version = "0.20.0-alpha.9" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab0b7d9cde969ad36dde692e487dc89d97f7168bf6a7bd3b894ad4bf7278298" +checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff" [[package]] name = "heed-types" -version = "0.20.0-alpha.9" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0cb3567a7363f28b597bf6e9897b9466397951dd0e52df2c8196dd8a71af44a" +checksum = "3cb0d6ba3700c9a57e83c013693e3eddb68a6d9b6781cacafc62a0d992e8ddb3" dependencies = [ "bincode", "byteorder", @@ -2374,12 +2390,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyper" version = "0.14.27" @@ -2413,7 +2423,7 @@ dependencies = [ "futures-util", "http 0.2.11", "hyper", - "rustls 0.21.10", + "rustls 0.21.12", "tokio", "tokio-rustls", ] @@ -2442,9 +2452,10 @@ checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" [[package]] name = "index-scheduler" -version = "1.8.3" +version = "1.9.0" dependencies = [ "anyhow", + "arroy", "big_s", "bincode", "crossbeam", @@ -2455,11 +2466,11 @@ dependencies = [ "file-store", "flate2", "insta", + "maplit", "meili-snap", "meilisearch-auth", "meilisearch-types", "page_size 0.5.0", - "puffin", "rayon", "roaring", "serde", @@ -2638,7 +2649,7 @@ dependencies = [ [[package]] name = "json-depth-checker" -version = "1.8.3" +version = "1.9.0" dependencies = [ "criterion", "serde_json", @@ -2774,9 +2785,9 @@ dependencies = [ [[package]] name = "lindera" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1bbf252ea3490053dc397539ece0b510924f2f72605fa28d3e858d86f43ec88" +checksum = "dcd4fa369654517f72c10b24adf03ad4ce69d19facb79c3cb3cf9b4580ac352f" dependencies = [ "lindera-analyzer", "lindera-core", @@ -2787,9 +2798,9 @@ dependencies = [ [[package]] name = "lindera-analyzer" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87febfec0e2859ce2154fb90dd6f66b774ddb0b6e264b44f8e3d1303c9dcedd7" +checksum = "c2cba7fe275cb8ec4c594cfee9cc39e48b71e02a089457d52f3e70dc146a8133" dependencies = [ "anyhow", "bincode", @@ -2817,9 +2828,9 @@ dependencies = [ [[package]] name = "lindera-cc-cedict" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb91bb8a93ab0f95dbc3c43b5105354bb059134ef731154f75a64b5d919e71d" +checksum = "240adf9faba3f09ad16557aefcd316dd00ebb940ac94334a629660d772f118c1" dependencies = [ "bincode", "byteorder", @@ -2831,29 +2842,21 @@ dependencies = [ [[package]] name = "lindera-cc-cedict-builder" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6022a8309a287dbef425fd09a61585351670c83001d74f6c089979e2330b683" +checksum = "f12241f9e74babe708a0b9441d9f3fa67cb29fd01257918f30ffd480ca568820" dependencies = [ "anyhow", - "bincode", - "byteorder", - "csv", - "encoding", - "env_logger", - "glob", - "lindera-compress", "lindera-core", "lindera-decompress", - "log", - "yada", + "lindera-dictionary-builder", ] [[package]] name = "lindera-compress" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32363cbcf433f915e7d77c2a0c410db2d6b23442e80715cf2cf6b9864078a500" +checksum = "50f9f7a858d70ff9e4383cbd507ca9e98c8faf0319e08c10df4c30cb58c9ca6c" dependencies = [ "anyhow", "flate2", @@ -2862,9 +2865,9 @@ dependencies = [ [[package]] name = "lindera-core" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9a0e858753a02b1a3524fae4fbb11ca4b3a947128fd7854b797386562678be8" +checksum = "7f09810ab98ce2a084d788ac38fbb7b31697f34bc47c61de0d880320a674bd15" dependencies = [ "anyhow", "bincode", @@ -2879,9 +2882,9 @@ dependencies = [ [[package]] name = "lindera-decompress" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e406345f6f8b665b9a129c67079c18ca9d97e9d171d102b4106a64a592c285e" +checksum = "d53400c9b2dd6b45f82d9fa5b5efe079f3acaf6ce609dba8d42c8a76baaa2b12" dependencies = [ "anyhow", "flate2", @@ -2890,9 +2893,9 @@ dependencies = [ [[package]] name = "lindera-dictionary" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2a3ec0e5fd6768a27c6ec1040e8470d3a5926418f7afe065859e98aabb3bfe" +checksum = "2053d064a515839250438b8dfa6cf445e2b97633232ded34a54f267e945d196e" dependencies = [ "anyhow", "bincode", @@ -2914,10 +2917,32 @@ dependencies = [ ] [[package]] -name = "lindera-filter" -version = "0.30.0" +name = "lindera-dictionary-builder" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1badaf51bad051185ea4917ba91bbbf2d6f8167e155647e21e0eaaef0982a95d" +checksum = "14f486924055f8bedcc5877572e4dc91fbc10370862430ac2e5f7f0d671a18c8" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "csv", + "derive_builder 0.20.0", + "encoding", + "encoding_rs", + "encoding_rs_io", + "glob", + "lindera-compress", + "lindera-core", + "lindera-decompress", + "log", + "yada", +] + +[[package]] +name = "lindera-filter" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb3904fc279f0297f6fd6210435adab1f8c82ba84eba8635407c791af51c0d8a" dependencies = [ "anyhow", "csv", @@ -2940,9 +2965,9 @@ dependencies = [ [[package]] name = "lindera-ipadic" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129ec16366354998f9791467ad38731539197747f649e573ead845358271ce25" +checksum = "4aa3ef2f1f6838b0fa2e2fca2896242bb83bc877c1760cdb6fa23449ab95d664" dependencies = [ "bincode", "byteorder", @@ -2954,31 +2979,21 @@ dependencies = [ [[package]] name = "lindera-ipadic-builder" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f0979a56bc57e9c9be2996dff232c47aa146a2e7baebf5dd567e388eba3dd90" +checksum = "a41287db18eadb58d73a04d49778d41c161549fbbbe155d4338976b7b8541c7d" dependencies = [ "anyhow", - "bincode", - "byteorder", - "csv", - "encoding_rs", - "encoding_rs_io", - "env_logger", - "glob", - "lindera-compress", "lindera-core", "lindera-decompress", - "log", - "serde", - "yada", + "lindera-dictionary-builder", ] [[package]] name = "lindera-ipadic-neologd" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20076660c4e79ef0316735b44e18ec7644e54786acdee8946c972d5f97086d0f" +checksum = "49382256f245078400bf7e72663f9eb30afcd9ed54cd46f29d7db1be529678e1" dependencies = [ "bincode", "byteorder", @@ -2990,31 +3005,21 @@ dependencies = [ [[package]] name = "lindera-ipadic-neologd-builder" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eccd18ed5f65d1d64ac0cbfa1d6827bfbbaf6530520ae6847e6a91ee38f47e20" +checksum = "5ae9cfd2fda68ef526ef0c7b50c5d4d5582a4daa6ecd0cea9e2b0b62564a2a5d" dependencies = [ "anyhow", - "bincode", - "byteorder", - "csv", - "encoding_rs", - "encoding_rs_io", - "env_logger", - "glob", - "lindera-compress", "lindera-core", "lindera-decompress", - "log", - "serde", - "yada", + "lindera-dictionary-builder", ] [[package]] name = "lindera-ko-dic" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59073171566c3e498ca048e84c2d0a7e117a42f36c8eb7d7163e65ac38bd6d48" +checksum = "7f86d03a863f3ae1d269e7b7d4dd2cce9385a53463479bafc5d7aa48719f36db" dependencies = [ "bincode", "byteorder", @@ -3030,29 +3035,21 @@ dependencies = [ [[package]] name = "lindera-ko-dic-builder" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae176afa8535ca2a5ee9471873f85d531db0a6c32a3c42b41084506aac22b577" +checksum = "bd0f44f2e56358c5879dfb5e7f76cc6ba7853ec31082c4e3f8fb65fb2d849c51" dependencies = [ "anyhow", - "bincode", - "byteorder", - "csv", - "encoding", - "env_logger", - "glob", - "lindera-compress", "lindera-core", "lindera-decompress", - "log", - "yada", + "lindera-dictionary-builder", ] [[package]] name = "lindera-tokenizer" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "457285bdde84571aa510c9e05371904305a55e8a541fa1473d4393062f06932d" +checksum = "7c5182735cdc2832ac757b31e8a5b150a3514357a30efe3dec212f8dcb06ba14" dependencies = [ "bincode", "lindera-core", @@ -3064,9 +3061,9 @@ dependencies = [ [[package]] name = "lindera-unidic" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5839980be552dfa639b70964c61914a9ad014148663679b0e148aa72e5e30f23" +checksum = "6c63da104728dd1cf14bfa564753cbfa996f6078ed2e23e31475bd1d639fc597" dependencies = [ "bincode", "byteorder", @@ -3082,22 +3079,14 @@ dependencies = [ [[package]] name = "lindera-unidic-builder" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcaab8f061d5b944b1e424f49c7efbf8f276e8a72e4f4ff956d01e46d481f008" +checksum = "04acecbc068dac21766a1b7ed1f2608b6f250d10b4f8bff67abc2a00437a0974" dependencies = [ "anyhow", - "bincode", - "byteorder", - "csv", - "encoding", - "env_logger", - "glob", - "lindera-compress", "lindera-core", "lindera-decompress", - "log", - "yada", + "lindera-dictionary-builder", ] [[package]] @@ -3157,7 +3146,7 @@ checksum = "fc2fb41a9bb4257a3803154bdf7e2df7d45197d1941c9b1a90ad815231630721" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -3183,14 +3172,13 @@ checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" [[package]] name = "lmdb-master-sys" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629c123f5321b48fa4f8f4d3b868165b748d9ba79c7103fb58e3a94f736bcedd" +checksum = "a5142795c220effa4c8f4813537bd4c88113a07e45e93100ccb2adc5cec6c7f3" dependencies = [ "cc", "doxygen-rs", "libc", - "pkg-config", ] [[package]] @@ -3213,9 +3201,9 @@ checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -3227,12 +3215,6 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" -[[package]] -name = "lz4_flex" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8c72594ac26bfd34f2d99dfced2edfaddfe8a476e3ff2ca0eb293d925c4f83" - [[package]] name = "macro_rules_attribute" version = "0.2.0" @@ -3258,7 +3240,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -3275,7 +3257,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.8.3" +version = "1.9.0" dependencies = [ "insta", "md5", @@ -3284,7 +3266,7 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.8.3" +version = "1.9.0" dependencies = [ "actix-cors", "actix-http", @@ -3337,12 +3319,11 @@ dependencies = [ "pin-project-lite", "platform-dirs", "prometheus", - "puffin", "rand", "rayon", "regex", "reqwest", - "rustls 0.21.10", + "rustls 0.21.12", "rustls-pemfile", "segment", "serde", @@ -3377,7 +3358,7 @@ dependencies = [ [[package]] name = "meilisearch-auth" -version = "1.8.3" +version = "1.9.0" dependencies = [ "base64 0.21.7", "enum-iterator", @@ -3396,7 +3377,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "1.8.3" +version = "1.9.0" dependencies = [ "actix-web", "anyhow", @@ -3426,7 +3407,7 @@ dependencies = [ [[package]] name = "meilitool" -version = "1.8.3" +version = "1.9.0" dependencies = [ "anyhow", "clap", @@ -3465,7 +3446,7 @@ dependencies = [ [[package]] name = "milli" -version = "1.8.3" +version = "1.9.0" dependencies = [ "arroy", "big_s", @@ -3505,7 +3486,6 @@ dependencies = [ "obkv", "once_cell", "ordered-float", - "puffin", "rand", "rand_pcg", "rayon", @@ -3598,7 +3578,7 @@ checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -3906,7 +3886,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.8.3" +version = "1.9.0" dependencies = [ "big_s", "serde_json", @@ -3942,7 +3922,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -3996,7 +3976,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -4025,7 +4005,7 @@ checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -4133,9 +4113,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -4176,23 +4156,6 @@ version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" -[[package]] -name = "puffin" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76425abd4e1a0ad4bd6995dd974b52f414fca9974171df8e3708b3e660d05a21" -dependencies = [ - "anyhow", - "bincode", - "byteorder", - "cfg-if", - "instant", - "lz4_flex", - "once_cell", - "parking_lot", - "serde", -] - [[package]] name = "pulp" version = "0.18.9" @@ -4207,9 +4170,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -4362,6 +4325,12 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "regex-lite" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" + [[package]] name = "regex-syntax" version = "0.8.2" @@ -4391,7 +4360,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.10", + "rustls 0.21.12", "rustls-pemfile", "serde", "serde_json", @@ -4410,12 +4379,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "retain_mut" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" - [[package]] name = "ring" version = "0.17.8" @@ -4433,13 +4396,12 @@ dependencies = [ [[package]] name = "roaring" -version = "0.10.2" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6106b5cf8587f5834158895e9715a3c6c9716c8aefab57f1f7680917191c7873" +checksum = "7699249cc2c7d71939f30868f47e9d7add0bdc030d90ee10bfd16887ff8bb1c8" dependencies = [ "bytemuck", "byteorder", - "retain_mut", "serde", ] @@ -4505,9 +4467,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", @@ -4517,9 +4479,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", @@ -4540,9 +4502,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" [[package]] name = "rustls-webpki" @@ -4643,9 +4605,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] @@ -4661,20 +4623,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "indexmap", "itoa", @@ -4922,6 +4884,12 @@ 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.2" @@ -4941,7 +4909,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -4963,9 +4931,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -4989,7 +4957,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -5085,22 +5053,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -5243,7 +5211,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -5252,7 +5220,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.10", + "rustls 0.21.12", "tokio", ] @@ -5335,9 +5303,9 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.7.9" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe0d5feac3f4ca21ba33496bcb1ccab58cca6412b1405ae80f0581541e0ca78" +checksum = "4ee9e39a66d9b615644893ffc1704d2a89b5b315b7fd0228ad3182ca9a306b19" dependencies = [ "actix-web", "mutually_exclusive_features", @@ -5354,7 +5322,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -5469,9 +5437,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-blocks" @@ -5529,15 +5497,15 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.6" +version = "2.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" +checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "flate2", "log", "once_cell", - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pki-types", "rustls-webpki 0.102.2", "serde", @@ -5703,7 +5671,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -5737,7 +5705,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5834,7 +5802,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -5843,7 +5811,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -5870,7 +5838,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -5905,17 +5873,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" 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", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -5932,9 +5900,9 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -5950,9 +5918,9 @@ checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -5968,9 +5936,9 @@ checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -5986,9 +5954,9 @@ checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -6004,9 +5972,9 @@ checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -6022,9 +5990,9 @@ checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -6040,9 +6008,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" @@ -6074,7 +6042,7 @@ dependencies = [ [[package]] name = "xtask" -version = "1.8.3" +version = "1.9.0" dependencies = [ "anyhow", "build-info", @@ -6140,7 +6108,7 @@ checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "synstructure", ] @@ -6161,7 +6129,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -6181,7 +6149,7 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "synstructure", ] diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 4a6723319416..efbef3bed8fd 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.8.3"; + version = "1.9.0"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -18,9 +18,9 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "meilisearch"; - repo = "MeiliSearch"; + repo = "meiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-R074dn9kWxHf5loq/K4aLWvrJwpt7YAigNU0YHc0mRg="; + hash = "sha256-fPXhayS8OKiiiDvVvBry3njZ74/W6oVL0p85Z5qf3KA=="; }; cargoBuildFlags = [ "--package=meilisearch" ]; @@ -28,7 +28,6 @@ rustPlatform.buildRustPackage { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "actix-web-static-files-3.0.5" = "sha256-2BN0RzLhdykvN3ceRLkaKwSZtel2DBqZ+uz4Qut+nII="; "hf-hub-0.3.2" = "sha256-tsn76b+/HRvPnZ7cWd8SBcEdnMPtjUEIRJipOJUbz54="; "tokenizers-0.15.2" = "sha256-lWvCu2hDJFzK6IUBJ4yeL4eZkOA08LHEMfiKXVvkog8="; }; diff --git a/pkgs/servers/search/qdrant/Cargo.lock b/pkgs/servers/search/qdrant/Cargo.lock index 65ed8a715ae4..0f07b40a12e6 100644 --- a/pkgs/servers/search/qdrant/Cargo.lock +++ b/pkgs/servers/search/qdrant/Cargo.lock @@ -231,9 +231,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.7.0" +version = "4.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6316df3fa569627c98b12557a8b6ff0674e5be4bb9b5e4ae2550ddb4964ed6" +checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" dependencies = [ "actix-codec", "actix-http", @@ -476,7 +476,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "api" -version = "1.9.6" +version = "1.9.7" dependencies = [ "chrono", "common", @@ -871,9 +871,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.99" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b" dependencies = [ "jobserver", "libc", @@ -1586,11 +1586,12 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.3" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" dependencies = [ "cfg-if", + "crossbeam-utils", "hashbrown 0.14.2", "lock_api", "once_cell", @@ -1646,17 +1647,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "dlv-list" version = "0.5.2" @@ -2607,124 +2597,6 @@ dependencies = [ "cxx-build", ] -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" -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.48", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -2743,14 +2615,12 @@ dependencies = [ [[package]] name = "idna" -version = "1.0.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "icu_normalizer", - "icu_properties", - "smallvec", - "utf8_iter", + "unicode-bidi", + "unicode-normalization", ] [[package]] @@ -3030,9 +2900,9 @@ checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -4200,9 +4070,9 @@ dependencies = [ [[package]] name = "proptest" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ "bit-set", "bit-vec", @@ -4445,7 +4315,7 @@ dependencies = [ [[package]] name = "qdrant" -version = "1.9.6" +version = "1.9.7" dependencies = [ "actix-cors", "actix-files", @@ -5949,9 +5819,9 @@ checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] @@ -6032,17 +5902,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" -[[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.48", -] - [[package]] name = "sys-info" version = "0.9.1" @@ -6255,16 +6114,6 @@ dependencies = [ "crunchy", ] -[[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" @@ -6749,28 +6598,16 @@ dependencies = [ [[package]] name = "url" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", - "idna 1.0.0", + "idna 0.5.0", "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" @@ -6779,9 +6616,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom 0.2.11", "serde", @@ -7339,18 +7176,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[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 = "wyz" version = "0.5.1" @@ -7386,30 +7211,6 @@ dependencies = [ "linked-hash-map", ] -[[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.48", - "synstructure", -] - [[package]] name = "zerocopy" version = "0.7.31" @@ -7435,21 +7236,6 @@ name = "zerofrom" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" -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.48", - "synstructure", -] [[package]] name = "zeroize" @@ -7463,20 +7249,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" dependencies = [ - "yoke", "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", ] [[package]] diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index cb8ef90f2026..b34640a32aa9 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.9.6"; + version = "1.9.7"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-fRQZmCHbWC5G6kS4+9KWgI4Qc6JnX3aBS4wJJgTWHlk="; + sha256 = "sha256-PM2nzHkZVvlH/ojZK8o2ELkLUtMNr0I2cezFlaPqYSA="; }; cargoLock = { diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/servers/search/weaviate/default.nix index 8cd90febb036..667ba4434d58 100644 --- a/pkgs/servers/search/weaviate/default.nix +++ b/pkgs/servers/search/weaviate/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "weaviate"; - version = "1.25.5"; + version = "1.25.6"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-tkTsZ9iDZdQARhkEUyRYm77ebUCwNWgDdDEjLj7LOgY="; + hash = "sha256-jXnCICtw5NYnqfiBeM8aZkpnTd30IcQJMH2CUqPGMlY="; }; vendorHash = "sha256-40O6MF1Tk9ZhGVLcKGzoUTaUFjKuXdpIHbB1GuRgyL8="; diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix index 1363aea11e34..f2e652adaae3 100644 --- a/pkgs/servers/serviio/default.nix +++ b/pkgs/servers/serviio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "serviio"; - version = "2.2.1"; + version = "2.4"; src = fetchurl { url = "http://download.serviio.org/releases/${pname}-${version}-linux.tar.gz"; - sha256 = "sha256-uRRWKMv4f2b1yIE9OnXDIZAmcoqw/8F0z1LOesQBsyQ="; + sha256 = "sha256-ssi2fKbAMizr5eLAMng+G25ui3v98zCNWzMg7uLgGas="; }; installPhase = '' diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 3d4d433bcd40..a9043f65331d 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { pname = "shairport-sync"; - version = "4.3.3"; + version = "4.3.4"; src = fetchFromGitHub { repo = "shairport-sync"; owner = "mikebrady"; rev = "refs/tags/${version}"; - hash = "sha256-sxYzFmI1Geoqckw+7XMXyvkizNVSlfvpWI7vMbCPT0U="; + hash = "sha256:1y8dh1gdffq38hgy6x1228l51l6p56iaiqlflw7w1dcbgw15llcd"; }; nativeBuildInputs = [ @@ -62,11 +62,6 @@ stdenv.mkDerivation rec { unixtools.xxd ]; - makeFlags = [ - # Workaround for https://github.com/mikebrady/shairport-sync/issues/1705 - "AR=${stdenv.cc.bintools.targetPrefix}ar" - ]; - buildInputs = [ openssl avahi diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 4c534cc2bfe4..f01358146197 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.31.1"; + version = "3.32.3"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-qcivNJ3CrvToT8CBq5Z/xssP/srTerXJfRGXcvNh2Ag="; + hash = "sha256-Qqemee13V5+k56Q4hPOKjRsw6pmfALGRcKi4gHBj6eI="; }; patches = [ diff --git a/pkgs/servers/simplehttp2server/deps.nix b/pkgs/servers/simplehttp2server/deps.nix deleted file mode 100644 index e6a26bf2506c..000000000000 --- a/pkgs/servers/simplehttp2server/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/NYTimes/gziphandler"; - fetch = { - type = "git"; - url = "https://github.com/NYTimes/gziphandler"; - rev = "289a3b81f5aedc99f8d6eb0f67827c142f1310d8"; - sha256 = "1r9ly9wdqjcc4nwv71mfldf1f5cjm4r34vvkdm5wabmdqqqwkbyx"; - }; - } -] diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index d66b3cd2726d..fa90943d1ce1 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.36.3"; + version = "2.36.4"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-+8bw6pFbogM1955OO/w21KnJa+JlAALTRc2m1QAXObE="; + sha256 = "sha256-pKOYyEiVszbZM1iDe8e6YgaNPB6MoiAc24e06Nyeeb0="; }; sourceRoot = "snappymail"; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix deleted file mode 100644 index b2ea1080c30b..000000000000 --- a/pkgs/servers/sonarr/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv, fetchurl, dotnet-runtime, icu, ffmpeg, openssl, sqlite, curl, makeWrapper, nixosTests, zlib }: - -let - os = if stdenv.isDarwin then "osx" else "linux"; - arch = { - x86_64-linux = "x64"; - aarch64-linux = "arm64"; - x86_64-darwin = "x64"; - aarch64-darwin = "arm64"; - }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - hash = { - x64-linux_hash = "sha256-MkRKWMhH4x5Z9mURh8qpShaozHrBFOHHwTmFlU1wqS8="; - arm64-linux_hash = "sha256-OIwWZEW4qmL5359hmGdNzunxVTIT3hIbTdAsd5Cpw/k="; - x64-osx_hash = "sha256-uDQXfj4r56ewrhZdwOnF78L3M1o0jDLt/PZlfWxxV18="; - arm64-osx_hash = "sha256-6WUeMIfF5juNHrLqep3mONqfcgxlBJOOJmHJkyHpZhU="; - }."${arch}-${os}_hash"; -in -stdenv.mkDerivation rec { - pname = "sonarr"; - version = "4.0.5.1710"; - - src = fetchurl { - url = "https://github.com/Sonarr/Sonarr/releases/download/v${version}/Sonarr.main.${version}.${os}-${arch}.tar.gz"; - inherit hash; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,share/sonarr-${version}} - cp -r * $out/share/sonarr-${version}/. - - makeWrapper "${dotnet-runtime}/bin/dotnet" $out/bin/NzbDrone \ - --add-flags "$out/share/sonarr-${version}/Sonarr.dll" \ - --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite openssl icu zlib ]} - - runHook postInstall - ''; - - passthru = { - updateScript = ./update.sh; - tests.smoke-test = nixosTests.sonarr; - }; - - meta = { - description = "Smart PVR for newsgroup and bittorrent users"; - homepage = "https://sonarr.tv/"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ fadenb purcell ]; - mainProgram = "NzbDrone"; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/servers/sonarr/update.sh b/pkgs/servers/sonarr/update.sh deleted file mode 100755 index 8ccbc5ba9919..000000000000 --- a/pkgs/servers/sonarr/update.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix-prefetch jq - -set -e - -dirname="$(dirname "$0")" - -updateHash() -{ - version=$1 - arch=$2 - os=$3 - - hashKey="${arch}-${os}_hash" - - url="https://github.com/Sonarr/Sonarr/releases/download/v${version}/Sonarr.main.${version}.${os}-${arch}.tar.gz"; - hash=$(nix-prefetch-url --type sha256 $url) - sriHash="$(nix hash to-sri --type sha256 $hash)" - - sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" -} - -updateVersion() -{ - sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" -} - -currentVersion=$(cd $dirname && nix eval --raw -f ../../.. sonarr.version) - -latestTag=$(curl https://api.github.com/repos/Sonarr/Sonarr/releases/latest | jq -r ".tag_name") -latestVersion="$(expr $latestTag : 'v\(.*\)')" - -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "Sonarr is up-to-date: ${currentVersion}" - exit 0 -fi - -updateVersion $latestVersion - -updateHash $latestVersion x64 linux -updateHash $latestVersion arm64 linux -updateHash $latestVersion x64 osx -updateHash $latestVersion arm64 osx diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index dd8a8005a50a..8271d9ab760b 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.41.0"; + version = "1.41.1"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-IeLG2IRHGrx5F3tIcvilhgC9BUFHpIpbzTo6vdQj+ZE="; + sha256 = "sha256-f2diF3mC+OlyCJ5mifC5ueQD2yWuHTGBMZiNvgUReGM="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-bqTw4k2WWE7vsp36Ldexnp/eoFOBUL5po8lZzsbv7D4="; + vendorHash = "sha256-3VP1uQ6AIZna1JH4L86JkW0udbE6miN1dVrQR4hE1u4="; proxyVendor = true; doCheck = false; diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 18922e5deb0a..2f0b4d0b2b5e 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.18"; + version = "26.4.19"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - hash = "sha256-JZMw9P+70c6m1zxaQLn0N46jL+P71cvyROekjoc5/Kk="; + hash = "sha256-DSYwOMBs7kxskTjEIO1AqXw+oAUeDXzX+qLNBuob0Jg="; fetchSubmodules = true; }; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 598be781403d..6de05cba60f3 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.0.36"; + version = "8.0.37"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-9PJwa5WKinOA72yVjdlyMHvb7qRR76/DQuTEbim36d0="; + hash = "sha256-4GOgkazZ7EC7BfLATfZPiZan5OJuiDu2UChJ1fa0pho="; }; nativeBuildInputs = [ bison cmake pkg-config ] diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix index ec681de8ff45..4add347a24a2 100644 --- a/pkgs/servers/sql/rqlite/default.nix +++ b/pkgs/servers/sql/rqlite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rqlite"; - version = "8.26.2"; + version = "8.26.6"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GGqnhsEvv8pnaRmJO+IX64VNQVnBaGZcUKMOiW/PJaQ="; + sha256 = "sha256-Mn6rju0DioW2xI9tz0e9Sy4H4tg6StpYn7NjJRxzfAI="; }; - vendorHash = "sha256-x1W2niLqhAcroh67cssDuuiJA3Pd5W4Wkh12uKqSfDI="; + vendorHash = "sha256-bzK6PYSg9z1QS+5Vk6pPM10ddrLVRm0C7rmepZt4b0M="; subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index a69e7eb3aecd..9eb168751fa8 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -14,7 +14,7 @@ }: let - version = "1.68.1"; + version = "1.68.2"; in buildGoModule { pname = "tailscale"; @@ -24,7 +24,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-ZAzro69F7ovfdqzRss/U7puh1T37bkEtUXabCYc5LwU="; + hash = "sha256-VI5k8PnPP8r2rIkW7AeQod7JmoHWuSLiaxkZXXv+0T8="; }; patches = [ diff --git a/pkgs/servers/teleport/14/default.nix b/pkgs/servers/teleport/14/default.nix index 456938012664..eda21fd7cb12 100644 --- a/pkgs/servers/teleport/14/default.nix +++ b/pkgs/servers/teleport/14/default.nix @@ -10,8 +10,4 @@ import ../generic.nix (args // { "rdp-rs-0.1.0" = "sha256-U52FVuqo2DH/7f0cQ1qcb1GbFZ97yxExVFMX5cs0zw4="; }; }; - extPatches = [ - # https://github.com/NixOS/nixpkgs/issues/120738 - ../tsh_14.patch - ]; }) diff --git a/pkgs/servers/teleport/15/default.nix b/pkgs/servers/teleport/15/default.nix index 8c356547270a..1dcaad94fa0b 100644 --- a/pkgs/servers/teleport/15/default.nix +++ b/pkgs/servers/teleport/15/default.nix @@ -12,10 +12,6 @@ import ../generic.nix (args // { "sspi-0.10.1" = "sha256-fkclC/plTh2d8zcmqthYmr5yXqbPTeFxI1VuaPX5vxk="; }; }; - extPatches = [ - # https://github.com/NixOS/nixpkgs/issues/120738 - ../tsh_14.patch - ]; # wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock wasm-bindgen-cli = wasm-bindgen-cli.override { diff --git a/pkgs/servers/teleport/16/Cargo.lock b/pkgs/servers/teleport/16/Cargo.lock new file mode 100644 index 000000000000..45249a280c20 --- /dev/null +++ b/pkgs/servers/teleport/16/Cargo.lock @@ -0,0 +1,3441 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" + +[[package]] +name = "anstyle-parse" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "asn1-rs" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "async-dnssd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98efc05996cc8d660e88841fcffb75aa71be5339c9ae559a8c8016c048420b82" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-util", + "libc", + "log", + "pin-utils", + "pkg-config", + "tokio", + "winapi", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "atomic-polyfill" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" +dependencies = [ + "critical-section", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[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 = "bindgen" +version = "0.68.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.68", +] + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[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 = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[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 = "boring" +version = "4.7.0" +source = "git+https://github.com/gravitational/boring?rev=99897308abb5976ea05625b8314c24b16eebb01b#99897308abb5976ea05625b8314c24b16eebb01b" +dependencies = [ + "bitflags 2.6.0", + "boring-sys", + "foreign-types", + "libc", + "once_cell", +] + +[[package]] +name = "boring-sys" +version = "4.7.0" +source = "git+https://github.com/gravitational/boring?rev=99897308abb5976ea05625b8314c24b16eebb01b#99897308abb5976ea05625b8314c24b16eebb01b" +dependencies = [ + "bindgen", + "cmake", + "fs_extra", + "fslock", +] + +[[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 = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cbindgen" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" +dependencies = [ + "clap", + "heck", + "indexmap 1.9.3", + "log", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 1.0.109", + "tempfile", + "toml", +] + +[[package]] +name = "cc" +version = "1.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[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 = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +dependencies = [ + "atty", + "bitflags 1.3.2", + "clap_lex", + "indexmap 1.9.3", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[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 = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[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 = "critical-section" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" + +[[package]] +name = "crypto" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf1e6e5492f8f0830c37f301f6349e0dac8b2466e4fe89eef90e9eef906cd046" +dependencies = [ + "crypto-common", +] + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[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 = "crypto-mac" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "delog" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af2b93368262340c9d4441251b824500d1b641a50957ecf4219a2cc41b9eac8f" +dependencies = [ + "log", +] + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "der_derive", + "flagset", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "des" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" +dependencies = [ + "cipher", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[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.68", +] + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8", + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +dependencies = [ + "curve25519-dalek", + "ed25519", + "rand_core", + "serde", + "sha2", + "subtle", + "zeroize", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "flagset" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdeb3aa5e95cf9aabc17f060cfa0ced7b83f042390760ca53bf09df9968acaa1" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[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_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[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.68", +] + +[[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-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", + "zeroize", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[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", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heapless" +version = "0.7.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version", + "spin", + "stable_deref_trait", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[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.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +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", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "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", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + +[[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 = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", +] + +[[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.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "ironrdp" +version = "0.1.0" +dependencies = [ + "console_error_panic_hook", + "getrandom", + "ironrdp-graphics", + "ironrdp-pdu", + "ironrdp-session", + "js-sys", + "log", + "time", + "tracing", + "tracing-subscriber", + "tracing-web", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "ironrdp-async" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +dependencies = [ + "bytes", + "ironrdp-connector", + "ironrdp-pdu", + "tracing", +] + +[[package]] +name = "ironrdp-cliprdr" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +dependencies = [ + "bitflags 2.6.0", + "ironrdp-pdu", + "ironrdp-svc", + "thiserror", + "tracing", +] + +[[package]] +name = "ironrdp-connector" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +dependencies = [ + "ironrdp-error", + "ironrdp-pdu", + "ironrdp-svc", + "rand_core", + "sspi 0.11.1", + "tracing", + "url", + "winapi", +] + +[[package]] +name = "ironrdp-displaycontrol" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +dependencies = [ + "ironrdp-dvc", + "ironrdp-pdu", + "ironrdp-svc", + "tracing", +] + +[[package]] +name = "ironrdp-dvc" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +dependencies = [ + "ironrdp-pdu", + "ironrdp-svc", + "slab", + "tracing", +] + +[[package]] +name = "ironrdp-error" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" + +[[package]] +name = "ironrdp-graphics" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +dependencies = [ + "bit_field", + "bitflags 2.6.0", + "bitvec", + "byteorder", + "ironrdp-error", + "ironrdp-pdu", + "lazy_static", + "num-derive", + "num-traits", + "thiserror", +] + +[[package]] +name = "ironrdp-pdu" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +dependencies = [ + "bit_field", + "bitflags 2.6.0", + "byteorder", + "der-parser", + "ironrdp-error", + "md-5", + "num-bigint", + "num-derive", + "num-integer", + "num-traits", + "pkcs1", + "sha1", + "tap", + "thiserror", + "x509-cert", +] + +[[package]] +name = "ironrdp-rdpdr" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +dependencies = [ + "bitflags 2.6.0", + "ironrdp-error", + "ironrdp-pdu", + "ironrdp-svc", + "tracing", +] + +[[package]] +name = "ironrdp-rdpsnd" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +dependencies = [ + "ironrdp-pdu", + "ironrdp-svc", +] + +[[package]] +name = "ironrdp-session" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +dependencies = [ + "ironrdp-connector", + "ironrdp-displaycontrol", + "ironrdp-dvc", + "ironrdp-error", + "ironrdp-graphics", + "ironrdp-pdu", + "ironrdp-svc", + "tracing", +] + +[[package]] +name = "ironrdp-svc" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +dependencies = [ + "bitflags 2.6.0", + "ironrdp-pdu", +] + +[[package]] +name = "ironrdp-tls" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +dependencies = [ + "tokio", + "tokio-rustls", + "x509-cert", +] + +[[package]] +name = "ironrdp-tokio" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +dependencies = [ + "bytes", + "ironrdp-async", + "tokio", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "iso7816" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3af73ac9c821e7aea3280532118e15cdf9e7bb45c923cbf0e319ae25b27d20c" +dependencies = [ + "delog", + "heapless", +] + +[[package]] +name = "iso7816-tlv" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7660d28d24a831d690228a275d544654a30f3b167a8e491cf31af5fe5058b546" +dependencies = [ + "untrusted", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "keccak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" +dependencies = [ + "cpufeatures", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libloading" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +dependencies = [ + "cfg-if", + "windows-targets 0.52.5", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] +name = "md4" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da5ac363534dce5fabf69949225e174fbf111a498bf0ff794c8ea1fba9f3dda" +dependencies = [ + "digest", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[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 = "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-bigint" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "serde", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "object" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +dependencies = [ + "memchr", +] + +[[package]] +name = "oid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c19903c598813dba001b53beeae59bb77ad4892c5c1b9b3500ce4293a0d06c2" +dependencies = [ + "serde", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.10", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.2", + "smallvec", + "windows-targets 0.52.5", +] + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", + "sha1", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "picky" +version = "7.0.0-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52cccdaffd2f361b4b4eb70b4249bd71d89bb66cb84b7f76483ecd1640c543ce" +dependencies = [ + "base64", + "digest", + "ed25519-dalek", + "md-5", + "num-bigint-dig", + "p256", + "p384", + "picky-asn1", + "picky-asn1-der", + "picky-asn1-x509", + "rand", + "rand_core", + "rsa", + "serde", + "sha1", + "sha2", + "sha3", + "thiserror", + "x25519-dalek", + "zeroize", +] + +[[package]] +name = "picky-asn1" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "295eea0f33c16be21e2a98b908fdd4d73c04dd48c8480991b76dbcf0cb58b212" +dependencies = [ + "oid", + "serde", + "serde_bytes", + "time", + "zeroize", +] + +[[package]] +name = "picky-asn1-der" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5df7873a9e36d42dadb393bea5e211fe83d793c172afad5fb4ec846ec582793f" +dependencies = [ + "picky-asn1", + "serde", + "serde_bytes", +] + +[[package]] +name = "picky-asn1-x509" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c5f20f71a68499ff32310f418a6fad8816eac1a2859ed3f0c5c741389dd6208" +dependencies = [ + "base64", + "num-bigint-dig", + "oid", + "picky-asn1", + "picky-asn1-der", + "serde", + "widestring", + "zeroize", +] + +[[package]] +name = "picky-krb" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f71cf61ebe6e657a81bcac31f9d61d52c23a1fd517b0dad77b915a7d3d15d2e8" +dependencies = [ + "aes", + "byteorder", + "cbc", + "crypto", + "des", + "hmac", + "num-bigint-dig", + "oid", + "pbkdf2", + "picky-asn1", + "picky-asn1-der", + "picky-asn1-x509", + "rand", + "serde", + "sha1", + "thiserror", + "uuid", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "portpicker" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" +dependencies = [ + "rand", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[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 = "rdp-client" +version = "0.1.0" +dependencies = [ + "bitflags 2.6.0", + "boring", + "byteorder", + "bytes", + "cbindgen", + "env_logger", + "ironrdp-cliprdr", + "ironrdp-connector", + "ironrdp-displaycontrol", + "ironrdp-dvc", + "ironrdp-pdu", + "ironrdp-rdpdr", + "ironrdp-rdpsnd", + "ironrdp-session", + "ironrdp-svc", + "ironrdp-tls", + "ironrdp-tokio", + "iso7816", + "iso7816-tlv", + "log", + "parking_lot 0.12.2", + "rand", + "rand_chacha", + "rsa", + "sspi 0.10.1", + "static_init", + "tempfile", + "tokio", + "tokio-boring", + "utf16string", + "uuid", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +dependencies = [ + "bitflags 2.6.0", +] + +[[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", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg 0.50.0", +] + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[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 = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[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-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "serde" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_json" +version = "1.0.118" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" +dependencies = [ + "itoa", + "ryu", + "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 = "sha3" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +dependencies = [ + "digest", + "keccak", +] + +[[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 = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sspi" +version = "0.10.1" +source = "git+https://github.com/Devolutions/sspi-rs?rev=d54bdfcafa0e10d9d78224ebacc4f2a0992a6b79#d54bdfcafa0e10d9d78224ebacc4f2a0992a6b79" +dependencies = [ + "async-dnssd", + "async-recursion", + "bitflags 2.6.0", + "byteorder", + "cfg-if", + "crypto-mac", + "futures", + "hmac", + "lazy_static", + "md-5", + "md4", + "num-bigint-dig", + "num-derive", + "num-traits", + "oid", + "picky", + "picky-asn1", + "picky-asn1-der", + "picky-asn1-x509", + "picky-krb", + "portpicker", + "rand", + "reqwest", + "serde", + "serde_derive", + "sha1", + "sha2", + "time", + "tokio", + "tracing", + "url", + "uuid", + "winapi", + "windows", + "windows-sys 0.48.0", + "winreg 0.51.0", + "zeroize", +] + +[[package]] +name = "sspi" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d31fab47d9290be28a8d027c8428756826f1d4fe1e5ba0f51d24f52c568e21" +dependencies = [ + "async-dnssd", + "async-recursion", + "bitflags 2.6.0", + "byteorder", + "cfg-if", + "crypto-mac", + "futures", + "hmac", + "lazy_static", + "md-5", + "md4", + "num-bigint-dig", + "num-derive", + "num-traits", + "oid", + "picky", + "picky-asn1", + "picky-asn1-der", + "picky-asn1-x509", + "picky-krb", + "rand", + "serde", + "serde_derive", + "sha1", + "sha2", + "time", + "tokio", + "tracing", + "url", + "uuid", + "winapi", + "windows", + "windows-sys 0.48.0", + "winreg 0.51.0", + "zeroize", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_init" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6" +dependencies = [ + "bitflags 1.3.2", + "cfg_aliases", + "libc", + "parking_lot 0.11.2", + "parking_lot_core 0.8.6", + "static_init_macro", + "winapi", +] + +[[package]] +name = "static_init_macro" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf" +dependencies = [ + "cfg_aliases", + "memchr", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[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.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +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 = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[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 = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" + +[[package]] +name = "thiserror" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[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 = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "js-sys", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +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 = "tls_codec" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e78c9c330f8c85b2bae7c8368f2739157db9991235123aa1b15ef9502bfb6a" +dependencies = [ + "tls_codec_derive", + "zeroize", +] + +[[package]] +name = "tls_codec_derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d9ef545650e79f30233c0003bcc2504d7efac6dad25fca40744de773fe2049c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[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 0.12.2", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-boring" +version = "4.7.0" +source = "git+https://github.com/gravitational/boring?rev=99897308abb5976ea05625b8314c24b16eebb01b#99897308abb5976ea05625b8314c24b16eebb01b" +dependencies = [ + "boring", + "boring-sys", + "once_cell", + "tokio", +] + +[[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.68", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[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.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[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 = [ + "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.68", +] + +[[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-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 = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "time", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-web" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e6a141feebd51f8d91ebfd785af50fca223c570b86852166caa3b141defe7c" +dependencies = [ + "js-sys", + "tracing-core", + "tracing-subscriber", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[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.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf16string" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b62a1e85e12d5d712bf47a85f426b73d303e2d00a90de5f3004df3596e9d216" +dependencies = [ + "byteorder", +] + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +dependencies = [ + "getrandom", + "serde", +] + +[[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 = "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.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[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 = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + +[[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" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[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.5", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[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 = "winreg" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "x25519-dalek" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" +dependencies = [ + "curve25519-dalek", + "rand_core", + "serde", + "zeroize", +] + +[[package]] +name = "x509-cert" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94" +dependencies = [ + "const-oid", + "der", + "spki", + "tls_codec", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix new file mode 100644 index 000000000000..eaf0ab11d992 --- /dev/null +++ b/pkgs/servers/teleport/16/default.nix @@ -0,0 +1,22 @@ +{ wasm-bindgen-cli, ... }@args: +import ../generic.nix (args // { + version = "16.0.4"; + hash = "sha256-svDqcYm6PbmPyHhN00VKn/sGRkfb7ah2N7BtEVdZ9hg="; + vendorHash = "sha256-H4Rwel/UAvxY8/4CfSbneJYjt9HHgsuNbYXUM6MtqXM="; + yarnHash = "sha256-OHNnN66MevDiH4Zr6Uq3Om65XBzf4O3AIrPvhlvhkbE="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "boring-4.7.0" = "sha256-ACzw4Bfo6OUrwvi3h21tvx5CpdQaWCEIDkslzjzy9o8="; + "ironrdp-async-0.1.0" = "sha256-nE5O/wRJ3vJqJG5zdYmpVkhx6JC6Yb92pR4EKSWSdkA="; + "sspi-0.10.1" = "sha256-fkclC/plTh2d8zcmqthYmr5yXqbPTeFxI1VuaPX5vxk="; + }; + }; + + # wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock + wasm-bindgen-cli = wasm-bindgen-cli.override { + version = "0.2.92"; + hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0="; + cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0="; + }; +}) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 79eafe528683..10b4eb98efad 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -3,7 +3,8 @@ let f = args: rec { teleport_14 = import ./14 args; teleport_15 = import ./15 args; - teleport = teleport_15; + teleport_16 = import ./16 args; + teleport = teleport_16; }; # Ensure the following callPackages invocation includes everything 'generic' needs. f' = lib.setFunctionArgs f (builtins.functionArgs (import ./generic.nix)); diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 51bea403f7db..003f0b79320f 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -27,7 +27,7 @@ , version , hash , vendorHash -, extPatches ? null +, extPatches ? [] , cargoHash ? null , cargoLock ? null , yarnHash @@ -136,6 +136,7 @@ buildGoModule rec { patches = extPatches ++ [ ./0001-fix-add-nix-path-to-exec-env.patch ./rdpclient.patch + ./tsh.patch ]; # Reduce closure size for client machines diff --git a/pkgs/servers/teleport/tsh.patch b/pkgs/servers/teleport/tsh.patch index fac9c98ab049..6344a3915717 100644 --- a/pkgs/servers/teleport/tsh.patch +++ b/pkgs/servers/teleport/tsh.patch @@ -1,8 +1,8 @@ -diff --git a/tool/tsh/tsh.go b/tool/tsh/tsh.go -index f73b0a4e46..6848286781 100644 ---- a/tool/tsh/tsh.go -+++ b/tool/tsh/tsh.go -@@ -1065,10 +1065,11 @@ func Run(ctx context.Context, args []string, opts ...cliOption) error { +diff --git a/tool/tsh/common/tsh.go b/tool/tsh/common/tsh.go +index 5de21c69d0..3995c19e3c 100644 +--- a/tool/tsh/common/tsh.go ++++ b/tool/tsh/common/tsh.go +@@ -1084,10 +1084,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error { var err error diff --git a/pkgs/servers/teleport/tsh_14.patch b/pkgs/servers/teleport/tsh_14.patch deleted file mode 100644 index 6344a3915717..000000000000 --- a/pkgs/servers/teleport/tsh_14.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/tool/tsh/common/tsh.go b/tool/tsh/common/tsh.go -index 5de21c69d0..3995c19e3c 100644 ---- a/tool/tsh/common/tsh.go -+++ b/tool/tsh/common/tsh.go -@@ -1084,10 +1084,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error { - - var err error - -- cf.executablePath, err = os.Executable() -+ tempBinaryPath, err := os.Executable() - if err != nil { - return trace.Wrap(err) - } -+ cf.executablePath = path.Dir(tempBinaryPath) + "/tsh" - - // configs - setEnvFlags(&cf) diff --git a/pkgs/servers/tracing/honeycomb/refinery/default.nix b/pkgs/servers/tracing/honeycomb/refinery/default.nix index f4e29dbcb36c..364115b6bfee 100644 --- a/pkgs/servers/tracing/honeycomb/refinery/default.nix +++ b/pkgs/servers/tracing/honeycomb/refinery/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { homepage = "https://github.com/honeycombio/refinery"; description = "Tail-sampling proxy for OpenTelemetry"; license = licenses.asl20; - maintainers = with maintainers; [ lf- ]; + maintainers = [ ]; mainProgram = "refinery"; }; } diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 375347b22fc1..e6275826ccf6 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "3.0.3"; + version = "3.0.4"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - hash = "sha256-vjY8sbNkY/kdQiJ020iUWxIVzxkmpkeLhxBThc6tUuE="; + hash = "sha256-9dxg9UL6wkoIs2ql+pLHzd2z+w83vzXYN6zRRLtIegQ="; stripRoot = false; }; - vendorHash = "sha256-rvo3nw9yUfikO82cy6BbukwqwBSrUCCEta3nKBprCbk="; + vendorHash = "sha256-4zI4OL4UlaaefxRPQoUtjyn9M8yfuYOBOyYh6vTnMJg="; subPackages = [ "cmd/traefik" ]; diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix index 26ee095e951d..eb945eb32795 100644 --- a/pkgs/servers/unpackerr/default.nix +++ b/pkgs/servers/unpackerr/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { meta = with lib; { description = "Extracts downloads for Radarr, Sonarr, Lidarr - Deletes extracted files after import"; homepage = "https://github.com/davidnewhall/unpackerr"; - maintainers = with maintainers; [ nullx76 ]; + maintainers = with maintainers; [ ]; license = licenses.mit; mainProgram = "unpackerr"; }; diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index a04165a5aa36..55d27b196362 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -5,21 +5,21 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.45.23"; + version = "0.45.24"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = "refs/tags/${version}"; - hash = "sha256-EamTErJfa6mQCem4DWKC53ydupXP+6jrj9tGPlwehLc="; + hash = "sha256-VltrcTbX95agV9JGV2KYGeZ6iUlgzrOsjShsUpiGfes="; }; postPatch = '' substituteInPlace requirements.txt \ --replace "apprise~=1.8.0" "apprise" \ --replace "cryptography~=3.4" "cryptography" \ - --replace "dnspython~=2.4" "dnspython" \ + --replace "dnspython==2.6.1" "dnspython" \ --replace "pytest ~=7.2" "" \ --replace "pytest-flask ~=1.2" "" \ --replace "selenium~=4.14.0" "selenium" \ @@ -43,6 +43,7 @@ python3.pkgs.buildPythonApplication rec { flask-paginate flask-restful flask-wtf + greenlet inscriptis jinja2 jinja2-time @@ -51,7 +52,6 @@ python3.pkgs.buildPythonApplication rec { loguru lxml paho-mqtt - pillow playwright pyee pyppeteer diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 79d7d096f668..b85be3beb0e3 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -41,18 +41,19 @@ , jq , moreutils , terser +, uglify-js , plugins ? [] }@args: let - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-JUCFtB5BvBytO3flq9o6iI3HPmvLU358HEmE6wbBsSk="; + sha256 = "sha256-ehv81trN8eG7QRAD5ERiSql6ZRCJK9cz6VOT9OzjZhg="; }; ruby = ruby_3_2; @@ -214,7 +215,7 @@ let nativeBuildInputs = runtimeDeps ++ [ postgresql redis - nodePackages.uglify-js + uglify-js terser yarn jq diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile index d2a2d943c408..ba35ee28efa9 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile @@ -5,6 +5,5 @@ source "https://rubygems.org" # gem "rails" gem 'bcrypt', '3.1.13' gem 'unix-crypt', '1.3.0' -gem 'ffi', '1.16.3', require: false gem 'ffi-compiler', '1.0.1', require: false gem 'argon2', '2.2.0' diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock index a7bfa717ed9d..e806952546ee 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock @@ -5,7 +5,7 @@ GEM ffi (~> 1.15) ffi-compiler (~> 1.0) bcrypt (3.1.13) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -18,9 +18,8 @@ PLATFORMS DEPENDENCIES argon2 (= 2.2.0) bcrypt (= 3.1.13) - ffi (= 1.16.3) ffi-compiler (= 1.0.1) unix-crypt (= 1.3.0) BUNDLED WITH - 2.5.9 + 2.5.11 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix index 2189ba854eb7..d220f050e20a 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "communiteq"; repo = "discourse-migratepassword"; - rev = "32d5fca6de3e8daf3869696ce835fefca1f00bfa"; - sha256 = "sha256-kNYkA6zuiuUZlPgvIvaO49P8bD+nNysEsow33xG1PnI="; + rev = "a732ae244cd4125561fd225a67bae95ef5f738d0"; + sha256 = "sha256-EO+QnFTy3PgxZ92DZBm9sP8sFAny3ZpFw+faTX32j7Q="; }; meta = with lib; { homepage = "https://github.com/communiteq/discourse-migratepassword"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix index 49174f05d0e9..bff0d82479a3 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index f73aeecb6baa..bae9d8b9852d 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -55,8 +55,6 @@ gem "message_bus" gem "rails_multisite" -gem "fast_xs", platform: :ruby - gem "fastimage" gem "aws-sdk-s3", require: false @@ -199,8 +197,6 @@ gem "puma", require: false gem "rbtrace", require: false, platform: :mri -gem "gc_tracer", require: false, platform: :mri - # required for feed importing and embedding gem "ruby-readability", require: false @@ -269,3 +265,8 @@ gem "net-http" gem "cgi", ">= 0.3.6", require: false gem "tzinfo-data" +gem "csv", require: false + +# TODO: Can be removed once we upgrade to Rails 7.1 +gem "mutex_m" +gem "drb" diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 31af98840b1c..4437a2d36817 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -33,7 +33,7 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - actionview_precompiler (0.3.0) + actionview_precompiler (0.4.0) actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) @@ -117,6 +117,7 @@ GEM crass (1.0.6) css_parser (1.16.0) addressable + csv (3.3.0) date (3.3.4) debug_inspector (1.2.0) diff-lcs (1.5.0) @@ -130,6 +131,7 @@ GEM faker (~> 2.16) literate_randomizer docile (1.4.0) + drb (2.2.1) email_reply_trimmer (0.1.13) erubi (1.12.0) excon (0.109.0) @@ -146,16 +148,14 @@ GEM faraday-retry (2.2.0) faraday (~> 2.0) fast_blank (1.0.1) - fast_xs (0.8.0) fastimage (2.3.0) ffi (1.16.3) fspath (3.1.2) - gc_tracer (1.5.1) globalid (1.2.1) activesupport (>= 6.1) - google-protobuf (3.25.2) - google-protobuf (3.25.2-arm64-darwin) - google-protobuf (3.25.2-x86_64-darwin) + google-protobuf (3.25.3) + google-protobuf (3.25.3-arm64-darwin) + google-protobuf (3.25.3-x86_64-darwin) guess_html_encoding (0.0.11) hana (1.3.7) hashdiff (1.1.0) @@ -217,7 +217,7 @@ GEM rack (>= 1.1.3) method_source (1.0.0) mini_mime (1.1.5) - mini_portile2 (2.8.6) + mini_portile2 (2.8.7) mini_racer (0.8.0) libv8-node (~> 18.16.0.0) mini_scheduler (0.16.0) @@ -233,6 +233,7 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) mustache (1.1.1) + mutex_m (0.2.0) net-http (0.4.1) uri net-imap (0.4.9.1) @@ -517,6 +518,7 @@ GEM PLATFORMS arm64-darwin-21 arm64-darwin-22 + arm64-darwin-23 ruby x86_64-darwin-22 @@ -546,11 +548,13 @@ DEPENDENCIES cose cppjieba_rb css_parser + csv diffy digest discourse-fonts discourse-seed-fu discourse_dev_assets + drb email_reply_trimmer excon execjs @@ -560,9 +564,7 @@ DEPENDENCIES faraday faraday-retry fast_blank - fast_xs fastimage - gc_tracer highline htmlentities http_accept_language @@ -591,6 +593,7 @@ DEPENDENCIES mocha multi_json mustache + mutex_m net-http net-imap net-pop @@ -661,4 +664,4 @@ DEPENDENCIES yard BUNDLED WITH - 2.5.9 + 2.5.11 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 79cba6f33bee..16474c336762 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07jyr2h87ha6k2y965rs4ywq142ddkfkhbmp0r44xg4wnffr8jbl"; + sha256 = "077d83avfm73nd0yji853jn94jpbr496apyz5zh5df61qipbvdik"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; active_model_serializers = { dependencies = ["activemodel"]; @@ -449,6 +449,16 @@ }; version = "1.16.0"; }; + csv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b"; + type = "gem"; + }; + version = "3.3.0"; + }; date = { groups = ["default"]; platforms = []; @@ -541,6 +551,16 @@ }; version = "1.4.0"; }; + drb = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + type = "gem"; + }; + version = "2.2.1"; + }; email_reply_trimmer = { groups = ["default"]; platforms = []; @@ -675,22 +695,6 @@ }; version = "1.0.1"; }; - fast_xs = { - groups = ["default"]; - platforms = [{ - engine = "maglev"; - } { - engine = "rbx"; - } { - engine = "ruby"; - }]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1iydzaqmvqq7ncxkr182aybkk6xap0cb2w9amr73vbdxi2qf3wjz"; - type = "gem"; - }; - version = "0.8.0"; - }; fastimage = { groups = ["default"]; platforms = []; @@ -725,20 +729,6 @@ }; version = "3.1.2"; }; - gc_tracer = { - groups = ["default"]; - platforms = [{ - engine = "maglev"; - } { - engine = "ruby"; - }]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yv3mp8lx74lfzs04fd5h4g89209iwhzpc407y35p7cmzgx6a4kv"; - type = "gem"; - }; - version = "1.5.1"; - }; globalid = { dependencies = ["activesupport"]; groups = ["default"]; @@ -755,10 +745,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02sh4rp14wmpfv9r7xrap6xgcakg0lk6zjvq1gsi5y38swhn2blw"; + sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r"; type = "gem"; }; - version = "3.25.2"; + version = "3.25.3"; }; guess_html_encoding = { groups = ["default"]; @@ -1141,10 +1131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "149r94xi6b3jbp6bv72f8383b95ndn0p5sxnq11gs1j9jadv0ajf"; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; mini_racer = { dependencies = ["libv8-node"]; @@ -1264,6 +1254,16 @@ }; version = "1.1.1"; }; + mutex_m = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; + type = "gem"; + }; + version = "0.2.0"; + }; net-http = { dependencies = ["uri"]; groups = ["default"]; diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index 5d17b9798b60..9d922de7c9cc 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix bundler nix-update nix-universal-prefetch "python3.withPackages (ps: with ps; [ requests click click-log packaging ])" prefetch-yarn-deps +#! nix-shell -i python3 -p bundix bundler nix-update nurl "python3.withPackages (ps: with ps; [ requests click click-log packaging ])" prefetch-yarn-deps from __future__ import annotations import click @@ -301,6 +301,11 @@ def update_plugins(): name = plugin.get('name') repo_name = plugin.get('repo_name') or name + if fetcher == "fetchFromGitHub": + url = f"https://github.com/{owner}/{repo_name}" + else: + raise NotImplementedError(f"Missing URL pattern for {fetcher}") + repo = DiscourseRepo(owner=owner, repo=repo_name) # implement the plugin pinning algorithm laid out here: @@ -378,10 +383,11 @@ def update_plugins(): prev_hash = _nix_eval(f'discourse.plugins.{name}.src.outputHash') new_hash = subprocess.check_output([ - 'nix-universal-prefetch', fetcher, - '--owner', owner, - '--repo', repo_name, - '--rev', rev, + "nurl", + "--fetcher", fetcher, + "--hash", + url, + rev, ], text=True).strip("\n") click.echo(f"Update {name}, {prev_commit_sha} -> {rev} in {filename}") diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index f43aa15887cf..78c73719b481 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , nixosTests , php +, writeText }: stdenvNoCC.mkDerivation rec { @@ -16,26 +17,33 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-AAOON1RdbG6JSnCc123jmIlIXHOE1PE49BV4hcASO/s="; }; - passthru.tests = { - inherit (nixosTests) freshrss-sqlite freshrss-pgsql freshrss-http-auth freshrss-none-auth; - }; + postPatch = '' + patchShebangs cli/*.php app/actualize_script.php + ''; + + # the thirdparty_extension_path can only be set by config, but should be read by an env-var. + overrideConfig = writeText "constants.local.php" '' + ", - "license": "AGPL-3.0-only", - "scripts": { - "analyze": "webpack --mode=none", - "build:dev": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=development", - "build:prod": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=production", - "clean": "yarn run rimraf dist", - "dev": "yarn build:dev --watch", - "lint": "yarn translations:generate && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx \"src/**\" && prettier --check \"src/**/*.{ts,tsx,js,css,scss}\"", - "postinstall": "husky install", - "prebuild:dev": "yarn clean && node generate_translations.js", - "prebuild:prod": "yarn clean && node generate_translations.js", - "prepare": "husky install", - "themes:build": "sass src/assets/css/themes/:src/assets/css/themes", - "themes:watch": "sass --watch src/assets/css/themes/:src/assets/css/themes", - "translations:generate": "node generate_translations.js", - "translations:init": "git submodule init && yarn translations:update", - "translations:update": "git submodule update --remote --recursive" - }, - "repository": "https://github.com/LemmyNet/lemmy-ui", - "engines": { - "node": ">=8.9.0" - }, - "dependencies": { - "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-decorators": "^7.23.7", - "@babel/plugin-transform-runtime": "^7.23.7", - "@babel/plugin-transform-typescript": "^7.23.6", - "@babel/preset-env": "^7.23.8", - "@babel/preset-typescript": "^7.21.5", - "@babel/runtime": "^7.23.8", - "@emoji-mart/data": "^1.1.0", - "@shortcm/qr-image": "^9.0.2", - "autosize": "^6.0.1", - "babel-loader": "^9.1.3", - "babel-plugin-inferno": "^6.7.1", - "bootstrap": "^5.3.1", - "check-password-strength": "^2.0.7", - "classnames": "^2.5.1", - "clean-webpack-plugin": "^4.0.0", - "cookie": "^0.6.0", - "copy-webpack-plugin": "^12.0.2", - "css-loader": "^6.9.1", - "date-fns": "^3.2.0", - "emoji-mart": "^5.4.0", - "emoji-short-name": "^2.0.0", - "express": "~4.18.2", - "history": "^5.3.0", - "html-to-text": "^9.0.5", - "husky": "^8.0.3", - "i18next": "^23.7.16", - "inferno": "^8.2.3", - "inferno-create-element": "^8.2.3", - "inferno-helmet": "^5.2.1", - "inferno-hydrate": "^8.2.3", - "inferno-i18next-dess": "0.0.2", - "inferno-router": "^8.2.3", - "inferno-server": "^8.2.3", - "jwt-decode": "^4.0.0", - "lemmy-js-client": "0.19.2-alpha.1", - "lodash.isequal": "^4.5.0", - "markdown-it": "^14.0.0", - "markdown-it-bidi": "^0.1.0", - "markdown-it-container": "^4.0.0", - "markdown-it-emoji": "^3.0.0", - "markdown-it-footnote": "^4.0.0", - "markdown-it-highlightjs": "^4.0.1", - "markdown-it-html5-embed": "^1.0.0", - "markdown-it-ruby": "^0.1.1", - "markdown-it-sub": "^2.0.0", - "markdown-it-sup": "^2.0.0", - "mini-css-extract-plugin": "^2.7.7", - "register-service-worker": "^1.7.2", - "run-node-webpack-plugin": "^1.3.0", - "rxjs": "^7.8.1", - "sanitize-html": "^2.11.0", - "sass": "^1.70.0", - "sass-loader": "^14.0.0", - "serialize-javascript": "^6.0.2", - "service-worker-webpack": "^1.0.0", - "sharp": "0.32.6", - "tippy.js": "^6.3.7", - "toastify-js": "^1.12.0", - "tributejs": "^5.1.3", - "webpack": "^5.89.0", - "webpack-cli": "^5.1.4", - "webpack-node-externals": "^3.0.0" - }, - "devDependencies": { - "@babel/core": "^7.23.7", - "@types/autosize": "^4.0.0", - "@types/bootstrap": "^5.2.6", - "@types/cookie": "^0.6.0", - "@types/express": "^4.17.17", - "@types/html-to-text": "^9.0.0", - "@types/lodash.isequal": "^4.5.6", - "@types/markdown-it": "^13.0.7", - "@types/markdown-it-container": "^2.0.6", - "@types/node": "^20.11.5", - "@types/path-browserify": "^1.0.0", - "@types/sanitize-html": "^2.9.0", - "@types/serialize-javascript": "^5.0.1", - "@types/toastify-js": "^1.12.0", - "@typescript-eslint/eslint-plugin": "^6.19.0", - "@typescript-eslint/parser": "^6.19.0", - "eslint": "^8.56.0", - "eslint-plugin-inferno": "^7.33.3", - "eslint-plugin-jsx-a11y": "^6.7.1", - "eslint-plugin-prettier": "^5.1.3", - "import-sort-style-module": "^6.0.0", - "lint-staged": "^15.2.0", - "prettier": "^3.2.4", - "prettier-plugin-import-sort": "^0.0.7", - "prettier-plugin-organize-imports": "^3.2.3", - "prettier-plugin-packagejson": "^2.4.9", - "rimraf": "^5.0.0", - "sortpack": "^2.4.0", - "style-loader": "^3.3.4", - "terser": "^5.27.0", - "typescript": "^5.3.3", - "typescript-language-server": "^4.3.1", - "webpack-bundle-analyzer": "^4.9.0", - "webpack-dev-server": "4.15.1" - }, - "lint-staged": { - "*.{css, scss}": [ - "prettier --write" - ], - "*.{ts,tsx,js}": [ - "prettier --write", - "eslint --fix" - ], - "package.json": [ - "sortpack" - ] - }, - "packageManager": "yarn@1.22.19", - "engineStrict": true, - "importSort": { - ".js, .jsx, .ts, .tsx": { - "style": "module", - "parser": "typescript" - } - } -} diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index fdab1c9d63d6..36c61ba3d92b 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,8 +1,8 @@ { - "serverVersion": "0.19.3", - "uiVersion": "0.19.3", - "serverHash": "sha256-iO7bY2oChx0cZbwgXMrrV4e1kffop9s4xmepNywnApU=", - "serverCargoHash": "sha256-XXfg0o/LQ/imnsHsREoBXMDP1hU5Stxv0s6AP+o+USc=", - "uiHash": "sha256-6GGiKCNL0PALdz0W0d1OOPyMIA5kaoL3148j9GWzrMM=", - "uiYarnDepsHash": "sha256-UQ+B2vF34L+HuisyO7wdW2zCfEEGa8YdnoaB4jHi+DY=" + "serverVersion": "0.19.5", + "uiVersion": "0.19.5", + "serverHash": "sha256-ellHimZdbB5EQSHVsppBNYyZOODpUADvUn7u6JOu1ns=", + "serverCargoHash": "sha256-UdFw8RPKYLqY98So8z9kiaVCl3b8KaqIoUMK/EV2uNM=", + "uiHash": "sha256-bhbZQ8tDnJ6TWYj+ki/JQW8cbVjRfLzxaXRDX9JAIm4=", + "uiPNPMDepsHash": "sha256-aJPa46a2W8xHlDzFt0QMFQtEoUSkFQtN9VhaQOvoVio=" } diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index d4d44c473f5c..8cb65bfef2bf 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -50,6 +50,10 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # test requires database access "--skip=session_middleware::tests::test_session_auth" + + # tests require network access + "--skip=scheduled_tasks::tests::test_nodeinfo_mastodon_social" + "--skip=scheduled_tasks::tests::test_nodeinfo_voyager_lemmy_ml" ]; passthru.updateScript = ./update.py; @@ -59,7 +63,7 @@ rustPlatform.buildRustPackage rec { description = "🐀 Building a federated alternative to reddit in rust"; homepage = "https://join-lemmy.org/"; license = licenses.agpl3Only; - maintainers = with maintainers; [ happysalada billewanick ]; + maintainers = with maintainers; [ happysalada billewanick georgyo ]; mainProgram = "lemmy_server"; }; } diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix index 2bb1ccaeb842..b3b267d2f722 100644 --- a/pkgs/servers/web-apps/lemmy/ui.nix +++ b/pkgs/servers/web-apps/lemmy/ui.nix @@ -1,11 +1,11 @@ { lib -, mkYarnPackage +, stdenvNoCC , libsass , nodejs , python3 , pkg-config +, pnpm_9 , fetchFromGitHub -, fetchYarnDeps , nixosTests , vips , nodePackages @@ -14,85 +14,70 @@ let pinData = lib.importJSON ./pin.json; - pkgConfig = { - node-sass = { - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libsass python3 ]; - postInstall = '' - LIBSASS_EXT=auto yarn --offline run build - rm build/config.gypi - ''; - }; - sharp = { - nativeBuildInputs = [ pkg-config nodePackages.node-gyp nodePackages.semver ]; - buildInputs = [ vips ]; - postInstall = '' - yarn --offline run install - ''; - }; - }; - name = "lemmy-ui"; +in + +stdenvNoCC.mkDerivation (finalAttrs: { + + pname = "lemmy-ui"; version = pinData.uiVersion; - src = fetchFromGitHub { + src = with finalAttrs; fetchFromGitHub { owner = "LemmyNet"; - repo = name; + repo = pname; rev = version; fetchSubmodules = true; hash = pinData.uiHash; }; -in -mkYarnPackage { - inherit src pkgConfig name version; + nativeBuildInputs = [ + nodejs + pnpm_9.configHook + ]; + + buildInputs = [libsass vips ]; extraBuildInputs = [ libsass ]; - - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - hash = pinData.uiYarnDepsHash; + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) pname version src; + hash = pinData.uiPNPMDepsHash; }; - patchPhase = '' - substituteInPlace ./package.json \ - --replace '$(git rev-parse --short HEAD)' "${src.rev}" \ - --replace 'yarn clean' 'yarn --offline clean' \ - --replace 'yarn run rimraf dist' 'yarn --offline run rimraf dist' - ''; - - yarnPreBuild = '' - export npm_config_nodedir=${nodejs} - ''; - buildPhase = '' - # Yarn writes cache directories etc to $HOME. - export HOME=$PWD/yarn_home + runHook preBuild - ln -sf $PWD/node_modules $PWD/deps/lemmy-ui/ - echo 'export const VERSION = "${version}";' > $PWD/deps/lemmy-ui/src/shared/version.ts + pnpm build:prod - yarn --offline build:prod + runHook postBuild ''; - preInstall = '' + # installPhase = '' + # runHook preInstall + + # mkdir -p $out/{bin,lib/${finalAttrs.pname}} + # mv {dist,node_modules} $out/lib/${finalAttrs.pname} + + # runHook postInstall + + # ''; + preInstall = '' mkdir $out - cp -R ./deps/lemmy-ui/dist $out + cp -R ./dist $out cp -R ./node_modules $out ''; + distPhase = "true"; passthru.updateScript = ./update.py; passthru.tests.lemmy-ui = nixosTests.lemmy; - passthru.commit_sha = src.rev; + passthru.commit_sha = finalAttrs.src.rev; meta = with lib; { description = "Building a federated alternative to reddit in rust"; homepage = "https://join-lemmy.org/"; license = licenses.agpl3Only; - maintainers = with maintainers; [ happysalada billewanick ]; + maintainers = with maintainers; [ happysalada billewanick georgyo ]; inherit (nodejs.meta) platforms; }; -} +}) diff --git a/pkgs/servers/web-apps/lemmy/update.py b/pkgs/servers/web-apps/lemmy/update.py index 4e867553b790..c9ce4e6e8823 100755 --- a/pkgs/servers/web-apps/lemmy/update.py +++ b/pkgs/servers/web-apps/lemmy/update.py @@ -30,7 +30,7 @@ class Pin: serverHash: str = "" serverCargoHash: str = "" uiHash: str = "" - uiYarnDepsHash: str = "" + uiPNPMDepsHash: str = "" filename: Optional[str] = None @@ -136,18 +136,10 @@ def make_server_pin(pin: Pin, attr: str) -> None: pin.write() -def make_ui_pin(pin: Pin, package_json: str, attr: str) -> None: - # Save a copy of package.json - print("Getting package.json") - with urlopen( - f"https://raw.githubusercontent.com/{OWNER}/{UI_REPO}/{pin.uiVersion}/package.json" - ) as resp: - with open(os.path.join(SCRIPT_DIR, package_json), "wb") as fd: - fd.write(resp.read()) - +def make_ui_pin(pin: Pin, attr: str) -> None: pin.uiHash = prefetch_github(OWNER, UI_REPO, pin.uiVersion) pin.write() - pin.uiYarnDepsHash = get_fod_hash(attr) + pin.uiPNPMDepsHash = get_fod_hash(attr) pin.write() @@ -160,4 +152,4 @@ if __name__ == "__main__": pin = Pin(server_version, ui_version, filename=os.path.join(SCRIPT_DIR, "pin.json")) make_server_pin(pin, "lemmy-server") - make_ui_pin(pin, "package.json", "lemmy-ui") + make_ui_pin(pin, "lemmy-ui") diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index 964baf96f827..43f3f399b4e1 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "mediawiki"; - version = "1.41.1"; + version = "1.42.1"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - hash = "sha256-TguqlTuF6U0xBAyyUSCrxgb6hpsuMxJr37t/xhPoxLI="; + hash = "sha256-7IevlaNd0Jw01S4CeVZSoDCrcpVeQx8IynIqc3N+ulM="; }; postPatch = '' diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index e579303bcfd2..3a65cb0fecfa 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nifi"; - version = "1.26.0"; + version = "1.27.0"; src = fetchzip { url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip"; - hash = "sha256-V/XrggYDeitsDmdvwnXK5QIBGDDBmK4mToz1RphkbSk="; + hash = "sha256-D3o7MLn8vdDqzk6/AJ7Lmq6Yx2swy8CwOyDTlxFSVME="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/pixelfed/default.nix b/pkgs/servers/web-apps/pixelfed/default.nix index d69ee6a154b0..0d696b33a639 100644 --- a/pkgs/servers/web-apps/pixelfed/default.nix +++ b/pkgs/servers/web-apps/pixelfed/default.nix @@ -10,16 +10,16 @@ php.buildComposerProject (finalAttrs: { pname = "pixelfed"; - version = "0.11.13"; + version = "0.12.1"; src = fetchFromGitHub { owner = "pixelfed"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-bEwKaC9fSOGLQbjsuPuIdMMbO3kzvzQxWQR8C2A4mQc="; + hash = "sha256-pNo10vvUD7q0HLM7+GgT+6PyocF4kDZ3Zee4ZCPDJNQ="; }; - vendorHash = "sha256-ahQsOq3qOMGt3b0Ebac4xex+MP9knTmjyCy0PSNE4W8="; + vendorHash = "sha256-y6dgF/LHEYEVG+MgNnZa6f6oMQGvuvAgG6PVbmeMIz4="; postInstall = '' mv "$out/share/php/${finalAttrs.pname}"/* $out diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index 8a9fc7973f98..98b084ad50e3 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -1,10 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests, installShellFiles, stdenv }: buildGoModule rec { pname = "shiori"; - version = "1.5.5"; + version = "1.7.0"; - vendorHash = "sha256-suWdtqf5IZntEVD+NHGD6RsL1tjcGH9vh5skISW+aCc="; + vendorHash = "sha256-fakRqgoEcdzw9WZuubaxfGfvVrMvb8gV/IwPikMnfRQ="; doCheck = false; @@ -12,18 +12,24 @@ buildGoModule rec { owner = "go-shiori"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kGPvCYvLLixEH9qih/F3StUyGPqlKukTWLSw41+Mq8E="; + sha256 = "sha256-5+hTtvBnj3Nh5HitReVkLift9LTiMYVuuYx5EirN0SA="; }; - passthru.tests = { - smoke-test = nixosTests.shiori; - }; + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + installShellCompletion --cmd shiori \ + --bash <($out/bin/shiori completion bash) \ + --fish <($out/bin/shiori completion fish) \ + --zsh <($out/bin/shiori completion zsh) + ''; + + passthru.tests.smoke-test = nixosTests.shiori; meta = with lib; { description = "Simple bookmark manager built with Go"; mainProgram = "shiori"; homepage = "https://github.com/go-shiori/shiori"; license = licenses.mit; - maintainers = with maintainers; [ minijackson ]; + maintainers = with maintainers; [ minijackson CaptainJawZ ]; }; } diff --git a/pkgs/servers/web-apps/slskd/default.nix b/pkgs/servers/web-apps/slskd/default.nix index 75dd597001b3..db233e2a7020 100644 --- a/pkgs/servers/web-apps/slskd/default.nix +++ b/pkgs/servers/web-apps/slskd/default.nix @@ -8,13 +8,13 @@ }: let pname = "slskd"; - version = "0.19.5"; + version = "0.21.1"; src = fetchFromGitHub { owner = "slskd"; repo = "slskd"; rev = version; - sha256 = "sha256-Vm+nA3yKiCMpQ41GTQF6Iuat89QrUtstQdHmX/DyU9g="; + sha256 = "sha256-ic631e4pyby6EibUkxIGc/uQnVuPY9RFZ9hWvw3u1zk="; }; meta = with lib; { @@ -32,7 +32,7 @@ let src = "${src}/src/web"; npmFlags = [ "--legacy-peer-deps" ]; nodejs = nodejs_18; - npmDepsHash = "sha256-E1J4fYcY1N+UmN4Ch4Ss6ty+nYlmrv3ngvCJ8YCjPfI="; + npmDepsHash = "sha256-06qQ1y870TrkXhkHYADjnWVhdyiLWEqdDt3qrJ1BBFo="; installPhase = '' cp -r build $out ''; @@ -43,8 +43,8 @@ in buildDotnetModule { runtimeDeps = [ mono ]; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; projectFile = "slskd.sln"; diff --git a/pkgs/servers/web-apps/slskd/deps.nix b/pkgs/servers/web-apps/slskd/deps.nix index 7de44128b9aa..e4d5bcd850b5 100644 --- a/pkgs/servers/web-apps/slskd/deps.nix +++ b/pkgs/servers/web-apps/slskd/deps.nix @@ -2,114 +2,105 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ + (fetchNuGet { pname = "Asp.Versioning.Abstractions"; version = "8.1.0"; sha256 = "1pcnmhk5viym05kq9ivkx7w03m181z1dd0i9fy450acyzksz7zfa"; }) + (fetchNuGet { pname = "Asp.Versioning.Http"; version = "8.1.0"; sha256 = "0y4zr1brvjsfz3ldjga2zrwvvvsdla9b4hsqgnhk9bdjyfiiwyj3"; }) + (fetchNuGet { pname = "Asp.Versioning.Mvc"; version = "8.1.0"; sha256 = "0wlr7akw6z9nm2a8an4zks08gj9g0bmgg7kmlws3y61rzbwlhk3g"; }) + (fetchNuGet { pname = "Asp.Versioning.Mvc.ApiExplorer"; version = "8.1.0"; sha256 = "12dn272zmgk2z03j5f50jf0a4zin7df4v15q96djbwhrxc6wc7q9"; }) (fetchNuGet { pname = "AutoFixture"; version = "4.18.1"; sha256 = "0whinrvkr2xbhkwd02jbcnws3wz7vlc25hk6w0iw4g92hrmgxqxd"; }) (fetchNuGet { pname = "AutoFixture.Xunit2"; version = "4.18.1"; sha256 = "1xs5dbj410h29spdl5c07vrxqkdl3rcyl2fv4jv4g7vq3kanc5p6"; }) (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) (fetchNuGet { pname = "coverlet.msbuild"; version = "6.0.0"; sha256 = "18qgg6d0ybrr70g69yqamgn5qvpyizlii1123cnj65amd0w2rxjl"; }) (fetchNuGet { pname = "Fare"; version = "2.1.1"; sha256 = "1gagj8k2w5m2z6nlywrzhqx1q9n880yriwk0lsq3vcda9lcggmcz"; }) - (fetchNuGet { pname = "FluentFTP"; version = "48.0.3"; sha256 = "147n6vk3042jm1qspn2jss84qf5v5qh0spv3arpcak2nh61pjrf4"; }) + (fetchNuGet { pname = "FluentFTP"; version = "49.0.2"; sha256 = "14arsbqz7qxpig7nd1amxg9577mgvwak3631kqmiq1x4hfw5whim"; }) (fetchNuGet { pname = "IPAddressRange"; version = "6.0.0"; sha256 = "0fnaxxabamzijj7a418i1z5nnd5ymcjsbplqrj95z8vdw02b99ny"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "7.0.13"; sha256 = "1zzihfm2rwy5z11ndvpi0bx2llghg52msv1mwhgjlrm06q2zff5l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "7.0.13"; sha256 = "091cim81z0r0yl33d8qgs5h1xm6r2fwzl4v805arfkjhjr02q3f3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "7.0.13"; sha256 = "1wp7dvm9cq3bxz8lxknkjyn9myxlcyr4f0a3296pr48r7jnhafk7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "7.0.13"; sha256 = "0n7g7581n9gmpxm2bi0mgxkwj63gva9kmy3njb3zpvvr2vz93fq2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Versioning"; version = "5.1.0"; sha256 = "09v155s17px3d4zm2qz4syj6gdj17sb1a18fzwwvsrs3h357m4c1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer"; version = "5.1.0"; sha256 = "01bhvs1n7217js1rh3vgl5i2gmxvkgpa3b8i71sv3k8bcz29101l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "7.0.13"; sha256 = "13mpw2rj0yb68gvjzb0yg5nzl9wi5pg95swmb4lj38vzypbc897p"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "7.0.13"; sha256 = "1lk74hsv3m1sc86cjrbx89a9w7f0a8v38sk6nmig49bk1fkpnb46"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "7.0.13"; sha256 = "0fvajiq24waqxh7pvp3kjnjbj7adhffhm21rmw6l09dvcin8hqwf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "7.0.13"; sha256 = "0kzisw542lvcn96n7vk2cwb9n2kb580hxanwahw57x3j8kyz97nz"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "7.0.4"; sha256 = "0x0gb6r9lr72jcnv3kkgi01zx1hgpx54niszmrjkdcfivbmmaa81"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "8.0.6"; sha256 = "1ks797mr3pjq01zxhknccv5rxi7z6vbw9p19nz69ir4xxf8kfj5d"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "8.0.6"; sha256 = "1lw5fjmxb3nvl3akhv16plv83g59m554k7944ahpak77860cqyr8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "8.0.6"; sha256 = "1gs2f63j0z63qzj8564ldba02i4754b8x80d7rmyb0hihz60fyf6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "8.0.6"; sha256 = "101b91c8iqfs55am569sgd6bc66dhqqxnll4jbcshvz5q6j4yaq4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "8.0.6"; sha256 = "0csdgi0z40kyyxpy3wqd558n2s8mf4c6zxh785parg27r0bl41mi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "8.0.6"; sha256 = "0kl6skydfslz7p6hixlgq8y4472pwfmyar18nqydabmfl8w5fy1j"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "8.0.6"; sha256 = "03cncacrdhsc0yfrzwxs3cmsj8g1fy1nc49xjg58vid3i1jc81pz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "8.0.6"; sha256 = "05yw7c79zdj7y0kwpfbgzcnh130rrphscg76y96sq1q3fp3gh3x6"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "8.0.0"; sha256 = "1mkzpxk07mcvb1wkqsm4cz0kjln0m5z4fn902874dcj9v5phi8v7"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "7.0.13"; sha256 = "07k00mk8f9pd4gcmx81i3l5kqbih2abc939lixpak7hmqzf3a18r"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.13"; sha256 = "1rnm635jvjyxc7jb9isgarasrhmpvsahv6r6gp4b7li1y2sz3pyv"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "7.0.13"; sha256 = "0jmmfcqvxfacgycwdqqrxgimjk83m59w68lpy5vgnqwcbfabg7zj"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "7.0.13"; sha256 = "0r36s142lknwx8j9lnxnx70wv3i7f4z6y2d5fi7r2whd3rvidkpq"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "7.0.13"; sha256 = "030s0rz3xjdlr77p1s7w0mqs0jrwgsklz63bnm30sxgr6zb25pz3"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "7.0.13"; sha256 = "0kx5056d6qkyxdcpqz46gd344xmizp2w0hknxh1x06bdfsnd292i"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "7.0.13"; sha256 = "1mrgz6r4nllm3v8lgg1xy53am80kscr8kfh18xzc48w3frxwslr7"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "8.0.6"; sha256 = "17h6jhhaagdhk1ljyjgxsqq168xw7yda5ys1sxls7nqkbrq3an5p"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.6"; sha256 = "0sifqhm9myix618a77w5h4v66da9dgq0aabgqrics30bpmnh219j"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.6"; sha256 = "0q9j6qqns82c99imkqaw1ngq0x19flbm1p9wc92b0l46n3lz7lsg"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.6"; sha256 = "0zq9hcajib3b2j5xn7qllfq2x9g6xh9s8rap03r729llsl1hims5"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.6"; sha256 = "17r858s69mar0k70zqf0r2cp7k7sc06xazml0ncgacglw9l9ydb9"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.6"; sha256 = "1p55h0w30gxvnbq312pbivwss5la86zz7nmfa9wvskdp5b6y8rwp"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.6"; sha256 = "181lp36mh96rix1f8zl0061p2m37ksw7dnj9r384n1cxw1961dg2"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "7.0.0"; sha256 = "1hv94kwd4v7969cq3ik2afg5ipn44zbhpsgaga9cd0z47swz4r3a"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "7.0.0"; sha256 = "09mq6g61rqjy5mdhsz2224m0rb0z9rkrxhhqym9zwpn272bbc9df"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; sha256 = "04m6ywsf9731z24nfd14z0ah8xl06619ba7mkdb4vg8h5jpllsn4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; sha256 = "0bv8ihd5i2gwr97qljwf56h8mdwspmlw0zs64qyk608fb3ciwi25"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.0"; sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.0"; sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; sha256 = "1as8cygz0pagg17w22nsf6mb49lr2mcl1x8i3ad1wi8lyzygy1a3"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.0"; sha256 = "13jj7jxihiswmhmql7r5jydbca4x5qj6h7zq10z17gagys6dc7pw"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.0.0"; sha256 = "0cqbvy49ph16rlba2f35qhi0n7vpcf5kjybvn5fbs7dchfdzw927"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.1.0"; sha256 = "1xc61dy07bn2q73mx1z3ylrw80xpa682qjby13gklnqq636a3gab"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.0.0"; sha256 = "06s8j8v0w06f12jxw6vvsd0l5zqrmsvc3rr2gqx9z3gcq7mdnr3l"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.0"; sha256 = "1pvms778xkyv1a3gfwrxnh8ja769cxi416n7pcidn9wvg15ifvbh"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "7.0.0"; sha256 = "04wb6hw3r7mmhg57215r1mb01q17glyaddjw1j5g1drsws914fj4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.1"; sha256 = "1wyhpamm1nqjfi3r463dhxljdlr6rm2ax4fvbgq2s0j3jhpdhd4p"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; sha256 = "02jnx23hm1vid3yd9pw4gghzn6qkgdl5xfc5r0zrcxdax70rsh5a"; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; sha256 = "15m4j6w9n8h0mj7hlfzb83hd3wn7aq1s7fxbicm16slsjfwzj82i"; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks"; version = "6.0.9"; sha256 = "06mx8zmlmi371ab5pskw8iawy8bbi4vx6rwrcj0andc59zfmg96q"; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"; version = "6.0.9"; sha256 = "1nv2rwq0q7ql63qip5ba45p97yxgva9jg6gnvrnfh2yk2fjwyag2"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "7.0.13"; sha256 = "1sdn9cssq7khq094zb5y8mrp3xapfbmccgm0wgd0chs0h3vxim49"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "8.0.6"; sha256 = "0kl39lwpmk3wa3h4wanz80ckzzl5ffyn5ydgccpcjzy7ihpj4j95"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; sha256 = "1idq65fxwcn882c06yci7nscy9i0rgw6mqjrl7362prvvsd9f15r"; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "6.0.0"; sha256 = "1mwjx6li4a82nb589763whpnhf5hfy1bpv1dzqqvczb1lhxhzhlj"; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; sha256 = "00d5dwmzw76iy8z40ly01hy9gly49a7rpf7k7m99vrid1kxp346h"; }) (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "3.1.0"; sha256 = "02ipxf75rqzsbmmy5ka44hh8krmxgky9mdxmh8f7fkbclpg2s6cy"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.1.0"; sha256 = "1d3yhqj1rav7vswm747j7w8fh8paybji4rz941hhlq4b12mfqfh4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.0"; sha256 = "1zyalrcksszmn9r5xjnirfh7847axncgzxkk3k5srbvlcch8fw8g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.2"; sha256 = "1wv54f3p3r2zj1pr9a6z8zqrh2ihm6v6qcw2pjwis1lcc0qb472m"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; sha256 = "0xv3sqc1lbx5j4yy6g2w3kakzvrpwqs2ihax6lqasj5sz5map6fk"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.1"; sha256 = "0i9pgmk60b8xlws3q9z890gim1xjq42dhyh6dj4xvbycmgg1x1sd"; }) (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "7.0.0"; sha256 = "15lz0qk2gr2q52i05ip51dzm9p4hzqlrammkc0hv2ng6g0z72697"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.1.0"; sha256 = "0akccwhpn93a4qrssyb3rszdsp3j4p9hlxbsb7yhqb78xydaqhyh"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.1"; sha256 = "0ghz4y4gxnf2vw8yvhz9nkw21p6q2qqwh19phkk1xwxywyilr3mq"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.2"; sha256 = "0as39ml1idgp42yvh725ddqp4illq87adzd1ymzx6xjxsxsjadq2"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.0"; sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.0.3"; sha256 = "0njmg2lygnirnfjv9gck2f5lq4ly5rgws9cpf8qj3kwcwxfp0b9s"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.0.3"; sha256 = "1ayh85xqdq8rqjk2iqcn7iaczcl7d8qg6bxk0b4rgx59fmsmbqj7"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.1"; sha256 = "1jnswvv5d6gbnssmql08d72pb0a42xscp4k5k1svsk8k5pj3nf8p"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.0.3"; sha256 = "13cjqmf59k895q6gkd5ycl89mnpalckda7rhsdl11jdyr32hsfnv"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "6.15.1"; sha256 = "1075g2g30g7qmznc9mf97nm4k4xbz4s37bi59qxwbx0y2pnl1f2r"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "6.15.1"; sha256 = "19sbh8hxbbp24294k8vc6z92906wq366m49k5484mngwrw5jpsyf"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.1"; sha256 = "1ljg7nrxjkfcwh081831s30agpfx8f3flqvwg5piy6vfc9hqmxa8"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.0.3"; sha256 = "1pmhd0imh9wlhvbvvwjrpjsqvzagi2ly22nddwr4r0pi234khyz1"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.1.2"; sha256 = "01jdg8b1hi4nx5h1cn9baalfkp4y70kc2wf4lz77kw8w1fvrppa0"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.1.2"; sha256 = "1y9yq07hr91aaxm7pahv3fc590dzydlffr4hs3zix1g45pvd4m4i"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.1.2"; sha256 = "1yi7s2pm4f8vl6b0qck0nrfsrf1h4jwamznkzl75n1cwxpbdikp8"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "7.1.2"; sha256 = "0ql5b7472g7359b1pqh2lfm8s3lym9vyzj1xpvbhsv9syk9czrg8"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "7.1.2"; sha256 = "06r9i1m6zhfbbx18p0drpcbswirlq7xg0wm3iqfjgzxyv053033h"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.1.2"; sha256 = "1q70c1ax9f5nggqp4g8nyfaz0481grsaxhp85cmjpmx8l3q35zx9"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) + (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; sha256 = "1wr8crmjg4gznm3jqgz9s9p285vrwb8a6baqc6gz3b58rn4m88km"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) (fetchNuGet { pname = "Moq"; version = "4.16.1"; sha256 = "1m2gwbx0gsy84rl9c3hgdaw9gz8d08ffg19nwg0idsdqmmiq887l"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) - (fetchNuGet { pname = "OneOf"; version = "3.0.263"; sha256 = "08jiy5ff6nx3bbmia7iqcfrva0bynr87m0m4nxkzm5ri21w49ri1"; }) - (fetchNuGet { pname = "prometheus-net"; version = "8.2.0"; sha256 = "19m9lkpc4h9a0jmn66p61x8960gk9fidcwic70nrvjhmd5m201fj"; }) - (fetchNuGet { pname = "prometheus-net.AspNetCore"; version = "8.2.0"; sha256 = "1lilk7xw19wgl2i7cjbf09ssd4jicla45wj29hfy6d1bzcnd6yn8"; }) - (fetchNuGet { pname = "prometheus-net.AspNetCore.HealthChecks"; version = "8.2.0"; sha256 = "1kzvlab31ypgp62663nnr6g964w19iabnyilqlkm6acl5f5vvfvv"; }) + (fetchNuGet { pname = "OneOf"; version = "3.0.271"; sha256 = "09b15fh1f3wzx3m9m3150pyflb02h9vqspg7aigm4p9zk3qb4mdl"; }) + (fetchNuGet { pname = "prometheus-net"; version = "8.2.1"; sha256 = "0g1hf6v6k4ym9a663az76775rkazvxmfl4yb60w0ghqzvrfxw49p"; }) + (fetchNuGet { pname = "prometheus-net.AspNetCore"; version = "8.2.1"; sha256 = "1rygyyflx53djczfgavr6jzqgz0sfw3r1h93gm3gs3v48d6c06kn"; }) + (fetchNuGet { pname = "prometheus-net.AspNetCore.HealthChecks"; version = "8.2.1"; sha256 = "012954anrd279hjdav4bb1rrblbnsq2fs15l4s6ab6cz6ih4hi0b"; }) (fetchNuGet { pname = "prometheus-net.DotNetRuntime"; version = "4.4.0"; sha256 = "1hrzf2djkjiswyf4xg3pl6rb0a8i0mh294hrfbna782hfxya7c29"; }) - (fetchNuGet { pname = "prometheus-net.SystemMetrics"; version = "3.0.0"; sha256 = "0gl1msasy19vy836dzwkp8046f141nlrx0fhzg70vzfzjnrh3jm5"; }) + (fetchNuGet { pname = "prometheus-net.SystemMetrics"; version = "3.1.0"; sha256 = "1k6qw6bgfq5h88z0zjndv7hpaaicgln96py9y1nyskms1xhdxb7n"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -156,7 +147,7 @@ (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "Serilog"; version = "3.1.1"; sha256 = "0ck51ndmaqflsri7yyw5792z42wsp91038rx2i6vg7z4r35vfvig"; }) - (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.0"; sha256 = "0g1scn1a5paiydxk1nnrwzzqny2vabc3hniy6jwjqycag6ch2pni"; }) + (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.1"; sha256 = "0vmrbhj9vb00fhvxrw3w5j1gvdx4xzxz8d2cp65hps988zxwykkb"; }) (fetchNuGet { pname = "Serilog.Extensions.Hosting"; version = "8.0.0"; sha256 = "10cgp4nsrzkld5yxnvkfkwd0wkc1m8m7p5z42w4sqd8f188n8i9q"; }) (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "8.0.0"; sha256 = "087ab94sfhkj6h6x3cwwf66g456704faxnfyc4pi6shxk45b318s"; }) (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "2.0.0"; sha256 = "0y7vg2qji02riq7r0kgybarhkngw6gh3xw89w7c2hcmjawd96x3k"; }) @@ -167,17 +158,17 @@ (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) (fetchNuGet { pname = "Serilog.Sinks.Grafana.Loki"; version = "7.1.1"; sha256 = "1c7csknq5v09j2x3ybrssxk59aca9x678j53wp73ryjh0niqxznl"; }) (fetchNuGet { pname = "Serilog.Sinks.Http"; version = "8.0.0"; sha256 = "1sx30n2cn5ixfvxs8llgk19r0vvv27246341bjy2h4994sl8zgld"; }) - (fetchNuGet { pname = "Soulseek"; version = "6.2.0"; sha256 = "1nz4fcqpf4mqbc8ig1311vkcn11wcx3nayk56cn7syqczpdqzqxv"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.4"; sha256 = "0shdspl9cm71wwqg9103s44r0l01r3sgnpxr523y4a0wlgac50g0"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.4"; sha256 = "11l85ksv1ck46j8z08fyf0c3l572zmp9ynb7p5chm5iyrh8xwkkn"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.4"; sha256 = "0b8f51nrjkq0pmfzjaqk5rp7r0cp2lbdm2whynj3xsjklppzmn35"; }) + (fetchNuGet { pname = "Soulseek"; version = "6.5.0"; sha256 = "0gcczchpp96dl0zcb3m50ach7sny1z3frcq7vspbyq0qffws5xa2"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.6"; sha256 = "0pzgdfl707pd9fz108xaff22w7c2y27yaix6wfp36phqkdnzz43m"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; sha256 = "1w8zsgz2w2q0a9cw9cl1rzrpv48a04nhyq67ywan6xlgknds65a7"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.6"; sha256 = "0g959z7r3h43nwzm7z3jiib1xvyx146lxyv0x6fl8ll5wivpjyxq"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.6"; sha256 = "1vs1c7yhi0mdqrd35ji289cxkhg7dxdnn6wgjjbngvqxkdhkyxyc"; }) (fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.2.0-beta.435"; sha256 = "0dirz0av24ds2k7hgpss15y4wlhwlzz22qdjvkq0n3g3sxcckrsy"; }) (fetchNuGet { pname = "StyleCop.Analyzers.Unstable"; version = "1.2.0.435"; sha256 = "1jv4ha4y2c9922n21yf2dvfkmi8qfa8z28gk5zsqdyck08izp9mh"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.5.0"; sha256 = "0k61chpz5j59s1yax28vx0mppx20ff8vg8grwja112hfrzj1f45n"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; sha256 = "0lq774iggpvsmykbrplvv2a5z2ylsslv5wynmvpnlznd4lvgxb4h"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; sha256 = "0j93y0krn5fzvji0k7g4cxi22b7j8n3brxw4698pjq2pqqf2d8qy"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; sha256 = "00lar7246mncidflm15xz5b9hpni9bf8wj37dc0l2sj3hhv9nvwj"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; sha256 = "0w0h2cs8n5avczzm5plzmkvkc6xn0pj425f4400fk21h8ysvhg8h"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) @@ -214,7 +205,7 @@ (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.0.3"; sha256 = "1fls88ffq34j1gr6zay1crm27v3sjs5fa4mvj9akqjq05bxanlhk"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.1.2"; sha256 = "09ds8xanyd4zgncsl77gnlcz4kqw00s9ap3wvc6c8lrj91vmc58h"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) @@ -225,7 +216,7 @@ (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; sha256 = "1ila2vgi1w435j7g2y7ykp2pdbh9c5a02vm85vql89az93b7qvav"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "8.0.0"; sha256 = "00f36lqz1wf3x51kwk23gznkjjrf5nmqic9n7073nhrgrvb43nid"; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) @@ -278,7 +269,6 @@ (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0"; sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; }) @@ -297,16 +287,14 @@ (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; }) (fetchNuGet { pname = "System.Text.Json"; version = "6.0.2"; sha256 = "1lz6gx1r4if8sbx6yp9h0mi0g9ffr40x0cg518l0z2aiqgil3fk0"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; sha256 = "0scb0lp7wbgcinaa4kqiqs7b8i5nx4ppfad81138jiwd1sl37pyp"; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; sha256 = "1qrmqa6hpzswlmyp3yqsbnmia9i5iz1y208xpqc1y88b1f6j1v8a"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "8.0.0"; sha256 = "060ab3gxgmffzlfcj08hpmkyfkhyiky9brw35klbl32pnfhdi53k"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) @@ -323,15 +311,15 @@ (fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; sha256 = "1z7v9lrkss1f8s42sclsq3az9zjihgmhyxnwhjyf0scgk1amngrw"; }) (fetchNuGet { pname = "Utility.CommandLine.Arguments"; version = "6.0.0"; sha256 = "0i8m0vn1wm4wy7d3radyha6kxg0l50r2q02zlmkg6633yyiqry1a"; }) (fetchNuGet { pname = "Utility.EnvironmentVariables"; version = "1.0.5"; sha256 = "1x9vd5qni194yxc18pcrnvln9zib01sgai7ygw86zcj5137hj72i"; }) - (fetchNuGet { pname = "xunit"; version = "2.6.3"; sha256 = "0yy0579ipqk4fab877kc0y947q9i83329rwwf47apwgbhpkcfi62"; }) + (fetchNuGet { pname = "xunit"; version = "2.6.6"; sha256 = "024290yclyq54jrm29bj6vipshq4dxpci9y06b9j8cpbsn7drr5s"; }) (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.1"; sha256 = "0c7zkf3i8n1mhc457q859klk067bw1xbf31lyxlwc5hlx9aqz65z"; }) (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "1.7.0"; sha256 = "0dga1c6icksd6y7c652pkwcmdsqxrgnxj3v2nijc0vayqa5prnvc"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.6.3"; sha256 = "0i4g5sw0j2j4ajya671d4ragq3xrgpaf2bw5fzs7hlkykm0s5vgc"; }) - (fetchNuGet { pname = "xunit.core"; version = "2.6.3"; sha256 = "14jissxdzrshnrz8rbgxzvn93if808fvmcbha6bz9f5yh503z88p"; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "1.10.0"; sha256 = "0b4rbxpx4bmbjr18zn5afahx9imhqv0dg76flhjxsqzvx66zjqaf"; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.6.6"; sha256 = "1rkp96b4zdbv38r2hffhcwfp82vcs86a24b09001h4x5ln51bdb5"; }) + (fetchNuGet { pname = "xunit.core"; version = "2.6.6"; sha256 = "0xi254srmvrrqkzq0n74d048hphijsk38gx47r68vm44q1vpzpln"; }) (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.2.0"; sha256 = "0l9fl09l709dq671r5yvmcrk9vhxgszmxf3ny1h9ja2sp9xx5pbs"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.6.3"; sha256 = "1j9hjrar5lr3irxmpnbk564dc4g11hkjx6w4241xx333pz4h8jr5"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.6.3"; sha256 = "0514n70rizl96kx9b62qpsia2nc7k9rjbmwn32vbclpvil2jdy07"; }) - (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.5"; sha256 = "06w2skg7vn1wag7x06z8gw2rbfzq21i3alg6dfcwj0rkq98zyxac"; }) - (fetchNuGet { pname = "YamlDotNet"; version = "13.7.1"; sha256 = "1m2lnfb2r8382fpjyxp79wnbis7l462zksj3618142q53y33bk5z"; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.6.6"; sha256 = "0f8w71b58kbv23b7p6083jxy4pmpsa59r8xqpp2j71300cyp2rl0"; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.6.6"; sha256 = "0n295fxvzwp4d27qa644m55klapvcmynb240rwcjr95yvgsfzjz4"; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.6"; sha256 = "1knl6myb5zip2yii1mm5kxvkq81z3zj7dkn8zlqbb4ylaxslzf88"; }) + (fetchNuGet { pname = "YamlDotNet"; version = "15.3.0"; sha256 = "0mcj6j6i756gd6bnmnvcajbf6xfhscbls4b6gs5c3q8w66dmxdys"; }) ] diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index bf6c041205e4..8566c8c61749 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3898,11 +3898,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkeyboard-config"; - version = "2.41"; + version = "2.42"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.41.tar.xz"; - sha256 = "13vjvyg1fjvsqzqkpxzigvv94v154mcb2gba4d80spi9aywxcb7h"; + url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.42.tar.xz"; + sha256 = "01q8gs7lnx9d7iz29pal7a3whz7njmgjcpzhy82wa7zhq6znxc56"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index cd7e116c17d5..f1e63de72bd5 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -397,6 +397,7 @@ self: super: libXpresent = super.libXpresent.overrideAttrs (attrs: { buildInputs = with xorg; attrs.buildInputs ++ [ libXext libXfixes libXrandr ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libXfixes ]; }); libxkbfile = super.libxkbfile.overrideAttrs (attrs: { @@ -636,7 +637,7 @@ self: super: xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: { prePatch = '' - patchShebangs rules/merge.py rules/compat/map-variants.py rules/xml2lst.pl + patchShebangs rules/merge.py rules/compat/map-variants.py rules/generate-options-symbols.py rules/xml2lst.pl ''; nativeBuildInputs = attrs.nativeBuildInputs ++ [ meson @@ -835,6 +836,7 @@ self: super: buildInputs = commonBuildInputs ++ [ bootstrap_cmds automake autoconf Xplugin Carbon Cocoa + mesa ]; propagatedBuildInputs = commonPropagatedBuildInputs ++ [ libAppleWM xorgproto @@ -904,6 +906,35 @@ self: super: }; })); + # xvfb is used by a bunch of things to run tests + # and doesn't support hardware accelerated rendering + # so remove it from the rebuild heavy path for mesa + xvfb = super.xorgserver.overrideAttrs(old: { + configureFlags = [ + "--enable-xvfb" + "--disable-xorg" + "--disable-xquartz" + "--disable-xwayland" + "--disable-glamor" + "--disable-glx" + "--disable-dri" + "--disable-dri2" + "--disable-dri3" + "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" + "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" + "--with-xkb-output=$out/share/X11/xkb/compiled" + ] ++ lib.optional stdenv.isDarwin [ + "--without-dtrace" + ]; + + buildInputs = old.buildInputs ++ (with xorg; [ + pixman + libXfont2 + xtrans + libxcvt + ]) ++ lib.optional stdenv.isDarwin [ Xplugin ]; + }); + lndir = super.lndir.overrideAttrs (attrs: { buildInputs = []; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index f58c526f7def..8305e1574040 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -73,7 +73,7 @@ mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz mirror://xorg/individual/app/xwud-1.0.6.tar.xz mirror://xorg/individual/data/xbitmaps-1.1.3.tar.xz mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.41.tar.xz +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.42.tar.xz mirror://xorg/individual/doc/xorg-docs-1.7.3.tar.xz mirror://xorg/individual/doc/xorg-sgml-doctools-1.12.1.tar.xz mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index b77dbed3b55a..0368963ceb51 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.38.0"; + version = "1.39.0"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-h++IXL1y6f52mSBRP3TiqLMKkFXP/QKaNlpM2PCgT5k="; + hash = "sha256-+JpL6LadrD5FDxtiv+YNkfqylYEp/1aSlkLIaFXl5mw="; }; - npmDepsHash = "sha256-OsG9FCdlSQYWrne/jaklNIsCT0M4+vt8DxZ9CGPfbzM="; + npmDepsHash = "sha256-HMRYbVw4mfxOoPaAzquCEBy97hUC3tR6s1Z8MppJgzY="; buildInputs = lib.optionals withSystemd [ systemdMinimal diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 12c88764e554..37b3d67559c9 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-nmih6kyVaYLVOG+EEaCUYkVRAXPXXUdPchv6JFzlU+U="; + hash = "sha256-ht0zeeePU2fPMP7/Q0K2VKUudVCa4T94sESJCxix04M="; }; - vendorHash = "sha256-QG+50wqYYpASzFv8Y3rpuyahW/lTV8Kz+v3rDt1kAN4="; + vendorHash = "sha256-XDX59HFf0yMEy9D5nQLZk1LeKrBcgC8M5kUyGiy29Ak="; ldflags = [ "-s" diff --git a/pkgs/shells/hishtory/default.nix b/pkgs/shells/hishtory/default.nix index d7875fc7c0b2..4afb7400a480 100644 --- a/pkgs/shells/hishtory/default.nix +++ b/pkgs/shells/hishtory/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "hishtory"; - version = "0.297"; + version = "0.298"; src = fetchFromGitHub { owner = "ddworken"; repo = pname; rev = "v${version}"; - hash = "sha256-qc+TmExj7x7bH5XzppVpwMt7oSK8CtBM/tHAXs4rrlE="; + hash = "sha256-9hs9XLDq1B3a9t+ohDBOj3fm25hMk0jXQI0SnyMAczM="; }; vendorHash = "sha256-zTwZ/sMhQdlf7RYfR2/K/m08U1Il0VQmYFyNNiYsWhc="; @@ -33,7 +33,7 @@ buildGoModule rec { description = "Your shell history: synced, queryable, and in context"; homepage = "https://github.com/ddworken/hishtory"; license = licenses.mit; - maintainers = with maintainers; [ Enzime ]; + maintainers = with maintainers; [ ]; mainProgram = "hishtory"; }; } diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index bdb7bbe6548e..6c2cb409658d 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "liquidprompt"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "liquidprompt"; repo = pname; rev = "v${version}"; - hash = "sha256-ra+uJg9E2Cr1k0Ni1+xG9yKFF9iMInJFB5oAFnc52lc="; + hash = "sha256-ZVzFGe3ItWsN23iyGpxZEN2KtviYKI8x/sDa2MRio/Y="; }; strictDeps = true; diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index e270a895c42c..529f0afd8e4a 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2024-06-29"; + version = "0-unstable-2024-07-03"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "61a805eb06f27dfb4651877ae4e0fd85e2b9f1b7"; - hash = "sha256-ZcpcxRKtx2lS39c09txLGysRkLq6dNyy+9aZNrfGcT0="; + rev = "d6cf03e315f029f6e270fb3949d02432f31a0a04"; + hash = "sha256-cFZ5khjSqg0C4rlkGuAPlZeJO8EOBmz9/B9SMEJFbRA="; }; installPhase = '' diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f7e427aa113d..ab4a161c616d 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,14 +5,14 @@ , git, nix, nixfmt-classic, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2024-06-28"; + version = "2024-07-03"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "dd4be1b6fb9973d63eba334d8bd92b3da30b3e72"; - sha256 = "sha256-d6gqfBxAm4Y1xt204GhPhhEBOwP97K7qCeIf6I6Wbfg="; + rev = "057f3ec67e65661d3c01b757ec5cad0a3718453e"; + sha256 = "sha256-gRQ1F13/CZaxLmDT5L+seUPldP7pBy3n3AcnfBnpcO8="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix index f91709a4c29a..fd83401ba59b 100644 --- a/pkgs/shells/zsh/zimfw/default.nix +++ b/pkgs/shells/zsh/zimfw/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - sha256 = "sha256-ZmOmdIvSs60GYT4zfhYONmfayDOEHG8acsf4u1A2wWQ="; + sha256 = "sha256-JBMrgUMGsvjYasEHJsZ0jZAHmrN3Z0d8T8agI9FiEPs="; }; strictDeps = true; dontConfigure = true; diff --git a/pkgs/shells/zsh/zsh-fzf-history-search/default.nix b/pkgs/shells/zsh/zsh-fzf-history-search/default.nix index 67111738bd5d..9854d76ce281 100644 --- a/pkgs/shells/zsh/zsh-fzf-history-search/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-history-search/default.nix @@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/joshskidmore/zsh-fzf-history-search"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 45cc6742c720..5e5f2be12ba6 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -25,7 +25,7 @@ assert crossSystem == localSystem; let inherit (localSystem) system; - useAppleSDKLibs = localSystem.isAarch64; + useAppleSDKLibs = lib.versionAtLeast localSystem.darwinSdkVersion "11"; commonImpureHostDeps = [ "/bin/sh" @@ -233,7 +233,10 @@ in # stage should only access the stage that came before it. ccWrapperStdenv = self.stdenv; - bash = bootstrapTools; + bash = bootstrapTools // { + shellPath = "/bin/bash"; + }; + coreutils = bootstrapTools; cpio = bootstrapTools; gnugrep = bootstrapTools; @@ -244,10 +247,6 @@ in # will have to manually add it to their build inputs. CF = null; - binutils-unwrapped = bootstrapTools // { - version = "boot"; - }; - binutils = super.wrapBintoolsWith { name = "bootstrap-stage0-binutils-wrapper"; @@ -266,10 +265,98 @@ in inherit (selfDarwin) postLinkSignHook signingUtils; }; - cctools = bootstrapTools // { - targetPrefix = ""; + binutils-unwrapped = (superDarwin.binutils-unwrapped.overrideAttrs (old: { version = "boot"; - man = bootstrapTools; + passthru = (old.passthru or { }) // { + isFromBootstrapFiles = true; + }; + })).override { enableManpages = false; }; + + cctools = super.stdenv.mkDerivation { + pname = "bootstrap-stage0-cctools"; + version = "boot"; + + buildCommand = '' + declare -a cctools=( + ar + bitcode_strip + check_dylib + checksyms + cmpdylib + codesign_allocate + ctf_insert + depinfo + diagtest + ld + gas + gprof + install_name_tool + libtool + lipo + mtoc + mtor + nm + nmedit + otool + pagestuff + ranlib + redo_prebinding + seg_addr_table + seg_hack + segedit + size + strings + strip + vtool + ) + + mkdir -p "$out/bin" + for tool in "''${cctools[@]}"; do + toolsrc="${bootstrapTools}/bin/$tool" + if [ -e "$toolsrc" ]; then + ln -s "$toolsrc" "$out/bin" + fi + done + + # Copy only the required headers to avoid accidentally linking headers that belong to other packages, + # which can cause problems when building Libsystem in the source-based SDK. + declare -a machohdrs=( + arch.h + fat.h + fixup-chains.h + getsect.h + ldsyms.h + loader.h + nlist.h + ranlib.h + reloc.h + stab.h + swap.h + arm + arm64 + hppa + i386 + i860 + m68k + m88k + ppc + sparc + x86_64 + ) + + mkdir -p "$out/include/mach-o" + for header in "''${machohdrs[@]}"; do + machosrc="${bootstrapTools}/include-Libsystem/mach-o/$header" + if [ -e "$machosrc" ]; then + cp -r "$machosrc" "$out/include/mach-o/$header" + fi + done + ''; + + passthru = { + isFromBootstrapFiles = true; + targetPrefix = ""; + }; }; locale = self.stdenv.mkDerivation { @@ -327,22 +414,31 @@ in ''; passthru = { isFromBootstrapFiles = true; - hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ]; + hardeningUnsupportedFlags = [ + "fortify3" + "stackclashprotection" + "zerocallusedregs" + ]; }; }; - clang-unwrapped = selfTools.libclang; libllvm = self.stdenv.mkDerivation { name = "bootstrap-stage0-llvm"; outputs = [ "out" "lib" ]; buildCommand = '' mkdir -p $out/bin $out/lib ln -s $out $lib - ln -s ${bootstrapTools}/bin/strip $out/bin/llvm-strip + for tool in ${toString super.darwin.binutils-unwrapped.llvm_cmds}; do + cctoolsTool=''${tool//-/_} + toolsrc="${bootstrapTools}/bin/$cctoolsTool" + if [ -e "$toolsrc" ]; then + ln -s "$toolsrc" $out/bin/llvm-$tool + fi + done + ln -s ${bootstrapTools}/bin/dsymutil $out/bin/dsymutil ln -s ${bootstrapTools}/lib/libLLVM* $out/lib ''; passthru.isFromBootstrapFiles = true; }; - llvm = selfTools.libllvm; }); libraries = super.llvmPackages.libraries.extend (_: _: { libcxx = self.stdenv.mkDerivation { @@ -380,19 +476,9 @@ in ''; }) - # This stage is primarily responsible for building the linker and setting up versions of - # certain dependencies needed by the rest of the build process. It is necessary to rebuild the - # linker because the `compiler-rt` build process checks the version and attempts to manually - # run `codesign` if it detects a version of `ld64` it considers too old. If that happens, the - # build process will fail for a few different reasons: - # - sigtool is too old and does not accept the `--sign` argument; - # - sigtool is new enough to accept the `--sign` argument, but it aborts when it is invoked on a - # binary that is already signed; or - # - compiler-rt attempts to invoke `codesign` on x86_64-darwin, but `sigtool` is not currently - # part of the x86_64-darwin bootstrap tools. - # - # This stage also builds CF and Libsystem to simplify assertions and assumptions for later by - # making sure both packages are present on x86_64-darwin and aarch64-darwin. + # This stage is primarily responsible for setting up versions of certain dependencies needed + # by the rest of the build process. This stage also builds CF and Libsystem to simplify assertions + # and assumptions for later by making sure both packages are present on x86_64-darwin and aarch64-darwin. (prevStage: # previous stage0 stdenv: assert lib.all isFromBootstrapFiles ( @@ -419,6 +505,8 @@ in inherit (prevStage) ccWrapperStdenv coreutils gnugrep; + binutils-unwrapped = builtins.throw "nothing in the bootstrap should depend on GNU binutils"; + # Use this stage’s CF to build CMake. It’s required but can’t be included in the stdenv. cmake = self.cmakeMinimal; cmakeMinimal = super.cmakeMinimal.overrideAttrs (old: { @@ -436,18 +524,22 @@ in ninja = super.ninja.override { buildDocs = false; }; - # Use this stage’s CF to build Python. It’s required but can’t be included in the stdenv. + # Use this stage’s CF to build Python. It’s required, but it can’t be included in the stdenv. python3 = self.python3Minimal; - python3Minimal = super.python3Minimal.overrideAttrs (old: { - buildInputs = old.buildInputs ++ [ self.darwin.CF ]; + python3Minimal = (super.python3Minimal.override { + self = self.python3Minimal; + }).overrideAttrs (old: { + buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ]; }); darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { + inherit (prevStage.darwin) cctools; + apple_sdk = superDarwin.apple_sdk // { inherit (prevStage.darwin.apple_sdk) sdkRoot; }; - # Use this stage’s CF to build configd. It’s required but can’t be included in the stdenv. + # Use this stage’s CF to build configd. It’s required, but it can’t be included in the stdenv. configd = superDarwin.configd.overrideAttrs (old: { buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ]; }); @@ -460,6 +552,7 @@ in inherit (selfDarwin) sigtool; }; + # Rewrap binutils with the real Libsystem binutils = superDarwin.binutils.override { inherit (self) coreutils; inherit (selfDarwin) postLinkSignHook signingUtils; @@ -470,11 +563,11 @@ in runtimeShell = "${bootstrapTools}/bin/bash"; }; + # Avoid building unnecessary Python dependencies due to building LLVM manpages. binutils-unwrapped = superDarwin.binutils-unwrapped.override { inherit (selfDarwin) cctools; + enableManpages = false; }; - - cctools = selfDarwin.cctools-port; }); llvmPackages = super.llvmPackages // ( @@ -506,28 +599,28 @@ in ''; }) - # Build cctools, Python, and sysctl for use by LLVM’s check phase. They must be built in - # their stage to prevent infinite recursions and to make sure the stdenv used to build - # LLVM has the newly built cctools instead of the one from the bootstrap tools. + # Build sysctl for use by LLVM’s check phase. It must be built separately to avoid an infinite recursion. (prevStage: # previous stage1 stdenv: assert lib.all isFromBootstrapFiles (with prevStage; [ coreutils gnugrep ]); assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ - autoconf automake bash binutils-unwrapped bison brotli cmake cpio cyrus_sasl db + autoconf automake bash bison brotli cmake cpio cyrus_sasl db ed expat flex gettext gmp groff icu libedit libffi libiconv libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 ncurses nghttp2 ninja openldap openssh openssl patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite subversion texinfo unzip which xz zlib zstd ]); + assert lib.all isFromBootstrapFiles (with prevStage.darwin; [ cctools ]); assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ - binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool + locale libtapi print-reexports rewrite-tbd sigtool ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc]); - assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); + assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd xnu ]); assert lib.all isFromBootstrapFiles (with prevStage.llvmPackages; [ clang-unwrapped libclang libllvm llvm compiler-rt libcxx @@ -547,28 +640,18 @@ in python3Minimal scons sed serf sharutils sqlite subversion texinfo unzip which xz zlib zstd; - # Support for the SystemConfiguration framework is required to run the LLVM tests, but trying - # to override python3Minimal does not appear to work. - python3 = (super.python3.override { - inherit (self) libffi; - inherit (self.darwin) configd; - openssl = null; - readline = null; - ncurses = null; - gdbm = null; - sqlite = null; - tzdata = null; - stripConfig = true; - stripIdlelib = true; - stripTests = true; - stripTkinter = true; - rebuildBytecode = false; - stripBytecode = true; - includeSiteCustomize = false; - enableOptimizations = false; + # Avoid pulling in openldap just to run Meson’s tests. + meson = super.meson.overrideAttrs { + doInstallCheck = false; + }; + + # The bootstrap Python needs its own `pythonAttr` to make sure the override works properly. + python3 = self.python3-bootstrap; + python3-bootstrap = super.python3.override { + self = self.python3-bootstrap; + pythonAttr = "python3-bootstrap"; enableLTO = false; - mimetypesSupport = false; - }).overrideAttrs (_: { pname = "python3-minimal-scproxy"; }); + }; darwin = super.darwin.overrideScope (_: superDarwin: { inherit (prevStage.darwin) @@ -617,28 +700,27 @@ in assert lib.all isFromBootstrapFiles (with prevStage; [ coreutils gnugrep ]); assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ - atf autoconf automake bash binutils-unwrapped bison brotli cmake cpio cyrus_sasl db + atf autoconf automake bash bison brotli cmake cpio cyrus_sasl db ed expat flex gettext gmp groff icu kyua libedit libffi libiconv libidn2 libkrb5 libssh2 - libtool libunistring libxml2 m4 ncurses nghttp2 ninja openldap openssh openssl + libtool libunistring libxml2 m4 meson ncurses nghttp2 ninja openldap openssh openssl patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite subversion sysctl.provider texinfo unzip which xz zlib zstd ]); + assert lib.all isFromBootstrapFiles (with prevStage.darwin; [ cctools ]); assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ - binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool + locale libtapi print-reexports rewrite-tbd sigtool ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); - assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); + assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd xnu ]); assert lib.all isFromBootstrapFiles (with prevStage.llvmPackages; [ clang-unwrapped libclang libllvm llvm compiler-rt libcxx ]); - assert lib.getVersion prevStage.stdenv.cc.bintools.bintools == lib.getVersion prevStage.darwin.cctools-port; - stageFun prevStage { name = "bootstrap-stage-xclang"; @@ -646,12 +728,11 @@ in inherit (prevStage) ccWrapperStdenv atf autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal cpio cyrus_sasl db ed expat flex gettext gmp groff icu kyua libedit libffi libiconv - libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 ncurses nghttp2 ninja + libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 meson ncurses nghttp2 ninja openldap openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zlib zstd; - # Switch from cctools-port to cctools-llvm now that LLVM has been built. - darwin = super.darwin.overrideScope (_: superDarwin: { + darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { inherit (prevStage.darwin) CF Libsystem configd darwin-stubs dyld launchd libclosure libdispatch libobjc locale objc4 postLinkSignHook print-reexports rewrite-tbd signingUtils sigtool; @@ -660,8 +741,13 @@ in inherit (prevStage.darwin.apple_sdk) sdkRoot; }; + binutils = superDarwin.binutils.override { + inherit (prevStage) expand-response-params; + libc = selfDarwin.Libsystem; + }; + # Avoid building unnecessary Python dependencies due to building LLVM manpages. - cctools-llvm = superDarwin.cctools-llvm.override { enableManpages = false; }; + binutils-unwrapped = superDarwin.binutils-unwrapped.override { enableManpages = false; }; }); llvmPackages = super.llvmPackages // ( @@ -679,6 +765,11 @@ in nixSupport.cc-ldflags = [ "-lSystem" ]; }); + tools = super.llvmPackages.tools.extend (selfTools: superTools: { + # LLVM’s check phase takes a while to run, so disable it in the first LLVM build to speed up the bootstrap. + libllvm = superTools.libllvm.override { doCheck = false; }; + }); + libraries = super.llvmPackages.libraries.extend (selfLib: superLib: { compiler-rt = null; libcxx = superLib.libcxx.override ({ @@ -686,7 +777,7 @@ in }); }); in - { inherit libraries; } // libraries + { inherit tools libraries; } // tools // libraries ); }; @@ -706,8 +797,8 @@ in (prevStage: # previous stage-xclang stdenv: assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ - atf autoconf automake bash binutils-unwrapped bison cmake cmakeMinimal coreutils cpio - cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua libedit libtool m4 ninja + atf autoconf automake bash bison cmake cmakeMinimal coreutils cpio + cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua libedit libtool m4 meson ninja openbsm openldap openpam openssh patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite subversion sysctl.provider texinfo unzip which xz ]); @@ -718,13 +809,13 @@ in ]); assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ - binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool + cctools locale libtapi print-reexports rewrite-tbd sigtool ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); - assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); + assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd libclosure libdispatch xnu ]); assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.llvmPackages; [ clang-unwrapped libclang libllvm llvm @@ -732,8 +823,6 @@ in assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ libcxx ]); assert prevStage.llvmPackages.compiler-rt == null; - assert lib.getVersion prevStage.stdenv.cc.bintools.bintools == lib.getVersion prevStage.darwin.cctools-port; - stageFun prevStage { name = "bootstrap-stage2-Libsystem"; @@ -742,7 +831,7 @@ in inherit (prevStage) ccWrapperStdenv atf autoconf automake binutils-unwrapped bison brotli cmake cmakeMinimal coreutils cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua libedit libffi - libiconv libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 ncurses nghttp2 + libiconv libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 meson ncurses nghttp2 ninja openbsm openldap openpam openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons serf sqlite subversion sysctl texinfo unzip which xz zlib zstd; @@ -807,9 +896,9 @@ in (prevStage: # previous stage2-Libsystem stdenv: assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ - atf autoconf automake binutils-unwrapped bison brotli cmake cmakeMinimal coreutils + atf autoconf automake bison brotli cmake cmakeMinimal coreutils cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua libedit libidn2 - libkrb5 libssh2 libtool libunistring m4 nghttp2 ninja openbsm openldap openpam openssh + libkrb5 libssh2 libtool libunistring m4 meson nghttp2 ninja openbsm openldap openpam openssh openssl patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite subversion sysctl.provider texinfo unzip which xz zstd ]); @@ -821,14 +910,14 @@ in ]); assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ - binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool + cctools locale libtapi print-reexports rewrite-tbd sigtool ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); - assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); + assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd libclosure libdispatch xnu ]); assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.llvmPackages; [ clang-unwrapped libclang libllvm llvm @@ -836,8 +925,6 @@ in assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ libcxx ]); assert prevStage.llvmPackages.compiler-rt == null; - assert lib.getVersion prevStage.stdenv.cc.bintools.bintools == lib.getVersion prevStage.darwin.cctools-llvm; - stageFun prevStage { name = "bootstrap-stage2-CF"; @@ -846,7 +933,7 @@ in inherit (prevStage) ccWrapperStdenv atf autoconf automake bash bison brotli cmake cmakeMinimal coreutils cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff kyua libedit libidn2 libkrb5 - libssh2 libtool libunistring m4 ncurses nghttp2 ninja openbsm openldap openpam + libssh2 libtool libunistring m4 meson ncurses nghttp2 ninja openbsm openldap openpam openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons serf sqlite subversion sysctl texinfo unzip which xz zstd; @@ -865,9 +952,6 @@ in } // { passthru = { inherit (prevStage.bintools.passthru) isFromBootstrapFiles; }; }; - - # Avoid building unnecessary Python dependencies due to building LLVM manpages. - cctools-llvm = superDarwin.cctools-llvm.override { enableManpages = false; }; }); llvmPackages = super.llvmPackages // ( @@ -931,34 +1015,32 @@ in assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ autoconf automake bison brotli cmake cmakeMinimal coreutils cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff libedit libidn2 libkrb5 libssh2 libtool - libunistring m4 ncurses nghttp2 ninja openbsm openldap openpam openssh openssl + libunistring m4 meson ncurses nghttp2 ninja openbsm openldap openpam openssh openssl patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite subversion sysctl.provider texinfo unzip which xz zstd ]); assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ - bash binutils-unwrapped icu libffi libiconv libxml2 zlib + bash icu libffi libiconv libxml2 zlib ]); assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ locale print-reexports rewrite-tbd sigtool ]); assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ - binutils-unwrapped cctools libtapi + cctools libtapi ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); - assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); + assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd libclosure libdispatch xnu ]); assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.llvmPackages; [ clang-unwrapped libclang libllvm llvm ]); assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ libcxx ]); - assert lib.getVersion prevStage.stdenv.cc.bintools.bintools == lib.getVersion prevStage.darwin.cctools-llvm; - stageFun prevStage { name = "bootstrap-stage3"; @@ -967,7 +1049,7 @@ in inherit (prevStage) ccWrapperStdenv autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal coreutils cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff libedit - libidn2 libkrb5 libssh2 libtool libunistring m4 nghttp2 ninja openbsm openldap + libidn2 libkrb5 libssh2 libtool libunistring m4 meson nghttp2 ninja openbsm openldap openpam openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zstd @@ -979,7 +1061,7 @@ in darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { inherit (prevStage.darwin) - CF Libsystem binutils binutils-unwrapped cctools cctools-llvm cctools-port configd + CF Libsystem binutils binutils-unwrapped cctools cctools-port configd darwin-stubs dyld launchd libclosure libdispatch libobjc libtapi locale objc4 postLinkSignHook print-reexports rewrite-tbd signingUtils sigtool; @@ -1015,34 +1097,32 @@ in assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ autoconf automake bison brotli cmake cmakeMinimal coreutils cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff libedit libidn2 libkrb5 libssh2 libtool - libunistring m4 nghttp2 ninja openbsm openldap openpam openssh openssl patchutils pbzx + libunistring m4 meson nghttp2 ninja openbsm openldap openpam openssh openssl patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite subversion sysctl.provider texinfo unzip which xz zstd ]); assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ - bash binutils-unwrapped icu libffi libiconv libxml2 zlib + bash icu libffi libiconv libxml2 zlib ]); assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ locale print-reexports rewrite-tbd sigtool ]); assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ - binutils-unwrapped cctools libtapi + cctools libtapi ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); - assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); + assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd libclosure libdispatch xnu ]); assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ clang-unwrapped libclang libllvm llvm compiler-rt libcxx ]); - assert lib.getVersion prevStage.stdenv.cc.bintools.bintools == lib.getVersion prevStage.darwin.cctools-llvm; - stageFun prevStage { name = "bootstrap-stage4"; @@ -1050,7 +1130,7 @@ in overrides = self: super: { inherit (prevStage) ccWrapperStdenv autoconf automake bash bison cmake cmakeMinimal cyrus_sasl db expat flex groff - libedit libtool m4 ninja openldap openssh patchutils perl pkg-config python3 scons + libedit libtool m4 meson ninja openldap openssh patchutils perl pkg-config python3 scons serf sqlite subversion sysctl texinfo unzip which # CF dependencies - don’t rebuild them. @@ -1079,26 +1159,27 @@ in libc = selfDarwin.Libsystem; }; - # cctools needs to build the LLVM man pages, which requires sphinx. Sphinx - # has hatch-vcs as a transitive dependency, which pulls in git (and curl). - # Disabling the tests for hatch-vcs allows the stdenv bootstrap to avoid having - # any dependency on curl other than the one provided in the bootstrap tools. - cctools-llvm = superDarwin.cctools-llvm.override (old: { - llvmPackages = - let - tools = old.llvmPackages.tools.extend (_: superTools: { - llvm-manpages = superTools.llvm-manpages.override { - python3Packages = prevStage.python3Packages.overrideScope (_: superPython: { - hatch-vcs = (superPython.hatch-vcs.override { - git = null; - pytestCheckHook = null; - }); - }); - }; - }); - inherit (old.llvmPackages) libraries release_version; - in - { inherit tools libraries release_version; } // tools // libraries; + # binutils-unwrapped needs to build the LLVM man pages, which requires a lot of Python stuff + # that ultimately ends up depending on git. Fortunately, the git dependency is only for check + # inputs. The following set of overrides allow the LLVM documentation to be built without + # pulling curl (and other packages like ffmpeg) into the stdenv bootstrap. + binutils-unwrapped = superDarwin.binutils-unwrapped.override (old: { + llvm-manpages = super.llvmPackages.llvm-manpages.override { + python3Packages = self.python3.pkgs.overrideScope (_: superPython: { + hatch-vcs = superPython.hatch-vcs.overrideAttrs { + doInstallCheck = false; + }; + markdown-it-py = superPython.markdown-it-py.overrideAttrs { + doInstallCheck = false; + }; + mdit-py-plugins = superPython.mdit-py-plugins.overrideAttrs { + doInstallCheck = false; + }; + myst-parser = superPython.myst-parser.overrideAttrs { + doInstallCheck = false; + }; + }); + }; }); }); @@ -1177,20 +1258,20 @@ in (prevStage: # previous stage4 stdenv: assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ - bash binutils-unwrapped brotli bzip2 cpio diffutils ed file findutils gawk + bash brotli bzip2 cpio diffutils ed file findutils gawk gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libkrb5 libssh2 libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch pbzx pcre python3Minimal xar xz zlib zstd ]); assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ - binutils-unwrapped cctools libtapi locale print-reexports rewrite-tbd sigtool + cctools libtapi locale print-reexports rewrite-tbd sigtool ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem configd ]); assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); - assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); + assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd libclosure libdispatch xnu ]); assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ clang-unwrapped libclang libllvm llvm compiler-rt libcxx @@ -1198,12 +1279,10 @@ in assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ autoconf automake bison cmake cmakeMinimal cyrus_sasl db expat flex groff libedit - libtool m4 ninja openldap openssh patchutils perl pkg-config.pkg-config python3 scons + libtool m4 meson ninja openldap openssh patchutils perl pkg-config.pkg-config python3 scons serf sqlite subversion sysctl.provider texinfo unzip which ]); - assert prevStage.darwin.cctools == prevStage.darwin.cctools-llvm; - let doSign = localSystem.isAarch64; @@ -1255,8 +1334,6 @@ in allowedRequisites = (with prevStage; [ bash - binutils.bintools - binutils.bintools.lib bzip2.bin bzip2.out cc.expand-response-params @@ -1312,7 +1389,6 @@ in ++ (with prevStage.darwin; [ CF Libsystem - cctools-llvm cctools-port dyld libtapi @@ -1340,7 +1416,7 @@ in inherit (prevStage.darwin.apple_sdk) sdkRoot; }; } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { - inherit (prevStage.darwin) binutils binutils-unwrapped cctools-llvm cctools-port; + inherit (prevStage.darwin) binutils binutils-unwrapped cctools-port; }); } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { inherit (prevStage.llvmPackages) clang llvm; @@ -1357,8 +1433,6 @@ in in { inherit tools libraries; } // tools // libraries ); - - inherit (prevStage) binutils binutils-unwrapped; }; }; }) @@ -1367,17 +1441,22 @@ in (prevStage: # previous final stage stdenv: assert isBuiltByNixpkgsCompiler prevStage.darwin.sigtool; - assert isBuiltByNixpkgsCompiler prevStage.darwin.binutils-unwrapped; assert isBuiltByNixpkgsCompiler prevStage.darwin.print-reexports; assert isBuiltByNixpkgsCompiler prevStage.darwin.rewrite-tbd; assert isBuiltByNixpkgsCompiler prevStage.darwin.cctools; assert isFromNixpkgs prevStage.darwin.CF; assert isFromNixpkgs prevStage.darwin.Libsystem; + assert isFromNixpkgs prevStage.darwin.binutils-unwrapped; assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.clang-unwrapped; assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.libllvm; assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.libcxx; assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.compiler-rt; + + # Make sure these evaluate since they were disabled explicitly in the bootstrap. + assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped; + assert isFromNixpkgs prevStage.binutils-unwrapped.src; + { inherit (prevStage) config overlays stdenv; }) ] diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index bacad15a68bc..3d1894315ff1 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -40,8 +40,6 @@ rec { NIX_LDFLAGS = (oa.NIX_LDFLAGS or "") + " -headerpad_max_install_names"; }); - cctools_ = darwin.cctools; - # Avoid messing with libkrb5 and libnghttp2. curl_ = curlMinimal.override (args: { gssSupport = false; @@ -112,7 +110,7 @@ rec { # Copy binutils. for i in as ld ar ranlib nm strip otool install_name_tool lipo codesign_allocate; do - cp ${getBin cctools_}/bin/$i $out/bin + cp ${getBin darwin.binutils-unwrapped}/bin/$i $out/bin done # Copy coreutils, bash, etc. diff --git a/pkgs/stdenv/darwin/override-sdk.nix b/pkgs/stdenv/darwin/override-sdk.nix index 6de67537b499..02d3cd4fb747 100644 --- a/pkgs/stdenv/darwin/override-sdk.nix +++ b/pkgs/stdenv/darwin/override-sdk.nix @@ -403,13 +403,13 @@ let stdenv.override ( old: { - buildPlatform = mkPlatform newVersion old.buildPlatform; - hostPlatform = mkPlatform newVersion old.hostPlatform; - targetPlatform = mkPlatform newVersion old.targetPlatform; + buildPlatform = mkPlatform newVersion stdenv.buildPlatform; + hostPlatform = mkPlatform newVersion stdenv.hostPlatform; + targetPlatform = mkPlatform newVersion stdenv.targetPlatform; } # Only perform replacements if the SDK version has changed. Changing only the # deployment target does not require replacing the libc or SDK dependencies. - // lib.optionalAttrs (old.hostPlatform.darwinSdkVersion != darwinSdkVersion) { + // lib.optionalAttrs (stdenv.hostPlatform.darwinSdkVersion != darwinSdkVersion) { allowedRequisites = null; mkDerivationFromStdenv = extendMkDerivationArgs old (mapInputsToSDK [ diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 1621307e573c..952b8b66c10c 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -119,6 +119,7 @@ let "pie" "relro" "stackprotector" + "stackclashprotection" "strictoverflow" "trivialautovarinit" "zerocallusedregs" diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 45c73d7709c6..b5b7a7037784 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -47,10 +47,67 @@ getAllOutputNames() { fi } +if [[ -n "${NIX_LOG_FD:-}" ]]; then + # Logs arguments to $NIX_LOG_FD, if it exists, no-op if it does not. + nixLog() { + echo "$@" >&"$NIX_LOG_FD" + } + + # Log a hook, to be run before the hook is actually called. + # logging for "implicit" hooks -- the ones specified directly + # in derivation's arguments -- is done in _callImplicitHook instead. + _logHook() { + local hookKind="$1" + local hookExpr="$2" + shift 2 + + if declare -F "$hookExpr" > /dev/null 2>&1; then + nixLog "calling '$hookKind' function hook '$hookExpr'" "$@" + elif type -p "$hookExpr" > /dev/null; then + nixLog "sourcing '$hookKind' script hook '$hookExpr'" + elif [[ "$hookExpr" != "_callImplicitHook"* ]]; then + # Here we have a string hook to eval. + # Join lines onto one with literal \n characters unless NIX_DEBUG >= 2. + local exprToOutput + if (( "${NIX_DEBUG:-0}" >= 2 )); then + exprToOutput="$hookExpr" + else + # We have `r'\n'.join([line.lstrip() for lines in text.split('\n')])` at home. + local hookExprLine + while IFS= read -r hookExprLine; do + # These lines often have indentation, + # so let's remove leading whitespace. + hookExprLine="${hookExprLine#"${hookExprLine%%[![:space:]]*}"}" + # If this line wasn't entirely whitespace, + # then add it to our output + if [[ -n "$hookExprLine" ]]; then + exprToOutput+="$hookExprLine\\n " + fi + done <<< "$hookExpr" + + # And then remove the final, unnecessary, \n + exprToOutput="${exprToOutput%%\\n }" + fi + nixLog "evaling '$hookKind' string hook '$exprToOutput'" + fi + } +else + nixLog() { + # Stub. + # Note: because bash syntax, this colon is load bearing. Removing it + # will turn this function into a syntax error. + : + } + + _logHook() { + # Load-bearing colon; same as above. + : + } +fi + ###################################################################### # Hook handling. - # Run all hooks with the specified name in the order in which they # were added, stopping if any fails (returns a non-zero exit # code). The hooks for are the shell function or variable @@ -64,6 +121,7 @@ runHook() { # Hack around old bash being bad and thinking empty arrays are # undefined. for hook in "_callImplicitHook 0 $hookName" ${!hooksSlice+"${!hooksSlice}"}; do + _logHook "$hookName" "$hook" "$@" _eval "$hook" "$@" done @@ -81,6 +139,7 @@ runOneHook() { local hook ret=1 # Hack around old bash like above for hook in "_callImplicitHook 1 $hookName" ${!hooksSlice+"${!hooksSlice}"}; do + _logHook "$hookName" "$hook" "$@" if _eval "$hook" "$@"; then ret=0 break @@ -100,10 +159,13 @@ _callImplicitHook() { local def="$1" local hookName="$2" if declare -F "$hookName" > /dev/null; then + nixLog "calling implicit '$hookName' function hook" "$hookName" elif type -p "$hookName" > /dev/null; then + nixLog "sourcing implicit '$hookName' script hook" source "$hookName" elif [ -n "${!hookName:-}" ]; then + nixLog "evaling implicit '$hookName' string hook" eval "${!hookName}" else return "$def" @@ -644,6 +706,7 @@ activatePackage() { (( hostOffset <= targetOffset )) || exit 1 if [ -f "$pkg" ]; then + nixLog "sourcing setup hook '$pkg'" source "$pkg" fi @@ -667,6 +730,7 @@ activatePackage() { fi if [[ -f "$pkg/nix-support/setup-hook" ]]; then + nixLog "sourcing setup hook '$pkg/nix-support/setup-hook'" source "$pkg/nix-support/setup-hook" fi } @@ -830,7 +894,7 @@ substituteStream() { # deprecated 2023-11-22 # this will either get removed, or switch to the behaviour of --replace-fail in the future if ! "$_substituteStream_has_warned_replace_deprecation"; then - echo "substituteStream(): WARNING: '--replace' is deprecated, use --replace-{fail,warn,quiet}. ($description)" >&2 + echo "substituteStream() in derivation $name: WARNING: '--replace' is deprecated, use --replace-{fail,warn,quiet}. ($description)" >&2 _substituteStream_has_warned_replace_deprecation=true fi replace_mode='--replace-warn' @@ -845,9 +909,9 @@ substituteStream() { if [ "$pattern" != "$replacement" ]; then if [ "${!var}" == "$savedvar" ]; then if [ "$replace_mode" == --replace-warn ]; then - printf "substituteStream(): WARNING: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 + printf "substituteStream() in derivation $name: WARNING: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 elif [ "$replace_mode" == --replace-fail ]; then - printf "substituteStream(): ERROR: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 + printf "substituteStream() in derivation $name: ERROR: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 return 1 fi fi @@ -859,11 +923,11 @@ substituteStream() { shift 2 # check if the used nix attribute name is a valid bash name if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then - echo "substituteStream(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2 + echo "substituteStream() in derivation $name: ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2 return 1 fi if [ -z ${!varName+x} ]; then - echo "substituteStream(): ERROR: variable \$$varName is unset" >&2 + echo "substituteStream() in derivation $name: ERROR: variable \$$varName is unset" >&2 return 1 fi pattern="@$varName@" @@ -879,7 +943,7 @@ substituteStream() { ;; *) - echo "substituteStream(): ERROR: Invalid command line argument: $1" >&2 + echo "substituteStream() in derivation $name: ERROR: Invalid command line argument: $1" >&2 return 1 ;; esac @@ -1558,9 +1622,7 @@ runPhase() { if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then return; fi if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then return; fi - if [[ -n $NIX_LOG_FD ]]; then - echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&"$NIX_LOG_FD" - fi + nixLog "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" showPhaseHeader "$curPhase" dumpVars diff --git a/pkgs/stdenv/linux/bootstrap-tools/default.nix b/pkgs/stdenv/linux/bootstrap-tools/default.nix index 6d2490acfa47..4450679983ff 100644 --- a/pkgs/stdenv/linux/bootstrap-tools/default.nix +++ b/pkgs/stdenv/linux/bootstrap-tools/default.nix @@ -15,5 +15,10 @@ derivation ({ langC = true; langCC = true; isGNU = true; - hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" "trivialautovarinit" ]; + hardeningUnsupportedFlags = [ + "fortify3" + "stackclashprotection" + "trivialautovarinit" + "zerocallusedregs" + ]; } // extraAttrs) diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 2b978ff3e1bc..1b7882bcbed3 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -83,6 +83,8 @@ with pkgs; inherit gccTests; }; + devShellTools = callPackage ../build-support/dev-shell-tools/tests { }; + stdenv-inputs = callPackage ./stdenv-inputs { }; stdenv = callPackage ./stdenv { }; diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index e06759fa28bd..00f1ce90ef3a 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -99,6 +99,9 @@ let in { + # Disable on Darwin due to assumptions with __bootPackages + __attrsFailEvaluation = stdenv.isDarwin; + # tests for hooks in `stdenv.defaultNativeBuildInputs` hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; inherit lib; }); diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index bbc0e75d8811..0223c088c817 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, libxslt, - gobject-introspection, gtk3, wrapGAppsHook3, gnome }: + gobject-introspection, gtk3, wrapGAppsHook3, adwaita-icon-theme }: python3Packages.buildPythonApplication rec { pname = "wpgtk"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ wrapGAppsHook3 gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme libxslt ]; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 644c997de619..28360b17527c 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -167,7 +167,10 @@ let { scripts = [ "bin/xdg-screensaver" ]; interpreter = "${bash}/bin/bash"; - inputs = commonDeps ++ [ nettools perl procmail procps ]; + inputs = commonDeps ++ [ nettools perl procps ] + # procmail's funky build system is currently broken in cross-build. + # xdg-screensaver will gracefully degrade if it's not available. + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) procmail; # These are desktop-specific, so we don't want xdg-utils to be able to # call them when in a different setup. fake.external = commonFakes ++ [ @@ -176,7 +179,7 @@ let "xautolock" # Xautolock "xscreensaver-command" # Xscreensaver "xset" # generic-ish X - ]; + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "lockfile"; # procmail keep = { "$MV" = true; "$XPROP" = true; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index f779dd325b8c..90fd42f9f3be 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -29,11 +29,13 @@ , pango , pulseaudio , python3 +, stdenv , util-linux , which , x264 , x265 , xauth +, xdg-utils , xorg , xorgserver }: @@ -84,6 +86,12 @@ in buildPythonApplication rec { ./fix-122159.patch # https://github.com/NixOS/nixpkgs/issues/122159 ]; + # Note: xposix is renamed to posix in v5. + postPatch = lib.optionalString stdenv.isLinux '' + substituteInPlace xpra/platform/xposix/features.py \ + --replace-fail "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" + ''; + INCLUDE_DIRS = "${pam}/include"; nativeBuildInputs = [ diff --git a/pkgs/tools/X11/xprintidle/default.nix b/pkgs/tools/X11/xprintidle/default.nix index d1c6d393187e..697f9407a6ed 100644 --- a/pkgs/tools/X11/xprintidle/default.nix +++ b/pkgs/tools/X11/xprintidle/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xprintidle"; - version = "0.2.5"; + version = "0.3.0"; src = fetchFromGitHub { owner = "g0hl1n"; repo = "xprintidle"; rev = finalAttrs.version; - sha256 = "sha256-bafDUZoSFsJ3g6mtLCRechGizfrWg2qW2vnlfIzj7mQ="; + sha256 = "sha256-MawkT4RconRDDCNnaWMxU18lK34ywcebbiHlYeZn/lc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 2db13aa1275e..5ef9536b987e 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.209"; + version = "3.0.210"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-d3HLFyJp++tZLJHjjM2xOcYyUanI9/AlrLt0cTcWO8s="; + sha256 = "sha256-x5uXlcSdXrPQ8mxqH2QH6atHQBlsSfU7e8pMe585MSk="; }; vendorHash = "sha256-wHdSDBxDArVbD5+EgGcIpQ+NLg5BKXo2v3WM4ni1efc="; diff --git a/pkgs/tools/admin/ansible/doctor.nix b/pkgs/tools/admin/ansible/doctor.nix index 8a14a049893b..e6a370c46f90 100644 --- a/pkgs/tools/admin/ansible/doctor.nix +++ b/pkgs/tools/admin/ansible/doctor.nix @@ -30,7 +30,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core poetry-dynamic-versioning - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/admin/ansible/later.nix b/pkgs/tools/admin/ansible/later.nix index f040acdfbd0f..d40355e09e81 100644 --- a/pkgs/tools/admin/ansible/later.nix +++ b/pkgs/tools/admin/ansible/later.nix @@ -45,7 +45,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core poetry-dynamic-versioning - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/admin/ansible/lint.nix b/pkgs/tools/admin/ansible/lint.nix index e3ff67eda963..6970abd8a27f 100644 --- a/pkgs/tools/admin/ansible/lint.nix +++ b/pkgs/tools/admin/ansible/lint.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools setuptools-scm - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 568282fa86ab..f3e5fc97e323 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -9,24 +9,18 @@ }: let - botocoreVersion = python3.pkgs.botocore.version; - # awscli.version should be pinned to 2 minor versions less than the botocoreVersion - versionMinor = toString (lib.toInt (lib.versions.minor botocoreVersion) - 2); - versionPatch = lib.versions.patch botocoreVersion; self = python3.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.${versionMinor}.${versionPatch}"; # N.B: if you change this, change botocore and boto3 to a matching version too + # N.B: if you change this, change botocore and boto3 to a matching version too + # check e.g. https://github.com/aws/aws-cli/blob/1.33.21/setup.py + version = "1.33.11"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-96hFvXs3Fcvad+PBEpS9RFMJkcD1qHqfQ+8gtVfEbnc="; + hash = "sha256-Q8qtGChOnscOm7m3s7bWwUFmrUwMua9N6uz1Lyc8QIY="; }; - nativeBuildInputs = [ - python3.pkgs.pythonRelaxDepsHook - ]; - pythonRelaxDeps = [ # botocore must not be relaxed "colorama" @@ -64,7 +58,7 @@ let installCheckPhase = '' runHook preInstallCheck - $out/bin/aws --version | grep "${botocoreVersion}" + $out/bin/aws --version | grep "${python3.pkgs.botocore.version}" $out/bin/aws --version | grep "${version}" runHook postInstallCheck diff --git a/pkgs/tools/admin/azure-cli/README.md b/pkgs/tools/admin/azure-cli/README.md index 30936ded0a75..ec98c8cb7d24 100644 --- a/pkgs/tools/admin/azure-cli/README.md +++ b/pkgs/tools/admin/azure-cli/README.md @@ -1,5 +1,22 @@ # Azure CLI +## Updating the CLI + +- Update `version` and `src.hash` in default.nix +- Check out the changes made to the azure-cli [setup.py](https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/setup.py) since the last release +- Try build the CLI, will likely fail with `ModuleNotFoundError`, for example + ``` + ModuleNotFoundError: No module named 'azure.mgmt.storage.v2023_05_01' + ``` + Sometimes it will also fail with other import errors. +- Check the referenced module (`azure-mgmt-storage`) in the setup.py +- Find the actual version required, for example + ``` + 'azure-mgmt-storage==21.2.0', + ``` +- Update version and hash of this dependency in python-packages.nix +- Repeat until it builds + ## Extensions There are two sets of extensions: the one in `extensions-generated.nix` is generated with the script diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 89bd83d23a1b..f1d0c47c010b 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -5,7 +5,7 @@ , fetchurl , fetchFromGitHub , installShellFiles -, python3 +, python311 # Whether to include patches that enable placing certain behavior-defining # configuration files in the Nix store. @@ -18,18 +18,23 @@ }: let - version = "2.61.0"; + version = "2.62.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-RmCZigDenbX8OoIZeY087ga2AP8yRckyG0qZnN9gg44="; + hash = "sha256-Rb27KRAb50YzTZzMs6n8g04x14ni3rIYAL3c5j/ieRw="; }; + # Pin Python version to 3.11. + # See https://discourse.nixos.org/t/breaking-changes-announcement-for-unstable/17574/53 + # and https://github.com/Azure/azure-cli/issues/27673 + python3 = python311; + # put packages that needs to be overridden in the py package scope - py = callPackage ./python-packages.nix { inherit src version; }; + py = callPackage ./python-packages.nix { inherit src version python3; }; # Builder for Azure CLI extensions. Extensions are Python wheels that # outside of nix would be fetched by the CLI itself from various sources. @@ -55,7 +60,7 @@ let extensions = callPackages ./extensions-generated.nix { inherit mkAzExtension; } - // callPackages ./extensions-manual.nix { inherit mkAzExtension; }; + // callPackages ./extensions-manual.nix { inherit mkAzExtension python3; python3Packages = python3.pkgs; }; extensionDir = stdenvNoCC.mkDerivation { name = "azure-cli-extensions"; diff --git a/pkgs/tools/admin/azure-cli/extensions-manual.nix b/pkgs/tools/admin/azure-cli/extensions-manual.nix index 66c2268bffbb..8d4a7f642b02 100644 --- a/pkgs/tools/admin/azure-cli/extensions-manual.nix +++ b/pkgs/tools/admin/azure-cli/extensions-manual.nix @@ -6,6 +6,7 @@ , mkAzExtension , mycli , python3Packages +, python3 }: { @@ -31,7 +32,7 @@ pymysql setproctitle ]) ++ [ - mycli + (mycli.override { inherit python3; }) ]; meta.maintainers = with lib.maintainers; [ obreitwi ]; }; diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 9fc836fb803b..d2eedff5499e 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -114,6 +114,7 @@ let azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip" "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "31.0.0" "tar.gz" "sha256-WlscT8GhnssCKhLe0b6LGxVfaXnQP7nvwEZC9gZkS78="; azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.3.2" "zip" "sha256-B/Sv6COlXXBLBI1h7f3BMYwFHtWfJEAyEmNQvpXp1QE="; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "9.5.1" "tar.gz" "sha256-TlXTlz8RzwLPeoBVruhmFSM9fL47siegfBdrrIvH7wI="; azure-mgmt-datalake-store = overrideAzureMgmtPackage super.azure-mgmt-datalake-store "0.5.0" "zip" "sha256-k3bTVJVmHRn4rMVgT2ewvFlJOxg1u8SA+aGVL5ABekw="; azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40="; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" "sha256-QHwtrLM1E/++nKS+Wt216dS64Mt++mE8P31THve/jeg="; @@ -140,12 +141,11 @@ let azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "2.1.0" "tar.gz" "sha256-oIQzBJVUQ2yQhEvIqWgg6INplITm/8mQMv0lcfjF99Y="; azure-mgmt-servicelinker = overrideAzureMgmtPackage super.azure-mgmt-servicelinker "1.2.0b2" "tar.gz" "sha256-PpEFMM8ri9OgAa79dGhvPKy5YFfDZZustBUDieQrtZU="; azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "2.0.0b1" "tar.gz" "sha256-oK2ceBEoQ7gAeG6mye+x8HPzQU9bUNRPVJtRW2GL4xg="; - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b16" "tar.gz" "sha256-+6QKEROlbXe0oCj4qtB+r4/yCPZD4N+71e5Z1Z/zXV0="; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b17" "tar.gz" "sha256-i9VNbYJ3TgzURbtYYrXw+ez4ubK7BH39/EIL5kqb9Xg="; azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b5" "zip" "sha256-ZFgJflgynRSxo+B+Vso4eX1JheWlDQjfJ9QmupXypMc="; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "21.1.0" "tar.gz" "sha256-1tPA6RfJiLye0Eckd9PvP5CIYAnrHZenEZRPg3VjAWI="; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "21.2.0" "tar.gz" "sha256-KHyYQLAb6TGBnUA9p+1SvWL9B3sFKd1HDm28T+3ksg0="; azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b5" "zip" "sha256-5E6Yf1GgNyNVjd+SeFDbhDxnOA6fOAG6oojxtCP4m+k="; azure-mgmt-trafficmanager = overrideAzureMgmtPackage super.azure-mgmt-trafficmanager "1.0.0" "zip" "sha256-R0F2HoA0bE7dTLPycTaOqYBj+ATQFeJFwv4EjtK1lqg="; - azure-storage-common = overrideAzureMgmtPackage super.azure-storage-common "1.4.2" "tar.gz" "sha256-Tsh8dTfUV+yVJS4ORkd+LBzPM3dP/v0F2FRGgssK5AE="; azure-synapse-accesscontrol = overrideAzureMgmtPackage super.azure-synapse-accesscontrol "0.5.0" "zip" "sha256-g14ySiByqPgkJGRH8EnIRJO9Q6H2usS5FOeMCQiUuwQ="; azure-synapse-spark = overrideAzureMgmtPackage super.azure-synapse-spark "0.2.0" "zip" "sha256-OQ5brhweEIrtN2iP4I5NacdC9t3YUiGIVhhqSs3FMuI="; diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index ec51b07d9e5b..f5850aa82c00 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -18,16 +18,16 @@ let }; in buildNpmPackage' rec { pname = "balena-cli"; - version = "18.2.10"; + version = "18.2.17"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-HZAQpK7cai4FEBvQSIHGBdDMe4pQRXXF9DSax07rjF0="; + hash = "sha256-sWe7D89bL7mWanxCAOAso6J9fuxPFh3PHUL2mR8aOBs="; }; - npmDepsHash = "sha256-9XVjyqLgi+gkEEp09P4HzmeRNINeXUC4mBmib6M6YyE="; + npmDepsHash = "sha256-lYgt0du8OfJitVbfWiUqrEGulvs/OxqF4AdxyGCRCJY="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/tools/admin/boulder/default.nix index 50325a6690cf..8da2e8db9e3a 100644 --- a/pkgs/tools/admin/boulder/default.nix +++ b/pkgs/tools/admin/boulder/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "boulder"; - version = "2024-06-17a"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "letsencrypt"; @@ -21,7 +21,7 @@ buildGoModule rec { find $out -name .git -print0 | xargs -0 rm -rf popd ''; - hash = "sha256-kObCD9diy1ryyeLQNyfWNMJPfvtjAWVp8OVUO0MLV6A="; + hash = "sha256-SWOWx1K+m+VWGPqBEyn/m5/9qspEd2JiLLskXJLH5AM="; }; vendorHash = null; @@ -42,49 +42,260 @@ buildGoModule rec { preCheck = '' # Test all targets. unset subPackages - - # Disable tests that fail or require additional services. - rm -f \ - cmd/admin-revoker/main_test.go \ - cmd/admin/cert_test.go \ - cmd/admin/key_test.go \ - cmd/bad-key-revoker/main_test.go \ - cmd/cert-checker/main_test.go \ - cmd/config_test.go \ - cmd/contact-auditor/main_test.go \ - cmd/expiration-mailer/main_test.go \ - cmd/expiration-mailer/send_test.go \ - cmd/id-exporter/main_test.go \ - cmd/rocsp-tool/client_test.go \ - cmd/shell_test.go \ - core/util_test.go \ - db/map_test.go \ - db/multi_test.go \ - db/rollback_test.go \ - grpc/creds/creds_test.go \ - log/log_test.go \ - ocsp/updater/updater_test.go \ - ra/ra_test.go \ - ratelimits/limiter_test.go \ - ratelimits/source_redis_test.go \ - ratelimits/source_test.go \ - redis/lookup_test.go \ - rocsp/rocsp_test.go \ - sa/database_test.go \ - sa/model_test.go \ - sa/precertificates_test.go \ - sa/rate_limits_test.go \ - sa/sa_test.go \ - test/load-generator/acme/directory_test.go \ - va/caa_test.go \ - va/dns_test.go \ - va/http_test.go \ - va/tlsalpn_test.go \ - va/va_test.go \ - wfe2/verify_test.go \ - wfe2/wfe_test.go ''; + # Tests that fail or require additional services. + disabledTests = [ + "TestARI" + "TestAccount" + "TestAddBlockedKeyUnknownSource" + "TestAddCertificate" + "TestAddCertificateDuplicate" + "TestAddCertificateRenewalBit" + "TestAddPreCertificateDuplicate" + "TestAddPrecertificate" + "TestAddPrecertificateIncomplete" + "TestAddPrecertificateKeyHash" + "TestAddPrecertificateNoOCSP" + "TestAddRegistration" + "TestAddSerial" + "TestAdministrativelyRevokeCertificate" + "TestAuthorization500" + "TestAuthorizationChallengeNamespace" + "TestAuthzFailedRateLimitingNewOrder" + "TestAutoIncrementSchema" + "TestBadNonce" + "TestBlockedKey" + "TestBlockedKeyRevokedBy" + "TestBuildID" + "TestCTPolicyMeasurements" + "TestCertIsRenewed" + "TestCertificateAbsent" + "TestCertificateKeyNotEqualAccountKey" + "TestCertificatesTableContainsDuplicateSerials" + "TestCertsPerNameRateLimitTable" + "TestChallenge" + "TestCheckCert" + "TestCheckCert" + "TestCheckCertReturnsDNSNames" + "TestCheckCertReturnsDNSNames" + "TestCheckExactCertificateLimit" + "TestCheckFQDNSetRateLimitOverride" + "TestCheckWildcardCert" + "TestCheckWildcardCert" + "TestClientTransportCredentials" + "TestContactAuditor" + "TestCountCertificatesByNamesParallel" + "TestCountCertificatesByNamesTimeRange" + "TestCountCertificatesRenewalBit" + "TestCountInvalidAuthorizations2" + "TestCountNewOrderWithReplaces" + "TestCountOrders" + "TestCountPendingAuthorizations2" + "TestCountRegistrationsByIP" + "TestCountRegistrationsByIPRange" + "TestDbSettings" + "TestDeactivateAccount" + "TestDeactivateAuthorization" + "TestDeactivateRegistration" + "TestDedupOnRegistration" + "TestDirectory" + "TestDontFindRevokedCert" + "TestEarlyOrderRateLimiting" + "TestEmptyAccount" + "TestEnforceJWSAuthType" + "TestExactPublicSuffixCertLimit" + "TestExtractJWK" + "TestFQDNSetTimestampsForWindow" + "TestFQDNSets" + "TestFQDNSetsExists" + "TestFailExit" + "TestFasterGetOrderForNames" + "TestFinalizeAuthorization2" + "TestFinalizeOrder" + "TestFinalizeOrderWildcard" + "TestFinalizeOrderWithMixedSANAndCN" + "TestFinalizeSCTError" + "TestFindCertsAtCapacity" + "TestFindExpiringCertificates" + "TestFindIDs" + "TestFindIDsForHostnames" + "TestFindIDsWithExampleHostnames" + "TestFindUnrevoked" + "TestFindUnrevokedNoRows" + "TestGETAPIAuthz" + "TestGETAPIChallenge" + "TestGenerateOCSP" + "TestGenerateOCSPLongExpiredSerial" + "TestGenerateOCSPUnknownSerial" + "TestGetAndProcessCerts" + "TestGetAndProcessCerts" + "TestGetAuthorization" + "TestGetAuthorization2NoRows" + "TestGetAuthorizations2" + "TestGetCertificate" + "TestGetCertificateHEADHasCorrectBodyLength" + "TestGetCertificateNew" + "TestGetCertificateServerError" + "TestGetCertsEmptyResults" + "TestGetCertsEmptyResults" + "TestGetChallenge" + "TestGetChallengeUpRel" + "TestGetMaxExpiration" + "TestGetOrder" + "TestGetOrderExpired" + "TestGetOrderForNames" + "TestGetPendingAuthorization2" + "TestGetRevokedCerts" + "TestGetSerialMetadata" + "TestGetSerialsByAccount" + "TestGetSerialsByKey" + "TestGetStartingID" + "TestGetValidAuthorizations2" + "TestGetValidOrderAuthorizations2" + "TestHTTPDialTimeout" + "TestHTTPMethods" + "TestHandleFunc" + "TestHeaderBoulderRequester" + "TestIgnoredLint" + "TestIgnoredLint" + "TestIncidentARI" + "TestIncidentSerialModel" + "TestIncidentsForSerial" + "TestIndex" + "TestIndexGet404" + "TestInvoke" + "TestInvokeRevokerHasNoExtantCerts" + "TestIssueCertificateAuditLog" + "TestIssueCertificateCAACheckLog" + "TestIssueCertificateInnerErrs" + "TestIssueCertificateInnerWithProfile" + "TestIssueCertificateOuter" + "TestKeyRollover" + "TestKeyRolloverMismatchedJWSURLs" + "TestLeaseOldestCRLShard" + "TestLeaseSpecificCRLShard" + "TestLifetimeOfACert" + "TestLimiter_CheckWithLimitOverrides" + "TestLimiter_DefaultLimits" + "TestLimiter_InitializationViaCheckAndSpend" + "TestLimiter_RefundAndReset" + "TestLoadFromDB" + "TestLookupJWK" + "TestMatchJWSURLs" + "TestNewAccount" + "TestNewAccountNoID" + "TestNewAccountWhenAccountHasBeenDeactivated" + "TestNewAccountWhenGetRegByKeyFails" + "TestNewAccountWhenGetRegByKeyNotFound" + "TestNewECDSAAccount" + "TestNewLookup" + "TestNewLookupWithAllFailingSRV" + "TestNewLookupWithOneFailingSRV" + "TestNewOrder" + "TestNewOrderAuthzReuseSafety" + "TestNewOrderCheckFailedAuthorizationsFirst" + "TestNewOrderExpiry" + "TestNewOrderFailedAuthzRateLimitingExempt" + "TestNewOrderMaxNames" + "TestNewOrderRateLimiting" + "TestNewOrderRateLimitingExempt" + "TestNewOrderReplacesSerialCarriesThroughToSA" + "TestNewOrderReuse" + "TestNewOrderReuseInvalidAuthz" + "TestNewOrderWildcard" + "TestNewRegistration" + "TestNewRegistrationBadKey" + "TestNewRegistrationContactsPresent" + "TestNewRegistrationNoFieldOverwrite" + "TestNewRegistrationRateLimit" + "TestNewRegistrationSAFailure" + "TestNoContactCertIsNotRenewed" + "TestNoContactCertIsRenewed" + "TestNoSuchRegistrationErrors" + "TestNonceEndpoint" + "TestOldTLSInbound" + "TestOrderMatchesReplacement" + "TestOrderToOrderJSONV2Authorizations" + "TestOrderWithOrderModelv1" + "TestPOST404" + "TestPanicStackTrace" + "TestParseJWSRequest" + "TestPendingAuthorizationsUnlimited" + "TestPerformValidationAlreadyValid" + "TestPerformValidationBadChallengeType" + "TestPerformValidationExpired" + "TestPerformValidationSuccess" + "TestPerformValidationVAError" + "TestPrepAuthzForDisplay" + "TestPreresolvedDialerTimeout" + "TestProcessCerts" + "TestProcessCertsConnectError" + "TestProcessCertsParallel" + "TestRecheckCAADates" + "TestRecheckCAAEmpty" + "TestRecheckCAAFail" + "TestRecheckCAAInternalServerError" + "TestRecheckCAASuccess" + "TestRedisSource_BatchSetAndGet" + "TestRedisSource_Ping" + "TestRegistrationsPerIPOverrideUsage" + "TestRehydrateHostPort" + "TestRelativeDirectory" + "TestReplicationLagRetries" + "TestResolveContacts" + "TestRevokeCertByApplicant_Controller" + "TestRevokeCertByApplicant_Subscriber" + "TestRevokeCertByKey" + "TestRevokeCertificate" + "TestRevokeCerts" + "TestRollback" + "TestSPKIHashFromPrivateKey" + "TestSPKIHashesFromFile" + "TestSelectRegistration" + "TestSelectUncheckedRows" + "TestSendEarliestCertInfo" + "TestSerialsForIncident" + "TestSerialsFromFile" + "TestSerialsFromPrivateKey" + "TestSetAndGet" + "TestSetOrderProcessing" + "TestSingleton" + "TestStart" + "TestStatusForOrder" + "TestStoreResponse" + "TestStrictness" + "TestTLSALPN01DialTimeout" + "TestTLSConfigLoad" + "TestTimeouts" + "TestUpdateCRLShard" + "TestUpdateChallengeFinalizedAuthz" + "TestUpdateChallengeRAError" + "TestUpdateChallengesDeleteUnused" + "TestUpdateMissingAuthorization" + "TestUpdateNowWithAllFailingSRV" + "TestUpdateNowWithOneFailingSRV" + "TestUpdateRegistrationSame" + "TestUpdateRevokedCertificate" + "TestValidJWSForKey" + "TestValidNonce" + "TestValidNonce_NoMatchingBackendFound" + "TestValidPOSTAsGETForAccount" + "TestValidPOSTForAccount" + "TestValidPOSTForAccountSwappedKey" + "TestValidPOSTRequest" + "TestValidPOSTURL" + "TestValidSelfAuthenticatedPOST" + "TestValidSelfAuthenticatedPOSTGoodKeyErrors" + "TestValidateContacts" + "TestWrappedMap" + "Test_sendError" + ]; + + checkFlags = [ + "-skip ${lib.strings.concatStringsSep "|" disabledTests}" + ]; + postInstall = '' for i in $($out/bin/boulder --list); do ln -s $out/bin/boulder $out/bin/$i diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 0e890270a52b..2ec57721e419 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "containers"; repo = "bubblewrap"; rev = "v${version}"; - hash = "sha256-UiZfp1bX/Eul5x31oBln5P9KMT2oFwawQqDs9udZUxY="; + hash = "sha256-dfr6MiBdCHVscrS6XE0pT67q18NxrtqJliVbbQDFl5g="; }; postPatch = '' diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/tools/admin/docker-credential-helpers/default.nix index 28a50c8053ba..ff7a50676b46 100644 --- a/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-credential-helpers"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "docker"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q1SdDfTT0W+eG/F5HX+pk4B06IG5ZoeZxe36l71gMc8="; + sha256 = "sha256-LFXSfb4JnlacSZVnIf+5/A+KefARYadEGDzGtcSDJBw="; }; vendorHash = null; diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index 74a951f74acf..c0bead586d50 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2024-05-23"; + version = "0-unstable-2024-06-10"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "8391a9e364622cb7d85e128b427fb96c75e18265"; - hash = "sha256-YHko0lCCn7SydnKbepZpt4Ua6NdvuPD3Y3ZQ1Ysb0+g="; + rev = "19f4185f3967a5c00053236015da22c0da2af41d"; + hash = "sha256-aIoWhjzVmfXv5fcwIBwjUFVjdx316JivKMS+odnEB/I="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index 84cf2ff08d57..e4c56659c733 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,8 +5,8 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.12.20"; # also update these 3 vars: - gitversion = "tags/v0.12.20-0-g0a0d89a"; # git describe --long --all + version = "0.12.21"; # also update these 3 vars: + gitversion = "tags/v0.12.21-0-g0a0d89a"; # git describe --long --all gitsha = "0a0d89a8"; # git rev-parse --short=8 HEAD gittime = "2024-05-15T17:34:46+02:00"; # date --iso-8601=seconds @@ -14,10 +14,10 @@ buildGoModule rec { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - hash = "sha256-WDqdp9E9O6nzwLJNwljV2FcgTqdEVVRppOeNxrSrBv8="; + hash = "sha256-O3wX7IW2puMg0xhOf9BUfxzCMCKHxtPJxOCpc+wY0Ao="; }; - vendorHash = "sha256-18iCTv0H9X3IccWsTD44qEEt9nXnq/En5zoqEwkC8Bs="; + vendorHash = "sha256-YSWO7Y9qtqCWfAMnzSMOWlXezjnggMLV8xF42vgOS7s="; ldflags = [ "-X github.com/metal-stack/v.Version=${version}" diff --git a/pkgs/tools/admin/gimme-aws-creds/default.nix b/pkgs/tools/admin/gimme-aws-creds/default.nix index 3b1a334c6be2..ab43e9971d8e 100644 --- a/pkgs/tools/admin/gimme-aws-creds/default.nix +++ b/pkgs/tools/admin/gimme-aws-creds/default.nix @@ -37,7 +37,6 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = with python.pkgs; [ installShellFiles - pythonRelaxDepsHook ]; pythonRemoveDeps = [ diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index 541bcb42f905..dadf70e773ce 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -1,7 +1,7 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python311 }: let - python = python3.override { + python = python311.override { packageOverrides = self: super: { pyparsing = super.pyparsing.overridePythonAttrs rec { version = "2.4.7"; diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/tools/admin/google-cloud-sdk/components.json index b15934f1e875..dd2cfb391763 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.json +++ b/pkgs/tools/admin/google-cloud-sdk/components.json @@ -5,7 +5,7 @@ "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f", "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8", "size": 800, - "source": "components/google-cloud-sdk-alpha-20240524155722.tar.gz", + "source": "components/google-cloud-sdk-alpha-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -22,8 +22,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240524155722, - "version_string": "2024.05.24" + "build_number": 20240628141907, + "version_string": "2024.06.28" } }, { @@ -1020,10 +1020,10 @@ }, { "data": { - "checksum": "b1609ab7b619594661f457a0e58e3f72be94dfee7686af3bf1480a9804a1364d", - "contents_checksum": "582e30d1bd5e7d63b92f565111424585ab69af8da8d75ed2bc738d033c4f0600", - "size": 133086961, - "source": "components/google-cloud-sdk-app-engine-java-20240510142152.tar.gz", + "checksum": "240d499b86cd1fcdd44475ea579b6af6ab258d9a69f7f3d64c3288e0311f02b2", + "contents_checksum": "d72e0f41dc3538983c78d6ee3c798f3f334da441a61205924ab2276748f70014", + "size": 133675565, + "source": "components/google-cloud-sdk-app-engine-java-20240607152945.tar.gz", "type": "tar" }, "dependencies": [ @@ -1041,8 +1041,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "2.0.27" + "build_number": 20240607152945, + "version_string": "2.0.28" } }, { @@ -1432,7 +1432,7 @@ "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760", "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d", "size": 797, - "source": "components/google-cloud-sdk-beta-20240524155722.tar.gz", + "source": "components/google-cloud-sdk-beta-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -1449,8 +1449,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240524155722, - "version_string": "2024.05.24" + "build_number": 20240628141907, + "version_string": "2024.06.28" } }, { @@ -1765,10 +1765,10 @@ }, { "data": { - "checksum": "cde4e71a348b97ed7da266d97745519c70c806793d3495b5f14d9b5062a73384", - "contents_checksum": "ce776833b9b7645c4e36ba6a5df015e90c8d8976d6c7bf18a5b6281f81ee015d", - "size": 1789662, - "source": "components/google-cloud-sdk-bq-20240524155722.tar.gz", + "checksum": "dc8a494e45b8fb7ed07610415670c4c24d790996c9704ea4de134f5ced656eed", + "contents_checksum": "fa75ed5c31aec233af4d26393b6ae73335c66906079df0040bf97716fd7f61a6", + "size": 1805684, + "source": "components/google-cloud-sdk-bq-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -1787,8 +1787,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240524155722, - "version_string": "2.1.5" + "build_number": 20240628141907, + "version_string": "2.1.6" } }, { @@ -2148,15 +2148,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.20.0" + "version_string": "1.21.0" } }, { "data": { - "checksum": "d5cbe5833410e7311827444000ca564d8bbe608a1a2e647245ba3d36bf0c2f8f", - "contents_checksum": "96989a9ef3161e0b0b694c7fd66620fd40c12acb8de95f539f57ddcbe0cbd4a4", - "size": 17893438, - "source": "components/google-cloud-sdk-cbt-darwin-arm-20240510142152.tar.gz", + "checksum": "3d1713cc5a17d36f806a7313ec68032373c6ef71179e19f383fcc0274aee88a9", + "contents_checksum": "dcf1b9502101268ce05abe93970b1f63b56beb325e2e1d9f33f4414cae4aec10", + "size": 17871065, + "source": "components/google-cloud-sdk-cbt-darwin-arm-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -2180,8 +2180,8 @@ }, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "1.20.0" + "build_number": 20240624182041, + "version_string": "1.21.0" } }, { @@ -2219,10 +2219,10 @@ }, { "data": { - "checksum": "cd3facd4c0e16eac188743379a6d967bfdb93d7bf169bdce8239323663b7b048", - "contents_checksum": "a3ae695ae36042223c03c6e0cff6a153f20cc9635da83c270d1008f1e65c2f55", - "size": 18664476, - "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20240510142152.tar.gz", + "checksum": "4437e990cf658b31aa184e4e5d2b06a6b0b6b08ff98bb84f7877dbc8e3c69ed7", + "contents_checksum": "51fb420da739dde8534ee1bbe419aee62520db2b8e7393ad4bbc1fc8b41defe4", + "size": 18668186, + "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -2246,16 +2246,16 @@ }, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "1.20.0" + "build_number": 20240624182041, + "version_string": "1.21.0" } }, { "data": { - "checksum": "f3ca11891da580532e6aa4598d8fbde08f761b950636ce48094f738f5bdfdbc9", - "contents_checksum": "e2dd27cc276256584d33c02f81c71b078eba398e57802f534b42bd5b9be09a08", - "size": 17422248, - "source": "components/google-cloud-sdk-cbt-linux-arm-20240510142152.tar.gz", + "checksum": "0dab71da969b9cf86f79793773e30406e2f6913774660083378235627c007b94", + "contents_checksum": "c928b188894801fa7d2367712fcbcb7c788d0650d975bbf36e60d19799a91101", + "size": 17394282, + "source": "components/google-cloud-sdk-cbt-linux-arm-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -2279,16 +2279,16 @@ }, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "1.20.0" + "build_number": 20240624182041, + "version_string": "1.21.0" } }, { "data": { - "checksum": "57696fc6c79eaf43af572ea73a7fd2de8ec37f49e739ff2b4dfcc03dbf5b5911", - "contents_checksum": "8c219444eccd9a4dab443586df961def13e95449e2e225e5e3d27d04124358fb", - "size": 17237577, - "source": "components/google-cloud-sdk-cbt-linux-x86-20240510142152.tar.gz", + "checksum": "911a85bb4a86bda2d13d00ecec45a9d48ca105ad2d8f14c32dd98f7da65522ee", + "contents_checksum": "fd7dc528702f1f66086d83867737b3813ccfcc958cd841602afd7228b3231d41", + "size": 17275734, + "source": "components/google-cloud-sdk-cbt-linux-x86-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -2312,16 +2312,16 @@ }, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "1.20.0" + "build_number": 20240624182041, + "version_string": "1.21.0" } }, { "data": { - "checksum": "50325cf8742e4c14c1ec11d57f9e9e0fbb7eaee2bd3474b1deb0bb6ed146a676", - "contents_checksum": "d464a3b284972bf15830d964b89a9c1ddc6c6e19b6e8c4b93470f4fdca1f78ab", - "size": 18566977, - "source": "components/google-cloud-sdk-cbt-linux-x86_64-20240510142152.tar.gz", + "checksum": "f1395612e02e4a10c8b381d388af26dc6463ade27bdf1fb8135fff82ce1f7f7a", + "contents_checksum": "7c5b9a2019d706ba0bfbf32f030472e6bc8630cfc72f14fbdbf3904eaf2a9dee", + "size": 18570041, + "source": "components/google-cloud-sdk-cbt-linux-x86_64-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -2345,16 +2345,16 @@ }, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "1.20.0" + "build_number": 20240624182041, + "version_string": "1.21.0" } }, { "data": { - "checksum": "1ac8348cea516de3639d37942f8b9fe4fc7a128431ab82f8b53f0a1ba36fdc75", - "contents_checksum": "9b7a21e015629f59cd3c1c5965c2773a2f078888792f100b05458b9c68b650b1", - "size": 17660232, - "source": "components/google-cloud-sdk-cbt-windows-x86-20240510142152.tar.gz", + "checksum": "53cb4fc8f903c3deb266f48a364f0591e5ba38e4e9640a18c205c4c01da95e10", + "contents_checksum": "506dfe72815e11ff50d4f4c21dbb91b3c7fd8908e0fe598888599c4d18a1a86b", + "size": 17698876, + "source": "components/google-cloud-sdk-cbt-windows-x86-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -2378,16 +2378,16 @@ }, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "1.20.0" + "build_number": 20240624182041, + "version_string": "1.21.0" } }, { "data": { - "checksum": "601cd2b70e0db9a8a8fcc8120bc0ecf79b6a896087e994a2e343f7db2505d2e7", - "contents_checksum": "287f76af634352c8d9e8ed3648268b58f2341c82d83bdd82c8715d45ad9e6954", - "size": 18828246, - "source": "components/google-cloud-sdk-cbt-windows-x86_64-20240510142152.tar.gz", + "checksum": "fefefe5120b24b0e685c281b8ffafb49566c117f5b1b74b6f44e0a56d35e72a9", + "contents_checksum": "ce6d3970696fcabd56d9e569030353d03d312e6e819163766a38af9aafbd825b", + "size": 18831679, + "source": "components/google-cloud-sdk-cbt-windows-x86_64-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -2411,8 +2411,8 @@ }, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "1.20.0" + "build_number": 20240624182041, + "version_string": "1.21.0" } }, { @@ -2818,15 +2818,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.5.18" + "version_string": "1.5.19" } }, { "data": { - "checksum": "23a3bc38e7f0a1df5526c64eaa8e5e210ed7d87e547396eb76b40cfc4b501389", - "contents_checksum": "6553bbd9db825db5ba50a1141e59303417f4f019780a899eb4217a4ef083b476", - "size": 38325669, - "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20240517151541.tar.gz", + "checksum": "348756460ed8945f115b3f07163f36ea220595f13b0ec6f47ee803266f0f4b3d", + "contents_checksum": "ab4a339f052251c4c217f41ea0a69332477a47baaa688f664cddbfbca67b246e", + "size": 38355144, + "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -2851,8 +2851,8 @@ }, "platform_required": false, "version": { - "build_number": 20240517151541, - "version_string": "1.5.18" + "build_number": 20240624182041, + "version_string": "1.5.19" } }, { @@ -3589,10 +3589,10 @@ }, { "data": { - "checksum": "6c1aadf0ae74503a46ea8d4d5d55b17853624ad503b5edea1f18f17d2ff829a6", - "contents_checksum": "11808d47d5b9f497baf24d6e5d91949d0258215fcc3cecefa1eb439b62cfbe5f", - "size": 19546688, - "source": "components/google-cloud-sdk-core-20240524155722.tar.gz", + "checksum": "c85aa9d08f077efdaa4154c8b25b05bcc43652341172876778b6c1006c0eb227", + "contents_checksum": "f04fb4fc18ab33e87bfc87d5fcd7af2a1a4eeb98f5a17a5bd9f280a6728b4806", + "size": 19841449, + "source": "components/google-cloud-sdk-core-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -3613,8 +3613,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240524155722, - "version_string": "2024.05.24" + "build_number": 20240628141907, + "version_string": "2024.06.28" } }, { @@ -4405,10 +4405,10 @@ }, { "data": { - "checksum": "2678d4b85b8247cb896f38bb6741e6e30c9e5f2c65e495e85795131493ef5acc", - "contents_checksum": "91de55f1ec585b9e8326f529655b1c550739f8f864059b47e2d7554c4fc170a6", - "size": 17408040, - "source": "components/google-cloud-sdk-gcloud-deps-20240503145345.tar.gz", + "checksum": "ca09bfbd8ebc1571dc9770caddbb3c9e7ace51b30707eb50ff8de7e8a7c8049f", + "contents_checksum": "f3c947eafda42461652eb08104d0309bd3e5b2d1b6edacf276385313880a4da1", + "size": 17415961, + "source": "components/google-cloud-sdk-gcloud-deps-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -4431,8 +4431,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240503145345, - "version_string": "2024.05.03" + "build_number": 20240628141907, + "version_string": "2024.06.28" } }, { @@ -4668,10 +4668,10 @@ }, { "data": { - "checksum": "00d4d5a33fcc9ed3e2234f551b63b1ee2a997ee7d40b5812ce00e1ab3db9cbdd", - "contents_checksum": "0db1f61e6c193d520df0b9b89589a999466406a374eede0e6a402b80210b9f21", - "size": 6964181, - "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20240524155722.tar.gz", + "checksum": "6c9cdcacbe7cff43bd94a255b5388a67a3f042db77071893029d4cf1530110a7", + "contents_checksum": "5b5391973a55924bc0e962bc2d8654749d68e30144a38723eda2a5fb5883b5ac", + "size": 7056653, + "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -4696,7 +4696,7 @@ }, "platform_required": false, "version": { - "build_number": 20240524155722, + "build_number": 20240628141907, "version_string": "" } }, @@ -4733,15 +4733,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.5.8" + "version_string": "0.5.9" } }, { "data": { - "checksum": "327a609642f03ff8f40490eed3794ecf937c6d5fdabf16b41711f037f86c283a", - "contents_checksum": "e63fd07984cbb296b5359bb35569445a539ed4e58c8bce640d4216a94c8a6881", - "size": 7784812, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-arm-20240106004423.tar.gz", + "checksum": "27b741809b10d91841910a7e6dff5f90fe300659f87ac412eb850155faf34ea9", + "contents_checksum": "93b2324b7e9d1e74a9c892b720df9b7b88aca216ce747770de4235765f4d8e02", + "size": 4148014, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-arm-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -4765,16 +4765,16 @@ }, "platform_required": false, "version": { - "build_number": 20240106004423, - "version_string": "0.5.8" + "build_number": 20240628141907, + "version_string": "0.5.9" } }, { "data": { - "checksum": "79c52f25361b485515fdf2d20283925997feeea6a3f276eb49f5476645c1fe10", - "contents_checksum": "aeff6edc3ea7bde1aa33f44744484644cd4e1ca56803f043e7ef27dba5e7b015", - "size": 8160991, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-x86_64-20240106004423.tar.gz", + "checksum": "4def0d9e145c9fe98b0befffc19cd6318fdb3ab26e21f6a300a49d12aca8d84b", + "contents_checksum": "59687db899e36af44cf4199c0beb18731080b941324d64892facdef63aace340", + "size": 4366885, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-x86_64-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -4798,16 +4798,16 @@ }, "platform_required": false, "version": { - "build_number": 20240106004423, - "version_string": "0.5.8" + "build_number": 20240628141907, + "version_string": "0.5.9" } }, { "data": { - "checksum": "51fcd3459f2ef594b441faea5433a26cc8d94ab638cdac3b9028a2710a5adcbb", - "contents_checksum": "b33be7d31ad5e77814ae435860a3ab9688672baaccda4bf86c000a5b7d1eea67", - "size": 7695357, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-arm-20240106004423.tar.gz", + "checksum": "aa080cab16a1224add7d977ff34ac0f926a6935f832fc022e6fec5d779db54d3", + "contents_checksum": "0c4706838a3d1272e1b8c179a108b60d6ef3fba64d0c78da29003a0b2ce3d750", + "size": 3794917, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-arm-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -4831,16 +4831,16 @@ }, "platform_required": false, "version": { - "build_number": 20240106004423, - "version_string": "0.5.8" + "build_number": 20240628141907, + "version_string": "0.5.9" } }, { "data": { - "checksum": "87066fca15ebfd79a716c54fd15ad5621fb67dc4a3a34d1e23bcd69d4b5ed5dd", - "contents_checksum": "2a425e75e5ec31bec2b7dbdec75ed1a4ca8920ccceee7b12bf658b2e1bd409a8", - "size": 8213296, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86-20240106004423.tar.gz", + "checksum": "d47b02021ca2228a162e94b6e49b68130feb2becc933d308718106299e567c95", + "contents_checksum": "216050b1e8bc0ee27baaae4444aecca9f894015e6e0d84cf928c0662589bd511", + "size": 3938786, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -4864,16 +4864,16 @@ }, "platform_required": false, "version": { - "build_number": 20240106004423, - "version_string": "0.5.8" + "build_number": 20240628141907, + "version_string": "0.5.9" } }, { "data": { - "checksum": "cb9856b2ae92bf1a5fd69c7f29bd6892abeb2a229732541f361adea37ede3d9f", - "contents_checksum": "811125a0907dc84d4603f7c3734cfd214509c7400397e705d234b06d31c6714f", - "size": 8323564, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86_64-20240106004423.tar.gz", + "checksum": "95ecc2880a8a192436bf1f2b2b7d4343ca0a98da745aab201120e362dd96e48f", + "contents_checksum": "3a2e4fd48d7956c17417b281305fa53f0113bf30af8a588868d21535f2c700e3", + "size": 4178059, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86_64-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -4897,16 +4897,16 @@ }, "platform_required": false, "version": { - "build_number": 20240106004423, - "version_string": "0.5.8" + "build_number": 20240628141907, + "version_string": "0.5.9" } }, { "data": { - "checksum": "3b4ffda0fab2631a3b43229390bbb7c2d35d6aa6c7b283d47d8107499c44ee58", - "contents_checksum": "3f148312f9edea79f254274261b0bb1a928dc979bd569ca1410699f576433156", - "size": 8319970, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86-20240106004423.tar.gz", + "checksum": "a0d8a115db6823642b3f6f94e015209bb77cb7f3de2161adb67d0ad54a0e8921", + "contents_checksum": "de5357e3abe645a86193162ebb64c28435a1a86ab8a72918056a0fe42b3f0369", + "size": 3966177, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -4930,16 +4930,16 @@ }, "platform_required": false, "version": { - "build_number": 20240106004423, - "version_string": "0.5.8" + "build_number": 20240628141907, + "version_string": "0.5.9" } }, { "data": { - "checksum": "56b20fa9e9fbe51bc2b8e5d8086088be75aaaf90fdeae444c7bb246bdd38454a", - "contents_checksum": "af802f48ffa244f12154321bc1bc4170e53d2ab7628df711cac7c36bb1b0493d", - "size": 8477137, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86_64-20240106004423.tar.gz", + "checksum": "ed447809034732f3753eb9ef3d5a045bafe45702e9d5fb98557ae2b5ca08b775", + "contents_checksum": "831925f8cf946320a14695fd19e09a016609a000e7f863cf34f85c969e7ee50a", + "size": 4280513, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86_64-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -4963,16 +4963,16 @@ }, "platform_required": false, "version": { - "build_number": 20240106004423, - "version_string": "0.5.8" + "build_number": 20240628141907, + "version_string": "0.5.9" } }, { "data": { - "checksum": "b5ad2b82a6e8ae3fd644e8021b74bde9603bfbf68eb0da56a11a9b6c1082f4fa", - "contents_checksum": "0a00a72f6a2e3a700fad29c05b9f4418fd7e5d3a20aea9a128306251c58d34e0", - "size": 11893574, - "source": "components/google-cloud-sdk-gsutil-20240510142152.tar.gz", + "checksum": "6a095725ca5b67f81f0a39c0d506feac032aab079523a23cef9f99bdbd21c4a1", + "contents_checksum": "b9ac406aaff3e4a874760d14844a126dd75b2d69c4dcfaeaf36f8fa02bdfba82", + "size": 11883175, + "source": "components/google-cloud-sdk-gsutil-20240614142823.tar.gz", "type": "tar" }, "dependencies": [ @@ -4991,8 +4991,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "5.29" + "build_number": 20240614142823, + "version_string": "5.30" } }, { @@ -5447,10 +5447,10 @@ }, { "data": { - "checksum": "c21058af28fe7e220aa8cfb02b4d0a73036a91b52e1efa976f5c1fce50fef2ab", - "contents_checksum": "2e0a5ed80f5d195267068f7166e405a95076d362df4b0e391ba000d957a3df00", + "checksum": "c93afe5174d13a67852539bed4a2de80df4d9e27e9267d6d37d78ea4732fcf97", + "contents_checksum": "244cd00939229a06b9d7a79582dc2839313cf95d58bc3ecc2e410af35b3f0c30", "size": 35803, - "source": "components/google-cloud-sdk-kubectl-20240517151541.tar.gz", + "source": "components/google-cloud-sdk-kubectl-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -5474,16 +5474,16 @@ "platform": {}, "platform_required": true, "version": { - "build_number": 20240517151541, - "version_string": "1.27.14" + "build_number": 20240624182041, + "version_string": "1.27.15" } }, { "data": { - "checksum": "f0046d0cacea55159afe64d1c1b86a9d75b8cb9a3c5f2fb3620ad38136756d91", - "contents_checksum": "d0f9bede72e21ed6dceac46adf9ff6a50dc6962879ffcdbe9c6e2e09afe7bc38", - "size": 76286320, - "source": "components/google-cloud-sdk-kubectl-darwin-arm-20240517151541.tar.gz", + "checksum": "ba31d657e3125d1a71e5712ec8fa44f5ea9ee6047ac45b82f1db7a5e6ad907e7", + "contents_checksum": "f55f74a6ae18d7dfc667e2d3e2731bbf49e92cbd9e992c84c05ed8617a2ae575", + "size": 76290494, + "source": "components/google-cloud-sdk-kubectl-darwin-arm-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -5508,16 +5508,16 @@ }, "platform_required": true, "version": { - "build_number": 20240517151541, - "version_string": "1.27.14" + "build_number": 20240624182041, + "version_string": "1.27.15" } }, { "data": { - "checksum": "db8f9ca7b6aa0027ac3e1118891a189147531048dd89c8b1636ac66200878384", - "contents_checksum": "dbf4b56dfad764ba9cb4eed4a4953bbed3aff19fd8788eb214383b3612dae392", - "size": 80437849, - "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20240517151541.tar.gz", + "checksum": "885fcd0694e94f99f23a48dfcf648c4bfd984bd5691e97986992f9c6e1532779", + "contents_checksum": "0aa804ed82d0e4667e774f7b14741d5ef499e5120e5b8f2b90252644b5ae37db", + "size": 80432565, + "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -5542,16 +5542,16 @@ }, "platform_required": true, "version": { - "build_number": 20240517151541, - "version_string": "1.27.14" + "build_number": 20240624182041, + "version_string": "1.27.15" } }, { "data": { - "checksum": "1cd785b6e4a438283b8be7547eb187077ef16f062d7455c2365dfc859215ab40", - "contents_checksum": "4e5a6e6dadb4f0789198190eb5eb4f754fc6e5aaf1f75ca8c5a6cb458815cb8a", - "size": 73476445, - "source": "components/google-cloud-sdk-kubectl-linux-arm-20240517151541.tar.gz", + "checksum": "3ad4928265226167ffaa197b18270a61d27a858ad42e5f9079513689d70345ec", + "contents_checksum": "f17c7860507b5248c5face0cda8a95ab2c015b13f90a6fd6e274748887eb3c65", + "size": 73474381, + "source": "components/google-cloud-sdk-kubectl-linux-arm-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -5576,16 +5576,16 @@ }, "platform_required": true, "version": { - "build_number": 20240517151541, - "version_string": "1.27.14" + "build_number": 20240624182041, + "version_string": "1.27.15" } }, { "data": { - "checksum": "fe8ae00f29adbe46a07b9a5ecc167dfbc553675becf61135321a985672d1a2d3", - "contents_checksum": "baae0e60cf98e356e8a3848c91464f298f905ae688d7d93028e518662bfe1178", - "size": 71253795, - "source": "components/google-cloud-sdk-kubectl-linux-x86-20240517151541.tar.gz", + "checksum": "e3b28906976e1579dff93dc777fa348e21392d354ba3a493aec56e9a56798b91", + "contents_checksum": "6179b9854bb4e63cda81b2c236fa97650891e5c25291a5292311edcd1eab10f9", + "size": 71255708, + "source": "components/google-cloud-sdk-kubectl-linux-x86-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -5610,16 +5610,16 @@ }, "platform_required": true, "version": { - "build_number": 20240517151541, - "version_string": "1.27.14" + "build_number": 20240624182041, + "version_string": "1.27.15" } }, { "data": { - "checksum": "2b8ca7ccbc9521579db6b64b2944561721d02746978e7abb915efa725c0ce0de", - "contents_checksum": "7c601db0aefcf2c6d92956a8c1fe83189fca6eef9e9f715c36387096270949f9", - "size": 76954346, - "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20240517151541.tar.gz", + "checksum": "9b98bb6004218eff092eaaf57e600c6820641ba00f2855577a61852590c7ed27", + "contents_checksum": "a3c7d039ffa798e43a3acb15670156e837d4f868e76627601f910177bcea481b", + "size": 76953404, + "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -5644,8 +5644,8 @@ }, "platform_required": true, "version": { - "build_number": 20240517151541, - "version_string": "1.27.14" + "build_number": 20240624182041, + "version_string": "1.27.15" } }, { @@ -5848,10 +5848,10 @@ }, { "data": { - "checksum": "2e69b9fefdab2e33e2a68e244606e9e5588ed091a7e0ed1bb43850eba7e8d4ec", - "contents_checksum": "7b43f42e006d3406b46e6d3c69725d886036cb4f4f3072b210a850f79021b0db", - "size": 74875962, - "source": "components/google-cloud-sdk-kubectl-windows-x86-20240517151541.tar.gz", + "checksum": "391b6fb5860780874a4b6c5c2443c047c43b99aa451347184c2c0bad1bb097b8", + "contents_checksum": "38c0ad032e37fd6ea90f5ab1eeaba408719851d3e4cf84927d039d60071c304f", + "size": 74873955, + "source": "components/google-cloud-sdk-kubectl-windows-x86-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -5878,16 +5878,16 @@ }, "platform_required": true, "version": { - "build_number": 20240517151541, - "version_string": "1.27.14" + "build_number": 20240624182041, + "version_string": "1.27.15" } }, { "data": { - "checksum": "58ab256106978ea9bfa7a52a2e8ce85fb4bd8b606d120d1a040675d8df610f2f", - "contents_checksum": "6a935880c971037634a2312f25efe9df72cd08b8d5293a20b33f7cfe8c2d3e3a", - "size": 78994894, - "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20240517151541.tar.gz", + "checksum": "6fccb2f163c0d27639adccf8671ca76103759337f6b6954a809fef0262c6d1e2", + "contents_checksum": "86d9c6193f04f54bea5e57823e44a36a76034597560c1631b74b2a3730b257c9", + "size": 78995215, + "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20240624182041.tar.gz", "type": "tar" }, "dependencies": [ @@ -5914,8 +5914,8 @@ }, "platform_required": true, "version": { - "build_number": 20240517151541, - "version_string": "1.27.14" + "build_number": 20240624182041, + "version_string": "1.27.15" } }, { @@ -6665,15 +6665,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.18.0-rc.3" + "version_string": "1.18.2-rc.2" } }, { "data": { - "checksum": "e25768b4cc121658267bacecd76c6bef913ce8f83046e168361199dc47946f0e", - "contents_checksum": "2703dbbec230c683ab31645f2c85764797de91502c9336fec4f216e12e7e0919", - "size": 30051781, - "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20240510142152.tar.gz", + "checksum": "78bfc25756970074fa09b214f9d924f9cf698fe5a0d44e2853f40e5cafb25275", + "contents_checksum": "93404e52e62716c64c088035390ded4d5ea12e3328ed319b1ca18b67ad88880e", + "size": 31591559, + "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -6697,16 +6697,16 @@ }, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "1.18.0-rc.3" + "build_number": 20240628141907, + "version_string": "1.18.2-rc.2" } }, { "data": { - "checksum": "3ab5af0f69751230c98c7920e3931cd36bdd40c3306190e4ad16c0e768d2eee8", - "contents_checksum": "6ea201c0f057a3a58d43c6e4b3fc1691c5cf00ed27ac40e92528d2334d89c885", - "size": 30217798, - "source": "components/google-cloud-sdk-nomos-linux-x86_64-20240510142152.tar.gz", + "checksum": "7fe7d46c755eb5a94df3d7c0031a0ab3b6b95124c6120be0b832c16047685db5", + "contents_checksum": "85aab3cdb4ff4c6112b285a57f69b59a3b88663e167e5de19e0d16b0b3e14123", + "size": 31771575, + "source": "components/google-cloud-sdk-nomos-linux-x86_64-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -6730,8 +6730,8 @@ }, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "1.18.0-rc.3" + "build_number": 20240628141907, + "version_string": "1.18.2-rc.2" } }, { @@ -7323,10 +7323,10 @@ }, { "data": { - "checksum": "120bd981566b18fae7041191f60980d99bb654e8fc846cc0eabf5de1719981e9", - "contents_checksum": "1fa1d0fcc0a4fa9fc465722a33fd5f89a0ad09e014840594557461409535ca81", - "size": 3783443, - "source": "components/google-cloud-sdk-ssh-tools-windows-20240419141706.tar.gz", + "checksum": "616b251f0ef9daf38ac151c622403fd0563ac378cedaa20cf3132a75be05249a", + "contents_checksum": "a7771f6c72699f4212a02b3d53b23b20c9d223f13791e5b0988792d56fcd85d4", + "size": 3782047, + "source": "components/google-cloud-sdk-ssh-tools-windows-20240614142823.tar.gz", "type": "tar" }, "dependencies": [ @@ -7347,7 +7347,7 @@ }, "platform_required": false, "version": { - "build_number": 20240419141706, + "build_number": 20240614142823, "version_string": "" } }, @@ -7551,10 +7551,10 @@ }, { "data": { - "checksum": "a1f346a6fee441c88145e5e7bde1378b4fdb893a6efd567822f058c1ee8d5907", - "contents_checksum": "cd4bfe5247c8f08ce1cf8826c8ee0154c0af47510e10b20e069a384088ea9f93", - "size": 57089124, - "source": "components/google-cloud-sdk-tests-20240524155722.tar.gz", + "checksum": "a69ec16f040d496e7f6901717f9738255f66773b0eb20a96cb19688fe853f937", + "contents_checksum": "f4dad17b254ae4340379b1c061410d576644fe22f0a9576d29e343c677afda5a", + "size": 57476207, + "source": "components/google-cloud-sdk-tests-20240628141907.tar.gz", "type": "tar" }, "dependencies": [ @@ -7571,8 +7571,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240524155722, - "version_string": "2024.05.24" + "build_number": 20240628141907, + "version_string": "2024.06.28" } } ], @@ -7591,11 +7591,11 @@ ], "post_processing_command": "components post-process", "release_notes_url": "RELEASE_NOTES", - "revision": 20240524155722, + "revision": 20240628141907, "schema_version": { "no_update": false, "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz", "version": 3 }, - "version": "478.0.0" + "version": "483.0.0" } diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix index 543214462025..ea4ee77e1254 100644 --- a/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -1,32 +1,32 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "478.0.0"; + version = "483.0.0"; googleCloudSdkPkgs = { x86_64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-478.0.0-linux-x86_64.tar.gz"; - sha256 = "1f4k1n1dic1aqqzhm31hggyjjrvqixbzlvr717z0ri5qi5qkqv2w"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-483.0.0-linux-x86_64.tar.gz"; + sha256 = "1vp455n1wdm581nzf7gc43v2p6byx8rpa19mcncvgyh2k43p9kqc"; }; x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-478.0.0-darwin-x86_64.tar.gz"; - sha256 = "1xs55hvq6bx39xh00nq0hsi52vgkvklvhrgxwghgi2i01ry1fm9n"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-483.0.0-darwin-x86_64.tar.gz"; + sha256 = "1cygr9z23g6xx18dcdgwms6pb4gvapldlsj3fqjjwnzcgmrj41a1"; }; aarch64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-478.0.0-linux-arm.tar.gz"; - sha256 = "0pzgddqmw5bwyg60vavxy3lfl0v2lrx0h2d5k120y7h6zvvnynj9"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-483.0.0-linux-arm.tar.gz"; + sha256 = "1k1dasnby7x5jhs9n6rji2g25gasb8mvc679cs5rp78fvq9kbygq"; }; aarch64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-478.0.0-darwin-arm.tar.gz"; - sha256 = "0dz25jqv67bvz4vj1p54pxskmxz1x33s18snplkcm32agdjjgaxd"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-483.0.0-darwin-arm.tar.gz"; + sha256 = "1sy0pzy9r96p9x604a22z6blqr824fxp16imvwfajqn3c3m65z3g"; }; i686-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-478.0.0-linux-x86.tar.gz"; - sha256 = "1wdxjpr8nycrz0qf8lgl2nrhbgk0y3phy4cx46jjwdagwgdhihas"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-483.0.0-linux-x86.tar.gz"; + sha256 = "0j219d1p71ys7kkgbjrwjypmwf2cw7p0a17fr0ss3a9x88gzfhnd"; }; }; } diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index b3b0fd6d1409..b8eb0facea4f 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "granted"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YOEuAjVIOmQdudjPc1ooGWRjm2ADemS7xSntho1k5KA="; + sha256 = "sha256-C9VzFrhIehGsGzYfXkPiYjE1vuSK6Sh3exm81PdhLKo="; }; vendorHash = "sha256-/X7kHaBZyDV4IqvKqyR7pAQLgYqIvcvSSh0NdrA5d3I="; diff --git a/pkgs/tools/admin/netbox2netshot/default.nix b/pkgs/tools/admin/netbox2netshot/default.nix index 47b6dc2e293d..ccaff8f38ecf 100644 --- a/pkgs/tools/admin/netbox2netshot/default.nix +++ b/pkgs/tools/admin/netbox2netshot/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { description = "Inventory synchronization tool between Netbox and Netshot"; homepage = "https://github.com/scaleway/netbox2netshot"; license = licenses.asl20; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "netbox2netshot"; }; } diff --git a/pkgs/tools/admin/okta-aws-cli/default.nix b/pkgs/tools/admin/okta-aws-cli/default.nix index 38e661a56ace..0d4fe0759bba 100644 --- a/pkgs/tools/admin/okta-aws-cli/default.nix +++ b/pkgs/tools/admin/okta-aws-cli/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "okta-aws-cli"; - version = "2.1.2"; + version = "2.2.0"; subPackages = [ "cmd/okta-aws-cli" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "okta"; repo = "okta-aws-cli"; rev = "v${version}"; - sha256 = "sha256-MNaoCefJwUPWYPZ+AtQUHhm1ZKSFq+hCGGAFwBxrbWI="; + sha256 = "sha256-ECcBsFKs3QabQxURrGO1ZvJ10NzVL4J38rLRLO5y7Mw="; }; - vendorHash = "sha256-SjABVO6tHYRc/1pYjOqfZP+NfnK1/WnAcY5NQ4hMssE="; + vendorHash = "sha256-2VTq8lzGYBKH410/mflloAphWTwFie3mdmz2kLkfuQ0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/admin/pbm/default.nix b/pkgs/tools/admin/pbm/default.nix index e681d6f286db..8a444311ffd6 100644 --- a/pkgs/tools/admin/pbm/default.nix +++ b/pkgs/tools/admin/pbm/default.nix @@ -4,7 +4,7 @@ buildDotnetGlobalTool { pname = "pbm"; version = "1.3.2"; - nugetSha256 = "sha256-xu3g8NFLZYnHzBuoIhIiAzaPJqY0xhLWLYi+ORRADH8="; + nugetHash = "sha256-xu3g8NFLZYnHzBuoIhIiAzaPJqY0xhLWLYi+ORRADH8="; meta = with lib; { description = "CLI for managing Akka.NET applications and Akka.NET Clusters"; diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 9e45896512ee..00d6877f6418 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -15,14 +15,14 @@ let pname = "pgadmin"; - version = "8.8"; - yarnHash = "sha256-dBgbgZrjF1rNyN1Hp1nKiT6C6FVbYdbEZQgYbRKVsYI="; + version = "8.9"; + yarnHash = "sha256-UEQ5gcc4n/XMW5kNol2gLiXUb9Ys75YMzWDXDiDIC9I="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-203tuxtYOn1fD1m8BGL6rt5lDDr5V38ybPy+iwmZpkk="; + hash = "sha256-qxbY4gIXpp5U8RkzdYZUKJ7aTXvuXPGOGTKX41k1iyE="; }; # keep the scope, as it is used throughout the derivation and tests @@ -77,7 +77,7 @@ pythonPackages.buildPythonApplication rec { sed 's|*|0|g' -i requirements.txt # remove packageManager from package.json so we can work without corepack substituteInPlace web/package.json \ - --replace-fail "\"packageManager\": \"yarn@3.6.4\"" "\"\": \"\"" + --replace-fail "\"packageManager\": \"yarn@3.8.2\"" "\"\": \"\"" substituteInPlace pkg/pip/setup_pip.py \ --replace-fail "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req" ${lib.optionalString (!server-mode) '' diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index 2d0d2d44a23b..d5a752eaa1f9 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -2,15 +2,10 @@ # yarn lockfile v1 -"@aashutoshrathi/word-wrap@^1.2.3": - version "1.2.6" - resolved "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" - integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== - "@adobe/css-tools@^4.3.2": - version "4.3.3" - resolved "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz#90749bde8b89cd41764224f5aac29cd4138f75ff" - integrity sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ== + version "4.4.0" + resolved "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.0.tgz#728c484f4e10df03d5a3acd0d8adcbbebff8ad63" + integrity sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ== "@ampproject/remapping@^2.2.0": version "2.3.0" @@ -20,34 +15,34 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2": - version "7.24.2" - resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae" - integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465" + integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA== dependencies: - "@babel/highlight" "^7.24.2" + "@babel/highlight" "^7.24.7" picocolors "^1.0.0" -"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.5", "@babel/compat-data@^7.24.4": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz#6f102372e9094f25d908ca0d34fc74c74606059a" - integrity sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ== +"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz#d23bbea508c3883ba8251fb4164982c36ea577ed" + integrity sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw== "@babel/core@^7.10.2", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.21.3", "@babel/core@^7.23.9": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/core/-/core-7.24.4.tgz#1f758428e88e0d8c563874741bc4ffc4f71a4717" - integrity sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg== + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz#b676450141e0b52a3d43bc91da86aa608f950ac4" + integrity sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.24.2" - "@babel/generator" "^7.24.4" - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.24.4" - "@babel/parser" "^7.24.4" - "@babel/template" "^7.24.0" - "@babel/traverse" "^7.24.1" - "@babel/types" "^7.24.0" + "@babel/code-frame" "^7.24.7" + "@babel/generator" "^7.24.7" + "@babel/helper-compilation-targets" "^7.24.7" + "@babel/helper-module-transforms" "^7.24.7" + "@babel/helpers" "^7.24.7" + "@babel/parser" "^7.24.7" + "@babel/template" "^7.24.7" + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -55,84 +50,85 @@ semver "^6.3.1" "@babel/eslint-parser@^7.21.3": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.24.1.tgz#e27eee93ed1d271637165ef3a86e2b9332395c32" - integrity sha512-d5guuzMlPeDfZIbpQ8+g1NaCNuAGBBGNECh0HVqz1sjOeVLh2CEaifuOysCH18URW6R7pqXINvf5PaR/dC6jLQ== + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.24.7.tgz#27ebab1a1ec21f48ae191a8aaac5b82baf80d9c7" + integrity sha512-SO5E3bVxDuxyNxM5agFv480YA2HO6ohZbGxbazZdIk3KQOPOGVNw6q78I9/lbviIf95eq6tPozeYnJLbjnC8IA== dependencies: "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1" eslint-visitor-keys "^2.1.0" semver "^6.3.1" "@babel/eslint-plugin@^7.17.7": - version "7.23.5" - resolved "https://registry.npmjs.org/@babel/eslint-plugin/-/eslint-plugin-7.23.5.tgz#77d4703e9f83b81e9fc13382810372beb2f10f94" - integrity sha512-03+E/58Hoo/ui69gR+beFdGpplpoVK0BSIdke2iw4/Bz7eGN0ssRenNlnU4nmbkowNQOPCStKSwFr8H6DiY49g== + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/eslint-plugin/-/eslint-plugin-7.24.7.tgz#ebdab31638cdcc720f0c788813066e9b5c0b3e29" + integrity sha512-lODNPJnM+OfcxxBvdmI2YmUeC0fBK3k9yET5O+1Eukr8d5VpO19c6ARtNheE2t2i/8XNYTzp3HeGEAAGZH3nnQ== dependencies: eslint-rule-composer "^0.3.0" -"@babel/generator@^7.24.1", "@babel/generator@^7.24.4", "@babel/generator@^7.7.2": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz#1fc55532b88adf952025d5d2d1e71f946cb1c498" - integrity sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw== +"@babel/generator@^7.24.7", "@babel/generator@^7.7.2": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz#1654d01de20ad66b4b4d99c135471bc654c55e6d" + integrity sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA== dependencies: - "@babel/types" "^7.24.0" + "@babel/types" "^7.24.7" "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" - integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg== +"@babel/helper-annotate-as-pure@^7.22.5", "@babel/helper-annotate-as-pure@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab" + integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg== dependencies: - "@babel/types" "^7.22.5" + "@babel/types" "^7.24.7" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15": - version "7.22.15" - resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956" - integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz#37d66feb012024f2422b762b9b2a7cfe27c7fba3" + integrity sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA== dependencies: - "@babel/types" "^7.22.15" + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" -"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991" - integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ== +"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz#4eb6c4a80d6ffeac25ab8cd9a21b5dfa48d503a9" + integrity sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg== dependencies: - "@babel/compat-data" "^7.23.5" - "@babel/helper-validator-option" "^7.23.5" + "@babel/compat-data" "^7.24.7" + "@babel/helper-validator-option" "^7.24.7" browserslist "^4.22.2" lru-cache "^5.1.1" semver "^6.3.1" -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.24.1", "@babel/helper-create-class-features-plugin@^7.24.4": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz#c806f73788a6800a5cfbbc04d2df7ee4d927cce3" - integrity sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ== +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz#2eaed36b3a1c11c53bdf80d53838b293c52f5b3b" + integrity sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg== dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-member-expression-to-functions" "^7.23.0" - "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/helper-replace-supers" "^7.24.1" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/helper-annotate-as-pure" "^7.24.7" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-function-name" "^7.24.7" + "@babel/helper-member-expression-to-functions" "^7.24.7" + "@babel/helper-optimise-call-expression" "^7.24.7" + "@babel/helper-replace-supers" "^7.24.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" + "@babel/helper-split-export-declaration" "^7.24.7" semver "^6.3.1" -"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5": - version "7.22.15" - resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1" - integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w== +"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz#be4f435a80dc2b053c76eeb4b7d16dd22cfc89da" + integrity sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA== dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-annotate-as-pure" "^7.24.7" regexpu-core "^5.3.1" semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.6.1": - version "0.6.1" - resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz#fadc63f0c2ff3c8d02ed905dcea747c5b0fb74fd" - integrity sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA== +"@babel/helper-define-polyfill-provider@^0.6.1", "@babel/helper-define-polyfill-provider@^0.6.2": + version "0.6.2" + resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d" + integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ== dependencies: "@babel/helper-compilation-targets" "^7.22.6" "@babel/helper-plugin-utils" "^7.22.5" @@ -140,181 +136,187 @@ lodash.debounce "^4.0.8" resolve "^1.14.2" -"@babel/helper-environment-visitor@^7.22.20": - version "7.22.20" - resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" - integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== - -"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0": - version "7.23.0" - resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" - integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== +"@babel/helper-environment-visitor@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9" + integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ== dependencies: - "@babel/template" "^7.22.15" - "@babel/types" "^7.23.0" + "@babel/types" "^7.24.7" -"@babel/helper-hoist-variables@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" - integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== +"@babel/helper-function-name@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz#75f1e1725742f39ac6584ee0b16d94513da38dd2" + integrity sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA== dependencies: - "@babel/types" "^7.22.5" + "@babel/template" "^7.24.7" + "@babel/types" "^7.24.7" -"@babel/helper-member-expression-to-functions@^7.23.0": - version "7.23.0" - resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366" - integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA== +"@babel/helper-hoist-variables@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz#b4ede1cde2fd89436397f30dc9376ee06b0f25ee" + integrity sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ== dependencies: - "@babel/types" "^7.23.0" + "@babel/types" "^7.24.7" -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.24.1", "@babel/helper-module-imports@^7.24.3": - version "7.24.3" - resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128" - integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg== +"@babel/helper-member-expression-to-functions@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz#67613d068615a70e4ed5101099affc7a41c5225f" + integrity sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w== dependencies: - "@babel/types" "^7.24.0" + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" -"@babel/helper-module-transforms@^7.23.3": - version "7.23.3" - resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1" - integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ== +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b" + integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA== dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-simple-access" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" -"@babel/helper-optimise-call-expression@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e" - integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw== +"@babel/helper-module-transforms@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz#31b6c9a2930679498db65b685b1698bfd6c7daf8" + integrity sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ== dependencies: - "@babel/types" "^7.22.5" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-module-imports" "^7.24.7" + "@babel/helper-simple-access" "^7.24.7" + "@babel/helper-split-export-declaration" "^7.24.7" + "@babel/helper-validator-identifier" "^7.24.7" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.24.0" - resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a" - integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w== - -"@babel/helper-remap-async-to-generator@^7.22.20": - version "7.22.20" - resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0" - integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw== +"@babel/helper-optimise-call-expression@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz#8b0a0456c92f6b323d27cfd00d1d664e76692a0f" + integrity sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A== dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-wrap-function" "^7.22.20" + "@babel/types" "^7.24.7" -"@babel/helper-replace-supers@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz#7085bd19d4a0b7ed8f405c1ed73ccb70f323abc1" - integrity sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz#98c84fe6fe3d0d3ae7bfc3a5e166a46844feb2a0" + integrity sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg== + +"@babel/helper-remap-async-to-generator@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz#b3f0f203628522713849d49403f1a414468be4c7" + integrity sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA== dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-member-expression-to-functions" "^7.23.0" - "@babel/helper-optimise-call-expression" "^7.22.5" + "@babel/helper-annotate-as-pure" "^7.24.7" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-wrap-function" "^7.24.7" -"@babel/helper-simple-access@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" - integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w== +"@babel/helper-replace-supers@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz#f933b7eed81a1c0265740edc91491ce51250f765" + integrity sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg== dependencies: - "@babel/types" "^7.22.5" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-member-expression-to-functions" "^7.24.7" + "@babel/helper-optimise-call-expression" "^7.24.7" -"@babel/helper-skip-transparent-expression-wrappers@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847" - integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q== +"@babel/helper-simple-access@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3" + integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg== dependencies: - "@babel/types" "^7.22.5" + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" -"@babel/helper-split-export-declaration@^7.22.6": - version "7.22.6" - resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" - integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== +"@babel/helper-skip-transparent-expression-wrappers@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz#5f8fa83b69ed5c27adc56044f8be2b3ea96669d9" + integrity sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ== dependencies: - "@babel/types" "^7.22.5" + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" -"@babel/helper-string-parser@^7.23.4": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e" - integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ== - -"@babel/helper-validator-identifier@^7.22.20": - version "7.22.20" - resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" - integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== - -"@babel/helper-validator-option@^7.23.5": - version "7.23.5" - resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307" - integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== - -"@babel/helper-wrap-function@^7.22.20": - version "7.22.20" - resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569" - integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw== +"@babel/helper-split-export-declaration@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz#83949436890e07fa3d6873c61a96e3bbf692d856" + integrity sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA== dependencies: - "@babel/helper-function-name" "^7.22.5" - "@babel/template" "^7.22.15" - "@babel/types" "^7.22.19" + "@babel/types" "^7.24.7" -"@babel/helpers@^7.24.4": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.4.tgz#dc00907fd0d95da74563c142ef4cd21f2cb856b6" - integrity sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw== - dependencies: - "@babel/template" "^7.24.0" - "@babel/traverse" "^7.24.1" - "@babel/types" "^7.24.0" +"@babel/helper-string-parser@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz#4d2d0f14820ede3b9807ea5fc36dfc8cd7da07f2" + integrity sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg== -"@babel/highlight@^7.24.2": - version "7.24.2" - resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26" - integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA== +"@babel/helper-validator-identifier@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" + integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== + +"@babel/helper-validator-option@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz#24c3bb77c7a425d1742eec8fb433b5a1b38e62f6" + integrity sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw== + +"@babel/helper-wrap-function@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz#52d893af7e42edca7c6d2c6764549826336aae1f" + integrity sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw== dependencies: - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-function-name" "^7.24.7" + "@babel/template" "^7.24.7" + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" + +"@babel/helpers@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz#aa2ccda29f62185acb5d42fb4a3a1b1082107416" + integrity sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg== + dependencies: + "@babel/template" "^7.24.7" + "@babel/types" "^7.24.7" + +"@babel/highlight@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d" + integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw== + dependencies: + "@babel/helper-validator-identifier" "^7.24.7" chalk "^2.4.2" js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1", "@babel/parser@^7.24.4": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88" - integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz#9a5226f92f0c5c8ead550b750f5608e766c8ce85" + integrity sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw== -"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.4": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz#6125f0158543fb4edf1c22f322f3db67f21cb3e1" - integrity sha512-qpl6vOOEEzTLLcsuqYYo8yDtrTocmu2xkGvgNebvPjT9DTtfFYGmgDqY+rBYXNlqL4s9qLDn6xkrJv4RxAPiTA== +"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7.tgz#fd059fd27b184ea2b4c7e646868a9a381bbc3055" + integrity sha512-TiT1ss81W80eQsN+722OaeQMY/G4yTb4G9JrqeiDADs3N8lbPMGldWi9x8tyqCW5NLx1Jh2AvkE6r6QvEltMMQ== dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.1.tgz#b645d9ba8c2bc5b7af50f0fe949f9edbeb07c8cf" - integrity sha512-y4HqEnkelJIOQGd+3g1bTeKsA5c6qM7eOn7VggGVbBc0y8MLSKHacwcIE2PplNlQSj0PqS9rrXL/nkPVK+kUNg== +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz#468096ca44bbcbe8fcc570574e12eb1950e18107" + integrity sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.1.tgz#da8261f2697f0f41b0855b91d3a20a1fbfd271d3" - integrity sha512-Hj791Ii4ci8HqnaKHAlLNs+zaLXb0EzSDhiAWp5VNlyvCNymYfacs64pxTxbH1znW/NcArSmwpmG9IKE/TUVVQ== +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz#e4eabdd5109acc399b38d7999b2ef66fc2022f89" + integrity sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/plugin-transform-optional-chaining" "^7.24.1" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" + "@babel/plugin-transform-optional-chaining" "^7.24.7" -"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.1.tgz#1181d9685984c91d657b8ddf14f0487a6bab2988" - integrity sha512-m9m/fXsXLiHfwdgydIFnpk+7jlVbnvlK5B2EKiPdLUb6WX654ZaaEWJUjk8TftRbZpK0XibovlLWX4KIZhV6jw== +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7.tgz#71b21bb0286d5810e63a1538aa901c58e87375ec" + integrity sha512-utA4HuR6F4Vvcr+o4DnjL8fCOlgRFGbeeBEGNg3ZTrLFw6VWG5XmUrvcQ0FjIYMU2ST4XcR2Wsp7t9qOAPnxMg== dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-proposal-class-properties@^7.10.4": version "7.18.6" @@ -382,19 +384,19 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-import-assertions@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz#db3aad724153a00eaac115a3fb898de544e34971" - integrity sha512-IuwnI5XnuF189t91XbxmXeCDz3qs6iDRO7GJ++wcfgeXNs/8FmIlKcpDSXNVyuLQxlwvskmI3Ct73wUODkJBlQ== +"@babel/plugin-syntax-import-assertions@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz#2a0b406b5871a20a841240586b1300ce2088a778" + integrity sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-syntax-import-attributes@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.1.tgz#c66b966c63b714c4eec508fcf5763b1f2d381093" - integrity sha512-zhQTMH0X2nVLnb04tz+s7AMuasX8U0FnpE+nHTOhSOINjWMnopoZTxtIKsd45n4GQ/HIZLyfIpoul8e2m0DnRA== +"@babel/plugin-syntax-import-attributes@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz#b4f9ea95a79e6912480c4b626739f86a076624ca" + integrity sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-import-meta@^7.10.4", "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" @@ -410,12 +412,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.16.0", "@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.23.3", "@babel/plugin-syntax-jsx@^7.24.1", "@babel/plugin-syntax-jsx@^7.7.2": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz#3f6ca04b8c841811dbc3c5c5f837934e0d626c10" - integrity sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA== +"@babel/plugin-syntax-jsx@^7.16.0", "@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.24.7", "@babel/plugin-syntax-jsx@^7.7.2": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz#39a1fa4a7e3d3d7f34e2acc6be585b718d30e02d" + integrity sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" @@ -473,12 +475,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.24.1", "@babel/plugin-syntax-typescript@^7.7.2": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz#b3bcc51f396d15f3591683f90239de143c076844" - integrity sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw== +"@babel/plugin-syntax-typescript@^7.24.7", "@babel/plugin-syntax-typescript@^7.7.2": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz#58d458271b4d3b6bb27ee6ac9525acbb259bad1c" + integrity sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-unicode-sets-regex@^7.18.6": version "7.18.6" @@ -488,476 +490,476 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-arrow-functions@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz#2bf263617060c9cc45bcdbf492b8cc805082bf27" - integrity sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw== +"@babel/plugin-transform-arrow-functions@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz#4f6886c11e423bd69f3ce51dbf42424a5f275514" + integrity sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-async-generator-functions@^7.24.3": - version "7.24.3" - resolved "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.3.tgz#8fa7ae481b100768cc9842c8617808c5352b8b89" - integrity sha512-Qe26CMYVjpQxJ8zxM1340JFNjZaF+ISWpr1Kt/jGo+ZTUzKkfw/pphEWbRCb+lmSM6k/TOgfYLvmbHkUQ0asIg== +"@babel/plugin-transform-async-generator-functions@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.7.tgz#7330a5c50e05181ca52351b8fd01642000c96cfd" + integrity sha512-o+iF77e3u7ZS4AoAuJvapz9Fm001PuD2V3Lp6OSE4FYQke+cSewYtnek+THqGRWyQloRCyvWL1OkyfNEl9vr/g== dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-remap-async-to-generator" "^7.22.20" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-remap-async-to-generator" "^7.24.7" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-transform-async-to-generator@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.1.tgz#0e220703b89f2216800ce7b1c53cb0cf521c37f4" - integrity sha512-AawPptitRXp1y0n4ilKcGbRYWfbbzFWz2NqNu7dacYDtFtz0CMjG64b3LQsb3KIgnf4/obcUL78hfaOS7iCUfw== +"@babel/plugin-transform-async-to-generator@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz#72a3af6c451d575842a7e9b5a02863414355bdcc" + integrity sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA== dependencies: - "@babel/helper-module-imports" "^7.24.1" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-remap-async-to-generator" "^7.22.20" + "@babel/helper-module-imports" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-remap-async-to-generator" "^7.24.7" -"@babel/plugin-transform-block-scoped-functions@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.1.tgz#1c94799e20fcd5c4d4589523bbc57b7692979380" - integrity sha512-TWWC18OShZutrv9C6mye1xwtam+uNi2bnTOCBUd5sZxyHOiWbU6ztSROofIMrK84uweEZC219POICK/sTYwfgg== +"@babel/plugin-transform-block-scoped-functions@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz#a4251d98ea0c0f399dafe1a35801eaba455bbf1f" + integrity sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-block-scoping@^7.24.4": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.4.tgz#28f5c010b66fbb8ccdeef853bef1935c434d7012" - integrity sha512-nIFUZIpGKDf9O9ttyRXpHFpKC+X3Y5mtshZONuEUYBomAKoM4y029Jr+uB1bHGPhNmK8YXHevDtKDOLmtRrp6g== +"@babel/plugin-transform-block-scoping@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz#42063e4deb850c7bd7c55e626bf4e7ab48e6ce02" + integrity sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-class-properties@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.1.tgz#bcbf1aef6ba6085cfddec9fc8d58871cf011fc29" - integrity sha512-OMLCXi0NqvJfORTaPQBwqLXHhb93wkBKZ4aNwMl6WtehO7ar+cmp+89iPEQPqxAnxsOKTaMcs3POz3rKayJ72g== +"@babel/plugin-transform-class-properties@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz#256879467b57b0b68c7ddfc5b76584f398cd6834" + integrity sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w== dependencies: - "@babel/helper-create-class-features-plugin" "^7.24.1" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-class-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-class-static-block@^7.24.4": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.4.tgz#1a4653c0cf8ac46441ec406dece6e9bc590356a4" - integrity sha512-B8q7Pz870Hz/q9UgP8InNpY01CSLDSCyqX7zcRuv3FcPl87A2G17lASroHWaCtbdIcbYzOZ7kWmXFKbijMSmFg== +"@babel/plugin-transform-class-static-block@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz#c82027ebb7010bc33c116d4b5044fbbf8c05484d" + integrity sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ== dependencies: - "@babel/helper-create-class-features-plugin" "^7.24.4" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-class-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-transform-classes@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz#5bc8fc160ed96378184bc10042af47f50884dcb1" - integrity sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q== +"@babel/plugin-transform-classes@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz#4ae6ef43a12492134138c1e45913f7c46c41b4bf" + integrity sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw== dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-replace-supers" "^7.24.1" - "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/helper-annotate-as-pure" "^7.24.7" + "@babel/helper-compilation-targets" "^7.24.7" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-function-name" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-replace-supers" "^7.24.7" + "@babel/helper-split-export-declaration" "^7.24.7" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.1.tgz#bc7e787f8e021eccfb677af5f13c29a9934ed8a7" - integrity sha512-5pJGVIUfJpOS+pAqBQd+QMaTD2vCL/HcePooON6pDpHgRp4gNRmzyHTPIkXntwKsq3ayUFVfJaIKPw2pOkOcTw== +"@babel/plugin-transform-computed-properties@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz#4cab3214e80bc71fae3853238d13d097b004c707" + integrity sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/template" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/template" "^7.24.7" -"@babel/plugin-transform-destructuring@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.1.tgz#b1e8243af4a0206841973786292b8c8dd8447345" - integrity sha512-ow8jciWqNxR3RYbSNVuF4U2Jx130nwnBnhRw6N6h1bOejNkABmcI5X5oz29K4alWX7vf1C+o6gtKXikzRKkVdw== +"@babel/plugin-transform-destructuring@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz#a097f25292defb6e6cc16d6333a4cfc1e3c72d9e" + integrity sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-dotall-regex@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.1.tgz#d56913d2f12795cc9930801b84c6f8c47513ac13" - integrity sha512-p7uUxgSoZwZ2lPNMzUkqCts3xlp8n+o05ikjy7gbtFJSt9gdU88jAmtfmOxHM14noQXBxfgzf2yRWECiNVhTCw== +"@babel/plugin-transform-dotall-regex@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz#5f8bf8a680f2116a7207e16288a5f974ad47a7a0" + integrity sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-duplicate-keys@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.1.tgz#5347a797fe82b8d09749d10e9f5b83665adbca88" - integrity sha512-msyzuUnvsjsaSaocV6L7ErfNsa5nDWL1XKNnDePLgmz+WdU4w/J8+AxBMrWfi9m4IxfL5sZQKUPQKDQeeAT6lA== +"@babel/plugin-transform-duplicate-keys@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz#dd20102897c9a2324e5adfffb67ff3610359a8ee" + integrity sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-dynamic-import@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.1.tgz#2a5a49959201970dd09a5fca856cb651e44439dd" - integrity sha512-av2gdSTyXcJVdI+8aFZsCAtR29xJt0S5tas+Ef8NvBNmD1a+N/3ecMLeMBgfcK+xzsjdLDT6oHt+DFPyeqUbDA== +"@babel/plugin-transform-dynamic-import@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz#4d8b95e3bae2b037673091aa09cd33fecd6419f4" + integrity sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-transform-exponentiation-operator@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.1.tgz#6650ebeb5bd5c012d5f5f90a26613a08162e8ba4" - integrity sha512-U1yX13dVBSwS23DEAqU+Z/PkwE9/m7QQy8Y9/+Tdb8UWYaGNDYwTLi19wqIAiROr8sXVum9A/rtiH5H0boUcTw== +"@babel/plugin-transform-exponentiation-operator@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz#b629ee22645f412024297d5245bce425c31f9b0d" + integrity sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-export-namespace-from@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.1.tgz#f033541fc036e3efb2dcb58eedafd4f6b8078acd" - integrity sha512-Ft38m/KFOyzKw2UaJFkWG9QnHPG/Q/2SkOrRk4pNBPg5IPZ+dOxcmkK5IyuBcxiNPyyYowPGUReyBvrvZs7IlQ== +"@babel/plugin-transform-export-namespace-from@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz#176d52d8d8ed516aeae7013ee9556d540c53f197" + integrity sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-transform-for-of@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.1.tgz#67448446b67ab6c091360ce3717e7d3a59e202fd" - integrity sha512-OxBdcnF04bpdQdR3i4giHZNZQn7cm8RQKcSwA17wAAqEELo1ZOwp5FFgeptWUQXFyT9kwHo10aqqauYkRZPCAg== +"@babel/plugin-transform-for-of@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz#f25b33f72df1d8be76399e1b8f3f9d366eb5bc70" + integrity sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" -"@babel/plugin-transform-function-name@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.1.tgz#8cba6f7730626cc4dfe4ca2fa516215a0592b361" - integrity sha512-BXmDZpPlh7jwicKArQASrj8n22/w6iymRnvHYYd2zO30DbE277JO20/7yXJT3QxDPtiQiOxQBbZH4TpivNXIxA== +"@babel/plugin-transform-function-name@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz#6d8601fbffe665c894440ab4470bc721dd9131d6" + integrity sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w== dependencies: - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-compilation-targets" "^7.24.7" + "@babel/helper-function-name" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-json-strings@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.1.tgz#08e6369b62ab3e8a7b61089151b161180c8299f7" - integrity sha512-U7RMFmRvoasscrIFy5xA4gIp8iWnWubnKkKuUGJjsuOH7GfbMkB+XZzeslx2kLdEGdOJDamEmCqOks6e8nv8DQ== +"@babel/plugin-transform-json-strings@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz#f3e9c37c0a373fee86e36880d45b3664cedaf73a" + integrity sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-transform-literals@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.1.tgz#0a1982297af83e6b3c94972686067df588c5c096" - integrity sha512-zn9pwz8U7nCqOYIiBaOxoQOtYmMODXTJnkxG4AtX8fPmnCRYWBOHD0qcpwS9e2VDSp1zNJYpdnFMIKb8jmwu6g== +"@babel/plugin-transform-literals@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz#36b505c1e655151a9d7607799a9988fc5467d06c" + integrity sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-logical-assignment-operators@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.1.tgz#719d8aded1aa94b8fb34e3a785ae8518e24cfa40" - integrity sha512-OhN6J4Bpz+hIBqItTeWJujDOfNP+unqv/NJgyhlpSqgBTPm37KkMmZV6SYcOj+pnDbdcl1qRGV/ZiIjX9Iy34w== +"@babel/plugin-transform-logical-assignment-operators@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz#a58fb6eda16c9dc8f9ff1c7b1ba6deb7f4694cb0" + integrity sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-transform-member-expression-literals@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.1.tgz#896d23601c92f437af8b01371ad34beb75df4489" - integrity sha512-4ojai0KysTWXzHseJKa1XPNXKRbuUrhkOPY4rEGeR+7ChlJVKxFa3H3Bz+7tWaGKgJAXUWKOGmltN+u9B3+CVg== +"@babel/plugin-transform-member-expression-literals@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz#3b4454fb0e302e18ba4945ba3246acb1248315df" + integrity sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-modules-amd@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.1.tgz#b6d829ed15258536977e9c7cc6437814871ffa39" - integrity sha512-lAxNHi4HVtjnHd5Rxg3D5t99Xm6H7b04hUS7EHIXcUl2EV4yl1gWdqZrNzXnSrHveL9qMdbODlLF55mvgjAfaQ== +"@babel/plugin-transform-modules-amd@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz#65090ed493c4a834976a3ca1cde776e6ccff32d7" + integrity sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg== dependencies: - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-module-transforms" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-modules-commonjs@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz#e71ba1d0d69e049a22bf90b3867e263823d3f1b9" - integrity sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw== +"@babel/plugin-transform-modules-commonjs@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz#9fd5f7fdadee9085886b183f1ad13d1ab260f4ab" + integrity sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ== dependencies: - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-simple-access" "^7.22.5" + "@babel/helper-module-transforms" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-simple-access" "^7.24.7" -"@babel/plugin-transform-modules-systemjs@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.1.tgz#2b9625a3d4e445babac9788daec39094e6b11e3e" - integrity sha512-mqQ3Zh9vFO1Tpmlt8QPnbwGHzNz3lpNEMxQb1kAemn/erstyqw1r9KeOlOfo3y6xAnFEcOv2tSyrXfmMk+/YZA== +"@babel/plugin-transform-modules-systemjs@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz#f8012316c5098f6e8dee6ecd58e2bc6f003d0ce7" + integrity sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw== dependencies: - "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-hoist-variables" "^7.24.7" + "@babel/helper-module-transforms" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-validator-identifier" "^7.24.7" -"@babel/plugin-transform-modules-umd@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.1.tgz#69220c66653a19cf2c0872b9c762b9a48b8bebef" - integrity sha512-tuA3lpPj+5ITfcCluy6nWonSL7RvaG0AOTeAuvXqEKS34lnLzXpDb0dcP6K8jD0zWZFNDVly90AGFJPnm4fOYg== +"@babel/plugin-transform-modules-umd@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz#edd9f43ec549099620df7df24e7ba13b5c76efc8" + integrity sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A== dependencies: - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-module-transforms" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f" - integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ== +"@babel/plugin-transform-named-capturing-groups-regex@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz#9042e9b856bc6b3688c0c2e4060e9e10b1460923" + integrity sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-new-target@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.1.tgz#29c59988fa3d0157de1c871a28cd83096363cc34" - integrity sha512-/rurytBM34hYy0HKZQyA0nHbQgQNFm4Q/BOc9Hflxi2X3twRof7NaE5W46j4kQitm7SvACVRXsa6N/tSZxvPug== +"@babel/plugin-transform-new-target@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz#31ff54c4e0555cc549d5816e4ab39241dfb6ab00" + integrity sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-nullish-coalescing-operator@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.1.tgz#0cd494bb97cb07d428bd651632cb9d4140513988" - integrity sha512-iQ+caew8wRrhCikO5DrUYx0mrmdhkaELgFa+7baMcVuhxIkN7oxt06CZ51D65ugIb1UWRQ8oQe+HXAVM6qHFjw== +"@babel/plugin-transform-nullish-coalescing-operator@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz#1de4534c590af9596f53d67f52a92f12db984120" + integrity sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-transform-numeric-separator@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.1.tgz#5bc019ce5b3435c1cadf37215e55e433d674d4e8" - integrity sha512-7GAsGlK4cNL2OExJH1DzmDeKnRv/LXq0eLUSvudrehVA5Rgg4bIrqEUW29FbKMBRT0ztSqisv7kjP+XIC4ZMNw== +"@babel/plugin-transform-numeric-separator@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz#bea62b538c80605d8a0fac9b40f48e97efa7de63" + integrity sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-transform-object-rest-spread@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.1.tgz#5a3ce73caf0e7871a02e1c31e8b473093af241ff" - integrity sha512-XjD5f0YqOtebto4HGISLNfiNMTTs6tbkFf2TOqJlYKYmbo+mN9Dnpl4SRoofiziuOWMIyq3sZEUqLo3hLITFEA== +"@babel/plugin-transform-object-rest-spread@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz#d13a2b93435aeb8a197e115221cab266ba6e55d6" + integrity sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q== dependencies: - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-compilation-targets" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.24.1" + "@babel/plugin-transform-parameters" "^7.24.7" -"@babel/plugin-transform-object-super@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.1.tgz#e71d6ab13483cca89ed95a474f542bbfc20a0520" - integrity sha512-oKJqR3TeI5hSLRxudMjFQ9re9fBVUU0GICqM3J1mi8MqlhVr6hC/ZN4ttAyMuQR6EZZIY6h/exe5swqGNNIkWQ== +"@babel/plugin-transform-object-super@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz#66eeaff7830bba945dd8989b632a40c04ed625be" + integrity sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-replace-supers" "^7.24.1" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-replace-supers" "^7.24.7" -"@babel/plugin-transform-optional-catch-binding@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.1.tgz#92a3d0efe847ba722f1a4508669b23134669e2da" - integrity sha512-oBTH7oURV4Y+3EUrf6cWn1OHio3qG/PVwO5J03iSJmBg6m2EhKjkAu/xuaXaYwWW9miYtvbWv4LNf0AmR43LUA== +"@babel/plugin-transform-optional-catch-binding@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz#00eabd883d0dd6a60c1c557548785919b6e717b4" + integrity sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-transform-optional-chaining@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz#26e588acbedce1ab3519ac40cc748e380c5291e6" - integrity sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg== +"@babel/plugin-transform-optional-chaining@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz#b8f6848a80cf2da98a8a204429bec04756c6d454" + integrity sha512-tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.1.tgz#983c15d114da190506c75b616ceb0f817afcc510" - integrity sha512-8Jl6V24g+Uw5OGPeWNKrKqXPDw2YDjLc53ojwfMcKwlEoETKU9rU0mHUtcg9JntWI/QYzGAXNWEcVHZ+fR+XXg== +"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz#5881f0ae21018400e320fc7eb817e529d1254b68" + integrity sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-private-methods@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.1.tgz#a0faa1ae87eff077e1e47a5ec81c3aef383dc15a" - integrity sha512-tGvisebwBO5em4PaYNqt4fkw56K2VALsAbAakY0FjTYqJp7gfdrgr7YX76Or8/cpik0W6+tj3rZ0uHU9Oil4tw== +"@babel/plugin-transform-private-methods@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz#e6318746b2ae70a59d023d5cc1344a2ba7a75f5e" + integrity sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ== dependencies: - "@babel/helper-create-class-features-plugin" "^7.24.1" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-class-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-private-property-in-object@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.1.tgz#756443d400274f8fb7896742962cc1b9f25c1f6a" - integrity sha512-pTHxDVa0BpUbvAgX3Gat+7cSciXqUcY9j2VZKTbSB6+VQGpNgNO9ailxTGHSXlqOnX1Hcx1Enme2+yv7VqP9bg== +"@babel/plugin-transform-private-property-in-object@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz#4eec6bc701288c1fab5f72e6a4bbc9d67faca061" + integrity sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA== dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-create-class-features-plugin" "^7.24.1" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-annotate-as-pure" "^7.24.7" + "@babel/helper-create-class-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-transform-property-literals@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.1.tgz#d6a9aeab96f03749f4eebeb0b6ea8e90ec958825" - integrity sha512-LetvD7CrHmEx0G442gOomRr66d7q8HzzGGr4PMHGr+5YIm6++Yke+jxj246rpvsbyhJwCLxcTn6zW1P1BSenqA== +"@babel/plugin-transform-property-literals@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz#f0d2ed8380dfbed949c42d4d790266525d63bbdc" + integrity sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-transform-react-constant-elements@^7.21.3": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.24.1.tgz#d493a0918b9fdad7540f5afd9b5eb5c52500d18d" - integrity sha512-QXp1U9x0R7tkiGB0FOk8o74jhnap0FlZ5gNkRIWdG3eP+SvMFg118e1zaWewDzgABb106QSKpVsD3Wgd8t6ifA== + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.24.7.tgz#b85e8f240b14400277f106c9c9b585d9acf608a1" + integrity sha512-7LidzZfUXyfZ8/buRW6qIIHBY8wAZ1OrY9c/wTr8YhZ6vMPo+Uc/CVFLYY1spZrEQlD4w5u8wjqk5NQ3OVqQKA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-react-display-name@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.1.tgz#554e3e1a25d181f040cf698b93fd289a03bfdcdb" - integrity sha512-mvoQg2f9p2qlpDQRBC7M3c3XTr0k7cp/0+kFKKO/7Gtu0LSw16eKB+Fabe2bDT/UpsyasTBBkAnbdsLrkD5XMw== +"@babel/plugin-transform-react-display-name@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.7.tgz#9caff79836803bc666bcfe210aeb6626230c293b" + integrity sha512-H/Snz9PFxKsS1JLI4dJLtnJgCJRoo0AUm3chP6NYr+9En1JMKloheEiLIhlp5MDVznWo+H3AAC1Mc8lmUEpsgg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-react-jsx-development@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz#e716b6edbef972a92165cd69d92f1255f7e73e87" - integrity sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A== +"@babel/plugin-transform-react-jsx-development@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.24.7.tgz#eaee12f15a93f6496d852509a850085e6361470b" + integrity sha512-QG9EnzoGn+Qar7rxuW+ZOsbWOt56FvvI93xInqsZDC5fsekx1AlIO4KIJ5M+D0p0SqSH156EpmZyXq630B8OlQ== dependencies: - "@babel/plugin-transform-react-jsx" "^7.22.5" + "@babel/plugin-transform-react-jsx" "^7.24.7" -"@babel/plugin-transform-react-jsx@^7.22.5", "@babel/plugin-transform-react-jsx@^7.23.4": - version "7.23.4" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz#393f99185110cea87184ea47bcb4a7b0c2e39312" - integrity sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA== +"@babel/plugin-transform-react-jsx@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.24.7.tgz#17cd06b75a9f0e2bd076503400e7c4b99beedac4" + integrity sha512-+Dj06GDZEFRYvclU6k4bme55GKBEWUmByM/eoKuqg4zTNQHiApWRhQph5fxQB2wAEFvRzL1tOEj1RJ19wJrhoA== dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-jsx" "^7.23.3" - "@babel/types" "^7.23.4" + "@babel/helper-annotate-as-pure" "^7.24.7" + "@babel/helper-module-imports" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/plugin-syntax-jsx" "^7.24.7" + "@babel/types" "^7.24.7" -"@babel/plugin-transform-react-pure-annotations@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.1.tgz#c86bce22a53956331210d268e49a0ff06e392470" - integrity sha512-+pWEAaDJvSm9aFvJNpLiM2+ktl2Sn2U5DdyiWdZBxmLc6+xGt88dvFqsHiAiDS+8WqUwbDfkKz9jRxK3M0k+kA== +"@babel/plugin-transform-react-pure-annotations@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.7.tgz#bdd9d140d1c318b4f28b29a00fb94f97ecab1595" + integrity sha512-PLgBVk3fzbmEjBJ/u8kFzOqS9tUeDjiaWud/rRym/yjCo/M9cASPlnrd2ZmmZpQT40fOOrvR8jh+n8jikrOhNA== dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-annotate-as-pure" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-regenerator@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.1.tgz#625b7545bae52363bdc1fbbdc7252b5046409c8c" - integrity sha512-sJwZBCzIBE4t+5Q4IGLaaun5ExVMRY0lYwos/jNecjMrVCygCdph3IKv0tkP5Fc87e/1+bebAmEAGBfnRD+cnw== +"@babel/plugin-transform-regenerator@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz#021562de4534d8b4b1851759fd7af4e05d2c47f8" + integrity sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" regenerator-transform "^0.15.2" -"@babel/plugin-transform-reserved-words@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.1.tgz#8de729f5ecbaaf5cf83b67de13bad38a21be57c1" - integrity sha512-JAclqStUfIwKN15HrsQADFgeZt+wexNQ0uLhuqvqAUFoqPMjEcFCYZBhq0LUdz6dZK/mD+rErhW71fbx8RYElg== +"@babel/plugin-transform-reserved-words@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz#80037fe4fbf031fc1125022178ff3938bb3743a4" + integrity sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-transform-runtime@^7.22.15": - version "7.24.3" - resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.3.tgz#dc58ad4a31810a890550365cc922e1ff5acb5d7f" - integrity sha512-J0BuRPNlNqlMTRJ72eVptpt9VcInbxO6iP3jaxr+1NPhC0UkKL+6oeX6VXMEYdADnuqmMmsBspt4d5w8Y/TCbQ== + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz#00a5bfaf8c43cf5c8703a8a6e82b59d9c58f38ca" + integrity sha512-YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw== dependencies: - "@babel/helper-module-imports" "^7.24.3" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-module-imports" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" babel-plugin-polyfill-corejs2 "^0.4.10" babel-plugin-polyfill-corejs3 "^0.10.1" babel-plugin-polyfill-regenerator "^0.6.1" semver "^6.3.1" -"@babel/plugin-transform-shorthand-properties@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz#ba9a09144cf55d35ec6b93a32253becad8ee5b55" - integrity sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA== +"@babel/plugin-transform-shorthand-properties@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz#85448c6b996e122fa9e289746140aaa99da64e73" + integrity sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-spread@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.1.tgz#a1acf9152cbf690e4da0ba10790b3ac7d2b2b391" - integrity sha512-KjmcIM+fxgY+KxPVbjelJC6hrH1CgtPmTvdXAfn3/a9CnWGSTY7nH4zm5+cjmWJybdcPSsD0++QssDsjcpe47g== +"@babel/plugin-transform-spread@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz#e8a38c0fde7882e0fb8f160378f74bd885cc7bb3" + integrity sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" -"@babel/plugin-transform-sticky-regex@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.1.tgz#f03e672912c6e203ed8d6e0271d9c2113dc031b9" - integrity sha512-9v0f1bRXgPVcPrngOQvLXeGNNVLc8UjMVfebo9ka0WF3/7+aVUHmaJVT3sa0XCzEFioPfPHZiOcYG9qOsH63cw== +"@babel/plugin-transform-sticky-regex@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz#96ae80d7a7e5251f657b5cf18f1ea6bf926f5feb" + integrity sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-template-literals@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz#15e2166873a30d8617e3e2ccadb86643d327aab7" - integrity sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g== +"@babel/plugin-transform-template-literals@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz#a05debb4a9072ae8f985bcf77f3f215434c8f8c8" + integrity sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-typeof-symbol@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.1.tgz#6831f78647080dec044f7e9f68003d99424f94c7" - integrity sha512-CBfU4l/A+KruSUoW+vTQthwcAdwuqbpRNB8HQKlZABwHRhsdHZ9fezp4Sn18PeAlYxTNiLMlx4xUBV3AWfg1BA== +"@babel/plugin-transform-typeof-symbol@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz#f074be466580d47d6e6b27473a840c9f9ca08fb0" + integrity sha512-VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-typescript@^7.24.1": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.4.tgz#03e0492537a4b953e491f53f2bc88245574ebd15" - integrity sha512-79t3CQ8+oBGk/80SQ8MN3Bs3obf83zJ0YZjDmDaEZN8MqhMI760apl5z6a20kFeMXBwJX99VpKT8CKxEBp5H1g== +"@babel/plugin-transform-typescript@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.7.tgz#b006b3e0094bf0813d505e0c5485679eeaf4a881" + integrity sha512-iLD3UNkgx2n/HrjBesVbYX6j0yqn/sJktvbtKKgcaLIQ4bTTQ8obAypc1VpyHPD2y4Phh9zHOaAt8e/L14wCpw== dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-create-class-features-plugin" "^7.24.4" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/plugin-syntax-typescript" "^7.24.1" + "@babel/helper-annotate-as-pure" "^7.24.7" + "@babel/helper-create-class-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/plugin-syntax-typescript" "^7.24.7" -"@babel/plugin-transform-unicode-escapes@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.1.tgz#fb3fa16676549ac7c7449db9b342614985c2a3a4" - integrity sha512-RlkVIcWT4TLI96zM660S877E7beKlQw7Ig+wqkKBiWfj0zH5Q4h50q6er4wzZKRNSYpfo6ILJ+hrJAGSX2qcNw== +"@babel/plugin-transform-unicode-escapes@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz#2023a82ced1fb4971630a2e079764502c4148e0e" + integrity sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-unicode-property-regex@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.1.tgz#56704fd4d99da81e5e9f0c0c93cabd91dbc4889e" - integrity sha512-Ss4VvlfYV5huWApFsF8/Sq0oXnGO+jB+rijFEFugTd3cwSObUSnUi88djgR5528Csl0uKlrI331kRqe56Ov2Ng== +"@babel/plugin-transform-unicode-property-regex@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz#9073a4cd13b86ea71c3264659590ac086605bbcd" + integrity sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-unicode-regex@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.1.tgz#57c3c191d68f998ac46b708380c1ce4d13536385" - integrity sha512-2A/94wgZgxfTsiLaQ2E36XAOdcZmGAaEEgVmxQWwZXWkGhvoHbaqXcKnU8zny4ycpu3vNqg0L/PcCiYtHtA13g== +"@babel/plugin-transform-unicode-regex@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz#dfc3d4a51127108099b19817c0963be6a2adf19f" + integrity sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-unicode-sets-regex@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.1.tgz#c1ea175b02afcffc9cf57a9c4658326625165b7f" - integrity sha512-fqj4WuzzS+ukpgerpAoOnMfQXwUHFxXUZUE84oL2Kao2N8uSlvcpnAidKASgsNgzZHBsHWvcm8s9FPWUhAb8fA== +"@babel/plugin-transform-unicode-sets-regex@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz#d40705d67523803a576e29c63cef6e516b858ed9" + integrity sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/preset-env@^7.10.2", "@babel/preset-env@^7.20.2": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.4.tgz#46dbbcd608771373b88f956ffb67d471dce0d23b" - integrity sha512-7Kl6cSmYkak0FK/FXjSEnLJ1N9T/WA2RkMhu17gZ/dsxKJUuTYNIylahPTzqpLyJN4WhDif8X0XK1R8Wsguo/A== + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.7.tgz#ff067b4e30ba4a72f225f12f123173e77b987f37" + integrity sha512-1YZNsc+y6cTvWlDHidMBsQZrZfEFjRIo/BZCT906PMdzOyXtSLTgqGdrpcuTDCXyd11Am5uQULtDIcCfnTc8fQ== dependencies: - "@babel/compat-data" "^7.24.4" - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-validator-option" "^7.23.5" - "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.24.4" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.24.1" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.1" - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.24.1" + "@babel/compat-data" "^7.24.7" + "@babel/helper-compilation-targets" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-validator-option" "^7.24.7" + "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.24.7" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.24.7" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.7" + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.24.7" "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-import-assertions" "^7.24.1" - "@babel/plugin-syntax-import-attributes" "^7.24.1" + "@babel/plugin-syntax-import-assertions" "^7.24.7" + "@babel/plugin-syntax-import-attributes" "^7.24.7" "@babel/plugin-syntax-import-meta" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.3" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" @@ -969,54 +971,54 @@ "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-syntax-top-level-await" "^7.14.5" "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" - "@babel/plugin-transform-arrow-functions" "^7.24.1" - "@babel/plugin-transform-async-generator-functions" "^7.24.3" - "@babel/plugin-transform-async-to-generator" "^7.24.1" - "@babel/plugin-transform-block-scoped-functions" "^7.24.1" - "@babel/plugin-transform-block-scoping" "^7.24.4" - "@babel/plugin-transform-class-properties" "^7.24.1" - "@babel/plugin-transform-class-static-block" "^7.24.4" - "@babel/plugin-transform-classes" "^7.24.1" - "@babel/plugin-transform-computed-properties" "^7.24.1" - "@babel/plugin-transform-destructuring" "^7.24.1" - "@babel/plugin-transform-dotall-regex" "^7.24.1" - "@babel/plugin-transform-duplicate-keys" "^7.24.1" - "@babel/plugin-transform-dynamic-import" "^7.24.1" - "@babel/plugin-transform-exponentiation-operator" "^7.24.1" - "@babel/plugin-transform-export-namespace-from" "^7.24.1" - "@babel/plugin-transform-for-of" "^7.24.1" - "@babel/plugin-transform-function-name" "^7.24.1" - "@babel/plugin-transform-json-strings" "^7.24.1" - "@babel/plugin-transform-literals" "^7.24.1" - "@babel/plugin-transform-logical-assignment-operators" "^7.24.1" - "@babel/plugin-transform-member-expression-literals" "^7.24.1" - "@babel/plugin-transform-modules-amd" "^7.24.1" - "@babel/plugin-transform-modules-commonjs" "^7.24.1" - "@babel/plugin-transform-modules-systemjs" "^7.24.1" - "@babel/plugin-transform-modules-umd" "^7.24.1" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5" - "@babel/plugin-transform-new-target" "^7.24.1" - "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.1" - "@babel/plugin-transform-numeric-separator" "^7.24.1" - "@babel/plugin-transform-object-rest-spread" "^7.24.1" - "@babel/plugin-transform-object-super" "^7.24.1" - "@babel/plugin-transform-optional-catch-binding" "^7.24.1" - "@babel/plugin-transform-optional-chaining" "^7.24.1" - "@babel/plugin-transform-parameters" "^7.24.1" - "@babel/plugin-transform-private-methods" "^7.24.1" - "@babel/plugin-transform-private-property-in-object" "^7.24.1" - "@babel/plugin-transform-property-literals" "^7.24.1" - "@babel/plugin-transform-regenerator" "^7.24.1" - "@babel/plugin-transform-reserved-words" "^7.24.1" - "@babel/plugin-transform-shorthand-properties" "^7.24.1" - "@babel/plugin-transform-spread" "^7.24.1" - "@babel/plugin-transform-sticky-regex" "^7.24.1" - "@babel/plugin-transform-template-literals" "^7.24.1" - "@babel/plugin-transform-typeof-symbol" "^7.24.1" - "@babel/plugin-transform-unicode-escapes" "^7.24.1" - "@babel/plugin-transform-unicode-property-regex" "^7.24.1" - "@babel/plugin-transform-unicode-regex" "^7.24.1" - "@babel/plugin-transform-unicode-sets-regex" "^7.24.1" + "@babel/plugin-transform-arrow-functions" "^7.24.7" + "@babel/plugin-transform-async-generator-functions" "^7.24.7" + "@babel/plugin-transform-async-to-generator" "^7.24.7" + "@babel/plugin-transform-block-scoped-functions" "^7.24.7" + "@babel/plugin-transform-block-scoping" "^7.24.7" + "@babel/plugin-transform-class-properties" "^7.24.7" + "@babel/plugin-transform-class-static-block" "^7.24.7" + "@babel/plugin-transform-classes" "^7.24.7" + "@babel/plugin-transform-computed-properties" "^7.24.7" + "@babel/plugin-transform-destructuring" "^7.24.7" + "@babel/plugin-transform-dotall-regex" "^7.24.7" + "@babel/plugin-transform-duplicate-keys" "^7.24.7" + "@babel/plugin-transform-dynamic-import" "^7.24.7" + "@babel/plugin-transform-exponentiation-operator" "^7.24.7" + "@babel/plugin-transform-export-namespace-from" "^7.24.7" + "@babel/plugin-transform-for-of" "^7.24.7" + "@babel/plugin-transform-function-name" "^7.24.7" + "@babel/plugin-transform-json-strings" "^7.24.7" + "@babel/plugin-transform-literals" "^7.24.7" + "@babel/plugin-transform-logical-assignment-operators" "^7.24.7" + "@babel/plugin-transform-member-expression-literals" "^7.24.7" + "@babel/plugin-transform-modules-amd" "^7.24.7" + "@babel/plugin-transform-modules-commonjs" "^7.24.7" + "@babel/plugin-transform-modules-systemjs" "^7.24.7" + "@babel/plugin-transform-modules-umd" "^7.24.7" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.24.7" + "@babel/plugin-transform-new-target" "^7.24.7" + "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.7" + "@babel/plugin-transform-numeric-separator" "^7.24.7" + "@babel/plugin-transform-object-rest-spread" "^7.24.7" + "@babel/plugin-transform-object-super" "^7.24.7" + "@babel/plugin-transform-optional-catch-binding" "^7.24.7" + "@babel/plugin-transform-optional-chaining" "^7.24.7" + "@babel/plugin-transform-parameters" "^7.24.7" + "@babel/plugin-transform-private-methods" "^7.24.7" + "@babel/plugin-transform-private-property-in-object" "^7.24.7" + "@babel/plugin-transform-property-literals" "^7.24.7" + "@babel/plugin-transform-regenerator" "^7.24.7" + "@babel/plugin-transform-reserved-words" "^7.24.7" + "@babel/plugin-transform-shorthand-properties" "^7.24.7" + "@babel/plugin-transform-spread" "^7.24.7" + "@babel/plugin-transform-sticky-regex" "^7.24.7" + "@babel/plugin-transform-template-literals" "^7.24.7" + "@babel/plugin-transform-typeof-symbol" "^7.24.7" + "@babel/plugin-transform-unicode-escapes" "^7.24.7" + "@babel/plugin-transform-unicode-property-regex" "^7.24.7" + "@babel/plugin-transform-unicode-regex" "^7.24.7" + "@babel/plugin-transform-unicode-sets-regex" "^7.24.7" "@babel/preset-modules" "0.1.6-no-external-plugins" babel-plugin-polyfill-corejs2 "^0.4.10" babel-plugin-polyfill-corejs3 "^0.10.4" @@ -1034,72 +1036,72 @@ esutils "^2.0.2" "@babel/preset-react@^7.12.13", "@babel/preset-react@^7.18.6": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.24.1.tgz#2450c2ac5cc498ef6101a6ca5474de251e33aa95" - integrity sha512-eFa8up2/8cZXLIpkafhaADTXSnl7IsUFCYenRWrARBz0/qZwcT0RBXpys0LJU4+WfPoF2ZG6ew6s2V6izMCwRA== + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.24.7.tgz#480aeb389b2a798880bf1f889199e3641cbb22dc" + integrity sha512-AAH4lEkpmzFWrGVlHaxJB7RLH21uPQ9+He+eFLWHmF9IuFQVugz8eAsamaW0DXRrTfco5zj1wWtpdcXJUOfsag== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-validator-option" "^7.23.5" - "@babel/plugin-transform-react-display-name" "^7.24.1" - "@babel/plugin-transform-react-jsx" "^7.23.4" - "@babel/plugin-transform-react-jsx-development" "^7.22.5" - "@babel/plugin-transform-react-pure-annotations" "^7.24.1" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-validator-option" "^7.24.7" + "@babel/plugin-transform-react-display-name" "^7.24.7" + "@babel/plugin-transform-react-jsx" "^7.24.7" + "@babel/plugin-transform-react-jsx-development" "^7.24.7" + "@babel/plugin-transform-react-pure-annotations" "^7.24.7" -"@babel/preset-typescript@^7.21.0", "@babel/preset-typescript@^7.22.5": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.1.tgz#89bdf13a3149a17b3b2a2c9c62547f06db8845ec" - integrity sha512-1DBaMmRDpuYQBPWD8Pf/WEwCrtgRHxsZnP4mIy9G/X+hFfbI47Q2G4t1Paakld84+qsk2fSsUPMKg71jkoOOaQ== +"@babel/preset-typescript@^7.21.0", "@babel/preset-typescript@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.7.tgz#66cd86ea8f8c014855671d5ea9a737139cbbfef1" + integrity sha512-SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-validator-option" "^7.23.5" - "@babel/plugin-syntax-jsx" "^7.24.1" - "@babel/plugin-transform-modules-commonjs" "^7.24.1" - "@babel/plugin-transform-typescript" "^7.24.1" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-validator-option" "^7.24.7" + "@babel/plugin-syntax-jsx" "^7.24.7" + "@babel/plugin-transform-modules-commonjs" "^7.24.7" + "@babel/plugin-transform-typescript" "^7.24.7" "@babel/regjsgen@^0.8.0": version "0.8.0" resolved "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.4", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.4.tgz#de795accd698007a66ba44add6cc86542aff1edd" - integrity sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA== +"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.6", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12" + integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw== dependencies: regenerator-runtime "^0.14.0" -"@babel/template@^7.22.15", "@babel/template@^7.24.0", "@babel/template@^7.3.3": - version "7.24.0" - resolved "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50" - integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA== +"@babel/template@^7.24.7", "@babel/template@^7.3.3": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz#02efcee317d0609d2c07117cb70ef8fb17ab7315" + integrity sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig== dependencies: - "@babel/code-frame" "^7.23.5" - "@babel/parser" "^7.24.0" - "@babel/types" "^7.24.0" + "@babel/code-frame" "^7.24.7" + "@babel/parser" "^7.24.7" + "@babel/types" "^7.24.7" -"@babel/traverse@^7.24.1", "@babel/traverse@^7.4.5": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c" - integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ== +"@babel/traverse@^7.24.7", "@babel/traverse@^7.4.5": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz#de2b900163fa741721ba382163fe46a936c40cf5" + integrity sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA== dependencies: - "@babel/code-frame" "^7.24.1" - "@babel/generator" "^7.24.1" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.24.1" - "@babel/types" "^7.24.0" + "@babel/code-frame" "^7.24.7" + "@babel/generator" "^7.24.7" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-function-name" "^7.24.7" + "@babel/helper-hoist-variables" "^7.24.7" + "@babel/helper-split-export-declaration" "^7.24.7" + "@babel/parser" "^7.24.7" + "@babel/types" "^7.24.7" debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.24.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.8.3": - version "7.24.0" - resolved "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf" - integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w== +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.24.7", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.8.3": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2" + integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q== dependencies: - "@babel/helper-string-parser" "^7.23.4" - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-string-parser" "^7.24.7" + "@babel/helper-validator-identifier" "^7.24.7" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -1108,9 +1110,9 @@ integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== "@codemirror/autocomplete@^6.0.0": - version "6.16.0" - resolved "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.16.0.tgz#595eb30099ba91a835ed65ed8ff7497388f604b3" - integrity sha512-P/LeCTtZHRTCU4xQsa89vSKWecYv1ZqwzOd5topheGRf+qtacFgBeIMQi3eL8Kt/BUNvxUWkx+5qP2jlGoARrg== + version "6.16.2" + resolved "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.16.2.tgz#ac4e191cd599503e45f35e97366b432d30b8f37a" + integrity sha512-MjfDrHy0gHKlPWsvSsikhO1+BOh+eBHNgfH1OXs1+DAf30IonQldgMM3kxLDTG9ktE7kDLaA1j/l7KMPA4KNfw== dependencies: "@codemirror/language" "^6.0.0" "@codemirror/state" "^6.0.0" @@ -1118,19 +1120,19 @@ "@lezer/common" "^1.0.0" "@codemirror/commands@^6.0.0": - version "6.4.0" - resolved "https://registry.npmjs.org/@codemirror/commands/-/commands-6.4.0.tgz#be4538b98b9f4f6f2f43a178622be6540be5a18a" - integrity sha512-HB3utD5GxCvEhSyj5EuG9KpuQQhFpxalh3lwrspyL/GeSNDe4c6JDxVzL12SJ+7gUknHjZzmq7OPCb9QPgiRmQ== + version "6.6.0" + resolved "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.0.tgz#d308f143fe1b8896ca25fdb855f66acdaf019dd4" + integrity sha512-qnY+b7j1UNcTS31Eenuc/5YJB6gQOzkUoNmJQc0rznwqSRpeaWWpjkWy2C/MPTcePpsKJEM26hXrOXl1+nceXg== dependencies: "@codemirror/language" "^6.0.0" "@codemirror/state" "^6.4.0" - "@codemirror/view" "^6.0.0" + "@codemirror/view" "^6.27.0" "@lezer/common" "^1.1.0" -"@codemirror/lang-sql@^6.6.3": - version "6.6.3" - resolved "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.6.3.tgz#627cb54c91e1df376f7be4f97e6922195a9d6537" - integrity sha512-fo5i3OD/7TmmqMtKycC4OaqfPsRxk0sKOb35g8cOtyUyyI2hfP2qXkDc7Asb6h7BiJK+MU/DYVPnQm6iNB5ZTw== +"@codemirror/lang-sql@^6.6.5": + version "6.6.5" + resolved "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.6.5.tgz#696c7e7bbc0b4ab2b40794fa5b3edbeb7e4dd4c8" + integrity sha512-noy8Hp+4rng6HM0647hvN5hXVefd9o6tar+9p/vV7pj14zsRBaVQvtl6w7cLs1dGPllSsDmnN8R+gAsjnEs6mA== dependencies: "@codemirror/autocomplete" "^6.0.0" "@codemirror/language" "^6.0.0" @@ -1140,9 +1142,9 @@ "@lezer/lr" "^1.0.0" "@codemirror/language@^6.0.0": - version "6.10.1" - resolved "https://registry.npmjs.org/@codemirror/language/-/language-6.10.1.tgz#428c932a158cb75942387acfe513c1ece1090b05" - integrity sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ== + version "6.10.2" + resolved "https://registry.npmjs.org/@codemirror/language/-/language-6.10.2.tgz#4056dc219619627ffe995832eeb09cea6060be61" + integrity sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA== dependencies: "@codemirror/state" "^6.0.0" "@codemirror/view" "^6.23.0" @@ -1152,9 +1154,9 @@ style-mod "^4.0.0" "@codemirror/lint@^6.0.0": - version "6.5.0" - resolved "https://registry.npmjs.org/@codemirror/lint/-/lint-6.5.0.tgz#ea43b6e653dcc5bcd93456b55e9fe62e63f326d9" - integrity sha512-+5YyicIaaAZKU8K43IQi8TBy6mF6giGeWAH7N96Z5LC30Wm5JMjqxOYIE9mxwMG1NbhT2mA3l9hA4uuKUM3E5g== + version "6.8.0" + resolved "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.0.tgz#cf9067c7041c1f6c9f20bab411dac9323aab54f0" + integrity sha512-lsFofvaw0lnPRJlQylNsC4IRt/1lI4OD/yYslrSGVndOJfStc58v+8p9dgGiD90ktOfL7OhBWns1ZETYgz0EJA== dependencies: "@codemirror/state" "^6.0.0" "@codemirror/view" "^6.0.0" @@ -1174,10 +1176,10 @@ resolved "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz#da57143695c056d9a3c38705ed34136e2b68171b" integrity sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A== -"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0": - version "6.26.3" - resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.26.3.tgz#47aebd49a6ee3c8d36b82046d3bffe6056b8039f" - integrity sha512-gmqxkPALZjkgSxIeeweY/wGQXBfwTUaLs8h7OKtSwfbj9Ct3L11lD+u1sS7XHppxFQoMDiMDp07P9f3I2jWOHw== +"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0": + version "6.27.0" + resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.27.0.tgz#829882b171106bc50b4f17b7e5d2f7277832c92f" + integrity sha512-8kqX1sHbVW1lVzWwrjAbh4dR7eKhV8eIQ952JKaBXOoXE04WncoqCy4DMU701LSrPZ3N2Q4zsTawz7GQ+2mrUw== dependencies: "@codemirror/state" "^6.4.0" style-mod "^4.1.0" @@ -1389,17 +1391,17 @@ resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz#d0fce5d07b0620caa282b5131c297bb60f9d87e6" integrity sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww== -"@eslint-community/eslint-utils@^4.2.0": +"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== dependencies: eslint-visitor-keys "^3.3.0" -"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1": - version "4.10.0" - resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" - integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== +"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1": + version "4.10.1" + resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.1.tgz#361461e5cb3845d874e61731c11cfedd664d83a0" + integrity sha512-Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA== "@eslint/eslintrc@^2.1.4": version "2.1.4" @@ -1422,31 +1424,31 @@ integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== "@floating-ui/core@^1.0.0": - version "1.6.0" - resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.0.tgz#fa41b87812a16bf123122bf945946bae3fdf7fc1" - integrity sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g== + version "1.6.2" + resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.2.tgz#d37f3e0ac1f1c756c7de45db13303a266226851a" + integrity sha512-+2XpQV9LLZeanU4ZevzRnGFg2neDeKHgFLjP6YLW+tly0IvrhqT4u8enLGjLH3qeh85g19xY5rsAusfwTdn5lg== dependencies: - "@floating-ui/utils" "^0.2.1" + "@floating-ui/utils" "^0.2.0" -"@floating-ui/dom@^1.0.1", "@floating-ui/dom@^1.6.1": - version "1.6.3" - resolved "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz#954e46c1dd3ad48e49db9ada7218b0985cee75ef" - integrity sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw== +"@floating-ui/dom@^1.0.0", "@floating-ui/dom@^1.0.1": + version "1.6.5" + resolved "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.5.tgz#323f065c003f1d3ecf0ff16d2c2c4d38979f4cb9" + integrity sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw== dependencies: "@floating-ui/core" "^1.0.0" "@floating-ui/utils" "^0.2.0" "@floating-ui/react-dom@^2.0.8": - version "2.0.8" - resolved "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.8.tgz#afc24f9756d1b433e1fe0d047c24bd4d9cefaa5d" - integrity sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw== + version "2.1.0" + resolved "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.0.tgz#4f0e5e9920137874b2405f7d6c862873baf4beff" + integrity sha512-lNzj5EQmEKn5FFKc04+zasr09h/uX8RtJRNj5gUXsSQIXHVWTVh+hVAg1vOMCexkX8EgvemMvIFpQfkosnVNyA== dependencies: - "@floating-ui/dom" "^1.6.1" + "@floating-ui/dom" "^1.0.0" -"@floating-ui/utils@^0.2.0", "@floating-ui/utils@^0.2.1": - version "0.2.1" - resolved "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz#16308cea045f0fc777b6ff20a9f25474dd8293d2" - integrity sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q== +"@floating-ui/utils@^0.2.0": + version "0.2.2" + resolved "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.2.tgz#d8bae93ac8b815b2bd7a98078cf91e2724ef11e5" + integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw== "@fortawesome/fontawesome-free@latest": version "6.5.2" @@ -1750,9 +1752,9 @@ "@lezer/common" "^1.0.0" "@lezer/lr@^1.0.0": - version "1.4.0" - resolved "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.0.tgz#ed52a75dbbfbb0d1eb63710ea84c35ee647cb67e" - integrity sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg== + version "1.4.1" + resolved "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.1.tgz#fe25f051880a754e820b28148d90aa2a96b8bdd2" + integrity sha512-CHsKq8DMKBf9b3yXPDIU4DbH+ZJd/sJdYOW2llbW/HudP5u0VS6Bfq1hLYfgU7uAYGFIyGGQIsSOXGPEErZiJw== dependencies: "@lezer/common" "^1.0.0" @@ -1770,27 +1772,27 @@ prop-types "^15.8.1" "@mui/base@^5.0.0-beta.22": - version "5.0.0-beta.42" - resolved "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.42.tgz#d70fb479c57a60ce080d0700fe137db8686abe3e" - integrity sha512-fWRiUJVCHCPF+mxd5drn08bY2qRw3jj5f1SSQdUXmaJ/yKpk23ys8MgLO2KGVTRtbks/+ctRfgffGPbXifj0Ug== + version "5.0.0-dev.20240529-082515-213b5e33ab" + resolved "https://registry.npmjs.org/@mui/base/-/base-5.0.0-dev.20240529-082515-213b5e33ab.tgz#e9a916677dab38ffc92c3171f7d96bf300790531" + integrity sha512-3ic6fc6BHstgM+MGqJEVx3zt9g5THxVXm3VVFUfdeplPqAWWgW2QoKfZDLT10s+pi+MAkpgEBP0kgRidf81Rsw== dependencies: - "@babel/runtime" "^7.24.4" + "@babel/runtime" "^7.24.6" "@floating-ui/react-dom" "^2.0.8" - "@mui/types" "^7.2.14" - "@mui/utils" "^6.0.0-alpha.1" + "@mui/types" "^7.2.14-dev.20240529-082515-213b5e33ab" + "@mui/utils" "^6.0.0-dev.20240529-082515-213b5e33ab" "@popperjs/core" "^2.11.8" - clsx "^2.1.0" + clsx "^2.1.1" prop-types "^15.8.1" -"@mui/core-downloads-tracker@^5.15.15": - version "5.15.15" - resolved "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.15.15.tgz#2bc2bda50db66c12f10aefec907c48c8f669ef59" - integrity sha512-aXnw29OWQ6I5A47iuWEI6qSSUfH6G/aCsW9KmW3LiFqr7uXZBK4Ks+z8G+qeIub8k0T5CMqlT2q0L+ZJTMrqpg== +"@mui/core-downloads-tracker@^5.15.19": + version "5.15.19" + resolved "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.15.19.tgz#7af0025c871f126367a55219486681954e4821d7" + integrity sha512-tCHSi/Tomez9ERynFhZRvFO6n9ATyrPs+2N80DMDzp6xDVirbBjEwhPcE+x7Lj+nwYw0SqFkOxyvMP0irnm55w== "@mui/icons-material@^5.15.10": - version "5.15.15" - resolved "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.15.tgz#84ce08225a531d9f5dc5132009d91164b456a0ae" - integrity sha512-kkeU/pe+hABcYDH6Uqy8RmIsr2S/y5bP2rp+Gat4CcRjCcVne6KudS1NrZQhUCRysrTDCAhcbcf9gt+/+pGO2g== + version "5.15.19" + resolved "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.19.tgz#0602da80d814af662812659eab891e435ec0d5c0" + integrity sha512-RsEiRxA5azN9b8gI7JRqekkgvxQUlitoBOtZglflb8cUDyP12/cP4gRwhb44Ea1/zwwGGjAj66ZJpGHhKfibNA== dependencies: "@babel/runtime" "^7.23.9" @@ -1808,13 +1810,13 @@ prop-types "^15.8.1" "@mui/material@^5.15.10": - version "5.15.15" - resolved "https://registry.npmjs.org/@mui/material/-/material-5.15.15.tgz#e3ba35f50b510aa677cec3261abddc2db7b20b59" - integrity sha512-3zvWayJ+E1kzoIsvwyEvkTUKVKt1AjchFFns+JtluHCuvxgKcLSRJTADw37k0doaRtVAsyh8bz9Afqzv+KYrIA== + version "5.15.19" + resolved "https://registry.npmjs.org/@mui/material/-/material-5.15.19.tgz#a5bd50b6e68cee4ed39ea91dbecede5a020aaa97" + integrity sha512-lp5xQBbcRuxNtjpWU0BWZgIrv2XLUz4RJ0RqFXBdESIsKoGCQZ6P3wwU5ZPuj5TjssNiKv9AlM+vHopRxZhvVQ== dependencies: "@babel/runtime" "^7.23.9" "@mui/base" "5.0.0-beta.40" - "@mui/core-downloads-tracker" "^5.15.15" + "@mui/core-downloads-tracker" "^5.15.19" "@mui/system" "^5.15.15" "@mui/types" "^7.2.14" "@mui/utils" "^5.15.14" @@ -1844,29 +1846,6 @@ csstype "^3.1.3" prop-types "^15.8.1" -"@mui/styles@^5.15.10": - version "5.15.15" - resolved "https://registry.npmjs.org/@mui/styles/-/styles-5.15.15.tgz#cfc974657882cb60c6017d57d81f133d8b5e51a1" - integrity sha512-KBklDHNEddodEjcnZ+/3ieVcp+Mb/pzdQzAagUpt4RDd9m/mn+2JkqJh2rnrWUwS//YLsbL3IbUrONYn5yPxfQ== - dependencies: - "@babel/runtime" "^7.23.9" - "@emotion/hash" "^0.9.1" - "@mui/private-theming" "^5.15.14" - "@mui/types" "^7.2.14" - "@mui/utils" "^5.15.14" - clsx "^2.1.0" - csstype "^3.1.3" - hoist-non-react-statics "^3.3.2" - jss "^10.10.0" - jss-plugin-camel-case "^10.10.0" - jss-plugin-default-unit "^10.10.0" - jss-plugin-global "^10.10.0" - jss-plugin-nested "^10.10.0" - jss-plugin-props-sort "^10.10.0" - jss-plugin-rule-value-function "^10.10.0" - jss-plugin-vendor-prefixer "^10.10.0" - prop-types "^15.8.1" - "@mui/system@^5.15.15": version "5.15.15" resolved "https://registry.npmjs.org/@mui/system/-/system-5.15.15.tgz#658771b200ce3c4a0f28e58169f02e5e718d1c53" @@ -1881,7 +1860,7 @@ csstype "^3.1.3" prop-types "^15.8.1" -"@mui/types@^7.2.14": +"@mui/types@^7.2.14", "@mui/types@^7.2.14-dev.20240529-082515-213b5e33ab": version "7.2.14" resolved "https://registry.npmjs.org/@mui/types/-/types-7.2.14.tgz#8a02ac129b70f3d82f2f9b76ded2c8d48e3fc8c9" integrity sha512-MZsBZ4q4HfzBsywtXgM1Ksj6HDThtiwmOKUXH1pKYISI9gAVXCNHNpo7TlGoGrBaYWZTdNoirIN7JsQcQUjmQQ== @@ -1896,20 +1875,20 @@ prop-types "^15.8.1" react-is "^18.2.0" -"@mui/utils@^6.0.0-alpha.1": - version "6.0.0-alpha.3" - resolved "https://registry.npmjs.org/@mui/utils/-/utils-6.0.0-alpha.3.tgz#c83ad4aed65298cd0128eb47cc00d904f157b62b" - integrity sha512-DBuCy0LmpKFBX6KcZpNve8T3oZmbdZABN0ixJIvDRdoxTG86divvx1CcA71YJojZD3FhRWb0d/XxtMAzn4qIvg== +"@mui/utils@^6.0.0-dev.20240529-082515-213b5e33ab": + version "6.0.0-dev.20240529-082515-213b5e33ab" + resolved "https://registry.npmjs.org/@mui/utils/-/utils-6.0.0-dev.20240529-082515-213b5e33ab.tgz#085d02079d9f12baa25f620d314ec2aed4b43ab7" + integrity sha512-jyNcB0drDhYcoq5MHNTiEc63GfVE1GZK+CVUd8tlLzk5q631RPYJ5jONSOszLiUOXBmI8Uu1SBJUwrG3j2YG2A== dependencies: - "@babel/runtime" "^7.24.4" + "@babel/runtime" "^7.24.6" "@types/prop-types" "^15.7.12" prop-types "^15.8.1" react-is "^18.2.0" "@mui/x-date-pickers@^6.19.7": - version "6.19.9" - resolved "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-6.19.9.tgz#5fb7ecbeec5b5ce1fddbb547583d0083e30a845b" - integrity sha512-B2m4Fv/fOme5qmV6zuE3QnWQSvj3zKtI2OvikPz5prpiCcIxqpeytkQ7VfrWH3/Aqd5yhG1Yr4IgbqG0ymIXGg== + version "6.20.1" + resolved "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-6.20.1.tgz#b7ce0cfdfbcb0434197edf8385c5d4aaf6a5ac4c" + integrity sha512-DKUzDpHTrP5f6BPclWAs46zrOgDZ+4ewizCO0qbVXMC6rYrZh+ElNeF396GqdZBfrt3ATEyAEa1CW2mceK4wng== dependencies: "@babel/runtime" "^7.23.2" "@mui/base" "^5.0.0-beta.22" @@ -1967,9 +1946,9 @@ semver "^7.3.5" "@npmcli/fs@^3.1.0": - version "3.1.0" - resolved "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e" - integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w== + version "3.1.1" + resolved "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726" + integrity sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg== dependencies: semver "^7.3.5" @@ -2077,12 +2056,12 @@ integrity sha512-7PGLWa9MZ5x/cWy8EH2VzI4T8q5WpuHbixzCDXqixP/WyqwIrg5NDUPgYuFnB4IEIZF+6nA265mYzswFo/h1Pw== "@simonwep/pickr@^1.5.1": - version "1.9.0" - resolved "https://registry.npmjs.org/@simonwep/pickr/-/pickr-1.9.0.tgz#1640651ff04e76b48d805dc186c6513087a704a3" - integrity sha512-oEYvv15PyfZzjoAzvXYt3UyNGwzsrpFxLaZKzkOSd0WYBVwLd19iJerePDONxC1iF6+DpcswPdLIM2KzCJuYFg== + version "1.9.1" + resolved "https://registry.npmjs.org/@simonwep/pickr/-/pickr-1.9.1.tgz#10d86dab514b8888b2d6b90299a477f254067c43" + integrity sha512-fR3qmfAcPf/HSFS7GEnTmZLM3+xERv1+jyMBbzT63ilRRM8veYjI7ELvkHHKk0/du3lHp7uh/FqatjM3646X1g== dependencies: - core-js "3.32.2" - nanopop "2.3.0" + core-js "3.37.0" + nanopop "2.4.2" "@sinclair/typebox@^0.27.8": version "0.27.8" @@ -2109,9 +2088,9 @@ "@sinonjs/commons" "^3.0.0" "@socket.io/component-emitter@~3.1.0": - version "3.1.1" - resolved "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.1.tgz#621270c02c0a5d4f4669eb1caa9723c91cf201de" - integrity sha512-dzJtaDAAoXx4GCOJpbB2eG/Qj8VDpdwkLsWGzGm+0L7E8/434RyMbAHmk9ubXWVAb9nXmc44jUf8GKqVDiKezg== + version "3.1.2" + resolved "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz#821f8442f4175d8f0467b9daf26e3a18e2d02af2" + integrity sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA== "@sphinxxxx/color-conversion@^2.2.2": version "2.2.2" @@ -2233,28 +2212,28 @@ react-transition-state "^1.1.3" "@tanstack/react-table@^8.16.0": - version "8.16.0" - resolved "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.16.0.tgz#92151210ff99d6925353d7a2205735d9c31af48c" - integrity sha512-rKRjnt8ostqN2fercRVOIH/dq7MAmOENCMvVlKx6P9Iokhh6woBGnIZEkqsY/vEJf1jN3TqLOb34xQGLVRuhAg== + version "8.17.3" + resolved "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.17.3.tgz#4e10b4cf5355a40d6d72a83d3f4b3ecd32f56bf4" + integrity sha512-5gwg5SvPD3lNAXPuJJz1fOCEZYk9/GeBFH3w/hCgnfyszOIzwkwgp5I7Q4MJtn0WECp84b5STQUDdmvGi8m3nA== dependencies: - "@tanstack/table-core" "8.16.0" + "@tanstack/table-core" "8.17.3" "@tanstack/react-virtual@^3.4.0": - version "3.4.0" - resolved "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.4.0.tgz#5dcc0ac7c9e35d5db12c3bbe4cbc075bad684d93" - integrity sha512-GZN4xn/Tg5w7gvYeVcMVCeL4pEyUhvg+Cp6KX2Z01C4FRNxIWMgIQ9ibgMarNQfo+gt0PVLcEER4A9sNv/jlow== + version "3.5.1" + resolved "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.5.1.tgz#1ce466f530a10f781871360ed2bf7ff83e664f85" + integrity sha512-jIsuhfgy8GqA67PdWqg73ZB2LFE+HD9hjWL1L6ifEIZVyZVAKpYmgUG4WsKQ005aEyImJmbuimPiEvc57IY0Aw== dependencies: - "@tanstack/virtual-core" "3.4.0" + "@tanstack/virtual-core" "3.5.1" -"@tanstack/table-core@8.16.0": - version "8.16.0" - resolved "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.16.0.tgz#7b58018dd3cec8e0015fe22d6bb24d18d33c891f" - integrity sha512-dCG8vQGk4js5v88/k83tTedWOwjGnIyONrKpHpfmSJB8jwFHl8GSu1sBBxbtACVAPtAQgwNxl0rw1d3RqRM1Tg== +"@tanstack/table-core@8.17.3": + version "8.17.3" + resolved "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.17.3.tgz#d7a9830abb29cd369b52b2a7159dc0360af646fd" + integrity sha512-mPBodDGVL+fl6d90wUREepHa/7lhsghg2A3vFpakEhrhtbIlgNAZiMr7ccTgak5qbHqF14Fwy+W1yFWQt+WmYQ== -"@tanstack/virtual-core@3.4.0": - version "3.4.0" - resolved "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.4.0.tgz#afd72bc5a839b71c2cda87a738eb4eb18451b80a" - integrity sha512-75jXqXxqq5M5Veb9KP1STi8kA5u408uOOAefk2ftHDGCpUk3RP6zX++QqfbmHJTBiU72NQ+ghgCZVts/Wocz8Q== +"@tanstack/virtual-core@3.5.1": + version "3.5.1" + resolved "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.5.1.tgz#f519149bce9156d0e7954b9531df15f446f2fc12" + integrity sha512-046+AUSiDru/V9pajE1du8WayvBKeCvJ2NmKPy/mR8/SbKKrqmSbj7LJBfXE+nSq4f5TBXvnCzu0kcYebI9WdQ== "@testing-library/dom@^8.0.0": version "8.20.1" @@ -2271,9 +2250,9 @@ pretty-format "^27.0.2" "@testing-library/jest-dom@^6.1.2": - version "6.4.2" - resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.4.2.tgz#38949f6b63722900e2d75ba3c6d9bf8cffb3300e" - integrity sha512-CzqH0AFymEMG48CpzXFriYYkOjk6ZGPCLMhW9e9jg3KMCn5OfJecF8GtGW7yGfR/IgCe3SX8BSwjdzI6BBbZLw== + version "6.4.5" + resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.4.5.tgz#badb40296477149136dabef32b572ddd3b56adf1" + integrity sha512-AguB9yvTXmCnySBP1lWjfNNUwpbElsaQ567lt2VdGqAdHtpieLgjmcVyv1q7PMIvLbgpDdkWV5Ydv3FEejyp2A== dependencies: "@adobe/css-tools" "^4.3.2" "@babel/runtime" "^7.9.2" @@ -2281,7 +2260,7 @@ chalk "^3.0.0" css.escape "^1.5.1" dom-accessibility-api "^0.6.3" - lodash "^4.17.15" + lodash "^4.17.21" redent "^3.0.0" "@testing-library/react@12": @@ -2345,9 +2324,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.20.5" - resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz#7b7502be0aa80cc4ef22978846b983edaafcd4dd" - integrity sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ== + version "7.20.6" + resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz#8dc9f0ae0f202c08d8d4dab648912c8d6038e3f7" + integrity sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg== dependencies: "@babel/types" "^7.20.7" @@ -2367,9 +2346,9 @@ "@types/estree" "*" "@types/eslint@*": - version "8.56.9" - resolved "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.9.tgz#403e9ced04a34e63f1c383c5b8ee1a94442c8cc4" - integrity sha512-W4W3KcqzjJ0sHg2vAq9vfml6OhsJ53TcUjUqfzzZf/EChUtwspszj/S0pzMxnfRcO55/iGq47dscXw71Fxc4Zg== + version "8.56.10" + resolved "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz#eb2370a73bf04a901eeba8f22595c7ee0f7eb58d" + integrity sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -2422,7 +2401,7 @@ "@types/tough-cookie" "*" parse5 "^7.0.0" -"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": +"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.15" resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== @@ -2440,9 +2419,9 @@ integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== "@types/node@*": - version "20.12.7" - resolved "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz#04080362fa3dd6c5822061aa3124f5c152cff384" - integrity sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg== + version "20.14.2" + resolved "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18" + integrity sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q== dependencies: undici-types "~5.26.4" @@ -2476,9 +2455,9 @@ "@types/react" "*" "@types/react@*": - version "18.2.79" - resolved "https://registry.npmjs.org/@types/react/-/react-18.2.79.tgz#c40efb4f255711f554d47b449f796d1c7756d865" - integrity sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w== + version "18.3.3" + resolved "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f" + integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw== dependencies: "@types/prop-types" "*" csstype "^3.0.2" @@ -2531,30 +2510,30 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^5.59.9": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db" - integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag== +"@typescript-eslint/eslint-plugin@^7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.12.0.tgz#f87a32e8972b8a60024f2f8f12205e7c8108bc41" + integrity sha512-7F91fcbuDf/d3S8o21+r3ZncGIke/+eWk0EpO21LXhDfLahriZF9CGj4fbAetEjlaBdjdSm9a6VeXbpbT6Z40Q== dependencies: - "@eslint-community/regexpp" "^4.4.0" - "@typescript-eslint/scope-manager" "5.62.0" - "@typescript-eslint/type-utils" "5.62.0" - "@typescript-eslint/utils" "5.62.0" - debug "^4.3.4" + "@eslint-community/regexpp" "^4.10.0" + "@typescript-eslint/scope-manager" "7.12.0" + "@typescript-eslint/type-utils" "7.12.0" + "@typescript-eslint/utils" "7.12.0" + "@typescript-eslint/visitor-keys" "7.12.0" graphemer "^1.4.0" - ignore "^5.2.0" - natural-compare-lite "^1.4.0" - semver "^7.3.7" - tsutils "^3.21.0" + ignore "^5.3.1" + natural-compare "^1.4.0" + ts-api-utils "^1.3.0" -"@typescript-eslint/parser@^5.57.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7" - integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA== +"@typescript-eslint/parser@^7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.12.0.tgz#8761df3345528b35049353db80010b385719b1c3" + integrity sha512-dm/J2UDY3oV3TKius2OUZIFHsomQmpHtsV0FTh1WO8EKgHLQ1QCADUqscPgTpU+ih1e21FQSRjXckHn3txn6kQ== dependencies: - "@typescript-eslint/scope-manager" "5.62.0" - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/typescript-estree" "5.62.0" + "@typescript-eslint/scope-manager" "7.12.0" + "@typescript-eslint/types" "7.12.0" + "@typescript-eslint/typescript-estree" "7.12.0" + "@typescript-eslint/visitor-keys" "7.12.0" debug "^4.3.4" "@typescript-eslint/scope-manager@5.62.0": @@ -2565,21 +2544,34 @@ "@typescript-eslint/types" "5.62.0" "@typescript-eslint/visitor-keys" "5.62.0" -"@typescript-eslint/type-utils@5.62.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a" - integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew== +"@typescript-eslint/scope-manager@7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.12.0.tgz#259c014362de72dd34f995efe6bd8dda486adf58" + integrity sha512-itF1pTnN6F3unPak+kutH9raIkL3lhH1YRPGgt7QQOh43DQKVJXmWkpb+vpc/TiDHs6RSd9CTbDsc/Y+Ygq7kg== dependencies: - "@typescript-eslint/typescript-estree" "5.62.0" - "@typescript-eslint/utils" "5.62.0" + "@typescript-eslint/types" "7.12.0" + "@typescript-eslint/visitor-keys" "7.12.0" + +"@typescript-eslint/type-utils@7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.12.0.tgz#9dfaaa1972952f395ec5be4f5bbfc4d3cdc63908" + integrity sha512-lib96tyRtMhLxwauDWUp/uW3FMhLA6D0rJ8T7HmH7x23Gk1Gwwu8UZ94NMXBvOELn6flSPiBrCKlehkiXyaqwA== + dependencies: + "@typescript-eslint/typescript-estree" "7.12.0" + "@typescript-eslint/utils" "7.12.0" debug "^4.3.4" - tsutils "^3.21.0" + ts-api-utils "^1.3.0" "@typescript-eslint/types@5.62.0": version "5.62.0" resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f" integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ== +"@typescript-eslint/types@7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.12.0.tgz#bf208f971a8da1e7524a5d9ae2b5f15192a37981" + integrity sha512-o+0Te6eWp2ppKY3mLCU+YA9pVJxhUJE15FV7kxuD9jgwIAa+w/ycGJBMrYDTpVGUM/tgpa9SeMOugSabWFq7bg== + "@typescript-eslint/typescript-estree@5.62.0": version "5.62.0" resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b" @@ -2593,7 +2585,31 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.62.0", "@typescript-eslint/utils@^5.10.0": +"@typescript-eslint/typescript-estree@7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.12.0.tgz#e6c1074f248b3db6573ab6a7c47a39c4cd498ff9" + integrity sha512-5bwqLsWBULv1h6pn7cMW5dXX/Y2amRqLaKqsASVwbBHMZSnHqE/HN4vT4fE0aFsiwxYvr98kqOWh1a8ZKXalCQ== + dependencies: + "@typescript-eslint/types" "7.12.0" + "@typescript-eslint/visitor-keys" "7.12.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + minimatch "^9.0.4" + semver "^7.6.0" + ts-api-utils "^1.3.0" + +"@typescript-eslint/utils@7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.12.0.tgz#c6e58fd7f724cdccc848f71e388ad80cbdb95dd0" + integrity sha512-Y6hhwxwDx41HNpjuYswYp6gDbkiZ8Hin9Bf5aJQn1bpTs3afYY4GX+MPYxma8jtoIV2GRwTM/UJm/2uGCVv+DQ== + dependencies: + "@eslint-community/eslint-utils" "^4.4.0" + "@typescript-eslint/scope-manager" "7.12.0" + "@typescript-eslint/types" "7.12.0" + "@typescript-eslint/typescript-estree" "7.12.0" + +"@typescript-eslint/utils@^5.10.0": version "5.62.0" resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86" integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ== @@ -2615,6 +2631,14 @@ "@typescript-eslint/types" "5.62.0" eslint-visitor-keys "^3.3.0" +"@typescript-eslint/visitor-keys@7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.12.0.tgz#c053b55a996679528beeedd8e565710ce1ae1ad3" + integrity sha512-uZk7DevrQLL3vSnfFl5bj4sL75qC9D6EdjemIdbtkuUmIheWpuiiylSY01JxJE7+zGrOWDZrp1WxOuDntvKrHQ== + dependencies: + "@typescript-eslint/types" "7.12.0" + eslint-visitor-keys "^3.4.3" + "@ungap/structured-clone@^1.2.0": version "1.2.0" resolved "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" @@ -2757,22 +2781,20 @@ "@webassemblyjs/ast" "1.12.1" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.2.0": - version "1.2.0" - resolved "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" - integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg== +"@webpack-cli/configtest@^2.1.1": + version "2.1.1" + resolved "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" + integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== -"@webpack-cli/info@^1.5.0": - version "1.5.0" - resolved "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" - integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ== - dependencies: - envinfo "^7.7.3" +"@webpack-cli/info@^2.0.2": + version "2.0.2" + resolved "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" + integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== -"@webpack-cli/serve@^1.7.0": - version "1.7.0" - resolved "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" - integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== +"@webpack-cli/serve@^2.0.5": + version "2.0.5" + resolved "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" + integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== "@xmldom/xmldom@^0.7.2": version "0.7.13" @@ -2813,9 +2835,9 @@ abbrev@^2.0.0: integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== ace-builds@^1.31.1: - version "1.33.0" - resolved "https://registry.npmjs.org/ace-builds/-/ace-builds-1.33.0.tgz#3b6fb993a4b1d3f2b5923aecded098e13e6527d8" - integrity sha512-PDvytkZNvAfuh+PaP5Oy3l3sBGd7xMk4NsB+4w/w1e3gjBqEOGeJwcX+wF/SB6mLtT3VfJLrhDNPT3eaCjtR3w== + version "1.34.2" + resolved "https://registry.npmjs.org/ace-builds/-/ace-builds-1.34.2.tgz#c17c6fd7c661c7ba33f57533a42004a7b3f8dcbd" + integrity sha512-wiOZYuxyOSYfZzDasQTe+ZWmRlYxXSJM/kMKZ/bSqO1VgrBl+PaaTz/Sc+y7hXCKAUj3syUdpwxQyvwv9vQe6w== acorn-globals@^7.0.0: version "7.0.1" @@ -2923,14 +2945,14 @@ ajv-keywords@^5.1.0: uri-js "^4.2.2" "ajv@^8.0.0", "ajv@^8.8.2", "ajv@^8.9.0": - version "8.12.0" - resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" - integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== + version "8.16.0" + resolved "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz#22e2a92b94f005f7e0f9c9d39652ef0b8f6f0cb4" + integrity sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw== dependencies: - fast-deep-equal "^3.1.1" + fast-deep-equal "^3.1.3" json-schema-traverse "^1.0.0" require-from-string "^2.0.2" - uri-js "^4.2.2" + uri-js "^4.4.1" ansi-escapes@^4.2.1: version "4.3.2" @@ -3048,7 +3070,7 @@ aria-query@^5.0.0: call-bind "^1.0.5" is-array-buffer "^3.0.4" -"array-includes@^3.1.6", "array-includes@^3.1.7": +"array-includes@^3.1.6", "array-includes@^3.1.8": version "3.1.8" resolved "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d" integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ== @@ -3070,7 +3092,7 @@ array-union@^3.0.1: resolved "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975" integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw== -array.prototype.findlast@^1.2.4: +array.prototype.findlast@^1.2.5: version "1.2.5" resolved "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904" integrity sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ== @@ -3113,14 +3135,14 @@ array.prototype.toreversed@^1.1.2: es-shim-unscopables "^1.0.0" array.prototype.tosorted@^1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz#c8c89348337e51b8a3c48a9227f9ce93ceedcba8" - integrity sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg== + version "1.1.4" + resolved "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc" + integrity sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA== dependencies: - call-bind "^1.0.5" + call-bind "^1.0.7" define-properties "^1.2.1" - es-abstract "^1.22.3" - es-errors "^1.1.0" + es-abstract "^1.23.3" + es-errors "^1.3.0" es-shim-unscopables "^1.0.2" arraybuffer.prototype.slice@^1.0.3: @@ -3232,10 +3254,10 @@ axios-mock-adapter@^1.17.0: fast-deep-equal "^3.1.3" is-buffer "^2.0.5" -axios@^1.6.8: - version "1.6.8" - resolved "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66" - integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ== +axios@^1.7.2: + version "1.7.2" + resolved "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621" + integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" @@ -3254,15 +3276,13 @@ babel-jest@^29.7.0: graceful-fs "^4.2.9" slash "^3.0.0" -babel-loader@^8.1.0: - version "8.3.0" - resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8" - integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q== +babel-loader@^9.1.3: + version "9.1.3" + resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz#3d0e01b4e69760cc694ee306fe16d358aa1c6f9a" + integrity sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw== dependencies: - find-cache-dir "^3.3.1" - loader-utils "^2.0.0" - make-dir "^3.1.0" - schema-utils "^2.6.5" + find-cache-dir "^4.0.0" + schema-utils "^4.0.0" babel-plugin-emotion@^10.0.27: version "10.2.2" @@ -3320,12 +3340,12 @@ babel-plugin-macros@^3.1.0: resolve "^1.19.0" babel-plugin-polyfill-corejs2@^0.4.10: - version "0.4.10" - resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz#276f41710b03a64f6467433cab72cbc2653c38b1" - integrity sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ== + version "0.4.11" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33" + integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q== dependencies: "@babel/compat-data" "^7.22.6" - "@babel/helper-define-polyfill-provider" "^0.6.1" + "@babel/helper-define-polyfill-provider" "^0.6.2" semver "^6.3.1" "babel-plugin-polyfill-corejs3@^0.10.1", "babel-plugin-polyfill-corejs3@^0.10.4": @@ -3337,11 +3357,11 @@ babel-plugin-polyfill-corejs2@^0.4.10: core-js-compat "^3.36.1" babel-plugin-polyfill-regenerator@^0.6.1: - version "0.6.1" - resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.1.tgz#4f08ef4c62c7a7f66a35ed4c0d75e30506acc6be" - integrity sha512-JfTApdE++cgcTWjsiCQlLyFBMbTUft9ja17saCc93lgV33h4tuCVj7tlvu//qpLwaG+3yEz7/KhahGrUMkVq9g== + version "0.6.2" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz#addc47e240edd1da1058ebda03021f382bba785e" + integrity sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg== dependencies: - "@babel/helper-define-polyfill-provider" "^0.6.1" + "@babel/helper-define-polyfill-provider" "^0.6.2" "babel-plugin-styled-components@>= 1.12.0": version "2.1.4" @@ -3513,12 +3533,12 @@ brace@^0.11.1: resolved "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58" integrity sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q== -braces@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== +braces@^3.0.3: + version "3.0.3" + resolved "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" "brorand@^1.0.1", "brorand@^1.1.0": version "1.1.0" @@ -3779,9 +3799,9 @@ cacache@^16.1.0: unique-filename "^2.0.0" cacache@^18.0.0: - version "18.0.2" - resolved "https://registry.npmjs.org/cacache/-/cacache-18.0.2.tgz#fd527ea0f03a603be5c0da5805635f8eef00c60c" - integrity sha512-r3NU8h/P+4lVUHfeRw1dtgQYar3DZMm4/cm2bZgOvrFC/su7budSOeqh52VJIC4U4iG1WWwV6vRW0znqBvxNuw== + version "18.0.3" + resolved "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz#864e2c18414e1e141ae8763f31e46c2cb96d1b21" + integrity sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg== dependencies: "@npmcli/fs" "^3.1.0" fs-minipass "^3.0.0" @@ -3866,9 +3886,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" "caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30001587", "caniuse-lite@^1.0.30001599": - version "1.0.30001611" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001611.tgz#4dbe78935b65851c2d2df1868af39f709a93a96e" - integrity sha512-19NuN1/3PjA3QI8Eki55N8my4LzfkMCRLgCVfrl/slbSAchQfV0+GwjPrK3rq37As4UCLlM/DHajbKkAqbv92Q== + version "1.0.30001629" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001629.tgz#907a36f4669031bd8a1a8dbc2fa08b29e0db297e" + integrity sha512-c3dl911slnQhmxUIT4HhYzT7wnBK/XYpGnYLOj4nJBaRiw52Ibe7YxlDaAeRECvA786zCuExhxIUJ2K7nHMrBw== "caw@^2.0.0", "caw@^2.0.1": version "2.0.1" @@ -3928,9 +3948,9 @@ chownr@^2.0.0: integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + version "1.0.4" + resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz#05bffd7ff928465093314708c93bdfa9bd1f0f5b" + integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ== ci-info@^3.2.0: version "3.9.0" @@ -3946,9 +3966,9 @@ ci-info@^3.2.0: safe-buffer "^5.0.1" cjs-module-lexer@^1.0.0: - version "1.2.3" - resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107" - integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ== + version "1.3.1" + resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz#c485341ae8fd999ca4ee5af2d7a1c9ae01e0099c" + integrity sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q== "classnames@*", "classnames@2.x", "classnames@^2.2.1", "classnames@^2.2.5", "classnames@^2.2.6", "classnames@^2.5.1": version "2.5.1" @@ -3997,10 +4017,10 @@ closest@^0.0.1: resolved "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== -"clsx@^2.0.0", "clsx@^2.1.0": - version "2.1.0" - resolved "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz#e851283bcb5c80ee7608db18487433f7b23f77cb" - integrity sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg== +"clsx@^2.0.0", "clsx@^2.1.0", "clsx@^2.1.1": + version "2.1.1" + resolved "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999" + integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA== co@^4.6.0: version "4.6.0" @@ -4081,12 +4101,17 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" +commander@^10.0.1: + version "10.0.1" + resolved "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + "commander@^2.19.0", "commander@^2.20.0", "commander@^2.8.1": version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -"commander@^7.0.0", "commander@^7.2.0": +commander@^7.2.0: version "7.2.0" resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== @@ -4096,10 +4121,10 @@ commander@^9.3.0: resolved "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== +common-path-prefix@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0" + integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w== concat-map@0.0.1: version "0.0.1" @@ -4182,16 +4207,16 @@ copy-webpack-plugin@^11.0.0: serialize-javascript "^6.0.0" "core-js-compat@^3.31.0", "core-js-compat@^3.36.1": - version "3.37.0" - resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.0.tgz#d9570e544163779bb4dff1031c7972f44918dc73" - integrity sha512-vYq4L+T8aS5UuFg4UwDhc7YNRWVeVZwltad9C/jV3R2LgVOpS9BDr7l/WL6BN0dbV3k1XejPTHqqEzJgsa0frA== + version "3.37.1" + resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz#c844310c7852f4bdf49b8d339730b97e17ff09ee" + integrity sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg== dependencies: browserslist "^4.23.0" -core-js@3.32.2: - version "3.32.2" - resolved "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz#172fb5949ef468f93b4be7841af6ab1f21992db7" - integrity sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ== +core-js@3.37.0: + version "3.37.0" + resolved "https://registry.npmjs.org/core-js/-/core-js-3.37.0.tgz#d8dde58e91d156b2547c19d8a4efd5c7f6c426bb" + integrity sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug== core-util-is@~1.0.0: version "1.0.3" @@ -4428,14 +4453,6 @@ css-tree@~2.2.0: mdn-data "2.0.28" source-map-js "^1.0.1" -css-vendor@^2.0.8: - version "2.0.8" - resolved "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d" - integrity sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ== - dependencies: - "@babel/runtime" "^7.8.3" - is-in-browser "^1.0.2" - "css-what@^6.0.1", "css-what@^6.1.0": version "6.1.0" resolved "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" @@ -4655,9 +4672,9 @@ debounce@^1.2.1: integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug== "debug@4", "debug@^4.1.0", "debug@^4.1.1", "debug@^4.3.1", "debug@^4.3.2", "debug@^4.3.3", "debug@^4.3.4", "debug@~4.3.1", "debug@~4.3.2": - version "4.3.4" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + version "4.3.5" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e" + integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg== dependencies: ms "2.1.2" @@ -4802,7 +4819,7 @@ deep-is@^0.1.3: es-errors "^1.3.0" gopd "^1.0.1" -"define-properties@^1.1.3", "define-properties@^1.2.0", "define-properties@^1.2.1": +"define-properties@^1.2.0", "define-properties@^1.2.1": version "1.2.1" resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== @@ -5092,9 +5109,9 @@ ejs@~3.1.8: jake "^10.8.5" electron-to-chromium@^1.4.668: - version "1.4.740" - resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.740.tgz#89c82421332ee425e5b193e3db2dea019d423419" - integrity sha512-Yvg5i+iyv7Xm18BRdVPVm8lc7kgxM3r6iwqCH2zB7QZy1kZRNmd0Zqm0zcD9XoFREE5/5rwIuIAOT+/mzGcnZg== + version "1.4.794" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.794.tgz#cca7762998f6c42517770666e272f52a53c08605" + integrity sha512-6FApLtsYhDCY0Vglq3AptsdxQ+PJLc6AxlAM0HjEihUAiOPPbkASEsq9gtxUeZY9o0sJIEa3WnF0vVH4VT4iug== "elliptic@^6.5.3", "elliptic@^6.5.5": version "6.5.5" @@ -5160,9 +5177,9 @@ engine.io-parser@~5.2.1: integrity sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw== enhanced-resolve@^5.16.0: - version "5.16.0" - resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787" - integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA== + version "5.17.0" + resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz#d037603789dd9555b89aaec7eb78845c49089bc5" + integrity sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -5183,9 +5200,9 @@ env-paths@^2.2.0: integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== envinfo@^7.7.3: - version "7.12.0" - resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.12.0.tgz#b56723b39c2053d67ea5714f026d05d4f5cc7acd" - integrity sha512-Iw9rQJBGpJRd3rwXm9ft/JiGoAZmLxxJZELYDQoPRZ4USVhkKtIcNBPw6U+/K2mBpaqM25JSV6Yl4Az9vO2wJg== + version "7.13.0" + resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz#81fbb81e5da35d74e814941aeab7c325a606fb31" + integrity sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q== err-code@^2.0.2: version "2.0.3" @@ -5199,7 +5216,7 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -"es-abstract@^1.22.1", "es-abstract@^1.22.3", "es-abstract@^1.23.0", "es-abstract@^1.23.1", "es-abstract@^1.23.2": +"es-abstract@^1.22.1", "es-abstract@^1.22.3", "es-abstract@^1.23.0", "es-abstract@^1.23.1", "es-abstract@^1.23.2", "es-abstract@^1.23.3": version "1.23.3" resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0" integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A== @@ -5258,7 +5275,7 @@ es-define-property@^1.0.0: dependencies: get-intrinsic "^1.2.4" -"es-errors@^1.1.0", "es-errors@^1.2.1", "es-errors@^1.3.0": +"es-errors@^1.2.1", "es-errors@^1.3.0": version "1.3.0" resolved "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== @@ -5278,14 +5295,14 @@ es-get-iterator@^1.1.3: isarray "^2.0.5" stop-iteration-iterator "^1.0.0" -es-iterator-helpers@^1.0.17: - version "1.0.18" - resolved "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.18.tgz#4d3424f46b24df38d064af6fbbc89274e29ea69d" - integrity sha512-scxAJaewsahbqTYrGKJihhViaM6DDZDDoucfvzNbK0pOren1g/daDQ3IAhzn+1G14rBG7w+i5N+qul60++zlKA== +es-iterator-helpers@^1.0.19: + version "1.0.19" + resolved "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz#117003d0e5fec237b4b5c08aded722e0c6d50ca8" + integrity sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw== dependencies: call-bind "^1.0.7" define-properties "^1.2.1" - es-abstract "^1.23.0" + es-abstract "^1.23.3" es-errors "^1.3.0" es-set-tostringtag "^2.0.3" function-bind "^1.1.2" @@ -5299,9 +5316,9 @@ es-iterator-helpers@^1.0.17: safe-array-concat "^1.1.2" es-module-lexer@^1.2.1: - version "1.5.0" - resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.0.tgz#4878fee3789ad99e065f975fdd3c645529ff0236" - integrity sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw== + version "1.5.3" + resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.3.tgz#25969419de9c0b1fbe54279789023e8a9a788412" + integrity sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg== es-object-atoms@^1.0.0: version "1.0.0" @@ -5335,7 +5352,7 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -escalade@^3.1.1: +"escalade@^3.1.1", "escalade@^3.1.2": version "3.1.2" resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== @@ -5373,33 +5390,33 @@ eslint-plugin-jest@^27.4.0: "@typescript-eslint/utils" "^5.10.0" eslint-plugin-react-hooks@^4.3.0: - version "4.6.0" - resolved "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3" - integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== + version "4.6.2" + resolved "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596" + integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ== eslint-plugin-react@^7.33.2: - version "7.34.1" - resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.1.tgz#6806b70c97796f5bbfb235a5d3379ece5f4da997" - integrity sha512-N97CxlouPT1AHt8Jn0mhhN2RrADlUAsk1/atcT2KyA/l9Q/E6ll7OIGwNumFmWfZ9skV3XXccYS19h80rHtgkw== + version "7.34.2" + resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.2.tgz#2780a1a35a51aca379d86d29b9a72adc6bfe6b66" + integrity sha512-2HCmrU+/JNigDN6tg55cRDKCQWicYAPB38JGSFDQt95jDm8rrvSUo7YPkOIm5l6ts1j1zCvysNcasvfTMQzUOw== dependencies: - array-includes "^3.1.7" - array.prototype.findlast "^1.2.4" + array-includes "^3.1.8" + array.prototype.findlast "^1.2.5" array.prototype.flatmap "^1.3.2" array.prototype.toreversed "^1.1.2" array.prototype.tosorted "^1.1.3" doctrine "^2.1.0" - es-iterator-helpers "^1.0.17" + es-iterator-helpers "^1.0.19" estraverse "^5.3.0" jsx-ast-utils "^2.4.1 || ^3.0.0" minimatch "^3.1.2" - object.entries "^1.1.7" - object.fromentries "^2.0.7" - object.hasown "^1.1.3" - object.values "^1.1.7" + object.entries "^1.1.8" + object.fromentries "^2.0.8" + object.hasown "^1.1.4" + object.values "^1.2.0" prop-types "^15.8.1" resolve "^2.0.0-next.5" semver "^6.3.1" - string.prototype.matchall "^4.0.10" + string.prototype.matchall "^4.0.11" eslint-rule-composer@^0.3.0: version "0.3.0" @@ -5681,11 +5698,6 @@ fast-levenshtein@^2.0.6: resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== -fast-memoize@^2.5.1: - version "2.5.2" - resolved "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e" - integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw== - fast-safe-stringify@^2.0.7: version "2.1.1" resolved "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" @@ -5791,21 +5803,20 @@ filenamify@^2.0.0: strip-outer "^1.0.0" trim-repeated "^1.0.0" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1" -find-cache-dir@^3.3.1: - version "3.3.2" - resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" - integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== +find-cache-dir@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz#a30ee0448f81a3990708f6453633c733e2f6eec2" + integrity sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg== dependencies: - commondir "^1.0.1" - make-dir "^3.0.2" - pkg-dir "^4.1.0" + common-path-prefix "^3.0.0" + pkg-dir "^7.0.0" find-root@^1.1.0: version "1.1.0" @@ -5828,6 +5839,14 @@ find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" +find-up@^6.3.0: + version "6.3.0" + resolved "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790" + integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw== + dependencies: + locate-path "^7.1.0" + path-exists "^5.0.0" + find-versions@^3.0.0: version "3.2.0" resolved "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz#10297f98030a786829681690545ef659ed1d254e" @@ -6063,15 +6082,15 @@ glob-to-regexp@^0.4.1: integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== "glob@^10.2.2", "glob@^10.3.10": - version "10.3.12" - resolved "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b" - integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg== + version "10.4.1" + resolved "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2" + integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw== dependencies: foreground-child "^3.1.0" - jackspeak "^2.3.6" - minimatch "^9.0.1" - minipass "^7.0.4" - path-scurry "^1.10.2" + jackspeak "^3.1.2" + minimatch "^9.0.4" + minipass "^7.1.2" + path-scurry "^1.11.1" "glob@^7.1.0", "glob@^7.1.3", "glob@^7.1.4", "glob@^7.1.6": version "7.2.3" @@ -6109,11 +6128,12 @@ globals@^13.19.0: type-fest "^0.20.2" globalthis@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" - integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== + version "1.0.4" + resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236" + integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ== dependencies: - define-properties "^1.1.3" + define-properties "^1.2.1" + gopd "^1.0.1" globby@^11.1.0: version "11.1.0" @@ -6486,11 +6506,6 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -hyphenate-style-name@^1.0.3: - version "1.0.4" - resolved "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d" - integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== - "iconv-lite@0.6.3", "iconv-lite@^0.6.2": version "0.6.3" resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" @@ -6508,18 +6523,18 @@ hyphenate-style-name@^1.0.3: resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -"ignore@^5.1.9", "ignore@^5.2.0", "ignore@^5.2.4": +"ignore@^5.1.9", "ignore@^5.2.0", "ignore@^5.2.4", "ignore@^5.3.1": version "5.3.1" resolved "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== -image-minimizer-webpack-plugin@^3.8.2: - version "3.8.3" - resolved "https://registry.npmjs.org/image-minimizer-webpack-plugin/-/image-minimizer-webpack-plugin-3.8.3.tgz#41b2379f9d8adabf4e4db63c656543fee26dd4c2" - integrity sha512-Ex0cjNJc2FUSuwN7WHNyxkIZINP0M9lrN+uWJznMcsehiM5Z7ELwk+SEkSGEookK1GUd2wf+09jy1PEH5a5XmQ== +image-minimizer-webpack-plugin@^4.0.2: + version "4.0.2" + resolved "https://registry.npmjs.org/image-minimizer-webpack-plugin/-/image-minimizer-webpack-plugin-4.0.2.tgz#793bee4979ae6753f6e90ed739252d57ee2863f3" + integrity sha512-/A7yc5r/6wQBF/AvVPO8eEroV2XwBFg36+7staL2M88E4VrcjSSjkNJn4dUizw3FAZ/GXO8A7IwWrIGC0f2tCg== dependencies: schema-utils "^4.2.0" - serialize-javascript "^6.0.1" + serialize-javascript "^6.0.2" imagemin-mozjpeg@^10.0.0: version "10.0.0" @@ -6671,10 +6686,10 @@ insert-module-globals@^7.2.1: hasown "^2.0.0" side-channel "^1.0.4" -interpret@^2.2.0: - version "2.2.0" - resolved "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" - integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== +interpret@^3.1.1: + version "3.1.1" + resolved "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" + integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== into-stream@^3.1.0: version "3.1.0" @@ -6825,11 +6840,6 @@ is-generator-fn@^2.0.0: dependencies: is-extglob "^2.1.1" -"is-in-browser@^1.0.2", "is-in-browser@^1.1.3": - version "1.1.3" - resolved "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" - integrity sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g== - is-jpg@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/is-jpg/-/is-jpg-3.0.0.tgz#f97b4ab6de92401650cb4f54ec0a6ad79c51367f" @@ -7096,18 +7106,18 @@ iterator.prototype@^1.1.2: reflect.getprototypeof "^1.0.4" set-function-name "^2.0.1" -jackspeak@^2.3.6: - version "2.3.6" - resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" - integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== +jackspeak@^3.1.2: + version "3.4.0" + resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz#a75763ff36ad778ede6a156d8ee8b124de445b4a" + integrity sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw== dependencies: "@isaacs/cliui" "^8.0.2" "@pkgjs/parseargs" "^0.11.0" jake@^10.8.5: - version "10.8.7" - resolved "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" - integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w== + version "10.9.1" + resolved "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz#8dc96b7fcc41cb19aa502af506da4e1d56f5e62b" + integrity sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w== dependencies: async "^3.2.3" chalk "^4.0.2" @@ -7500,9 +7510,9 @@ jest@^29.6.4: jest-cli "^29.7.0" jiti@^1.20.0: - version "1.21.0" - resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d" - integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== + version "1.21.3" + resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.3.tgz#b2adb07489d7629b344d59082bbedb8c21c5f755" + integrity sha512-uy2bNX5zQ+tESe+TiC7ilGRz8AtRGmnJH55NC5S0nSUjvvvM2hJHmefHErugGXN4pNv4Qx7vLsnNw9qJ9mtIsw== jmespath@^0.16.0: version "0.16.0" @@ -7655,76 +7665,6 @@ jsonrepair@3.1.0: resolved "https://registry.npmjs.org/jsonrepair/-/jsonrepair-3.1.0.tgz#02488882080930e6a37a7b080bc77546f2e12676" integrity sha512-idqReg23J0PVRAADmZMc5xQM3xeOX5bTB6OTyMnzq33IXJXmn9iJuWIEvGmrN80rQf4d7uLTMEDwpzujNcI0Rg== -jss-plugin-camel-case@^10.10.0: - version "10.10.0" - resolved "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz#27ea159bab67eb4837fa0260204eb7925d4daa1c" - integrity sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw== - dependencies: - "@babel/runtime" "^7.3.1" - hyphenate-style-name "^1.0.3" - jss "10.10.0" - -jss-plugin-default-unit@^10.10.0: - version "10.10.0" - resolved "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz#db3925cf6a07f8e1dd459549d9c8aadff9804293" - integrity sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - -jss-plugin-global@^10.10.0: - version "10.10.0" - resolved "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz#1c55d3c35821fab67a538a38918292fc9c567efd" - integrity sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - -jss-plugin-nested@^10.10.0: - version "10.10.0" - resolved "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz#db872ed8925688806e77f1fc87f6e62264513219" - integrity sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - tiny-warning "^1.0.2" - -jss-plugin-props-sort@^10.10.0: - version "10.10.0" - resolved "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz#67f4dd4c70830c126f4ec49b4b37ccddb680a5d7" - integrity sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - -jss-plugin-rule-value-function@^10.10.0: - version "10.10.0" - resolved "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz#7d99e3229e78a3712f78ba50ab342e881d26a24b" - integrity sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - tiny-warning "^1.0.2" - -jss-plugin-vendor-prefixer@^10.10.0: - version "10.10.0" - resolved "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz#c01428ef5a89f2b128ec0af87a314d0c767931c7" - integrity sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg== - dependencies: - "@babel/runtime" "^7.3.1" - css-vendor "^2.0.8" - jss "10.10.0" - -"jss@10.10.0", "jss@^10.10.0": - version "10.10.0" - resolved "https://registry.npmjs.org/jss/-/jss-10.10.0.tgz#a75cc85b0108c7ac8c7b7d296c520a3e4fbc6ccc" - integrity sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw== - dependencies: - "@babel/runtime" "^7.3.1" - csstype "^3.0.2" - is-in-browser "^1.1.3" - tiny-warning "^1.0.2" - "jsx-ast-utils@^2.4.1 || ^3.0.0": version "3.3.5" resolved "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a" @@ -7829,9 +7769,9 @@ loader-utils@^2.0.0: json5 "^2.1.2" loader-utils@^3.2.1: - version "3.2.1" - resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576" - integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw== + version "3.3.1" + resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-3.3.1.tgz#735b9a19fd63648ca7adbd31c2327dfe281304e5" + integrity sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg== locate-path@^5.0.0: version "5.0.0" @@ -7847,6 +7787,13 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" +locate-path@^7.1.0: + version "7.2.0" + resolved "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a" + integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA== + dependencies: + p-locate "^6.0.0" + lodash._basebind@~2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.3.0.tgz#2b5bc452a0e106143b21869f233bdb587417d248" @@ -8043,9 +7990,9 @@ lowercase-keys@^1.0.0: integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== "lru-cache@^10.0.1", "lru-cache@^10.2.0": - version "10.2.0" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" - integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== + version "10.2.2" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878" + integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ== lru-cache@^4.0.1: version "4.1.5" @@ -8086,13 +8033,6 @@ lz-string@^1.5.0: dependencies: pify "^3.0.0" -"make-dir@^3.0.2", "make-dir@^3.1.0": - version "3.1.0" - resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - make-dir@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e" @@ -8123,9 +8063,9 @@ make-fetch-happen@^10.0.3: ssri "^9.0.0" make-fetch-happen@^13.0.0: - version "13.0.0" - resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz#705d6f6cbd7faecb8eac2432f551e49475bfedf0" - integrity sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A== + version "13.0.1" + resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36" + integrity sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA== dependencies: "@npmcli/agent" "^2.0.0" cacache "^18.0.0" @@ -8136,6 +8076,7 @@ make-fetch-happen@^13.0.0: minipass-flush "^1.0.5" minipass-pipeline "^1.2.4" negotiator "^0.6.3" + proc-log "^4.2.0" promise-retry "^2.0.1" ssri "^10.0.0" @@ -8234,11 +8175,11 @@ microbuffer@^1.0.0: integrity sha512-O/SUXauVN4x6RaEJFqSPcXNtLFL+QzJHKZlyDVYFwcDDRVca3Fa/37QXXC+4zAGGa4YhHrHxKXuuHvLDIQECtA== micromatch@^4.0.4: - version "4.0.5" - resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + version "4.0.7" + resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5" + integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q== dependencies: - braces "^3.0.2" + braces "^3.0.3" picomatch "^2.3.1" miller-rabin@^4.0.0: @@ -8313,7 +8254,7 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^9.0.1: +minimatch@^9.0.4: version "9.0.4" resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== @@ -8359,9 +8300,9 @@ minipass-fetch@^2.0.3: minizlib "^2.1.2" minipass-fetch@^3.0.0: - version "3.0.4" - resolved "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz#4d4d9b9f34053af6c6e597a64be8e66e42bf45b7" - integrity sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg== + version "3.0.5" + resolved "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz#f0f97e40580affc4a35cc4a1349f05ae36cb1e4c" + integrity sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg== dependencies: encoding "^0.1.13" minipass "^7.0.3" @@ -8401,10 +8342,10 @@ minipass@^5.0.0: resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", "minipass@^7.0.2", "minipass@^7.0.3", "minipass@^7.0.4": - version "7.0.4" - resolved "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" - integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", "minipass@^7.0.2", "minipass@^7.0.3", "minipass@^7.1.2": + version "7.1.2" + resolved "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" + integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== "minizlib@^2.1.1", "minizlib@^2.1.2": version "2.1.2" @@ -8533,15 +8474,10 @@ nan@^2.14.2: resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== -nanopop@2.3.0: - version "2.3.0" - resolved "https://registry.npmjs.org/nanopop/-/nanopop-2.3.0.tgz#a5f672fba27d45d6ecbd0b59789c040072915123" - integrity sha512-fzN+T2K7/Ah25XU02MJkPZ5q4Tj5FpjmIYq4rvoHX4yb16HzFdCO6JxFFn5Y/oBhQ8no8fUZavnyIv9/+xkBBw== - -natural-compare-lite@^1.4.0: - version "1.4.0" - resolved "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4" - integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g== +nanopop@2.4.2: + version "2.4.2" + resolved "https://registry.npmjs.org/nanopop/-/nanopop-2.4.2.tgz#b55482135be7e64f2d0f5aa8ef51a58104ac7b13" + integrity sha512-NzOgmMQ+elxxHeIha+OG/Pv3Oc3p4RU2aBhwWwAqDpXrdTbtRylbRLQztLy8dMMwfl6pclznBdfUhccEn9ZIzw== natural-compare@^1.4.0: version "1.4.0" @@ -8639,9 +8575,9 @@ nopt@^6.0.0: abbrev "^1.0.0" nopt@^7.0.0: - version "7.2.0" - resolved "https://registry.npmjs.org/nopt/-/nopt-7.2.0.tgz#067378c68116f602f552876194fd11f1292503d7" - integrity sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA== + version "7.2.1" + resolved "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7" + integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w== dependencies: abbrev "^2.0.0" @@ -8739,9 +8675,9 @@ nth-check@^2.0.1: boolbase "^1.0.0" nwsapi@^2.2.2: - version "2.2.7" - resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" - integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== + version "2.2.10" + resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.10.tgz#0b77a68e21a0b483db70b11fad055906e867cda8" + integrity sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ== "object-assign@^4.0.1", "object-assign@^4.1.0", "object-assign@^4.1.1": version "4.1.1" @@ -8776,7 +8712,7 @@ object-keys@^1.1.1: has-symbols "^1.0.3" object-keys "^1.1.1" -object.entries@^1.1.7: +object.entries@^1.1.8: version "1.1.8" resolved "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz#bffe6f282e01f4d17807204a24f8edd823599c41" integrity sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ== @@ -8785,7 +8721,7 @@ object.entries@^1.1.7: define-properties "^1.2.1" es-object-atoms "^1.0.0" -object.fromentries@^2.0.7: +object.fromentries@^2.0.8: version "2.0.8" resolved "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65" integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ== @@ -8795,7 +8731,7 @@ object.fromentries@^2.0.7: es-abstract "^1.23.2" es-object-atoms "^1.0.0" -object.hasown@^1.1.3: +object.hasown@^1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz#e270ae377e4c120cdcb7656ce66884a6218283dc" integrity sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg== @@ -8804,7 +8740,7 @@ object.hasown@^1.1.3: es-abstract "^1.23.2" es-object-atoms "^1.0.0" -"object.values@^1.1.6", "object.values@^1.1.7": +"object.values@^1.1.6", "object.values@^1.2.0": version "1.2.0" resolved "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b" integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ== @@ -8840,16 +8776,16 @@ opener@^1.5.2: integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== optionator@^0.9.3: - version "0.9.3" - resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" - integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== + version "0.9.4" + resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734" + integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g== dependencies: - "@aashutoshrathi/word-wrap" "^1.2.3" deep-is "^0.1.3" fast-levenshtein "^2.0.6" levn "^0.4.1" prelude-ls "^1.2.1" type-check "^0.4.0" + word-wrap "^1.2.5" optipng-bin@^7.0.0: version "7.0.1" @@ -8919,6 +8855,13 @@ p-limit@^2.2.0: dependencies: yocto-queue "^0.1.0" +p-limit@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644" + integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ== + dependencies: + yocto-queue "^1.0.0" + p-locate@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -8933,6 +8876,13 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" +p-locate@^6.0.0: + version "6.0.0" + resolved "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f" + integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw== + dependencies: + p-limit "^4.0.0" + p-map-series@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca" @@ -9042,6 +8992,11 @@ path-exists@^4.0.0: resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== +path-exists@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7" + integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ== + "path-fx@^2.0.0", "path-fx@^2.1.1": version "2.1.2" resolved "https://registry.npmjs.org/path-fx/-/path-fx-2.1.2.tgz#10683d3e7c4f0aa4fa974fb6e5f1302c181eee00" @@ -9079,10 +9034,10 @@ path-platform@~0.11.15: resolved "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2" integrity sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg== -path-scurry@^1.10.2: - version "1.10.2" - resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7" - integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA== +path-scurry@^1.11.1: + version "1.11.1" + resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2" + integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA== dependencies: lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" @@ -9130,10 +9085,10 @@ performance-now@^2.1.0: resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +"picocolors@^1.0.0", "picocolors@^1.0.1": + version "1.0.1" + resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" + integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== "picomatch@^2.0.4", "picomatch@^2.2.3", "picomatch@^2.3.1": version "2.3.1" @@ -9177,13 +9132,20 @@ pirates@^4.0.4: resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== -"pkg-dir@^4.1.0", "pkg-dir@^4.2.0": +pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== dependencies: find-up "^4.0.0" +pkg-dir@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz#8f0c08d6df4476756c5ff29b3282d0bab7517d11" + integrity sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA== + dependencies: + find-up "^6.3.0" + possible-typed-array-names@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" @@ -9590,9 +9552,9 @@ postcss-reduce-transforms@^6.0.2: postcss-value-parser "^4.2.0" "postcss-selector-parser@^6.0.11", "postcss-selector-parser@^6.0.16", "postcss-selector-parser@^6.0.2", "postcss-selector-parser@^6.0.4", "postcss-selector-parser@^6.0.5", "postcss-selector-parser@^6.0.9": - version "6.0.16" - resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04" - integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw== + version "6.1.0" + resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz#49694cb4e7c649299fea510a29fa6577104bcf53" + integrity sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -9684,6 +9646,11 @@ proc-log@^3.0.0: resolved "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8" integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A== +proc-log@^4.2.0: + version "4.2.0" + resolved "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034" + integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA== + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -9867,9 +9834,9 @@ rc-align@^4.0.0: resize-observer-polyfill "^1.5.1" rc-dock@^3.2.9: - version "3.2.19" - resolved "https://registry.npmjs.org/rc-dock/-/rc-dock-3.2.19.tgz#246e76f0ffec69a2aa40c7c4ad0c4ef3a5edbf00" - integrity sha512-onjYMYw4IEzf5LbQyQt+a2mSJ58oxAgpu29CD8/rexR5IWjTsa3amxyF+CxHy2+wtqCDzi/qsDsJglH/k6Bx9g== + version "3.3.0" + resolved "https://registry.npmjs.org/rc-dock/-/rc-dock-3.3.0.tgz#cb895359b58118bc9ace94329731a5d35e3b4005" + integrity sha512-9rQAzHSLAdQz1ZpPqQGkZKlAt4YI6gNYjuqqpY6hIWBFDhVPccs0jYr7L7PP3OpmliZ/R60LgHfLFbrL9l+Tlg== dependencies: classnames "^2.5.1" lodash "^4.17.21" @@ -9914,13 +9881,13 @@ rc-menu@~9.8.4: rc-util "^5.27.0" "rc-motion@^2.0.0", "rc-motion@^2.4.3": - version "2.9.0" - resolved "https://registry.npmjs.org/rc-motion/-/rc-motion-2.9.0.tgz#9e18a1b8d61e528a97369cf9a7601e9b29205710" - integrity sha512-XIU2+xLkdIr1/h6ohPZXyPBMvOmuyFZQ/T0xnawz+Rh+gh4FINcnZmMT5UTIj6hgI0VLDjTaPeRd+smJeSPqiQ== + version "2.9.1" + resolved "https://registry.npmjs.org/rc-motion/-/rc-motion-2.9.1.tgz#5b405437f9f673ed1a59b6b797c2227c2d6b3d91" + integrity sha512-QD4bUqByjVQs7PhUT1d4bNxvtTcK9ETwtg7psbDfo6TmYalH/1hhjj4r2hbhW7g5OOEqYHhfwfj4noIvuOVRtQ== dependencies: "@babel/runtime" "^7.11.1" classnames "^2.2.1" - rc-util "^5.21.0" + rc-util "^5.39.3" rc-new-window@^0.1.13: version "0.1.13" @@ -9975,20 +9942,18 @@ rc-tabs@~11.16.1: rc-motion "^2.0.0" rc-util "^5.19.2" -"rc-util@^5.12.0", "rc-util@^5.17.0", "rc-util@^5.19.2", "rc-util@^5.21.0", "rc-util@^5.26.0", "rc-util@^5.27.0", "rc-util@^5.37.0", "rc-util@^5.38.0", "rc-util@^5.5.0": - version "5.39.1" - resolved "https://registry.npmjs.org/rc-util/-/rc-util-5.39.1.tgz#7bca4fb55e20add0eef5c23166cd9f9e5f51a8a1" - integrity sha512-OW/ERynNDgNr4y0oiFmtes3rbEamXw7GHGbkbNd9iRr7kgT03T6fT0b9WpJ3mbxKhyOcAHnGcIoh5u/cjrC2OQ== +"rc-util@^5.12.0", "rc-util@^5.17.0", "rc-util@^5.19.2", "rc-util@^5.26.0", "rc-util@^5.27.0", "rc-util@^5.37.0", "rc-util@^5.38.0", "rc-util@^5.39.3", "rc-util@^5.5.0": + version "5.41.0" + resolved "https://registry.npmjs.org/rc-util/-/rc-util-5.41.0.tgz#b1ba000d4f3a9e72563370a3243b59f89b40e1bd" + integrity sha512-xtlCim9RpmVv0Ar2Nnc3WfJCxjQkTf3xHPWoFdjp1fSs2NirQwqiQrfqdU9HUe0kdfb168M/T8Dq0IaX50xeKg== dependencies: "@babel/runtime" "^7.18.3" react-is "^18.2.0" -re-resizable@6.9.6: - version "6.9.6" - resolved "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.6.tgz#b95d37e3821481b56ddfb1e12862940a791e827d" - integrity sha512-0xYKS5+Z0zk+vICQlcZW+g54CcJTTmHluA7JUUgvERDxnKAnytylcyPsA+BSFi759s5hPlHmBRegFrwXs2FuBQ== - dependencies: - fast-memoize "^2.5.1" +re-resizable@6.9.17: + version "6.9.17" + resolved "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.17.tgz#78e4349934ff24a8fcb4b6b5a43ff9ed5f319d2a" + integrity sha512-OBqd1BwVXpEJJn/yYROG+CbeqIDBWIp6wathlpB0kzZWWZIY1gPTsgK2yJEui5hOvkCdC2mcexF2V3DZVfLq2g== react-arborist@^3.2.0: version "3.4.0" @@ -10067,15 +10032,7 @@ react-dom@^17.0.1: object-assign "^4.1.1" scheduler "^0.20.2" -react-draggable@4.4.5: - version "4.4.5" - resolved "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.5.tgz#9e37fe7ce1a4cf843030f521a0a4cc41886d7e7c" - integrity sha512-OMHzJdyJbYTZo4uQE393fHcqqPYsEtkjfMgvCHr6rejT+Ezn4OZbNyGH50vv+SunC1RMvwOTSWkEODQLzw1M9g== - dependencies: - clsx "^1.1.1" - prop-types "^15.8.1" - -react-draggable@^4.4.6: +"react-draggable@4.4.6", "react-draggable@^4.4.6": version "4.4.6" resolved "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.6.tgz#63343ee945770881ca1256a5b6fa5c9f5983fe1e" integrity sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw== @@ -10093,9 +10050,9 @@ react-dropzone@^14.2.1: prop-types "^15.8.1" react-frame-component@^5.2.6: - version "5.2.6" - resolved "https://registry.npmjs.org/react-frame-component/-/react-frame-component-5.2.6.tgz#0d9991d251ff1f7177479d8f370deea06b824b79" - integrity sha512-CwkEM5VSt6nFwZ1Op8hi3JB5rPseZlmnp5CGiismVTauE6S4Jsc4TNMlT0O7Cts4WgIC3ZBAQ2p1Mm9XgLbj+w== + version "5.2.7" + resolved "https://registry.npmjs.org/react-frame-component/-/react-frame-component-5.2.7.tgz#e31c0943be95fdf667c59d6d7fcf18c1dda4d4b2" + integrity sha512-ROjHtSLoSVYUBfTieazj/nL8jIX9rZFmHC0yXEU+dx6Y82OcBEGgU9o7VyHMrBFUN9FuQ849MtIPNNLsb4krbg== "react-is@^16.13.1", "react-is@^16.7.0": version "16.13.1" @@ -10108,9 +10065,9 @@ react-is@^17.0.1: integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== "react-is@^18.0.0", "react-is@^18.2.0": - version "18.2.0" - resolved "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" - integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== + version "18.3.1" + resolved "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" + integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== react-leaflet@^3.2.2: version "3.2.5" @@ -10139,13 +10096,13 @@ react-resize-detector@^9.1.0: lodash "^4.17.21" react-rnd@^10.3.5: - version "10.4.1" - resolved "https://registry.npmjs.org/react-rnd/-/react-rnd-10.4.1.tgz#9e1c3f244895d7862ef03be98b2a620848c3fba1" - integrity sha512-0m887AjQZr6p2ADLNnipquqsDq4XJu/uqVqI3zuoGD19tRm6uB83HmZWydtkilNp5EWsOHbLGF4IjWMdd5du8Q== + version "10.4.11" + resolved "https://registry.npmjs.org/react-rnd/-/react-rnd-10.4.11.tgz#d1c3086de4ab163e01b49f8feae5a14b3d58e3f7" + integrity sha512-XTfNGNcS0ad2vo3to7qNTB0BkFML9k1csIUI0Nlj44M6Uuh7yP/2h8WXiXcV3v3bxxVJck1C9K6FS1LrLH0E0Q== dependencies: - re-resizable "6.9.6" - react-draggable "4.4.5" - tslib "2.3.1" + re-resizable "6.9.17" + react-draggable "4.4.6" + tslib "2.6.2" react-select@^5.7.2: version "5.8.0" @@ -10268,12 +10225,12 @@ readable-web-to-node-stream@^3.0.0: dependencies: readable-stream "^3.6.0" -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== +rechoir@^0.8.0: + version "0.8.0" + resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" + integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== dependencies: - resolve "^1.9.0" + resolve "^1.20.0" redent@^3.0.0: version "3.0.0" @@ -10416,7 +10373,7 @@ resolve.exports@^2.0.0: resolved "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== -"resolve@^1.1.4", "resolve@^1.12.0", "resolve@^1.14.2", "resolve@^1.17.0", "resolve@^1.19.0", "resolve@^1.20.0", "resolve@^1.4.0", "resolve@^1.9.0": +"resolve@^1.1.4", "resolve@^1.12.0", "resolve@^1.14.2", "resolve@^1.17.0", "resolve@^1.19.0", "resolve@^1.20.0", "resolve@^1.4.0": version "1.22.8" resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -10520,9 +10477,9 @@ safe-regex-test@^1.0.3: integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== sax@^1.2.4: - version "1.3.0" - resolved "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0" - integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA== + version "1.4.1" + resolved "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f" + integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg== saxes@^6.0.0: version "6.0.0" @@ -10539,15 +10496,6 @@ scheduler@^0.20.2: loose-envify "^1.1.0" object-assign "^4.1.1" -schema-utils@^2.6.5: - version "2.7.1" - resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" - integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== - dependencies: - "@types/json-schema" "^7.0.5" - ajv "^6.12.4" - ajv-keywords "^3.5.2" - "schema-utils@^3.0.0", "schema-utils@^3.1.1", "schema-utils@^3.2.0": version "3.3.0" resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" @@ -10591,19 +10539,17 @@ semver-truncate@^1.1.2: resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -"semver@^6.0.0", "semver@^6.3.0", "semver@^6.3.1": +"semver@^6.3.0", "semver@^6.3.1": version "6.3.1" resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -"semver@^7.3.4", "semver@^7.3.5", "semver@^7.3.7", "semver@^7.5.3", "semver@^7.5.4": - version "7.6.0" - resolved "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" - integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== - dependencies: - lru-cache "^6.0.0" +"semver@^7.3.4", "semver@^7.3.5", "semver@^7.3.7", "semver@^7.5.3", "semver@^7.5.4", "semver@^7.6.0": + version "7.6.2" + resolved "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13" + integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w== -"serialize-javascript@^6.0.0", "serialize-javascript@^6.0.1": +"serialize-javascript@^6.0.0", "serialize-javascript@^6.0.1", "serialize-javascript@^6.0.2": version "6.0.2" resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g== @@ -10902,9 +10848,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.17" - resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c" - integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg== + version "3.0.18" + resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz#22aa922dcf2f2885a6494a261f2d8b75345d0326" + integrity sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ== split.js@^1.5.10: version "1.6.5" @@ -10927,18 +10873,18 @@ sprintf-js@~1.0.2: integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== sql-formatter@^15.1.2: - version "15.3.0" - resolved "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.3.0.tgz#d6daec93b5d3fd053f40295a306f5440cc578849" - integrity sha512-1aDYVEX+dwOSCkRYns4HEGupRZoaivcsNpU4IzR+MVC+cWFYK9/dce7pr4aId4+ED2iK9PNs3j1Vdf8C+SIvDg== + version "15.3.1" + resolved "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.3.1.tgz#e988861d172827b856470a9baefa0135737227df" + integrity sha512-L/dqan+Hrt0PpPdCbHcI9bdfOvqaQZR7v5c5SWMJ3bUGQSezK09Mm9q2I3B4iObjaq7FyoldIM+fDSmfzGRXCA== dependencies: argparse "^2.0.1" get-stdin "=8.0.0" nearley "^2.20.1" ssri@^10.0.0: - version "10.0.5" - resolved "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz#e49efcd6e36385196cb515d3a2ad6c3f0265ef8c" - integrity sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A== + version "10.0.6" + resolved "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5" + integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ== dependencies: minipass "^7.0.3" @@ -11033,7 +10979,7 @@ string-length@^4.0.1: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -string.prototype.matchall@^4.0.10: +string.prototype.matchall@^4.0.11: version "4.0.11" resolved "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz#1092a72c59268d2abaad76582dccc687c0297e0a" integrity sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg== @@ -11240,9 +11186,9 @@ stylis@4.2.0: integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw== stylis@^4.0.7: - version "4.3.1" - resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.1.tgz#ed8a9ebf9f76fe1e12d462f5cc3c4c980b23a7eb" - integrity sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ== + version "4.3.2" + resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz#8f76b70777dd53eb669c6f58c997bf0a9972e444" + integrity sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg== subarg@^1.0.0: version "1.0.0" @@ -11334,9 +11280,9 @@ svgo@^2.7.0: stable "^0.1.8" "svgo@^3.0.2", "svgo@^3.2.0": - version "3.2.0" - resolved "https://registry.npmjs.org/svgo/-/svgo-3.2.0.tgz#7a5dff2938d8c6096e00295c2390e8e652fa805d" - integrity sha512-4PP6CMW/V7l/GmKRKzsLR8xxjdHTV4IMvhTnpuHwwBazSIlw5W/5SmPjN8Dwyt7lKbSJrRDgp4t9ph0HgChFBQ== + version "3.3.2" + resolved "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz#ad58002652dffbb5986fc9716afe52d869ecbda8" + integrity sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw== dependencies: "@trysound/sax" "0.2.0" commander "^7.2.0" @@ -11418,9 +11364,9 @@ tempfile@^2.0.0: terser "^5.26.0" terser@^5.26.0: - version "5.30.3" - resolved "https://registry.npmjs.org/terser/-/terser-5.30.3.tgz#f1bb68ded42408c316b548e3ec2526d7dd03f4d2" - integrity sha512-STdUgOUx8rLbMGO9IOwHLpCqolkDITFFQSMYYwKE1N2lY6MVSaeoi10z/EhWxRc6ybqoVmKSkhKYH/XUpl7vSA== + version "5.31.1" + resolved "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz#735de3c987dd671e95190e6b98cfe2f07f3cf0d4" + integrity sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -11466,11 +11412,6 @@ timers-browserify@^1.0.1: dependencies: process "~0.11.0" -tiny-warning@^1.0.2: - version "1.0.3" - resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" - integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== - tmpl@1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" @@ -11507,9 +11448,9 @@ totalist@^3.0.0: integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ== tough-cookie@^4.1.2: - version "4.1.3" - resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" - integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== + version "4.1.4" + resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36" + integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag== dependencies: psl "^1.1.33" punycode "^2.1.1" @@ -11535,10 +11476,15 @@ trim-repeated@^1.0.0: dependencies: escape-string-regexp "^1.0.2" -tslib@2.3.1: - version "2.3.1" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== +ts-api-utils@^1.3.0: + version "1.3.0" + resolved "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1" + integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ== + +tslib@2.6.2: + version "2.6.2" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== tslib@^1.8.1: version "1.14.1" @@ -11546,9 +11492,9 @@ tslib@^1.8.1: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== "tslib@^2.0.3", "tslib@^2.4.0": - version "2.6.2" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" - integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== + version "2.6.3" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0" + integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== tsutils@^3.21.0: version "3.21.0" @@ -11670,10 +11616,10 @@ typedarray@^0.0.6: resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@^4.9.5: - version "4.9.5" - resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" - integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== +typescript@^5.4.5: + version "5.4.5" + resolved "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" + integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== uglify-js@^3.1.4: version "3.17.4" @@ -11786,12 +11732,12 @@ universalify@^0.2.0: integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== update-browserslist-db@^1.0.13: - version "1.0.13" - resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4" - integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg== + version "1.0.16" + resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz#f6d489ed90fb2f07d67784eb3f53d7891f736356" + integrity sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ== dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" + escalade "^3.1.2" + picocolors "^1.0.1" uplot-react@^1.1.4: version "1.1.5" @@ -11803,7 +11749,7 @@ uplot@^1.6.24: resolved "https://registry.npmjs.org/uplot/-/uplot-1.6.30.tgz#1622a96b7cb2e50622c74330823c321847cbc147" integrity sha512-48oVVRALM/128ttW19F2a2xobc2WfGdJ0VJFX00099CfqbCTuML7L2OrTKxNzeFP34eo1+yJbqFSoFAp2u28/Q== -uri-js@^4.2.2: +"uri-js@^4.2.2", "uri-js@^4.4.1": version "4.4.1" resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== @@ -11864,11 +11810,16 @@ use-isomorphic-layout-effect@^1.1.2: resolved "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb" integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA== -"use-sync-external-store@1.2.0", "use-sync-external-store@^1.2.0": +use-sync-external-store@1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== +use-sync-external-store@^1.2.0: + version "1.2.2" + resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz#c3b6390f3a30eba13200d2302dcdf1e7b57b2ef9" + integrity sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw== + "util-deprecate@^1.0.1", "util-deprecate@^1.0.2", "util-deprecate@~1.0.1": version "1.0.2" resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -11999,22 +11950,23 @@ webpack-bundle-analyzer@^4.8.0: sirv "^2.0.3" ws "^7.3.1" -webpack-cli@^4.5.0: - version "4.10.0" - resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" - integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== +webpack-cli@^5.1.4: + version "5.1.4" + resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" + integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.2.0" - "@webpack-cli/info" "^1.5.0" - "@webpack-cli/serve" "^1.7.0" + "@webpack-cli/configtest" "^2.1.1" + "@webpack-cli/info" "^2.0.2" + "@webpack-cli/serve" "^2.0.5" colorette "^2.0.14" - commander "^7.0.0" + commander "^10.0.1" cross-spawn "^7.0.3" + envinfo "^7.7.3" fastest-levenshtein "^1.0.12" import-local "^3.0.2" - interpret "^2.2.0" - rechoir "^0.7.0" + interpret "^3.1.1" + rechoir "^0.8.0" webpack-merge "^5.7.3" webpack-merge@^5.7.3: @@ -12179,6 +12131,11 @@ wkx@^0.5.0: dependencies: "@types/node" "*" +word-wrap@^1.2.5: + version "1.2.5" + resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" + integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== + wordwrap@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" @@ -12221,9 +12178,9 @@ ws@^7.3.1: integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== ws@^8.11.0: - version "8.16.0" - resolved "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" - integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== + version "8.17.0" + resolved "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea" + integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow== ws@~8.11.0: version "8.11.0" @@ -12340,6 +12297,11 @@ yocto-queue@^0.1.0: resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== +yocto-queue@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" + integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== + zustand@^4.4.1: version "4.5.2" resolved "https://registry.npmjs.org/zustand/-/zustand-4.5.2.tgz#fddbe7cac1e71d45413b3682cdb47b48034c3848" diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 9d3f08cbc8b2..1c9c2d3b397c 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,52 +1,52 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.121.0"; + version = "3.122.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.121.0-linux-x64.tar.gz"; - sha256 = "14w74zr07drz0llmvaqf2y9ylay9v7r9zrqn2irh12akgj2is5zk"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.122.0-linux-x64.tar.gz"; + sha256 = "0672w7bk8yrvbiaivd97bhh3gixas8hy44i8lfsb6d9n8wll6r8r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-linux-amd64.tar.gz"; - sha256 = "0b35v0fx2ycv7fb32s457fgh24cksrjw393p437sbdl18c9kv86d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-linux-amd64.tar.gz"; + sha256 = "1iyjviw3vqwan1gxwwwz4kgy1xm4gvr7iw0284176qmjy8pci2hk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.2.0-linux-amd64.tar.gz"; sha256 = "0vwlil9awkfs774992bb9lj6bggjw4vnys0z0pzsd4lmidxc8mv8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.1-linux-amd64.tar.gz"; - sha256 = "17yvh68ycy2knllcdwzavbxz3cq93iclw26fpvzzzrlyypi4hy90"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.58.0-linux-amd64.tar.gz"; + sha256 = "1z7xkxmbr35s4q1a32abiscq4isnh4rd1xs7lasvxsjc4anzpd35"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-linux-amd64.tar.gz"; - sha256 = "1nqxc28ncrq1zpclm2acvvqa8yl21nmk6lb5sqsvy5kbizpzslar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.1.0-linux-amd64.tar.gz"; + sha256 = "113c8gnhq2mn4rk4n5zqlgx9gk0mqj62hm4i9dd2rnjzaapaj2am"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.4.0-linux-amd64.tar.gz"; sha256 = "0npah90y0529wfkcx0fjnlrnfaihmsg1b28isq1iskkm5pzc995g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.41.0-linux-amd64.tar.gz"; - sha256 = "0ydk31n1x8b41pbv9lva0il7c7pdifczavvr1gfmyykcrs1i2nnj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.43.0-linux-amd64.tar.gz"; + sha256 = "0fqsxcb0bf6hg8kv2z5m09dj9c5p34d5vi0q14y179pi5y7yxa1s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.81.0-linux-amd64.tar.gz"; - sha256 = "1w6pk54inxswhazy0y452n7pxmwcbyqp9rqb3hnxlsc77bb0l4a0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.82.0-linux-amd64.tar.gz"; + sha256 = "1sw9yifsn74mr9qx3ywda6jkgxh04s42lf0b64bn8y9ncr1igpxx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-linux-amd64.tar.gz"; - sha256 = "00cbix4cdhmgj50ilqjyn2ia3mxyp094n1979pm15j88plvambf3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.1-linux-amd64.tar.gz"; + sha256 = "1cjckw5ffqa1qswal1zyr9r4acriyrv5nrwmf06h6ggilx2xd7h9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-linux-amd64.tar.gz"; sha256 = "05vyz81a5z96k35hh8ky9bl6c505jfb6rxsc82qlfh8kx110p66l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.33.0-linux-amd64.tar.gz"; - sha256 = "0zgjmil0a3fidjbi5swlykg39qfifwszanwvkw37kxndvgqappmc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.33.1-linux-amd64.tar.gz"; + sha256 = "1fn6x1phyn9172bj8w822wvw0karbi1cnqc06hnnys8csxgrfpv1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-amd64.tar.gz"; @@ -69,12 +69,12 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.8.0-linux-amd64.tar.gz"; - sha256 = "17zngh68ssilazg5caiz2amzcgd1kp906k5viwp2ig70wp6gwkyy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.9.0-linux-amd64.tar.gz"; + sha256 = "03wx8b74nr93b5z7cm94n728ljzjggpxa0x6n1zn1zcdr6f495sk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.28.0-linux-amd64.tar.gz"; - sha256 = "1nr7lbdql05imn435gbl87w2fng6kkqza73dr5cp8mvp8hyjrykv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.29.0-linux-amd64.tar.gz"; + sha256 = "10y3czaa3cl6sj1ivkl687si6f6d8n5iamkaba3jcdd5k0qr4v0r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.2-linux-amd64.tar.gz"; @@ -93,16 +93,16 @@ sha256 = "1hjg23ah9v20kfi08cln76akvldn93s24rcsx7dilsz2hiw4qr9x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.13.1-linux-amd64.tar.gz"; - sha256 = "08vjj3wlxkrriqncmhx4r03dlg8w670qp9vhkzi4srax3141z518"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.14.0-linux-amd64.tar.gz"; + sha256 = "11ha4dlj1vk79pb1n43digkrlamqymqvv65hzp9891dmrybswrib"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.22.0-linux-amd64.tar.gz"; - sha256 = "1b1asxsrhzw060sr99hjx5nd6s7s7k8r18274104ngq5h66n30ln"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.22.1-linux-amd64.tar.gz"; + sha256 = "0xjmi10g569j7n809qgzwsijswa1qbzxv0vxvji4mwwbj1kjfqfr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.3-linux-amd64.tar.gz"; - sha256 = "07y4bnkiw0yn3vbm6h4z44v4yq26mbnhsfh3fpp8jcfm3raqivsy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-linux-amd64.tar.gz"; + sha256 = "0jl1nnvnj647rk001gakwdc09a58jc6i9g3x7mp5b6ywg46gjvqy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.5-linux-amd64.tar.gz"; @@ -117,28 +117,28 @@ sha256 = "01qqxxap2cmvgc0msajxdsr7ddpw9ly1ms70fzb4vk98dr9q7lpr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.2-linux-amd64.tar.gz"; - sha256 = "05k0kq11z4m5vjj41sqq5vi7qpiwmqrw3plw96f750bv5bzgpf09"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.3-linux-amd64.tar.gz"; + sha256 = "0byfb2zjymwmgd52wfk1xhp1llw6b4hniwa4faf66fmpr2i157nd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.55.0-linux-amd64.tar.gz"; sha256 = "0ibyifkbbvkid3pfgiy8c25mrykkjgkaq2r8cn7jd6yaf15x0p3a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.81.0-linux-amd64.tar.gz"; - sha256 = "0li0n75c8b52lsm22knymn1y4zrw08aiglhcp16qpwnzh1r2j7y6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.82.1-linux-amd64.tar.gz"; + sha256 = "0kwvz5wb4m2q5y9pv2rkn71k3s1z4b2ayh1afkh043d2aqm22d0a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-linux-amd64.tar.gz"; - sha256 = "124rdhsl10w2w4m2lyx71fs9mfp61v0cjdirpj6rj7f05lqnc4rx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.1-linux-amd64.tar.gz"; + sha256 = "191nslfjl5l3lv50ficavhir4qpnr5dha1zvsg87ps76cp693jnh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.0-linux-amd64.tar.gz"; - sha256 = "106mc4lc5j16wkwykn8336v135y3zmx6b80q7292jjryh16pl7mk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.1-linux-amd64.tar.gz"; + sha256 = "1pi6mfd9309ly8d633cv3mc4mm1gmwg8hfamdyljkw4svagl9l67"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.3-linux-amd64.tar.gz"; - sha256 = "0sy0fm73h5rv7jilj6dcyf2244hws8j4ayb3scr4ranckn05dpm1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-linux-amd64.tar.gz"; + sha256 = "0rx05a9mdlv9yfsf6pi0ccdv7zfp7kgrj5zhfjagbk8x04cnygrz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.2.0-linux-amd64.tar.gz"; @@ -149,8 +149,8 @@ sha256 = "0f3pa8y29n3isxa4kwqfsr6i1x3xhcj7jnqmnzkc60y7lg4r1z12"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-linux-amd64.tar.gz"; - sha256 = "0qr4ymmnhc51grsnpyv75kdx4bpvad7n1y9fzgk3vagaws0lypih"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.2-linux-amd64.tar.gz"; + sha256 = "0q4vs70zy873cwzh1y364bvfpfbmb18mr5gbiy069g38wbhk4i3g"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.2-linux-amd64.tar.gz"; @@ -163,48 +163,48 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.121.0-darwin-x64.tar.gz"; - sha256 = "1cpgnj8d291181f08mppinhywjir4i232x2k1n41f2gfaf7dikbx"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.122.0-darwin-x64.tar.gz"; + sha256 = "1wjccvrbnkbcr8w62r3kwi826sy6xya20qawjvkj4mbaawajwvdh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-darwin-amd64.tar.gz"; - sha256 = "0r0fs4q2aaig3138fd8ky10sfdwwa8vkqvjmyik59ri9xgpxrc6n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-darwin-amd64.tar.gz"; + sha256 = "0qw32ya0xnrdg51spwbh6g9c6zgmy5xyb5y38h3v93ksc45d0kab"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.2.0-darwin-amd64.tar.gz"; sha256 = "0kwj3m50giwk8p0d0amy5nrvf4m4ms5salbh51nd4fm0l5hz2n0q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.1-darwin-amd64.tar.gz"; - sha256 = "157mqj4bp3g99dlxsvw7v9ir7ngc8q1cp6s70nmsn2s3kvwn782n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.58.0-darwin-amd64.tar.gz"; + sha256 = "0x5x273vf0cj5vl4iwlbcrww5v2sbfwpkbisxnkmgnlnylzdn8za"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-darwin-amd64.tar.gz"; - sha256 = "1qi3vmzsp3bcq7y8y7q0h7hiqk6r5mzjq7h6i0g77fjcyjabqdch"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.1.0-darwin-amd64.tar.gz"; + sha256 = "0h4iwygj1h4fv9hwcam4v7mswfahy2xsk872wp1c21csz69izm1w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.4.0-darwin-amd64.tar.gz"; sha256 = "17k2c07v1gh0wdqqa1c29hl0mbxc1lkk3rdfnvqkh53flklm45yd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.41.0-darwin-amd64.tar.gz"; - sha256 = "0w4dcx2y4y7alykf795z2pmw7i9shlzk3qizrfhpjwpk0q75rr35"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.43.0-darwin-amd64.tar.gz"; + sha256 = "0b25gk4qxnfdqnmwj5py3xb6ahcs59s7ihgbar55rh0x8phy8wzq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.81.0-darwin-amd64.tar.gz"; - sha256 = "19lpmkhvc5d32iq2p31116hrcp3za3cm9wxkp3cqwssq9lhhw94r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.82.0-darwin-amd64.tar.gz"; + sha256 = "17xilwl6b91g90f4hg5sdxghv41lnqpb8vsz44gifhlkslmc9az1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-darwin-amd64.tar.gz"; - sha256 = "052hkf5ljyg3fhqn7z1dk4mhp4pbzvb2klvc9d2p4qqzv8vc47gr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.1-darwin-amd64.tar.gz"; + sha256 = "07zsm0zp0v36kscddlb53aiil1xmzq840qq35b9bvv17bbk2vvnk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-darwin-amd64.tar.gz"; sha256 = "0blhx82diydpwbfr7grj2zxk29pvg0b2w2rawlv60mhc3dw6ixar"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.33.0-darwin-amd64.tar.gz"; - sha256 = "1hzg4xdbgfh46733pgnjj9yl0zh3ymzq1rnhyb27rl5v543pw94c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.33.1-darwin-amd64.tar.gz"; + sha256 = "1788wzzzk6vc6c96adqi6dk1w9cxqhs8z0q9gwj5gfnvhq187qwc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-amd64.tar.gz"; @@ -227,12 +227,12 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.8.0-darwin-amd64.tar.gz"; - sha256 = "009w2zsmy4nkc5w8k0ldm5fl2yjl8h52574w1as27kz0800nibav"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.9.0-darwin-amd64.tar.gz"; + sha256 = "1kcp2hryja7bn7n2115wqlc326hb5ln1bk8fzmhlbwaysamxspbj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.28.0-darwin-amd64.tar.gz"; - sha256 = "16jpbkb4yms7vvffisgi1bqx7anyb18qzjprkl5rjbjp5bdl83ra"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.29.0-darwin-amd64.tar.gz"; + sha256 = "0213rp5v6m43bwcibnwrsz6zmnf1ix54hwncw9b9gbr8hp43sz2l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.2-darwin-amd64.tar.gz"; @@ -251,16 +251,16 @@ sha256 = "17d2j4wf08q818mhb1qlji1hb3b8900hx0yrpk43xnqwvfjsyyyh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.13.1-darwin-amd64.tar.gz"; - sha256 = "082gxffyjipccpi4cn6mlwvcg4c59773z7id58gsvdvxaddh0jpj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.14.0-darwin-amd64.tar.gz"; + sha256 = "137ym95k9fssmfch1af8lm044wwvs2v148jzhw8lngy2l5jz5qbv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.22.0-darwin-amd64.tar.gz"; - sha256 = "0i2v2l7k686nbbhr1zsfk9wzmlh34x2i0lgi3c1dpgvzdkra399a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.22.1-darwin-amd64.tar.gz"; + sha256 = "03542g9kqhqb1vj5ik53d3h2s07sivd51m86v88jzbkld3yk5kw1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.3-darwin-amd64.tar.gz"; - sha256 = "02ggykac6acylarljx0qg8i5b3k6apiz8njhcapfpw7my4whzzd7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-darwin-amd64.tar.gz"; + sha256 = "1v5kblswsaqcj8d7i15nqqsrmcdv4kgg9l7v23s1ggipk4bwjzjg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.5-darwin-amd64.tar.gz"; @@ -275,28 +275,28 @@ sha256 = "1m255nwx3qzl3pcsm2mqwrpzg6rwb1yl5js7l0ra5hz066pw0wai"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.2-darwin-amd64.tar.gz"; - sha256 = "0y4g3agranvahayblmy9m6i05f4x290r9lhc1pzhjsnz1xdh7nf4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.3-darwin-amd64.tar.gz"; + sha256 = "0xfqi33x1crkvqdl3iqq1i7vky2s3v36fyb1adrn6067mbd7dgxj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.55.0-darwin-amd64.tar.gz"; sha256 = "1yg346nz6nrp8s9f998jynn250nywpg1nzxx6820pdinvaw81sgy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.81.0-darwin-amd64.tar.gz"; - sha256 = "1aqalfgy0a2w8ka5q4ywr98caaz8x16yxpplbhf9p8rnnsmx61mp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.82.1-darwin-amd64.tar.gz"; + sha256 = "0nbncc4faq7cav8wgyvby54g7gs1iix13iyf5d1mlybx76l3mxl9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-darwin-amd64.tar.gz"; - sha256 = "0fna4395jc7f21kpp7lc5rda7sw8z1mmdgz690cl9lfqp5md5amh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.1-darwin-amd64.tar.gz"; + sha256 = "0mfg1c9dn948kkh3ylfm5njzri28hngv8fbszhx40x5qkyla6qkj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.0-darwin-amd64.tar.gz"; - sha256 = "1n09gli1102jlmqxyh788gfwn9rhzw7iswj1n8xnx9qqxssjngl5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.1-darwin-amd64.tar.gz"; + sha256 = "0021nwmzy3kf87da6r77di0gqpi6g9qby3r459d71631g19xi5hs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.3-darwin-amd64.tar.gz"; - sha256 = "1yf2xhsxg08wk5flzj6m0ix8www5qh0xx1ak7kd7hhnidfvshhiy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-darwin-amd64.tar.gz"; + sha256 = "0zqc8iwzgg5aw03sbgcmpi3s0dffya7c8qx2ncxjvq1hcdhzsyj7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.2.0-darwin-amd64.tar.gz"; @@ -307,8 +307,8 @@ sha256 = "06vdv0mms6ksn1ah61afkfi2jx6q0sicbkvw2ngd98ch8djjqysk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-darwin-amd64.tar.gz"; - sha256 = "14sab80f21dnmga4garkh931gwrf2iclhby3vrywi6m80vwcnkkv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.2-darwin-amd64.tar.gz"; + sha256 = "0v8jpsw7x66n3v2w2mvyr7yfg2dwvm6jz0l1sl5k477j3nh97hhk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.2-darwin-amd64.tar.gz"; @@ -321,48 +321,48 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.121.0-linux-arm64.tar.gz"; - sha256 = "1qpmpwhba4pg0mk13rxhdx6zgdnjf4dbfvgaragyajm41wiyz8pl"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.122.0-linux-arm64.tar.gz"; + sha256 = "07b3bs1h51i66sqmha96mcxm71rdiawcci436m8p49fsp204rg5m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-linux-arm64.tar.gz"; - sha256 = "08q48mmxdvzjlkysbfhbpsxqlphmzld2lmps5wnkillxswil028k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-linux-arm64.tar.gz"; + sha256 = "15f5zcnrz9p4fkmaj7cw7jgkhy38yyj9xh33qjcfk7k1qgxy8jf7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.2.0-linux-arm64.tar.gz"; sha256 = "0a1kqpjwsksimv29y5q8d4b36s28801vhim1f5agq0c0lrn1fcds"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.1-linux-arm64.tar.gz"; - sha256 = "09phgiri9zjp8ihys8g31m8mmvck0pxg3d4h4p92ynagrb7mym79"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.58.0-linux-arm64.tar.gz"; + sha256 = "0b1wswws1af5wcrw5pl7qj5qs96qlljl6s34yvpl6iqdd8m1xv9h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-linux-arm64.tar.gz"; - sha256 = "0fxsa527dnvc77flfgqbmj5823mfwwfp67r9sswkhik3i6i0lm3c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.1.0-linux-arm64.tar.gz"; + sha256 = "1caqbckxgyznrhypgvnrv3x3f07np6vvkhlwa4xq952m618r10g9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.4.0-linux-arm64.tar.gz"; sha256 = "1zbq7k4w9m8kq4j55ccb434lcvlbyx5idf2fjljnw2ic5xznrins"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.41.0-linux-arm64.tar.gz"; - sha256 = "12531i2swifhg2pl4c0daslldwvbadwls27ikwb777qr302mqnbl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.43.0-linux-arm64.tar.gz"; + sha256 = "19di4nd2gx9m5dpazp3ddghzylzsxwnz7d67xjrkcksq9nh7k2ap"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.81.0-linux-arm64.tar.gz"; - sha256 = "0wxk3r8w80f2kvnn5djvwsja7vahcvq73bwvv3g9nh98qbrvzdcf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.82.0-linux-arm64.tar.gz"; + sha256 = "07rr46aalny02r0vh5q2ic3rd8j9kk34nq8rj9qhmdqs5mw61dzs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-linux-arm64.tar.gz"; - sha256 = "08a20lp4ym5cncv6q3s7dbwrhhn76630x8a2arsm4j7gcqja389m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.1-linux-arm64.tar.gz"; + sha256 = "1dnrmi3ijav2h37pskh6wav6jdpkrx9rz2yachfg1zmzkb1jl1dv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-linux-arm64.tar.gz"; sha256 = "1chrfqdiwx6lvylrih6zx7m1zkrmcb7lz0x1cb9hc0l5fy93rc63"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.33.0-linux-arm64.tar.gz"; - sha256 = "15yh1k3yvf72hdbjffsxhm0bq65mb6ca4fzwbhp65mahxwgm4bak"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.33.1-linux-arm64.tar.gz"; + sha256 = "03c3nllq28s7zhy32y8p1mwf2njbx0y6skk7kynxdz2aviv3s4mr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-arm64.tar.gz"; @@ -385,12 +385,12 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.8.0-linux-arm64.tar.gz"; - sha256 = "09cdx6hh2lvipnj4fsff66vq8i3fvggs253ik2a8lpajg4xdhswi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.9.0-linux-arm64.tar.gz"; + sha256 = "1fr9hm4pkrhhgw6i9ay0mrnf17p5q8sj2bjf1v3lqgchfw8z6sga"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.28.0-linux-arm64.tar.gz"; - sha256 = "07cl25q1n94k956jykmz78bx0zpyn808l306zs55d2mvz3cj71qw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.29.0-linux-arm64.tar.gz"; + sha256 = "0bdp9r1f0swcclska949srgq681q39xknqvdl0n4z3ksq60zsvwc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.2-linux-arm64.tar.gz"; @@ -409,16 +409,16 @@ sha256 = "11winxlgf2p325xppp9xa0p2mhncj72xpcyxgz13wizk33saj649"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.13.1-linux-arm64.tar.gz"; - sha256 = "12y68fz2bvnpg35agdbrplmh208wn8db1fnx7y1ml4agfkrsvrqg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.14.0-linux-arm64.tar.gz"; + sha256 = "0ivihlfbzh5flbwmxb1wsf872yq9hpcwysg1fg0rxg4i1jzgd99n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.22.0-linux-arm64.tar.gz"; - sha256 = "0c2syxqpp0p37xgphwycaf1br9pw4lgkl30zzgcdp8mbdd2jnbw2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.22.1-linux-arm64.tar.gz"; + sha256 = "14m2g6jr47fw2dnlyllliwafny129da5aw972la6qjm08gbq683v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.3-linux-arm64.tar.gz"; - sha256 = "12hfiwhxwj3ah0fbcagjmwm5fzp7qs8cxaygr3w7ajq4x7yfdadf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-linux-arm64.tar.gz"; + sha256 = "11a8sm8z9zih5i4kcw5mvh18qc3x4rzln1nyhgknymymyqc4wqyp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.5-linux-arm64.tar.gz"; @@ -433,28 +433,28 @@ sha256 = "0kix5wkdhr1svbqicvfs91g43jwzp80zi07wq564pkphr907r99g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.2-linux-arm64.tar.gz"; - sha256 = "0s7sqcrf9nvlyfjcj2inbifdn5xlffcmsby1giiwjcjfvjk5wl8j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.3-linux-arm64.tar.gz"; + sha256 = "064x91jvbqj142rkyphvwwds71i347nifv5akak35lf0ha4v57hw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.55.0-linux-arm64.tar.gz"; sha256 = "15n7wi330pfqg4z196cjx5gksdz3nhaqbjvxslzx9lx501ly3npd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.81.0-linux-arm64.tar.gz"; - sha256 = "0gara61i7n7z42q69cwv98hp8ac7wvpgw1g349bbl2kjrd9ymxvc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.82.1-linux-arm64.tar.gz"; + sha256 = "1jc892fmdihmw0s6h01pz1b4k80x8x6rbasli682y8cswzrcbk5k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-linux-arm64.tar.gz"; - sha256 = "0vhf8l6ipyhm0ivl8ixpwha5a8pl715qxgncdwz7cfqrh24sw2n7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.1-linux-arm64.tar.gz"; + sha256 = "1rjjr3xxmms646navaiijcx70jv36mngxp9hkiab16avxs96vgd0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.0-linux-arm64.tar.gz"; - sha256 = "193pqh9gcl3n80vchfjxh5n88l0vv12rh9gjqqladidnl7v7qjr0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.1-linux-arm64.tar.gz"; + sha256 = "0jxrhwv8ailnakxqa8lcbds02r5m33xvn4n1xrrsq2xj15vbyzlz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.3-linux-arm64.tar.gz"; - sha256 = "0fxxiyl1g120lzc2rm13cz7lxjp1psvzjd811i7ljy43ii05ahq4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-linux-arm64.tar.gz"; + sha256 = "1868473rk41dhl2gxabg6bin8m9c1lzs52wmcbpjrn91wb8pyz7v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.2.0-linux-arm64.tar.gz"; @@ -465,8 +465,8 @@ sha256 = "0j9w042blbs0wq3qlnjk20a9bs48v3jmg4s3z2mn39c7ff1604by"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-linux-arm64.tar.gz"; - sha256 = "1rd2nim8x9zy07vsc2gjj71zfv82bnz3n45v0k0mv516f6m4f4vj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.2-linux-arm64.tar.gz"; + sha256 = "157xjjg5bcq1hzqpz1gw5ymc86r4jcd33f5wxl93j1yc997na0mv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.2-linux-arm64.tar.gz"; @@ -479,48 +479,48 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.121.0-darwin-arm64.tar.gz"; - sha256 = "0c0zhkc2p2bpnx3pzf63nl77w3qcdclrn7jns6yrp8nghaaq383x"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.122.0-darwin-arm64.tar.gz"; + sha256 = "1yp4pj17szdmdxis3xc937q752jlsi2hmscdswal4am8yqg0cdvm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-darwin-arm64.tar.gz"; - sha256 = "0ymj35japjafjm0cm7fqzbhss4dh7bapz8yr60qz2l9bmz5nm3d1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-darwin-arm64.tar.gz"; + sha256 = "0dgimn8pi53aml8zzwcirvqdjg7mm50lh9897p266zsfbzlp3i4r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.2.0-darwin-arm64.tar.gz"; sha256 = "0dydbqff9rd7f8ys2imjz3rf3c4y1248zmrbhsr78jywdw1h7fa3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.1-darwin-arm64.tar.gz"; - sha256 = "1p41qcjid0bndmvqbdj9xp3jcvcwww3np7wsldvnbi8fbp0daavf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.58.0-darwin-arm64.tar.gz"; + sha256 = "1zjf7ixbha3vf0y7m6jbr0jkvzncd15gsjxmmbpsm1mci5y0fj2p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-darwin-arm64.tar.gz"; - sha256 = "1g461qcw8479fgchyg0wl086lay2irz7f1415bdvjhcjhjsyqas9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.1.0-darwin-arm64.tar.gz"; + sha256 = "0lfmdkr0s0ndi7dahfmhl3nizwkxh9hx5w51i1qxrd5wk3gnkafm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.4.0-darwin-arm64.tar.gz"; sha256 = "09ji7blpyf1zjffilbn1nmn4606ngzn8is0c78wzm14mc4cg4ypj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.41.0-darwin-arm64.tar.gz"; - sha256 = "1cfkygay4yacjjb49z1j0q1hh9kppq53q471nw5gm1rz71qlzqan"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.43.0-darwin-arm64.tar.gz"; + sha256 = "1i62c5sqmd2mlgfjnkrk4kqrgljww0h4zlq6phpvbj1cbgg3rjfl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.81.0-darwin-arm64.tar.gz"; - sha256 = "15bvl134a3dg6mx09gqrvcv3c21ib8ln824vwc6dpj8hg6f9nk8m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.82.0-darwin-arm64.tar.gz"; + sha256 = "1cjbawy4qzsv2j7cbnkxpgjd24sprch0lyplrlsk5srhf0rmngzf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-darwin-arm64.tar.gz"; - sha256 = "0171rb3d1582vi0p67s4cmcjx19a3r278w4a1vlmqadk5jg9xx2k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.1-darwin-arm64.tar.gz"; + sha256 = "1n0ssfz1sbmlhci3s0ysvxmcpx7lzpkqamklw8g8sv7ncg3xqaa2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-darwin-arm64.tar.gz"; sha256 = "1m53gzviimjcr3dl0pydafa6dl1r0q6ih1gwhm7lvgpll300wl1q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.33.0-darwin-arm64.tar.gz"; - sha256 = "06036cwp66s2hpa0y999mz6vxs51mb9rryp29hqxsra2bv7wb3kj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.33.1-darwin-arm64.tar.gz"; + sha256 = "1nfh59ajyzlshv4nbm0qwsbs3ir066kk7k0ynbjbrwkyh0hcfq9n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-arm64.tar.gz"; @@ -543,12 +543,12 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.8.0-darwin-arm64.tar.gz"; - sha256 = "1054c8cici744kyf817q8fk89ljcijxi7g5vi9080w4j6hxmabvn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.9.0-darwin-arm64.tar.gz"; + sha256 = "0sd24dkf2bbz113vl59yc4ka5kxjdgsz0z6a84nnfa66llgr81b7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.28.0-darwin-arm64.tar.gz"; - sha256 = "1cqm3r6qv5wgz3pmjq7c9184pgjr26sjkjzkk2x3fvi431z4n0q9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.29.0-darwin-arm64.tar.gz"; + sha256 = "1c44yhh0dpsjbglyns9vwd4rkhn4zamvh53f41qds3scw25sfz3y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.2-darwin-arm64.tar.gz"; @@ -567,16 +567,16 @@ sha256 = "1cjq3n11hlsj4v0yi2xyapqk4ibf16qg9n9apwwgqcaz1l1sq8z2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.13.1-darwin-arm64.tar.gz"; - sha256 = "0jkv32p117nyr4cx03iflqz8mhllkfnwf03xdz771ii2nw6xvj5z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.14.0-darwin-arm64.tar.gz"; + sha256 = "1jm063brl4c55ggp0g5fim7njjln8x62z0bh1b8h902sllwvrr26"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.22.0-darwin-arm64.tar.gz"; - sha256 = "06x4b6lyrma88vlw6s6dq235dx8213yiqc2xav441w42ynzizip1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.22.1-darwin-arm64.tar.gz"; + sha256 = "0v03yzifswinslzbnyif0570c6gb3g4dfx2qnyp0hp5p2hhaij5g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.3-darwin-arm64.tar.gz"; - sha256 = "1l6q20hinxki5124s14lz67zwlwjdmzh33yni3hwm79cwzvvqqi9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-darwin-arm64.tar.gz"; + sha256 = "02mnm525kaxsd0mabpv7j92pj15sv972ikc9dr0vr5sd4dqmjj2k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.5-darwin-arm64.tar.gz"; @@ -591,28 +591,28 @@ sha256 = "16m2bd2ymaaaw4ac80kg349vwgc8f1b0nqkkkmc24k3hxv9rxlh9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.2-darwin-arm64.tar.gz"; - sha256 = "0m266lqic8x0j6nx7yyfan1d8n2zqpiil41qvqkax3za81aymykv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.3-darwin-arm64.tar.gz"; + sha256 = "15l2609g7z2xxsblakwq3d3lyg32swb4lmfsrn7m0cwa2a2s2v1x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.55.0-darwin-arm64.tar.gz"; sha256 = "1gfifqyj3aab1cwwsd99pdidvqwwyab558ca98l318jzl02855b9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.81.0-darwin-arm64.tar.gz"; - sha256 = "13z3pvd2i0sr0h723z7b0i0nni7dpd7zvgcd1gs01xbql8av7h8r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.82.1-darwin-arm64.tar.gz"; + sha256 = "1ahc43vj0qijycp1sqk5xv7wi1aqsis5vck4722bczvg09an4f16"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-darwin-arm64.tar.gz"; - sha256 = "0liqf7sv4bcc0ipnnmilr7k3v4bgysxcs395pk4gvz8b4xssz1lc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.1-darwin-arm64.tar.gz"; + sha256 = "1x9vc999rm8sb14294003ak64cim939k2p2lrng2yjib8h553w9y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.0-darwin-arm64.tar.gz"; - sha256 = "0g40px8rszsh34vv6kgln29ryjf9niricpf3rvs9g0667pbv9rs2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.1-darwin-arm64.tar.gz"; + sha256 = "01imbxv3l7f0kybykkcdnbvhaypnqalm1n6gzkz6badhazgl9552"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.3-darwin-arm64.tar.gz"; - sha256 = "00iql0iprfmp4glshlx7w9lz8ifmzcp7cbh8qsnacvhbix0azsrg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-darwin-arm64.tar.gz"; + sha256 = "1az0h9xq7py2cn9qwnhndacla8bfayznv2zbghqqy5wnc3rwbdr7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.2.0-darwin-arm64.tar.gz"; @@ -623,8 +623,8 @@ sha256 = "0djz66nn08bm47cqwai7mlgwffm6xzn4p3niwsh280xnj0q9hkbq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-darwin-arm64.tar.gz"; - sha256 = "1k3x749rgabshcpy4y6xymjwif5h75kczm0vq7zjfc9z2ds56ig9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.2-darwin-arm64.tar.gz"; + sha256 = "1kb0qxlzw907656jzdy3695rivcdmmik99n588znq3h1pcdn44w1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.2-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 01b2cc14a913..bdf7bc83eecf 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.94.16"; + version = "0.95.2"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-oWKE7k/ryEDdz63xeauDGK9y0nz6pri/sOnFTk0qBdM="; + hash = "sha256-Y2FPEGL0KAvElWT9KVQtkrOB1hevU6EY9DvRurXaMnI="; }; - vendorHash = "sha256-qrDadHGhjwsAIfIQIkUeT7Tehv1sTtsfzgPyKxc5zJE="; + vendorHash = "sha256-maeoEs6He4Qb4EOYCx44Ly8713NFn/5qWgNjb1s2ajw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 26ac2c3938a1..1de32cefab14 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -11,19 +11,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.52.2"; + version = "0.53.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-3RUL0sgO2/hcfuihNKr51t0qbXvxs9X7yD/OBGATDdw="; + hash = "sha256-DzCPJU99cLDnVGsFImy2lQX2WBXXMaiF3dM8P/ZIdvA="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-VkUyjmiiJsDx7NdU6T20LB3tltOYYtf/RaTTPuliMQU="; + vendorHash = "sha256-QRdXhISiTVFWn54qYT+0hXMr2RYkRAV29HFv3zUPeHE="; subPackages = [ "cmd/trivy" ]; diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix index dc0ec7d987e6..a5f5312502c7 100644 --- a/pkgs/tools/admin/turbovnc/default.nix +++ b/pkgs/tools/admin/turbovnc/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { # to the swrast dri driver in Mesa. # Can also be given at runtime to its `Xvnc` as: # -dridir /nix/store/...-mesa-20.1.10-drivers/lib/dri/ - "-DXORG_DRI_DRIVER_PATH=${mesa.drivers}/lib/dri" + "-DXORG_DRI_DRIVER_PATH=${mesa.driverLink}/lib/dri" # The build system doesn't find these files automatically. "-DTJPEG_JAR=${libjpeg_turbo.out}/share/java/turbojpeg.jar" "-DTJPEG_JNILIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index c24176263dfe..3408ce8c08d1 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchurl +, fetchzip # Only used for Linux's x86/x86_64 , uasm @@ -25,33 +25,24 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "7zz"; - version = "24.06"; + version = "24.07"; - src = fetchurl { + src = fetchzip { url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz"; hash = { - free = "sha256-X3uqGnJGQpW5MOaTtgWYwwrhS84e+piX7Gc+e8Pll00="; - unfree = "sha256-KqFmDHc1JbLthNbNf/BoDHhuwIk7h+TbRGVNy39ayLU="; + free = "sha256-D41Sf437WYRQMdVW7hwcnZI0UG67IJsTTMfxlpkk36M="; + unfree = "sha256-iKCs893IFG0I6a2kpUe0qiuCX+YUxIgMIBRykc9XYjA="; }.${if enableUnfree then "unfree" else "free"}; - downloadToTemp = (!enableUnfree); + stripRoot = false; # remove the unRAR related code from the src drv # > the license requires that you agree to these use restrictions, # > or you must remove the software (source and binary) from your hard disks # https://fedoraproject.org/wiki/Licensing:Unrar postFetch = lib.optionalString (!enableUnfree) '' - mkdir tmp - tar xf $downloadedFile -C ./tmp - rm -r ./tmp/CPP/7zip/Compress/Rar* - tar cfJ $out -C ./tmp . \ - --sort=name \ - --mtime="@$SOURCE_DATE_EPOCH" \ - --owner=0 --group=0 --numeric-owner \ - --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime - ''; + rm -r $out/CPP/7zip/Compress/Rar* + ''; }; - sourceRoot = "."; - patches = [ ./fix-cross-mingw-build.patch ]; diff --git a/pkgs/tools/archivers/peazip/default.nix b/pkgs/tools/archivers/peazip/default.nix index 4070c58d46c2..e99aa5f27495 100644 --- a/pkgs/tools/archivers/peazip/default.nix +++ b/pkgs/tools/archivers/peazip/default.nix @@ -6,6 +6,7 @@ , lazarus , xorg , libqt5pas +, runCommand , _7zz , archiver , brotli @@ -16,16 +17,21 @@ stdenv.mkDerivation rec { pname = "peazip"; - version = "9.6.0"; + version = "9.8.0"; src = fetchFromGitHub { owner = "peazip"; repo = pname; rev = version; - hash = "sha256-75EkVRx6bX1ZZzeNSR7IvKNjTA5NvzFzUJdORiAVHBo="; + hash = "sha256-oHtxiunB409xwk4tYB336Bq51Fl7PFrXKwH7ySaYCEs="; }; sourceRoot = "${src.name}/peazip-sources"; + postPatch = '' + # set it to use compression programs from $PATH + substituteInPlace dev/peach.pas --replace " HSYSBIN = 0;" " HSYSBIN = 2;" + ''; + nativeBuildInputs = [ wrapQtAppsHook lazarus @@ -40,43 +46,48 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; buildPhase = '' + # lazarus tries to create files in $HOME/.lazarus export HOME=$(mktemp -d) - cd dev - lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_pea.lpi && [ -f pea ] - lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_peach.lpi && [ -f peazip ] - cd .. + pushd dev + lazbuild --lazarusdir=${lazarus}/share/lazarus --add-package metadarkstyle/metadarkstyle.lpk + lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_pea.lpi + lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_peach.lpi + popd + ''; + + # peazip looks for the "7z", not "7zz" + _7z = runCommand "7z" {} '' + mkdir -p $out/bin + ln -s ${_7zz}/bin/7zz $out/bin/7z ''; installPhase = '' runHook preInstall - # Executables - ## Main programs install -D dev/{pea,peazip} -t $out/lib/peazip + wrapProgram $out/lib/peazip/peazip --prefix PATH : ${lib.makeBinPath [ + _7z + archiver + brotli + upx + zpaq + zstd + ]} mkdir -p $out/bin ln -s $out/lib/peazip/{pea,peazip} $out/bin/ - ## Symlink the available compression algorithm programs. - mkdir -p $out/lib/peazip/res/bin/7z - ln -s ${_7zz}/bin/7zz $out/lib/peazip/res/bin/7z/7z - mkdir -p $out/lib/peazip/res/bin/arc - ln -s ${archiver}/bin/arc $out/lib/peazip/res/bin/arc/ - mkdir -p $out/lib/peazip/res/bin/brotli - ln -s ${brotli}/bin/brotli $out/lib/peazip/res/bin/brotli/ - mkdir -p $out/lib/peazip/res/bin/upx - ln -s ${upx}/bin/upx $out/lib/peazip/res/bin/upx/ - mkdir -p $out/lib/peazip/res/bin/zpaq - ln -s ${zpaq}/bin/zpaq $out/lib/peazip/res/bin/zpaq/ - mkdir -p $out/lib/peazip/res/bin/zstd - ln -s ${zstd}/bin/zstd $out/lib/peazip/res/bin/zstd/ - - mkdir -p $out/share/peazip + mkdir -p $out/share/peazip $out/lib/peazip/res/share ln -s $out/share/peazip $out/lib/peazip/res/share cp -r res/share/{icons,lang,themes,presets} $out/share/peazip/ - install -D res/share/batch/freedesktop_integration/peazip.png -t "$out/share/icons/hicolor/256x256/apps" - install -D res/share/icons/peazip_{7z,rar,zip}.png -t "$out/share/icons/hicolor/256x256/mimetypes" - install -D res/share/batch/freedesktop_integration/peazip_{add,extract}.png -t "$out/share/icons/hicolor/256x256/actions" - install -D res/share/batch/freedesktop_integration/*.desktop -t "$out/share/applications" + # Install desktop entries + install -D res/share/batch/freedesktop_integration/*.desktop -t $out/share/applications + # Install desktop entries's icons + mkdir -p $out/share/icons/hicolor/256x256/apps + ln -s $out/share/peazip/icons/peazip.png -t $out/share/icons/hicolor/256x256/apps/ + mkdir $out/share/icons/hicolor/256x256/mimetypes + ln -s $out/share/peazip/icons/peazip_{7z,zip,cd}.png $out/share/icons/hicolor/256x256/mimetypes/ + mkdir $out/share/icons/hicolor/256x256/actions + ln -s $out/share/peazip/icons/peazip_{add,extract,convert}.png $out/share/icons/hicolor/256x256/actions/ runHook postInstall ''; @@ -94,5 +105,6 @@ stdenv.mkDerivation rec { homepage = "https://peazip.github.io"; platforms = platforms.linux; maintainers = with maintainers; [ annaaurora ]; + mainProgram = "peazip"; }; } diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index 2c9143d51f89..c1b7eab31f9a 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "darkice"; - version = "1.4"; + version = "1.5"; src = fetchurl { url = "https://github.com/rafael2k/darkice/releases/download/v${version}/darkice-${version}.tar.gz"; - sha256 = "05yq7lggxygrkd76yiqby3msrgdn082p0qlvmzzv9xbw8hmyra76"; + sha256 = "sha256-GLTEVzp8z+CcEJTrV5gVniqYkhBupi11OTP28qdGBY4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index aad2647d2e3e..9f7237dd497b 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchFromGitHub, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook3 }: +{ lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchFromGitHub, gtk3, adwaita-icon-theme, gdk-pixbuf, librsvg, wrapGAppsHook3 }: stdenv.mkDerivation { pname = "gvolicon"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ - alsa-lib gtk3 gdk-pixbuf gnome.adwaita-icon-theme + alsa-lib gtk3 gdk-pixbuf adwaita-icon-theme librsvg wrapGAppsHook3 ]; diff --git a/pkgs/tools/audio/mpd-notification/default.nix b/pkgs/tools/audio/mpd-notification/default.nix index bb09b9b18302..d4ee520ad6dc 100644 --- a/pkgs/tools/audio/mpd-notification/default.nix +++ b/pkgs/tools/audio/mpd-notification/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mpd-notification"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "eworm-de"; repo = "mpd-notification"; rev = version; - hash = "sha256-1DG8pemlF5bURbdJwGTZqp3WVfLOwGEpfqq9q1NtwaE="; + hash = "sha256-8iBG1IdbERB2gOALvVBNJ3/hhiou3D/azSRkRD+u9O8="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index 218872ed1e31..c74919dbcb0e 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -57,21 +57,14 @@ effectiveStdenv.mkDerivation (finalAttrs: { CoreVideo MetalKit ] ++ lib.optionals cudaSupport ( with cudaPackages; [ - - # A temporary hack for reducing the closure size, remove once cudaPackages - # have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792 - cuda_cccl.dev # provides nv/target - cuda_cudart.dev - cuda_cudart.lib - cuda_cudart.static - libcublas.dev - libcublas.lib - libcublas.static + cuda_cccl # provides nv/target + cuda_cudart + libcublas ]); postPatch = let cudaOldStr = "-lcuda "; - cudaNewStr = "-lcuda -L${cudaPackages.cuda_cudart.lib}/lib/stubs "; + cudaNewStr = "-lcuda -L${cudaPackages.cuda_cudart}/lib/stubs "; in lib.optionalString cudaSupport '' substituteInPlace Makefile \ --replace '${cudaOldStr}' '${cudaNewStr}' diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index c89e1a208153..c0ceb449707d 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook3 -, gnome, avahi, gtk3, libayatana-appindicator, libnotify, libpulseaudio +, adwaita-icon-theme, avahi, gtk3, libayatana-appindicator, libnotify, libpulseaudio , gsettings-desktop-schemas }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme avahi gtk3 libayatana-appindicator libnotify libpulseaudio gsettings-desktop-schemas ]; diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 3e252f2313b4..0131d64ba824 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -18,10 +18,11 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; - pythonRelaxDeps = true; + # Remove when https://github.com/spotDL/spotify-downloader/issues/2119 is fixed + patches = [ ./is_lrc_valid-failure.patch ]; + dependencies = with python3.pkgs; [ bandcamp-api beautifulsoup4 diff --git a/pkgs/tools/audio/spotdl/is_lrc_valid-failure.patch b/pkgs/tools/audio/spotdl/is_lrc_valid-failure.patch new file mode 100644 index 000000000000..e419bca125d2 --- /dev/null +++ b/pkgs/tools/audio/spotdl/is_lrc_valid-failure.patch @@ -0,0 +1,65 @@ +From 0c1357470450d98b3b7fe5444ac460ba9ee04425 Mon Sep 17 00:00:00 2001 +From: Jeremy Cutler +Date: Mon, 17 Jun 2024 02:19:33 -0700 +Subject: [PATCH 1/2] Update lrc.py for updated function in python-syncedlyrics + +See syncedlyrics commit: [here](https://github.com/moehmeni/syncedlyrics/commit/64d3f9de3d17bec69cbc3b3b5acd1ab847fde4b2) +--- + spotdl/utils/lrc.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/spotdl/utils/lrc.py b/spotdl/utils/lrc.py +index 726fefbee..e59490b53 100644 +--- a/spotdl/utils/lrc.py ++++ b/spotdl/utils/lrc.py +@@ -7,7 +7,7 @@ + from pathlib import Path + + from syncedlyrics import search as syncedlyrics_search +-from syncedlyrics.utils import is_lrc_valid, save_lrc_file ++from syncedlyrics.utils import has_translation, save_lrc_file + + from spotdl.types.song import Song + +@@ -25,7 +25,7 @@ def generate_lrc(song: Song, output_file: Path): + - output_file: Path to the output file + """ + +- if song.lyrics and is_lrc_valid(song.lyrics): ++ if song.lyrics and has_translation(song.lyrics): + lrc_data = song.lyrics + else: + try: + +From bfa9456049132e64b5c83655bdeae7c9dcd1b532 Mon Sep 17 00:00:00 2001 +From: Jeremy Cutler +Date: Wed, 26 Jun 2024 18:06:59 -0700 +Subject: [PATCH 2/2] Update lrc.py + +Seems to have fixed the update of syncedlyrics to 1.0.0 +--- + spotdl/utils/lrc.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/spotdl/utils/lrc.py b/spotdl/utils/lrc.py +index e59490b53..cf7478214 100644 +--- a/spotdl/utils/lrc.py ++++ b/spotdl/utils/lrc.py +@@ -7,7 +7,7 @@ + from pathlib import Path + + from syncedlyrics import search as syncedlyrics_search +-from syncedlyrics.utils import has_translation, save_lrc_file ++from syncedlyrics.utils import has_translation, Lyrics + + from spotdl.types.song import Song + +@@ -34,7 +34,7 @@ def generate_lrc(song: Song, output_file: Path): + lrc_data = None + + if lrc_data: +- save_lrc_file(str(output_file.with_suffix(".lrc")), lrc_data) ++ Lyrics.save_lrc_file(str(output_file.with_suffix(".lrc")), lrc_data) + logger.debug("Saved lrc file for %s", song.display_name) + else: + logger.debug("No lrc file found for %s", song.display_name) diff --git a/pkgs/tools/audio/whisper-ctranslate2/default.nix b/pkgs/tools/audio/whisper-ctranslate2/default.nix index 5bb464345fdd..b442e25fb215 100644 --- a/pkgs/tools/audio/whisper-ctranslate2/default.nix +++ b/pkgs/tools/audio/whisper-ctranslate2/default.nix @@ -5,7 +5,7 @@ }: let pname = "whisper-ctranslate2"; - version = "0.4.4"; + version = "0.4.5"; in python3.pkgs.buildPythonApplication { inherit pname version; @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication { owner = "Softcatala"; repo = "whisper-ctranslate2"; rev = version; - hash = "sha256-iVS1wyPCXlbK1rMFidNbbUohu527NSaCpu1Dve01TvM="; + hash = "sha256-hnotnEpw+5hVWVKknZHqiBSeDWy9XEjL3ojQD2ZXbAM="; }; build-system = [ python3.pkgs.setuptools ]; diff --git a/pkgs/tools/audio/wyoming/faster-whisper.nix b/pkgs/tools/audio/wyoming/faster-whisper.nix index 563f2ce4562d..4807e50adb42 100644 --- a/pkgs/tools/audio/wyoming/faster-whisper.nix +++ b/pkgs/tools/audio/wyoming/faster-whisper.nix @@ -17,7 +17,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/tools/audio/wyoming/openwakeword.nix b/pkgs/tools/audio/wyoming/openwakeword.nix index 69f10f1d208f..78fb2e81d9fe 100644 --- a/pkgs/tools/audio/wyoming/openwakeword.nix +++ b/pkgs/tools/audio/wyoming/openwakeword.nix @@ -17,7 +17,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/tools/audio/wyoming/piper.nix b/pkgs/tools/audio/wyoming/piper.nix index 8a614ef4083c..ed79d289c0d8 100644 --- a/pkgs/tools/audio/wyoming/piper.nix +++ b/pkgs/tools/audio/wyoming/piper.nix @@ -17,7 +17,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ @@ -35,10 +34,10 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - changelog = "https://github.com/rhasspy/wyoming-openwakeword/v${version}/master/CHANGELOG.md"; + changelog = "https://github.com/rhasspy/wyoming-piper/v${version}/master/CHANGELOG.md"; description = "Wyoming Server for Piper"; mainProgram = "wyoming-piper"; - homepage = "https://github.com/rhasspy/wyoming-openwakeword"; + homepage = "https://github.com/rhasspy/wyoming-piper"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 778f5a5aad9f..ab43dfbef0ce 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -19,14 +19,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.2.8"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "borgbackup"; repo = "borg"; rev = "refs/tags/${version}"; - hash = "sha256-+FHqOVuHlY9QUjCrYVnrMBZPMFH9Z2U7eZ6eUSINSrw="; + hash = "sha256-n1hCM7Sp0t2bOJEzErEd1PS/Xc7c+KDmJ4PjQuuF140="; }; postPatch = '' @@ -82,7 +82,6 @@ python.pkgs.buildPythonApplication rec { nativeCheckInputs = with python.pkgs; [ e2fsprogs py - python-dateutil pytest-benchmark pytest-xdist pytestCheckHook @@ -121,6 +120,8 @@ python.pkgs.buildPythonApplication rec { outputs = [ "out" "doc" "man" ]; + disabled = python.pythonOlder "3.9"; + meta = with lib; { changelog = "https://github.com/borgbackup/borg/blob/${src.rev}/docs/changes.rst"; description = "Deduplicating archiver with compression and encryption"; diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index dba8cf36b3a0..7a0793c2763b 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -1,34 +1,26 @@ -{ lib -, stdenv -, borgbackup -, coreutils -, python3Packages -, fetchpatch -, fetchPypi -, systemd -, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -, installShellFiles -, borgmatic -, testers +{ + borgbackup, + borgmatic, + coreutils, + enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, + fetchPypi, + fetchpatch, + installShellFiles, + lib, + python3Packages, + stdenv, + systemd, + testers, }: - python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.8.11"; + version = "1.8.13"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Sgj15etVx8nnk0AZv+GzWscSqfqdC7+1wBE6gF/0aL0="; + sha256 = "sha256-4Z5imxNjfvd4fkpFsggSO9XueN5Yzcz4RCl+BqmddCM="; }; - patches = [ - (fetchpatch { - name = "prevent-network-access-in-tests.patch"; - url = "https://projects.torsion.org/borgmatic-collective/borgmatic/pulls/869.patch"; - hash = "sha256-jOo3LjgvJtyTaRKZX1wfnKNdw975hVekBkKfK4mJFAc="; - }) - ]; - nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ] ++ passthru.optional-dependencies.apprise; # - test_borgmatic_version_matches_news_version @@ -44,13 +36,13 @@ python3Packages.buildPythonApplication rec { colorama jsonschema packaging - ruamel-yaml requests + ruamel-yaml setuptools ]; passthru.optional-dependencies = { - apprise = with python3Packages; [ apprise ]; + apprise = [ python3Packages.apprise ]; }; postInstall = '' @@ -72,11 +64,11 @@ python3Packages.buildPythonApplication rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Simple, configuration-driven backup software for servers and workstations"; homepage = "https://torsion.org/borgmatic/"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ imlonghao ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ imlonghao x123 ]; }; } diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index a1f9365be809..43289247e943 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "partclone"; - version = "0.3.27"; + version = "0.3.31"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; rev = version; - sha256 = "sha256-atQ355w9BRUJKkvuyJupcNexVEnVcYsWRvnNmpBw8OA="; + sha256 = "sha256-ASOca6HMXlnA78LbHALk9Fi9kiqjQmjp2OPLYpqhbwQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 5f1ff957b634..198a5dda0593 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.16.4"; + version = "0.16.5"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-TSUhrtSgGIPM/cUzA6WDtCpqCyjtnM5BZDhK6udR0Ek="; + hash = "sha256-WwySXQU8eoyQRcI+zF+pIIKLEFheTnqkPTw0IZeUrhA="; }; patches = [ @@ -17,7 +17,7 @@ buildGoModule rec { ./0001-Skip-testing-restore-with-permission-failure.patch ]; - vendorHash = "sha256-E+Erf8AdlMBdep1g2SpI8JKIdJuKqmyWEUmh8Rs5R/o="; + vendorHash = "sha256-VZTX0LPZkqN4+OaaIkwepbGwPtud8Cu7Uq7t1bAUC8M="; subPackages = [ "cmd/restic" ]; diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/tools/backup/tarsnapper/default.nix index 843e61ecea57..58ab9640f5e6 100644 --- a/pkgs/tools/backup/tarsnapper/default.nix +++ b/pkgs/tools/backup/tarsnapper/default.nix @@ -26,7 +26,6 @@ python3Packages.buildPythonApplication rec { ]; nativeBuildInputs = with python3Packages; [ - pythonRelaxDepsHook setuptools ]; @@ -36,8 +35,10 @@ python3Packages.buildPythonApplication rec { pexpect ]; + doCheck = python3Packages.pythonOlder "3.12"; + nativeCheckInputs = with python3Packages; [ - pynose + nose ]; # Remove standard module argparse from requirements diff --git a/pkgs/tools/backup/zfs-autobackup/default.nix b/pkgs/tools/backup/zfs-autobackup/default.nix index 5999508fabf2..e29813caab27 100644 --- a/pkgs/tools/backup/zfs-autobackup/default.nix +++ b/pkgs/tools/backup/zfs-autobackup/default.nix @@ -10,7 +10,6 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-rvtY7fsn2K2hueAsQkaPXcwxUAgE8j+GsQFF3eJKG2o="; }; - nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; propagatedBuildInputs = with python3Packages; [ colorama ]; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 1f66be687bc9..45713d5b8e62 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 , obex_data_server, xdg-utils, dnsmasq, dhcpcd, iproute2 -, gnome, librsvg, wrapGAppsHook3, gobject-introspection +, adwaita-icon-theme, librsvg, wrapGAppsHook3, gobject-introspection , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: let @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ bluez gtk3 pythonPackages.python librsvg - gnome.adwaita-icon-theme networkmanager ] + adwaita-icon-theme networkmanager ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix index 6cb93b3e04be..3cce608ffdc8 100644 --- a/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -5,29 +5,32 @@ stdenv.mkDerivation { pname = "cue2pops"; - version = "unstable-2018-01-04"; + version = "0-unstable-2023-01-15"; src = fetchFromGitHub { owner = "makefu"; repo = "cue2pops-linux"; - rev = "541863adf23fdecde92eba5899f8d58586ca4551"; - sha256 = "05w84726g3k33rz0wwb9v77g7xh4cnhy9sxlpilf775nli9bynrk"; + rev = "3f2be6126bd50dfe6b998bc8926f88ce9139c19a"; + hash = "sha256-7rgYvqeH8ZDI8Vc5vnjIhe3Ke0TE1q/iFHEqucanhUM="; }; dontConfigure = true; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - installPhase = '' + runHook preInstall install --directory --mode=755 $out/bin install --mode=755 cue2pops $out/bin + runHook postInstall ''; - meta = with lib; { + meta = { description = "Convert CUE to ISO suitable to POPStarter"; homepage = "https://github.com/makefu/cue2pops-linux"; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + # Upstream license is unclear. + # + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; mainProgram = "cue2pops"; }; } diff --git a/pkgs/tools/compression/keka/default.nix b/pkgs/tools/compression/keka/default.nix index 71e979fa0c20..c2ec7cf290da 100644 --- a/pkgs/tools/compression/keka/default.nix +++ b/pkgs/tools/compression/keka/default.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://www.keka.io"; license = licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/tools/compression/lz4/0001-Create-a-unified-lz4-target.patch b/pkgs/tools/compression/lz4/0001-Create-a-unified-lz4-target.patch new file mode 100644 index 000000000000..4092d232a0a3 --- /dev/null +++ b/pkgs/tools/compression/lz4/0001-Create-a-unified-lz4-target.patch @@ -0,0 +1,34 @@ +From 14fca2e93bd783c0ad2362af6d69801c2073765d Mon Sep 17 00:00:00 2001 +From: Tobias Mayer +Date: Sun, 23 Jun 2024 20:16:00 +0200 +Subject: [PATCH] Create a unified lz4 target + +Includes changes from +* https://github.com/lz4/lz4/pull/1372 +* https://github.com/lz4/lz4/pull/1413 +--- + build/cmake/CMakeLists.txt | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt +index eb7007b..07ddd2b 100644 +--- a/build/cmake/CMakeLists.txt ++++ b/build/cmake/CMakeLists.txt +@@ -130,6 +130,14 @@ if(BUILD_STATIC_LIBS) + POSITION_INDEPENDENT_CODE ${LZ4_POSITION_INDEPENDENT_LIB}) + list(APPEND LZ4_LIBRARIES_BUILT lz4_static) + endif() ++# Add unified target. ++add_library(lz4 INTERFACE) ++list(APPEND LZ4_LIBRARIES_BUILT lz4) ++if(BUILD_SHARED_LIBS) ++ target_link_libraries(lz4 INTERFACE lz4_shared) ++else() ++ target_link_libraries(lz4 INTERFACE lz4_static) ++endif() + + if(BUILD_STATIC_LIBS) + set(LZ4_LINK_LIBRARY lz4_static) +-- +2.45.1 + diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index f745f4f091ab..67bc9016cace 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,58 +1,48 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, valgrind -, enableStatic ? stdenv.hostPlatform.isStatic -, enableShared ? !stdenv.hostPlatform.isStatic +{ lib, stdenv, fetchFromGitHub, cmake +, valgrind, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lz4"; version = "1.9.4"; src = fetchFromGitHub { - sha256 = "sha256-YiMCD3vvrG+oxBUghSrCmP2LAfAGZrEaKz0YoaQJhpI="; - rev = "v${version}"; - repo = pname; - owner = pname; + repo = "lz4"; + owner = "lz4"; + rev = "v${finalAttrs.version}"; + hash = "sha256-YiMCD3vvrG+oxBUghSrCmP2LAfAGZrEaKz0YoaQJhpI="; }; - patches = [ - (fetchpatch { # https://github.com/lz4/lz4/pull/1162 - name = "build-shared-no.patch"; - url = "https://github.com/lz4/lz4/commit/851ef4b23c7cbf4ceb2ba1099666a8b5ec4fa195.patch"; - sha256 = "sha256-P+/uz3m7EAmHgXF/1Vncc0uKKxNVq6HNIsElx0rGxpw="; - }) + nativeBuildInputs = [ + cmake ]; - # TODO(@Ericson2314): Separate binaries and libraries - outputs = [ "bin" "out" "dev" ]; + buildInputs = lib.optionals finalAttrs.doCheck [ + valgrind + ]; - buildInputs = lib.optional doCheck valgrind; + outputs = [ "dev" "lib" "man" "out" ]; - enableParallelBuilding = true; + patches = [ + ./0001-Create-a-unified-lz4-target.patch + ]; - makeFlags = [ - "PREFIX=$(out)" - "INCLUDEDIR=$(dev)/include" - "BUILD_STATIC=${if enableStatic then "yes" else "no"}" - "BUILD_SHARED=${if enableShared then "yes" else "no"}" - "WINDRES:=${stdenv.cc.bintools.targetPrefix}windres" - ] - # TODO make full dictionary - ++ lib.optional stdenv.hostPlatform.isMinGW "TARGET_OS=MINGW" - ++ lib.optional stdenv.hostPlatform.isLinux "TARGET_OS=Linux" - ; + cmakeDir = "../build/cmake"; + cmakeBuildDir = "build-dist"; doCheck = false; # tests take a very long time checkTarget = "test"; - # TODO(@Ericson2314): Make resusable setup hook for this issue on Windows. - postInstall = - lib.optionalString stdenv.hostPlatform.isWindows '' - mv $out/bin/*.dll $out/lib - ln -s $out/lib/*.dll - '' - + '' - moveToOutput bin "$bin" - ''; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "v${finalAttrs.version}"; + }; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "liblz4" ]; + }; + }; meta = with lib; { description = "Extremely fast compression algorithm"; @@ -66,5 +56,7 @@ stdenv.mkDerivation rec { homepage = "https://lz4.github.io/lz4/"; license = with licenses; [ bsd2 gpl2Plus ]; platforms = platforms.all; + mainProgram = "lz4"; + maintainers = [ maintainers.tobim ]; }; -} +}) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index e5d2fd267a61..6220d56b15a2 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -11,14 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xz"; - version = "5.4.6"; # Beware of CVE-2024-3094 and related risks!!! + version = "5.6.2"; src = fetchurl { - url = with finalAttrs; - # The original URL has been taken down. - # "https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.bz2"; - "mirror://sourceforge/lzmautils/xz-${version}.tar.bz2"; - sha256 = "sha256-kThRsnTo4dMXgeyUnxwj6NvPDs9uc6JDbcIXad0+b0k="; + url = with finalAttrs; "https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.xz"; + hash = "sha256-qds7s9ZOJIoPrpY/j7a6hRomuhgi5QTcDv0YqAxibK8="; }; strictDeps = true; @@ -52,10 +49,10 @@ stdenv.mkDerivation (finalAttrs: { set -eu -o pipefail - # Expect the text in format of '>xz-5.2.6.tar.bz2' + # Expect the text in format of '>xz-5.2.6.tar.xz' # We pick first match where a stable release goes first. new_version="$(curl -s https://tukaani.org/xz/ | - pcregrep -o1 '>xz-([0-9.]+)[.]tar[.]bz2' | + pcregrep -o1 '>xz-([0-9.]+)[.]tar[.]xz' | head -n1)" update-source-version ${finalAttrs.pname} "$new_version" ''; @@ -65,9 +62,9 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - homepage = "https://tukaani.org/xz/"; + changelog = "https://github.com/tukaani-project/xz/releases/tag/v${finalAttrs.version}"; description = "General-purpose data compression software, successor of LZMA"; - + homepage = "https://tukaani.org/xz/"; longDescription = '' XZ Utils is free general-purpose data compression software with high compression ratio. XZ Utils were written for POSIX-like systems, @@ -81,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: { create 30 % smaller output than gzip and 15 % smaller output than bzip2. ''; - license = with licenses; [ gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ sander ]; platforms = platforms.all; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index df15ef388fee..e116304f07b4 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -318,6 +318,11 @@ in rec { pname = "ceph"; inherit src version; + postPatch = '' + substituteInPlace cmake/modules/Finduring.cmake \ + --replace-fail "liburing.a liburing" "uring" + ''; + nativeBuildInputs = [ cmake fmt diff --git a/pkgs/tools/filesystems/disk-inventory-x/default.nix b/pkgs/tools/filesystems/disk-inventory-x/default.nix index 008781d4cd45..2ed895eeb3d2 100644 --- a/pkgs/tools/filesystems/disk-inventory-x/default.nix +++ b/pkgs/tools/filesystems/disk-inventory-x/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://www.derlien.com"; license = licenses.gpl3Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ emilytrau ]; platforms = [ "x86_64-darwin" ]; }; }) diff --git a/pkgs/tools/filesystems/eiciel/default.nix b/pkgs/tools/filesystems/eiciel/default.nix index a3f7378c205c..ac87be61a444 100644 --- a/pkgs/tools/filesystems/eiciel/default.nix +++ b/pkgs/tools/filesystems/eiciel/default.nix @@ -2,10 +2,10 @@ , fetchFromGitHub , stdenv , acl -, gnome , glibmm_2_68 , gtkmm4 , meson +, nautilus , ninja , pkg-config , itstool @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { acl glibmm_2_68 gtkmm4 - gnome.nautilus + nautilus ]; mesonFlags = [ diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 6afbda9f27cd..def4a7938962 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.13"; + version = "1.14"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-ngpC1KtUsIJOfpJ9dSqZn9XhKkJSpp2/6RBz/RlZ+A0="; + hash = "sha256-A70AxYPKph/5zRNFRDWrwl8Csc8Vf1gmOLJ39ixJgL0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index b34074435c18..a02fdc1f1bc3 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gcsfuse"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-ecTwC0FHg0MHBkrsydTam4UfylldZQp06t/1BYUwgUI="; + hash = "sha256-FxBVNJVcVdAAvkIWzFmWiVdrVEQ4eQGGo8tmrlcH+6k="; }; - vendorHash = "sha256-GmLyYtgiUBd09mUktjNhbPN5QCUb9VNUzA0xT5mzQ0Q="; + vendorHash = "sha256-9eUUjcRQ/H3iPO2F+KE0nd5+b8slc6xacXSZt3jytgU="; subPackages = [ "." "tools/mount_gcsfuse" ]; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index f7e830f3211d..636a4520ea56 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -79,11 +79,14 @@ in stdenv.mkDerivation rec { postPatch = '' sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \ - --replace '/sbin/' '${lvm2}/bin/' + --replace-fail '/sbin/' '${lvm2}/bin/' substituteInPlace libglusterfs/src/glusterfs/compat.h \ - --replace '/bin/umount' '${util-linux}/bin/umount' + --replace-fail '/bin/umount' '${util-linux}/bin/umount' substituteInPlace contrib/fuse-lib/mount-gluster-compat.h \ - --replace '/bin/mount' '${util-linux}/bin/mount' + --replace-fail '/bin/mount' '${util-linux}/bin/mount' + # use local up to date m4 files to ensure the correct python version is detected + substituteInPlace autogen.sh \ + --replace-fail '$ACLOCAL -I ./contrib/aclocal' '$ACLOCAL' ''; # Note that the VERSION file is something that is present in release tarballs diff --git a/pkgs/tools/filesystems/mountain-duck/default.nix b/pkgs/tools/filesystems/mountain-duck/default.nix index a881eb4f998f..8eef2328b0df 100644 --- a/pkgs/tools/filesystems/mountain-duck/default.nix +++ b/pkgs/tools/filesystems/mountain-duck/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://mountainduck.io"; license = licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/tools/filesystems/rmfuse/default.nix b/pkgs/tools/filesystems/rmfuse/default.nix index 04a4d6273878..7ce74671e5df 100644 --- a/pkgs/tools/filesystems/rmfuse/default.nix +++ b/pkgs/tools/filesystems/rmfuse/default.nix @@ -18,7 +18,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index afbe1c9c7c58..0c837e14cc44 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -27,18 +27,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.6.7"; + version = "3.6.8"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-cODi0YWAcnMs7bWu1oCtcZ0Wz9FAjBcoyam0G6GH7Xc="; + hash = "sha256-cYd2oy9reY8eWSdO98cVcz6/Z+MS26NY4U3UNVfMdbg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-eCuCqFwGm7pslyKTwk2iX42omM3gFeXrAy/2ll+tJts="; + hash = "sha256-1KzOKo5Q1uBqO3aCBYUJJxla4873AzrwoFPaNpKKFJU="; }; postPatch = '' diff --git a/pkgs/tools/games/slipstream/default.nix b/pkgs/tools/games/slipstream/default.nix index 7be7983a2501..522f9ec5d25b 100644 --- a/pkgs/tools/games/slipstream/default.nix +++ b/pkgs/tools/games/slipstream/default.nix @@ -13,7 +13,7 @@ mavenWithJdk.buildMavenPackage rec { hash = "sha256-F+o94Oh9qxVdfgwdmyOv+WZl1BjQuzhQWaVrAgScgIU="; }; - mvnHash = "sha256-zqXbLnLmTZHzwH+vgGASR7Jsz1t173DmQMIe2R6B6Ic="; + mvnHash = "sha256-woOSkF5TuzaJ84EndryMoXTMbbK/V/BShM1k+WB8D/c="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/games/steam-rom-manager/default.nix b/pkgs/tools/games/steam-rom-manager/default.nix index a58bcf55f34b..21dfeee297f0 100644 --- a/pkgs/tools/games/steam-rom-manager/default.nix +++ b/pkgs/tools/games/steam-rom-manager/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { name = "steam-rom-manager"; - version = "2.5.11"; + version = "2.5.17"; src = fetchurl { url = "https://github.com/SteamGridDB/steam-rom-manager/releases/download/v${version}/Steam-ROM-Manager-${version}.AppImage"; - sha256 = "sha256-KeJ1O7YZOP8l09XFIa043tEAAU6bwpvCsJQ5r5aeuQY="; + sha256 = "sha256-2b9gL9gkQdTf+EBgjb+KFRJZjqNW/xeDusDJM1AO2U4="; }; extraInstallCommands = let diff --git a/pkgs/tools/games/steamback/default.nix b/pkgs/tools/games/steamback/default.nix index e7cc2c06b910..a41b5f3ca7fb 100644 --- a/pkgs/tools/games/steamback/default.nix +++ b/pkgs/tools/games/steamback/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonApplication , fetchPypi -, pythonRelaxDepsHook , setuptools , setuptools-scm , wheel @@ -24,7 +23,6 @@ buildPythonApplication rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools-scm wheel ]; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 46b8122dd5b6..55fce30cd990 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl , autoreconfHook, bison, glm, flex, wrapQtAppsHook, cmake, pkg-config -, freeglut, ghostscriptX, imagemagick, fftw, eigen, libtirpc -, boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv +, libglut, ghostscriptX, imagemagick, fftw, eigen, libtirpc +, boehmgc, libGLU, libGL, ncurses, readline, gsl, libsigsegv , python3, qtbase, qtsvg, boost , zlib, perl, curl , texinfo @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ glm ] ++ lib.optionals stdenv.isLinux [ - freeglut libGLU libGL mesa.osmesa + libglut libGLU libGL ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]); diff --git a/pkgs/tools/graphics/deqp-runner/default.nix b/pkgs/tools/graphics/deqp-runner/default.nix index 7749d5fdb5c5..101832176907 100644 --- a/pkgs/tools/graphics/deqp-runner/default.nix +++ b/pkgs/tools/graphics/deqp-runner/default.nix @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://gitlab.freedesktop.org/anholt/deqp-runner"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ Benjamin-L ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index d665c884751e..26645cea6a59 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchhg , autoreconfHook , boost -, freeglut +, libglut , glew , gsl , lcms2 @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-0gCUSdg3HR3YeIbOByEBCZh2zGlYur6DeCOzUM53fdc="; }; - buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU libGL vigra ]; + buildInputs = [ boost libglut glew gsl lcms2 libpng libtiff libGLU libGL vigra ]; nativeBuildInputs = [ autoreconfHook help2man perl pkg-config texliveSmall ]; diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix index aeec2ffb4939..ec0b4ffdf794 100644 --- a/pkgs/tools/graphics/glee/default.nix +++ b/pkgs/tools/graphics/glee/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GL Easy Extension Library"; homepage = "https://sourceforge.net/p/glee/glee/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix index f0253c8b6613..0d2a5eb4ac7e 100644 --- a/pkgs/tools/graphics/grim/default.nix +++ b/pkgs/tools/graphics/grim/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/emersion/grim"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ buffet eclairevoyant ]; + maintainers = with maintainers; [ eclairevoyant ]; mainProgram = "grim"; }; } diff --git a/pkgs/tools/graphics/maskromtool/default.nix b/pkgs/tools/graphics/maskromtool/default.nix index 7be41a410508..62afa6ef8dc0 100644 --- a/pkgs/tools/graphics/maskromtool/default.nix +++ b/pkgs/tools/graphics/maskromtool/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "maskromtool"; - version = "2024-05-19"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "travisgoodspeed"; repo = "maskromtool"; rev = "v${version}"; - hash = "sha256-cG1OT5sbDW7uU7t+uh7GAdabd2zRlDTan2qPxBNHJTo="; + hash = "sha256-b/mmp8byb+4PZJNtiXB2XYbLaQPEDKaVc4gSHfytFUc="; }; buildInputs = [ diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix index 0bc30c8773fd..3bbc20bc4cad 100644 --- a/pkgs/tools/graphics/mesa-demos/default.nix +++ b/pkgs/tools/graphics/mesa-demos/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, freeglut +, libglut , libGL , libGLU , libX11 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - freeglut + libglut libX11 libXext libGL @@ -54,14 +54,12 @@ stdenv.mkDerivation rec { vulkan-loader libxkbcommon libdecor - ] ++ lib.optional (mesa ? osmesa) mesa.osmesa; + ]; mesonFlags = [ - "-Degl=${if stdenv.isDarwin then "disabled" else "auto"}" - "-Dlibdrm=${if mesa.libdrm == null then "disabled" else "enabled"}" - "-Dosmesa=${if mesa ? osmesa then "enabled" else "disabled"}" - "-Dwayland=${if wayland.withLibraries then "enabled" else "disabled"}" "-Dwith-system-data-files=true" + "-Dgles1=disabled" + "-Dosmesa=disabled" ]; meta = with lib; { diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 90cf811e9130..fdc05cbff04d 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { }) ] ++ (lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch); - buildInputs = [ qtbase qttools libGLU.dev ]; + buildInputs = [ qtbase qttools libGLU ]; nativeBuildInputs = [ qmake wrapQtAppsHook ]; preConfigure = '' diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 99debde345fe..ac41fd9c94f6 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, darwin -, openexr, zlib, imagemagick6, libGLU, libGL, freeglut, fftwFloat +, openexr, zlib, imagemagick6, libGLU, libGL, libglut, fftwFloat , fftw, gsl, libexif, perl, qtbase, netpbm , enableUnfree ? false, opencv2 }: @@ -35,7 +35,7 @@ mkDerivation rec { ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ - libGLU libGL freeglut + libGLU libGL libglut ]) ++ lib.optional enableUnfree (opencv2.override { enableUnfree = true; }); patches = [ ./glut.patch ./threads.patch ./pfstools.patch ./pfsalign.patch ]; diff --git a/pkgs/tools/graphics/piglit/default.nix b/pkgs/tools/graphics/piglit/default.nix index 8cc125e47da9..69e5c44be69a 100644 --- a/pkgs/tools/graphics/piglit/default.nix +++ b/pkgs/tools/graphics/piglit/default.nix @@ -2,7 +2,7 @@ , fetchFromGitLab , lib , cmake -, freeglut +, libglut , libGL , libGLU , libglvnd @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - freeglut + libglut libGL libGLU libglvnd diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix index 52941f7b96d7..790ef79ea09e 100644 --- a/pkgs/tools/graphics/twilight/default.nix +++ b/pkgs/tools/graphics/twilight/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, libGL, libGLU, freeglut, libX11 }: +, libGL, libGLU, libglut, libX11 }: stdenv.mkDerivation rec { pname = "twilight"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0mmmi4jj8yd8wnah6kx5na782sjycszgzim33dfalr0ph361m4pz"; }; - buildInputs = [ libGL libGLU freeglut libX11 ]; + buildInputs = [ libGL libGLU libglut libX11 ]; installPhase = '' install -Dm755 twilight $out/bin/twilight diff --git a/pkgs/tools/graphics/vkbasalt-cli/default.nix b/pkgs/tools/graphics/vkbasalt-cli/default.nix index efe704ace293..4d99b4efb413 100644 --- a/pkgs/tools/graphics/vkbasalt-cli/default.nix +++ b/pkgs/tools/graphics/vkbasalt-cli/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { description = "Command-line utility for vkBasalt"; homepage = "https://gitlab.com/TheEvilSkeleton/vkbasalt-cli"; license = with licenses; [ lgpl3Only gpl3Only ]; - maintainers = with maintainers; [ martfont ]; + maintainers = with maintainers; [ ]; mainProgram = "vkbasalt"; }; } diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index d695682175c3..6579b7e160de 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -118,9 +118,9 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.updateScript = ./update.sh; - passthru.tests.lavapipe = runCommand "vulkan-cts-tests-lavapipe" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } '' - # Expand the wildcard to pick the existing architecture - export VK_ICD_FILENAMES=$(echo ${mesa.drivers}/share/vulkan/icd.d/lvp_icd.*.json) + passthru.tests.lavapipe = runCommand "vulkan-cts-tests-lavapipe" { + nativeBuildInputs = [ finalAttrs.finalPackage mesa.llvmpipeHook ]; + } '' deqp-vk -n dEQP-VK.api.smoke.triangle touch $out ''; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-pinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-pinyin/default.nix new file mode 100644 index 000000000000..8574b04875f0 --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-pinyin/default.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + intltool, + pkg-config, + python3, + wrapGAppsHook3, + glib, + gtk3, + ibus, + lua, + pyzy, + sqlite, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "ibus-pinyin"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "ibus"; + repo = "ibus-pinyin"; + rev = version; + hash = "sha256-8nM/dEjkNhQNv6Ikv4xtRkS3mALDT6OYC1EAKn1zNtI="; + }; + + nativeBuildInputs = [ + autoreconfHook + intltool + pkg-config + python3 + wrapGAppsHook3 + ]; + + buildInputs = [ + glib + gtk3 + ibus + lua + pyzy + sqlite + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + isIbusEngine = true; + description = "The PinYin engine for IBus"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ azuwis ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index d88c00fb7983..db93a966b798 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.17.4"; + version = "1.17.6"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "sha256-XljpwsDsdZkcnXimnN7BzPhOZdUmEEJbBM53Sv/9rIo="; + sha256 = "sha256-rbtyixsDMIQAP2TLqp1KbcCUMc7cKvGQR27puJmbLno="; }; postPatch = '' diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 1350ce8764c7..883ed6a2b5a3 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.25.10"; + version = "2.25.11"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-6kcU6oOH75X/M1+fv3m+r05ffIFYrXrlNl8tB6K+B5I="; + hash = "sha256-of8FcuYeLIEQgPmEQt1UqcMT6Bd2l5sCDj0Cia0JbmM="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 gobject-introspection ]; @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { description = "Completion input method for faster typing"; mainProgram = "emoji-picker"; maintainers = with maintainers; [ ncfavier ]; + platforms = platforms.linux; isIbusEngine = true; }; } diff --git a/pkgs/tools/inputmethods/keymapper/default.nix b/pkgs/tools/inputmethods/keymapper/default.nix index 6ed0ad69db9d..a9124086bf9f 100644 --- a/pkgs/tools/inputmethods/keymapper/default.nix +++ b/pkgs/tools/inputmethods/keymapper/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keymapper"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; rev = finalAttrs.version; - hash = "sha256-NB9sVSkd01lm9Ia8fGrnICjD1cNdPfcvJ++Yy3NO5QQ="; + hash = "sha256-pM273Ma8ELFVQV8zxCmtEvhBz5HLiIBtPtRv9Hh5dGY="; }; # all the following must be in nativeBuildInputs diff --git a/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix b/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix index 6337b0d7f4f5..e47d55053865 100644 --- a/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix +++ b/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/ther0n/UnnaturalScrollWheels"; license = licenses.gpl3Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/tools/misc/aichat/default.nix b/pkgs/tools/misc/aichat/default.nix index 975fb995bb87..6bd57a6e8e96 100644 --- a/pkgs/tools/misc/aichat/default.nix +++ b/pkgs/tools/misc/aichat/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "aichat"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "aichat"; rev = "v${version}"; - hash = "sha256-V7WKzi9PKSek8DlF7QzBEaYn3a+BJzMtKEoi5yMGS/w="; + hash = "sha256-/HDuPz60Bj5VEZNlgSpNO+axfu7vZyre0ROS7woxVeg="; }; - cargoHash = "sha256-sFRYu1sQ9PdjsBTgajMfvJqA32Q8HZCHs3h2wemb9oY="; + cargoHash = "sha256-WI9VT27g1f6XSxBJI5AvLM8wGmzg448wLbg+xeK1J/4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index ff8d6cd4b1e5..08d130513cd9 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -1,13 +1,13 @@ -{ lib -, python3Packages -, fetchFromGitHub -, glibcLocales +{ + lib, + python3Packages, + fetchFromGitHub, }: python3Packages.buildPythonApplication rec { pname = "asciinema"; version = "2.4.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "asciinema"; @@ -16,23 +16,14 @@ python3Packages.buildPythonApplication rec { hash = "sha256-UegLwpJ+uc9cW3ozLQJsQBjIGD7+vzzwzQFRV5gmDmI="; }; - nativeBuildInputs = [ - python3Packages.setuptools - ]; + build-system = [ python3Packages.setuptools ]; postPatch = '' substituteInPlace tests/pty_test.py \ - --replace "python3" "${python3Packages.python}/bin/python" + --replace-fail "python3" "${python3Packages.python.interpreter}" ''; - nativeCheckInputs = [ - glibcLocales - python3Packages.nose - ]; - - checkPhase = '' - LC_ALL=en_US.UTF-8 nosetests -v tests/config_test.py - ''; + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; meta = { description = "Terminal session recorder and the best companion of asciinema.org"; diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index 67fa9dcf4e90..1189cca85379 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -86,7 +86,7 @@ let description = "Bash scripts that integrate bat with various command line tools"; homepage = "https://github.com/eth-p/bat-extras"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ bbigras lilyball ]; + maintainers = with maintainers; [ bbigras ]; platforms = platforms.all; }; }; diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index e788fc53875f..527357dc4fa0 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, autoreconfHook, buildPackages -, fetchurl, flex, readline, ed, texinfo +{ + lib, + stdenv, + autoreconfHook, + buildPackages, + fetchurl, + flex, + readline, + ed, + texinfo, }: stdenv.mkDerivation rec { @@ -18,11 +26,18 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ # Tools - autoreconfHook ed flex texinfo + autoreconfHook + ed + flex + texinfo # Libraries for build - buildPackages.readline buildPackages.ncurses + buildPackages.readline + buildPackages.ncurses + ]; + buildInputs = [ + readline + flex ]; - buildInputs = [ readline flex ]; doCheck = true; # not cross @@ -36,5 +51,6 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/bc/"; license = licenses.gpl3Plus; platforms = platforms.all; + mainProgram = "bc"; }; } diff --git a/pkgs/tools/misc/boxxy/default.nix b/pkgs/tools/misc/boxxy/default.nix index ac723e959022..b2596746f7df 100644 --- a/pkgs/tools/misc/boxxy/default.nix +++ b/pkgs/tools/misc/boxxy/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "boxxy"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "queer"; repo = "boxxy"; rev = "v${version}"; - hash = "sha256-euIecFMDktL0gDkso83T1qZfVdfYAAC+WBMsfZaarAQ="; + hash = "sha256-6pb3yyC4/kpe8S67B3pzsSu3PfQyOWpiYi0JTBQk3lU="; }; - cargoHash = "sha256-8aIuMRjZHLlP3x+C9S9WX21/i98RAUvGGwzptzCpRR4="; + cargoHash = "sha256-PaH0WBBGK37T59RU4ofL0XjYX3cV5lR7WmCw+H/MeuA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 5fda81cf80b4..10c87dde327b 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.39.0"; + version = "1.39.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-OmkO7qZ8l9HvSJFGNgTeCo/gS17fF0edfOc8wvf29/I="; + hash = "sha256-cKCIKyXYtDfW3UTTr6QL7Gh/bfb9aZAFRptaP2zdcxc="; }; - cargoHash = "sha256-lfFv8NF5nID96tCcLB7bXnDfAyrjoXhnBa2QDHz3nY4="; + cargoHash = "sha256-JsMgToSzvf3JcVLz5a6kygtxhrU8YSYrHrwbMRhQ1uw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/btc-rpc-explorer/default.nix b/pkgs/tools/misc/btc-rpc-explorer/default.nix index 9e548d5f3dfd..babfe9400532 100644 --- a/pkgs/tools/misc/btc-rpc-explorer/default.nix +++ b/pkgs/tools/misc/btc-rpc-explorer/default.nix @@ -43,5 +43,7 @@ buildNpmPackage rec { license = lib.licenses.mit; mainProgram = "btc-rpc-explorer"; maintainers = with lib.maintainers; [ d-xo ]; + broken = true; # At 2024-06-29 + # https://hydra.nixos.org/build/264232177/nixlog/1 }; } diff --git a/pkgs/tools/misc/caffeine/default.nix b/pkgs/tools/misc/caffeine/default.nix index 6c8995192a14..1e547a5533ba 100644 --- a/pkgs/tools/misc/caffeine/default.nix +++ b/pkgs/tools/misc/caffeine/default.nix @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Don't let your Mac fall asleep"; homepage = "https://intelliscapesolutions.com/apps/caffeine"; license = licenses.mit; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ emilytrau ]; platforms = [ "x86_64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/tools/misc/cp210x-program/default.nix b/pkgs/tools/misc/cp210x-program/default.nix index b734008fad2a..d53a406c3cdc 100644 --- a/pkgs/tools/misc/cp210x-program/default.nix +++ b/pkgs/tools/misc/cp210x-program/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { description = "EEPROM tool for Silabs CP210x USB-Serial adapter"; homepage = "https://github.com/VCTLabs/cp210x-program"; license = licenses.lgpl21Only; # plus/only status unclear - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; mainProgram = "cp210x-program"; }; } diff --git a/pkgs/tools/misc/csvs-to-sqlite/default.nix b/pkgs/tools/misc/csvs-to-sqlite/default.nix index 28537e9631ea..2ed4af000f56 100644 --- a/pkgs/tools/misc/csvs-to-sqlite/default.nix +++ b/pkgs/tools/misc/csvs-to-sqlite/default.nix @@ -27,7 +27,6 @@ with python3.pkgs; buildPythonApplication rec { ]; nativeBuildInputs = [ - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/cyclonedx-python/default.nix b/pkgs/tools/misc/cyclonedx-python/default.nix index fa5be39000af..ba6d137fa5b7 100644 --- a/pkgs/tools/misc/cyclonedx-python/default.nix +++ b/pkgs/tools/misc/cyclonedx-python/default.nix @@ -36,7 +36,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with py.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with py.pkgs; [ diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 96e003fe7204..446af9107754 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -40,14 +40,14 @@ let binPath = lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.131"; + version = "1.0.136"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rwNcrS2GzVs0JYxeHcpLMG9FDwSpthNmZIemn95hC6g="; + hash = "sha256-hUXOUIUSANXS1a65AA30jZ3J444Xb2klu3m8x0QJfns="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 89af942966a6..d2f3360180b4 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -96,11 +96,11 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "269"; + version = "271"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-L2UygmcTXgcc9l8ALpOS52+2dhsO42733nlc1Hzl8L8="; + hash = "sha256-YwNaYj0daYbs3rN/EcPz5LihJjZ6JZb33FSS6u98Gss="; }; outputs = [ @@ -108,9 +108,6 @@ python.pkgs.buildPythonApplication rec { "man" ]; - # https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/378 - sourceRoot = "./-269"; - patches = [ ./ignore_links.patch ./openssh-no-dsa.patch # https://salsa.debian.org/reproducible-builds/diffoscope/-/merge_requests/139 @@ -151,6 +148,7 @@ python.pkgs.buildPythonApplication rec { # > FAILED tests/comparators/test_macho_decompiler.py::test_radare2_diff - AssertionError # # We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.). + # Packages which are marked broken for a platform are not automatically filtered to avoid accidentally removing them without noticing it. pythonPath = lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([ acl binutils-unwrapped-all-targets diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 6d00d4128a51..94984710511b 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "5.5"; + version = "5.6"; src = fetchurl { url = "https://eradman.com/entrproject/code/${pname}-${version}.tar.gz"; - hash = "sha256-EowM4u/qWua9P9M8PNMeFh6wwCYJ2HF6036VtBZW5SY="; + hash = "sha256-AiK435KNO1o7UZTWPn3gmFM+BBkNnZoVS5JsbB+d0U4="; }; postPatch = '' diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index ea6e7a3471d1..d9d05b161dd0 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -19,21 +19,20 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.6.4"; + version = "2024.6.6"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Wdq6sduIjvvLZAumYGmlm3QDaSKqmg/rssQNjdxQuaA="; + hash = "sha256-/EGj6kEgUhQefdFz/IllKWeVGLhC3STiOOsy3Pq4pIM="; }; nativeBuildInputs = with python.pkgs; [ setuptools argcomplete installShellFiles - pythonRelaxDepsHook ]; pythonRelaxDeps = true; diff --git a/pkgs/tools/misc/expect/0004-enable-cross-compilation.patch b/pkgs/tools/misc/expect/0004-enable-cross-compilation.patch new file mode 100644 index 000000000000..c09623d292b2 --- /dev/null +++ b/pkgs/tools/misc/expect/0004-enable-cross-compilation.patch @@ -0,0 +1,295 @@ +From: Andrew Ruder +Subject: [PATCH] enable cross compilation for expect + +This patch was created by running ./configure on a modern Linux machine +and inserting the results into the cross compilation section of +each AC_MSG_CHECKING that bombed out with an error. + +Signed-off-by: Andrew Ruder + +-- + +The original patch, and description above, is originally from +https://github.com/buildroot/buildroot/blob/master/package/expect/0001-enable-cross-compilation.patch + +This patch has been further modified to not hard-code Linux assumptions. + +--- + +Index: expect-5.45/configure.in +=================================================================== +--- expect-5.45.orig/configure.in 2013-11-14 07:59:58.732100595 -0600 ++++ expect-5.45/configure.in 2013-11-14 07:59:58.732100595 -0600 +@@ -6,10 +6,12 @@ + AC_INIT([expect],[5.45.4]) + + TEA_INIT([3.9]) + + AC_CONFIG_AUX_DIR(tclconfig) ++ ++AC_LANG([C]) + + #-------------------------------------------------------------------- + # Configure script for package 'Expect'. + # TEA compliant. + #-------------------------------------------------------------------- +@@ -465,26 +467,20 @@ + # Some systems only define WNOHANG if _POSIX_SOURCE is defined + # The following merely tests that sys/wait.h can be included + # and if so that WNOHANG is not defined. The only place I've + # seen this is ISC. + AC_MSG_CHECKING([if WNOHANG requires _POSIX_SOURCE]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include +-int +-main() { + #ifndef WNOHANG +- return 0; +-#else +- return 1; ++# error "WNOHANG requires _POSIX_SOURCE to be defined" + #endif +-}], ++]])], + AC_MSG_RESULT(yes) + AC_DEFINE(WNOHANG_REQUIRES_POSIX_SOURCE) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + AC_MSG_CHECKING([if any value exists for WNOHANG]) + rm -rf wnohang + AC_TRY_RUN([ +@@ -504,11 +501,12 @@ + rm -f wnohang + , + AC_MSG_RESULT(no) + AC_DEFINE(WNOHANG_BACKUP_VALUE, 1) + , +- AC_MSG_ERROR([Expect can't be cross compiled]) ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(WNOHANG_BACKUP_VALUE, 1) + ) + + # + # check how signals work + # +@@ -572,11 +570,11 @@ + }], + AC_MSG_RESULT(yes) + AC_DEFINE(REARM_SIG) + , + AC_MSG_RESULT(no) +-, AC_MSG_WARN([Expect can't be cross compiled]) ++, AC_MSG_RESULT(no) + ) + + # HPUX7 has trouble with the big cat so split it + # Owen Rees 29Mar93 + SEDDEFS="${SEDDEFS}CONFEOF +@@ -710,25 +708,19 @@ + AC_DEFINE(POSIX) + fi + + # first check for the pure bsd + AC_MSG_CHECKING([for struct sgttyb]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include +-int +-main() +-{ +- struct sgttyb tmp; +- return 0; +-}], ++static struct sgttyb tmp; ++]])], + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SGTTYB) + PTY_TYPE=sgttyb + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + # mach systems have include files for unimplemented features + # so avoid doing following test on those systems + if test $mach -eq 0 ; then +@@ -735,116 +728,88 @@ + # next check for the older style ttys + # note that if we detect termio.h (only), we still set PTY_TYPE=termios + # since that just controls which of pty_XXXX.c file is use and + # pty_termios.c is set up to handle pty_termio. + AC_MSG_CHECKING([for struct termio]) +- AC_TRY_RUN([#include +- int +- main() +- { +- struct termio tmp; +- return 0; +- }], ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++#include ++static struct termio tmp; ++]])], + AC_DEFINE(HAVE_TERMIO) + PTY_TYPE=termios + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + # now check for the new style ttys (not yet posix) + AC_MSG_CHECKING([for struct termios]) +- AC_TRY_RUN([ +- /* including termios.h on Solaris 5.6 fails unless inttypes.h included */ +-# ifdef HAVE_INTTYPES_H ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++/* including termios.h on Solaris 5.6 fails unless inttypes.h included */ ++#ifdef HAVE_INTTYPES_H + # include +-# endif +-# include +- int +- main() +- { +- struct termios tmp; +- return 0; +- }], ++#endif ++#include ++static struct termios tmp; ++]])], + AC_DEFINE(HAVE_TERMIOS) + PTY_TYPE=termios + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +- , +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + fi + + AC_MSG_CHECKING([if TCGETS or TCGETA in termios.h]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + /* including termios.h on Solaris 5.6 fails unless inttypes.h included */ + #ifdef HAVE_INTTYPES_H +-#include ++# include + #endif + #include +-int +-main() { +-#if defined(TCGETS) || defined(TCGETA) +- return 0; +-#else +- return 1; ++# ++#if !(defined(TCGETS) || defined(TCGETA)) ++# error "missing both of TCGETS and TCGETA" + #endif +-}], ++]])], + AC_DEFINE(HAVE_TCGETS_OR_TCGETA_IN_TERMIOS_H) + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + AC_MSG_CHECKING([if TIOCGWINSZ in termios.h]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + /* including termios.h on Solaris 5.6 fails unless inttypes.h included */ + #ifdef HAVE_INTTYPES_H +-#include ++# include + #endif + #include +-int +-main() { +-#ifdef TIOCGWINSZ +- return 0; +-#else +- return 1; ++ ++#ifndef TIOCGWINSZ ++# error "missing TIOCGWINSZ" + #endif +-}], ++]])], + AC_DEFINE(HAVE_TIOCGWINSZ_IN_TERMIOS_H) + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + # finally check for Cray style ttys + AC_MSG_CHECKING([for Cray-style ptys]) + SETUID=":" +-AC_TRY_RUN([ +-int +-main(){ +-#ifdef CRAY +- return 0; +-#else +- return 1; ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++#ifndef CRAY ++# error "CRAY is not defined" + #endif +-} +-], ++]])], + PTY_TYPE=unicos + SETUID="chmod u+s" + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + # + # Check for select and/or poll. If both exist, we prefer select. + # if neither exists, define SIMPLE_EVENT. +@@ -873,26 +842,24 @@ + + # + # check for timezones + # + AC_MSG_CHECKING([for SV-style timezone]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + extern char *tzname[2]; + extern int daylight; + int + main() + { + int *x = &daylight; + char **y = tzname; + + return 0; +-}], ++}]])], + AC_DEFINE(HAVE_SV_TIMEZONE) + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + + # Following comment stolen from Tcl's configure.in: + # Note: in the following variable, it's important to use the absolute + diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 543400380162..102120a8604e 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -10,12 +10,8 @@ tcl.mkTclDerivation rec { }; patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/buildroot/buildroot/c05e6aa361a4049eabd8b21eb64a34899ef83fc7/package/expect/0001-enable-cross-compilation.patch"; - hash = "sha256-yyzE0Jjac5qaj7Svn4VpMiAqSNLYrw7VZbtFqgMVncs="; - }) (substituteAll { - src = ./fix-cross-compilation.patch; + src = ./fix-build-time-run-tcl.patch; tcl = "${buildPackages.tcl}/bin/tclsh"; }) # The following patches fix compilation with clang 15+ @@ -27,8 +23,12 @@ tcl.mkTclDerivation rec { url = "https://sourceforge.net/p/expect/patches/_discuss/thread/b813ca9895/6759/attachment/expect-configure-c99.patch"; hash = "sha256-PxQQ9roWgVXUoCMxkXEgu+it26ES/JuzHF6oML/nk54="; }) + ./0004-enable-cross-compilation.patch # Include `sys/ioctl.h` and `util.h` on Darwin, which are required for `ioctl` and `openpty`. - ./fix-darwin-clang16.patch + # Include `termios.h` on FreeBSD for `openpty` + ./fix-darwin-bsd-clang16.patch + # Remove some code which causes it to link against a file that does not exist at build time on native FreeBSD + ./freebsd-unversioned.patch ]; postPatch = '' diff --git a/pkgs/tools/misc/expect/fix-cross-compilation.patch b/pkgs/tools/misc/expect/fix-build-time-run-tcl.patch similarity index 100% rename from pkgs/tools/misc/expect/fix-cross-compilation.patch rename to pkgs/tools/misc/expect/fix-build-time-run-tcl.patch diff --git a/pkgs/tools/misc/expect/fix-darwin-clang16.patch b/pkgs/tools/misc/expect/fix-darwin-bsd-clang16.patch similarity index 81% rename from pkgs/tools/misc/expect/fix-darwin-clang16.patch rename to pkgs/tools/misc/expect/fix-darwin-bsd-clang16.patch index 9454769c99c8..a0e11a5f9d6b 100644 --- a/pkgs/tools/misc/expect/fix-darwin-clang16.patch +++ b/pkgs/tools/misc/expect/fix-darwin-bsd-clang16.patch @@ -14,16 +14,21 @@ diff -ur a/exp_win.c b/exp_win.c diff -ur d/pty_termios.c c/pty_termios.c --- d/pty_termios.c 2023-10-10 07:59:23.244452442 -0400 +++ c/pty_termios.c 2023-10-10 08:00:35.303231582 -0400 -@@ -7,7 +7,13 @@ +@@ -7,7 +7,18 @@ */ -#include /* openpty */ +/* openpty */ -+#ifdef __APPLE__ -+#include ++#if defined(__APPLE__) ++# include ++#elif defined(__FreeBSD__) ++# include ++# include ++# include ++# include +#else /* pty.h is Linux-specific */ -+#include ++# include +#endif + #include diff --git a/pkgs/tools/misc/expect/freebsd-unversioned.patch b/pkgs/tools/misc/expect/freebsd-unversioned.patch new file mode 100644 index 000000000000..345fa4f6277f --- /dev/null +++ b/pkgs/tools/misc/expect/freebsd-unversioned.patch @@ -0,0 +1,14 @@ +--- expect5.45.4/tclconfig/tcl.m4.orig 2024-05-29 11:24:56.150656190 -0700 ++++ expect5.45.4/tclconfig/tcl.m4 2024-05-29 11:25:22.850790934 -0700 +@@ -1643,11 +1643,6 @@ + LIBS=`echo $LIBS | sed s/-pthread//` + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LDFLAGS="$LDFLAGS $PTHREAD_LIBS"]) +- # Version numbers are dot-stripped by system policy. +- TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` +- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' +- TCL_LIB_VERSIONS_OK=nodots + ;; + Darwin-*) + CFLAGS_OPTIMIZE="-Os" diff --git a/pkgs/tools/misc/fedifetcher/default.nix b/pkgs/tools/misc/fedifetcher/default.nix index 1210b7146fdb..bca508165e4f 100644 --- a/pkgs/tools/misc/fedifetcher/default.nix +++ b/pkgs/tools/misc/fedifetcher/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "7.1.1"; + version = "7.1.4"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; rev = "refs/tags/v${version}"; - hash = "sha256-HMpLn73PTk3kwlNof4EZhRHRlHUEfzJt5raYaEqWrjI="; + hash = "sha256-/iAmX2kBYJgtsz7b817UqLXkwVwXi7EY4KL0ZYxXYBw="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index ae377b63812f..7a06d96300c2 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -86,7 +86,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://gitlab.com/timvisee/ffsend"; license = licenses.gpl3Only; - maintainers = with maintainers; [ lilyball equirosa ]; + maintainers = with maintainers; [ equirosa ]; platforms = platforms.unix; mainProgram = "ffsend"; }; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index cfa4105cda0d..0caa589c6013 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "findutils"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { url = "mirror://gnu/findutils/${pname}-${version}.tar.xz"; - sha256 = "sha256-or+4wJ1DZ3DtxZ9Q+kg+eFsWGjt7nVR1c8sIBl/UYv4="; + sha256 = "sha256-E4fgtn/yR9Kr3pmPkN+/cMFJE5Glnd/suK5ph4nwpPU="; }; postPatch = '' diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 20349aa8ff4d..6d5d7147cbd6 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.0.7"; + version = "3.1.0"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-AR+YmxIP6VZlpztpez6OViX1cGqoP/jeOiuzBcav1Eg="; + hash = "sha256-X97Z/1GBooQNH6SLH5AG6uX7BkCXCIkdh9vEE4IkUEA="; }; # optional only to avoid linux rebuild diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index aed9b33584b6..fe626a417ab3 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { url = "https://github.com/fontforge/fontforge/commit/216eb14b558df344b206bf82e2bdaf03a1f2f429.patch"; hash = "sha256-aRnir09FSQMT50keoB7z6AyhWAVBxjSQsTRvBzeBuHU="; }) + + # https://github.com/fontforge/fontforge/pull/5423 + ./replace-distutils.patch ]; # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps diff --git a/pkgs/tools/misc/fontforge/replace-distutils.patch b/pkgs/tools/misc/fontforge/replace-distutils.patch new file mode 100644 index 000000000000..99087c649021 --- /dev/null +++ b/pkgs/tools/misc/fontforge/replace-distutils.patch @@ -0,0 +1,13 @@ +diff --git a/pyhook/CMakeLists.txt b/pyhook/CMakeLists.txt +index dd48054aa..710728f26 100644 +--- a/pyhook/CMakeLists.txt ++++ b/pyhook/CMakeLists.txt +@@ -21,7 +21,7 @@ target_link_libraries(psMat_pyhook PRIVATE Python3::Module) + # So do it ourselves, getting the prefix-relative path instead + if(NOT DEFINED PYHOOK_INSTALL_DIR) + execute_process( +- COMMAND "${Python3_EXECUTABLE}" -c "import distutils.sysconfig as sc; print(sc.get_python_lib(prefix='', plat_specific=True,standard_lib=False))" ++ COMMAND "${Python3_EXECUTABLE}" -c "import sysconfig; print(sysconfig.get_path('platlib', sysconfig.get_preferred_scheme('user'), vars={'userbase': '.'}))" + RESULT_VARIABLE _pyhook_install_dir_result + OUTPUT_VARIABLE PYHOOK_INSTALL_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 58928b4bf7ad..8b723ef0c81b 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fortune-mod"; - version = "3.20.0"; + version = "3.22.0"; # We use fetchurl instead of fetchFromGitHub because the release pack has some # special files. src = fetchurl { url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-MQG+lfuJxISNSD5ykw2o0D9pJXN6I9eIA9a1XEL+IJQ="; + sha256 = "sha256-BpMhu01K46v1VJPQQ86gZTTck/Giwp6GaU2e2xOAoOM="; }; nativeBuildInputs = [ cmake perl rinutils ]; diff --git a/pkgs/tools/misc/fxlinuxprintutil/default.nix b/pkgs/tools/misc/fxlinuxprintutil/default.nix index fba442e4aa0c..e041202576fb 100644 --- a/pkgs/tools/misc/fxlinuxprintutil/default.nix +++ b/pkgs/tools/misc/fxlinuxprintutil/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = "https://onlinesupport.fujixerox.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ delan ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/glasgow/default.nix b/pkgs/tools/misc/glasgow/default.nix index 4821ad923ef8..373a1d38889e 100644 --- a/pkgs/tools/misc/glasgow/default.nix +++ b/pkgs/tools/misc/glasgow/default.nix @@ -5,40 +5,49 @@ , yosys , icestorm , nextpnr +, unstableGitUpdater }: python3.pkgs.buildPythonApplication rec { pname = "glasgow"; - version = "unstable-2023-09-20"; - # python -m setuptools_scm - realVersion = "0.1.dev1798+g${lib.substring 0 7 src.rev}"; + version = "0-unstable-2024-06-27"; + # from `pdm show` + realVersion = let + tag = builtins.elemAt (lib.splitString "-" version) 0; + rev = lib.substring 0 7 src.rev; + in "${tag}.1.dev2085+g${rev}"; + + pyproject = true; src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "e9a9801d5be3dcba0ee188dd8a6e9115e337795d"; - sha256 = "sha256-ztB3I/jrDSm1gKB1e5igivUVloq+YYhkshDlWg75NMA="; + rev = "a599e3caa64c2e445358894fd050e16917f2ee42"; + sha256 = "sha256-5qg0/j1MgwHMOjySBY5cKuQqlqltV5cXcR/Ap6J9vys="; }; nativeBuildInputs = [ - python3.pkgs.setuptools-scm + python3.pkgs.pdm-backend sdcc ]; propagatedBuildInputs = with python3.pkgs; [ - aiohttp + typing-extensions amaranth - appdirs - bitarray - crc + packaging + platformdirs fx2 libusb1 - packaging pyvcd - setuptools + aiohttp ]; - nativeCheckInputs = [ yosys icestorm nextpnr ]; + nativeCheckInputs = [ + python3.pkgs.unittestCheckHook + yosys + icestorm + nextpnr + ]; enableParallelBuilding = true; @@ -46,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { make -C firmware LIBFX2=${python3.pkgs.fx2}/share/libfx2 cp firmware/glasgow.ihex software/glasgow cd software - export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" + export PDM_BUILD_SCM_VERSION="${realVersion}" ''; # installCheck tries to build_ext again @@ -54,16 +63,16 @@ python3.pkgs.buildPythonApplication rec { postInstall = '' mkdir -p $out/etc/udev/rules.d - cp $src/config/99-glasgow.rules $out/etc/udev/rules.d + cp $src/config/*.rules $out/etc/udev/rules.d ''; - checkPhase = '' + preCheck = '' + export PYTHONWARNINGS="ignore::DeprecationWarning" # tests attempt to cache bitstreams # for linux: export XDG_CACHE_HOME=$TMPDIR # for darwin: export HOME=$TMPDIR - ${python3.interpreter} -W ignore::DeprecationWarning test.py ''; makeWrapperArgs = [ @@ -72,6 +81,10 @@ python3.pkgs.buildPythonApplication rec { "--set" "NEXTPNR_ICE40" "${nextpnr}/bin/nextpnr-ice40" ]; + passthru.updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; + }; + meta = with lib; { description = "Software for Glasgow, a digital interface multitool"; homepage = "https://github.com/GlasgowEmbedded/Glasgow"; diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index 4675789c5914..c5901a6cd6e1 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotify-cli"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "gotify"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-mOIomHNA20gKU7uh2Sf4NqqLNjNnD5hgOTUu9DuduiI="; + sha256 = "sha256-Hzdd9T8RcLxHG+vHb4KuKqW4SwcWDrVc6DZ0QUpH2Xc="; }; - vendorHash = "sha256-ObJfUIy2GwogFm2/uCmShEXnIxDTqWWXCZPu9KJVFOA="; + vendorHash = "sha256-+G0LWlPiDcYmEou4gpoIU/OAjzQ3VSHftM1ViG9lhYM="; postInstall = '' mv $out/bin/cli $out/bin/gotify diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index d12babfddfaf..eef6062c73a5 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, gettext, coreutils, gnused, gnome +, adwaita-icon-theme , gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook3, substituteAll , mtools, dosfstools @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome.adwaita-icon-theme ]; + buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin adwaita-icon-theme ]; nativeBuildInputs = [ gettext pkg-config wrapGAppsHook3 ]; preConfigure = '' diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index 2b5878f7a638..c405f7a90751 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook3, pcre-cpp, gnome }: +{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook3, pcre-cpp, adwaita-icon-theme }: stdenv.mkDerivation rec { pname = "gsmartcontrol"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook3 ]; - buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ]; + buildInputs = [ gtkmm3 pcre-cpp adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix index eb8259929e82..d472727ce3ac 100644 --- a/pkgs/tools/misc/hdaps-gl/default.nix +++ b/pkgs/tools/misc/hdaps-gl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, freeglut, libGL, libGLU }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libglut, libGL, libGLU }: stdenv.mkDerivation rec { pname = "hdaps-gl"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ freeglut libGL libGLU ]; + buildInputs = [ libglut libGL libGLU ]; meta = with lib; { description = "GL-based laptop model that rotates in real-time via hdaps"; diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index bbea88413c77..226143c44be6 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , cmake , removeReferencesTo , cppSupport ? true @@ -28,21 +28,18 @@ assert !cppSupport || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.14.3"; + version = "1.14.4.3"; pname = "hdf5" + lib.optionalString cppSupport "-cpp" + lib.optionalString fortranSupport "-fortran" + lib.optionalString mpiSupport "-mpi" + lib.optionalString threadsafe "-threadsafe"; - src = fetchurl { - url = - let - majorMinor = lib.versions.majorMinor version; - majorMinorPatch = with lib.versions; "${major version}.${minor version}.${patch version}"; - in - "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${majorMinor}/hdf5-${majorMinorPatch}/src/hdf5-${version}.tar.bz2"; - sha256 = "sha256-lCXyJO110SgLtG1vJpI92Tj5BA5+rr9X5m7HNXwI+Rc="; + src = fetchFromGitHub { + owner = "HDFGroup"; + repo = "hdf5"; + rev = "hdf5_${version}"; + hash = "sha256-lvz3x04SS0oZmUn/BIxQEHnugaDOws46kfT3NAw7Hos="; }; passthru = { @@ -83,6 +80,9 @@ stdenv.mkDerivation rec { ++ lib.optional javaSupport "-DHDF5_BUILD_JAVA=ON" ++ lib.optional usev110Api "-DDEFAULT_API_VERSION=v110" ++ lib.optionals threadsafe [ "-DDHDF5_ENABLE_THREADSAFE:BOOL=ON" "-DHDF5_BUILD_HL_LIB=OFF" ] + # broken in nixpkgs since around 1.14.3 -> 1.14.4.3 + # https://github.com/HDFGroup/hdf5/issues/4208#issuecomment-2098698567 + ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) "-DHDF5_ENABLE_NONSTANDARD_FEATURE_FLOAT16=OFF" ; postInstall = '' diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 16b0f64a2207..58842ba6b55d 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.37"; + version = "0.10.38"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-WcX/H0zGXbkf5mM5Xq07UuQixUCCUXRPmBVrf3V4TEM="; + sha256 = "sha256-cnZ7ASYm1IhlqskWMEWzaAG6XKEex7P3akjmYUjHSzc="; }; vendorHash = "sha256-bLSj4/+7h0uHdR956VL4iLqRddKV5Ac+FIL1zJxPCW8="; diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 0b33329e1beb..c08bf5e9b102 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { pname = "ipxe"; - version = "1.21.1-unstable-2024-05-31"; + version = "1.21.1-unstable-2024-06-27"; nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "e965f179e1654103eca33feed7a9cc4c51d91be6"; - hash = "sha256-32LYNF+5z5rS4y2iGKA2BnQntXg9Ec9709m6pL5hBdo="; + rev = "b66e27d9b29a172a097c737ab4d378d60fe01b05"; + hash = "sha256-TKZ4WjNV2oZIYNefch7E7m1JpeoC/d7O1kofoNv8G40="; }; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix index fc2aa1400758..a93a9c9c8379 100644 --- a/pkgs/tools/misc/kodi-cli/default.nix +++ b/pkgs/tools/misc/kodi-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, zenity }: stdenv.mkDerivation rec { pname = "kodi-cli"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -a kodi-cli $out/bin wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]} cp -a playlist_to_kodi $out/bin - wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome.zenity jq youtube-dl ]} + wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash zenity jq youtube-dl ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/lerpn/default.nix b/pkgs/tools/misc/lerpn/default.nix index 8e35a5b0b107..f6714310f298 100644 --- a/pkgs/tools/misc/lerpn/default.nix +++ b/pkgs/tools/misc/lerpn/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication { meta = with lib; { homepage = "https://gitea.alexisvl.rocks/alexisvl/lerpn"; description = "Curses RPN calculator written in straight Python"; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; license = licenses.gpl3Plus; mainProgram = "lerpn"; }; diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix index c9baf275b4d2..9ee54115e693 100644 --- a/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/pkgs/tools/misc/lokalise2-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lokalise2-cli"; - version = "2.6.14"; + version = "3.0.0"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "sha256-kj0tkI87pgYdJNlQXCRpVhg7IjvWTDBDeXqePO0HZNo="; + sha256 = "sha256-kCD7PovmEU27q9zhXypOHiCy3tHipvuCLVHRcxjHObM="; }; - vendorHash = "sha256-P7AqMSV05UKeiUqWBxCOlLwMJcAtp0lpUC+eoE3JZFM="; + vendorHash = "sha256-SDI36+35yFy7Fp+VrnQMyIDUY1kM2tylwdS3I9E2vyk="; doCheck = false; diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index a2cd0ef600d1..c20c1c5aee51 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -14,10 +14,9 @@ let # Run `eval $(nix-build -A lorri.updater)` after updating the revision! # It will copy some required files if necessary. # Also don’t forget to run `nix-build -A lorri.tests` - version = "1.6.0"; - gitRev = "1.6.0"; - sha256 = "sha256-peelMKv9GOTPdyb1iifzlFikeayTchqaYCgeXyR5EgM="; - cargoSha256 = "sha256-UFAmTYnCqsQxBnCm1zMu+BcWIZMuuxvpF7poLlzC6Kg="; + version = "1.7.0"; + sha256 = "sha256-pGNhhEBHyWhTaW24dHrxAvpb/qr5RPbHXRwDZx6Rf74="; + cargoSha256 = "sha256-ENZATiBhoO+N6NpSknOWpvsatkaYb4mS/E63XNRXfMU="; in (rustPlatform.buildRustPackage rec { pname = "lorri"; @@ -26,7 +25,7 @@ in (rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "nix-community"; repo = pname; - rev = gitRev; + rev = version; inherit sha256; }; @@ -65,9 +64,9 @@ in (rustPlatform.buildRustPackage rec { meta = with lib; { description = "Your project's nix-env"; - homepage = "https://github.com/target/lorri"; + homepage = "https://github.com/nix-community/lorri"; license = licenses.asl20; - maintainers = with maintainers; [ grahamc Profpatsch ]; + maintainers = with maintainers; [ grahamc Profpatsch nyarly ]; mainProgram = "lorri"; }; }) diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix index e8553b7f9e58..af5ca9ac87b5 100644 --- a/pkgs/tools/misc/mandoc/default.nix +++ b/pkgs/tools/misc/mandoc/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { downloadPage = "http://mandoc.bsd.lv/snapshots/"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ bb010g ramkromberg sternenseemann ]; + maintainers = with maintainers; [ ramkromberg sternenseemann ]; }; } diff --git a/pkgs/tools/misc/mandown/default.nix b/pkgs/tools/misc/mandown/default.nix index 308605e1172f..cff5d74a9bd2 100644 --- a/pkgs/tools/misc/mandown/default.nix +++ b/pkgs/tools/misc/mandown/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mandown"; - version = "0.1.3"; + version = "0.1.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-8a4sImsjw+lzeVK4V74VpIKDcAhMR1bOmJYVWzfWEfc="; + sha256 = "sha256-8SHZR8frDHLGj2WYlnFGBWY3B6xv4jByET7CODt2TGw="; }; - cargoHash = "sha256-Wf1+dxwgPZ4CHpas+3P6n6kKDIISbnfI01+XksjxQlQ="; + cargoHash = "sha256-/IvPvJo5zwvLY+P5+hsdbR56/pfopfwncEz9UGUS1Oc="; meta = with lib; { description = "Markdown to groff (man page) converter"; diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 4140308c4967..888b8727c5d4 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.23.15"; + version = "1.24.3"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-tRjKBHsNJL66oz+0gZTrL8xFHQEyHLG+W35LHUYQKwU="; + hash = "sha256-3jSCZ4VsqYL2hGyv3aED2L2KKzurSdA/JxzDUypDoNI="; }; vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; diff --git a/pkgs/tools/misc/nanoemoji/default.nix b/pkgs/tools/misc/nanoemoji/default.nix index 210eb5d6f8a2..88b1cad12234 100644 --- a/pkgs/tools/misc/nanoemoji/default.nix +++ b/pkgs/tools/misc/nanoemoji/default.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools-scm - pythonRelaxDepsHook pngquant resvg diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix index 45716202878f..67f45c2eb6f2 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -4,7 +4,8 @@ , dconf , fetchFromGitHub , glib -, gnome +, nautilus +, nautilus-python , gobject-introspection , gsettings-desktop-schemas , gtk3 @@ -14,14 +15,14 @@ python3.pkgs.buildPythonPackage rec { pname = "nautilus-open-any-terminal"; - version = "0.5.1"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "Stunkymonkey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-liyzgbZGl08gHLVpsy8NbTiTytNdiMdymF70ik4cPXs="; + hash = "sha256-jKPqgd0sSt/qKPqbYbvdeGuo78R5gp1R5tSTPAzz+IU="; }; patches = [ ./hardcode-gsettings.patch ]; @@ -31,14 +32,14 @@ python3.pkgs.buildPythonPackage rec { gobject-introspection pkg-config wrapGAppsHook3 - python3.pkgs.setuptools + python3.pkgs.setuptools-scm ]; buildInputs = [ dbus dconf - gnome.nautilus - gnome.nautilus-python + nautilus + nautilus-python gsettings-desktop-schemas gtk3 python3.pkgs.pygobject3 diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch b/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch index 5116d5110ca1..7546c5561974 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch +++ b/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch @@ -1,8 +1,8 @@ diff --git a/nautilus_open_any_terminal/nautilus_open_any_terminal.py b/nautilus_open_any_terminal/nautilus_open_any_terminal.py -index b02a995..a616399 100644 +index 05b6514..b5541dc 100644 --- a/nautilus_open_any_terminal/nautilus_open_any_terminal.py +++ b/nautilus_open_any_terminal/nautilus_open_any_terminal.py -@@ -228,9 +228,10 @@ def set_terminal_args(*args): +@@ -413,9 +413,10 @@ if API_VERSION in ("3.0", "2.0"): """Provide keyboard shortcuts for opening terminals in Nautilus.""" def __init__(self): @@ -16,10 +16,24 @@ index b02a995..a616399 100644 self._gsettings.connect("changed", self._bind_shortcut) self._create_accel_group() self._window = None -@@ -326,9 +327,10 @@ class OpenAnyTerminalExtension(GObject.GObject, Nautilus.MenuProvider): - return items - - +@@ -452,9 +453,10 @@ class OpenAnyTerminalExtension(GObject.GObject, FileManager.MenuProvider): + """Provide context menu items for opening terminals in Nautilus.""" + + def __init__(self): +- gsettings_source = Gio.SettingsSchemaSource.get_default() +- if gsettings_source.lookup(GSETTINGS_PATH, True): +- self._gsettings = Gio.Settings.new(GSETTINGS_PATH) ++ gsettings_source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True) ++ if True: ++ _schema = gsettings_source.lookup(GSETTINGS_PATH, False) ++ self._gsettings = Gio.Settings.new_full(_schema, None, None); + + def _get_terminal_name(self): + if self._gsettings.get_boolean(GSETTINGS_USE_GENERIC_TERMINAL_NAME): +@@ -512,8 +514,9 @@ class OpenAnyTerminalExtension(GObject.GObject, FileManager.MenuProvider): + ) + + -source = Gio.SettingsSchemaSource.get_default() -if source is not None and source.lookup(GSETTINGS_PATH, True): - _gsettings = Gio.Settings.new(GSETTINGS_PATH) diff --git a/pkgs/tools/misc/nbqa/default.nix b/pkgs/tools/misc/nbqa/default.nix index 97c821947c03..5a05f403b641 100644 --- a/pkgs/tools/misc/nbqa/default.nix +++ b/pkgs/tools/misc/nbqa/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-vRJxpWs2i4A8gi8F4YrTlmgBSnA73KeMCrmjLNF1zpA="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { ruff = [ ruff ]; }; - propagatedBuildInputs = with python3.pkgs; + dependencies = with python3.pkgs; [ autopep8 ipython @@ -82,6 +82,10 @@ python3.pkgs.buildPythonApplication rec { "test_unable_to_reconstruct_message_pythonpath" "test_with_subcommand" "test_pylint_works" + + # Test cases not updated to work with ruff>=0.5.0 + # https://github.com/nbQA-dev/nbQA/issues/856 + "test_ruff_works" ]; disabledTestPaths = [ @@ -89,12 +93,12 @@ python3.pkgs.buildPythonApplication rec { "tests/test_include_exclude.py" ]; - meta = with lib; { + meta = { homepage = "https://github.com/nbQA-dev/nbQA"; changelog = "https://nbqa.readthedocs.io/en/latest/history.html"; description = "Run ruff, isort, pyupgrade, mypy, pylint, flake8, black, blacken-docs, and more on Jupyter Notebooks"; - license = licenses.mit; - maintainers = with maintainers; [ l0b0 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ l0b0 ]; mainProgram = "nbqa"; }; } diff --git a/pkgs/tools/misc/netbootxyz-efi/default.nix b/pkgs/tools/misc/netbootxyz-efi/default.nix index 2726df1b8701..89ffb7094442 100644 --- a/pkgs/tools/misc/netbootxyz-efi/default.nix +++ b/pkgs/tools/misc/netbootxyz-efi/default.nix @@ -15,7 +15,7 @@ in fetchurl { homepage = "https://netboot.xyz/"; description = "Tool to boot OS installers and utilities over the network, to be run from a bootloader"; license = licenses.asl20; - maintainers = with maintainers; [ Enzime ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/open-pdf-sign/default.nix b/pkgs/tools/misc/open-pdf-sign/default.nix index 76d957d340ad..1b87ca87728e 100644 --- a/pkgs/tools/misc/open-pdf-sign/default.nix +++ b/pkgs/tools/misc/open-pdf-sign/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "0.2.0"; + version = "0.2.1"; pname = "open-pdf-sign"; src = fetchurl { url = "https://github.com/open-pdf-sign/open-pdf-sign/releases/download/v${finalAttrs.version}/open-pdf-sign.jar"; - hash = "sha256-W4WymhjLrHtNK5XY8aahpZOIIh/Qp9scE3zybXF6/9o="; + hash = "sha256-jtaEystCiZUK93HkVPuWzAUISO4RMMxjMmFbooWZJGU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index b079c6c9bec1..648126154d37 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.103.0"; + version = "0.104.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-gunTgELRqPxlywQzI/+0UbXkLeCFAYIf+Mc3vN0Z/6U="; + sha256 = "sha256-M0aNobj5h2NcliNDI2TjyV6xcd8m0MK6Cv9bf2d0d9g="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-ZIoEeW8/4/SofZV49hDprwNgXG2mNRbRQBqZHmqy1Hk="; + vendorHash = "sha256-VTV6xgGWHc+H7eX1q2bYIS+YQxTvErf6+d8PNucUPkw="; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcontribcol"; diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index b9f3d12c0a92..05e5f9425462 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.101.0"; + version = "0.103.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - hash = "sha256-BRZxeTFw4v4LLXPPzIzcjtR/RTckpolGGcB6jyq+ZOA="; + hash = "sha256-xmsxr1A0/kyWXLNVZglZy8K7ieZT1GS4lGqsSrUkttI="; }; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcorecol"; - vendorHash = "sha256-dO0j26AlpibsmbOqozz9+xMAJS/ZZHT6Z857AblYFHA="; + vendorHash = "sha256-1NDGfzg/60VJNrWkMtGS2t3Cv1CXSguR1qLp4mqF1UM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/oppai-ng/default.nix b/pkgs/tools/misc/oppai-ng/default.nix index cf1ea893fcf9..f09a6b45cbed 100644 --- a/pkgs/tools/misc/oppai-ng/default.nix +++ b/pkgs/tools/misc/oppai-ng/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Difficulty and pp calculator for osu!"; homepage = "https://github.com/Francesco149/oppai-ng"; license = licenses.unlicense; - maintainers = with maintainers; [ tadeokondrak ]; + maintainers = with maintainers; [ ]; mainProgram = "oppai"; platforms = platforms.all; }; diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index 2aef5a0788a8..aa8c3d756984 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec { wrapProgram "$out/bin/panoply" --prefix PATH : "${jre}/bin" - runHook postHook + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index e68ed0e5cd00..886b611b3464 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20240522"; + version = "20240622"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - hash = "sha256-Z+2frTG/PiXwnVAOfoyn3546w4D+Tr0WxvAURIo0aSg="; + hash = "sha256-N+IQyQe9RDx9W2JgcegV3A1pHQZSmStn0MKsw0y/ONU="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/tools/misc/parquet-tools/default.nix index 2e0d5744659a..4775be223afa 100644 --- a/pkgs/tools/misc/parquet-tools/default.nix +++ b/pkgs/tools/misc/parquet-tools/default.nix @@ -39,7 +39,6 @@ buildPythonApplication rec { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index 1b9986a80dcd..79a7a221a947 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.29.0"; + version = "2.30.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-5f38D1+nK/yxJSdw4pgCfmWYlgCFxaE9Oey8/UwvR30="; + sha256 = "sha256-eeGoOBLQMp44Y7z3VQN+gaL1uJmyKNV1BmYSOhhjDkw="; }; - vendorHash = "sha256-Uqp+ZEdWDW5sA9EfjYX2ydMGmcGI4rPUINb3D2RlrQY="; + vendorHash = "sha256-pBIAcEmEWmjy1TE8EwZ3vmNmDdolyam/vxY5XHMXU+E="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/tools/misc/pipectl/default.nix b/pkgs/tools/misc/pipectl/default.nix index 68df99eb476b..6612826be2d6 100644 --- a/pkgs/tools/misc/pipectl/default.nix +++ b/pkgs/tools/misc/pipectl/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pipectl"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Ferdi265"; repo = pname; rev = "v${version}"; - hash = "sha256-Ixch5iyeIjx+hSvln8L0N8pXG7ordpsFVroqZPUzAG0="; + hash = "sha256-uBKHGR4kv62EMOIT/K+WbvFtdJ0V5IbsxjwQvhUu9f8="; }; nativeBuildInputs = [ cmake scdoc ]; diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 029c1077cc52..228900abf9dd 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pistol"; - version = "0.4.3"; + version = "0.5"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xzVVOx5Uz10Bv8LDRuqqxyjdYp1JKhQPb3ws2l6Dg2Y="; + sha256 = "sha256-C0X9LdCgfv+IFHsNLOumH1e/RAh6NycmE/J4SdA6AMs="; }; - vendorHash = "sha256-9+eWTpz2VcNtEwVtVdNPjXYdG7XjB7cvC4WWvxF7Lvs="; + vendorHash = "sha256-3H3XAJ9gNBd+IjxpjfUFl2/3NWN1E+6aey4i4ajOIiY="; doCheck = false; diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/tools/misc/piston-cli/default.nix index 44ec8eabc149..68519f2eb643 100644 --- a/pkgs/tools/misc/piston-cli/default.nix +++ b/pkgs/tools/misc/piston-cli/default.nix @@ -18,7 +18,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index bf186a3bad9a..7a840caec143 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, nixosTests }: let - version = "1.2024.5"; + version = "1.2024.6"; in stdenv.mkDerivation rec { pname = "plantuml-server"; inherit version; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-WbgjPPEm51DXzpSt2j8It8PWKRKrIK8HXoWY+N/1mlg="; + sha256 = "sha256-5+2Qut9c/UrwfiJXMm2Ix+ABCDCM65L1jpJdamjZ4k4="; }; dontUnpack = true; diff --git a/pkgs/tools/misc/pricehist/default.nix b/pkgs/tools/misc/pricehist/default.nix index fc6c5753b767..6930867cc446 100644 --- a/pkgs/tools/misc/pricehist/default.nix +++ b/pkgs/tools/misc/pricehist/default.nix @@ -9,7 +9,6 @@ , pytest-mock , responses , pytestCheckHook -, pythonRelaxDepsHook }: buildPythonApplication rec { @@ -33,7 +32,6 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - pythonRelaxDepsHook ]; nativeCheckInputs = [ diff --git a/pkgs/tools/misc/qmk_hid/default.nix b/pkgs/tools/misc/qmk_hid/default.nix index f5d1b61868a3..b0835dbcb577 100644 --- a/pkgs/tools/misc/qmk_hid/default.nix +++ b/pkgs/tools/misc/qmk_hid/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { description = "Commandline tool for interactng with QMK devices over HID"; homepage = "https://github.com/FrameworkComputer/qmk_hid"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "qmk_hid"; }; } diff --git a/pkgs/tools/misc/rkvm/default.nix b/pkgs/tools/misc/rkvm/default.nix index bf6ef6e482d0..162899b46e80 100644 --- a/pkgs/tools/misc/rkvm/default.nix +++ b/pkgs/tools/misc/rkvm/default.nix @@ -42,6 +42,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/htrefil/rkvm/releases/tag/${version}"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/rmate-sh/default.nix b/pkgs/tools/misc/rmate-sh/default.nix index 81189a1cd6c7..b362807f19d2 100644 --- a/pkgs/tools/misc/rmate-sh/default.nix +++ b/pkgs/tools/misc/rmate-sh/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { 'echo "${hostname}/bin/hostname"' patsh -f rmate -s ${builtins.storeDir} - runHook preBuild + runHook postBuild ''; installPhase = '' diff --git a/pkgs/tools/misc/script-directory/default.nix b/pkgs/tools/misc/script-directory/default.nix index 95ab361782f6..55be6b327f3e 100644 --- a/pkgs/tools/misc/script-directory/default.nix +++ b/pkgs/tools/misc/script-directory/default.nix @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/ianthehenry/sd"; changelog = "https://github.com/ianthehenry/sd/tree/${src.rev}#changelog"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "sd"; }; } diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix index 75d554ca4ecb..f2bc903d3d58 100644 --- a/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -23,7 +23,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ hatchling - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 907ca3432aea..c94f94f55f2e 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-JCdGmZk2vRn3X1BDxOJaY3Aw8dr0ODVzi0oY20ZWfRs="; excludes = [ "NEWS" ]; }) + + # switch to pep517 build tools + ./pep517.patch ]; buildInputs = [ @@ -44,7 +47,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext libtool autoconf-archive xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils - python3Packages.wrapPython + python3Packages.wrapPython python3Packages.build python3Packages.installer + python3Packages.setuptools python3Packages.wheel wrapGAppsHook3 autoreconfHook gobject-introspection ]; diff --git a/pkgs/tools/misc/system-config-printer/pep517.patch b/pkgs/tools/misc/system-config-printer/pep517.patch new file mode 100644 index 000000000000..1b02a548564f --- /dev/null +++ b/pkgs/tools/misc/system-config-printer/pep517.patch @@ -0,0 +1,16 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -59,11 +59,11 @@ dbus/org.fedoraproject.Config.Printing.service: dbus/org.fedoraproject.Config.Pr + + # Use distutils to build the module. + all-local: .stamp-distutils-in-builddir config.py cupshelpers/config.py +- $(PYTHON) setup.py build ++ $(PYTHON) -m build --no-isolation --outdir dist/ --wheel + + # Use distutils to install the module. + install-exec-local: .stamp-distutils-in-builddir +- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) ++ $(PYTHON) -m installer --prefix=$(prefix) dist/*.whl + + # Uninstall the module, crossing our fingers that we know enough + # about how distutils works to do this. Unfortunately, distutils diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index dec0e1b45335..aa72ecb5d980 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -48,6 +48,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/tmux/tmux/commit/4f5a944ae3e8f7a230054b6c0b26f423fa738e71.patch"; hash = "sha256-HlUeU5ZicPe7Ya8A1HpunxfVOE2BF6jOHq3ZqTuU5RE="; }) + # https://github.com/tmux/tmux/issues/3983 + # fix tmux crashing when neovim is used in a ssh session + (fetchpatch { + url = "https://github.com/tmux/tmux/commit/aa17f0e0c1c8b3f1d6fc8617613c74f07de66fae.patch"; + hash = "sha256-jhWGnC9tsGqTTA5tU+i4G3wlwZ7HGz4P0UHl17dVRU4="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 3b632348f263..8b037912a80d 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "14.0.1"; + version = "15.0.0"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-opTMV+OH8PR9SxBWj1o8xSngK0QdindDcXyd6TRjdvI="; + hash = "sha256-w3JsMUuARJ5UtA8Io3kzeNjXoa014YzyT8hHPwEgljQ="; }; - cargoHash = "sha256-pgYrUZAxoyllQp1HuVhbLR3za+Gx0l8Z2/Zq/KCOKZg="; + cargoHash = "sha256-DEZlpt9mOy/BOnvkkINz2+q3hUx2aBSzBfOVxv43w6g="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 0e88aa91c863..1b3c920eca09 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.25"; + version = "0.0.27"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - hash = "sha256-25jmlGxMWzAaJEmMHruA6H+nqx2QHnYX9c9SKqrQRE4="; + hash = "sha256-6MbX3C5NVwiOwXW5xJO2X3qKMh3pUSALR9aK2IbgaaU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-lQoOkiSga2aS8GNgLcHdid1/1u3johYEcGi9oOVsdJs="; + hash = "sha256-JowORfYHxN8GqvWeUm0ACnHNM3uZviYbhR7BOeAfphw="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; diff --git a/pkgs/tools/misc/watchlog/default.nix b/pkgs/tools/misc/watchlog/default.nix index d942d8282379..cd2cc2b0792c 100644 --- a/pkgs/tools/misc/watchlog/default.nix +++ b/pkgs/tools/misc/watchlog/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "watchlog"; - version = "1.213.0"; + version = "1.240.0"; src = fetchFromGitLab { owner = "kevincox"; repo = "watchlog"; rev = "v${version}"; - sha256 = "sha256-UNywUEhhJy2cJIwl/S9hRReoBfkzvNoN0c4mxp7PuG0="; + sha256 = "sha256-8uNBjkxETQXZOfRtxDg+aS8sIbYTD3g9ttBA4m2wavY="; }; - cargoSha256 = "sha256-HBlfSgR96XIUBj2ZyHi1qaEKP8jG9kcrxJmhIGWjfUE="; + cargoHash = "sha256-YFQGqkvUgoJJE2B/SQFksWS42YTF/O2tn3CNL54LRUY="; meta = { description = "Easier monitoring of live logs"; diff --git a/pkgs/tools/misc/wayback/default.nix b/pkgs/tools/misc/wayback/default.nix index 3fb220c4001e..7d7068e7a418 100644 --- a/pkgs/tools/misc/wayback/default.nix +++ b/pkgs/tools/misc/wayback/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "wayback"; - version = "0.19.1"; + version = "0.20.1"; src = fetchFromGitHub { owner = "wabarc"; repo = "wayback"; rev = "v${version}"; - hash = "sha256-LIWCT0/5T52VQQK4Dy6EFmFlJ02MkfvKddN/O/5zpZc="; + hash = "sha256-GnirEgJHgZVzxkFFVDU9795kgvMTitnH+xWd7ooNf7Y="; }; - vendorHash = "sha256-TC4uwJswpD5oKqF/rpXqU/h+k0jErwhguT/LkdBA83Y="; + vendorHash = "sha256-vk9c+U8mKwT03dHV9labvCOM2Ip1vk7AeiTleEBuNP4="; doCheck = false; diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix index e8d8098ad95c..4212e96586be 100644 --- a/pkgs/tools/misc/wimboot/default.nix +++ b/pkgs/tools/misc/wimboot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wimboot"; - version = "2.7.6"; + version = "2.8.0"; src = fetchFromGitHub { owner = "ipxe"; repo = "wimboot"; rev = "v${version}"; - sha256 = "sha256-AFPuHxcDM/cdEJ5nRJnVbPk7Deg97NeSMsg/qwytZX4="; + sha256 = "sha256-JqdOgcwOXIJDl8O7k/pHdd4MNC/rJ0fWTowtEVpJyx8="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/tools/misc/xcp/default.nix b/pkgs/tools/misc/xcp/default.nix index b98b965e5f74..68c29e3ce1ef 100644 --- a/pkgs/tools/misc/xcp/default.nix +++ b/pkgs/tools/misc/xcp/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "xcp"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "tarka"; repo = pname; rev = "v${version}"; - hash = "sha256-5d0jI2augBYHKM1H8QXDeBJeG3VoNBdfykU5I4E5xu8="; + hash = "sha256-dcNnj8j6eItDoP2K33nBPC8kvB9DuHc4/LxsoKF9H/g="; }; # no such file or directory errors doCheck = false; - cargoHash = "sha256-jS4OebCHcg7GG033LairvjXdswKaJI9kg8ycOQmXSME="; + cargoHash = "sha256-CT3vo5ctgB6kVOGPjMI/tLCvdWvXEFdOWip5nH9fxfo="; meta = with lib; { description = "Extended cp(1)"; diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 038cae8f39e6..f168c2826898 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -2,7 +2,7 @@ , stdenvNoCC , fetchFromGitHub , makeWrapper -, xorgserver +, xorg , getopt , xauth , util-linux @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation rec { patchShebangs $out/bin/xvfb-run wrapProgram $out/bin/xvfb-run \ --set-default FONTCONFIG_FILE "${fontsConf}" \ - --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]} + --prefix PATH : ${lib.makeBinPath [ getopt xorg.xvfb xauth which util-linux gawk coreutils ]} ''; doInstallCheck = true; diff --git a/pkgs/tools/misc/xxv/default.nix b/pkgs/tools/misc/xxv/default.nix index cd0208dd9ecf..1cb13709bb89 100644 --- a/pkgs/tools/misc/xxv/default.nix +++ b/pkgs/tools/misc/xxv/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://chrisvest.github.io/xxv/"; license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ lilyball ]; + maintainers = with maintainers; [ ]; mainProgram = "xxv"; }; } diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 77a6eceb8a2f..5f2becdadaff 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -92,5 +92,8 @@ buildPythonPackage rec { maintainers = with maintainers; [ bluescreen303 fpletz ]; platforms = with platforms; linux ++ darwin; mainProgram = "youtube-dl"; + knownVulnerabilities = [ + "youtube-dl is unmaintained, migrate to yt-dlp, if possible" + ]; }; } diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index d4e1f6df6dc4..66309af65bc9 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -25,13 +25,13 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.5.27"; + version = "2024.7.7"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-NWbA3iQNDNPRwihc5lX3LKON/GGNY01GgYsA2J1SiL4="; + hash = "sha256-Kg+JQj0l1H25SZJdtb0sb2UZYK6T279bPtYc86QHjOU="; }; build-system = [ diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 0bad719e3362..6243a2e4668c 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "5.4.0"; + version = "5.5.1"; pyproject = true; src = fetchFromGitHub { owner = "Yubico"; repo = "yubikey-manager"; rev = version; - hash = "sha256-Rn3iGiiR48EFVAn9BRQ043L8x7WwH7XnazZlVw50IGU="; + hash = "sha256-m/B5G83XZROoCNq/ZT0U0MUth2IC99e3LWc8FcOq1ig="; }; postPatch = '' @@ -25,7 +25,6 @@ python3Packages.buildPythonPackage rec { nativeBuildInputs = with python3Packages; [ poetry-core - pythonRelaxDepsHook installShellFiles ]; diff --git a/pkgs/tools/misc/zitadel-tools/default.nix b/pkgs/tools/misc/zitadel-tools/default.nix index cd5ae370805b..0ef9b344320d 100644 --- a/pkgs/tools/misc/zitadel-tools/default.nix +++ b/pkgs/tools/misc/zitadel-tools/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { description = "Helper tools for zitadel"; homepage = "https://github.com/zitadel/zitadel-tools"; license = licenses.asl20; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "zitadel-tools"; }; } diff --git a/pkgs/tools/misc/zthrottle/default.nix b/pkgs/tools/misc/zthrottle/default.nix index 8789af288146..aa1d3c1c4fbf 100644 --- a/pkgs/tools/misc/zthrottle/default.nix +++ b/pkgs/tools/misc/zthrottle/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Program that throttles a pipeline, only letting a line through at most every $1 seconds"; homepage = "https://github.com/anko/zthrottle"; license = licenses.unlicense; - maintainers = [ maintainers.ckie ]; + maintainers = [ ]; platforms = platforms.unix; mainProgram = "zthrottle"; }; diff --git a/pkgs/tools/networking/bore/default.nix b/pkgs/tools/networking/bore/default.nix index f32e9ff7542c..1ffbe6a603d3 100644 --- a/pkgs/tools/networking/bore/default.nix +++ b/pkgs/tools/networking/bore/default.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { description = "DNS query tool"; homepage = "https://crates.io/crates/bore"; license = licenses.isc; - maintainers = [ maintainers.delan ]; + maintainers = [ ]; mainProgram = "bore"; broken = stdenv.isDarwin; # bindgen fails on: "in6_addr_union_(...)" is not a valid Ident }; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 8f22d042b8d8..b50f61ebc304 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -62,7 +62,6 @@ buildFHSEnv { libdrm libudev0-shim libxkbcommon - mesa.drivers nspr nss pango diff --git a/pkgs/tools/networking/cloud-custodian/default.nix b/pkgs/tools/networking/cloud-custodian/default.nix index 587774ec53fa..42ba013670b8 100644 --- a/pkgs/tools/networking/cloud-custodian/default.nix +++ b/pkgs/tools/networking/cloud-custodian/default.nix @@ -25,7 +25,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ argcomplete diff --git a/pkgs/tools/networking/cloudflare-warp/default.nix b/pkgs/tools/networking/cloudflare-warp/default.nix index 4a0f84207136..0f6207a53e75 100644 --- a/pkgs/tools/networking/cloudflare-warp/default.nix +++ b/pkgs/tools/networking/cloudflare-warp/default.nix @@ -73,6 +73,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/systemd/user/warp-taskbar.service \ --replace "ExecStart=" "ExecStart=$out" + cat >>$out/lib/systemd/user/warp-taskbar.service < +Date: Fri, 7 Jun 2024 14:03:15 -0700 +Subject: [PATCH] libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid + function + +When building on musl systems ( with out systemd ), and using LLD linker +from LLVM project we fail to link with undefined symbols. + +This symbol is in sd_id128.c but its disabled, so let disable the functions +which need this function. + +| x86_64-yoe-linux-musl-ld.lld: error: undefined symbol: sd_id128_get_machine_app_specific +| >>> referenced by sd-dhcp-duid.c:202 (/usr/src/debug/networkmanager/1.48.0/../NetworkManager-1.48.0/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c:202) +| >>> libnm-systemd-core.a.p/src_libsystemd-network_sd-dhcp-duid.c.o:(sd_dhcp_duid_set_uuid) in archive src/libnm-systemd-core/libnm-systemd-core.a +| x86_64-yoe-linux-musl-clang: error: linker command failed with exit code 1 (use -v to see invocation) + +Signed-off-by: Khem Raj +--- + src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | 2 ++ + .../src/libsystemd-network/sd-dhcp6-client.c | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c +index e664a4a720..7ba502086f 100644 +--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c ++++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c +@@ -193,6 +193,7 @@ int sd_dhcp_duid_set_en(sd_dhcp_duid *duid) { + return 0; + } + ++#if 0 + int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { + sd_id128_t machine_id; + int r; +@@ -209,6 +210,7 @@ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { + duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id); + return 0; + } ++#endif + + int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) { + _cleanup_free_ char *p = NULL, *x = NULL; +diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c +index 7c20116409..08c1e96b3c 100644 +--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c +@@ -244,6 +244,7 @@ int sd_dhcp6_client_set_duid_en(sd_dhcp6_client *client) { + return 0; + } + ++#if 0 + int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { + int r; + +@@ -256,7 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { + + return 0; + } +- ++#endif + int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) { + int r; + +-- +GitLab + diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index 85c619aee27c..ffe6486ed236 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -13,7 +13,7 @@ let pname = "ockam"; - version = "0.127.0"; + version = "0.129.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - hash = "sha256-PPKLQ42V46ybtei0IKefPhpvKylvlj/nlOBJdz3O6Ho="; + hash = "sha256-KlfR5/SYm8r5c31P0L8HF/mBAkwPesZedKNR0hKxAR0="; }; - cargoHash = "sha256-8yOavvkYiYDZAIGe8K892Se0GC32u+09Wh/CC0G8Ss0="; + cargoHash = "sha256-YadksBZIwUfJN1pPpDDwQNknOyzc6WRTZZlOUZxI5uk="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; diff --git a/pkgs/tools/networking/octodns/default.nix b/pkgs/tools/networking/octodns/default.nix index 4eedbaa0dedd..6b354f3b3398 100644 --- a/pkgs/tools/networking/octodns/default.nix +++ b/pkgs/tools/networking/octodns/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { homepage = "https://github.com/octodns/octodns"; changelog = "https://github.com/octodns/octodns/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/octodns/providers/bind/default.nix b/pkgs/tools/networking/octodns/providers/bind/default.nix index d89576c75575..18cd54f0f081 100644 --- a/pkgs/tools/networking/octodns/providers/bind/default.nix +++ b/pkgs/tools/networking/octodns/providers/bind/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/octodns/octodns-bind"; changelog = "https://github.com/octodns/octodns-bind/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/octodns/providers/hetzner/default.nix b/pkgs/tools/networking/octodns/providers/hetzner/default.nix index 7ce8ceb81476..688f1c90e2b8 100644 --- a/pkgs/tools/networking/octodns/providers/hetzner/default.nix +++ b/pkgs/tools/networking/octodns/providers/hetzner/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/octodns/octodns-hetzner/"; changelog = "https://github.com/octodns/octodns-hetzner/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/octodns/providers/powerdns/default.nix b/pkgs/tools/networking/octodns/providers/powerdns/default.nix index deee1d142a31..25d5291a5594 100644 --- a/pkgs/tools/networking/octodns/providers/powerdns/default.nix +++ b/pkgs/tools/networking/octodns/providers/powerdns/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/octodns/octodns-powerdns/"; changelog = "https://github.com/octodns/octodns-powerdns/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 16bca4c2197d..9ddc2164b456 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -15,12 +15,13 @@ python3.pkgs.buildPythonApplication rec { pname = "offlineimap"; version = "8.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "OfflineIMAP"; repo = "offlineimap3"; rev = "v${version}"; - sha256 = "0y3giaz9i8vvczlxkbwymfkn3vi9fv599dy4pc2pn2afxsl4mg2w"; + hash = "sha256-XLxKqO5OCXsFu8S3lMp2Ke5hp6uer9npZ3ujmL6Kb3g="; }; patches = [ @@ -29,23 +30,18 @@ python3.pkgs.buildPythonApplication rec { url = "https://github.com/OfflineIMAP/offlineimap3/pull/139/commits/7cd32cf834b34a3d4675b29bebcd32dc1e5ef128.patch"; hash = "sha256-xNq4jFHMf9XZaa9BFF1lOzZrEGa5BEU8Dr+gMOBkJE4="; }) - ]; - - nativeBuildInputs = [ - asciidoc - docbook_xsl - installShellFiles - libxml2 - libxslt - ]; - - propagatedBuildInputs = with python3.pkgs; [ - certifi - distro - imaplib2 - pysocks - rfc6555 - urllib3 + (fetchpatch { + # https://github.com/OfflineIMAP/offlineimap3/pull/120 + name = "python312-comaptibility.patch"; + url = "https://github.com/OfflineIMAP/offlineimap3/commit/a1951559299b297492b8454850fcfe6eb9822a38.patch"; + hash = "sha256-CBGMHi+ZzOBJt3TxBf6elrTRMIQ+8wr3JgptL2etkoA="; + }) + (fetchpatch { + # https://github.com/OfflineIMAP/offlineimap3/pull/161 + name = "python312-compatibility.patch"; + url = "https://github.com/OfflineIMAP/offlineimap3/commit/3dd8ebc931e3f3716a90072bd34e50ac1df629fa.patch"; + hash = "sha256-2IJ0yzESt+zk+r+Z+9js3oKhFF0+xok0xK8Jd3G/gYY="; + }) ]; postPatch = '' @@ -56,6 +52,25 @@ python3.pkgs.buildPythonApplication rec { sed -i offlineimap/utils/distro_utils.py -e '/def get_os_sslcertfile():/a\ \ \ \ return "${cacert}/etc/ssl/certs/ca-bundle.crt"' ''; + build-system = [ python3.pkgs.setuptools ]; + + nativeBuildInputs = [ + asciidoc + docbook_xsl + installShellFiles + libxml2 + libxslt + ]; + + dependencies = with python3.pkgs; [ + certifi + distro + imaplib2 + pysocks + rfc6555 + urllib3 + ]; + postInstall = '' make -C docs man installManPage docs/offlineimap.1 diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index d451c3094e14..5b65cb8be37f 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation (finalAttrs: { - version = "7.6.0"; + version = "7.7.0"; pname = "openapi-generator-cli"; jarfilename = "${finalAttrs.pname}-${finalAttrs.version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://maven/org/openapitools/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.jarfilename}"; - sha256 = "sha256-NQdL3TzfxGvpqQLhGlSj+qPK4eNOtmy9lZ0cgHC719c="; + sha256 = "sha256-OnVydsMdJJpPBqFGUbH/Hxpc9G4RCnCtzEpqKDT4VWE="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 7196ceeebaad..17e228b041f3 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -36,7 +36,7 @@ , isNixos ? stdenv.hostPlatform.isLinux }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { inherit pname version src; patches = [ @@ -111,7 +111,7 @@ stdenv.mkDerivation { hardeningEnable = [ "pie" ]; - doCheck = true; + doCheck = false; enableParallelChecking = false; nativeCheckInputs = [ openssl ] ++ lib.optional (!stdenv.isDarwin) hostname; preCheck = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' @@ -181,7 +181,11 @@ stdenv.mkDerivation { inherit withKerberos; tests = { borgbackup-integration = nixosTests.borgbackup; - openssh = nixosTests.openssh; + nixosTest = nixosTests.openssh; + openssh = finalAttrs.finalPackage.overrideAttrs (previousAttrs: { + pname = previousAttrs.pname + "-test"; + doCheck = true; + }); }; }; @@ -194,4 +198,4 @@ stdenv.mkDerivation { maintainers = (extraMeta.maintainers or []) ++ (with maintainers; [ eelco aneeshusa ]); mainProgram = "ssh"; } // extraMeta; -} +}) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 855ce3de34cb..1c60f8f304d7 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -5,11 +5,11 @@ in { openssh = common rec { pname = "openssh"; - version = "9.7p1"; + version = "9.8p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-SQQm92bYKidj/KzY2D6j1weYdQx70q/y5X3FZg93P/0="; + hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM="; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; @@ -29,6 +29,8 @@ in extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/b3f86656fc67aa397f60747c85f7f7b967c3279d/security/openssh-portable/files/extra-patch-hpn"; in [ ./ssh-keysign-8.5.patch + ./openssh-9.6_p1-CVE-2024-6387.patch + ./openssh-9.6_p1-chaff-logic.patch # HPN Patch from FreeBSD ports (fetchpatch { @@ -68,6 +70,8 @@ in extraPatches = [ ./ssh-keysign-8.5.patch + ./openssh-9.6_p1-CVE-2024-6387.patch + ./openssh-9.6_p1-chaff-logic.patch (fetchpatch { name = "openssh-gssapi.patch"; diff --git a/pkgs/tools/networking/openssh/openssh-9.6_p1-CVE-2024-6387.patch b/pkgs/tools/networking/openssh/openssh-9.6_p1-CVE-2024-6387.patch new file mode 100644 index 000000000000..7b7fb70380d9 --- /dev/null +++ b/pkgs/tools/networking/openssh/openssh-9.6_p1-CVE-2024-6387.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/935271 +Backport proposed by upstream at https://marc.info/?l=oss-security&m=171982317624594&w=2. +--- a/log.c ++++ b/log.c +@@ -451,12 +451,14 @@ void + sshsigdie(const char *file, const char *func, int line, int showfunc, + LogLevel level, const char *suffix, const char *fmt, ...) + { ++#ifdef SYSLOG_R_SAFE_IN_SIGHAND + va_list args; + + va_start(args, fmt); + sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL, + suffix, fmt, args); + va_end(args); ++#endif + _exit(1); + } + diff --git a/pkgs/tools/networking/openssh/openssh-9.6_p1-chaff-logic.patch b/pkgs/tools/networking/openssh/openssh-9.6_p1-chaff-logic.patch new file mode 100644 index 000000000000..90544d1a457e --- /dev/null +++ b/pkgs/tools/networking/openssh/openssh-9.6_p1-chaff-logic.patch @@ -0,0 +1,16 @@ +"Minor logic error in ObscureKeystrokeTiming" +https://marc.info/?l=oss-security&m=171982317624594&w=2 +--- a/clientloop.c ++++ b/clientloop.c +@@ -608,8 +608,9 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout, + if (timespeccmp(&now, &chaff_until, >=)) { + /* Stop if there have been no keystrokes for a while */ + stop_reason = "chaff time expired"; +- } else if (timespeccmp(&now, &next_interval, >=)) { +- /* Otherwise if we were due to send, then send chaff */ ++ } else if (timespeccmp(&now, &next_interval, >=) && ++ !ssh_packet_have_data_to_write(ssh)) { ++ /* If due to send but have no data, then send chaff */ + if (send_chaff(ssh)) + nchaff++; + } diff --git a/pkgs/tools/networking/rosenpass/default.nix b/pkgs/tools/networking/rosenpass/default.nix index afbd1ac7f310..476514d7b826 100644 --- a/pkgs/tools/networking/rosenpass/default.nix +++ b/pkgs/tools/networking/rosenpass/default.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "rosenpass"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-t5AeJqeV16KCUoBm1GUzj/U6q382CRCR/XG6B2MiBU4="; + hash = "sha256-fQIeKGyTkFWUV9M1o256G4U1Os5OlVsRZu+5olEkbD4="; }; - cargoHash = "sha256-caYJP3SNpZxtV9y3D62CuzJ5RjMoq98D9W0Fms5E3Nc="; + cargoHash = "sha256-GyeJCIE60JuZa/NuixDc3gTj9WAOpSReIyVxQqM4tDQ="; nativeBuildInputs = [ cmake # for oqs build in the oqs-sys crate diff --git a/pkgs/tools/networking/sipexer/default.nix b/pkgs/tools/networking/sipexer/default.nix index d1be5e9f7770..98aaf67d80e6 100644 --- a/pkgs/tools/networking/sipexer/default.nix +++ b/pkgs/tools/networking/sipexer/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { homepage = "https://github.com/miconda/sipexer"; changelog = "https://github.com/miconda/sipexer/releases/tag/v${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ astro janik ]; + maintainers = with maintainers; [ astro ]; mainProgram = "sipexer"; }; } diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix index 619a3c773b16..12325afc48be 100644 --- a/pkgs/tools/networking/smartdns/default.nix +++ b/pkgs/tools/networking/smartdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "45"; + version = "46"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - hash = "sha256-aVGIgQkFz8A1UsHsgOSkEEE5vzp4cJEtcaKHv1EzErg="; + hash = "sha256-7JNP8vacYENBbbCxBtSpVu9j5vCBVBsQ/OeVPoRxlE4="; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 16c6a40bb347..2cb9f3b62a92 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "snabb"; - version = "2023.10"; + version = "2024.06"; src = fetchFromGitHub { owner = "snabbco"; repo = "snabb"; rev = "v${version}"; - sha256 = "sha256-oCHPRqJ1zm2Ple3Ck9nMyRC7PgKaF1RuswzdGBVU2C8="; + sha256 = "sha256-iCW0oEbLLqRKaxqxhSDsmRnI5YTi4HYcg+IWRAbt9WI="; }; installPhase = '' diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix deleted file mode 100644 index 34f64cb5e480..000000000000 --- a/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, fetchFromGitHub }: - -let - version = "3.14.79"; -in -fetchFromGitHub { - name = "stevenblack-blocklist-${version}"; - - owner = "StevenBlack"; - repo = "hosts"; - rev = version; - hash = "sha256-MfQGu+Y4/A0GKIu9d//U+yiP0fN/7cWhEo2dut4UvcE="; - - meta = with lib; { - description = "Unified hosts file with base extensions"; - homepage = "https://github.com/StevenBlack/hosts"; - license = licenses.mit; - maintainers = with maintainers; [ - moni - Guanran928 - frontear - ]; - }; -} diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix index 1d860bc75364..909648f8d03c 100644 --- a/pkgs/tools/networking/twa/default.nix +++ b/pkgs/tools/networking/twa/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "twa"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "trailofbits"; repo = "twa"; rev = "v${version}"; - hash = "sha256-8c1o03iwStmhjKHmEXIZGyaSOAJRlOuhu0ERjCO5SHg="; + hash = "sha256-B+UwH7oCtediLzurjYuLp56IxiKNAqyoW5QkwXX72MA="; }; dontBuild = true; diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 4fe4222ff08e..9e6961b7e526 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.15.3"; + version = "5.16.1"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-45VS+Hrl7egIS2PBrgmDsKgX6vKirEFyQUKy2TBxY4U="; + hash = "sha256-bgDTraLufl6txl9TMPstuPs4IgN1pLIBlpl2VlvuN0o="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorHash = "sha256-Z3jD7auUixTgrY9Cm0LoNRHIyEFbStMYpumTCqKv+x0="; + vendorHash = "sha256-FDmwZoBN2/8jPMs7xkQiI9hFt9cgaQPHC31ueYq3n9k="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/networking/v2raya/default.nix b/pkgs/tools/networking/v2raya/default.nix index a09bc8e3c53a..800bf07d754a 100644 --- a/pkgs/tools/networking/v2raya/default.nix +++ b/pkgs/tools/networking/v2raya/default.nix @@ -11,13 +11,13 @@ }: let pname = "v2raya"; - version = "2.2.5.1"; + version = "2.2.5.6"; src = fetchFromGitHub { owner = "v2rayA"; repo = "v2rayA"; rev = "v${version}"; - hash = "sha256-aicKjirUHNeCCxfW9aaPI+X5DTQ0RdZnCxIQRU+GdCM="; + hash = "sha256-tXVyroQ2yXwLe+OulvVQYgfd9EcC87S0L8d7w5gLnMI="; postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock"; }; guiSrc = "${src}/gui"; @@ -62,7 +62,7 @@ buildGoModule { inherit pname version; src = "${src}/service"; - vendorHash = "sha256-/4l13TbE1WEX1xYfyzEwygFsNtT6weoYDll4ejvCyIg="; + vendorHash = "sha256-8MSNTKeN0N2/yaHnXsKmxzw9vRy+E5q60IpwLycqC2I="; ldflags = [ "-s" diff --git a/pkgs/tools/networking/veilid/Cargo.lock b/pkgs/tools/networking/veilid/Cargo.lock index c783ac9a5907..25774d69682e 100644 --- a/pkgs/tools/networking/veilid/Cargo.lock +++ b/pkgs/tools/networking/veilid/Cargo.lock @@ -24,7 +24,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ "crypto-common", - "generic-array 0.14.7", + "generic-array", ] [[package]] @@ -74,9 +74,9 @@ dependencies = [ [[package]] name = "allo-isolate" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f5a5fd28223e6f3cafb7d9cd685f51eafdd71d33ca1229f8316925d5957240" +checksum = "97b6d794345b06592d0ebeed8e477e41b71e5a0a49df4fc0e4184d5938b99509" dependencies = [ "atomic", ] @@ -140,8 +140,8 @@ dependencies = [ [[package]] name = "ansi-parser" -version = "0.9.0" -source = "git+https://gitlab.com/davidbittner/ansi-parser.git#80b28ea6c42fc6ee7c9974aaa8059ae244032365" +version = "0.9.1" +source = "git+https://gitlab.com/davidbittner/ansi-parser.git#a431fb31f8b7f5680525987c1d67d4863ac02660" dependencies = [ "heapless", "nom", @@ -158,47 +158,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -206,25 +207,24 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" -version = "3.3.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" dependencies = [ "clipboard-win", "core-graphics", "image", "log", - "objc", - "objc-foundation", - "objc_id", - "parking_lot 0.12.2", - "thiserror", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "parking_lot 0.12.3", "windows-sys 0.48.0", "x11rb", ] @@ -253,18 +253,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "as-slice" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45403b49e3954a4b8428a0ac21a4b7afadccf92bfd96273f1a58cd4812496ae0" -dependencies = [ - "generic-array 0.12.4", - "generic-array 0.13.3", - "generic-array 0.14.7", - "stable_deref_trait", -] - [[package]] name = "async-attributes" version = "1.1.2" @@ -288,22 +276,21 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ "async-task", "concurrent-queue", @@ -318,10 +305,10 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.2.1", + "async-channel 2.3.1", "async-executor", - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.3", + "async-lock 3.4.0", "blocking", "futures-lite 2.3.0", "once_cell", @@ -349,17 +336,17 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 3.3.0", + "async-lock 3.4.0", "cfg-if 1.0.0", "concurrent-queue", "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.0", + "polling 3.7.2", "rustix 0.38.34", "slab", "tracing", @@ -377,12 +364,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] @@ -405,12 +392,12 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.3", + "async-lock 3.4.0", "atomic-waker", "cfg-if 1.0.0", "futures-core", @@ -461,7 +448,7 @@ dependencies = [ "futures-util", "hickory-resolver", "pin-utils", - "socket2 0.5.6", + "socket2 0.5.7", ] [[package]] @@ -483,7 +470,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -500,7 +487,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -581,9 +568,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" @@ -694,9 +681,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -731,22 +718,16 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - [[package]] name = "block-buffer" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] @@ -755,7 +736,7 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] @@ -775,13 +756,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] -name = "blocking" -version = "1.6.0" +name = "block2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "async-channel 2.2.1", - "async-lock 3.3.0", + "objc2", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel 2.3.1", "async-task", "futures-io", "futures-lite 2.3.0", @@ -805,9 +794,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -823,27 +812,27 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "capnp" -version = "0.18.13" +version = "0.19.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384b671a5b39eadb909b0c2b81d22a400d446526e651e64be9eb6674b33644a4" +checksum = "de71387912cac7dd3cb7c219e09628411620a18061bba58c71453c26ae7bf66a" dependencies = [ "embedded-io", ] [[package]] name = "capnpc" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a642faaaa78187e70bdcc0014c593c213553cfeda3b15054426d0d596048b131" +checksum = "c75ba30e0f08582d53c2f3710cf4bb65ff562614b1ba86906d7391adffe189ec" dependencies = [ "capnp", ] [[package]] name = "cc" -version = "1.0.95" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "5208975e568d83b6b05cc0a063c8e7e9acc2b43bee6da15616a5b73e109d7437" [[package]] name = "cesu8" @@ -878,6 +867,12 @@ 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 = "chacha20" version = "0.9.1" @@ -913,7 +908,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -922,7 +917,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] @@ -938,9 +933,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -964,9 +959,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", "clap_derive", @@ -974,9 +969,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstream", "anstyle", @@ -987,27 +982,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -1034,17 +1029,11 @@ dependencies = [ "owo-colors", ] -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "combine" @@ -1063,6 +1052,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", + "portable-atomic", ] [[package]] @@ -1100,7 +1090,7 @@ dependencies = [ "rust-ini 0.19.0", "serde", "serde_json", - "toml 0.8.12", + "toml 0.8.14", "yaml-rust", ] @@ -1119,22 +1109,22 @@ dependencies = [ [[package]] name = "console-api" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" +checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd" dependencies = [ "futures-core", - "prost 0.12.4", + "prost 0.12.6", "prost-types", - "tonic 0.10.2", + "tonic 0.11.0", "tracing-core", ] [[package]] name = "console-subscriber" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" +checksum = "31c4cc54bae66f7d9188996404abdf7fdfa23034ef8e43478c8810828abad758" dependencies = [ "console-api", "crossbeam-channel", @@ -1142,13 +1132,14 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime", + "prost 0.12.6", "prost-types", "serde", "serde_json", "thread_local", "tokio", "tokio-stream", - "tonic 0.10.2", + "tonic 0.11.0", "tracing", "tracing-core", "tracing-subscriber", @@ -1256,18 +1247,18 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1293,9 +1284,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" @@ -1303,12 +1294,12 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "crossterm_winapi", "futures-core", "libc", "mio", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "signal-hook", "signal-hook-mio", "winapi", @@ -1335,7 +1326,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.7", + "generic-array", "rand_core", "typenum", ] @@ -1346,7 +1337,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "generic-array 0.14.7", + "generic-array", "subtle", ] @@ -1357,7 +1348,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -1427,12 +1418,12 @@ dependencies = [ "log", "num", "owning_ref", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "serde_json", "serde_yaml", "time", "tokio", - "toml 0.8.12", + "toml 0.8.14", "unicode-segmentation", "unicode-width", "xi-unicode", @@ -1448,16 +1439,15 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.2" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if 1.0.0", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms", "rustc_version", "subtle", "zeroize", @@ -1471,7 +1461,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -1495,12 +1485,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] @@ -1519,15 +1509,15 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -1543,13 +1533,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.8", + "darling_core 0.20.9", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -1607,7 +1597,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] @@ -1691,15 +1681,15 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embedded-io" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bbadc628dc286b9ae02f0cb0f5411c056eb7487b72f0083203f115de94060" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" [[package]] name = "encode_unicode" @@ -1716,7 +1706,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -1736,7 +1726,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -1776,10 +1766,10 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" dependencies = [ - "darling 0.20.8", + "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -1813,9 +1803,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1846,20 +1836,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1868,23 +1847,13 @@ dependencies = [ "portable-atomic-util", ] -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - [[package]] name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener 5.3.1", "pin-project-lite", ] @@ -1946,9 +1915,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "filetime" @@ -1964,9 +1933,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4556222738635b7a3417ae6130d8f52201e45a0c4d1a907f0826383adb5f85e7" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -2032,7 +2001,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -2144,7 +2113,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -2193,24 +2162,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "304de19db7028420975a296ab0fcbbc8e69438c4ed254a1e41e2a7f37d5f0e0a" -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - -[[package]] -name = "generic-array" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f797e67af32588215eaaab8327027ee8e71b9dd0b2b26996aedf20c030fce309" -dependencies = [ - "typenum", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -2233,9 +2184,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2305,7 +2256,7 @@ dependencies = [ "grpcio-sys", "libc", "log", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "protobuf", ] @@ -2352,9 +2303,9 @@ checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" [[package]] name = "hash32" -version = "0.1.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" dependencies = [ "byteorder", ] @@ -2411,12 +2362,10 @@ dependencies = [ [[package]] name = "heapless" -version = "0.6.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634bd4d29cbf24424d0a4bfcbf80c6960129dc24424752a7d1d1390607023422" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" dependencies = [ - "as-slice", - "generic-array 0.14.7", "hash32", "stable_deref_trait", ] @@ -2448,6 +2397,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -2490,7 +2445,7 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "rand", "resolv-conf", "smallvec", @@ -2574,9 +2529,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -2592,9 +2547,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -2607,7 +2562,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.6", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -2687,13 +2642,12 @@ dependencies = [ [[package]] name = "image" -version = "0.24.9" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", "byteorder", - "color_quant", "num-traits", "png", "tiff", @@ -2737,14 +2691,14 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if 1.0.0", ] @@ -2766,7 +2720,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.6", + "socket2 0.5.7", "widestring", "windows-sys 0.48.0", "winreg", @@ -2778,6 +2732,12 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.10.5" @@ -2884,41 +2844,41 @@ dependencies = [ [[package]] name = "keyvaluedb" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bdcaabe14fa83eaae1fb92480f619c5a8b413580723153da0334848eb2dff24" +checksum = "c3fe4850c4103a92a7bd14a56ecbe413c27f8c89ea642cb4753b310c30dff812" dependencies = [ "smallvec", ] [[package]] name = "keyvaluedb-memorydb" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62802173041ed97845bc20f8cf6817e445fe537ed879ddf43fb96166829ec8ff" +checksum = "e5e8d196e170cdf21ee4fb0ff779278ca24253c10abee1a49914a893dce71097" dependencies = [ "keyvaluedb", - "parking_lot 0.12.2", + "parking_lot 0.12.3", ] [[package]] name = "keyvaluedb-sqlite" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "144f474a27a7dadc5c179c08ef9a4662acaca8047f4e5c30d5b77582243c7538" +checksum = "aa4d3df76ca45b92891e22fbd0a0928d2ef848a65051d5bd2da43ed1c0dfeb6f" dependencies = [ "hex", "keyvaluedb", "log", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "rusqlite", ] [[package]] name = "keyvaluedb-web" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93d243dfa1643389f8b981ddc07b2a7c533f0fae38b3f5831b004b2cc7f6353" +checksum = "351f750d6c87e6af74cdead18c33bb14fa47882787873bc05faa0002078cb9e5" dependencies = [ "async-lock 2.8.0", "flume", @@ -2927,7 +2887,7 @@ dependencies = [ "keyvaluedb", "keyvaluedb-memorydb", "log", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "send_wrapper 0.6.0", "wasm-bindgen", "web-sys", @@ -2944,9 +2904,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -2956,9 +2916,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libc-print" @@ -2971,12 +2931,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2985,7 +2945,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -3002,9 +2962,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -3026,9 +2986,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -3042,9 +3002,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "value-bag", ] @@ -3073,15 +3033,6 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - [[package]] name = "match_cfg" version = "0.1.0" @@ -3105,9 +3056,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -3138,9 +3089,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -3211,7 +3162,7 @@ dependencies = [ "ndk-macro", "ndk-sys 0.4.1+23.1.7779620", "once_cell", - "parking_lot 0.12.2", + "parking_lot 0.12.3", ] [[package]] @@ -3341,7 +3292,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if 1.0.0", "libc", ] @@ -3352,9 +3303,21 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if 1.0.0", - "cfg_aliases", + "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 1.0.0", + "cfg_aliases 0.2.1", "libc", ] @@ -3389,9 +3352,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -3403,20 +3366,19 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -3438,9 +3400,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -3449,11 +3411,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -3461,9 +3422,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -3509,32 +3470,102 @@ dependencies = [ ] [[package]] -name = "objc" -version = "0.2.7" +name = "objc-sys" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ - "malloc_buf", + "objc-sys", + "objc2-encode", ] [[package]] -name = "objc-foundation" -version = "0.1.1" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "block", - "objc", - "objc_id", + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", ] [[package]] -name = "objc_id" -version = "0.1.1" +name = "objc2-core-data" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "objc", + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", ] [[package]] @@ -3753,9 +3784,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core 0.9.10", @@ -3783,9 +3814,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3801,9 +3832,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" @@ -3825,9 +3856,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.9" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -3836,9 +3867,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.9" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -3846,22 +3877,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.9" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] name = "pest_meta" -version = "2.7.9" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", @@ -3895,7 +3926,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -3912,9 +3943,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -3937,12 +3968,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - [[package]] name = "png" version = "0.17.13" @@ -3974,13 +3999,13 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", - "hermit-abi 0.3.9", + "hermit-abi 0.4.0", "pin-project-lite", "rustix 0.38.34", "tracing", @@ -4006,9 +4031,9 @@ checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "portable-atomic-util" -version = "0.1.5" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a7411625b38d51b41421c6333976adffd4674a925a978856734a2dc853449b" +checksum = "15e6070f5b7452d6689dd85f08a109adec42cf6d039c9100aab6ee3403fd7307" dependencies = [ "portable-atomic", ] @@ -4046,9 +4071,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -4065,12 +4090,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.4", + "prost-derive 0.12.6", ] [[package]] @@ -4088,24 +4113,24 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] name = "prost-types" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.4", + "prost 0.12.6", ] [[package]] @@ -4217,11 +4242,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -4237,14 +4262,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -4258,13 +4283,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -4275,9 +4300,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "resolv-conf" @@ -4322,7 +4347,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_derive", ] @@ -4373,7 +4398,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4403,9 +4428,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -4442,10 +4467,10 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -4482,9 +4507,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustyline-async" @@ -4504,9 +4529,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -4519,9 +4544,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.17" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f55c82c700538496bdc329bb4918a81f87cc8888811bd123cf325a0f2f8d309" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "dyn-clone", "schemars_derive", @@ -4531,14 +4556,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.17" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83263746fe5e32097f06356968a077f96089739c927a61450efa069905eec108" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", - "serde_derive_internals 0.29.0", - "syn 2.0.60", + "serde_derive_internals 0.29.1", + "syn 2.0.69", ] [[package]] @@ -4585,11 +4610,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -4598,9 +4623,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -4608,9 +4633,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "send_wrapper" @@ -4629,9 +4654,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.199" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -4669,9 +4694,9 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] @@ -4688,13 +4713,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -4705,25 +4730,25 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] name = "serde_derive_internals" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -4738,14 +4763,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -4773,7 +4798,7 @@ dependencies = [ "futures", "lazy_static", "log", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "serial_test_derive", ] @@ -4785,7 +4810,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -4949,9 +4974,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -5037,9 +5062,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" dependencies = [ "proc-macro2", "quote", @@ -5054,9 +5079,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sysinfo" -version = "0.30.11" +version = "0.30.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87341a165d73787554941cd5ef55ad728011566fe714e987d1b976c15dbc3a83" +checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -5101,28 +5126,28 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "662b54ef6f7b4e71f683dadc787bbb2d8e8ef2f91b682ebed3164a5a7abca905" dependencies = [ - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project", ] [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -5190,9 +5215,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22" dependencies = [ "tinyvec_macros", ] @@ -5205,19 +5230,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", "libc", "mio", "num_cpus", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2 0.5.7", "tokio-macros", "tracing", "windows-sys 0.48.0", @@ -5235,13 +5260,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -5257,9 +5282,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -5267,7 +5292,6 @@ dependencies = [ "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -5281,21 +5305,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.12", + "toml_edit 0.22.14", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -5313,15 +5337,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.12" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.7", + "winnow 0.6.13", ] [[package]] @@ -5354,9 +5378,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ "async-stream", "async-trait", @@ -5370,7 +5394,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.4", + "prost 0.12.6", "tokio", "tokio-stream", "tower", @@ -5443,7 +5467,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -5466,6 +5490,17 @@ dependencies = [ "tracing-subscriber", ] +[[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-journald" version = "0.3.0" @@ -5562,9 +5597,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" +checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" dependencies = [ "serde", "stable_deref_trait", @@ -5599,7 +5634,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.28.0", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -5662,9 +5697,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode_categories" @@ -5696,9 +5731,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -5719,9 +5754,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "valuable" @@ -5731,9 +5766,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74797339c3b98616c009c7c3eb53a0ce41e85c8ec66bd3db96ed132d20cfdee8" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" [[package]] name = "vcpkg" @@ -5785,14 +5820,14 @@ dependencies = [ [[package]] name = "veilid-cli" -version = "0.3.2" +version = "0.3.3" dependencies = [ "arboard", "async-std", "async-tungstenite", "cfg-if 1.0.0", "chrono", - "clap 4.5.4", + "clap 4.5.8", "config 0.14.0", "console", "crossbeam-channel", @@ -5810,7 +5845,7 @@ dependencies = [ "log", "lru", "owning_ref", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "rustyline-async", "serde", "serde_derive", @@ -5826,7 +5861,7 @@ dependencies = [ [[package]] name = "veilid-core" -version = "0.3.2" +version = "0.3.3" dependencies = [ "argon2", "async-io 1.13.0", @@ -5857,6 +5892,7 @@ dependencies = [ "glob", "hex", "hickory-resolver", + "indent", "jni", "jni-sys", "js-sys", @@ -5875,7 +5911,7 @@ dependencies = [ "num-traits", "once_cell", "paranoid-android", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "paste", "range-set-blaze", "rustls", @@ -5891,7 +5927,7 @@ dependencies = [ "sha2 0.10.8", "shell-words", "simplelog", - "socket2 0.5.6", + "socket2 0.5.7", "static_assertions", "stop-token", "sysinfo", @@ -5929,7 +5965,7 @@ dependencies = [ [[package]] name = "veilid-flutter" -version = "0.3.2" +version = "0.3.3" dependencies = [ "allo-isolate", "android_log-sys 0.3.1", @@ -5949,13 +5985,14 @@ dependencies = [ "opentelemetry-semantic-conventions", "oslog", "paranoid-android", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "serde", "serde_json", "tokio", "tokio-stream", "tokio-util", "tracing", + "tracing-flame", "tracing-opentelemetry", "tracing-subscriber", "veilid-core", @@ -5986,13 +6023,13 @@ dependencies = [ [[package]] name = "veilid-server" -version = "0.3.2" +version = "0.3.3" dependencies = [ "ansi_term", "async-std", "backtrace", "cfg-if 1.0.0", - "clap 4.5.4", + "clap 4.5.8", "color-eyre", "config 0.14.0", "console-subscriber", @@ -6004,11 +6041,11 @@ dependencies = [ "hostname 0.4.0", "json", "lazy_static", - "nix 0.28.0", + "nix 0.29.0", "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "rpassword", "serde", "serde_derive", @@ -6023,6 +6060,7 @@ dependencies = [ "tokio-util", "tracing", "tracing-appender", + "tracing-flame", "tracing-journald", "tracing-opentelemetry", "tracing-subscriber", @@ -6036,7 +6074,7 @@ dependencies = [ [[package]] name = "veilid-tools" -version = "0.3.2" +version = "0.3.3" dependencies = [ "android_logger 0.13.3", "async-lock 2.8.0", @@ -6066,7 +6104,7 @@ dependencies = [ "once_cell", "oslog", "paranoid-android", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "rand", "rand_core", "range-set-blaze", @@ -6094,7 +6132,7 @@ dependencies = [ [[package]] name = "veilid-wasm" -version = "0.3.2" +version = "0.3.3" dependencies = [ "cfg-if 1.0.0", "console_error_panic_hook", @@ -6103,7 +6141,7 @@ dependencies = [ "gloo-utils 0.2.0", "js-sys", "lazy_static", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "send_wrapper 0.6.0", "serde", "serde-wasm-bindgen 0.6.5", @@ -6128,9 +6166,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" @@ -6180,7 +6218,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", "wasm-bindgen-shared", ] @@ -6214,7 +6252,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6247,7 +6285,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] @@ -6326,9 +6364,9 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dadf90865f15d5c2d87f126a56ce3715b3a233641acdd10f59200aa7f4c81fb9" dependencies = [ - "event-listener 5.3.0", + "event-listener 5.3.1", "futures-core", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project-lite", "triomphe", ] @@ -6399,7 +6437,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6417,7 +6455,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6436,7 +6474,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24d6bcc7f734a4091ecf8d7a64c5f7d7066f45585c1861eba06449909609c8a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "widestring", "windows-sys 0.52.0", ] @@ -6465,7 +6503,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6500,18 +6538,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "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.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -6528,9 +6566,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -6546,9 +6584,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -6564,15 +6602,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -6588,9 +6626,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6606,9 +6644,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6624,9 +6662,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6642,9 +6680,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -6657,9 +6695,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.7" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -6695,9 +6733,9 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "gethostname", "rustix 0.38.34", @@ -6706,9 +6744,9 @@ dependencies = [ [[package]] name = "x11rb-protocol" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "x25519-dalek" @@ -6789,29 +6827,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -6824,7 +6862,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.69", ] [[package]] diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix index cc6669b79482..f1a53c461a33 100644 --- a/pkgs/tools/networking/veilid/default.nix +++ b/pkgs/tools/networking/veilid/default.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "veilid"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitLab { owner = "veilid"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iaWdI6lhxX3xdpd5caPl5cWXrBkWiMc7T/dMXp2hqNM="; + sha256 = "sha256-Gm65fvLImbsAU8kMYQv5VFEjkBQnhBFDqwheddRbtU8="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ansi-parser-0.9.0" = "sha256-3qTJ4J3QE73ScDShnTFD4WPiZaDaiss0wqXmeRQEIt0="; + "ansi-parser-0.9.1" = "sha256-Vdjt8QDstrfxYfklZ5vYPGhVNG1BVh4cpKGwvvsHlS4="; "cursive-0.20.0" = "sha256-EGKO7JVN9hIqADKKC3mUHHOCSxMjPoXzYBZujzdgk3E="; "cursive_buffered_backend-0.6.1" = "sha256-+sTJnp570HupwaJxV2x+oKyLwNmqQ4HqOH2P1s9Hhw8="; "cursive_table_view-0.14.0" = "sha256-haos82qtobMsFCP3sNRu5u1mki4bsjrV+eqFxUGIHqk="; diff --git a/pkgs/tools/networking/vpn-slice/default.nix b/pkgs/tools/networking/vpn-slice/default.nix index 0cde0170b78f..ce8b04c35fc7 100644 --- a/pkgs/tools/networking/vpn-slice/default.nix +++ b/pkgs/tools/networking/vpn-slice/default.nix @@ -43,6 +43,6 @@ buildPythonApplication rec { "vpnc-script replacement for easy and secure split-tunnel VPN setup"; mainProgram = "vpn-slice"; license = licenses.gpl3; - maintainers = with maintainers; [ liketechnik ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index d5cec9284550..dae32fa93f1e 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchurl, gettext, pkg-config, perlPackages , libidn2, zlib, pcre, libuuid, libiconv, libintl -, python3, lzip +, python3, lzip, darwin , withLibpsl ? false, libpsl , withOpenssl ? true, openssl }: stdenv.mkDerivation rec { pname = "wget"; - version = "1.21.4"; + version = "1.24.5"; src = fetchurl { - url = "mirror://gnu/wget/${pname}-${version}.tar.lz"; - hash = "sha256-NoNhml9Q7cvMsXIKeQBvo3v5uaJVqMW0gEi8PHqHS9k="; + url = "mirror://gnu/wget/wget-${version}.tar.lz"; + hash = "sha256-V6EHFR5O+U/flK/+z6xZiWPzcvEyk+2cdAMhBTkLNu4="; }; patches = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ++ lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ] ++ lib.optional withOpenssl openssl ++ lib.optional withLibpsl libpsl - ++ lib.optional stdenv.isDarwin perlPackages.perl; + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices perlPackages.perl ]; configureFlags = [ (lib.withFeatureAs withOpenssl "ssl" "openssl") diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index e0b213a120b2..5df8e7903b2b 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.22.0"; + version = "0.22.2"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-hppfBiWJAsJXh6eERh4RYTmSOCNlxy2BcilRM6oafjk="; + sha256 = "sha256-FhhVodpIdcB+2s4AkFk6phvoXFLYll/CFJV2/lHS0ww="; }; - cargoHash = "sha256-pyOcrc8F+rdYWQtOEP6RZpaKeaMGNvc6eqFOVeBzK4k="; + cargoHash = "sha256-P/OLzMpqWThrdCReWcPlVPGqVSjVD1veq3xL0TJ/soM="; buildFeatures = lib.optional withNativeTls "native-tls"; diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index e4e5a1a22fda..05948633d0cf 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -14,14 +14,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-1CdYmFKpjc3CAmHwpSJ3IL4ZrJqYo0QZ4a/yRy732IM="; - aarch64-linux = "sha256-Du/Kyb4UafEK3ssfWB3w0harAxUIlmsc5SGsxf1Dc18="; - armv7l-linux = "sha256-59tQ5sNk0QL1H+BjeiiJItTQUNWCNuWCp0wWe//VEhg="; + x86_64-linux = "sha256-8fEmiRKFOrF9v66OEfUGLUYK+DfZMkAXrCKu2DoGbLA="; + aarch64-linux = "sha256-p+YbWpyLfIgFdNvakQQFfi+P/9lhfVMM+Y0XynRJ/rY="; + armv7l-linux = "sha256-mMjtbAjylSjS+89T0qQoI4H/p316cqh+5fbgarFbv90="; }.${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "zrok"; - version = "0.4.32"; + version = "0.4.34"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz"; diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix deleted file mode 100644 index 84672a8e96a3..000000000000 --- a/pkgs/tools/nix/cached-nix-shell/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, fetchFromGitHub, nix, ronn, rustPlatform }: - -let - blake3-src = fetchFromGitHub { - owner = "BLAKE3-team"; - repo = "BLAKE3"; - rev = "0.3.3"; - sha256 = "0av41ld0gqf3g60gcllpz59nqlr7r62v99mgfq9gs0p8diw5gi7x"; - }; - -in rustPlatform.buildRustPackage rec { - pname = "cached-nix-shell"; - version = "0.1.5"; - - src = fetchFromGitHub { - owner = "xzfc"; - repo = pname; - rev = "v${version}"; - sha256 = "17v38llx83mp05a0axjxcd2zyafd57syh7xhx5cq6qibcbha0by9"; - }; - - cargoSha256 = "1jkkwsn3k2anmzf99x99r9zfnf0gpcjbi5pyakh4agiryqcdyg0j"; - - # The BLAKE3 C library is intended to be built by the project depending on it - # rather than as a standalone library. - # https://github.com/BLAKE3-team/BLAKE3/blob/0.3.1/c/README.md#building - BLAKE3_CSRC = "${blake3-src}/c"; - - nativeBuildInputs = [ nix ronn ]; - - postBuild = '' - make -f nix/Makefile post-build - ''; - - postInstall = '' - make -f nix/Makefile post-install - ''; - - meta = with lib; { - description = "Instant startup time for nix-shell"; - mainProgram = "cached-nix-shell"; - homepage = "https://github.com/xzfc/cached-nix-shell"; - license = with licenses; [ unlicense /* or */ mit ]; - maintainers = with maintainers; [ xzfc ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/package-management/akku/akku.nix b/pkgs/tools/package-management/akku/akku.nix new file mode 100644 index 000000000000..40d5b8e15633 --- /dev/null +++ b/pkgs/tools/package-management/akku/akku.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, guile, curl, substituteAll }: +stdenv.mkDerivation rec { + pname = "akku"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "akkuscm"; + repo = "akku"; + rev = "v${version}"; + sha256 = "1pi18aamg1fd6f9ynfl7zx92052xzf0zwmhi2pwcwjs1kbah19f5"; + }; + + patches = [ + # substitute libcurl path + (substituteAll { + src = ./hardcode-libcurl.patch; + libcurl = "${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ guile ]; + + # Use a dummy package index to boostrap Akku + preBuild = '' + touch bootstrap.db + ''; + + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + meta = with lib; { + homepage = "https://akkuscm.org/"; + description = "Language package manager for Scheme"; + changelog = "https://gitlab.com/akkuscm/akku/-/raw/v${version}/NEWS.md"; + platforms = platforms.all; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ + nagy + konst-aa + ]; + mainProgram = "akku"; + }; +} diff --git a/pkgs/tools/package-management/akku/akkuDerivation.nix b/pkgs/tools/package-management/akku/akkuDerivation.nix new file mode 100644 index 000000000000..1c34518ad5c9 --- /dev/null +++ b/pkgs/tools/package-management/akku/akkuDerivation.nix @@ -0,0 +1,98 @@ +{ stdenv, akku, chez, guile, chibi, makeWrapper, lib, writeShellScriptBin }: +{ pname, version, src, buildInputs ? [ ], r7rs ? false, nativeBuildInputs ? [ ], ... } @ args: +let + parse-akku_ = writeShellScriptBin "parse-akku" + "${guile}/bin/guile --no-auto-compile ${./parse-akku.scm} \"$@\""; + parse-akku = "${parse-akku_}/bin/parse-akku"; +in +stdenv.mkDerivation ({ + inherit version src; + + pname = "akku-${pname}"; + propagatedBuildInputs = buildInputs; + buildInputs = [ ]; + nativeBuildInputs = [ makeWrapper akku chez chibi ] ++ nativeBuildInputs; + buildPhase = '' + runHook preBuild + + # only install the project + rm -f Akku.lock Akku.manifest + + # build, filter out guile warnings + akku install 2>&1 | grep -v "\(guile-user\)" - | cat + + # make sure akku metadata is present during testing and onwards + echo $PWD $CHEZSCHEMELIBDIRS \ + | sed "s/:/ /g" \ + | xargs find \ + | grep "metadata.sls" \ + | xargs ${parse-akku} merge ${pname} ${version} > temp___ + mv temp___ .akku/lib/akku/metadata.sls + + runHook postBuild + ''; + checkPhase = '' + IS_R7RS=false + runHook preCheck + + + propagated_chez=$CHEZSCHEMELIBDIRS + propagated_chibi=$CHIBI_MODULE_PATH + + export CHEZSCHEMELIBDIRS="$PWD/.akku/lib:$CHEZSCHEMELIBDIRS" + export CHIBI_MODULE_PATH="$PWD/.akku/lib:$CHIBI_MODULE_PATH" + + # Run all test .sps files if they exist + # and run tests for libs mirrored from snow-fort. + for path in $(find test* -type f | grep -e "\.sps") \ + $(find . | grep "run-test" | grep "\.scm"); do + echo Running test: $path + [[ "\n$SKIP\n" =~ $(basename $path) ]] && continue + if [ -x $path ]; then + patchShebangs $path + ./$path + elif ${lib.trivial.boolToString r7rs}; then + chibi-scheme $path + else + scheme-script $path + fi + done + + runHook postCheck + + export CHEZSCHEMELIBDIRS=$propagated_chez + export CHIBI_MODULE_PATH=$propagated_chibi + ''; + doCheck = true; + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + + cd .akku + + rm -f bin/activate* + + cp -rL lib $out/lib/scheme-libs + cp -rL bin $out/bin + + [ -d ffi ] && cp -rL ffi $out/lib + [ -d libobj ] && cp -rL libobj $out/lib + + CHEZSCHEMELIBDIRS="$out/lib/scheme-libs:$CHEZSCHEMELIBDIRS" + + # add support for other schemes + for f in $out/bin/* + do + patchShebangs $f + wrapProgram $f \ + --prefix CHEZSCHEMELIBDIRS : $CHEZSCHEMELIBDIRS + done + + runHook postInstall + ''; + meta = { + inherit (akku.meta) platforms; + } // args.meta or { }; + setupHook = ./setup-hook.sh; +} // builtins.removeAttrs args [ "name" "buildInputs" "meta" "nativeBuildInputs" ]) diff --git a/pkgs/tools/package-management/akku/default.nix b/pkgs/tools/package-management/akku/default.nix index 4b96fed6d32a..78cbcace5d5c 100644 --- a/pkgs/tools/package-management/akku/default.nix +++ b/pkgs/tools/package-management/akku/default.nix @@ -1,42 +1,66 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, guile, curl, substituteAll }: +{ lib, newScope, stdenv, fetchurl }: +lib.makeScope newScope (self: rec { -stdenv.mkDerivation rec { - pname = "akku"; - version = "1.1.0"; + fetchAkku = { name, url, sha256, ... }: + fetchurl { + inherit url sha256; + }; - src = fetchFromGitLab { - owner = "akkuscm"; - repo = "akku"; - rev = "v${version}"; - sha256 = "1pi18aamg1fd6f9ynfl7zx92052xzf0zwmhi2pwcwjs1kbah19f5"; - }; + akkuDerivation = self.callPackage ./akkuDerivation.nix { }; + akku = self.callPackage ./akku.nix { }; - patches = [ - # substitute libcurl path - (substituteAll { - src = ./hardcode-libcurl.patch; - libcurl = "${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary}"; - }) - ]; + akkuPackages = + let + overrides = self.callPackage ./overrides.nix { }; + makeAkkuPackage = akkuself: pname: + { version, dependencies, dev-dependencies, license, url, sha256, source, synopsis ? "", homepage ? "", ... }: + (akkuDerivation rec { + inherit version pname; + src = fetchAkku { + inherit url sha256; + name = pname; + }; + buildInputs = builtins.map (x: akkuself.${x}) dependencies; + r7rs = source == "snow-fort"; + nativeBuildInputs = builtins.map (x: akkuself.${x}) dev-dependencies; + unpackPhase = "tar xf $src"; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ guile ]; - - # Use a dummy package index to boostrap Akku - preBuild = '' - touch bootstrap.db - ''; - - makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - - meta = with lib; { - homepage = "https://akkuscm.org/"; - description = "Language package manager for Scheme"; - changelog = "https://gitlab.com/akkuscm/akku/-/raw/v${version}/NEWS.md"; - platforms = platforms.all; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; - mainProgram = "akku"; - }; -} + meta.homepage = homepage; + meta.description = synopsis; + meta.license = + let + stringToLicense = s: (lib.licenses // (with lib.licenses; { + "agpl" = agpl3Only; + "artistic" = artistic2; + "bsd" = bsd3; + "bsd-1-clause" = bsd1; + "bsd-2-clause" = bsd2; + "bsd-3-clause" = bsd3; + "gpl" = gpl3Only; + "gpl-2" = gpl2Only; + "gplv2" = gpl2Only; + "gpl-3" = gpl3Only; + "gpl-3.0" = gpl3Only; + "gplv3" = gpl3Only; + "lgpl" = lgpl3Only; + "lgpl-2" = lgpl2Only; + "lgpl-2.0+" = lgpl2Plus; + "lgpl-2.1" = lgpl21Only; + "lgpl-2.1-or-later" = lgpl21Plus; + "lgpl-3" = lgpl3Only; + "lgplv3" = lgpl3Only; + "public-domain" = publicDomain; + "srfi" = bsd3; + "unicode" = ucd; + "zlib-acknowledgement" = zlib; + })).${s} or s; + in + if builtins.isList license + then map stringToLicense license + else stringToLicense license; + }).overrideAttrs ({ "${pname}" = lib.id; } // overrides)."${pname}"; + deps = lib.importTOML ./deps.toml; + packages = lib.makeScope self.newScope (akkuself: lib.mapAttrs (makeAkkuPackage akkuself) deps); + in + lib.recurseIntoAttrs packages; +}) diff --git a/pkgs/tools/package-management/akku/deps.toml b/pkgs/tools/package-management/akku/deps.toml new file mode 100644 index 000000000000..291489dc9a8b --- /dev/null +++ b/pkgs/tools/package-management/akku/deps.toml @@ -0,0 +1,3388 @@ +[arvyy-interface] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/gmail.com/nma.arvydas.silanskas/arvyy/interface/1.0.0/arvyy-interface-1.0.0.tgz" +sha256 = "7e22daa7d0b2e57cc3a34ed0149a2cfc856a6b06c9708dbdb0b49da7573ef290" +source = "snow-fort" +synopsis = "Interface abstraction for a set of functions" +version = "1.0.0" + +[arvyy-mustache] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/gmail.com/nma.arvydas.silanskas/arvyy/mustache/1.0.2/arvyy-mustache-1.0.2.tgz" +sha256 = "ea8085f6313851249dc41e86a5c455225f73f351046994296fe7fc6144f05d16" +source = "snow-fort" +synopsis = "Mustache templating 1.2.1 implementation" +version = "1.0.2" + +[bcaine-defstruct] +dependencies = ["bcaine-format", "bcaine-misc-util", "chez-srfi", "akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/brian.d.caine/bcaine/defstruct/0.0.1/bcaine-defstruct-0.0.1.tgz" +sha256 = "a8dc0f55c99b23f2609a8cb8d7861491a8b33e4b45c93cfdb5ed5e94ffac2afc" +source = "snow-fort" +synopsis = "A more convenient version of `define-record-type`, inspired by Chicken's `defstruct`, including SRFI-17 setters" +version = "0.0.1" + +[bcaine-format] +dependencies = ["bcaine-misc-util", "chez-srfi", "chibi-char-set", "akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/brian.d.caine/bcaine/format/0.0.1/bcaine-format-0.0.1.tgz" +sha256 = "c5629185db68e53bafa5a82c7615c03c2984999c99cc10843b1cd16c7e428b25" +source = "snow-fort" +synopsis = "A `format`, `printf` and `sprintf` somewhat in the style of Chicken Scheme" +version = "0.0.1" + +[bcaine-misc-util] +dependencies = ["chez-srfi", "akku-r7rs", "chibi-show"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/brian.d.caine/bcaine/misc-util/1.0.1/bcaine-misc-util-1.0.1.tgz" +sha256 = "ca96d13af4602e72309137d20062cdb0fd23e77068adc6f2212a619d07b8d51b" +source = "snow-fort" +synopsis = "A collection of miscellaneous utilities I'm used to having. (Mostly from Chicken Scheme.)" +version = "1.0.1" + +[bcaine-obj] +dependencies = ["bcaine-defstruct", "bcaine-format", "bcaine-misc-util", "chez-srfi", "akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/brian.d.caine/bcaine/obj/0.0.7/bcaine-obj-0.0.7.tgz" +sha256 = "6257e168626eeafdb2cc951a2f32cba19e30dc0ea15657a94c6bf35b894e6247" +source = "snow-fort" +synopsis = "An object system very similar to Chicken's COOPS" +version = "0.0.7" + +[bcaine-sld-stub-expand] +dependencies = ["bcaine-format", "bcaine-misc-util", "chibi-match", "chibi-pathname", "chez-srfi", "akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/brian.d.caine/bcaine/sld-stub-expand/0.0.1/bcaine-sld-stub-expand-0.0.1.tgz" +sha256 = "c7b305e067469be7e68f4a46dab6dbf39ff435fc442921274f84ea7ace10de18" +source = "snow-fort" +synopsis = "Expands library declarations (`define-unprocessed-library` instead of `define-library`), and generates export statements for all the identifiers in .stub files" +version = "0.0.1" + +[chibi-app] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-config", "chibi-edit-distance", "chibi-string", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/app/0.9.0/chibi-app-0.9.0.tgz" +sha256 = "b477ea370b1b0bf805fbe7a8c0d0919330da0360e615ea8953d0f6f7e367f3bd" +source = "snow-fort" +synopsis = "Unified command-line option parsing and config management" +version = "0.9.0" + +[chibi-assert] +dependencies = ["chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/assert/0.10.0/chibi-assert-0.10.0.tgz" +sha256 = "b3901ce23329748eb423fe3f2dcffed63253dc1366a17cb8279025038139b921" +source = "snow-fort" +synopsis = "A nice assert macro" +version = "0.10.0" + +[chibi-base64] +dependencies = ["akku-r7rs", "chibi-string", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/base64/0.9.0/chibi-base64-0.9.0.tgz" +sha256 = "4f59e38142759554dc417e7b4f132414acd40ae3450a0481b57228a10257fcea" +source = "snow-fort" +synopsis = "RFC 3548 base64 encoding and decoding utilities" +version = "0.9.0" + +[chibi-binary-record] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/binary-record/0.9.0/chibi-binary-record-0.9.0.tgz" +sha256 = "5d338215b14c981954035bab32b9b99282f9f2b19af105266e79a00bca22ddf9" +source = "snow-fort" +version = "0.9.0" + +[chibi-bytevector] +dependencies = ["akku-r7rs", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/bytevector/0.9.0/chibi-bytevector-0.9.0.tgz" +sha256 = "7b5ee7c108d0272cdef87b82e6c2931f941c7d3654ce115a51db6e639873297d" +source = "snow-fort" +synopsis = "Additional bytevector utilities" +version = "0.9.0" + +[chibi-char-set] +dependencies = ["chibi-iset"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/char-set/0.9.0/chibi-char-set-0.9.0.tgz" +sha256 = "c88004fb0d8a06efa0993ebe847b4d8ddd5815d29d7f788d0a5ed38f5ae5df7c" +source = "snow-fort" +synopsis = "A minimal character set library" +version = "0.9.0" + +[chibi-char-set-boundary] +dependencies = [] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/char-set/boundary/0.9.0/chibi-char-set-boundary-0.9.0.tgz" +sha256 = "6a913ae82de56424910491e4d0456fd46fb5914c1634b973df93fb2df96b7f25" +source = "snow-fort" +synopsis = "Char-sets used for TR29 word boundaries" +version = "0.9.0" + +[chibi-config] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/config/0.9.0/chibi-config-0.9.0.tgz" +sha256 = "c9a6b3fd9a1cfb9a0fa6fcfde31946b492ff1adeb0aca77662fa4c937a2cf7a3" +source = "snow-fort" +synopsis = "This is a library for unified configuration management" +version = "0.9.0" + +[chibi-crypto-md5] +dependencies = ["akku-r7rs", "chibi-bytevector", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/crypto/md5/0.9.0/chibi-crypto-md5-0.9.0.tgz" +sha256 = "609d538c6621a6b84834967cd60ed3bcfd910d56a67e193ea189f2606aea7c1f" +source = "snow-fort" +synopsis = "Implementation of the MD5 (Message Digest) cryptographic hash" +version = "0.9.0" + +[chibi-crypto-rsa] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-bytevector", "chibi-math-prime", "chibi-crypto-sha2", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/crypto/rsa/0.9.0/chibi-crypto-rsa-0.9.0.tgz" +sha256 = "4eaee568f7898429d744a5ddd95c4d46b3a8402fd6dfe571443e7806ad9ce794" +source = "snow-fort" +synopsis = "RSA public key cryptography implementation" +version = "0.9.0" + +[chibi-crypto-sha2] +dependencies = ["akku-r7rs", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/crypto/sha2/0.9.0/chibi-crypto-sha2-0.9.0.tgz" +sha256 = "e5d6f3c5d0f5bdfb72d9cb2f1c3d1b2ac691ac0c92826fb4a9c5b7450b5aff85" +source = "snow-fort" +synopsis = "Implementation of the SHA-2 (Secure Hash Algorithm) cryptographic hash" +version = "0.9.0" + +[chibi-diff] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-optional", "chibi-term-ansi"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/diff/0.9.1.3/chibi-diff-0.9.1.3.tgz" +sha256 = "07b62a03d280924f0bd42ca6375c752884a480779984dd7e9889e150f892fbac" +source = "snow-fort" +version = "0.9.1" + +[chibi-edit-distance] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/edit-distance/0.9.0/chibi-edit-distance-0.9.0.tgz" +sha256 = "1534158ba2963dbb4a5b37831e94a7a3007afa105a7134c011f710f1afbf36b9" +source = "snow-fort" +version = "0.9.0" + +[chibi-filesystem] +dependencies = ["akku-r7rs", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/filesystem/0.9.0/chibi-filesystem-0.9.0.tgz" +sha256 = "dad608a7fbc00fe8e9929ff6124edad13bedfdc58cc14042be29b33f64c13483" +source = "snow-fort" +synopsis = "Interface to the filesystem and file descriptor objects" +version = "0.9.0" + +[chibi-html-parser] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/html-parser/0.5.7/chibi-html-parser-0.5.7.tgz" +sha256 = "509c4b4b79bde75c97b9f18cdf1a0c3f4ffd482b39439775bfdcae9c4dfa2a3a" +source = "snow-fort" +synopsis = "A permissive HTML parser supporting scalable streaming with a tree folding interface" +version = "0.5.7" + +[chibi-irregex] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/irregex/0.9.3/chibi-irregex-0.9.3.tgz" +sha256 = "50f7bbcb06d6f608aaff1784d63018ae5f5d32a62329eb24785bc922e0a91538" +source = "snow-fort" +synopsis = "A portable and efficient R[4567]RS implementation of regular expressions, supporting both POSIX syntax with various (irregular) PCRE extensions, as well as SCSH's SRE syntax" +version = "0.9.3" + +[chibi-iset] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/iset/0.9.0/chibi-iset-0.9.0.tgz" +sha256 = "33e536d20db603e24f489fdafd4996b3832ff29c7245e0f1bf59e52bac9c95dd" +source = "snow-fort" +synopsis = "A space efficient integer set (iset) implementation, optimized for minimal space usage and fast membership lookup" +version = "0.9.0" + +[chibi-locale] +dependencies = ["akku-r7rs", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/locale/0.1/chibi-locale-0.1.tgz" +sha256 = "13e7b773189ffec0f480305e1472361a9de310c8136ddffa84485e72846aa4b0" +source = "snow-fort" +synopsis = "A lightweight library for representing locale information and serializing to and from strings" +version = "0.1.0" + +[chibi-match] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/match/0.9.1/chibi-match-0.9.1.tgz" +sha256 = "badcfca91bdfc1a7831aed444a9fe4af317e1429216c725fc1b67e1864111ca4" +source = "snow-fort" +synopsis = "A portable hygienic pattern matcher" +version = "0.9.1" + +[chibi-math-linalg] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-assert", "chibi-optional", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/math/linalg/0.3/chibi-math-linalg-0.3.tgz" +sha256 = "55783898d0668465f3a7adf3102580dc4ad144b3845935539387b2db858994b0" +source = "snow-fort" +version = "0.3.0" + +[chibi-math-prime] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/math/prime/0.10.0/chibi-math-prime-0.10.0.tgz" +sha256 = "82628af19ec37dae8189b73ddab540958feba524c61da0e74f0ce0602e042d61" +source = "snow-fort" +synopsis = "Prime and number theoretic utilities" +version = "0.10.0" + +[chibi-math-stats] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-optional", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/math/stats/0.1/chibi-math-stats-0.1.tgz" +sha256 = "861d9c98e6c5aaedf385d459c989b6d9d7dddbbbd966e6f450a6dc8dc21b5856" +source = "snow-fort" +synopsis = "Statistics is the branch of mathematics dealing with the collection and analysis of data" +version = "0.1.0" + +[chibi-mecab] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-assert", "chibi-optional", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/mecab/0.1/chibi-mecab-0.1.tgz" +sha256 = "167b88e4415c0e531ae8ce233536ca2a6288fe5f1a056b95acb294777c628f06" +source = "snow-fort" +synopsis = "A wrapper around MeCab, a part-of-speech and morphological analyzer for Japanese" +version = "0.1.0" + +[chibi-mime] +dependencies = ["akku-r7rs", "chibi-base64", "chibi-quoted-printable", "chibi-string", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/mime/0.9.0/chibi-mime-0.9.0.tgz" +sha256 = "3f15743a4116eb95368449c0717b476040e6eba8af8bcf551023a19c7fcbcf8f" +source = "snow-fort" +synopsis = "A library to parse MIME headers and bodies into SXML" +version = "0.9.0" + +[chibi-monad-environment] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/monad/environment/0.9.0/chibi-monad-environment-0.9.0.tgz" +sha256 = "ae4abff382dbe3db6d1c8a6e5bcfa237c16f6dd7faeb45f160358acf63a00e22" +source = "snow-fort" +synopsis = "A Scheme take on the environment (reader) monad, focusing more on being efficient and convenient than pure" +version = "0.9.0" + +[chibi-net-dns] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-optional", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/net/dns/0.2/chibi-net-dns-0.2.tgz" +sha256 = "f1f07da380168e9107600760ce9dfee5ec8c1f656f3b6f7fdd5182f13ca41e0a" +source = "snow-fort" +synopsis = "Domain Name Service library, with high-level utilities for address, mx and text record lookups" +version = "0.2.0" + +[chibi-net-smtp] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-net-dns", "chibi-optional", "chibi-string", "chibi-regexp", "chibi-pathname", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/net/smtp/0.1/chibi-net-smtp-0.1.tgz" +sha256 = "b66d31adce32558c658f53d7f564313821a698d6bbd9dc3aec88b3ebbc39b738" +source = "snow-fort" +synopsis = "Easy mail interface" +version = "0.1.0" + +[chibi-optional] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/optional/0.9.1.3/chibi-optional-0.9.1.3.tgz" +sha256 = "30b58c0bbecbe37560fc24086417d2ab908536b74d8775670da55f1eb6971e9c" +source = "snow-fort" +synopsis = "Syntax to support optional and named keyword arguments" +version = "0.9.1" + +[chibi-parse] +dependencies = ["akku-r7rs", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/parse/0.9.0/chibi-parse-0.9.0.tgz" +sha256 = "66cd0a9d1ca07559f5f1ccbef05939921bfb9967049c2c2691031a43b56e3a17" +source = "snow-fort" +synopsis = "A parser combinator library with optional memoization and convenient syntax" +version = "0.9.0" + +[chibi-pathname] +dependencies = ["chibi-string", "akku-r7rs", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/pathname/0.9.0/chibi-pathname-0.9.0.tgz" +sha256 = "424aa360577d7cac0ceb4e7e6cbf8943ffe958870338d5b0fef1c22789a07186" +source = "snow-fort" +synopsis = "A general, non-filesystem-specific pathname library" +version = "0.9.0" + +[chibi-quoted-printable] +dependencies = ["akku-r7rs", "chibi-string", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/quoted-printable/0.9.0/chibi-quoted-printable-0.9.0.tgz" +sha256 = "9f7f9e3013139b36249b594e510feac1a2a4fc2b6a20c1974ebc559ff037a17d" +source = "snow-fort" +synopsis = "RFC 2045 quoted printable encoding and decoding utilities" +version = "0.9.0" + +[chibi-regexp] +dependencies = ["chibi-char-set-boundary", "chez-srfi", "akku-r7rs", "chibi-string", "chibi-match", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/regexp/0.9.0/chibi-regexp-0.9.0.tgz" +sha256 = "7bfed63982d55c7c272d32ddca295993a6196c37ef426d7bd90eafe3b8856c5e" +source = "snow-fort" +synopsis = "A regular expression engine implementing SRFI 115 using a non-backtracking Thompson NFA algorithm" +version = "0.9.0" + +[chibi-scribble] +dependencies = ["akku-r7rs", "chibi-string", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/scribble/0.9.0/chibi-scribble-0.9.0.tgz" +sha256 = "0f93bfa2f0267f3557499fdf9023e3a4d772a290fe971898f289327c71e0e7c1" +source = "snow-fort" +synopsis = "A library used for parsing \"scribble\" format, introduced by Racket and the format used to write this manual" +version = "0.9.0" + +[chibi-show] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-string", "chibi-monad-environment", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/show/0.7.3.1/chibi-show-0.7.3.1.tgz" +sha256 = "4a2c64802000eca62d36320de97480bc2f333e62517a987a0ff0af6d9b3d4194" +source = "snow-fort" +synopsis = "A library of procedures for formatting Scheme objects to text in various ways, and for easily concatenating, composing and extending these formatters" +version = "0.7.3" + +[chibi-snow-commands] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-bytevector", "chibi-config", "chibi-crypto-md5", "chibi-crypto-rsa", "chibi-crypto-sha2", "chibi-filesystem", "chibi-match", "chibi-pathname", "chibi-regexp", "chibi-show", "chibi-string", "chibi-sxml", "chibi-tar", "chibi-temp-file", "chibi-uri", "chibi-term-edit-line", "chibi-char-set"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/pclouds/chibi/snow/commands/0.0.0/./chibi-snow-commands-0.0.0.tgz" +sha256 = "c33106b879b787dd282bd6f01d3968e70224ac88fe61b71fca05d8f9bbea16a8" +source = "snow-fort" +version = "0.0.0" + +[chibi-sqlite3] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/sqlite3/0.7/chibi-sqlite3-0.7.tgz" +sha256 = "bd0aeb54c2e88567707c675e481a475d6a7431f5e1959b7e99ec07d361bda92f" +source = "snow-fort" +version = "0.7.0" + +[chibi-ssl] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/ssl/0.1/chibi-ssl-0.1.tgz" +sha256 = "85531baae0523140bfda7ebcd971ea30b7e242b6ba0874a1815cec9a7660a13d" +source = "snow-fort" +synopsis = "Basic bindings for establishing SSL connections" +version = "0.1.0" + +[chibi-string] +dependencies = ["akku-r7rs", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/string/0.9.0/chibi-string-0.9.0.tgz" +sha256 = "86a73c53b2e7a4e1201ff10115a5488890993c0020051b3abe0fc785a077ec11" +source = "snow-fort" +synopsis = "A cursor-oriented string library" +version = "0.9.0" + +[chibi-sxml] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/sxml/0.9.0/chibi-sxml-0.9.0.tgz" +sha256 = "cec4438595978dfcc4ffa5c41b77178d14609490b2d1da4551e42cd960262cc4" +source = "snow-fort" +synopsis = "Utilities to convert sxml to xml or plain text" +version = "0.9.0" + +[chibi-tar] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-string", "chibi-binary-record", "chibi-pathname", "chibi-filesystem", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/tar/0.9.0/chibi-tar-0.9.0.tgz" +sha256 = "86c5248f8206d4f059ba66c91460ef5eb9497d40d6fd90d4258583c71f49cf4a" +source = "snow-fort" +version = "0.9.0" + +[chibi-temp-file] +dependencies = ["akku-r7rs", "chibi-filesystem", "chibi-pathname"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/temp-file/0.9.0/chibi-temp-file-0.9.0.tgz" +sha256 = "c400a25de2c4109a6e569f014eab360844e31041239ae6e2afed5d40e16d1f60" +source = "snow-fort" +version = "0.9.0" + +[chibi-term-ansi] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/term/ansi/0.9.0/chibi-term-ansi-0.9.0.tgz" +sha256 = "805e33d6b87c6d54337bf0c89002f13c323e6d836291d2e88a252140d1552599" +source = "snow-fort" +synopsis = "A library to use ANSI escape codes to format text and background color, font weigh, and underlining" +version = "0.9.0" + +[chibi-term-edit-line] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/term/edit-line/0.9.0/chibi-term-edit-line-0.9.0.tgz" +sha256 = "0af16f80400b5d4382117d0ff361681956aa962e4688972b4d4ddaf48a41b385" +source = "snow-fort" +version = "0.9.0" + +[chibi-test] +dependencies = ["akku-r7rs", "chibi-diff", "chibi-term-ansi"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/test/0.9.0/chibi-test-0.9.0.tgz" +sha256 = "86997714be7fb6ade1b094d91727f9c9becd9051a41d1703986643d1ed09865d" +source = "snow-fort" +synopsis = "Simple but extensible testing framework with advanced reporting" +version = "0.9.0" + +[chibi-uri] +dependencies = ["chibi-string", "chibi-pathname", "akku-r7rs", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/uri/0.9.0/chibi-uri-0.9.0.tgz" +sha256 = "cfec051a399439452c8754ab3ff7440e93b152de35514fa4f4407925de537750" +source = "snow-fort" +synopsis = "Library for parsing and constructing URI objects" +version = "0.9.0" + +[chibi-voting] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/voting/0.1/chibi-voting-0.1.tgz" +sha256 = "a7ef21109198f47310fc5f385a928dcaf178adf8e5fdc52c414babf53169eebe" +source = "snow-fort" +synopsis = "Preferential voting utilities to help come to reasonable decisions when there are more than 2 options" +version = "0.1.0" + +[chibi-xgboost] +dependencies = ["akku-r7rs", "chibi-string", "chez-srfi", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/xgboost/0.1/chibi-xgboost-0.1.tgz" +sha256 = "82c2d83275436b8fe6c688088fe90193acbc0c64b04b08bfc5eb2c20adc348a5" +source = "snow-fort" +version = "0.1.0" + +[chibi-xlib] +dependencies = [] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/chibi/xlib/0.1/chibi-xlib-0.1.tgz" +sha256 = "bc35e1811909489ea7b2e121c4a2ba34e5cca41e7c9c8082bfd783774651aea2" +source = "snow-fort" +synopsis = "Minimal xlib bindings" +version = "0.1.0" + +[chrisoei-cint] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/gmail.com/chris.oei/chrisoei/cint/0.1.0/chrisoei-cint-0.1.0.tgz" +sha256 = "0f2b8a03afc0be7a27b7a64e808ee8df7d36570e47df3ef7e266c4c631db9b3d" +source = "snow-fort" +synopsis = "Compute cint coefficients" +version = "0.1.0" + +[chrisoei-test] +dependencies = ["akku-r7rs", "chibi-test"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/gmail.com/chris.oei/chrisoei/test/0.0.1/chrisoei-test-0.0.1.tgz" +sha256 = "2b0f7c600778c88752cf48ab6f5685c5674d9e4aa15c913622eaa9be1ebbcd5a" +source = "snow-fort" +synopsis = "Additional testing utilities" +version = "0.0.1" + +[comparators] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/kwortman/comparators/1.0.0/comparators-1.0.0.tgz" +sha256 = "d5169f6dc6c2d77c410b667b1e3ecb2793920655f4ec133a8dabdf9b6304d8b3" +source = "snow-fort" +synopsis = "SRFI 128: Comparators (reduced) reference implementation" +version = "1.0.0" + +[cyclone-iset] +dependencies = ["akku-r7rs", "cyclone-iset-base", "cyclone-iset-iterators", "cyclone-iset-constructors"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/arthurmaciel/cyclone/iset/1.0/cyclone-iset-1.0.tgz" +sha256 = "c1c3f2da8ab317baaad61c134e407bc297fa30b959ab449af15ebc9261b8c922" +source = "snow-fort" +version = "1.0.0" + +[cyclone-iset-base] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/arthurmaciel/cyclone/iset/base/1.0/cyclone-iset-base-1.0.tgz" +sha256 = "d3b03eb7c0161eb71ce248226f6cfaf16f1540a66e6ee5838e86152d7bfef056" +source = "snow-fort" +version = "1.0.0" + +[cyclone-iset-constructors] +dependencies = ["akku-r7rs", "chez-srfi", "cyclone-iset-base", "cyclone-iset-iterators"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/arthurmaciel/cyclone/iset/constructors/1.0/cyclone-iset-constructors-1.0.tgz" +sha256 = "b5c723719a348c312dede7c49faf656c72f790fb6532969fba0a1c980a9d7b7e" +source = "snow-fort" +version = "1.0.0" + +[cyclone-iset-iterators] +dependencies = ["akku-r7rs", "chez-srfi", "cyclone-iset-base"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/arthurmaciel/cyclone/iset/iterators/1.0/cyclone-iset-iterators-1.0.tgz" +sha256 = "cff79c0c5839c419526fcc29b347f72f8f518147751874e2d116f3865d1c98f4" +source = "snow-fort" +version = "1.0.0" + +[cyclone-iset-optimize] +dependencies = ["akku-r7rs", "chez-srfi", "cyclone-iset-base", "cyclone-iset-iterators", "cyclone-iset-constructors"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/arthurmaciel/cyclone/iset/optimize/1.0/cyclone-iset-optimize-1.0.tgz" +sha256 = "c24ee986262f9f6119715adb82e2c21ae7cd01a99b943b0ed1b96264955f6e3f" +source = "snow-fort" +version = "1.0.0" + +[dockerfile] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-match", "unpack-assoc", "shell-quote"] +dev-dependencies = [] +license = "isc" +url = "http://snow-fort.org/s/lassi.io/lassi/dockerfile/0.1/dockerfile-0.1.tgz" +sha256 = "41697d85fcc809fae965d5ba1137e5cdae2d4c87fee16c4ab33004a925830281" +source = "snow-fort" +synopsis = "Scheme DSL to build Dockerfiles" +version = "0.1.0" + +[edn] +dependencies = ["akku-r7rs", "chibi-parse", "chibi-test"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/edwinwatkeys.com/edwin/edn/0.2.0/./edn-0.2.0.tgz" +sha256 = "7c8e71ed0d1bf248fd15bd1a2ea173afba411b0082a58f107acbe15529ca9249" +source = "snow-fort" +synopsis = "EDN is a data format from the Clojure ecosystem" +version = "0.2.0" + +[fisherro-pipe] +dependencies = ["akku-r7rs", "chibi-test"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/fisher.cx/robert/fisherro/pipe/1.0.0/fisherro-pipe-1.0.0.tgz" +sha256 = "3e12f1347606c353018bf1a569226d7e0d7a6bd50cf37a9a7f42f155cfb22f65" +source = "snow-fort" +synopsis = "Pipelining syntax" +version = "1.0.0" + +[generators] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/kwortman/generators/1.0.2/generators-1.0.2.tgz" +sha256 = "629ff012704991d4ad34848790313140d71dce5fda36049eb7f5af98cd7b7847" +source = "snow-fort" +synopsis = "SRFI 121: Generators reference implementation" +version = "1.0.2" + +[in-progress-hash-bimaps] +dependencies = ["akku-r7rs", "r6rs-hashtables", "in-progress-hash-tables"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/in-progress/hash/bimaps/0.0.3/in-progress-hash-bimaps-0.0.3.tgz" +sha256 = "c8f0c936144233ddfae0311cdc188b29ee5a8080390975e660a8a329a009ae34" +source = "snow-fort" +synopsis = "Bimaps (HashTablesCowan)" +version = "0.0.3" + +[in-progress-hash-tables] +dependencies = ["akku-r7rs", "r6rs-hashtables", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/in-progress/hash/tables/0.0.3/in-progress-hash-tables-0.0.3.tgz" +sha256 = "5e81ab5a8b106d0e54bbd501610ecf15d39e4ed0b430c72a3a332208fb83e20c" +source = "snow-fort" +synopsis = "Hash tables (HashTablesCowan)" +version = "0.0.3" + +[independentresearch-xattr] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "cc0-1.0" +url = "http://snow-fort.org/s/gmail.com/lockywolf/independentresearch/xattr/0.2/independentresearch-xattr-0.2.tgz" +sha256 = "b579f63f541d6a3abfb46c04772c3079faaf1d21637c1d32a10b5543ff616972" +source = "snow-fort" +version = "0.2.0" + +[jkode-sassy] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-test"] +dev-dependencies = [] +license = "lgpl-2.1-or-later" +url = "http://snow-fort.org/s/gmail.com/alexshinn/jkode/sassy/0.2.1/jkode-sassy-0.2.1.tgz" +sha256 = "c3e3038470986238d40ce98ad6eb0a078d9fb8b7f71cb241bc28a84fb5c79e95" +source = "snow-fort" +synopsis = "A portable assembler for x86 processors" +version = "0.2.1" + +[lassik-dockerfile] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-match", "lassik-unpack-assoc", "lassik-shell-quote"] +dev-dependencies = [] +license = "isc" +url = "http://snow-fort.org/s/lassi.io/lassi/lassik/dockerfile/0.1/lassik-dockerfile-0.1.tgz" +sha256 = "7859d39d2928417c709c4f89f012fac1c1a95f2839a1a7d0ad870ba759dbea92" +source = "snow-fort" +synopsis = "Scheme DSL to build Dockerfiles" +version = "0.1.0" + +[lassik-shell-quote] +dependencies = ["akku-r7rs", "chibi-match"] +dev-dependencies = [] +license = "isc" +url = "http://snow-fort.org/s/lassi.io/lassi/lassik/shell-quote/0.1/lassik-shell-quote-0.1.tgz" +sha256 = "2bb3a0fa8ef30a5eea80fcea857392094b3a44548d95f400a3bbcf27d0332f0c" +source = "snow-fort" +synopsis = "Little Scheme DSL to build shell command lines" +version = "0.1.0" + +[lassik-string-inflection] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "isc" +url = "http://snow-fort.org/s/lassi.io/lassi/lassik/string-inflection/0.1.1/lassik-string-inflection-0.1.1.tgz" +sha256 = "d97f986bd6a97a090b307051caf6b8310e2c22a648e6023135db5f7085aaf404" +source = "snow-fort" +synopsis = "lisp-case under_score CapsUpper capsLower" +version = "0.1.1" + +[lassik-trivial-tar-writer] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "isc" +url = "http://snow-fort.org/s/lassi.io/lassi/lassik/trivial-tar-writer/0.1/lassik-trivial-tar-writer-0.1.tgz" +sha256 = "15528c2441923a84422ac2733802bfb355d9dffcc33deff55815d8aca0bea3b0" +source = "snow-fort" +synopsis = "Simplest way to output uncompressed .tar file" +version = "0.1.0" + +[lassik-unpack-assoc] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "isc" +url = "http://snow-fort.org/s/lassi.io/lassi/lassik/unpack-assoc/0.1/lassik-unpack-assoc-0.1.tgz" +sha256 = "109c7ac9b0be03df61103b84491bfccf7460f27367bd5abac58cf486300ac63b" +source = "snow-fort" +synopsis = "Alist/hash-table destructuring case macros" +version = "0.1.0" + +[lightweight-testing] +dependencies = ["akku-r7rs", "chibi-test"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/tutanota.com/flynn16/lightweight-testing/0.1/lightweight-testing-0.1.tgz" +sha256 = "17294025cf29ab76f41c51c5b8562961eff3b6a3a1ada2f6221b7f38e4a4223c" +source = "snow-fort" +synopsis = "SRFI-78 implemented as a wrapper around (chibi test)" +version = "0.1.0" + +[macduffie-json] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/gmail.com/taknamay/macduffie/json/0.9.5/macduffie-json-0.9.5.tgz" +sha256 = "e8dccf8e8c63f088d826b0e92357dbc2998356f616b4390433b438b26a08b4e2" +source = "snow-fort" +synopsis = "JSON reader and writer" +version = "0.9.5" + +[nytpu-contracts] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/nytpu.com/alex/nytpu/contracts/0.1.1/nytpu-contracts-0.1.1.tgz" +sha256 = "b077e4e751aba7046d9ce66e92e8a3a02d691b2baa7490b8bb2e9a5d4d1f29bd" +source = "snow-fort" +synopsis = "Design by Contracts for R7RS" +version = "0.1.1" + +[nytpu-getopt] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/nytpu.com/alex/nytpu/getopt/1.2.0/nytpu-getopt-1.2.0.tgz" +sha256 = "ec1396b8885bb7e76b29277d12484a2a9129b6b3e47cbdab2079ce582f10d11a" +source = "snow-fort" +synopsis = "POSIX getopt(3), in compliance with POSIX 2008" +version = "1.2.0" + +[okmij-ssax] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-test"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/alexshinn/okmij/ssax/5.4/okmij-ssax-5.4.tgz" +sha256 = "9a78a099fff4584c10c9444d41b808fe7029b5dfa2d3e5ece4c7a08e5e33b2c1" +source = "snow-fort" +synopsis = "Functional XML parsing framework" +version = "5.4.0" + +[pfds-alist] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/alist/1.0.0/pfds-alist-1.0.0.tgz" +sha256 = "e8c227fcf3c10f355df8d1c22860e0e6c54103c356bd707ed914028b3568b92e" +source = "snow-fort" +synopsis = "Convenience functions for working with association lists" +version = "1.0.0" + +[pfds-bitwise] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/bitwise/1.0.0/pfds-bitwise-1.0.0.tgz" +sha256 = "8654930f5a5a66df9120f3a8b7276cfa0ca36e65ea4579966b3e711422afab93" +source = "snow-fort" +synopsis = "Bitwise arithmetic utilities" +version = "1.0.0" + +[pfds-bounded-balance-tree] +dependencies = ["akku-r7rs", "pfds-list-helpers"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/bounded-balance-tree/1.0.0/pfds-bounded-balance-tree-1.0.0.tgz" +sha256 = "7ae6f64b9c5614ee38238b4459b558eaebd267c6824bc66354ab7cb39b2a04d6" +source = "snow-fort" +synopsis = "Bounded balance tree" +version = "1.0.0" + +[pfds-deque] +dependencies = ["akku-r7rs", "pfds-lazy-list", "pfds-list-helpers"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/deque/1.0.0/pfds-deque-1.0.0.tgz" +sha256 = "a5deddf48523c167649660fc9e41acf2cce77f185525a1f6d4cfa9589f7f868b" +source = "snow-fort" +synopsis = "Purely functional deques" +version = "1.0.0" + +[pfds-difference-list] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/difference-list/1.0.0/pfds-difference-list-1.0.0.tgz" +sha256 = "82a9e6db6f63ac1ab14fd87835e438a0a5486572a450a65c0b8eda0873c72a8c" +source = "snow-fort" +synopsis = "Difference lists" +version = "1.0.0" + +[pfds-fector] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/fector/1.0.0/pfds-fector-1.0.0.tgz" +sha256 = "ff0bb61c97b4a59b51c40f589d4b481a97759c09de197c0891386d6b0fa39f53" +source = "snow-fort" +synopsis = "Functional vectors" +version = "1.0.0" + +[pfds-fingertree] +dependencies = ["akku-r7rs", "pfds-list-helpers"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/fingertree/1.0.0/pfds-fingertree-1.0.0.tgz" +sha256 = "d2398c150e60b0f9c5214287720fef78b8ce0b9bce6733f67490a388685855b2" +source = "snow-fort" +synopsis = "Fingertree: A simple general-purpose data structure" +version = "1.0.0" + +[pfds-hash-array-mapped-trie] +dependencies = ["akku-r7rs", "pfds-alist", "pfds-bitwise", "pfds-list-helpers", "pfds-vector", "chez-srfi"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/hash-array-mapped-trie/1.0.0/pfds-hash-array-mapped-trie-1.0.0.tgz" +sha256 = "f549c8715d94b83037af786618b5ab08600d75ce9ffa40a841cb07e8f918931d" +source = "snow-fort" +synopsis = "Hash array mapped tries" +version = "1.0.0" + +[pfds-heap] +dependencies = ["akku-r7rs", "pfds-list-helpers"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/heap/1.0.0/pfds-heap-1.0.0.tgz" +sha256 = "5b9ec02fd7f9ff022f67aeee6e6aa4109e14bb3a0d096b33512d3d9265f49bb5" +source = "snow-fort" +synopsis = "Heap data structure" +version = "1.0.0" + +[pfds-lazy-list] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/lazy-list/1.0.0/pfds-lazy-list-1.0.0.tgz" +sha256 = "db4fcc889545c34716dff6c0420f9a5fcee2a3dee8f31416c1bc08462b74252f" +source = "snow-fort" +synopsis = "Odd lazy lists" +version = "1.0.0" + +[pfds-list-helpers] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/list-helpers/1.0.0/pfds-list-helpers-1.0.0.tgz" +sha256 = "0eb459e05b775a90f6b2a6a7435d19aa6369f99709b8d501a960149e05e21517" +source = "snow-fort" +synopsis = "List utility functions" +version = "1.0.0" + +[pfds-priority-search-queue] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/priority-search-queue/1.0.0/pfds-priority-search-queue-1.0.0.tgz" +sha256 = "47a90b0983d3c8cf9c5d87a65fba104671adcefa386e76f9db1b05d0206b38dc" +source = "snow-fort" +synopsis = "Priority search queues" +version = "1.0.0" + +[pfds-queue] +dependencies = ["akku-r7rs", "pfds-list-helpers", "pfds-lazy-list"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/queue/1.0.0/pfds-queue-1.0.0.tgz" +sha256 = "b9da21328abf243ff4efe9215d5720f0fffaf4e552f51a49519993347882c60f" +source = "snow-fort" +synopsis = "Purely functional queues" +version = "1.0.0" + +[pfds-sequence] +dependencies = ["akku-r7rs", "pfds-fingertree", "pfds-list-helpers"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/sequence/1.0.0/pfds-sequence-1.0.0.tgz" +sha256 = "6ac52b1e000c41406c34220aae9466288824556c0b0d8f4b9bf475d433038cc4" +source = "snow-fort" +synopsis = "Purely functional sequences" +version = "1.0.0" + +[pfds-set] +dependencies = ["akku-r7rs", "pfds-bounded-balance-tree", "pfds-list-helpers"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/set/1.0.0/pfds-set-1.0.0.tgz" +sha256 = "c71a6da9a21c6994b6801920511141a93c181c741017d0cfb24ec2cde523db7b" +source = "snow-fort" +synopsis = "Purely functional sets" +version = "1.0.0" + +[pfds-vector] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/pfds/vector/1.0.0/pfds-vector-1.0.0.tgz" +sha256 = "44dcbfec253b1f38f28b4a742e251a8a64daf25235c521b40ba0ad00f742058c" +source = "snow-fort" +synopsis = "Some utility functions for working with vectors" +version = "1.0.0" + +[postgresql] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/ymail.com/ktakashi/postgresql/17.09.26/postgresql-17.09.26.tgz" +sha256 = "d6d800b041ae02ef0c341a47bd23316a94dc26cab819c7d8425ddf84066ba0d1" +source = "snow-fort" +synopsis = "R7RS portable PostgreSQL binding" +version = "17.9.26" + +[r6rs-arithmetic-fixnums] +dependencies = ["akku-r7rs", "r6rs-base"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/arithmetic/fixnums/0.0.1/r6rs-arithmetic-fixnums-0.0.1.tgz" +sha256 = "a2839d9592f23c3859ace50bd3132dc37c2691702a382e873c76156b782a6378" +source = "snow-fort" +synopsis = "Port of (rnrs arithmetic fixnums) to R7RS" +version = "0.0.1" + +[r6rs-base] +dependencies = [] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/base/0.0.1/r6rs-base-0.0.1.tgz" +sha256 = "c3b23446ad2d17ff377006e9756a5e27a89dcd1ab65792e49e01efd5424a6c0d" +source = "snow-fort" +synopsis = "Port of (rnrs base) to R7RS" +version = "0.0.1" + +[r6rs-bytevectors] +dependencies = [] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/bytevectors/0.0.1/r6rs-bytevectors-0.0.1.tgz" +sha256 = "404c59936cd1b67bba8dd58219a535a71fa39d18be034ae7e8b1faad41eb782f" +source = "snow-fort" +synopsis = "Port of (rnrs bytevectors) to R7RS" +version = "0.0.1" + +[r6rs-control] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/control/0.0.1/r6rs-control-0.0.1.tgz" +sha256 = "b38fb48bac18d46a9a84ecd4ba64ca83d272abf3d789307a49a93a4230965a6a" +source = "snow-fort" +synopsis = "Port of (rnrs control) to R7RS" +version = "0.0.1" + +[r6rs-enums] +dependencies = [] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/enums/0.0.1/r6rs-enums-0.0.1.tgz" +sha256 = "f86c2a234a75fc494f088d831e17cfe23328f5244ea6677bda44dc6451affcbd" +source = "snow-fort" +synopsis = "Port of (rnrs enums) to R7RS" +version = "0.0.1" + +[r6rs-eval] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/eval/0.0.1/r6rs-eval-0.0.1.tgz" +sha256 = "b0e87f14188769d21f5f1c96e4f8a5b4e4dda4d57a8509d313c4da2b6e12f57c" +source = "snow-fort" +synopsis = "Port of (rnrs eval) to R7RS" +version = "0.0.1" + +[r6rs-exceptions] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/exceptions/0.0.1/r6rs-exceptions-0.0.1.tgz" +sha256 = "9555ee076c379a3f622b9ca2812cf3332a9d9afecd115d7e3b2ddda8aaa9b97f" +source = "snow-fort" +synopsis = "Port of (rnrs exceptions) to R7RS" +version = "0.0.1" + +[r6rs-files] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/files/0.0.1/r6rs-files-0.0.1.tgz" +sha256 = "6b674bf8735431e5a1cc809018d0d19b6ffc02ca56781328290de413db5829ef" +source = "snow-fort" +synopsis = "Port of (rnrs files) to R7RS" +version = "0.0.1" + +[r6rs-hashtables] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/hashtables/0.0.1/r6rs-hashtables-0.0.1.tgz" +sha256 = "d93f85d56c7eadb1e1603bf95988302bd1e111e3247bb1ddba7d271148633b12" +source = "snow-fort" +synopsis = "Port of (rnrs hashtables) to R7RS" +version = "0.0.1" + +[r6rs-io-simple] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/io/simple/0.0.1/r6rs-io-simple-0.0.1.tgz" +sha256 = "7f49ae295e3f6fa420e2ccfdbf446dc46cc814bdfb436046191bd8e146346b00" +source = "snow-fort" +synopsis = "Port of (rnrs io simple) to R7RS" +version = "0.0.1" + +[r6rs-lists] +dependencies = [] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/lists/0.0.1/r6rs-lists-0.0.1.tgz" +sha256 = "46507daa47b2226eeac6e00418301d6e9c46940a744ec9f0e07ac4efb93bb49e" +source = "snow-fort" +synopsis = "Port of (rnrs lists) to R7RS" +version = "0.0.1" + +[r6rs-mutable-pairs] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/mutable-pairs/0.0.1/r6rs-mutable-pairs-0.0.1.tgz" +sha256 = "850c349b4aadeda7c8c52afcf0b9f237b0b641f70d9786f77490cbf4b13e8bf1" +source = "snow-fort" +synopsis = "Port of (rnrs mutable-pairs) to R7RS" +version = "0.0.1" + +[r6rs-mutable-strings] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/mutable-strings/0.0.1/r6rs-mutable-strings-0.0.1.tgz" +sha256 = "c5f3a290e89314f1572cd7f31ab3238bd4e3c8b0883ebf281b56e174b13031a1" +source = "snow-fort" +synopsis = "Port of (rnrs mutable-strings) to R7RS" +version = "0.0.1" + +[r6rs-programs] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/programs/0.0.1/r6rs-programs-0.0.1.tgz" +sha256 = "b10955572de97a44524ce699dbf6c7607c75bb6000ba845051b1e927bd72370b" +source = "snow-fort" +synopsis = "Port of (rnrs programs) to R7RS" +version = "0.0.1" + +[r6rs-r5rs] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/r5rs/0.0.1/r6rs-r5rs-0.0.1.tgz" +sha256 = "a049e687207b76608448460b70eca530d0b495a8348bff5953fa911abf73772a" +source = "snow-fort" +synopsis = "Port of (rnrs r5rs) to R7RS" +version = "0.0.1" + +[r6rs-sorting] +dependencies = [] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/sorting/0.0.1/r6rs-sorting-0.0.1.tgz" +sha256 = "75235b206c41016a825fbba98d7f6c27ee46a4da089eb13e4585751cfdfb5ef9" +source = "snow-fort" +synopsis = "Port of (rnrs sorting) to R7RS" +version = "0.0.1" + +[r6rs-unicode] +dependencies = [] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/unicode/0.0.1/r6rs-unicode-0.0.1.tgz" +sha256 = "0da7ecacbc53ef8ce918b7383bc5309d8bb171cfa3db41e9f229a266faf46650" +source = "snow-fort" +synopsis = "Port of (rnrs unicode) to R7RS" +version = "0.0.1" + +[r6rs-unicode-reference-unicode0] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/unicode-reference/unicode0/0.0.1/r6rs-unicode-reference-unicode0-0.0.1.tgz" +sha256 = "1450a1e3defa951e407d4acb9151dc6aca3a5993b620dc7b2c05cd531c8951c4" +source = "snow-fort" +synopsis = "Helper library for (rnrs unicode)" +version = "0.0.1" + +[r6rs-unicode-reference-unicode1] +dependencies = ["akku-r7rs", "r6rs-unicode-reference-unicode0"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/unicode-reference/unicode1/0.0.1/r6rs-unicode-reference-unicode1-0.0.1.tgz" +sha256 = "ed65f577c1928918c734406431a63b5c31278794793cf40fa8035c339e677fb9" +source = "snow-fort" +synopsis = "Helper library for (rnrs unicode)" +version = "0.0.1" + +[r6rs-unicode-reference-unicode2] +dependencies = ["akku-r7rs", "r6rs-unicode-reference-unicode0", "r6rs-unicode-reference-unicode1"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/unicode-reference/unicode2/0.0.1/r6rs-unicode-reference-unicode2-0.0.1.tgz" +sha256 = "e46d3fd17c6305c35542ae783a578f5f2324e67d140b6bd84168ddd42190b24c" +source = "snow-fort" +synopsis = "Helper library for (rnrs unicode)" +version = "0.0.1" + +[r6rs-unicode-reference-unicode3] +dependencies = ["akku-r7rs", "r6rs-unicode-reference-unicode0", "r6rs-unicode-reference-unicode1", "r6rs-unicode-reference-unicode2"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/unicode-reference/unicode3/0.0.1/r6rs-unicode-reference-unicode3-0.0.1.tgz" +sha256 = "62fba6dbb3ddd123b392a538e01aa1db0bff1b8939505a7071619297f0af17ff" +source = "snow-fort" +synopsis = "Helper library for (rnrs unicode)" +version = "0.0.1" + +[r6rs-unicode-reference-unicode4] +dependencies = ["akku-r7rs", "r6rs-unicode-reference-unicode0", "r6rs-unicode-reference-unicode1", "r6rs-unicode-reference-unicode2", "r6rs-unicode-reference-unicode3"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/ccs.neu.edu/will/r6rs/unicode-reference/unicode4/0.0.1/r6rs-unicode-reference-unicode4-0.0.1.tgz" +sha256 = "85d46c2a686c606aa504245abf55036de6baac5675a809bca74ac469b1a75222" +source = "snow-fort" +synopsis = "Helper library for (rnrs unicode)" +version = "0.0.1" + +[rapid-analyze-library] +dependencies = ["akku-r7rs", "rapid-assume", "rapid-and-let", "rapid-receive", "rapid-comparator", "rapid-set", "rapid-mapping", "rapid-syntax", "rapid-read", "rapid-list", "rapid-vicinity", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/analyze-library/0.1.0/rapid-analyze-library-0.1.0.tgz" +sha256 = "4bb64598eb63535d917429c67aa6763b1903e3de125f2b607b07c9a05d019ad4" +source = "snow-fort" +synopsis = "Analyze R7RS library definitions" +version = "0.1.0" + +[rapid-and-let] +dependencies = ["akku-r7rs", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/and-let/0.1.0/rapid-and-let-0.1.0.tgz" +sha256 = "d11cd9d2eed4406f7426f9661f6eea71d034417708045373b329c839575cd21d" +source = "snow-fort" +synopsis = "And with local bindings compatible with SRFI 2" +version = "0.1.0" + +[rapid-args-fold] +dependencies = ["akku-r7rs", "rapid-list", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/args-fold/0.1.0/rapid-args-fold-0.1.0.tgz" +sha256 = "9aa5859eb01a0708d0170c1e7baca0dfd7d9fd49425f6dfd31c555f61256c606" +source = "snow-fort" +synopsis = "A program argument processor compatible with SRFI 37" +version = "0.1.0" + +[rapid-assume] +dependencies = ["akku-r7rs", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/assume/0.1.0/rapid-assume-0.1.0.tgz" +sha256 = "519d46ff8e517d1e4a01ade8355233dbe3befbf7f03f4d3f717de802e974a8a4" +source = "snow-fort" +synopsis = "Assumptions compatible with SRFI 145" +version = "0.1.0" + +[rapid-box] +dependencies = ["akku-r7rs", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/box/0.1.1/rapid-box-0.1.1.tgz" +sha256 = "a0e289ae74115c75b40d738776555fc1d36791e76e07f9eb9dce77c998bd5d32" +source = "snow-fort" +synopsis = "Boxes compatible with SRFI 111" +version = "0.1.1" + +[rapid-comparator] +dependencies = ["akku-r7rs", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/comparator/0.1.1/rapid-comparator-0.1.1.tgz" +sha256 = "9769cb53680e1c8a0a8993bb267db0856ba1351c437696821e45387878f44426" +source = "snow-fort" +synopsis = "Comparators compatible with SRFI 128" +version = "0.1.1" + +[rapid-eliminate-mutable-variables] +dependencies = ["akku-r7rs", "rapid-analyze-library", "rapid-receive", "rapid-comparator", "rapid-syntax", "rapid-set", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/eliminate-mutable-variables/0.1.0/rapid-eliminate-mutable-variables-0.1.0.tgz" +sha256 = "53a6c14289c95f247c4dc6ffb761ce990b64f3abd43cd196c15c000f4df75efd" +source = "snow-fort" +synopsis = "Eliminate mutable variables" +version = "0.1.0" + +[rapid-fix-letrec] +dependencies = ["akku-r7rs", "rapid-list", "rapid-analyze-library", "rapid-and-let", "rapid-receive", "rapid-comparator", "rapid-syntax", "rapid-mapping", "rapid-set", "rapid-graph", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/fix-letrec/0.1.0/rapid-fix-letrec-0.1.0.tgz" +sha256 = "8daba123e1fc21f8b75df7231aae1a8686f146ef45c11d284b702308752f12ce" +source = "snow-fort" +synopsis = "Fixing letrec" +version = "0.1.0" + +[rapid-format] +dependencies = ["akku-r7rs", "rapid-assume", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/format/0.1.0/rapid-format-0.1.0.tgz" +sha256 = "fa3dc4ea1c85698b3ae98f763d6eccf02566c5c7da2fdf49fd95d9d84e760aed" +source = "snow-fort" +synopsis = "Basic format strings compatible with SRFI 28" +version = "0.1.0" + +[rapid-generator] +dependencies = ["akku-r7rs", "rapid-list", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/generator/0.1.0/rapid-generator-0.1.0.tgz" +sha256 = "7bf11c74ef0a52856ad446e6ba2edea993d058c7e703ea1cde905b4b13e41d56" +source = "snow-fort" +synopsis = "Generators compatible with SRFI 121" +version = "0.1.0" + +[rapid-graph] +dependencies = ["akku-r7rs", "rapid-receive", "rapid-list", "rapid-set", "rapid-mapping", "rapid-test", "rapid-comparator"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/graph/0.1.0/rapid-graph-0.1.0.tgz" +sha256 = "3683420af145d9e9e792ff7f0c35741b85dcba5a72e5e431b86e7c3465e8e199" +source = "snow-fort" +synopsis = "Graph algorithms" +version = "0.1.0" + +[rapid-identity] +dependencies = ["akku-r7rs", "rapid-box", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/identity/0.1.0/rapid-identity-0.1.0.tgz" +sha256 = "817924ee4ed96b7a6f85f1dc59d89289cbe9dc5697367c632c33174ca9434aa4" +source = "snow-fort" +synopsis = "Unique identities" +version = "0.1.0" + +[rapid-library-definition] +dependencies = ["akku-r7rs", "rapid-assume", "rapid-and-let", "rapid-receive", "rapid-comparator", "rapid-set", "rapid-mapping", "rapid-syntax", "rapid-read", "rapid-list", "rapid-vicinity", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/library-definition/0.1.2/rapid-library-definition-0.1.2.tgz" +sha256 = "87c8bde40d0bf15469d65af98ca5229fffc224780fbe87dec5cd40bd2c9f53bc" +source = "snow-fort" +synopsis = "R7RS library definitions" +version = "0.1.2" + +[rapid-list] +dependencies = ["akku-r7rs", "rapid-receive", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/list/0.1.0/rapid-list-0.1.0.tgz" +sha256 = "5ac3af285d859b0bbbf2e95605931d217272cf6e6ab4aa64ab973dc8ea2b20af" +source = "snow-fort" +synopsis = "List library compatible with SRFI 1" +version = "0.1.0" + +[rapid-mapping] +dependencies = ["akku-r7rs", "rapid-list", "rapid-receive", "rapid-comparator", "rapid-assume", "rapid-generator", "rapid-rbtree", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/mapping/0.1.1/rapid-mapping-0.1.1.tgz" +sha256 = "6c00a8050b7187ba2ea1bfd774055e74827ba8439baf742a603fdd3dc2106fb6" +source = "snow-fort" +synopsis = "Mappings compatible with SRFI 146" +version = "0.1.1" + +[rapid-match] +dependencies = ["akku-r7rs", "rapid-assume"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/match/0.1.5/rapid-match-0.1.5.tgz" +sha256 = "51c6b1139c5b9136045be63cfda86ad50044f517296431315faff14cecef881e" +source = "snow-fort" +synopsis = "A pattern matcher" +version = "0.1.5" + +[rapid-quasiquote] +dependencies = ["akku-r7rs", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/quasiquote/0.1.1/rapid-quasiquote-0.1.1.tgz" +sha256 = "aa8fe3cb9350b96b790ad2d9f8da2a940c3e92704f485c71bca183c801ed6887" +source = "snow-fort" +synopsis = "Extended quasiquotation with ellipses" +version = "0.1.1" + +[rapid-rbtree] +dependencies = ["akku-r7rs", "rapid-assume", "rapid-and-let", "rapid-receive", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/rbtree/0.1.0/rapid-rbtree-0.1.0.tgz" +sha256 = "866ebac0723f6fb23936be5675cc3e24b340789cd6705d7ee2a6a77b0ed0e032" +source = "snow-fort" +synopsis = "Red-Black Trees" +version = "0.1.0" + +[rapid-read] +dependencies = ["akku-r7rs", "rapid-assume", "rapid-and-let", "rapid-receive", "rapid-list", "rapid-format", "rapid-vicinity", "rapid-comparator", "rapid-mapping", "rapid-syntax", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/read/0.1.3/rapid-read-0.1.3.tgz" +sha256 = "d66db1043ebdb03f7850229a5c0a1b8be2764777f85e9e8b4635caf2d139aa90" +source = "snow-fort" +synopsis = "Scheme reader with source-location information" +version = "0.1.3" + +[rapid-receive] +dependencies = ["akku-r7rs", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/receive/0.1.0/rapid-receive-0.1.0.tgz" +sha256 = "3193a4cba66dbd5122d8a95d4de8c4e7bfb6365215167e2a24e519c7d60b412c" +source = "snow-fort" +synopsis = "Binding to multiple values compatible with SRFI 8" +version = "0.1.0" + +[rapid-set] +dependencies = ["akku-r7rs", "rapid-list", "rapid-receive", "rapid-generator", "rapid-comparator", "rapid-assume", "rapid-mapping", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/set/0.1.0/rapid-set-0.1.0.tgz" +sha256 = "d2bcfff9e2502363ae30d11905245b95c05cd728ee6f67db1a103eb57982329f" +source = "snow-fort" +synopsis = "Sets and bags compatible with SRFI 113" +version = "0.1.0" + +[rapid-syntax] +dependencies = ["akku-r7rs", "rapid-quasiquote", "rapid-match", "rapid-format", "rapid-list", "rapid-identity", "rapid-comparator", "rapid-assume", "rapid-receive", "rapid-mapping", "rapid-vicinity", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/syntax/0.1.2/rapid-syntax-0.1.2.tgz" +sha256 = "b80e6430fe0b735c76850cd085d0eaba7f02153b808134a0ad1292dfb2a33829" +source = "snow-fort" +synopsis = "Syntax objects encapsulating Scheme datums together with source-location information" +version = "0.1.2" + +[rapid-test] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/test/0.1.3/rapid-test-0.1.3.tgz" +sha256 = "f4c432673e7e11993b602fc04b9ef95083a8bc44e6d6de8de0d6f450328b80cc" +source = "snow-fort" +synopsis = "A Scheme API for test suites compatible to SRFI 64" +version = "0.1.3" + +[rapid-vector] +dependencies = ["akku-r7rs", "rapid-receive", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/vector/0.1.0/rapid-vector-0.1.0.tgz" +sha256 = "d0434238f4bc78ee7df4747de2970105a70208d74fd7f48dfb30468fc744ef92" +source = "snow-fort" +synopsis = "Vector library compatible with SRFI 133" +version = "0.1.0" + +[rapid-vicinity] +dependencies = ["akku-r7rs", "rapid-test"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "http://snow-fort.org/s/rapid-scheme.org/marc/rapid/vicinity/0.1.0/rapid-vicinity-0.1.0.tgz" +sha256 = "87e893f816b306731dd38b8ffe8121fd9d4e1ba5dc2fd5f789c6a0d54c8d2ed1" +source = "snow-fort" +synopsis = "Vicinity compatible with SRFI 59" +version = "0.1.0" + +[read-char-if] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/lassi.io/lassi/read-char-if/0.1/read-char-if-0.1.tgz" +sha256 = "1d432bcf77414b37649f6c5621e74dbbe7be10cf081c98cf639ffa7be33ba714" +source = "snow-fort" +version = "0.1.0" + +[rebottled-cl-pdf] +dependencies = ["akku-r7rs", "slib-format", "rebottled-pregexp", "slib-common-list-functions", "robin-statistics"] +dev-dependencies = [] +license = "bsd-2-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/rebottled/cl-pdf/1.0.0/rebottled-cl-pdf-1.0.0.tgz" +sha256 = "9a0a91a9bef0f2311c47ee8fd0c719aafc81ba88bf3e800e4e977608cb7a78df" +source = "snow-fort" +synopsis = "Low level functions for generating PDF files" +version = "1.0.0" + +[rebottled-pregexp] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/rebottled/pregexp/20050502/rebottled-pregexp-20050502.tgz" +sha256 = "dd3e4b6dcdbfdba88827f20f2ef5171251d98526c88764051f64bff88b72e08c" +source = "snow-fort" +synopsis = "Dorai Sitaram's portable regular expressions" +version = "0.0.20050502" + +[rebottled-pstk] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-2-clause" +url = "http://snow-fort.org/s/peterlane.info/peter/rebottled/pstk/1.7.0/rebottled-pstk-1.7.0.tgz" +sha256 = "2377f19584f9d6117d83009db07b6cde1e947ed280b25a7acb4d2dfddb383e0d" +source = "snow-fort" +synopsis = "Portable Scheme Interface to the Tk GUI Toolkit" +version = "1.7.0" + +[rebottled-schelog] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/rebottled/schelog/20150602/rebottled-schelog-20150602.tgz" +sha256 = "7da22ea8b90c28a8c1812cf6fa43b0f30bfdf8629d5b8a7863b766f297eca7c5" +source = "snow-fort" +synopsis = "Dorai Sitaram's Schelog: logic programming in Scheme" +version = "0.0.20150602" + +[retropikzel-scgi] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/iki.fi/retropikzel/retropikzel/scgi/0.2.2/retropikzel-scgi-0.2.2.tgz" +sha256 = "976d44ef88574bcdacaaa87ae8983adbc34ef8ea90385eb1bfe5fda87f6d191f" +source = "snow-fort" +synopsis = "Portable Simple Common Gateway Interface implementation" +version = "0.2.2" + +[robin-abbrev] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/peterlane.info/peter/robin/abbrev/1.0.0/robin-abbrev-1.0.0.tgz" +sha256 = "4f4700313dbea75851051aec7d4bff1d4b3751dc5481639050db778fa6b9f835" +source = "snow-fort" +synopsis = "Create unique abbreviations for a list of strings" +version = "1.0.0" + +[robin-directory] +dependencies = ["akku-r7rs", "slib-filename"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/peterlane.info/peter/robin/directory/1.0.0/robin-directory-1.0.0.tgz" +sha256 = "11fc58780ddc06fa797a2b7c13e45c9ee99c0ed3edd6f929b6995670c0ffbaac" +source = "snow-fort" +synopsis = "Some useful directory functions" +version = "1.0.0" + +[robin-disjoint-set] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/peterlane.info/peter/robin/disjoint-set/1.0.0/robin-disjoint-set-1.0.0.tgz" +sha256 = "07417505109644442a1cc449dfe246cb340c41ef441b09d65093f991e0f70027" +source = "snow-fort" +synopsis = "A disjoint-set data structure" +version = "1.0.0" + +[robin-logger] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/peterlane.info/peter/robin/logger/1.0.0/robin-logger-1.0.0.tgz" +sha256 = "664f85a03adf1b2d430f1786619c19aa6588d13485d33cbf31016c22cef3b5ca" +source = "snow-fort" +synopsis = "A simple logging library for outputting messages while a program is running" +version = "1.0.0" + +[robin-statistics] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/peterlane.info/peter/robin/statistics/1.0.0/robin-statistics-1.0.0.tgz" +sha256 = "83f797df3841d24fb1c812667d2bb0928080beaec96ac2f1c07aa06efeeaf9ba" +source = "snow-fort" +synopsis = "A library of functions to compute statistical or other information about sets of data" +version = "1.0.0" + +[robin-text] +dependencies = ["akku-r7rs", "rebottled-pregexp", "robin-statistics", "slib-soundex", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/peterlane.info/peter/robin/text/1.0.0/robin-text-1.0.0.tgz" +sha256 = "167e0708526084bfd055be88601adce8f869fc42ab67a97cf148ce90e665c4e0" +source = "snow-fort" +synopsis = "A collection of functions for working with strings or text documents, including similarity measures, a stemmer and layout" +version = "1.0.0" + +[sdl2] +dependencies = ["chibi-bytevector", "akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/brian.d.caine/sdl2/1.0.4/sdl2-1.0.4.tgz" +sha256 = "044c10eb99c861f7fdfac617514684a58d4d524c8a7e1a5adda1937c46aff5ff" +source = "snow-fort" +synopsis = "Bindings for SDL2" +version = "1.0.4" + +[sdl2-obj] +dependencies = ["sdl2", "bcaine-obj", "chez-srfi", "chibi-match"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/brian.d.caine/sdl2/obj/0.0.2/sdl2-obj-0.0.2.tgz" +sha256 = "c28aed8b40622bf3f455de8c3bade443b312c6807349d58bb6297d854534086f" +source = "snow-fort" +synopsis = "OOP bindings for SDL2. Currently a work-in-progress" +version = "0.0.2" + +[sdl2-image] +dependencies = ["sdl2", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/brian.d.caine/sdl2-image/1.0.1/sdl2-image-1.0.1.tgz" +sha256 = "3a5106bdd4d9aa8946a1d9cefb3e1606bd78f5987efe4f0dfaee57d264dba498" +source = "snow-fort" +synopsis = "Bindings for SDL2_image" +version = "1.0.1" + +[sdl2-mixer] +dependencies = [] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/brian.d.caine/sdl2-mixer/1.0.0/sdl2-mixer-1.0.0.tgz" +sha256 = "30ca816089df62dd764d41dcaa7940c5d62cd387fdf14c56a154f114c0607125" +source = "snow-fort" +synopsis = "Bindings for SDL2_mixer" +version = "1.0.0" + +[shell-quote] +dependencies = ["akku-r7rs", "chibi-match"] +dev-dependencies = [] +license = "isc" +url = "http://snow-fort.org/s/lassi.io/lassi/shell-quote/0.1/shell-quote-0.1.tgz" +sha256 = "7394015e8a70da3c369481736cea27ea27c8aaa1b84d1549673d4f145e154d8d" +source = "snow-fort" +synopsis = "Little Scheme DSL to build shell command lines" +version = "0.1.0" + +[slib-alist] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/alist/SLIB-3b5-r7rs/slib-alist-SLIB-3b5-r7rs.tgz" +sha256 = "09a4b313597abc146f89c8bc836e9c00f30c4ccca8562b526f3bad995cbac0cc" +source = "snow-fort" +synopsis = "Some functions for working with association lists" +version = "3.1.5" + +[slib-array-for-each] +dependencies = ["akku-r7rs", "slib-common", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/array-for-each/SLIB-3b5-r7rs/slib-array-for-each-SLIB-3b5-r7rs.tgz" +sha256 = "e06f684faa4b4207a845c260a94be08acd7bf999494319e093d8c092a52aed1b" +source = "snow-fort" +synopsis = "Applicative routines for arrays/matrices" +version = "3.1.5" + +[slib-array-interpolate] +dependencies = ["akku-r7rs", "slib-array-for-each", "slib-subarray", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/array-interpolate/SLIB-3b5-r7rs/slib-array-interpolate-SLIB-3b5-r7rs.tgz" +sha256 = "87eb635b0583859bb3a64a9eb2418e2f70e324d5144f4124d9cc21539e90ede4" +source = "snow-fort" +synopsis = "Interpolated array access" +version = "3.1.5" + +[slib-byte] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/byte/SLIB-3b5-r7rs/slib-byte-SLIB-3b5-r7rs.tgz" +sha256 = "af4560b3df5a0d66398ddabbcfe576d0d073403c2795391718f55c8710ac7c0f" +source = "snow-fort" +synopsis = "Arrays of small integers, not necessarily chars" +version = "3.1.5" + +[slib-byte-number] +dependencies = ["akku-r7rs", "slib-byte", "slib-common", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/byte-number/SLIB-3b5-r7rs/slib-byte-number-SLIB-3b5-r7rs.tgz" +sha256 = "56e83d15dfdcb7bc651ef5e60925fdd28c7eb63e358235e37d650deeeccf7b4e" +source = "snow-fort" +synopsis = "Byte integer and IEEE floating-point conversions" +version = "3.1.5" + +[slib-chapter-order] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/chapter-order/SLIB-3b5-r7rs/slib-chapter-order-SLIB-3b5-r7rs.tgz" +sha256 = "f1f321f2e00e1779e06adb02c17ab4a1c50a57b1bab92176d4e68b6933745d38" +source = "snow-fort" +synopsis = "Chapter ordering" +version = "3.1.5" + +[slib-charplot] +dependencies = ["akku-r7rs", "slib-array-for-each", "slib-common", "slib-printf", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/charplot/SLIB-3b5-r7rs/slib-charplot-SLIB-3b5-r7rs.tgz" +sha256 = "5b7e056be7ec3e5f5898e87d9ce8818bdd6f431af65eaeb0ba14404f7a107e8b" +source = "snow-fort" +synopsis = "Plotting histograms/graphs in characters" +version = "3.1.5" + +[slib-coerce] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/coerce/SLIB-3b5-r7rs/slib-coerce-SLIB-3b5-r7rs.tgz" +sha256 = "3a4dd47d5b061045471fc8e055a2ca43e457bc9a8cb9471ef3364d7e8a5bad6d" +source = "snow-fort" +synopsis = "Implementation of COMMON-LISP COERCE and TYPE-OF" +version = "3.1.5" + +[slib-color] +dependencies = ["akku-r7rs", "slib-color-space", "slib-printf", "slib-scanf", "slib-string-case"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/color/SLIB-3b5-r7rs/slib-color-SLIB-3b5-r7rs.tgz" +sha256 = "76e9b75bc288e6e3c94c760c4ff5bd8d6b378adc07c5440afc842b957ff0daf2" +source = "snow-fort" +synopsis = "Color data type" +version = "3.1.5" + +[slib-color-space] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/color-space/SLIB-3b5-r7rs/slib-color-space-SLIB-3b5-r7rs.tgz" +sha256 = "cb2afbb291d44c4389e3e72d82ae1e147970454855a9ea006db50db4a59d8b62" +source = "snow-fort" +synopsis = "Color-space conversions" +version = "3.1.5" + +[slib-common] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/common/SLIB-3b5-r7rs/slib-common-SLIB-3b5-r7rs.tgz" +sha256 = "3f40923df702c9517b9066f30434bccbc6c9fa67d9b6c12f6ab3737eacd3eaf0" +source = "snow-fort" +synopsis = "SLIB core functions" +version = "3.1.5" + +[slib-common-lisp-time] +dependencies = ["akku-r7rs", "slib-common", "slib-time-core", "slib-time-zone"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/common-lisp-time/SLIB-3b5-r7rs/slib-common-lisp-time-SLIB-3b5-r7rs.tgz" +sha256 = "8aa7b829aa67f19c081937fd3ae682c514c809dde46cc3e49916f17f9cc074b3" +source = "snow-fort" +synopsis = "Common-Lisp time conversion routines" +version = "3.1.5" + +[slib-common-list-functions] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/common-list-functions/SLIB-3b5-r7rs/slib-common-list-functions-SLIB-3b5-r7rs.tgz" +sha256 = "9f58eb7ece12785a4e9ee1f4cc77e85ab1db4854d3cfdeb4f65cbb767950168b" +source = "snow-fort" +synopsis = "Some common list functions" +version = "3.1.5" + +[slib-daylight] +dependencies = ["akku-r7rs", "slib-color-space"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/daylight/SLIB-3b5-r7rs/slib-daylight-SLIB-3b5-r7rs.tgz" +sha256 = "f08b8e1ed909de19b0b627c66931fb2fd5379aa693a88baa377218eee458a292" +source = "snow-fort" +synopsis = "Model of sun and sky colors" +version = "3.1.5" + +[slib-determinant] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/determinant/SLIB-3b5-r7rs/slib-determinant-SLIB-3b5-r7rs.tgz" +sha256 = "34a1cdaeb1097f62e686caeb20718a9dd668f97856e82ce409cfe3256a187c7c" +source = "snow-fort" +synopsis = "Matrix Algebra" +version = "3.1.5" + +[slib-directory] +dependencies = ["akku-r7rs", "slib-common", "slib-filename"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/directory/SLIB-3b5-r7rs/slib-directory-SLIB-3b5-r7rs.tgz" +sha256 = "1fa7ce53dd543eb0b1ee4a24e7f09cdc792a94cd03891384f38b770380c9294c" +source = "snow-fort" +synopsis = "Directories" +version = "3.1.5" + +[slib-dynamic] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/dynamic/SLIB-3b5-r7rs/slib-dynamic-SLIB-3b5-r7rs.tgz" +sha256 = "2df9ed42deee17c638537d0317963546225e341aff83eb01645873be92f0b0c5" +source = "snow-fort" +synopsis = "Dynamic data type" +version = "3.1.5" + +[slib-factor] +dependencies = ["akku-r7rs", "slib-common", "slib-modular", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/factor/SLIB-3b5-r7rs/slib-factor-SLIB-3b5-r7rs.tgz" +sha256 = "1712e6656c51ab5153e240f0c1154699ef3223d84dc9ffb1f07d7b26b7c98e94" +source = "snow-fort" +synopsis = "Factorization, prime test and generation" +version = "3.1.5" + +[slib-filename] +dependencies = ["akku-r7rs", "slib-common"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/filename/SLIB-3b5-r7rs/slib-filename-SLIB-3b5-r7rs.tgz" +sha256 = "924adc1bad2f2f2d7f8607caad240ef0575c5b0bcc0f9f935a4ca7e66195b2a1" +source = "snow-fort" +synopsis = "String matching for filenames (glob, a la BASH)" +version = "3.1.5" + +[slib-format] +dependencies = ["akku-r7rs", "slib-common", "slib-pretty-print", "slib-string-case", "slib-string-port"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/format/SLIB-3b5-r7rs/slib-format-SLIB-3b5-r7rs.tgz" +sha256 = "5fa9e9b5a66ad7fb896fcd37c4b97e1c450c7133b2b7b917ee3d19cddf7d4cbb" +source = "snow-fort" +synopsis = "Common LISP text output formatter" +version = "3.1.5" + +[slib-fourier-transform] +dependencies = ["akku-r7rs", "slib-subarray", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/fourier-transform/SLIB-3b5-r7rs/slib-fourier-transform-SLIB-3b5-r7rs.tgz" +sha256 = "545b74a2e601d88b9960c0bc6772f1c805b0d8e774af20c831d7bd3bf8596ae1" +source = "snow-fort" +synopsis = "Discrete Fourier Transform" +version = "3.1.5" + +[slib-generic-write] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/generic-write/SLIB-3b5-r7rs/slib-generic-write-SLIB-3b5-r7rs.tgz" +sha256 = "31e2c198c67b4334d45a95011912990bc261013e36a211cdc51670368e93a129" +source = "snow-fort" +synopsis = "Generic write" +version = "3.1.5" + +[slib-line-io] +dependencies = ["akku-r7rs", "slib-common", "slib-filename"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/line-io/SLIB-3b5-r7rs/slib-line-io-SLIB-3b5-r7rs.tgz" +sha256 = "6b5a434f4ca35cb74916578076778a1d8628dbe8720362ac496b58925d60e5af" +source = "snow-fort" +synopsis = "Line oriented input/output functions" +version = "3.1.5" + +[slib-math-integer] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/math-integer/SLIB-3b5-r7rs-1/slib-math-integer-SLIB-3b5-r7rs-1.tgz" +sha256 = "af23642e7566b3522f9091288569144c80eef03439ce322dd30ec299484a240c" +source = "snow-fort" +synopsis = "Mathematical functions restricted to exact integers" +version = "3.1.5" + +[slib-math-real] +dependencies = ["akku-r7rs", "slib-common"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/math-real/SLIB-3b5-r7rs-1/slib-math-real-SLIB-3b5-r7rs-1.tgz" +sha256 = "2ffeb7b868551916d418bdf9f1c947e799f489ab479f534f9ee5ba09addaa380" +source = "snow-fort" +synopsis = "Mathematical functions restricted to real numbers" +version = "3.1.5" + +[slib-minimize] +dependencies = ["akku-r7rs", "slib-common"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/minimize/SLIB-3b5-r7rs/slib-minimize-SLIB-3b5-r7rs.tgz" +sha256 = "93ca3ffaef94cd90d6d495c2b3c0db750e1a16850aa8443725cb98116754bb14" +source = "snow-fort" +synopsis = "Finds minimum value of a function" +version = "3.1.5" + +[slib-modular] +dependencies = ["akku-r7rs", "slib-common"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/modular/SLIB-3b5-r7rs/slib-modular-SLIB-3b5-r7rs.tgz" +sha256 = "d45a4c32b22163eef93b74ae42529a52165ca3dea034bd3410c9a46f88d5738e" +source = "snow-fort" +synopsis = "Modular fixnum arithmetic" +version = "3.1.5" + +[slib-nbs-iscc] +dependencies = ["akku-r7rs", "slib-color", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/nbs-iscc/SLIB-3b5-r7rs/slib-nbs-iscc-SLIB-3b5-r7rs.tgz" +sha256 = "c65be8de29e72af4878583c48e875f48d54833167fe0287757978d4b171e91c5" +source = "snow-fort" +synopsis = "NBS/ISCC Color System" +version = "3.1.5" + +[slib-posix-time] +dependencies = ["akku-r7rs", "slib-time-core", "slib-time-zone"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/posix-time/SLIB-3b5-r7rs/slib-posix-time-SLIB-3b5-r7rs.tgz" +sha256 = "1d3721a1cd6de2ec183bd7bc107047524baf47389e4886edf2ba6f2eb29f71c3" +source = "snow-fort" +synopsis = "POSIX time conversion routines" +version = "3.1.5" + +[slib-pprint-file] +dependencies = ["akku-r7rs", "slib-common", "slib-pretty-print"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/pprint-file/SLIB-3b5-r7rs/slib-pprint-file-SLIB-3b5-r7rs.tgz" +sha256 = "ceba258740a178650d21d0c5f5dd60366c472cf93281a669f11556a111e7e587" +source = "snow-fort" +synopsis = "Pretty print a Scheme file" +version = "3.1.5" + +[slib-pretty-print] +dependencies = ["akku-r7rs", "slib-common", "slib-generic-write"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/pretty-print/SLIB-3b5-r7rs/slib-pretty-print-SLIB-3b5-r7rs.tgz" +sha256 = "ca76f30ada0dc85e99ac1442cb7f2ff72bd203c4917d0c483308e38029c56393" +source = "snow-fort" +synopsis = "Pretty printing" +version = "3.1.5" + +[slib-printf] +dependencies = ["akku-r7rs", "slib-generic-write"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/printf/SLIB-3b5-r7rs/slib-printf-SLIB-3b5-r7rs.tgz" +sha256 = "c86aa3efe26f514cbd11aeb03ade2ee1b3c6ac028db52c6b2454c20d378ac924" +source = "snow-fort" +synopsis = "Implementation of standard C functions" +version = "3.1.5" + +[slib-queue] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/queue/SLIB-3b5-r7rs/slib-queue-SLIB-3b5-r7rs.tgz" +sha256 = "a0d035502d72b9c8ac5ee23a2445cf94a312408be11e009d52b22b43904631f4" +source = "snow-fort" +synopsis = "Queue/Stack data structure" +version = "3.1.5" + +[slib-random-inexact] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/random-inexact/SLIB-3b5-r7rs/slib-random-inexact-SLIB-3b5-r7rs.tgz" +sha256 = "ada77b92756718b4867f0a4925ec97f6a39c2089359871a77f2b3176bd9de15d" +source = "snow-fort" +synopsis = "Pseudo-Random inexact real numbers" +version = "3.1.5" + +[slib-rationalize] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/rationalize/SLIB-3b5-r7rs/slib-rationalize-SLIB-3b5-r7rs.tgz" +sha256 = "ad97f49209172ea1be0ec1eb9059bc593349fc1f5d6e17605bffa5721ce61e40" +source = "snow-fort" +synopsis = "Find simplest number ratios" +version = "3.1.5" + +[slib-resene] +dependencies = ["akku-r7rs", "slib-color", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/resene/SLIB-3b5-r7rs/slib-resene-SLIB-3b5-r7rs.tgz" +sha256 = "d78d83e8ce9d1ad4681fff6284cbb07686d4917f5e5b4c8f0e1e3d435c058fe3" +source = "snow-fort" +synopsis = "Resene Color System" +version = "3.1.5" + +[slib-rev2-procedures] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/rev2-procedures/SLIB-3b5-r7rs/slib-rev2-procedures-SLIB-3b5-r7rs.tgz" +sha256 = "9a65b6ef513df1fb6c7b3bb1f0e43d2f67736b3880d3937f68a905f87b6d7ef1" +source = "snow-fort" +synopsis = "Implementation of some R2RS procedures eliminated in subsequence versions" +version = "3.1.5" + +[slib-saturate] +dependencies = ["akku-r7rs", "slib-color", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/saturate/SLIB-3b5-r7rs/slib-saturate-SLIB-3b5-r7rs.tgz" +sha256 = "97d5a99446a70f5f715311a464f6ecc382eeb718e1f9b3e52a32865a784e8d9e" +source = "snow-fort" +synopsis = "Saturated Color Dictionary" +version = "3.1.5" + +[slib-scanf] +dependencies = ["akku-r7rs", "slib-common", "slib-string-port"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/scanf/SLIB-3b5-r7rs/slib-scanf-SLIB-3b5-r7rs.tgz" +sha256 = "8bbb523308395d2109eba4d29435ed87d34a7b861e0e8ea1ae95cb6b26d064ae" +source = "snow-fort" +synopsis = "Implementation of POSIX-style formatted input" +version = "3.1.5" + +[slib-soundex] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/soundex/SLIB-3b5-r7rs/slib-soundex-SLIB-3b5-r7rs.tgz" +sha256 = "8d8b3e194c39791adcfcba0347d6d147be3e4969b34856129e96bd903f86d442" +source = "snow-fort" +synopsis = "Original Soundex algorithm" +version = "3.1.5" + +[slib-string-case] +dependencies = ["akku-r7rs", "slib-common"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/string-case/SLIB-3b5-r7rs/slib-string-case-SLIB-3b5-r7rs.tgz" +sha256 = "d1e81607bd042ef694ff1ddbcc61e6a11e7b0af08dd70e228e23afcb40ac24f8" +source = "snow-fort" +synopsis = "String casing functions" +version = "3.1.5" + +[slib-string-port] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/string-port/SLIB-3b5-r7rs/slib-string-port-SLIB-3b5-r7rs.tgz" +sha256 = "a36d8f1643a41db17fc8e9f1971148d997fcfc4ecf745a9ee4bc007a56c72c83" +source = "snow-fort" +synopsis = "Portable string ports" +version = "3.1.5" + +[slib-string-search] +dependencies = ["akku-r7rs", "slib-alist"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/string-search/SLIB-3b5-r7rs/slib-string-search-SLIB-3b5-r7rs.tgz" +sha256 = "b32f539326abebc0ac8169a2dd1085944ce244ae8e29eee9ae79c6a886662d7c" +source = "snow-fort" +synopsis = "Functions for working with and searching within strings" +version = "3.1.5" + +[slib-subarray] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/subarray/SLIB-3b5-r7rs/slib-subarray-SLIB-3b5-r7rs.tgz" +sha256 = "1125a4a2fa9400291c8e3a4e8b68471573f5813ea0aefc0ab3a7ca4ca75dedc7" +source = "snow-fort" +synopsis = "Accessing parts of arrays" +version = "3.1.5" + +[slib-time-core] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/time-core/SLIB-3b5-r7rs/slib-time-core-SLIB-3b5-r7rs.tgz" +sha256 = "3385839c98ab9b1bc68347baee280b8071dd73b1aed3ee3d1547161b9ced3630" +source = "snow-fort" +synopsis = "Core time conversion routines" +version = "3.1.5" + +[slib-time-zone] +dependencies = ["akku-r7rs", "slib-common", "slib-scanf", "slib-time-core", "slib-tzfile"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/time-zone/SLIB-3b5-r7rs/slib-time-zone-SLIB-3b5-r7rs.tgz" +sha256 = "60bcdd2a1254ff42eda3e5c04a4cc18d7114698b1639a752ec338e448e1dc4f7" +source = "snow-fort" +synopsis = "Compute timezones and DST from TZ environment variable" +version = "3.1.5" + +[slib-topological-sort] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/topological-sort/SLIB-3b5-r7rs/slib-topological-sort-SLIB-3b5-r7rs.tgz" +sha256 = "8f8039cd024f360b9ab1800e41ef66b1fdb1fc5b3e998e309c0c5186a95ea5b2" +source = "snow-fort" +synopsis = "Topological sort" +version = "3.1.5" + +[slib-tree] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/tree/SLIB-3b5-r7rs/slib-tree-SLIB-3b5-r7rs.tgz" +sha256 = "215900d6e5c6fff4e9f77000c6061b3dc126cb9ac2c6430f343cb589ac073827" +source = "snow-fort" +synopsis = "Implementation of COMMON LISP tree functions" +version = "3.1.5" + +[slib-tzfile] +dependencies = ["akku-r7rs", "slib-byte", "slib-common"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/tzfile/SLIB-3b5-r7rs/slib-tzfile-SLIB-3b5-r7rs.tgz" +sha256 = "6f77c976ba6e41b0a5d65383d0c2217786fb0fe7fd34ebb5cbc0d5f5c784b8f3" +source = "snow-fort" +synopsis = "Read sysV style (binary) timezone file" +version = "3.1.5" + +[slib-uri] +dependencies = ["akku-r7rs", "slib-coerce", "slib-common", "slib-directory", "slib-printf", "slib-scanf", "slib-string-case", "slib-string-search", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/uri/SLIB-3b5-r7rs/slib-uri-SLIB-3b5-r7rs.tgz" +sha256 = "dd009379a2b642fab5fb42a13122169bbf044343930cebf05930012bc45aa30f" +source = "snow-fort" +synopsis = "Construct and decode Uniform Resource Identifiers" +version = "3.1.5" + +[slib-wt-tree] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/wt-tree/SLIB-3b5-r7rs-1/slib-wt-tree-SLIB-3b5-r7rs-1.tgz" +sha256 = "2c24d746496b212d590217c35e02aa2cf70da13adee3c2e22780149c1ed60d83" +source = "snow-fort" +synopsis = "Weight balanced trees" +version = "3.1.5" + +[slib-xml-parse] +dependencies = ["akku-r7rs", "slib-common", "slib-rev2-procedures", "slib-string-search", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/slib/xml-parse/SLIB-3b5-r7rs/slib-xml-parse-SLIB-3b5-r7rs.tgz" +sha256 = "14f514013c32cfa82f3b976c2a40b7d5450f777349ded314c4aeb82ca9ceb291" +source = "snow-fort" +synopsis = "XML parsing and conversion to SXML" +version = "3.1.5" + +[srfi-19] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "mit" +url = "http://snow-fort.org/s/opinionatedgeek.com/snow-fort.org/srfi/19/1.0.1/srfi-19-1.0.1.tgz" +sha256 = "08b5a0340eb153b8005decc4cda0a0b2a2967653f51d2d8b7d7e5b2245f08c6a" +source = "snow-fort" +synopsis = "Implementation of SRFI 19 'Time Data Types and Procedures'" +version = "1.0.1" + +[srfi-28] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/lassi.io/lassi/srfi/28/0.9/srfi-28-0.9.tgz" +sha256 = "9452791e67a806afb10efa202d458a6b2919613008e6b293e97ff8fa412900b0" +source = "snow-fort" +synopsis = "SRFI 28: Basic Format Strings" +version = "0.9.0" + +[srfi-42] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/lockywolf/srfi/42/0.1/srfi-42-0.1.tgz" +sha256 = "809cad22d152218d2bad6ee316e3020968c48f5869beadaa3fc3d0bb783faa87" +source = "snow-fort" +version = "0.1.0" + +[srfi-60] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/srfi/60/1.0.0/srfi-60-1.0.0.tgz" +sha256 = "e9eb9a762bd66d09f2d63343571e7492965ba0a9c48bbfb45006932419e31631" +source = "snow-fort" +synopsis = "Bit access and operations" +version = "1.0.0" + +[srfi-63] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/peterlane.info/peter/srfi/63/1.0.0/srfi-63-1.0.0.tgz" +sha256 = "0b8a805dd242438a45acbce96aa3c4fc6ce7e15ca7051ea07bd75a3f88cd403f" +source = "snow-fort" +synopsis = "Homogeneous and Heterogeneous Arrays" +version = "1.0.0" + +[srfi-64] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/fisher.cx/robert/srfi/64/0.1.0/srfi-64-0.1.0.tgz" +sha256 = "ae07145fe5d22fe83954af4c7e36f86e1e96f88d46588a4bc43844a00935a7f2" +source = "snow-fort" +synopsis = "Reference implementation of SRFI-54: A Scheme API for test suites" +version = "0.1.0" + +[srfi-78] +dependencies = ["chez-srfi", "akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/lockywolf/srfi/78/0.1/srfi-78-0.1.tgz" +sha256 = "83cb79f0eb3daa004202c23b4d1f69f1b7a76c403f09fb4f37afea666037a32b" +source = "snow-fort" +version = "0.1.0" + +[srfi-156] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-test"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/fisher.cx/robert/srfi/156/1.0.0/srfi-156-1.0.0.tgz" +sha256 = "73f53cc757e2fbe59ef48395c2d2ab94cad6b2a7febd8d0db53110e28e664fd1" +source = "snow-fort" +synopsis = "Reference implementation of SRFI-156: Syntactic combiners for binary predicates" +version = "1.0.0" + +[srfi-166] +dependencies = ["chez-srfi", "akku-r7rs", "chibi-optional"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/srfi/166/0.8.0/srfi-166-0.8.0.tgz" +sha256 = "e132a68c070c157ebfc8291b0be8f84f45ee85b92e4f80ac12faabd0c3872523" +source = "snow-fort" +version = "0.8.0" + +[srfi-175] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/lassi.io/lassi/srfi/175/1.1/srfi-175-1.1.tgz" +sha256 = "6d96cfe5474f47d1bd24949ae7057c393746ed6624a9691c92e9a607da877c1c" +source = "snow-fort" +synopsis = "SRFI 175: ASCII character library" +version = "1.1.0" + +[srfi-179] +dependencies = ["akku-r7rs", "chez-srfi", "chibi-assert", "chibi-test"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "http://snow-fort.org/s/gmail.com/alexshinn/srfi/179/0.10.0/srfi-179-0.10.0.tgz" +sha256 = "385a8694e60277d99e9ab9605ccb38616166eedb94a60bed9a38ceb1d482b5a1" +source = "snow-fort" +version = "0.10.0" + +[srfi-197] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/upr.edu/jantony.velazquez/srfi/197/1.3/srfi-197-1.3.tgz" +sha256 = "a83a96a7db33f51f6ca747c1cfc109010b96b2972c09c8a3acc6696bf4dba54d" +source = "snow-fort" +synopsis = "SRFI 197: Pipeline Operators" +version = "1.3.0" + +[srfi-235] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/upr.edu/jantony.velazquez/srfi/235/1.0/srfi-235-1.0.tgz" +sha256 = "c5c4bd3121d47de1eb8b6eaa29f754bbf9cee74a1b3719173a18919f45f2d46a" +source = "snow-fort" +synopsis = "SRFI 235: Combinators" +version = "1.0.0" + +[string-inflection] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "isc" +url = "http://snow-fort.org/s/lassi.io/lassi/string-inflection/0.1.1/string-inflection-0.1.1.tgz" +sha256 = "1f3273ca2ff7b8aa14c6e0aba1b339c7989c201a073508dee7cad83596a57192" +source = "snow-fort" +synopsis = "lisp-case under_score CapsUpper capsLower" +version = "0.1.1" + +[tex-parser] +dependencies = ["akku-r7rs", "read-char-if"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/lassi.io/lassi/tex-parser/0.1/tex-parser-0.1.tgz" +sha256 = "507e3dc0d04411f9f00db7d835b5270c82103c90a10040d4433de34c44340cbb" +source = "snow-fort" +version = "0.1.0" + +[thunknyc-expand-braces] +dependencies = ["akku-r7rs", "chez-srfi"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/poseur.com/edw/thunknyc/expand-braces/0.1.1/thunknyc-expand-braces-0.1.1.tgz" +sha256 = "eff4b0cabee5608f7d8f706a4eb7d241f816af1e91b7240109d1f474e69a1a4a" +source = "snow-fort" +synopsis = "Expand UNIX-shell style brace expressions" +version = "0.1.1" + +[thunknyc-json] +dependencies = ["akku-r7rs", "chibi-parse"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/poseur.com/edw/thunknyc/json/0.1.3/thunknyc-json-0.1.3.tgz" +sha256 = "b3d1d01b6a76875e3d1f7bb280e98b6bfd878e53697e9263527d19969617acf8" +source = "snow-fort" +synopsis = "Simple JSON parsing library" +version = "0.1.3" + +[trivial-tar-writer] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "isc" +url = "http://snow-fort.org/s/lassi.io/lassi/trivial-tar-writer/0.1/trivial-tar-writer-0.1.tgz" +sha256 = "8eab97e5f9205ed12915b14205f65b85443e9627463866436de79f5ec20bf41a" +source = "snow-fort" +synopsis = "Simplest way to output uncompressed .tar file" +version = "0.1.0" + +[unpack-assoc] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "isc" +url = "http://snow-fort.org/s/lassi.io/lassi/unpack-assoc/0.1/unpack-assoc-0.1.tgz" +sha256 = "5c41ef07d210ddd1424c12cd38b44424afec0d37618c746ece31f2a3831d9e9a" +source = "snow-fort" +synopsis = "Alist/hash-table destructuring case macros" +version = "0.1.0" + +[yasos] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "noassertion" +url = "http://snow-fort.org/s/gmail.com/taknamay/yasos/1.0.1/yasos-1.0.1.tgz" +sha256 = "5a7c4d8171f98e37e40b4f3af9b5fe3d2ab24dfd6a73f28014f0ba87abfc6f2d" +source = "snow-fort" +synopsis = "simple objects" +version = "1.0.1" + +[TerribleTLS] +dependencies = ["hashing", "industria", "struct-pack", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/t/TerribleTLS_1.0.0_repack.tar.xz" +sha256 = "f845c7a363042199fd1f185a41560f5bc563a00d51d8962632793153a5a18f44" +source = "akku" +synopsis = "Inadvisible pure-Scheme TLS 1.2 client" +version = "1.0.0" + +[ac-d-bus] +dependencies = ["r6rs-pffi", "chibi-match", "packrat", "loko-srfi"] +dev-dependencies = ["chez-srfi"] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/a/ac-d-bus_1.0.0-beta.0_repack.tar.xz" +sha256 = "f16934a16fbec35b86033a240a86c16e09194aa531206c3f8cbd8b213be7e14b" +source = "akku" +synopsis = "AC/D-Bus - D-Bus wire protocol" +version = "1.0.0-beta.0" + +[adios] +dependencies = [] +dev-dependencies = [] +license = "apache-2.0" +url = "https://archive.akkuscm.org/archive/pkg/a/adios_0.1.0_repack.tar.xz" +sha256 = "7cabf4a8025c76835098d2636ffcab893773054856e919e14e51df299e719916" +source = "akku" +synopsis = "A simple prototype-based object system for Chez Scheme that supports single inheritance" +version = "0.1.0" + +[aeolus] +dependencies = ["akku-r7rs"] +dev-dependencies = [] +license = "bsd-2-clause" +url = "https://archive.akkuscm.org/archive/pkg/a/aeolus_0.0.0-akku.34.2a43103_repack.tar.xz" +sha256 = "74bab1dfd97c7fda752d2bdc1e126d47a3eeaf63494ddab666063230a6f07d9c" +source = "akku" +synopsis = "R7RS cryptographic library" +version = "0.0.0-akku.34.2a43103" + +[agave] +dependencies = ["dharmalab", "surfage", "xitomatl", "chez-gl"] +dev-dependencies = [] +license = "apache-2.0" +url = "https://archive.akkuscm.org/archive/pkg/a/agave_0.0.1-akku.103.f95c7df_repack.tar.xz" +sha256 = "82beeecc146d03b0f9ec05ad456d30156a2b4e7b5667d39b57d45eb208dcd065" +source = "akku" +synopsis = "Low-glycemic OpenGL hacking for R6RS Scheme" +version = "0.0.1-akku.103.f95c7df" + +[akku] +dependencies = ["chez-srfi", "industria", "spells", "semver", "spdx", "wak-fmt", "wak-riastreams", "wak-foof-loop", "wak-wt-tree", "hashing", "compression", "laesare", "r6rs-pffi", "chibi-match", "akku-r7rs"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/a/akku_1.1.0_repack.tar.xz" +sha256 = "12371ccb0d502b7647e8f00353c1527301b4d8a100fb06fb3e6fac56fda33741" +source = "akku" +synopsis = "Language package manager for Scheme" +version = "1.1.0" + +[akku-r7rs] +dependencies = ["chez-srfi", "laesare"] +dev-dependencies = [] +license = "cc0-1.0" +url = "https://archive.akkuscm.org/archive/pkg/a/akku-r7rs_1.0.1_repack.tar.xz" +sha256 = "dedce2bc5eda6735aa5880741802a5b508b49c3b327d14b40e9fecbdf86353db" +source = "akku" +synopsis = "R7RS standard library for Akku.scm" +version = "1.0.1" + +[arew-blake3] +dependencies = [] +dev-dependencies = [] +license = "cc0" +url = "https://archive.akkuscm.org/archive/pkg/a/arew-blake3_0.9.0_repack.tar.xz" +sha256 = "fe6d41bcb9381c7ef102de7b177c8b54c3df140b0112add4bfce8e4a21e7654b" +source = "akku" +synopsis = "blake3 cryptographic hashing for Chez Scheme" +version = "0.9.0" + +[arew-json] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "cc0" +url = "https://archive.akkuscm.org/archive/pkg/a/arew-json_1.0.0-alpha.0_repack.tar.xz" +sha256 = "d7546a44797d6eb3cc2d38a13478224172aead699200cdd4d1d61750096c5823" +source = "akku" +synopsis = "JSON reader and writer for Chez Scheme" +version = "1.0.0-alpha.0" + +[box2d-lite] +dependencies = ["chez-gl", "agave", "dharmalab", "surfage"] +dev-dependencies = [] +license = "apache-2.0" +url = "https://archive.akkuscm.org/archive/pkg/b/box2d-lite_0.0.0-akku.38.56f4ed1_repack.tar.xz" +sha256 = "f146201b386e01560ce0213949350a802d6ca8b22fee6605e7dd2fab17009526" +source = "akku" +synopsis = "Scheme port of the Box2D Lite physics engine" +version = "0.0.0-akku.38.56f4ed1" + +[chez-cmark] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/c/chez-cmark_1.0.0-alpha.0_repack.tar.xz" +sha256 = "b5804a728714090002e85a14d1e5aea8d6e967b1d515481689188f71c83a2304" +source = "akku" +synopsis = "CommonMark FFI Bindings for Chez" +version = "1.0.0-alpha.0" + +[chez-csv] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/c/chez-csv_2.0.1-alpha_repack.tar.xz" +sha256 = "f2ce71280c76e5c8dc5b20217287c85fb66093ead4bd7da97b8f51f7001dfbea" +source = "akku" +synopsis = "Chez Scheme CSV library." +version = "2.0.1-alpha" + +[chez-docs] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/c/chez-docs_0.3.2_repack.tar.xz" +sha256 = "393203fa849c8678f40b160d08f985e10c5a9a590ac44c6627610294985c0c9b" +source = "akku" +synopsis = "Access Chez Scheme documentation from the REPL." +version = "0.3.2" + +[chez-gl] +dependencies = [] +dev-dependencies = [] +license = "bsd-3-clause" +url = "https://archive.akkuscm.org/archive/pkg/c/chez-gl_1.0.0_repack.tar.xz" +sha256 = "4de5ac8b142749490391941c9174ba5ba2cb5b080ab38fdafeab9fa4f381efa9" +source = "akku" +synopsis = "3D library: GL, GLU and GLUT for Chez Scheme" +version = "1.0.0" + +[chez-matrices] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/c/chez-matrices_0.3.0-alpha.0_repack.tar.xz" +sha256 = "4472d7253f06b32a4e189d547123f2eb9558d4b8f5913f8113d374083ac744e9" +source = "akku" +synopsis = "Implementation of common matrix (tensor) constructions and operatoins." +version = "0.3.0-alpha.0" + +[chez-mit] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/c/chez-mit_0.0.0-alpha.0_repack.tar.xz" +sha256 = "a891bbe69a18ff1dde2671436d8e19fc3ef36519448a2ef8d89f1c2549c4a1c0" +source = "akku" +synopsis = "A MIT/GNU Scheme compatibility library for Chez Scheme" +version = "0.0.0-alpha.0" + +[chez-scmutils] +dependencies = ["chez-srfi", "chez-mit"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/c/chez-scmutils_0.0.0-alpha.0_repack.tar.xz" +sha256 = "7b6f707f3e0d8fa7fdd46b7ba9e7773398544102943870fec3099348e1809035" +source = "akku" +synopsis = "A port of the ???MIT Scmutils??? library to Chez Scheme" +version = "0.0.0-alpha.0" + +[chez-sockets] +dependencies = [] +dev-dependencies = [] +license = "0bsd" +url = "https://archive.akkuscm.org/archive/pkg/c/chez-sockets_0.0.0-akku.13.c3fc663.1_repack.tar.xz" +sha256 = "f2f8bb67f10201579040907761d9667e11f4800e52b0cf1e302b08d27fe222c9" +source = "akku" +synopsis = "Full Blown, portable, and extensible sockets library for Chez Scheme" +version = "0.0.0-akku.13.c3fc663.1" + +[chez-soop] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/c/chez-soop_1.0.0-alpha.2_repack.tar.xz" +sha256 = "b6d944f5c6a0442411479a68d87ed0f217e032157e74a8e4bbca1a57c66151a9" +source = "akku" +synopsis = "SOOP Library fork from Chez Repository" +version = "1.0.0-alpha.2" + +[chez-srfi] +dependencies = [] +dev-dependencies = [] +license = ["mit", "bsd-3-clause"] +url = "https://archive.akkuscm.org/archive/pkg/c/chez-srfi_0.0.0-akku.209.552cd37_repack.tar.xz" +sha256 = "f0f620f24a4765b85d3157b670e319d6cd30240bfc78f812af1f04cf6f8804e6" +source = "akku" +synopsis = "Portable SRFI collection" +version = "0.0.0-akku.209.552cd37" + +[chez-stats] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/c/chez-stats_0.1.6_repack.tar.xz" +sha256 = "694ad3200ab1927b35e006d24b838defe28b1a58a4c075153cf93e0b25cb1639" +source = "akku" +synopsis = "Read and write delimited text files, compute descriptive statistics, and generate random variates in Chez Scheme." +version = "0.1.6" + +[compression] +dependencies = ["chez-srfi", "hashing", "struct-pack"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/c/compression_0.1.2_repack.tar.xz" +sha256 = "68109a1b95d731a95fb762260e4be411fb971363eb2d89075d95fe138008395d" +source = "akku" +synopsis = "Decompresses zlib, xz, gzip, lzma, lzma2; extracts tar, zip" +version = "0.1.2" + +[conjure] +dependencies = ["chez-srfi", "wak-fmt", "wak-irregex", "wak-foof-loop", "spells", "wak-prometheus"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/c/conjure_0.1.0-akku.84.19f3aae_repack.tar.xz" +sha256 = "dc7aeff90c8fe0728db4c7e12d4fff1a86111c4aaba09fb5a44a356e1edf8838" +source = "akku" +synopsis = "Scheme make(1) replacement" +version = "0.1.0-akku.84.19f3aae" + +[dataframe] +dependencies = ["slib-format", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/d/dataframe_0.8.0_repack.tar.xz" +sha256 = "09deaf93e94308379cf2c727ac09667a233db9c356fc73585c2faefeffc6360d" +source = "akku" +synopsis = "A dataframe record type for Scheme (R6RS) with procedures to select, drop, and rename columns, and filter, sort, split, bind, append, join, reshape, and aggregate dataframes." +version = "0.8.0" + +[dharmalab] +dependencies = ["surfage"] +dev-dependencies = [] +license = ["apache-2.0", "gpl-2.0-or-later"] +url = "https://archive.akkuscm.org/archive/pkg/d/dharmalab_0.0.0-akku.53.aba65fb_repack.tar.xz" +sha256 = "ade61c99c49655dd05fa6f5a5f9b287c3ed3789d8cda0eed61110fb1ada74ae2" +source = "akku" +synopsis = "Experimental libraries" +version = "0.0.0-akku.53.aba65fb" + +[dollar-sign] +dependencies = [] +dev-dependencies = [] +license = "0bsd" +url = "https://archive.akkuscm.org/archive/pkg/d/dollar-sign_1.1.0_repack.tar.xz" +sha256 = "47fc7c0b3fc5d70c3f4ff0320ba8c609acdc8130f1169653d8f131b3c8b11924" +source = "akku" +synopsis = "Adds dollar sign string interpolation" +version = "1.1.0" + +[dorodango] +dependencies = ["chez-srfi", "wak-foof-loop", "wak-fmt", "wak-irregex", "wak-parscheme", "wak-wt-tree", "spells", "industria", "ocelotl"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/d/dorodango_0.0.0-akku.268.4344bea_repack.tar.xz" +sha256 = "a351bb663de79a9ab24b3de90e838cab11c1a8771745d4e15750373460e909fc" +source = "akku" +synopsis = "Package manager for R6RS implementations" +version = "0.0.0-akku.268.4344bea" + +[fectors] +dependencies = [] +dev-dependencies = [] +license = "bsd-3-clause" +url = "https://archive.akkuscm.org/archive/pkg/f/fectors_0.1.1-akku.v0.1-5-g6c05617_repack.tar.xz" +sha256 = "433731db3dd71d7d697fa9e7764785472fcf4967f6368a2d7578039b2886aa05" +source = "akku" +synopsis = "Functional Vectors for Scheme" +version = "0.1.1-akku.v0.1-5-g6c05617" + +[fs-fatfs] +dependencies = ["struct-pack"] +dev-dependencies = ["wak-fmt", "chez-srfi"] +license = "lgpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/f/fs-fatfs_0.1.0_repack.tar.xz" +sha256 = "bde15f8e672d152d0e7bf5b220d8138a8e647cb1d22c9816e6c567842f02157f" +source = "akku" +synopsis = "FAT filesystem library" +version = "0.1.0" + +[fs-partitions] +dependencies = ["struct-pack", "hashing"] +dev-dependencies = ["uuid"] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/f/fs-partitions_1.0.0-beta.0_repack.tar.xz" +sha256 = "ccf179be9ef0bfe43f216c30ece495fa501815fbe8a140f1ace4591dd5b44a4d" +source = "akku" +synopsis = "Disk partition table reader (MBR/GPT)" +version = "1.0.0-beta.0" + +[gnuplot-pipe] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/g/gnuplot-pipe_0.4.0_repack.tar.xz" +sha256 = "e86566adcfb6dac8b64627a4253d5ed448a554751e81f2ed5b9c4b7630de04f8" +source = "akku" +synopsis = "Port of gnuplot-pipe egg for Chicken Scheme to Chez Scheme." +version = "0.4.0" + +[guile-lib] +dependencies = [] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/g/guile-lib_0.2.6_repack.tar.xz" +sha256 = "9ad68640b9d2f8e44216d45d919afe43447aa1db2beebd29fef8982cb49ef5c6" +source = "akku" +synopsis = "Useful code written in Guile Scheme" +version = "0.2.6" + +[hashing] +dependencies = [] +dev-dependencies = ["chez-srfi"] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/h/hashing_1.3.0_repack.tar.xz" +sha256 = "45dc285ed1dbfe24fc54c2417fe5baefc408c3cad502333894d3c111f8255be6" +source = "akku" +synopsis = "CRC, HMAC, MD5, SHA-1, SHA-2, xxHash" +version = "1.3.0" + +[http-pixiu] +dependencies = ["chibi-uri", "ufo-socket", "ufo-threaded-function", "ufo-coroutines", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/h/http-pixiu_1.0.2_repack.tar.xz" +sha256 = "bcfda888b5bb88f83e066f765711c8dc7623e4c9bf56e7212bee72bd8646b960" +source = "akku" +synopsis = "A http server based on scheme" +version = "1.0.2" + +[ijputils] +dependencies = ["wak-foof-loop", "chez-srfi", "spells", "pfds"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "https://archive.akkuscm.org/archive/pkg/i/ijputils_0.0.0-akku.42.1370c75_repack.tar.xz" +sha256 = "d1e51a65b1d5654a430437ff43c1b25a6d5d7e2f121d4c65b2156afb12522a6d" +source = "akku" +synopsis = "A bunch of scheme junk :)" +version = "0.0.0-akku.42.1370c75" + +[industria] +dependencies = ["chez-srfi", "hashing", "ip-address", "struct-pack"] +dev-dependencies = ["xitomatl", "r6rs-usocket"] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/i/industria_2.2.0_repack.tar.xz" +sha256 = "04a3695cb5ce1e0516fb5414bab045b215e64ac302a07e4731cdc4de2c330243" +source = "akku" +synopsis = "Cryptography, OTR, SSH, OpenPGP, etc." +version = "2.2.0" + +[influx-client] +dependencies = ["loko-srfi", "r6rs-usocket", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/i/influx-client_1.0.0_repack.tar.xz" +sha256 = "0762cc45d219186e9ef2a0efdac8af785f38db93fb8dd8c50b3431fad30ae590" +source = "akku" +synopsis = "InfluxDB line protocol and client" +version = "1.0.0" + +[ip-address] +dependencies = [] +dev-dependencies = ["chez-srfi", "struct-pack"] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/i/ip-address_1.1.0_repack.tar.xz" +sha256 = "2313fdd9bd3024d6776ad4c1abd22f8386838e46cdfa3163bec7871223483920" +source = "akku" +synopsis = "IP address parsing and formatting" +version = "1.1.0" + +[irc-protocol] +dependencies = ["industria", "chez-srfi", "struct-pack", "hashing", "TerribleTLS", "chibi-match"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/i/irc-protocol_1.0.0_repack.tar.xz" +sha256 = "10902fd414a75fabae329960bc6d136a895ac5968f6101e2c917734b00953c14" +source = "akku" +synopsis = "IRC protocol utilities" +version = "1.0.0" + +[iteratees] +dependencies = ["monad", "chez-srfi"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "https://archive.akkuscm.org/archive/pkg/i/iteratees_0.0.0-akku.9.e298a57_repack.tar.xz" +sha256 = "7c5e3b7e468d65745f16b27532bdf1470295a9078a0614f0336a8958b4f15608" +source = "akku" +synopsis = "Functional processing of sequential chunked data" +version = "0.0.0-akku.9.e298a57" + +[json-tools] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/j/json-tools_0.1.1-akku.15.7.23_repack.tar.xz" +sha256 = "a22043ae0ab82ba5f550443d21b47e32efb0b1c823ce3c22a821a6abe182b183" +source = "akku" +synopsis = "Collection of JSON utilities" +version = "0.1.1-akku.15.7.23" + +[laesare] +dependencies = [] +dev-dependencies = ["chez-srfi"] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/l/laesare_1.0.2_repack.tar.xz" +sha256 = "b0cc8ccc940995e7bfd01cc30191c55561f8142195749bad945bde73bfa2a18c" +source = "akku" +synopsis = "Scheme lexer and reader" +version = "1.0.2" + +[lcs] +dependencies = [] +dev-dependencies = ["xunit"] +license = "bsd-3-clause" +url = "https://archive.akkuscm.org/archive/pkg/l/lcs_0.0.0-akku.3.6f5f5a4_repack.tar.xz" +sha256 = "430706c5e5fbc0998c8f1438042cfe14d6ab8e56581a142b12eb143e1d3ec267" +source = "akku" +synopsis = "Longest Common Subsequence (LCS)" +version = "0.0.0-akku.3.6f5f5a4" + +[linenoise] +dependencies = ["r6rs-pffi"] +dev-dependencies = [] +license = "bsd-2-clause" +url = "https://archive.akkuscm.org/archive/pkg/l/linenoise_1.0.1_repack.tar.xz" +sha256 = "43ba6d0185465807b1c5dabcf85cb130c5f28340a66e13e12438c0fb103c4534" +source = "akku" +synopsis = "Readline replacement via PFFI" +version = "1.0.1" + +[loko-srfi] +dependencies = ["industria", "ip-address", "struct-pack"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/l/loko-srfi_1.0.1_repack.tar.xz" +sha256 = "6eb9b0e039007c7f377b85afba6dd6ff443d94b5ca1a0fa6ba7acd4375e83f79" +source = "akku" +synopsis = "Extra SRFIs (sockets) for Loko Scheme" +version = "1.0.1" + +[machine-code] +dependencies = ["struct-pack"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/m/machine-code_2.2.0_repack.tar.xz" +sha256 = "4012c1ecac3b3f1166810ab398f94db4909f31c396c33ce645a0c3e5a2a73ee5" +source = "akku" +synopsis = "Assembler for x86, ELF reader, various disassemblers" +version = "2.2.0" + +[monad] +dependencies = ["ijputils"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "https://archive.akkuscm.org/archive/pkg/m/monad_0.0.0-akku.12.6f0115f_repack.tar.xz" +sha256 = "753aef3a2a89394f9cabf3110f8b39a34d8ee5ade46613e771f9918e4b0f0451" +source = "akku" +synopsis = "Various monads" +version = "0.0.0-akku.12.6f0115f" + +[mpl] +dependencies = ["surfage", "dharmalab"] +dev-dependencies = [] +license = "apache-2.0" +url = "https://archive.akkuscm.org/archive/pkg/m/mpl_0.0.0-akku.146.3469e3c_repack.tar.xz" +sha256 = "6279fde860f4eb311b30c2db9cb9e0047b0517cbf342fb4535b1b8919a605deb" +source = "akku" +synopsis = "Computer Algebra and Symbolic Computation" +version = "0.0.0-akku.146.3469e3c" + +[mummel] +dependencies = ["r6rs-protobuf", "TerribleTLS", "struct-pack"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/m/mummel_0.1.0-alpha.0_repack.tar.xz" +sha256 = "b4aff13e655c81519a75cbfa82bf636fa7b0f8add472b7569d1c50fb7d4059b4" +source = "akku" +synopsis = "Mumble voice chat protocol" +version = "0.1.0-alpha.0" + +[nanopass] +dependencies = [] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/n/nanopass_1.9.2_repack.tar.xz" +sha256 = "94d5fc588b8939c73a5a57ccc372bcded8ba27287190298ac02ef5d2587bc67a" +source = "akku" +synopsis = "Nanopass Compiler Infrastructure" +version = "1.9.2" + +[ocelotl] +dependencies = ["chez-srfi", "spells", "wak-riastreams", "wak-parscheme", "wak-foof-loop", "wak-ssax"] +dev-dependencies = [] +license = ["bsd-3-clause", "gpl-3.0-or-later"] +url = "https://archive.akkuscm.org/archive/pkg/o/ocelotl_0.0.0-akku.42.0c6aada_repack.tar.xz" +sha256 = "9c229d68b3f838cd6b687e61e1b7bee34736d79cddef6061dc8ae5609c5298fd" +source = "akku" +synopsis = "Library collection centered around HTTP" +version = "0.0.0-akku.42.0c6aada" + +[oleg] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/o/oleg_0.0.0-akku.2.c682687_repack.tar.xz" +sha256 = "d378fb66be2748d335cb607606236d5486f752055e330fa841220e017ffac1c0" +source = "akku" +synopsis = "Libraries written by Oleg ported to Chez Scheme" +version = "0.0.0-akku.2.c682687" + +[packrat] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/p/packrat_0.1.1_repack.tar.xz" +sha256 = "ba72d6b8081ac5ab4344de026b1cff3a86414c746a979fbb407f2ad05fd66c8c" +source = "akku" +synopsis = "Packrat parser library" +version = "0.1.1" + +[pfds] +dependencies = [] +dev-dependencies = [] +license = "bsd-3-clause" +url = "https://archive.akkuscm.org/archive/pkg/p/pfds_0.3.0_repack.tar.xz" +sha256 = "2937e034f9174644941096c0b14d7c00c377a1fdc71a8b824296b7400b19625e" +source = "akku" +synopsis = "Purely Functional Data Structures" +version = "0.3.0" + +[quickcheck] +dependencies = [] +dev-dependencies = [] +license = "bsd-3-clause" +url = "https://archive.akkuscm.org/archive/pkg/q/quickcheck_0.0.0-akku.10.cc5cc2d_repack.tar.xz" +sha256 = "e56917236277ebb37eb244338f271cef34656c1b59bf50c717aa54abc08673d7" +source = "akku" +synopsis = "A quickcheck-alike" +version = "0.0.0-akku.10.cc5cc2d" + +[r6lint] +dependencies = [] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/r/r6lint_0.1.0_repack.tar.xz" +sha256 = "3240edb0411555d3cb9591a4643359e6b3d3bb1078606d1a3351d9d9f0c56854" +source = "akku" +synopsis = "Linter for R6RS libraries and programs" +version = "0.1.0" + +[r6rs-ad] +dependencies = [] +dev-dependencies = [] +license = "gpl-2.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/r/r6rs-ad_0.0.0-akku.160.a1b8db1_repack.tar.xz" +sha256 = "e688e265055213d38d1dcbe2f6705246185e7c93df451ade81c9e22eed457d06" +source = "akku" +synopsis = "Automatic Differentiation and more" +version = "0.0.0-akku.160.a1b8db1" + +[r6rs-clos] +dependencies = ["surfage"] +dev-dependencies = [] +license = "xerox" +url = "https://archive.akkuscm.org/archive/pkg/r/r6rs-clos_1.0.0_repack.tar.xz" +sha256 = "f70a7c18c8936e60f9f94c1ed2429712de1cf5d3ba98e6a04ef2610a85b364eb" +source = "akku" +synopsis = "Tiny CLOS" +version = "1.0.0" + +[r6rs-coap] +dependencies = ["ip-address", "packrat"] +dev-dependencies = ["loko-srfi", "chez-srfi"] +license = "lgpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/r/r6rs-coap_0.1.1_repack.tar.xz" +sha256 = "b5af9f9ea166188ed3b57758879f0081cdf3be3facba0a350acb88f762951ff9" +source = "akku" +synopsis = "Constrained Application Protocol (CoAP)" +version = "0.1.1" + +[r6rs-monads] +dependencies = [] +dev-dependencies = [] +license = "apache-2.0" +url = "https://archive.akkuscm.org/archive/pkg/r/r6rs-monads_0.1.0-akku.17.76e857_repack.tar.xz" +sha256 = "5a9a230cf109756ae223bef934a97bb1644afcee4892b9fef7daeb8ea6748f0d" +source = "akku" +synopsis = "Generic syntax for working with monads" +version = "0.1.0-akku.17.76e857" + +[r6rs-mongodb] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "bsd-2-clause" +url = "https://archive.akkuscm.org/archive/pkg/r/r6rs-mongodb_0.0.190423_repack.tar.xz" +sha256 = "530fe61e253d35a7a73ea6f20ff19bcff8732ef6eba2eeb8cb2adc2503ce784f" +source = "akku" +synopsis = "MongoDB client and BSON" +version = "0.0.190423" + +[r6rs-msgpack] +dependencies = [] +dev-dependencies = ["chez-srfi"] +license = "bsd-2-clause" +url = "https://archive.akkuscm.org/archive/pkg/r/r6rs-msgpack_0.5.7_repack.tar.xz" +sha256 = "a14d84f8596d533dd199b9bf2fbdfe184bbb20f603bf6df7b4956adf8b00f7e7" +source = "akku" +synopsis = "MessagePack for R6RS Scheme" +version = "0.5.7" + +[r6rs-pffi] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "bsd-2-clause" +url = "https://archive.akkuscm.org/archive/pkg/r/r6rs-pffi_1.6.0_repack.tar.xz" +sha256 = "ca3f5200598d92af90a4dbcbe7d2f5c5a429393d752b09156747d145bbd4e189" +source = "akku" +synopsis = "Portable Foreign Function Interface (2023-01-02)" +version = "1.6.0" + +[r6rs-protobuf] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/r/r6rs-protobuf_0.9.0_repack.tar.xz" +sha256 = "5a186f1806700fbad6aa8bf24fde3abd7299f232b05e875de93db5145e11a8ba" +source = "akku" +synopsis = "Protocol Buffers for R6RS Scheme" +version = "0.9.0" + +[r6rs-psystem] +dependencies = ["r6rs-pffi", "chez-srfi"] +dev-dependencies = [] +license = "bsd-2-clause" +url = "https://archive.akkuscm.org/archive/pkg/r/r6rs-psystem_0.0.181217_repack.tar.xz" +sha256 = "48ceb008aefc4f97c248023049df5c066611a8c7968a6b896b63ab5d9daec3d9" +source = "akku" +synopsis = "OS name and libc-loading for PFFI" +version = "0.0.181217" + +[r6rs-redis] +dependencies = ["chez-srfi", "r6rs-usocket"] +dev-dependencies = [] +license = "bsd-2-clause" +url = "https://archive.akkuscm.org/archive/pkg/r/r6rs-redis_0.0.190103_repack.tar.xz" +sha256 = "ba2d75aa993e3629a2476f2e5fe915839de034a6fa4f166eafdc89420a9d34b6" +source = "akku" +synopsis = "Client for the Redis key-value store" +version = "0.0.190103" + +[r6rs-slice] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "https://archive.akkuscm.org/archive/pkg/r/r6rs-slice_0.0.0-akku.6.5f41a23_repack.tar.xz" +sha256 = "7f7e049530f4e4cad3f51801d8b0ed7b4e9456a0f0f0b9a078faffbe0c4e5b9e" +source = "akku" +synopsis = "Slice lists, vectors, strings and bytevectors" +version = "0.0.0-akku.6.5f41a23" + +[r6rs-thrift] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/r/r6rs-thrift_0.1.0_repack.tar.xz" +sha256 = "c149e130fb0166aef591dad1cb9f1e9cdedba5ec9db92659a753f0515709ea6f" +source = "akku" +synopsis = "Implementation of the Apache Thrift framework" +version = "0.1.0" + +[r6rs-usocket] +dependencies = ["r6rs-pffi", "r6rs-psystem"] +dev-dependencies = ["chez-srfi"] +license = "bsd-2-clause" +url = "https://archive.akkuscm.org/archive/pkg/r/r6rs-usocket_0.0.200218_repack.tar.xz" +sha256 = "56033c660a91d0afd7f3e0fd19a80e49ec201ae36d95d3e8b0f3525cdc4c14ea" +source = "akku" +synopsis = "portable sockets library" +version = "0.0.200218" + +[racr] +dependencies = [] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/r/racr_0.0.0-akku.756.c7d3fe0_repack.tar.xz" +sha256 = "5eb0fde6fe84d6a344cef46c234bb36a5c24dbc06505cad9335a9cb0a1b1b9b7" +source = "akku" +synopsis = "Reference Attribute Grammar Controlled Rewriting" +version = "0.0.0-akku.756.c7d3fe0" + +[riastradh] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/r/riastradh_0.0.0-akku.16.9714b5c_repack.tar.xz" +sha256 = "3a71c9de0e79630f6fdf543b77ed246b5308940ef336297cfd3c58d987b79b8d" +source = "akku" +synopsis = "Libraries by Taylor Campbell ported to Chez Scheme" +version = "0.0.0-akku.16.9714b5c" + +[scheme-bytestructures] +dependencies = ["akku-r7rs", "r6rs-bytevectors"] +dev-dependencies = [] +license = "gpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/s/scheme-bytestructures_1.0.6-akku.0_repack.tar.xz" +sha256 = "331ed7f1cadc75a1c4a620ebceb671c3170984b2150b8ca2d04a0bd21b96144c" +source = "akku" +synopsis = "Structured access to bytevector contents" +version = "1.0.6-akku.0" + +[scheme-langserver] +dependencies = ["ufo-thread-pool", "ufo-threaded-function", "uuid", "chibi-pathname", "ufo-match", "arew-json", "slib-string-search", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/s/scheme-langserver_1.2.1_repack.tar.xz" +sha256 = "2fe6450ff9907d1b32b9fa18b9b5799e5083fc0bf498a342788e8d5959f4372a" +source = "akku" +synopsis = "This package is a language server protocol implementation helping scheme programming." +version = "1.2.1" + +[scheme-specs] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "apache-2.0" +url = "https://archive.akkuscm.org/archive/pkg/s/scheme-specs_0.0.3_repack.tar.xz" +sha256 = "450d10c2621d1e5a6d0e0f056d8b022603393e7b21b4459e819d0bb320793fe7" +source = "akku" +synopsis = "Ruby-style spec testing library" +version = "0.0.3" + +[semver] +dependencies = ["chez-srfi", "packrat", "chibi-match"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/s/semver_1.0.4_repack.tar.xz" +sha256 = "e20046c87741d7af6468422a459c304413a152b765fa674a66addf732273252e" +source = "akku" +synopsis = "Semantic Versioning and ranges" +version = "1.0.4" + +[seq] +dependencies = [] +dev-dependencies = [] +license = "bsd" +url = "https://archive.akkuscm.org/archive/pkg/s/seq_0.0.1-beta.0_repack.tar.xz" +sha256 = "4eae88f1282692e82d4d817bb21f6079dd52bee5805e972060fe0e6b6fa6b986" +source = "akku" +synopsis = "This library provides tools for efficiently building up complex list structures." +version = "0.0.1-beta.0" + +[spdx] +dependencies = ["chez-srfi", "packrat"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/s/spdx_1.0.0_repack.tar.xz" +sha256 = "5e621cb4447c9fb5136002aa01f5600de84f44cd321786262af69de4c6379c66" +source = "akku" +synopsis = "SPDX license expressions and such" +version = "1.0.0" + +[spells] +dependencies = ["chez-srfi", "wak-irregex", "wak-foof-loop", "wak-fmt"] +dev-dependencies = ["wak-trc-testing"] +license = "gpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/s/spells_0.0.0-akku.509.1bfe3b8_repack.tar.xz" +sha256 = "03d8c1bb15e0a31cfbad5f30c5f23146ea0826947f1093d3890ebc44f66bc0f7" +source = "akku" +synopsis = "Portability and utility library" +version = "0.0.0-akku.509.1bfe3b8" + +[struct-pack] +dependencies = [] +dev-dependencies = ["chez-srfi"] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/s/struct-pack_1.1.1_repack.tar.xz" +sha256 = "42d34a4d7052bdda1bddec0dfddd8f1e576bd0a51b483215a4ca3a8ed7b56d09" +source = "akku" +synopsis = "Pack/unpack syntax for byte structures" +version = "1.1.1" + +[surfage] +dependencies = [] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/s/surfage_0.0.0-akku.12.895f16a_repack.tar.xz" +sha256 = "a7552a73a5e015f8484a515bdade9a99360681c7cd1cd9331b0c65e556a63539" +source = "akku" +synopsis = "SRFI collection: (surfage s1 lists), etc" +version = "0.0.0-akku.12.895f16a" + +[swish] +dependencies = [] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/s/swish_0.0.0-akku.259.842f51f_repack.tar.xz" +sha256 = "45f47f2619faaf3193a29bcfc86f46701d646f3e0e46e42a16b11a197e278d18" +source = "akku" +synopsis = "Swish Concurrency Engine (like Erlang/Node)" +version = "0.0.0-akku.259.842f51f" + +[text-mode] +dependencies = ["struct-pack", "r6rs-pffi", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/t/text-mode_1.0.0_repack.tar.xz" +sha256 = "a391a2eb08622dd97d9d24920bde7267a0cc2ad8529230be461323bad02cbff5" +source = "akku" +synopsis = "Text-mode console library (like curses)" +version = "1.0.0" + +[thunderchez] +dependencies = [] +dev-dependencies = [] +license = ["apache-2.0", "bsd-3-clause", "mit"] +url = "https://archive.akkuscm.org/archive/pkg/t/thunderchez_0.0.0-akku.121.9d6344a_repack.tar.xz" +sha256 = "e4d9a15bee40aa661b1d250ad5d1bb190a7ae452bfa8655e27f97b3a214e518c" +source = "akku" +synopsis = "Monorepo of various libraries for Chez Scheme" +version = "0.0.0-akku.121.9d6344a" + +[ufo-coroutines] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/u/ufo-coroutines_1.0.3_repack.tar.xz" +sha256 = "16b8aa3a449ba4cc91bd435ad0a97be9776c9dca24323b31f7f64e1f68c4b342" +source = "akku" +synopsis = "This package is a dependable coroutine package for chez scheme." +version = "1.0.3" + +[ufo-match] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/u/ufo-match_1.0.0_repack.tar.xz" +sha256 = "3200ebeb66a1b030ba244ee048c1ed7c6a256d6f091129a362ef1af53de16383" +source = "akku" +synopsis = "This package is a dependable match macro library for chez scheme." +version = "1.0.0" + +[ufo-socket] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/u/ufo-socket_1.0.0_repack.tar.xz" +sha256 = "4086f72cf355cd207e140be1db14aa29ca5ae1822ac8c9f4472cd071ab902014" +source = "akku" +synopsis = "I did not edit Akku.manifest" +version = "1.0.0" + +[ufo-thread-pool] +dependencies = ["slib-queue", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/u/ufo-thread-pool_1.0.3_repack.tar.xz" +sha256 = "566460f3ea2ba48dec08c1dbdad925177ca2fe94bbe5208c653c63bdea7cdb44" +source = "akku" +synopsis = "This package is a dependable thread pool package for chez scheme." +version = "1.0.3" + +[ufo-threaded-function] +dependencies = ["ufo-thread-pool", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/u/ufo-threaded-function_1.0.4_repack.tar.xz" +sha256 = "87e1406850888c52debefd64d75bcf825ea215772eb11a831f895cce1fe1541c" +source = "akku" +synopsis = "This package contains threaded-map, threaded-vector-map and such threaded functions for chez scheme." +version = "1.0.4" + +[uuid] +dependencies = ["hashing", "industria", "struct-pack", "chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/u/uuid_1.0.0-beta.0_repack.tar.xz" +sha256 = "03a058e7522933c1f7475cd20ab0515016bfbbd8c406d3c7302946b20664431d" +source = "akku" +synopsis = "Generate and analyze UUIDs" +version = "1.0.0-beta.0" + +[wak-common] +dependencies = [] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/w/wak-common_0.1.0-akku.15.6d495fc_repack.tar.xz" +sha256 = "9c5170c85c885d9e35ce62dcf829597d31cc0b3697b79fe544640bf828c5a22d" +source = "akku" +synopsis = "Common infrastructure for the Wak ports" +version = "0.1.0-akku.15.6d495fc" + +[wak-fmt] +dependencies = ["chez-srfi", "wak-common"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "https://archive.akkuscm.org/archive/pkg/w/wak-fmt_0.8.0-akku.10.d5b2a5a_repack.tar.xz" +sha256 = "807c3b78a2c5d4a89017a8a811a5f58fe3a2c81494107cab710b23d9f1a3a34f" +source = "akku" +synopsis = "Combinator Formatting Library" +version = "0.8.0-akku.10.d5b2a5a" + +[wak-foof-loop] +dependencies = ["chez-srfi", "wak-common", "wak-syn-param", "wak-riastreams"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "https://archive.akkuscm.org/archive/pkg/w/wak-foof-loop_0.0.0-akku.4.a7b9cd8_repack.tar.xz" +sha256 = "4612a0060480d128cb00d7b0f67e7455f5765960bc9b2e95c3471dd14ebf01a4" +source = "akku" +synopsis = "Extensible looping library" +version = "0.0.0-akku.4.a7b9cd8" + +[wak-htmlprag] +dependencies = ["chez-srfi", "wak-common"] +dev-dependencies = ["wak-testeez"] +license = "lgpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/w/wak-htmlprag_0.19.0_repack.tar.xz" +sha256 = "e1432301b0a2b8e2facfab0f3e1951ddd2ce1f00d755c8e3e587c5fbf10919ba" +source = "akku" +synopsis = "pragmatic parsing and emitting of HTML using SXML and SHTML" +version = "0.19.0" + +[wak-irregex] +dependencies = ["wak-common"] +dev-dependencies = [] +license = "bsd-3-clause" +url = "https://archive.akkuscm.org/archive/pkg/w/wak-irregex_0.8.1_repack.tar.xz" +sha256 = "097677fcd0d3a7a741729d4b3bad04ea083fff0fc2cd9b0332b44d1e067a9eca" +source = "akku" +synopsis = "Portable regular expressions" +version = "0.8.1" + +[wak-parscheme] +dependencies = ["chez-srfi", "wak-common", "wak-riastreams"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/w/wak-parscheme_0.0.0-akku.7.e9e25f9_repack.tar.xz" +sha256 = "5c9c266fe48c3c98a0a1d2b7e435347494530a97343acfc6d07ad831f78d6672" +source = "akku" +synopsis = "Parser combinator library" +version = "0.0.0-akku.7.e9e25f9" + +[wak-prometheus] +dependencies = ["chez-srfi", "wak-common"] +dev-dependencies = [] +license = "gpl-2.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/w/wak-prometheus_2.0.0-akku.6.965fc7e_repack.tar.xz" +sha256 = "bf99f85e6699fb2e39639d2e6fc56e5927683316b03e6bcd540bbb3718788bc6" +source = "akku" +synopsis = "Prototype-based message-passing object system" +version = "2.0.0-akku.6.965fc7e" + +[wak-riastreams] +dependencies = ["chez-srfi", "wak-common"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/w/wak-riastreams_0.0.0-akku.5.b444645_repack.tar.xz" +sha256 = "9d31a6f505db6b8bcdd8d3387c302084e7efa97ba7faded987fbeb2c2f666de8" +source = "akku" +synopsis = "Lazy streams" +version = "0.0.0-akku.5.b444645" + +[wak-ssax] +dependencies = ["chez-srfi", "wak-common"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/w/wak-ssax_5.1.0-akku.4.1f7fad4_repack.tar.xz" +sha256 = "dba5d065a8dcea8155b9444fbe5949d2eba6ffe82549ba2bb921d9314c59d04d" +source = "akku" +synopsis = "Functional XML parsing framework" +version = "5.1.0-akku.4.1f7fad4" + +[wak-sxml-tools] +dependencies = ["chez-srfi", "wak-common", "wak-ssax"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/w/wak-sxml-tools_0.0.0-akku.1.5c14730_repack.tar.xz" +sha256 = "828bfc298d6d26dc6b9b5d2e59b51c1facbad03f4ac48d805d13786e64cf8813" +source = "akku" +synopsis = "Tools for manipulating SXML" +version = "0.0.0-akku.1.5c14730" + +[wak-syn-param] +dependencies = ["wak-common"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/w/wak-syn-param_0.0.0-akku.4.8ca3272_repack.tar.xz" +sha256 = "f81250b57f88336805b43c72f491d5a652fe8221a0f5529361d3401bcd60ec7c" +source = "akku" +synopsis = "Operators with extended parameter syntax" +version = "0.0.0-akku.4.8ca3272" + +[wak-testeez] +dependencies = ["spells", "wak-common"] +dev-dependencies = [] +license = "lgpl-2.1-or-later" +url = "https://archive.akkuscm.org/archive/pkg/w/wak-testeez_0.2.0_repack.tar.xz" +sha256 = "3cbeeaca5df98443589fef0d6fd7c9fddbf65f4b79eb1f4f75948d74b769d221" +source = "akku" +synopsis = "Lightweight Unit Test Mechanism" +version = "0.2.0" + +[wak-trc-testing] +dependencies = ["chez-srfi", "wak-common", "wak-syn-param", "wak-fmt", "wak-foof-loop"] +dev-dependencies = [] +license = ["lgpl-3.0-or-later", "bsd-3-clause"] +url = "https://archive.akkuscm.org/archive/pkg/w/wak-trc-testing_0.0.0-akku.6.8168507_repack.tar.xz" +sha256 = "95ac705fee1e681fc5e580d42bf51f34ce7541a04315c8339a0bb4250dc1d969" +source = "akku" +synopsis = "Simple testing facility" +version = "0.0.0-akku.6.8168507" + +[wak-wt-tree] +dependencies = [] +dev-dependencies = [] +license = "gpl-2.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/w/wak-wt-tree_0.0.0-akku.5.2a2c933_repack.tar.xz" +sha256 = "049871743518fc55bc63e6ba9da651e78d4ec892c852cef2607fc64033fc0a7b" +source = "akku" +synopsis = "Weight-balanced trees" +version = "0.0.0-akku.5.2a2c933" + +[xitomatl] +dependencies = ["chez-srfi"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/x/xitomatl_0.0.0-akku.208.62a8243_repack.tar.xz" +sha256 = "090a62571c424dd4bb4f13a4f46d57a4f6434960ab3e71d8727b0b8eaf7bce4e" +source = "akku" +synopsis = "Monorepo with various libraries" +version = "0.0.0-akku.208.62a8243" + +[xunit] +dependencies = [] +dev-dependencies = [] +license = "bsd-3-clause" +url = "https://archive.akkuscm.org/archive/pkg/x/xunit_0.0.0-akku.21.0b4ede2_repack.tar.xz" +sha256 = "ba53698fb0d468aedb5062d49089002924ba7b1c622b16ed8170810412f4f4d3" +source = "akku" +synopsis = "xUnit test utility" +version = "0.0.0-akku.21.0b4ede2" + +[yxskaft] +dependencies = ["r6rs-pffi", "struct-pack"] +dev-dependencies = [] +license = "lgpl-3.0-or-later" +url = "https://archive.akkuscm.org/archive/pkg/y/yxskaft_0.2.0_repack.tar.xz" +sha256 = "a49d83c503088d5d22b0458ffa85fa64995fb65f2687a87c09f124bcb3b7319f" +source = "akku" +synopsis = "Tiny X client library" +version = "0.2.0" + +[zabavno] +dependencies = ["machine-code"] +dev-dependencies = [] +license = "mit" +url = "https://archive.akkuscm.org/archive/pkg/z/zabavno_0.2.0_repack.tar.xz" +sha256 = "8b663e50b7afe3e59960fcbe5dda69e1e56e940084789dcb2da6eefc934d394e" +source = "akku" +synopsis = "80386 real-mode CPU and PC emulator" +version = "0.2.0" + diff --git a/pkgs/tools/package-management/akku/overrides.nix b/pkgs/tools/package-management/akku/overrides.nix new file mode 100644 index 000000000000..4b72545d91a4 --- /dev/null +++ b/pkgs/tools/package-management/akku/overrides.nix @@ -0,0 +1,135 @@ +{ stdenv, lib, akku, curl, git, substituteAll }: +let + joinOverrides = + overrides: pkg: old: + lib.attrsets.mergeAttrsList (map (o: o pkg old) overrides); + addToBuildInputs = + extras: pkg: old: + { propagatedBuildInputs = old.propagatedBuildInputs ++ extras; }; + broken = lib.addMetaAttrs { broken = true; }; + skipTests = pkg: old: { doCheck = false; }; + # debugging + showLibs = pkg: old: { preCheck = "echo $CHEZSCHEMELIBDIRS"; }; + runTests = pkg: old: { doCheck = true; }; + brokenOnAarch64 = _: lib.addMetaAttrs { broken = stdenv.isAarch64; }; + brokenOnx86_64Darwin = lib.addMetaAttrs { broken = stdenv.isDarwin && stdenv.isx86_64; }; +in +{ + chez-srfi = joinOverrides [ + (pkg: old: { + preCheck = '' + SKIP=' + multi-dimensional-arrays.sps + time.sps + tables-test.ikarus.sps + lazy.sps + ' + ''; + }) + + # nothing builds on ARM Macs because of this + brokenOnAarch64 + ]; + + akku-r7rs = pkg: old: { + preBuild = '' + # tests aren't exported modules + rm -rf tests + ''; + }; + + akku = joinOverrides [ + (addToBuildInputs [ curl git ]) + (pkg: old: { + # hardcode-libcurl + patches = akku.patches; + }) + ]; + + # circular dependency on wak-trc-testing !? + wak-foof-loop = skipTests; + + scheme-langserver = joinOverrides [ + (pkg: old: { + preInstall = '' + # add the lsp executable to be installed + echo "#!/usr/bin/env scheme-script" > .akku/bin/scheme-langserver + cat run.ss >> .akku/bin/scheme-langserver + chmod +x .akku/bin/scheme-langserver + ''; + }) + skipTests + ]; + + # broken tests + xitomatl = skipTests; + ufo-threaded-function = skipTests; + + # unsupported schemes, it seems. + loko-srfi = broken; + ac-d-bus = broken; + + # todo: + # system-specific: + + # scheme-langserver doesn't work because of this + ufo-thread-pool = brokenOnx86_64Darwin; + + # broken everywhere: + chibi-math-linalg = broken; + chibi-mecab = broken; + chibi-ssl = broken; + chibi-voting = broken; + chibi-xgboost = broken; + dockerfile = broken; + in-progress-hash-bimaps = broken; + in-progress-hash-tables = broken; + rapid-analyze-library = broken; + rapid-args-fold = broken; + rapid-eliminate-mutable-variables = broken; + rapid-fix-letrec = broken; + rapid-graph = broken; + rapid-library-definition = broken; + rapid-mapping = broken; + rapid-read = broken; + rapid-set = broken; + rapid-syntax = broken; + read-char-if = broken; + shell-quote = broken; + srfi-19 = broken; + srfi-64 = broken; + srfi-179 = broken; + string-inflection = broken; + tex-parser = broken; + trivial-tar-writer = broken; + unpack-assoc = broken; + agave = broken; + box2d-lite = broken; + chez-soop = broken; + chez-stats = broken; + dataframe = broken; + dharmalab = broken; + dorodango = broken; + fectors = broken; + fs-fatfs = broken; + fs-partitions = broken; + gnuplot-pipe = broken; + http-pixiu = broken; + influx-client = broken; + linenoise = broken; + mpl = broken; + mummel = broken; + ocelotl = broken; + r6lint = broken; + r6rs-clos = broken; + r6rs-coap = broken; + r6rs-msgpack = broken; + scheme-bytestructures = broken; + surfage = broken; + swish = broken; + text-mode = broken; + thunderchez = broken; + wak-ssax = broken; + wak-sxml-tools = broken; + yxskaft = broken; +} diff --git a/pkgs/tools/package-management/akku/parse-akku.scm b/pkgs/tools/package-management/akku/parse-akku.scm new file mode 100644 index 000000000000..4ea0c5a1f589 --- /dev/null +++ b/pkgs/tools/package-management/akku/parse-akku.scm @@ -0,0 +1,151 @@ +(import (srfi 1) + (srfi 28) + (ice-9 pretty-print)) + + +(define-syntax anif + (syntax-rules (:=) + ((_ (bool := sym) x y) + (let ((sym bool)) + (if sym x y))) + ((_ b x) + (anif b x #f)))) + +(define ref assoc-ref) + +(define (sref alist key) + ;; Used to reach b in pairs like (a . (b)) + (anif ((ref alist key) := t) + (car t) + #f)) + +(define (printf str . args) + (display (apply format (cons str args)))) + +(define (->string x) + (cond + ((symbol? x) (symbol->string x)) + ((number? x) (number->string x)) + (else x))) + +(define (module-name->string module) + (if (pair? module) + (string-join (map ->string module) "-") + module)) + +(define (normalize-deps deps) + (map (compose module-name->string car) deps)) + +(define (parse-license license) + (let ((res (with-input-from-string license read))) + (if (pair? res) + (map (compose string-downcase ->string) + (filter (lambda (sym) (not (eq? sym 'AND))) res)) + (string-downcase (->string res))))) + +(define (parse-version-info alist) + (let* ((lock (ref alist 'lock)) + (url (sref (ref lock 'location) 'url)) + (sha256 (sref (ref lock 'content) 'sha256)) + (depends (normalize-deps (ref alist 'depends))) + (dev-depends + (anif ((ref alist 'depends/dev) := t) + (normalize-deps t) + (list))) + (license (parse-license (sref alist 'license)))) + (append `((license ,license) + (url ,url) + (sha256 ,sha256) + (depends ,depends) + (dev-depends ,dev-depends)) + alist))) + +(define (format-list lst) + (define (surround s) + (format "~s" s)) + (string-append + "[" + (apply string-join (list (map surround lst) ", ")) + "]")) + +(define (write-package sexp) + (let* ((latest (parse-version-info (last (ref sexp 'versions)))) + (license (sref latest 'license)) + (url (sref latest 'url))) + (printf "[~a]\n" (module-name->string (sref sexp 'name))) + (printf "dependencies = ~a\n" (format-list (sref latest 'depends))) + (printf "dev-dependencies = ~a\n" (format-list (sref latest 'dev-depends))) + (if (pair? license) + (printf "license = ~a\n" (format-list license)) + (printf "license = ~s\n" license)) + (printf "url = ~s\n" url) + (printf "sha256 = ~s\n" (sref latest 'sha256)) + (printf + "source = ~s\n" + (cond + ;; because #f could be returned + ((eqv? 0 (string-contains url "https://archive.akkuscm.org/")) "akku") + ((eqv? 0 (string-contains url "http://snow-fort.org/")) "snow-fort") + (else "UNKNOWN"))) + (anif ((sref latest 'synopsis) := t) + (printf "synopsis = ~s\n" t)) + (printf "version = ~s\n" (sref latest 'version)) + (anif ((sref latest 'hompeage) := t) + (printf "homepage = ~s\n" t)) + (newline))) + +(define (main-deps) + (let ((res (read))) + (if (eof-object? res) + (exit 0)) + (write-package (cdr res)) + (main-deps))) + + +(define (read-meta meta) + (with-input-from-file meta read)) + +(define (find-definition meta sym) + ;; cddr for + ;; (define sym definition ...) + ;; ^ + (cddr (find (lambda (a) + (and (pair? a) + (eq? (car a) 'define) + (eq? (cadr a) sym))) + meta))) + +(define (installed-libraries meta) + ;; cadar for + ;; ((quote ((chibi diff) (chibi diff-test)))) + ;; ^ + (cadar (find-definition meta 'installed-libraries))) + +(define (installed-assets meta) + (cadar (find-definition meta 'installed-assets))) + +(define (main-merge name version self-path . rest-paths) + (let* ((self (read-meta self-path)) + (metas (map read-meta (cons self-path rest-paths))) + (joined-libraries (append-map installed-libraries metas)) + (joined-assets (append-map installed-assets metas))) + (set-car! (find-definition self 'installed-libraries) + `',(delete-duplicates joined-libraries)) + (set-car! (find-definition self 'installed-assets) + `',(delete-duplicates joined-assets)) + (set-car! (find-definition self 'main-package-name) + `',name) + (set-car! (find-definition self 'main-package-version) + `',version) + self)) + +(case (string->symbol (cadr (command-line))) + ((deps) + (read) + (main-deps)) + ((merge) + (pretty-print (apply main-merge (cddr (command-line))))) + (else + (display "mode not found") + (newline))) + diff --git a/pkgs/tools/package-management/akku/setup-hook.sh b/pkgs/tools/package-management/akku/setup-hook.sh new file mode 100755 index 000000000000..0309475bb8ce --- /dev/null +++ b/pkgs/tools/package-management/akku/setup-hook.sh @@ -0,0 +1,32 @@ +_AKKU="SPDX-License-Identifier: MIT" +_AKKU="Copyright (c) The Akku.scm Developers" + +scheme_vars=' +CHEZSCHEMELIBDIRS +GUILE_LOAD_PATH +IKARUS_LIBRARY_PATH +MOSH_LOADPATH +PLTCOLLECTS +SAGITTARIUS_LOADPATH +VICARE_SOURCE_PATH +YPSILON_SITELIB +LARCENY_LIBPATH +IRONSCHEME_LIBRARY_PATH +LOKO_LIBRARY_PATH +DIGAMMA_SITELIB +CHIBI_MODULE_PATH +GAUCHE_LOAD_PATH +' + +addToAkkuEnv () { + adder="addToSearchPath" + for env_var in $scheme_vars; do + $adder $env_var "$1/lib/scheme-libs" + done + $adder GUILE_LOAD_COMPILED_PATH "$1/lib/libobj" + $adder LD_LIBRARY_PATH "$1/lib/ffi" + $adder DYLD_LIBRARY_PATH "$1/lib/ffi" +} + +addEnvHooks "$targetOffset" addToAkkuEnv + diff --git a/pkgs/tools/package-management/akku/update.sh b/pkgs/tools/package-management/akku/update.sh new file mode 100755 index 000000000000..0d7861f16e7a --- /dev/null +++ b/pkgs/tools/package-management/akku/update.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env nix-shell +#! nix-shell -I nixpkgs=../../../../ -i bash -p guile curl + +curl -sSf https://archive.akkuscm.org/archive/Akku-index.scm | guile parse-akku.scm deps > deps.toml diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index 4ecd812ddc2a..a4cd170e90e4 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation rec { - version = "2.8.5"; + version = "2.8.7"; pname = "clib"; src = fetchFromGitHub { rev = version; owner = "clibs"; repo = "clib"; - sha256 = "sha256-znvqxZWkQndxE6s36c77whUPc1UokrofTApFSIKFOtM="; + sha256 = "sha256-uL8prMk2DrYLjCmZW8DdbCg5FJ5uksT3vIATyOW2ZzY="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix index d9e33a82ed6e..3db0be269b8e 100644 --- a/pkgs/tools/package-management/comma/default.nix +++ b/pkgs/tools/package-management/comma/default.nix @@ -38,6 +38,6 @@ rustPlatform.buildRustPackage rec { description = "Runs programs without installing them"; license = licenses.mit; mainProgram = "comma"; - maintainers = with maintainers; [ Enzime artturin ]; + maintainers = with maintainers; [ artturin ]; }; } diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index d11bc0958994..e486f0b1300e 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall ant install - runHook postIntall + runHook postInstall ''; meta = { diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 1cc00581cb98..77d2da97dc65 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.37.1"; + version = "2.38.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-W32rjqPqMEZs7s9zi88CKm+OSVb6UKW6bEdykmOPJDw="; + hash = "sha256-enDzYXhqtQ3lNn8OFkffHpdxan0GsQvfE7ghGBTsQXo="; }; - vendorHash = "sha256-zHr9NdNFlScV6GsTzwH3vsAfuP3JsNTEi/JaJEdHOck="; + vendorHash = "sha256-LJM9F9NTAMvDwsaRvjnZyjKSI0AjZvVM4srOYuGLA7w="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index e07c21950b32..cea3fb099dce 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { longDescription = "An interactive Nix documentation tool providing a CLI for function search, a Nix plugin for docs in the REPL, and a ctags implementation for Nix script"; homepage = "https://github.com/lf-/nix-doc"; license = licenses.lgpl3Plus; - maintainers = [ maintainers.lf- ]; + maintainers = [ ]; platforms = platforms.unix; mainProgram = "nix-doc"; }; diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index a99f84716ee4..991ee6eb4271 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-update"; - version = "1.3.1"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - hash = "sha256-QWfW8tI4tk8hk9eNN6/3i2E4rwfIWgqjxj+htSZVdrc="; + hash = "sha256-gldeiq/R7EIvMZ3tkedSSumBour47LFrwDEiNS9tSSA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index f7b0dff33472..e98371a1e757 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -85,6 +85,7 @@ in # passthru tests , pkgsi686Linux +, runCommand }: let self = stdenv.mkDerivation { pname = "nix"; @@ -259,6 +260,21 @@ self = stdenv.mkDerivation { # Basic smoke test that needs to pass when upgrading nix. # Note that this test does only test the nixVersions.stable attribute. misc = nixosTests.nix-misc.default; + + srcVersion = runCommand "nix-src-version" { + inherit version; + } '' + # This file is an implementation detail, but it's a good sanity check + # If upstream changes that, we'll have to adapt. + srcVersion=$(cat ${src}/.version) + echo "Version in nix nix expression: $version" + echo "Version in nix.src: $srcVersion" + if [ "$version" != "$srcVersion" ]; then + echo "Version mismatch!" + exit 1 + fi + touch $out + ''; }; }; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 3290b0e71b61..499a1bc352af 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -177,13 +177,21 @@ in lib.makeExtensible (self: ({ }; nix_2_23 = common { - version = "2.23.1"; - hash = "sha256-US+UsPhFeYoJH0ncjERRtVD1U20JtVtjsG+xhZqr/nY="; + version = "2.23.2"; + hash = "sha256-NH1G4GGHXU4pnQWI9X/gs7r97GO0i4tJFjoaIxl0FaQ="; self_attribute_name = "nix_2_23"; + patches = [ + # fixes regression in nix-prefetch-url + # https://github.com/NixOS/nix/pull/11052 + (fetchpatch { + url = "https://github.com/NixOS/nix/commit/73f3179954ef8db5c8774c79272dd1215fe6f5c2.patch"; + sha256 = "sha256-d/rBOONZGxOFRUPltH7z0OSYRqKbS/ZwZl/DaIXygC0="; + }) + ]; }; git = common rec { - version = "2.23.1"; + version = "2.24.0"; suffix = "pre20240627_${lib.substring 0 8 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix index 3c27faaaf3a2..71f1653dbdee 100644 --- a/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/pkgs/tools/package-management/poetry/unwrapped.nix @@ -54,6 +54,11 @@ buildPythonPackage rec { installShellFiles ]; + pythonRelaxDeps = [ + "dulwich" + "keyring" + ]; + propagatedBuildInputs = [ build cachecontrol diff --git a/pkgs/tools/security/amoco/default.nix b/pkgs/tools/security/amoco/default.nix index c78cc8a60576..d3c687bcc8ee 100644 --- a/pkgs/tools/security/amoco/default.nix +++ b/pkgs/tools/security/amoco/default.nix @@ -16,7 +16,6 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix deleted file mode 100644 index 3091a8c91554..000000000000 --- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, imagemagick, qrencode -, testQR ? false, zbar ? null -}: - -assert testQR -> zbar != false; - -stdenv.mkDerivation { - pname = "asc-key-to-qr-code-gif"; - version = "20180613"; - - src = fetchFromGitHub { - owner = "yishilin14"; - repo = "asc-key-to-qr-code-gif"; - rev = "5b7b239a0089a5269444cbe8a651c99dd43dce3f"; - sha256 = "0yrc302a2fhbzryb10718ky4fymfcps3lk67ivis1qab5kbp6z8r"; - }; - - dontBuild = true; - dontStrip = true; - dontPatchELF = true; - - preInstall = let - substitutions = [ - ''--replace "convert" "${imagemagick}/bin/convert"'' - ''--replace "qrencode" "${qrencode.bin}/bin/qrencode"'' - ] ++ lib.optionals testQR [ - ''--replace "hash zbarimg" "true"'' # hash does not work on NixOS - ''--replace "$(zbarimg --raw" "$(${zbar.out}/bin/zbarimg --raw"'' - ]; - in '' - substituteInPlace asc-to-gif.sh ${lib.concatStringsSep " " substitutions} - ''; - - installPhase = '' - mkdir -p $out/bin - cp * $out/bin/ - ''; - - meta = with lib; { - homepage = "https://github.com/yishilin14/asc-key-to-qr-code-gif"; - description = "Convert ASCII-armored PGP keys to animated QR code"; - mainProgram = "asc-to-gif.sh"; - platforms = platforms.unix; - maintainers = with maintainers; [ asymmetric ]; - }; -} diff --git a/pkgs/tools/security/beyond-identity/default.nix b/pkgs/tools/security/beyond-identity/default.nix index 4d535cbb89e1..229d61be1d8a 100644 --- a/pkgs/tools/security/beyond-identity/default.nix +++ b/pkgs/tools/security/beyond-identity/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchurl, dpkg, buildFHSEnv , glibc, glib, openssl, tpm2-tss -, gtk3, gnome, polkit, polkit_gnome +, gtk3, gnome-keyring, polkit, polkit_gnome }: let pname = "beyond-identity"; version = "2.97.0-0"; - libPath = lib.makeLibraryPath ([ glib glibc openssl tpm2-tss gtk3 gnome.gnome-keyring polkit polkit_gnome ]); + libPath = lib.makeLibraryPath ([ glib glibc openssl tpm2-tss gtk3 gnome-keyring polkit polkit_gnome ]); meta = with lib; { description = "Passwordless MFA identities for workforces, customers, and developers"; homepage = "https://www.beyondidentity.com"; downloadPage = "https://app.byndid.com/downloads"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ klden ]; + maintainers = with maintainers; [ klden hornwall ]; platforms = [ "x86_64-linux" ]; }; @@ -73,7 +73,7 @@ in buildFHSEnv { targetPkgs = pkgs: [ beyond-identity glib glibc openssl tpm2-tss - gtk3 gnome.gnome-keyring + gtk3 gnome-keyring polkit polkit_gnome ]; diff --git a/pkgs/tools/security/cariddi/default.nix b/pkgs/tools/security/cariddi/default.nix index b4e07a622c24..acada9b12567 100644 --- a/pkgs/tools/security/cariddi/default.nix +++ b/pkgs/tools/security/cariddi/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cariddi"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "edoardottt"; repo = "cariddi"; rev = "refs/tags/v${version}"; - hash = "sha256-Hgz+/DEoCo4lxcFkawQgIc3ct7cc2NwpAnfBtZQruf0="; + hash = "sha256-mRrUTRknax3b4hs3frQMzg0GyB3WjMDZJk0RQSAC88U="; }; - vendorHash = "sha256-GgJyYDnlaFybf3Gu1gVcA12HkA0yUIjYEFj0G83GVGQ="; + vendorHash = "sha256-ML1aLbrYhs2IxnN2ywKFOpvAV6yuYb8GI+dtoxwJl4A="; ldflags = [ "-w" diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index a1c9f9484981..d835d416c8b2 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -25,7 +25,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/tools/security/chainsaw/default.nix b/pkgs/tools/security/chainsaw/default.nix index fc1e773ce9aa..a298b3f26ba7 100644 --- a/pkgs/tools/security/chainsaw/default.nix +++ b/pkgs/tools/security/chainsaw/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "chainsaw"; - version = "2.9.1"; + version = "2.9.1-2"; src = fetchFromGitHub { owner = "WithSecureLabs"; repo = "chainsaw"; rev = "refs/tags/v${version}"; - hash = "sha256-9UmyHf2aH6ODGEbsDBBD8pLRkRtOpc9HGKp9UV7mk0o="; + hash = "sha256-daedJZnWq9UnMDY9P9npngfFbGsv5MSDP4Ep/Pr++ek="; }; - cargoHash = "sha256-f4EDtRFjRU62Nuzaq5EbL+/sCKyMMgSOu6MaFsuAFec="; + cargoHash = "sha256-eSpyh8wnZWU5rY6qhKtxQUFkhkZXzIB2ycPab9LC+OA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 689719237ed2..304b10ca8abb 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -23,6 +23,11 @@ python3.pkgs.buildPythonApplication rec { patches = lib.optionals withDriver [ ./ko-path.diff ./compile-ko.diff ]; + postPatch = '' + substituteInPlace tests/software/util.py \ + --replace-fail "assertRegexpMatches" "assertRegex" + ''; + KSRC = lib.optionalString withDriver "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; nativeBuildInputs = [ diff --git a/pkgs/tools/security/cloudfox/default.nix b/pkgs/tools/security/cloudfox/default.nix index 97816db4c8c6..6cc3b95bf86b 100644 --- a/pkgs/tools/security/cloudfox/default.nix +++ b/pkgs/tools/security/cloudfox/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cloudfox"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "BishopFox"; repo = "cloudfox"; rev = "refs/tags/v${version}"; - hash = "sha256-vh7U66od+i1kmTtpHZ1tuMPTl0AnXoYUKMU16ZgxFBQ="; + hash = "sha256-4LOKCdnNiJdnLsCsoME5CZSFog5W+8IA7HwTe+QfHGY="; }; vendorHash = "sha256-2+UiaU4S64afH8Y8uz5ZclO5NxTi4YlUZ87ZN1MnLj0="; diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index 357f097a158d..72ceb4fca000 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.10.0"; + version = "11.11.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "refs/tags/v${version}"; - hash = "sha256-t8TuFjNpsVE5Xq3EloUAJH8ZqiCbZlIm9yzWTGr+E98="; + hash = "sha256-G2mVr0TB5BBzBdo4YcE3gH2jU9iZ9UuTgrYlqsEhQXs="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-npnZ/eTfA6GVga6p9XKMMU6YbECN657QMMEQA/pgLfc="; + vendorHash = "sha256-aXt/Ehh1G9k0rYGOrdbpddVB4faGTkOy0zWSz2X8BtI="; ldflags = [ "-w" diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 7f686fb37bca..082b66f3afb3 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.10.0"; + version = "11.11.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-tV7QDa7XSkr+HwegOwEnOjtn1IrLhE0PfrhjjRz0JbM="; + hash = "sha256-3cjtWdBovnRHFUS9TAPkGbg+XocgkkgJFfkljkyjqUg="; }; proxyVendor = true; - vendorHash = "sha256-KS+fuoLFueI5cHQLiM1g6Qxq4UFKNVGauvchx2aP+RY="; + vendorHash = "sha256-9N1v2i2Cxs7t1d2eI9NQOOqlmc9evV15HH12HZ0gr4U="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/tools/security/coercer/default.nix b/pkgs/tools/security/coercer/default.nix index e0d921e62e2d..c2e8ee3dfe21 100644 --- a/pkgs/tools/security/coercer/default.nix +++ b/pkgs/tools/security/coercer/default.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/tools/security/crackmapexec/default.nix b/pkgs/tools/security/crackmapexec/default.nix index 7db3c804f911..0a72fdff89aa 100644 --- a/pkgs/tools/security/crackmapexec/default.nix +++ b/pkgs/tools/security/crackmapexec/default.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/crackql/default.nix b/pkgs/tools/security/crackql/default.nix index cb3ecc1cb0a7..121ed522afae 100644 --- a/pkgs/tools/security/crackql/default.nix +++ b/pkgs/tools/security/crackql/default.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index cac3717625e4..597c34bf9ae2 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -14,17 +14,17 @@ in assert stdenv.isLinux; # better than `called with unexpected argument 'enableJavaFX'` mavenJdk.buildMavenPackage rec { pname = "cryptomator"; - version = "1.12.4"; + version = "1.13.0"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - hash = "sha256-i5TrWXOkRR+1iqSzMTJEe5xMJ3iM5kdI3fXb/Z5/Gb0="; + hash = "sha256-aKj8/yQzNWWV2m+sF2Or59OyPMiBqPeXEHn88w2VUkU="; }; mvnParameters = "-Dmaven.test.skip=true -Plinux"; - mvnHash = "sha256-Zx2HhgmebF8UOp+2JKl2+FGA98aPRSUTIduHPTtgAjI="; + mvnHash = "sha256-bZGTYkxRXgjGoxAdVkgiZZgVSghKz3Mq9pCBdivMNPQ="; preBuild = '' VERSION=${version} diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 7ef13bce4307..20582a6d5c6b 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -18,7 +18,6 @@ let # used of both wrappers and libpath libPath = lib.makeLibraryPath (with xorg; [ - mesa.drivers libGLU libGL fontconfig freetype diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/tools/security/expliot/default.nix index 88fd1cf84b61..9a23087aa10d 100644 --- a/pkgs/tools/security/expliot/default.nix +++ b/pkgs/tools/security/expliot/default.nix @@ -40,7 +40,6 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index c74c2aa6b05a..e2d9842ca4f2 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-06-27"; + version = "2024-07-02"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-8TYraSY6dA7Q9CE9sTjfteNzrVIc6CuMPD6umOmAoHk="; + hash = "sha256-lgnuUsIbRDtI5/KA9EBJxNfDTel/1+7VjLLMAoB0il0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 7526c21d6811..49f741617de3 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "fail2ban"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "fail2ban"; repo = "fail2ban"; rev = version; - hash = "sha256-Zd8zLkFlvXTbeInEkNFyHgcAiOsX4WwF6hf5juSQvbY="; + hash = "sha256-0xPNhbu6/p/cbHOr5Y+PXbMbt5q/S13S5100ZZSdylE="; }; outputs = [ "out" "man" ]; @@ -22,12 +22,12 @@ python3.pkgs.buildPythonApplication rec { lib.optionals stdenv.isLinux [ systemd pyinotify + + # https://github.com/fail2ban/fail2ban/issues/3787, remove it in the next release + setuptools ]; preConfigure = '' - patchShebangs fail2ban-2to3 - ./fail2ban-2to3 - for i in config/action.d/sendmail*.conf; do substituteInPlace $i \ --replace /usr/sbin/sendmail sendmail diff --git a/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/pkgs/tools/security/faraday-agent-dispatcher/default.nix index ad451c076d0d..be6b1d9a72fc 100644 --- a/pkgs/tools/security/faraday-agent-dispatcher/default.nix +++ b/pkgs/tools/security/faraday-agent-dispatcher/default.nix @@ -29,7 +29,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 3e651f593f45..0c6ce83a5796 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitLab -, fetchpatch , pkg-config , gobject-introspection , meson @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { pname = "fprintd"; - version = "1.94.2"; + version = "1.94.3"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -32,17 +31,9 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ePhcIZyXoGr8XlBuzKjpibU9D/44iCXYBlpVR9gcswQ="; + sha256 = "sha256-shH+ctQAx4fpTMWTmo3wB45ZS38Jf8RknryPabfZ6QE="; }; - patches = [ - # backport upstream patch fixing tests - (fetchpatch { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ae04fa989720279e5558c3b8ff9ebe1959b1cf36.patch"; - sha256 = "sha256-jW5vlzrbZQ1gUDLBf7G50GnZfZxhlnL2Eu+9Bghdwdw="; - }) - ]; - nativeBuildInputs = [ pkg-config meson diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/tools/security/gallia/default.nix index be66306c331b..2f8c6da988c0 100644 --- a/pkgs/tools/security/gallia/default.nix +++ b/pkgs/tools/security/gallia/default.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ aiofiles diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix index 22e3921be7bc..1b874921cce7 100644 --- a/pkgs/tools/security/ggshield/default.nix +++ b/pkgs/tools/security/ggshield/default.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ setuptools ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ appdirs diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 2a3bb65f8a79..3c739602514c 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -164,6 +164,7 @@ stdenv.mkDerivation (finalAttrs: { genericName = "Ghidra Software Reverse Engineering Suite"; categories = [ "Development" ]; terminal = false; + startupWMClass = "ghidra-Ghidra"; }) ]; diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 2788fe15974e..fc9b4d2853dc 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -20,6 +20,8 @@ let desktopName = "Ghidra"; genericName = "Ghidra Software Reverse Engineering Suite"; categories = [ "Development" ]; + terminal = false; + startupWMClass = "ghidra-Ghidra"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 59e7bcc13d66..475545526d37 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-libassuan-prefix=${libassuan.dev}" "--with-ksba-prefix=${libksba.dev}" - "--with-npth-prefix=${npth}" + "GPGRT_CONFIG=${lib.getDev libgpg-error}/bin/gpgrt-config" ] ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentry.binaryPath or "bin/pinentry"}" ++ lib.optional stdenv.isDarwin "--disable-ccid-driver"; diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index 92a741167782..54d196c59764 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -6,22 +6,22 @@ }: buildGoModule rec { - pname = "gotrue"; - version = "2.105.0"; + pname = "auth"; + version = "2.155.1"; src = fetchFromGitHub { owner = "supabase"; - repo = pname; + repo = "auth"; rev = "v${version}"; - hash = "sha256-6tFXuVBd7UptoVMSse1Pk9ok6XyGL994pfFkFTyc5I0="; + hash = "sha256-W2hJw/cn6Ss5LBBIJ7q0t5wbEHJ7WaGGvxrfRQ84Y8A="; }; - vendorHash = "sha256-cwTwze8WuhL5exaY5HJYDgcxNB9O1QuFpJgZmj6R838="; + vendorHash = "sha256-qL1uHUNw0QqAswnP2E2UrdJKao9ow8HHVWPK010LVgI="; ldflags = [ "-s" "-w" - "-X github.com/supabase/gotrue/internal/utilities.Version=${version}" + "-X github.com/supabase/auth/internal/utilities.Version=${version}" ]; # integration tests require network to connect to postgres database @@ -29,15 +29,15 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = gotrue-supabase; - command = "gotrue version"; + command = "auth version"; inherit version; }; meta = with lib; { - homepage = "https://github.com/supabase/gotrue"; + homepage = "https://github.com/supabase/auth"; description = "JWT based API for managing users and issuing JWT tokens"; - mainProgram = "gotrue"; - changelog = "https://github.com/supabase/gotrue/releases/tag/v${version}"; + mainProgram = "auth"; + changelog = "https://github.com/supabase/auth/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ urandom ]; }; diff --git a/pkgs/tools/security/ioccheck/default.nix b/pkgs/tools/security/ioccheck/default.nix index 3f899c33b557..2637fea90528 100644 --- a/pkgs/tools/security/ioccheck/default.nix +++ b/pkgs/tools/security/ioccheck/default.nix @@ -46,7 +46,6 @@ in py.pkgs.buildPythonApplication rec { nativeBuildInputs = with py.pkgs; [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/tools/security/jd-cli/default.nix b/pkgs/tools/security/jd-cli/default.nix index 10fa31a706c1..d99c1e687ac3 100644 --- a/pkgs/tools/security/jd-cli/default.nix +++ b/pkgs/tools/security/jd-cli/default.nix @@ -11,7 +11,9 @@ maven.buildMavenPackage rec { hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q="; }; - mvnHash = "sha256-yqMAEjaNHxm/c/cbApiMjkN7V6Gx/crs1LPbD0k0cgk="; + mvnHash = "sha256-lEcAq0H8Uacv02ItjVGfxvtRip5206HtpREBrQDzBDo="; + + mvnParameters = "-DskipTests"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/kdigger/default.nix b/pkgs/tools/security/kdigger/default.nix index a4f565bb791b..b73b62eeda27 100644 --- a/pkgs/tools/security/kdigger/default.nix +++ b/pkgs/tools/security/kdigger/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kdigger"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "quarkslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/F1wmP1hfhrAmx2jJtAn02LkTabi0RJu36T/oW3tyZw="; + sha256 = "sha256-hpLhtTENtOBQjm+CZRAcx1BG9831JUFIsLL57wZIrso="; # 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 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-rDJFowbOj77n/sBoDgFEF+2PgghxufvIgzbMqrHehws="; + vendorHash = "sha256-kMoTkrDuAJmgWAj7+V3a8VEYpPbTv3UdLscTdkpzud0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/kestrel/default.nix b/pkgs/tools/security/kestrel/default.nix index 329a31447daa..26045accca44 100644 --- a/pkgs/tools/security/kestrel/default.nix +++ b/pkgs/tools/security/kestrel/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "kestrel"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "finfet"; repo = pname; rev = "v${version}"; - hash = "sha256-aj8c4Hagdqoi7Q/AM0drjyrGOvqrT35sEjc2TC0ei6M="; + hash = "sha256-bKQBOk9yUqgnufRyyqXatsRHpesbM49rAkz0dD5XE80="; }; - cargoHash = "sha256-D3yGIZr6/jaySacdz0yOPQUpKsuYlgBGx0V/4lXuVuw="; + cargoHash = "sha256-R5TRF4yvjQalsj1UA2kiLBuTOhqIbbHW6lvf1ixvJG4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 6f77eab11323..0b575daa629b 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -1,11 +1,11 @@ { stdenv, substituteAll, lib, buildGoModule, fetchFromGitHub -, AVFoundation, AudioToolbox, ImageIO, CoreMedia +, AppKit, AVFoundation, AudioToolbox, ImageIO, CoreMedia , Foundation, CoreGraphics, MediaToolbox, gnupg }: buildGoModule rec { pname = "keybase"; - version = "6.2.8"; + version = "6.3.1"; modRoot = "go"; subPackages = [ "kbnm" "keybase" ]; @@ -16,9 +16,9 @@ buildGoModule rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - hash = "sha256-k/AMJNXS/gabJMjXdrQltxxc1Bez4VIR/l8RXXpiPWw="; + hash = "sha256-kmKqVtHS0DaVa0of+QEUc2aEhWP1dNmzb/L01zaIoe8="; }; - vendorHash = "sha256-DNTJtgZ2jDuEu4XqxbPTHLh+NR0vU2hcNNcD4amIDk4="; + vendorHash = "sha256-KHahkGzkXr6xp0XY9MyEeeiHnmphaNYi9dPBQ476+us="; patches = [ (substituteAll { @@ -28,7 +28,7 @@ buildGoModule rec { }) ]; - buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; + buildInputs = lib.optionals stdenv.isDarwin [ AppKit AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; tags = [ "production" ]; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/security/knockpy/default.nix b/pkgs/tools/security/knockpy/default.nix index 3f503ec6c44a..57b653035725 100644 --- a/pkgs/tools/security/knockpy/default.nix +++ b/pkgs/tools/security/knockpy/default.nix @@ -24,9 +24,9 @@ python3.pkgs.buildPythonApplication rec { "tqdm" ]; - build-system = with python3.pkgs; [ setuptools ]; - - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; + build-system = with python3.pkgs; [ + setuptools + ]; dependencies = with python3.pkgs; [ beautifulsoup4 diff --git a/pkgs/tools/security/knowsmore/default.nix b/pkgs/tools/security/knowsmore/default.nix index 4c460eabcbe5..c3df59cf141f 100644 --- a/pkgs/tools/security/knowsmore/default.nix +++ b/pkgs/tools/security/knowsmore/default.nix @@ -25,7 +25,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ setuptools ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ aioconsole diff --git a/pkgs/tools/security/kube-bench/default.nix b/pkgs/tools/security/kube-bench/default.nix index 7fb9288b731b..b6ecf84f835b 100644 --- a/pkgs/tools/security/kube-bench/default.nix +++ b/pkgs/tools/security/kube-bench/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BS/jJbseLcWtK9BX7ZbVokSrboUaaTCIr4cwpixl1QI="; + hash = "sha256-vP/BK3hOBrEAPrg+Bltg0GdyvAQyUffEtXoK3B3CEjs="; }; vendorHash = "sha256-bq8nz4i40xd4O6/r2ZiUyAEKxmsoLCNKctqRV/GPQEU="; diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index d4827d0f5961..6d147eab6d73 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "kubescape"; - version = "3.0.11"; + version = "3.0.13"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; rev = "refs/tags/v${version}"; - hash = "sha256-hxHVQ8Ssvwq5lk+b7v1kLrYeGSfJEj/FudSd0V3tUnQ="; + hash = "sha256-s0BaPIGMP8PbVv14e0U+tWKUFUVohAndaI5pLoMdALM="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-JWpviZqegrIUIOtGG6yvDGxq30TUw+fZcqCJevYqxvY"; + vendorHash = "sha256-1IpgtFm7P6IKoXWLkZ4RQMbk93lSfo1jayIGVChjtjA="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index 098b811eb3f8..5bb73911f0f9 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -25,7 +25,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ cython - pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/tools/security/maigret/default.nix b/pkgs/tools/security/maigret/default.nix index f2d706bfe510..cdbf6df4dd0f 100644 --- a/pkgs/tools/security/maigret/default.nix +++ b/pkgs/tools/security/maigret/default.nix @@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec { }) ]; - nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ aiodns diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 125546793296..e96d4350d251 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.15" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.16" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index f8839316b6a1..548118f22da0 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: b4a408704631fd0a0a4587f1f1a0017bcec9fb45 - ref: refs/tags/6.4.15 + revision: d21ca8b456e74278a0149a34ced9292692b5c52d + ref: refs/tags/6.4.16 specs: - metasploit-framework (6.4.15) + metasploit-framework (6.4.16) aarch64 abbrev actionpack (~> 7.0.0) @@ -51,6 +51,7 @@ GIT nessus_rest net-imap net-ldap + net-sftp net-smtp net-ssh network_interface @@ -297,6 +298,8 @@ GEM net-ldap (0.19.0) net-protocol (0.2.2) timeout + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) net-smtp (0.5.0) net-protocol net-ssh (7.2.3) @@ -481,4 +484,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.5.9 + 2.5.11 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 6bd3bf152e58..f73cfe86b63a 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.15"; + version = "6.4.16"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-CJXti/pX2Q59fJgRbAodUDMlMHIJH0eh3kOZxrQEllY="; + hash = "sha256-dCeSSxIIDMsEa6hQ43tcoRDMLkE3o+UzwsGOWE7jUPA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index c1918985810b..c1b2f3484aa7 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -724,12 +724,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "b4a408704631fd0a0a4587f1f1a0017bcec9fb45"; - sha256 = "0mln0jscd6a3vshlf7q9f8q2acsh3l56q4cqgiyhxnapza5yv588"; + rev = "d21ca8b456e74278a0149a34ced9292692b5c52d"; + sha256 = "1w2hwd75i3n1q8ryb8rp84pcq451bixy6l58dc2cn308295r49vl"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.15"; + version = "6.4.16"; }; metasploit-model = { groups = ["default"]; @@ -891,6 +891,16 @@ }; version = "0.2.2"; }; + net-sftp = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r33aa2d61hv1psm0l0mm6ik3ycsnq8symv7h84kpyf2b7493fv5"; + type = "gem"; + }; + version = "4.0.0"; + }; net-smtp = { groups = ["default"]; platforms = []; diff --git a/pkgs/tools/security/mitmproxy2swagger/default.nix b/pkgs/tools/security/mitmproxy2swagger/default.nix index 0c940692f9e8..6731d7c21c53 100644 --- a/pkgs/tools/security/mitmproxy2swagger/default.nix +++ b/pkgs/tools/security/mitmproxy2swagger/default.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/tools/security/netexec/default.nix b/pkgs/tools/security/netexec/default.nix index 625cd3974252..3ac0eebda954 100644 --- a/pkgs/tools/security/netexec/default.nix +++ b/pkgs/tools/security/netexec/default.nix @@ -48,7 +48,6 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = with python.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/tools/security/onlykey-agent/default.nix b/pkgs/tools/security/onlykey-agent/default.nix index 36a1cb284759..f37073d602da 100644 --- a/pkgs/tools/security/onlykey-agent/default.nix +++ b/pkgs/tools/security/onlykey-agent/default.nix @@ -26,6 +26,7 @@ let propagatedBuildInputs = oa.propagatedBuildInputs or [ ] ++ [ bech32 cryptography + cython docutils pycryptodome pynacl diff --git a/pkgs/tools/security/ospd-openvas/default.nix b/pkgs/tools/security/ospd-openvas/default.nix index f047958c2492..a889f0168924 100644 --- a/pkgs/tools/security/ospd-openvas/default.nix +++ b/pkgs/tools/security/ospd-openvas/default.nix @@ -17,14 +17,14 @@ python3.pkgs.buildPythonApplication rec { }; pythonRelaxDeps = [ + "defusedxml" "packaging" + "psutil" "python-gnupg" ]; build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; - propagatedBuildInputs = with python3.pkgs; [ defusedxml deprecated diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index bd2cdbfbbbab..4e2ad4b53c9a 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation { homepage = "https://github.com/carnager/rofi-pass"; license = lib.licenses.gpl3; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ lilyinstarlight ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index bdbbd55e9607..faf96b7263b4 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -68,11 +68,11 @@ let in pinentryMkDerivation rec { pname = "pinentry-${pinentryExtraPname}"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://gnupg/pinentry/pinentry-${version}.tar.bz2"; - hash = "sha256-mzzVIm51l/L97TmaO8ZZkjNRU2VZ6dsIJpgbyjFklN4="; + hash = "sha256-vHLuJ8cjkAerGJbDwvrlOwduLJvSSD3CdpoWkCvOjAQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index c01704d0add6..b2325c0a9a69 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -19,7 +19,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ setuptools ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ androguard diff --git a/pkgs/tools/security/semgrep/default.nix b/pkgs/tools/security/semgrep/default.nix index 13307d310102..5baf13c2b833 100644 --- a/pkgs/tools/security/semgrep/default.nix +++ b/pkgs/tools/security/semgrep/default.nix @@ -3,7 +3,6 @@ , semgrep-core , buildPythonApplication , pythonPackages -, pythonRelaxDepsHook , pytestCheckHook , git @@ -42,7 +41,6 @@ buildPythonApplication rec { cd cli ''; - nativeBuildInputs = [ pythonRelaxDepsHook ]; # tell cli/setup.py to not copy semgrep-core into the result # this means we can share a copy of semgrep-core and avoid an issue where it # copies the binary but doesn't retain the executable bit diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index f2854b680dd4..2918343d1373 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "1.0.2"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "SigmaHQ"; repo = "sigma-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-/Nciqf8O/Sq2zniaKid1VkYC/H6hgsVzMtOtFy/CiR8="; + hash = "sha256-bBKNKgS3V/sZ8lZMk2ZwTzOVaVecSR9GhNP2FNkWbw0="; }; postPatch = '' diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 6ececc3613d3..3ca39e21c2bc 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -1,24 +1,26 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nix-update-script }: buildGoModule rec { pname = "sops"; - version = "3.8.1"; + version = "3.9.0"; src = fetchFromGitHub { owner = "getsops"; repo = pname; rev = "v${version}"; - hash = "sha256-4K09wLV1+TvYTtvha6YyGhjlhEldWL1eVazNwcEhi3Q="; + hash = "sha256-Q1e3iRIne9/bCLxKdhzP3vt3oxuHJAuG273HdeHZ3so="; }; - vendorHash = "sha256-iRgLspYhwSVuL0yarPdjXCKfjK7TGDZeQCOcIYtNvzA="; + vendorHash = "sha256-3vzKQZTg38/UGVJ/M1jLALCgor7wztsLKVuMqY3adtI="; subPackages = [ "cmd/sops" ]; ldflags = [ "-s" "-w" "-X github.com/getsops/sops/v3/version.Version=${version}" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { - homepage = "https://github.com/getsops/sops"; + homepage = "https://getsops.io/"; description = "Simple and flexible tool for managing secrets"; changelog = "https://github.com/getsops/sops/blob/v${version}/CHANGELOG.rst"; mainProgram = "sops"; diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index 82e4d3624d1e..477b47057ee4 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.9.6"; + version = "1.10.0"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wubrZJBPLA83VB57UVKLuh2cmyXHouwN4BVPiHFl+1s="; + sha256 = "sha256-4S+Pko8uMZmVVB5vjG6Y1mBB3RFtwBBrH2T6FPrss9s="; }; - vendorHash = "sha256-tx0zIr9rXuOvt+77Sp6dIdtN21fDX5FdnTxGpHWo7+A="; + vendorHash = "sha256-U8JGj1hsV0ySREcWZeA243FO/8VPSZ1KUIsVrw1P5H0="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix index 5392f0c8a8c4..4cf19ea2dafe 100644 --- a/pkgs/tools/security/ssh-to-age/default.nix +++ b/pkgs/tools/security/ssh-to-age/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-age"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-age"; rev = version; - sha256 = "sha256-NHNjBMK4eJZSZMOg75VmpD6mVQaRJbk5GoJST9W6j4w="; + sha256 = "sha256-wGtNaejzAOgOuYDEKz6xMCaoaHsiDuQZj0KKpcejphE="; }; - vendorHash = "sha256-JpZ+cdDQ3yfH0EAyzi3HO7bozGYJgCYFf2KO/lXwCf8="; + vendorHash = "sha256-w/REcFeH58DTQwgotxSBVR4y7aQ9rBDX2U0A4vJno7s="; checkPhase = '' runHook preCheck diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 948297df707b..c5dcc5f864a0 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.sudo.ws/"; # From https://www.sudo.ws/about/license/ license = with licenses; [ sudo bsd2 bsd3 zlib ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ rhendric ]; platforms = platforms.linux ++ platforms.freebsd; mainProgram = "sudo"; }; diff --git a/pkgs/tools/security/tell-me-your-secrets/default.nix b/pkgs/tools/security/tell-me-your-secrets/default.nix index 1d723aae52df..30bd9d48fd23 100644 --- a/pkgs/tools/security/tell-me-your-secrets/default.nix +++ b/pkgs/tools/security/tell-me-your-secrets/default.nix @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/trueseeing/default.nix b/pkgs/tools/security/trueseeing/default.nix index e5d89ab3ac0c..c80abb6c3164 100644 --- a/pkgs/tools/security/trueseeing/default.nix +++ b/pkgs/tools/security/trueseeing/default.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ flit-core - pythonRelaxDepsHook ]; pythonRelaxDeps = true; diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index 1ddfbb703b96..77be8d9d5358 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ setuptools ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; diff --git a/pkgs/tools/security/yaralyzer/default.nix b/pkgs/tools/security/yaralyzer/default.nix index 47b5576e7bec..9854a696ac99 100644 --- a/pkgs/tools/security/yaralyzer/default.nix +++ b/pkgs/tools/security/yaralyzer/default.nix @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/tools/system/amdgpu_top/Cargo.lock b/pkgs/tools/system/amdgpu_top/Cargo.lock index 19c171f752e2..98e9ae36636b 100644 --- a/pkgs/tools/system/amdgpu_top/Cargo.lock +++ b/pkgs/tools/system/amdgpu_top/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.24" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e08104bebc65a46f8bc7aa733d39ea6874bfa7156f41a46b805785e3af1587d" +checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -59,13 +59,13 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "amdgpu_top" -version = "0.8.2" +version = "0.8.5" dependencies = [ "amdgpu_top_gui", "amdgpu_top_json", @@ -77,7 +77,7 @@ dependencies = [ [[package]] name = "amdgpu_top_gui" -version = "0.8.2" +version = "0.8.5" dependencies = [ "eframe", "egui_plot", @@ -90,7 +90,7 @@ dependencies = [ [[package]] name = "amdgpu_top_json" -version = "0.8.2" +version = "0.8.5" dependencies = [ "libamdgpu_top", "serde_json", @@ -98,7 +98,7 @@ dependencies = [ [[package]] name = "amdgpu_top_tui" -version = "0.8.2" +version = "0.8.5" dependencies = [ "cursive", "libamdgpu_top", @@ -142,23 +142,22 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" -version = "3.3.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" dependencies = [ "clipboard-win", "log", - "objc", - "objc-foundation", - "objc_id", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", "parking_lot", - "thiserror", "x11rb", ] @@ -197,9 +196,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "base64" @@ -268,7 +267,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" dependencies = [ "block-sys", - "objc2", + "objc2 0.4.1", +] + +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2 0.5.2", ] [[package]] @@ -290,22 +298,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -348,12 +356,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.92" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -385,18 +394,18 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" +checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" dependencies = [ "error-code", ] [[package]] name = "clru" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807" +checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59" [[package]] name = "cocoa" @@ -487,9 +496,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -545,27 +554,27 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" @@ -649,9 +658,9 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -659,26 +668,26 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -748,7 +757,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -815,7 +824,7 @@ dependencies = [ "parking_lot", "percent-encoding", "raw-window-handle 0.5.2", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.2", "ron", "serde", "static_assertions", @@ -855,7 +864,7 @@ dependencies = [ "epaint", "log", "thiserror", - "type-map 0.5.0", + "type-map", "web-time", "wgpu", "winit", @@ -870,7 +879,7 @@ dependencies = [ "arboard", "egui", "log", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.2", "serde", "smithay-clipboard", "web-time", @@ -930,7 +939,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -941,7 +950,7 @@ checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -962,7 +971,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -990,9 +999,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1012,9 +1021,9 @@ checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1036,9 +1045,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1046,9 +1055,9 @@ dependencies = [ [[package]] name = "fluent" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +checksum = "bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a" dependencies = [ "fluent-bundle", "unic-langid", @@ -1056,9 +1065,9 @@ dependencies = [ [[package]] name = "fluent-bundle" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493" dependencies = [ "fluent-langneg", "fluent-syntax", @@ -1081,9 +1090,9 @@ dependencies = [ [[package]] name = "fluent-syntax" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" dependencies = [ "thiserror", ] @@ -1112,7 +1121,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -1152,9 +1161,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -1203,16 +1212,16 @@ dependencies = [ [[package]] name = "gix-actor" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3a3bde455ad2ee8ba8a195745241ce0b770a8a26faae59fcf409d01b28c46" +checksum = "d69c59d392c7e6c94385b6fd6089d6df0fe945f32b4357687989f3aee253cd7f" dependencies = [ "bstr", "gix-date", "gix-utils", "itoa", "thiserror", - "winnow 0.6.5", + "winnow 0.6.9", ] [[package]] @@ -1240,9 +1249,9 @@ dependencies = [ [[package]] name = "gix-config" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62129c75e4b6229fe15fb9838cdc00c655e87105b651e4edd7c183fc5288b5d1" +checksum = "7580e05996e893347ad04e1eaceb92e1c0e6a3ffe517171af99bf6b6df0ca6e5" dependencies = [ "bstr", "gix-config-value", @@ -1256,7 +1265,7 @@ dependencies = [ "smallvec", "thiserror", "unicode-bom", - "winnow 0.6.5", + "winnow 0.6.9", ] [[package]] @@ -1274,9 +1283,9 @@ dependencies = [ [[package]] name = "gix-date" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180b130a4a41870edfbd36ce4169c7090bca70e195da783dea088dd973daa59c" +checksum = "367ee9093b0c2b04fd04c5c7c8b6a1082713534eab537597ae343663a518fa99" dependencies = [ "bstr", "itoa", @@ -1314,9 +1323,9 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.38.1" +version = "0.38.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4254037d20a247a0367aa79333750146a369719f0c6617fec4f5752cc62b37" +checksum = "ac7045ac9fe5f9c727f38799d002a7ed3583cd777e3322a7c4b43e3cf437dc69" dependencies = [ "crc32fast", "flate2", @@ -1333,9 +1342,9 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634b8a743b0aae03c1a74ee0ea24e8c5136895efac64ce52b3ea106e1c6f0613" +checksum = "e2184c40e7910529677831c8b481acf788ffd92427ed21fad65b6aa637e631b8" dependencies = [ "gix-features", "gix-utils", @@ -1343,9 +1352,9 @@ dependencies = [ [[package]] name = "gix-glob" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "682bdc43cb3c00dbedfcc366de2a849b582efd8d886215dbad2ea662ec156bb5" +checksum = "c2a29ad0990cf02c48a7aac76ed0dbddeb5a0d070034b83675cc3bbf937eace4" dependencies = [ "bitflags 2.5.0", "bstr", @@ -1387,20 +1396,20 @@ dependencies = [ [[package]] name = "gix-macros" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dff438f14e67e7713ab9332f5fd18c8f20eb7eb249494f6c2bf170522224032" +checksum = "999ce923619f88194171a67fb3e6d613653b8d4d6078b529b15a765da0edcc17" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "gix-object" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d4f8efae72030df1c4a81d02dbe2348e748d9b9a11e108ed6efbd846326e051" +checksum = "1fe2dc4a41191c680c942e6ebd630c8107005983c4679214fdb1007dcf5ae1df" dependencies = [ "bstr", "gix-actor", @@ -1412,7 +1421,7 @@ dependencies = [ "itoa", "smallvec", "thiserror", - "winnow 0.6.5", + "winnow 0.6.9", ] [[package]] @@ -1498,7 +1507,7 @@ dependencies = [ "gix-validate", "memmap2", "thiserror", - "winnow 0.6.5", + "winnow 0.6.9", ] [[package]] @@ -1517,9 +1526,9 @@ dependencies = [ [[package]] name = "gix-revision" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e34196e1969bd5d36e2fbc4467d893999132219d503e23474a8ad2b221cb1e8" +checksum = "63e08f8107ed1f93a83bcfbb4c38084c7cb3f6cd849793f1d5eec235f9b13b2b" dependencies = [ "bstr", "gix-date", @@ -1533,9 +1542,9 @@ dependencies = [ [[package]] name = "gix-revwalk" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7d393ae814eeaae41a333c0ff684b243121cc61ccdc5bbe9897094588047d" +checksum = "4181db9cfcd6d1d0fd258e91569dbb61f94cb788b441b5294dd7f1167a3e788f" dependencies = [ "gix-commitgraph", "gix-date", @@ -1573,9 +1582,9 @@ dependencies = [ [[package]] name = "gix-trace" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b838b2db8f62c9447d483a4c28d251b67fee32741a82cb4d35e9eb4e9fdc5ab" +checksum = "f924267408915fddcd558e3f37295cc7d6a3e50f8bd8b606cee0808c3915157e" [[package]] name = "gix-traverse" @@ -1595,9 +1604,9 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0b24f3ecc79a5a53539de9c2e99425d0ef23feacdcf3faac983aa9a2f26849" +checksum = "0db829ebdca6180fbe32be7aed393591df6db4a72dbbc0b8369162390954d1cf" dependencies = [ "bstr", "gix-features", @@ -1609,9 +1618,9 @@ dependencies = [ [[package]] name = "gix-utils" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066432d4c277f9877f091279a597ea5331f68ca410efc874f0bdfb1cd348f92" +checksum = "35192df7fd0fa112263bad8021e2df7167df4cc2a6e6d15892e1e55621d3d4dc" dependencies = [ "fastrand", "unicode-normalization", @@ -1619,9 +1628,9 @@ dependencies = [ [[package]] name = "gix-validate" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e39fc6e06044985eac19dd34d474909e517307582e462b2eb4c8fa51b6241545" +checksum = "82c27dd34a49b1addf193c92070bcbf3beaf6e10f16a78544de6372e146a0acf" dependencies = [ "bstr", "thiserror", @@ -1666,7 +1675,7 @@ dependencies = [ "glutin_wgl_sys", "icrate", "libloading 0.8.3", - "objc2", + "objc2 0.4.1", "once_cell", "raw-window-handle 0.5.2", "wayland-sys", @@ -1769,9 +1778,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -1823,7 +1832,7 @@ dependencies = [ "serde", "serde_derive", "thiserror", - "toml 0.8.12", + "toml 0.8.13", "unic-langid", ] @@ -1866,7 +1875,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.58", + "syn 2.0.66", "unic-langid", ] @@ -1880,7 +1889,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -1889,9 +1898,9 @@ version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" dependencies = [ - "block2", + "block2 0.3.0", "dispatch", - "objc2", + "objc2 0.4.1", ] [[package]] @@ -1935,11 +1944,11 @@ dependencies = [ [[package]] name = "intl-memoizer" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda" dependencies = [ - "type-map 0.4.0", + "type-map", "unic-langid", ] @@ -1982,9 +1991,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2023,7 +2032,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libamdgpu_top" -version = "0.8.2" +version = "0.8.5" dependencies = [ "anyhow", "libdrm_amdgpu_sys", @@ -2031,14 +2040,14 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libdrm_amdgpu_sys" -version = "0.7.1" -source = "git+https://github.com/Umio-Yasuno/libdrm-amdgpu-sys-rs#d4b359daa6ad28ad01a15db7e209915c0f8c405a" +version = "0.7.3" +source = "git+https://github.com/Umio-Yasuno/libdrm-amdgpu-sys-rs#b5e281176c6ba5c15379b2bb832d1b37e83e673f" dependencies = [ "libc", ] @@ -2060,7 +2069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2086,9 +2095,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litrs" @@ -2111,9 +2120,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2175,9 +2184,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", "simd-adler32", @@ -2227,7 +2236,7 @@ dependencies = [ "ndk-sys", "num_enum", "raw-window-handle 0.5.2", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.2", "thiserror", ] @@ -2254,9 +2263,9 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-complex", "num-integer", @@ -2267,9 +2276,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -2291,9 +2300,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -2302,20 +2311,19 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -2338,7 +2346,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -2373,9 +2381,9 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" @@ -2384,7 +2392,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" dependencies = [ "objc-sys", - "objc2-encode", + "objc2-encode 3.0.0", +] + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode 4.0.3", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", ] [[package]] @@ -2393,6 +2451,49 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -2428,9 +2529,9 @@ dependencies = [ [[package]] name = "owned_ttf_parser" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" dependencies = [ "ttf-parser", ] @@ -2446,9 +2547,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2456,22 +2557,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -2506,9 +2607,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", @@ -2566,9 +2667,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] @@ -2611,9 +2712,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "raw-window-handle" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "redox_syscall" @@ -2633,6 +2734,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "redox_users" version = "0.4.5" @@ -2693,9 +2803,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" +checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -2704,22 +2814,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" +checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.58", + "syn 2.0.66", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" +checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" dependencies = [ "sha2", "walkdir", @@ -2733,9 +2843,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -2746,9 +2856,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -2777,40 +2887,40 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" dependencies = [ - "self_cell 1.0.3", + "self_cell 1.0.4", ] [[package]] name = "self_cell" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -2819,9 +2929,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -2866,9 +2976,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -2941,9 +3051,9 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" dependencies = [ "serde", ] @@ -2988,9 +3098,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -3020,22 +3130,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3073,9 +3183,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", ] @@ -3106,21 +3216,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.13", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -3138,15 +3248,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.9", ] [[package]] @@ -3167,18 +3277,9 @@ checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" [[package]] name = "ttf-parser" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" - -[[package]] -name = "type-map" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" -dependencies = [ - "rustc-hash", -] +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" [[package]] name = "type-map" @@ -3197,18 +3298,18 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unic-langid" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" dependencies = [ "unic-langid-impl", ] [[package]] name = "unic-langid-impl" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" dependencies = [ "serde", "tinystr", @@ -3249,9 +3350,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode-xid" @@ -3313,7 +3414,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -3347,7 +3448,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3506,9 +3607,9 @@ dependencies = [ [[package]] name = "wgpu" -version = "0.19.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1213b52478a7631d6e387543ed8f642bc02c578ef4e3b49aca2a29a7df0cb" +checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01" dependencies = [ "arrayvec", "cfg-if", @@ -3517,7 +3618,7 @@ dependencies = [ "log", "parking_lot", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.2", "smallvec", "static_assertions", "wasm-bindgen", @@ -3530,9 +3631,9 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f6b033c2f00ae0bc8ea872c5989777c60bc241aac4e58b24774faa8b391f78" +checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a" dependencies = [ "arrayvec", "bit-vec", @@ -3545,7 +3646,7 @@ dependencies = [ "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.2", "rustc-hash", "smallvec", "thiserror", @@ -3556,9 +3657,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.19.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f972c280505ab52ffe17e94a7413d9d54b58af0114ab226b9fc4999a47082e" +checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3" dependencies = [ "android_system_properties", "arrayvec", @@ -3584,7 +3685,7 @@ dependencies = [ "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.2", "renderdoc-sys", "rustc-hash", "smallvec", @@ -3630,11 +3731,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -3650,7 +3751,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -3659,7 +3760,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -3686,7 +3787,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -3721,17 +3822,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -3748,9 +3850,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -3766,9 +3868,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -3784,9 +3886,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -3802,9 +3910,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -3820,9 +3928,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -3838,9 +3946,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -3856,9 +3964,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winit" @@ -3883,12 +3991,12 @@ dependencies = [ "memmap2", "ndk", "ndk-sys", - "objc2", + "objc2 0.4.1", "once_cell", "orbclient", "percent-encoding", "raw-window-handle 0.5.2", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.2", "redox_syscall 0.3.5", "rustix", "smithay-client-toolkit", @@ -3919,9 +4027,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6" dependencies = [ "memchr", ] @@ -3939,9 +4047,9 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "as-raw-xcb-connection", "gethostname", @@ -3954,9 +4062,9 @@ dependencies = [ [[package]] name = "x11rb-protocol" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" @@ -3997,20 +4105,20 @@ checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] diff --git a/pkgs/tools/system/amdgpu_top/default.nix b/pkgs/tools/system/amdgpu_top/default.nix index 02c17535a347..5e69c03248c8 100644 --- a/pkgs/tools/system/amdgpu_top/default.nix +++ b/pkgs/tools/system/amdgpu_top/default.nix @@ -14,18 +14,18 @@ rustPlatform.buildRustPackage rec { pname = "amdgpu_top"; - version = "0.8.2"; + version = "0.8.5"; src = fetchFromGitHub { owner = "Umio-Yasuno"; repo = pname; rev = "v${version}"; - hash = "sha256-lJ1v1ixLqzo8nKnA/0P9cCDkTEd4Nt0hUnRyOsU9S24"; + hash = "sha256-n1nOlFXI8UCJxEgbuSbmMUhkZaLS3D4jGQdKH82WGc8="; }; cargoLock = { outputHashes = { - "libdrm_amdgpu_sys-0.7.1" = "sha256-Phj84wue/QcKqvxLJpGfj0sIjJdNobVrQUciNnZxKiw="; + "libdrm_amdgpu_sys-0.7.3" = "sha256-4bwbwVoNV2yroh6OLNxBq8gKaFJtoin/b9xaRdh9QOk="; }; lockFile = ./Cargo.lock; }; diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 292d10f50af7..bdbb466ef17c 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.18"; + version = "2.0.21"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o+PVzVLg1scAqBq6PSPj4PXWU7u4v/4PHMob3JhIBRk="; + sha256 = "sha256-Rk1Et/wPREF4IMbLQhqCmWDDiMjVpiJ6xEOj6YBYbwY="; }; - cargoHash = "sha256-s9FffL9Rvbj3WzlETsBTeKkuABj/MDnluRN9jQShvbw="; + cargoHash = "sha256-l/DJvm8r1xr4W/PNQcORfVV8LZEF+o/XEpU5FrboQM8="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index 2b33564b683f..7fe1ca2f85fa 100644 --- a/pkgs/tools/system/java-service-wrapper/default.nix +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.57"; + version = "3.5.58"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - hash = "sha256-86YusgyLUveMrXepAtnABgdZCGlQDQjVFnG9GqFnCIg="; + hash = "sha256-mwfLCZfjAtKNfp9Cc8hkLAOKo6VfKD3l+IDiXDP2LV8="; }; strictDeps = true; diff --git a/pkgs/tools/system/mediawriter/default.nix b/pkgs/tools/system/mediawriter/default.nix index 8740a9b8a1e1..e2ff1f610782 100644 --- a/pkgs/tools/system/mediawriter/default.nix +++ b/pkgs/tools/system/mediawriter/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "mediawriter"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "MediaWriter"; rev = "refs/tags/${version}"; - hash = "sha256-I4q9VARQiZf+Qz83EToyUj+eS3CTPsxEw0paACS8lmE="; + hash = "sha256-KyABM3XIHvd9kT7aayYivGw6kjLf55Gpkk041BQ4yw0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/nvitop/default.nix b/pkgs/tools/system/nvitop/default.nix index 1c7ed6083daf..a89f5d04d65b 100644 --- a/pkgs/tools/system/nvitop/default.nix +++ b/pkgs/tools/system/nvitop/default.nix @@ -16,7 +16,6 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "nvidia-ml-py" ]; - nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; propagatedBuildInputs = with python3Packages; [ cachetools diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 5290455390c3..e556d8e7bdb6 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, zlib, kmod, which +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, kmod, which , hwdata , static ? stdenv.hostPlatform.isStatic , IOKit @@ -7,11 +7,13 @@ stdenv.mkDerivation rec { pname = "pciutils"; - version = "3.12.0"; # with release-date database + version = "3.13.0"; # with release-date database - src = fetchurl { - url = "mirror://kernel/software/utils/pciutils/pciutils-${version}.tar.xz"; - hash = "sha256-8YXRFtX/mbeXSX786PGfHujMxaZouXoVnj0TRy9nQVQ="; + src = fetchFromGitHub { + owner = "pciutils"; + repo = "pciutils"; + rev = "v${version}"; + hash = "sha256-buhq7SN6eH+sckvT5mJ8eP4C1EP/4CUFt3gooJohJW0="; }; nativeBuildInputs = [ pkg-config ]; @@ -23,6 +25,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' "" ''; + enableParallelBuilding = true; + makeFlags = [ "SHARED=${if static then "no" else "yes"}" "PREFIX=\${out}" diff --git a/pkgs/tools/system/skeema/default.nix b/pkgs/tools/system/skeema/default.nix index a7503baac14b..a89538b2966b 100644 --- a/pkgs/tools/system/skeema/default.nix +++ b/pkgs/tools/system/skeema/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skeema"; - version = "1.11.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "skeema"; repo = "skeema"; rev = "v${version}"; - hash = "sha256-rnoIuftPmx1Qbn2ifEBGz4RiA/lBVemjMjcPr9Woflc="; + hash = "sha256-MdaMK65PWreIPTuhsm+2ZVRQ8t/wYijkENk8qvX9oEM="; }; vendorHash = null; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 01419c38610f..04a0af3c37eb 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.18.00"; + version = "0.18.01"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-rZPfo5PKNXsjNuKNI7nH6JWC/enQIkvREcbgxZCoxEU="; + hash = "sha256-of+sjt8niAR/zEZTlhNP395nyoGoBFQFsHmHmCpX7NQ="; }; postPatch = '' diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 383c281bd212..66f824ac48d0 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "tree"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitLab { owner = "OldManProgrammer"; repo = "unix-tree"; rev = version; - sha256 = "sha256-aPz1ROUeAKDmMjEtAaL2AguF54/CbIYWpL4Qovv2ftQ="; + sha256 = "sha256-1iBGbzNwjUX7kqkk6XzKISO2e6b05MBH08XgIwR+nyI="; }; preConfigure = '' diff --git a/pkgs/tools/system/zx/default.nix b/pkgs/tools/system/zx/default.nix index 57d7cb97ea32..9867ca80a3c6 100644 --- a/pkgs/tools/system/zx/default.nix +++ b/pkgs/tools/system/zx/default.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "zx"; - version = "8.1.3"; + version = "8.1.4"; src = fetchFromGitHub { owner = "google"; repo = "zx"; rev = version; - hash = "sha256-h3osu1FDBZsawXxtSVBDjcIiRdqgElPMBxdx2N4cfeQ="; + hash = "sha256-9B/X7lOaNTXRGIteGDnLexVF8joo1m+xsfaqxTL2150="; }; - npmDepsHash = "sha256-bijPRIiGNGfbtZiQ5aEVGI3DfYfFeA1YbNCTdljDhfw="; + npmDepsHash = "sha256-HNaREvW8opvxjZWJ7cFrIoF1JELWBemr8VB9DyYdNfA="; meta = { description = "Tool for writing scripts using JavaScript"; diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix index 1aa63333d89c..172963858e25 100644 --- a/pkgs/tools/text/csview/default.nix +++ b/pkgs/tools/text/csview/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "csview"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ci0PyTZJIEagBCymtrYR/ntgYym1aGKNX4COfrE99mY="; + sha256 = "sha256-9rjrNxMUUuH3S6fVsooscgIP+oFeQ6/gBQmuUMPDfp0="; }; - cargoHash = "sha256-/pswnb2vNtw8zSoWuC7oZPJ4yxVuy1c4ES1NUHhnG6I="; + cargoHash = "sha256-/0jviI91y4eAJ0uZDQqnw9htcl+j0aybY0U5gCc9DFg="; meta = with lib; { description = "High performance csv viewer with cjk/emoji support"; diff --git a/pkgs/tools/text/frogmouth/default.nix b/pkgs/tools/text/frogmouth/default.nix index b2551b6387d6..8a93e86be66c 100644 --- a/pkgs/tools/text/frogmouth/default.nix +++ b/pkgs/tools/text/frogmouth/default.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ python3.pkgs.poetry-core - python3.pkgs.pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/text/jotdown/default.nix b/pkgs/tools/text/jotdown/default.nix index c3b61b4f739b..42cadf6d9447 100644 --- a/pkgs/tools/text/jotdown/default.nix +++ b/pkgs/tools/text/jotdown/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jotdown"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "hellux"; repo = "jotdown"; rev = version; - hash = "sha256-Q1BjmcA5otOkeEe8KQiqKGKHSeGntj+ktcNMrdbGHZI="; + hash = "sha256-qFx87AVGi42OCFCvksgiLh+NkXNgzfPxjcP0zDeC1is="; }; - cargoHash = "sha256-bkMJ7ApM+GsshwIFuYsH19CnU6ebq0GfwQvVp9QD46A="; + cargoHash = "sha256-IsUlTSv2QcO67FpN0eAK1gKLJelr9sfX8DefcmzHbcc="; meta = with lib; { description = "Minimal Djot CLI"; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 456b2c568d82..f322a6f7d7c3 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kdiff3"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz"; - hash = "sha256-MPFKWrbg1VEWgpF42CdlTDDoQhwE/pcA085npTCEYpg="; + hash = "sha256-kYU3dcP6qVIkaOwSPNbedGYqy21RFkdZlqyk3Cw778g="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index 8aaa5c09b670..5d1517b28337 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -2,19 +2,29 @@ buildGoModule rec { pname = "mark"; - version = "9.1.4"; + version = "9.12.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-nAgEegtRT4c2wJzVOY41JgM/JVW5xQjRnhXUzjwqxLY="; + sha256 = "sha256-GbtwC361BI02mI1xzwdH9iqTIrY5ItiAKfZ7C3uk5ms="; }; - vendorHash = "sha256-2rEwZffM+RK0baz8m+fXN2NGYskv4zO67cWC4rx+hfI="; + vendorHash = "sha256-3OTHHhRgY9N6l6GXN6HCbmPAgpXyfyJ/3KAZWLltz24="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + checkFlags = + let + skippedTests = [ + # Expects to be able to launch google-chrome + "TestExtractMermaidImage" + ]; + in [ + "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" + ]; + meta = with lib; { description = "Tool for syncing your markdown documentation with Atlassian Confluence pages"; mainProgram = "mark"; diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/tools/text/ov/default.nix index c7801348c4e3..1556eeabe366 100644 --- a/pkgs/tools/text/ov/default.nix +++ b/pkgs/tools/text/ov/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles @@ -38,12 +39,12 @@ buildGoModule rec { outputs = [ "out" "doc" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ov \ - --bash <($out/bin/ov completion bash) \ - --fish <($out/bin/ov completion fish) \ - --zsh <($out/bin/ov completion zsh) - + --bash <($out/bin/ov --completion bash) \ + --fish <($out/bin/ov --completion fish) \ + --zsh <($out/bin/ov --completion zsh) + '' + '' mkdir -p $out/share/$name cp $src/ov-less.yaml $out/share/$name/less-config.yaml makeWrapper $out/bin/ov $out/bin/ov-less --add-flags "--config $out/share/$name/less-config.yaml" diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 58185538193f..6133bc409ddc 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "poedit"; - version = "3.4.2"; + version = "3.4.4"; src = fetchFromGitHub { owner = "vslavik"; repo = "poedit"; rev = "v${version}-oss"; - hash = "sha256-CfCWfKRzeGGk8/B0BLauO4Xb88/Si1ezvcGKeURgC9o="; + hash = "sha256-SZjsJQYJCXQendzQ2Tobg+IgkWL6lFX5YnMfruPt7UA="; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook3 diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/tools/text/sad/default.nix index 1b8dad394c9a..eecfbe0d83ab 100644 --- a/pkgs/tools/text/sad/default.nix +++ b/pkgs/tools/text/sad/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "sad"; - version = "0.4.30"; + version = "0.4.31"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "sad"; rev = "refs/tags/v${version}"; - hash = "sha256-pTCdoKY/+ubUY3adN/Cqop0Gvuqh6Bs55arjT9mjQ18="; + hash = "sha256-frsOfv98VdetlwgNA6O0KEhcCSY9tQeEwkl2am226ko="; }; - cargoHash = "sha256-ndl0jFQA30h90nnEcIl2CXfF/+cuj/UqUV/7ilsUPb4="; + cargoHash = "sha256-2oZf2wim2h/krGZMg7Psxx0VLFE/Xf1d1vWqkVtjSmo="; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 2dfb2f00f662..f0b35d2f0592 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "vale"; - version = "3.6.0"; + version = "3.6.1"; subPackages = [ "cmd/vale" ]; @@ -18,7 +18,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-Xkea1o0ywRKIg0cMJuxQehHbgVF0SSC9VRa53FQEong="; + hash = "sha256-CWIX5JWL8cvTq6TS7BoAXeW8RMmNcXqvCLwa/KStuMQ="; }; vendorHash = "sha256-OLlViQKLTark9yknnjJFiEThFtxNNjue5LUp1P/anKU="; diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 4574b44f8448..39069029e57c 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, libxslt, texliveBasic +{ lib, stdenv, fetchurl, python311, libxslt, texliveBasic , enableAllFeatures ? false, imagemagick, fig2dev, inkscape, fontconfig, ghostscript , tex ? texliveBasic.withPackages (ps: with ps; [ # satisfy all packages that ./configure mentions @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n"; }; - buildInputs = [ python3 libxslt tex ] + buildInputs = [ python311 libxslt tex ] ++ lib.optionals enableAllFeatures [ imagemagick fig2dev ]; # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - ${python3.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose + ${python311.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose ''; passthru = { inherit tex; }; diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index e9017333c943..feb444b98ff4 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -243,7 +243,7 @@ rec { # fonts. fontsConf = pkgs.makeFontsConf { fontDirectories = [ - "${pkgs.ghostscript}/share/ghostscript/fonts" + "${pkgs.ghostscript.fonts}/share/fonts" ]; }; diff --git a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix index e289f9171c15..1356fc325047 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix @@ -233,7 +233,7 @@ let # if the container is missing (that is, outputs == [ ]), create a file, to prevent passing the package to .withPackages '' for outputName in ''${!outputs[@]} ; do - if [[ -z ''${outputDrvs[$outputName]} ]] ; then + if [[ -n ''${outputDrvs[$outputName]} ]] ; then ln -s "''${outputDrvs[$outputName]}" "''${outputs[$outputName]}" else touch "''${outputs[$outputName]}" diff --git a/pkgs/tools/typesetting/tex/texpresso/default.nix b/pkgs/tools/typesetting/tex/texpresso/default.nix index 82f6bca589e9..38974b9a45dc 100644 --- a/pkgs/tools/typesetting/tex/texpresso/default.nix +++ b/pkgs/tools/typesetting/tex/texpresso/default.nix @@ -17,7 +17,13 @@ stdenv.mkDerivation rec { pname = "texpresso"; - version = "0-unstable-2024-05-23"; + version = "0-unstable-2024-06-22"; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc" \ + --replace-fail "LDCC=g++" "LDCC=${stdenv.cc.targetPrefix}c++" + ''; nativeBuildInputs = [ makeWrapper @@ -35,12 +41,16 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "let-def"; repo = "texpresso"; - rev = "01cafac1ec6d33d5e169a0202f23a6f565cc55b8"; - hash = "sha256-uLGanGEUGzxIYFbU3U8LLV3bpn/IN9XltvWCmwSlD7E="; + rev = "e1e05f5559751d4b50772cd51d14101be0563ce1"; + hash = "sha256-av1yadR2giJUxFQuHSXFgTbCNsmccrzKOmLVnAGJt6c="; }; buildFlags = [ "texpresso" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + "-Wno-error=implicit-function-declaration" + ]); + installPhase = '' runHook preInstall install -Dm0755 -t "$out/bin/" "build/${pname}" @@ -70,5 +80,6 @@ stdenv.mkDerivation rec { description = "Live rendering and error reporting for LaTeX"; maintainers = with lib.maintainers; [ nickhu ]; license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/typesetting/tex/texpresso/tectonic.nix b/pkgs/tools/typesetting/tex/texpresso/tectonic.nix index 603c4d5ad3f4..838a51324a09 100644 --- a/pkgs/tools/typesetting/tex/texpresso/tectonic.nix +++ b/pkgs/tools/typesetting/tex/texpresso/tectonic.nix @@ -6,8 +6,8 @@ tectonic-unwrapped.override (old: { src = fetchFromGitHub { owner = "let-def"; repo = "tectonic"; - rev = "bc522fabfdd17099deac2e12662b2a0810ceb104"; - hash = "sha256-0esXnUML6C9DYrpmBBB+ACypLvnLsYE9fuNiiCFfYzw="; + rev = "b38cb3b2529bba947d520ac29fbb7873409bd270"; + hash = "sha256-ap7fEPHsASAphIQkjcvk1CC7egTdxaUh7IpSS5os4W8="; fetchSubmodules = true; }; cargoHash = "sha256-62sxvPIiY3len1wsl7QelK3u4ekftIjcTqoIGZMYb5A="; diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 3db6e27cf715..3433bde6e11a 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "atomicparsley"; - version = "20221229.172126.d813aa6"; + version = "20240608.083822.1ed9031"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; - sha256 = "sha256-3otyOpDdiltZ0SR1hImfIDBi53PKuAvh93yq1X3Xkmo="; + sha256 = "sha256-VhrOMpGNMkNNYjcfCqlHI8gdApWr1ThtcxDwQ6gyV/g="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/video/blackmagic-desktop-video/default.nix b/pkgs/tools/video/blackmagic-desktop-video/default.nix deleted file mode 100644 index d8d6e7f2a169..000000000000 --- a/pkgs/tools/video/blackmagic-desktop-video/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ stdenv -, cacert -, curl -, runCommandLocal -, lib -, autoPatchelfHook -, libcxx -, libGL -, gcc7 -}: - -stdenv.mkDerivation rec { - pname = "blackmagic-desktop-video"; - version = "12.9a3"; - - buildInputs = [ - autoPatchelfHook - libcxx - libGL - gcc7.cc.lib - ]; - - # yes, the below download function is an absolute mess. - # blame blackmagicdesign. - src = runCommandLocal "${pname}-${lib.versions.majorMinor version}-src.tar.gz" - rec { - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "sha256-H7AHD6u8KsJoL+ug3QCqxuPfMP4A0nHtIyKx5IaQkdQ="; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - - nativeBuildInputs = [ curl ]; - - # ENV VARS - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - # from the URL that the POST happens to, see browser console - DOWNLOADID = "495ebc707969447598c2f1cf0ff8d7d8"; - # from the URL the download page where you click the "only download" button is at - REFERID = "6e65a87d97bd49e1915c57f8df255f5c"; - SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}"; - - USERAGENT = builtins.concatStringsSep " " [ - "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.hostPlatform.linuxArch})" - "AppleWebKit/537.36 (KHTML, like Gecko)" - "Chrome/77.0.3865.75" - "Safari/537.36" - ]; - - REQJSON = builtins.toJSON { - "country" = "nl"; - "downloadOnly" = true; - "platform" = "Linux"; - "policy" = true; - }; - - } '' - RESOLVEURL=$(curl \ - -s \ - -H "$USERAGENT" \ - -H 'Content-Type: application/json;charset=UTF-8' \ - -H "Referer: https://www.blackmagicdesign.com/support/download/$REFERID/Linux" \ - --data-ascii "$REQJSON" \ - --compressed \ - "$SITEURL") - - curl \ - --retry 3 --retry-delay 3 \ - --compressed \ - "$RESOLVEURL" \ - > $out - ''; - - postUnpack = let - arch = stdenv.hostPlatform.uname.processor; - in '' - tar xf Blackmagic_Desktop_Video_Linux_${lib.head (lib.splitString "a" version)}/other/${arch}/desktopvideo-${version}-${arch}.tar.gz - unpacked=$NIX_BUILD_TOP/desktopvideo-${version}-${stdenv.hostPlatform.uname.processor} - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,share/doc,lib/systemd/system} - cp -r $unpacked/usr/share/doc/desktopvideo $out/share/doc - cp $unpacked/usr/lib/*.so $out/lib - cp $unpacked/usr/lib/systemd/system/DesktopVideoHelper.service $out/lib/systemd/system - cp $unpacked/usr/lib/blackmagic/DesktopVideo/DesktopVideoHelper $out/bin/ - - substituteInPlace $out/lib/systemd/system/DesktopVideoHelper.service --replace "/usr/lib/blackmagic/DesktopVideo/DesktopVideoHelper" "$out/bin/DesktopVideoHelper" - - runHook postInstall - ''; - - # need to tell the DesktopVideoHelper where to find its own library - appendRunpaths = [ "${placeholder "out"}/lib" ]; - - meta = with lib; { - homepage = "https://www.blackmagicdesign.com/support/family/capture-and-playback"; - maintainers = [ maintainers.hexchen ]; - license = licenses.unfree; - description = "Supporting applications for Blackmagic Decklink. Doesn't include the desktop applications, only the helper required to make the driver work"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/video/rwedid/default.nix b/pkgs/tools/video/rwedid/default.nix index 238f1fd5189a..eea8a86c8cc3 100644 --- a/pkgs/tools/video/rwedid/default.nix +++ b/pkgs/tools/video/rwedid/default.nix @@ -42,6 +42,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://codeberg.org/ral/rwedid"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index d53c974a18d4..04dda18e6b78 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -11,7 +11,9 @@ let localPython = python3.override { self = localPython; packageOverrides = self: super: { - cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "sha256-h2XtBSwGHXTk0Bia3cM9Jo3lRMohmyWdeXdB9yXkItI="; + cement = + changeVersion super.cement.overridePythonAttrs "2.10.14" + "sha256-NC4n21SmYW3RiS7QuzWXoifO4z3C2FVgQm3xf8qQcFg="; }; }; @@ -35,7 +37,6 @@ localPython.pkgs.buildPythonApplication rec { ''; nativeBuildInputs = with localPython.pkgs; [ - pythonRelaxDepsHook ]; buildInputs = [ diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 3b8e619e864d..6dcc40973711 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "24.1"; + version = "24.2"; pyproject = true; namePrefix = ""; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { owner = "canonical"; repo = "cloud-init"; rev = "refs/tags/${version}"; - hash = "sha256-gcqo8q3BxxqXU7WnoOnTgTJ3QHF9h/p20zTJUhsCL2A="; + hash = "sha256-BhTcOeSKZ1XRIx+xJQkqkSw9M8ilr+BRKXDy5MUXB6E="; }; patches = [ diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index dafe1c2fda27..5e8810a991b9 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "govc"; - version = "0.37.3"; + version = "0.38.0"; subPackages = [ "govc" ]; @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-lqErey/uht+ub6deGgGNbytf0mhxgRekqe4y53Gtbms="; + sha256 = "sha256-ZwqDPtoR3jFV5h8Ufie5fmiTueu2twueFf6swrpdYq4="; }; vendorHash = "sha256-1EAQMYaTEtfAiu7+UTkC7QZwSWC1Ihwj9leTd90T0ZU="; diff --git a/pkgs/tools/virtualization/jumppad/default.nix b/pkgs/tools/virtualization/jumppad/default.nix index 5133d4477fab..d99e1164d9aa 100644 --- a/pkgs/tools/virtualization/jumppad/default.nix +++ b/pkgs/tools/virtualization/jumppad/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "jumppad"; - version = "0.11.2"; + version = "0.12.1"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = "jumppad"; rev = version; - hash = "sha256-ovPXjSHTCv7ke8k0iOqB4jB4R3cRMJ5cFkpptPrAr+g="; + hash = "sha256-jG/XTMkedgDSncCW7YbII3g3ieB1i0Z9cOEVfZiczHI="; }; - vendorHash = "sha256-39CORZ5qqbMJuTzYt1sKbHPPYkQEwQWSIQ4hWqdUFmk="; + vendorHash = "sha256-FPM0q1ZVDfo00Z6QEXqtqfx77qkq5HhB+3vF9z9zrM0="; subPackages = [ "." ]; diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index 4dea9b153d85..9a00c7d163dc 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rootlesskit"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - hash = "sha256-L8UdT3hQO4IrXkpOL0bjpy6OwNJQR8EG0+MgXVXzoBU="; + hash = "sha256-SWLXY7SsoeJFr2RLOtVSnt5Knx44+9hNIy50NzN602k="; }; - vendorHash = "sha256-TGLxcH6wg8fObLsSKKdBgIbb7t4YBP+pUWNNHlEZtaw="; + vendorHash = "sha256-74El20C7kE0lLAng9wQL7MnfcJLtPR2cAk00CuO4NlY="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/tools/wayland/wl-color-picker/default.nix b/pkgs/tools/wayland/wl-color-picker/default.nix index bb5f21ded61d..22f6821a1022 100644 --- a/pkgs/tools/wayland/wl-color-picker/default.nix +++ b/pkgs/tools/wayland/wl-color-picker/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , slurp , grim -, gnome +, zenity , wl-clipboard , imagemagick , makeWrapper @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { --replace 'grim' "${grim}/bin/grim" \ --replace 'slurp' "${slurp}/bin/slurp" \ --replace 'convert' "${imagemagick}/bin/convert" \ - --replace 'zenity' "${gnome.zenity}/bin/zenity" \ + --replace 'zenity' "${zenity}/bin/zenity" \ --replace 'wl-copy' "${wl-clipboard}/bin/wl-copy" ''; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { grim slurp imagemagick - gnome.zenity + zenity wl-clipboard ]} mkdir -p $out/bin diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index acc961aa9bb1..aed694c00239 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.16.3"; + version = "0.16.4"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-/ZxTFr5Mmg1UoJikweGJThREgutKCF0C5IwxEZ3bv7Q="; + hash = "sha256-a/wBHfLQf2RTd6FsiScewm+KOPyCrS/IaJDsi6+zJfI="; }; strictDeps = true; diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index 1e0e6e0a2d58..d1097a48327b 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -35,5 +35,7 @@ let agdarsec = callPackage ../development/libraries/agda/agdarsec { }; _1lab = callPackage ../development/libraries/agda/1lab { }; + + generics = callPackage ../development/libraries/agda/generics { }; }; in mkAgdaPackages Agda diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8a5e10e86faf..5871a61f155e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -108,6 +108,7 @@ mapAliases ({ atom-beta = throw "'atom-beta' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 atomEnv = throw "'atomEnv' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 atomPackages = throw "'atomPackages' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 + audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06 auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02 authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19 avldrums-lv2 = x42-avldrums; # Added 2020-03-29 @@ -133,6 +134,7 @@ mapAliases ({ bitwarden = bitwarden-desktop; # Added 2024-02-25 bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 + blackmagic-desktop-video = throw "blackmagic-desktop-video has been due to being unmaintained"; # Added 2024-07-02 blender-with-packages = args: lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`" (blender.withPackages (_: args.packages)).overrideAttrs @@ -156,6 +158,7 @@ mapAliases ({ bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17 bukut = throw "bukut has been removed since it has been archived by upstream"; # Added 2023-05-24 + butler = throw "butler was removed because it was broken and abandoned upstream"; # added 2024-06-18 # Shorter names; keep the longer name for back-compat. Added 2023-04-11 buildFHSUserEnv = buildFHSEnv; buildFHSUserEnvChroot = buildFHSEnvChroot; @@ -209,6 +212,8 @@ mapAliases ({ collada-dom = opencollada; # added 2024-02-21 composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 cope = throw "'cope' has been removed, as it is broken in nixpkgs since it was added, and fixing it is not trivial"; # Added 2024-04-12 + coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 + cosmic-tasks = tasks; # Added 2024-07-04 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 @@ -562,6 +567,7 @@ mapAliases ({ gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 grub2_full = grub2; # Added 2022-11-18 grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 + gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 gtkcord4 = dissent; # Added 2024-03-10 gtkpod = throw "'gtkpod' was removed due to one of its dependencies, 'anjuta' being unmaintained"; # Added 2024-01-16 guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09 @@ -695,6 +701,7 @@ mapAliases ({ libcxxabi = throw "'libcxxabi' was merged into 'libcxx'"; # Converted to throw 2024-03-08 libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23 libgme = game-music-emu; # Added 2022-07-20 + libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = libgpg-error; # Added 2021-09-04 libheimdal = heimdal; # Added 2022-11-18 libintlOrEmpty = throw "'libintlOrEmpty' has been replaced by gettext"; # Converted to throw 2023-09-10 @@ -856,6 +863,8 @@ mapAliases ({ mariadb-client = hiPrio mariadb.client; #added 2019.07.28 markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 + marwaita-manjaro = lib.warn "marwaita-manjaro has been renamed to marwaita-darkcyan" marwaita-darkcyan; # Added 2024-07-01 + marwaita-peppermint = lib.warn "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01 matrique = spectral; # Added 2020-01-27 matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09 matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21 @@ -945,7 +954,6 @@ mapAliases ({ ); nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10 nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained"; # Added 2023-11-20 - nix-top = throw "The nix-top package was dropped since it was unmaintained."; # Added 2024-06-21 nix-universal-prefetch = throw "The nix-universal-prefetch package was dropped since it was unmaintained."; # Added 2024-06-21 nixFlakes = nixVersions.stable; # Added 2021-05-21 nixStable = nixVersions.stable; # Added 2022-01-24 @@ -1350,6 +1358,7 @@ mapAliases ({ tkcvs = tkrev; # Added 2022-03-07 tokodon = plasma5Packages.tokodon; tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 + tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07 tootle = throw "'tootle' has been removed as it is not maintained upstream. Consider using 'tuba' instead"; # Added 2024-02-11 tor-browser-bundle-bin = tor-browser; # Added 2023-09-23 transmission = lib.warn (transmission3Warning {}) transmission_3; # Added 2024-06-10 @@ -1364,6 +1373,7 @@ mapAliases ({ trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 tvbrowser-bin = tvbrowser; # Added 2023-03-02 typst-fmt = typstfmt; # Added 2023-07-15 + typst-preview = throw "The features of this program have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07 ### U ### @@ -1515,12 +1525,6 @@ mapAliases ({ # LLVM packages for (integration) testing that should not be used inside Nixpkgs: llvmPackages_latest = llvmPackages_18; - llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git { - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_git.tools; - targetLlvmLibraries = targetPackages.llvmPackages_git.libraries or llvmPackages_git.libraries; - targetLlvm = targetPackages.llvmPackages_git.llvm or llvmPackages_git.llvm; - }); /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9aa8a3cb93c0..12c48c9586da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -837,9 +837,11 @@ with pkgs; grsync = callPackage ../applications/misc/grsync { }; + devShellTools = callPackage ../build-support/dev-shell-tools { }; + dockerTools = callPackage ../build-support/docker { writePython3 = buildPackages.writers.writePython3; - } // { __attrsFailEvaluation = true; }; + }; fakeNss = callPackage ../build-support/fake-nss { }; @@ -1073,14 +1075,14 @@ with pkgs; fetchpatch = callPackage ../build-support/fetchpatch { # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154 - patchutils = buildPackages.patchutils_0_3_3; + patchutils = __splicedPackages.patchutils_0_3_3; } // { tests = pkgs.tests.fetchpatch; version = 1; }; fetchpatch2 = callPackage ../build-support/fetchpatch { - patchutils = buildPackages.patchutils_0_4_2; + patchutils = __splicedPackages.patchutils_0_4_2; } // { tests = pkgs.tests.fetchpatch2; version = 2; @@ -1227,8 +1229,6 @@ with pkgs; libredirect = callPackage ../build-support/libredirect { }; - livecaptions = callPackage ../applications/misc/livecaptions { }; - madonctl = callPackage ../applications/misc/madonctl { }; copyDesktopItems = makeSetupHook { @@ -1288,7 +1288,10 @@ with pkgs; mpsolve = libsForQt5.callPackage ../applications/science/math/mpsolve { }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; }; + nixBufferBuilders = import ../applications/editors/emacs/build-support/buffer.nix { + inherit lib writeText; + inherit (emacs.pkgs) inherit-local; + }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; @@ -1361,7 +1364,7 @@ with pkgs; fixDarwinDylibNames = makeSetupHook { name = "fix-darwin-dylib-names-hook"; - substitutions = { inherit (binutils) targetPrefix; }; + substitutions = { inherit (darwin.binutils) targetPrefix; }; meta.platforms = lib.platforms.darwin; } ../build-support/setup-hooks/fix-darwin-dylib-names.sh; @@ -1530,6 +1533,7 @@ with pkgs; admin-fe = callPackage ../servers/akkoma/admin-fe { nodejs = nodejs_18; yarn = yarn.override { nodejs = nodejs_18; }; + python3 = python311; }; }; akkoma-emoji = recurseIntoAttrs { @@ -1546,8 +1550,6 @@ with pkgs; wxGTK = wxGTK32; } // (config.aegisub or {})); - aerc = callPackage ../applications/networking/mailreaders/aerc { }; - aerospike = callPackage ../servers/nosql/aerospike { }; aespipe = callPackage ../tools/security/aespipe { }; @@ -1641,11 +1643,11 @@ with pkgs; aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { - inherit (gnome) zenity; inherit (plasma5Packages) kdialog; }; - akku = callPackage ../tools/package-management/akku { }; + inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { })) + akku akkuPackages; albert = qt6Packages.callPackage ../applications/misc/albert { }; @@ -1689,10 +1691,6 @@ with pkgs; btc-rpc-explorer = callPackage ../tools/misc/btc-rpc-explorer { }; - butler = callPackage ../by-name/bu/butler/package.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - carbon-now-cli = callPackage ../tools/typesetting/carbon-now-cli { }; cf-vault = callPackage ../tools/admin/cf-vault { }; @@ -2081,8 +2079,6 @@ with pkgs; vitess = callPackage ../development/tools/database/vitess { }; - voms = callPackage ../tools/networking/voms { }; - vopono = callPackage ../tools/networking/vopono { }; vprof = with python3Packages; toPythonApplication vprof; @@ -2352,8 +2348,6 @@ with pkgs; git-mit = callPackage ../applications/version-management/git-mit { }; - git-my = callPackage ../applications/version-management/git-my { }; - git-machete = python3Packages.callPackage ../applications/version-management/git-machete { }; git-nomad = callPackage ../applications/version-management/git-nomad { }; @@ -2774,14 +2768,10 @@ with pkgs; vice = callPackage ../applications/emulators/vice { }; - winetricks = callPackage ../applications/emulators/wine/winetricks.nix { - inherit (gnome) zenity; - }; + winetricks = callPackage ../applications/emulators/wine/winetricks.nix { }; xcpc = callPackage ../applications/emulators/xcpc { }; - yapesdl = callPackage ../applications/emulators/yapesdl { }; - zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { }; @@ -2852,7 +2842,7 @@ with pkgs; x16-run = x16.run; yabause = libsForQt5.callPackage ../applications/emulators/yabause { - freeglut = null; + libglut = null; openal = null; }; @@ -3283,7 +3273,10 @@ with pkgs; awscli = callPackage ../tools/admin/awscli { }; - awscli2 = callPackage ../tools/admin/awscli2 { }; + awscli2 = callPackage ../by-name/aw/awscli2/package.nix { + # change when https://github.com/aws/aws-cli/issues/8342 resolved + python3 = python311; + }; okta-aws-cli = callPackage ../tools/admin/okta-aws-cli { }; @@ -3337,8 +3330,6 @@ with pkgs; berglas = callPackage ../tools/admin/berglas { }; - betterdiscordctl = callPackage ../tools/misc/betterdiscordctl { }; - betterdiscord-installer = callPackage ../tools/misc/betterdiscord-installer { }; binocle = callPackage ../applications/misc/binocle { @@ -3475,8 +3466,6 @@ with pkgs; bkyml = callPackage ../tools/misc/bkyml { }; - blackmagic-desktop-video = callPackage ../tools/video/blackmagic-desktop-video { }; - blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; bmap-tools = callPackage ../tools/misc/bmap-tools { }; @@ -3932,8 +3921,6 @@ with pkgs; xjadeo = callPackage ../tools/video/xjadeo { }; - asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; - go-audit = callPackage ../tools/system/go-audit { }; gopass = callPackage ../tools/security/gopass { }; @@ -4729,8 +4716,6 @@ with pkgs; clockify = callPackage ../applications/office/clockify { }; - contrast = callPackage ../applications/accessibility/contrast { }; - cplex = callPackage ../applications/science/math/cplex (config.cplex or {}); cpulimit = callPackage ../tools/misc/cpulimit { }; @@ -5825,7 +5810,7 @@ with pkgs; monetdb = callPackage ../servers/sql/monetdb { }; - monado = callPackage ../applications/graphics/monado { + monado = callPackage ../by-name/mo/monado/package.nix { inherit (gst_all_1) gstreamer gst-plugins-base; }; @@ -5871,8 +5856,6 @@ with pkgs; mrkd = callPackage ../tools/text/mrkd { }; - naproche = callPackage ../applications/science/logic/naproche { }; - nautilus-open-any-terminal = callPackage ../tools/misc/nautilus-open-any-terminal { }; n2n = callPackage ../tools/networking/n2n { }; @@ -5929,8 +5912,6 @@ with pkgs; nsz = with python3.pkgs; toPythonApplication nsz; - nwipe = callPackage ../tools/security/nwipe { }; - nx2elf = callPackage ../tools/compression/nx2elf { }; nx-libs = callPackage ../tools/X11/nx-libs { }; @@ -6756,9 +6737,7 @@ with pkgs; libsbsms_2_3_0 ; - libskk = callPackage ../development/libraries/libskk { - inherit (gnome) gnome-common; - }; + libskk = callPackage ../development/libraries/libskk { }; m17-cxx-demod = callPackage ../applications/radio/m17-cxx-demod { }; @@ -6810,6 +6789,8 @@ with pkgs; openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard { withIbusSupport = true; }; + pinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-pinyin { }; + rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { }; @@ -7454,8 +7435,6 @@ with pkgs; edit = callPackage ../applications/editors/edit { }; - edk2 = callPackage ../development/compilers/edk2 { }; - edk2-uefi-shell = callPackage ../tools/misc/edk2-uefi-shell { }; edl = callPackage ../development/embedded/edl { }; @@ -7659,7 +7638,7 @@ with pkgs; easeprobe = callPackage ../tools/misc/easeprobe { }; emscripten = callPackage ../development/compilers/emscripten { - llvmPackages = llvmPackages_17; + llvmPackages = llvmPackages_18; }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); @@ -7785,8 +7764,6 @@ with pkgs; expliot = callPackage ../tools/security/expliot { }; - f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; - Fabric = with python3Packages; toPythonApplication fabric; fail2ban = callPackage ../tools/security/fail2ban { }; @@ -8018,9 +7995,7 @@ with pkgs; fortune = callPackage ../tools/misc/fortune { }; - fox = callPackage ../development/libraries/fox { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + fox = callPackage ../development/libraries/fox {}; fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -8637,8 +8612,6 @@ with pkgs; efitools = callPackage ../tools/security/efitools { }; - sbctl = callPackage ../tools/security/sbctl { }; - sbsigntool = callPackage ../tools/security/sbsigntool { }; sonic-server = callPackage ../servers/search/sonic-server { }; @@ -9458,7 +9431,7 @@ with pkgs; # 2. the rest are added from here: https://github.com/keybase/client/blob/68bb8c893c5214040d86ea36f2f86fbb7fac8d39/go/chat/attachments/preview_darwin.go#L7 # #cgo LDFLAGS: -framework AVFoundation -framework CoreFoundation -framework ImageIO -framework CoreMedia -framework Foundation -framework CoreGraphics -lobjc # with the exception of CoreFoundation, due to the warning in https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-sdk/frameworks.nix#L25 - inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox; }; kbfs = callPackage ../tools/security/keybase/kbfs.nix { }; @@ -9469,8 +9442,6 @@ with pkgs; keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; - keymapp = callPackage ../applications/misc/keymapp { }; - keyscope = callPackage ../tools/security/keyscope { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit Security; }; @@ -9564,7 +9535,7 @@ with pkgs; last-resort = callPackage ../data/fonts/last-resort { }; ligo = - let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in + let ocaml_p = ocaml-ng.ocamlPackages_4_14; in callPackage ../development/compilers/ligo { coq = coq_8_13.override { customOCamlPackages = ocaml_p; @@ -10141,9 +10112,7 @@ with pkgs; libite = callPackage ../development/libraries/libite { }; - liblangtag = callPackage ../development/libraries/liblangtag { - inherit (gnome) gnome-common; - }; + liblangtag = callPackage ../development/libraries/liblangtag { }; liblouis = callPackage ../development/libraries/liblouis { }; @@ -11080,10 +11049,8 @@ with pkgs; nzbget = callPackage ../tools/networking/nzbget { }; nzbhydra2 = callPackage ../servers/nzbhydra2 { - # You need Java (at least 8, at most 15) - # https://github.com/theotherp/nzbhydra2/issues/697 - # https://github.com/theotherp/nzbhydra2/#how-to-run - jre = openjdk11; + # Requires Java 17, not lower, not higher + jre = openjdk17; }; oapi-codegen = callPackage ../tools/networking/oapi-codegen { }; @@ -11268,6 +11235,8 @@ with pkgs; etcDir = "/etc/ssh"; }; + opensshTest = openssh.tests.openssh; + opensshWithKerberos = openssh.override { withKerberos = true; }; @@ -11620,8 +11589,6 @@ with pkgs; pdf-quench = callPackage ../applications/misc/pdf-quench { }; - pdfarranger = callPackage ../applications/misc/pdfarranger { }; - briss = callPackage ../tools/graphics/briss { }; brickd = callPackage ../servers/brickd { }; @@ -11894,8 +11861,6 @@ with pkgs; pretender = callPackage ../tools/security/pretender { }; - prettierd = callPackage ../development/tools/prettierd { }; - pretty-simple = callPackage ../development/tools/pretty-simple { }; prettyping = callPackage ../tools/networking/prettyping { }; @@ -12293,8 +12258,6 @@ with pkgs; rtss = callPackage ../development/tools/misc/rtss { }; - realvnc-vnc-viewer = callPackage ../tools/admin/realvnc-vnc-viewer { }; - re-isearch = callPackage ../applications/search/re-isearch { }; reason-shell = callPackage ../applications/science/misc/reason-shell { }; @@ -12691,6 +12654,8 @@ with pkgs; seehecht = callPackage ../tools/text/seehecht { }; + segger-jlink-headless = callPackage ../by-name/se/segger-jlink/package.nix { headless = true; }; + selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { }; semantic-release = callPackage ../development/tools/semantic-release { @@ -12999,8 +12964,6 @@ with pkgs; solvespace = callPackage ../applications/graphics/solvespace { }; - sonarr = callPackage ../servers/sonarr { }; - sonata = callPackage ../applications/audio/sonata { }; sony-headphones-client = callPackage ../applications/audio/sony-headphones-client { }; @@ -13182,8 +13145,6 @@ with pkgs; staticjinja = with python3.pkgs; toPythonApplication staticjinja; - stevenblack-blocklist = callPackage ../tools/networking/stevenblack-blocklist { }; - stress = callPackage ../tools/system/stress { }; stress-ng = callPackage ../tools/system/stress-ng { }; @@ -13372,7 +13333,7 @@ with pkgs; inherit (callPackages ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - }) teleport_14 teleport_15 teleport; + }) teleport_14 teleport_15 teleport_16 teleport; telepresence = callPackage ../tools/networking/telepresence { pythonPackages = python3Packages; @@ -13431,8 +13392,6 @@ with pkgs; themes = recurseIntoAttrs (getPackagesWithPrefix "theme"); }; - thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; - theme-sh = callPackage ../tools/misc/theme-sh { }; thiefmd = callPackage ../applications/editors/thiefmd { }; @@ -14636,20 +14595,6 @@ with pkgs; xvfb-run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; - - # xvfb-run is used by a bunch of things to run tests - # and doesn't support hardware accelerated rendering - # so remove it from the rebuild heavy path for mesa - xorgserver = xorg.xorgserver.overrideAttrs(old: { - buildInputs = lib.filter (pkg: lib.getName pkg != "mesa") old.buildInputs; - configureFlags = old.configureFlags ++ [ - "--disable-glamor" - "--disable-glx" - "--disable-dri" - "--disable-dri2" - "--disable-dri3" - ]; - }); }; xvkbd = callPackage ../tools/X11/xvkbd { }; @@ -14967,6 +14912,9 @@ with pkgs; ### DEVELOPMENT / COMPILERS + temurin-bin-22 = javaPackages.compiler.temurin-bin.jdk-22; + temurin-jre-bin-22 = javaPackages.compiler.temurin-bin.jre-22; + temurin-bin-21 = javaPackages.compiler.temurin-bin.jdk-21; temurin-jre-bin-21 = javaPackages.compiler.temurin-bin.jre-21; @@ -14988,8 +14936,8 @@ with pkgs; temurin-bin-8 = javaPackages.compiler.temurin-bin.jdk-8; temurin-jre-bin-8 = javaPackages.compiler.temurin-bin.jre-8; - temurin-bin = temurin-bin-21; - temurin-jre-bin = temurin-jre-bin-21; + temurin-bin = temurin-bin-22; + temurin-jre-bin = temurin-jre-bin-22; semeru-bin-21 = javaPackages.compiler.semeru-bin.jdk-21; semeru-jre-bin-21 = javaPackages.compiler.semeru-bin.jre-21; @@ -16012,8 +15960,7 @@ with pkgs; openjdk = jdk; openjdk_headless = jdk_headless; - graalvmCEPackages = - recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { }); + graalvmCEPackages = callPackage ../development/compilers/graalvm/community-edition { }; graalvm-ce = graalvmCEPackages.graalvm-ce; buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { graalvmDrv = graalvm-ce; @@ -16178,61 +16125,33 @@ with pkgs; targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm; })); - llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_13.tools; - targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries; - targetLlvm = targetPackages.llvmPackages_13.llvm or llvmPackages_13.llvm; - stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 - })); + inherit (rec { + llvmPackagesSet = recurseIntoAttrs (callPackages ../development/compilers/llvm { }); - llvmPackages_14 = recurseIntoAttrs (callPackage ../development/compilers/llvm/14 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_14.tools; - targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries; - targetLlvm = targetPackages.llvmPackages_14.llvm or llvmPackages_14.llvm; - })); + llvmPackages_13 = llvmPackagesSet."13"; + llvmPackages_14 = llvmPackagesSet."14"; + llvmPackages_15 = llvmPackagesSet."15"; + llvmPackages_16 = llvmPackagesSet."16"; + llvmPackages_17 = llvmPackagesSet."17"; - llvmPackages_15 = recurseIntoAttrs (callPackage ../development/compilers/llvm/15 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_15.tools; - targetLlvmLibraries = targetPackages.llvmPackages_15.libraries or llvmPackages_15.libraries; - targetLlvm = targetPackages.llvmPackages_15.llvm or llvmPackages_15.llvm; - })); + llvmPackages_18 = llvmPackagesSet."18"; + clang_18 = llvmPackages_18.clang; + lld_18 = llvmPackages_18.lld; + lldb_18 = llvmPackages_18.lldb; + llvm_18 = llvmPackages_18.llvm; - llvmPackages_16 = recurseIntoAttrs (callPackage ../development/compilers/llvm/16 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_16.tools; - targetLlvmLibraries = targetPackages.llvmPackages_16.libraries or llvmPackages_16.libraries; - targetLlvm = targetPackages.llvmPackages_16.llvm or llvmPackages_16.llvm; - })); - - llvmPackages_17 = recurseIntoAttrs (callPackage ../development/compilers/llvm/17 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_17.tools; - targetLlvmLibraries = targetPackages.llvmPackages_17.libraries or llvmPackages_17.libraries; - targetLlvm = targetPackages.llvmPackages_17.llvm or llvmPackages_17.llvm; - })); - - inherit - (rec { - llvmPackages_18 = recurseIntoAttrs (callPackage ../development/compilers/llvm/18 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_18.tools; - targetLlvmLibraries = targetPackages.llvmPackages_18.libraries or llvmPackages_18.libraries; - targetLlvm = targetPackages.llvmPackages_18.llvm or llvmPackages_18.llvm; - })); - - clang_18 = llvmPackages_18.clang; - lld_18 = llvmPackages_18.lld; - lldb_18 = llvmPackages_18.lldb; - llvm_18 = llvmPackages_18.llvm; - }) - llvmPackages_18 - clang_18 - lld_18 - lldb_18 - llvm_18; + llvmPackages_git = llvmPackagesSet.git; + }) llvmPackages_13 + llvmPackages_14 + llvmPackages_15 + llvmPackages_16 + llvmPackages_17 + llvmPackages_18 + clang_18 + lld_18 + lldb_18 + llvm_18 + llvmPackages_git; lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; @@ -16641,8 +16560,6 @@ with pkgs; cauwugo = callPackage ../development/tools/rust/cauwugo { }; - crate2nix = callPackage ../development/tools/rust/crate2nix { }; - critcmp = callPackage ../development/tools/rust/critcmp { }; devspace = callPackage ../development/tools/misc/devspace { }; @@ -17291,11 +17208,11 @@ with pkgs; # available as `pythonPackages.tkinter` and can be used as any other Python package. # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md python2 = python27; - python3 = python311; + python3 = python312; # pythonPackages further below, but assigned here because they need to be in sync python2Packages = dontRecurseIntoAttrs python27Packages; - python3Packages = dontRecurseIntoAttrs python311Packages; + python3Packages = dontRecurseIntoAttrs python312Packages; pypy = pypy2; pypy2 = pypy27; @@ -17998,11 +17915,13 @@ with pkgs; binutils-unwrapped = callPackage ../development/tools/misc/binutils { autoreconfHook = autoreconfHook269; + inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; }; binutils-unwrapped-all-targets = callPackage ../development/tools/misc/binutils { autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook; + inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; withAllTargets = true; @@ -19030,10 +18949,6 @@ with pkgs; nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; - nexus = callPackage ../development/tools/repository-managers/nexus { - jre_headless = jre8_headless; - }; - nexusmods-app-unfree = callPackage ../by-name/ne/nexusmods-app/package.nix { enableUnfree = true; }; @@ -20011,7 +19926,7 @@ with pkgs; bicpl = callPackage ../development/libraries/science/biology/bicpl { }; - bicgl = callPackage ../development/libraries/science/biology/bicgl { inherit (darwin.apple_sdk.frameworks) GLUT; }; + bicgl = callPackage ../development/libraries/science/biology/bicgl { }; # TODO(@Ericson2314): Build bionic libc from source bionic = if stdenv.hostPlatform.useAndroidPrebuilt @@ -20448,7 +20363,9 @@ with pkgs; # TODO: Fix references and add justStaticExecutables https://github.com/NixOS/nixpkgs/issues/318013 emanote = haskellPackages.emanote; - enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; + enchant2 = callPackage ../development/libraries/enchant/2.x.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; enchant = enchant2; enet = callPackage ../development/libraries/enet { }; @@ -20497,8 +20414,6 @@ with pkgs; fb303 = darwin.apple_sdk_11_0.callPackage ../development/libraries/fb303 { }; - fcgi = callPackage ../development/libraries/fcgi { }; - fcl = callPackage ../development/libraries/fcl { }; febio = callPackage ../development/libraries/febio { }; @@ -20559,8 +20474,6 @@ with pkgs; flint3 = callPackage ../development/libraries/flint/3.nix { }; - flite = callPackage ../development/libraries/flite { }; - fltk13 = callPackage ../development/libraries/fltk { inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa OpenGL; }; @@ -20819,7 +20732,7 @@ with pkgs; glfw-wayland-minecraft = callPackage ../development/libraries/glfw/3.x-wayland-minecraft.nix {}; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL; + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; }; glibc = callPackage ../development/libraries/glibc { @@ -21322,7 +21235,7 @@ with pkgs; icu74 ; - icu = icu73; + icu = icu74; id3lib = callPackage ../development/libraries/id3lib { }; @@ -21968,9 +21881,6 @@ with pkgs; libglibutil = callPackage ../development/libraries/libglibutil { }; - libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome-keyring3 = gnome.libgnome-keyring; - libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { }; libgnome-games-support_2_0 = callPackage ../development/libraries/libgnome-games-support/2.0.nix { }; @@ -23136,26 +23046,59 @@ with pkgs; ## libGL/libGLU/Mesa stuff - # Default libGL implementation, should provide headers and - # libGL.so/libEGL.so/... to link agains them. Android NDK provides - # an OpenGL implementation, we can just use that. - libGL = if stdenv.hostPlatform.useAndroidPrebuilt then stdenv - else callPackage ../development/libraries/mesa/stubs.nix { - inherit (darwin.apple_sdk.frameworks) OpenGL; - }; + # Default libGL implementation. + # + # Android NDK provides an OpenGL implementation, we can just use that. + # + # On macOS, we use the OpenGL framework. Packages that still need GLX + # specifically can pull in libGLX instead. If you have a package that + # should work without X11 but it can’t find the library, it may help + # to add the path to `NIX_CFLAGS_COMPILE`: + # + # -L${libGL}/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries + # + # If you still can’t get it working, please don’t hesitate to ping + # @NixOS/darwin-maintainers to ask an expert to take a look. + libGL = + if stdenv.hostPlatform.useAndroidPrebuilt then + stdenv + else if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk.frameworks.OpenGL + else + libglvnd; - # Default libGLU - libGLU = mesa_glu; + # On macOS, we use the OpenGL framework. Packages that use libGLX on + # macOS may need to depend on mesa_glu directly if this doesn’t work. + libGLU = + if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk.frameworks.OpenGL + else + mesa_glu; + + # libglvnd does not work (yet?) on macOS. + libGLX = + if stdenv.hostPlatform.isDarwin then + mesa + else + libglvnd; + + # On macOS, we use the GLUT framework. Packages that use libGLX on + # macOS may need to depend on freeglut directly if this doesn’t work. + libglut = + if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk.frameworks.GLUT + else + freeglut; + + mesa = if stdenv.isDarwin + then darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/darwin.nix { + inherit (darwin.apple_sdk_11_0.libs) Xplugin; + } + else callPackage ../development/libraries/mesa {}; - mesa = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa { - inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; - inherit (darwin.apple_sdk_11_0.libs) Xplugin; - }; mesa_i686 = pkgsi686Linux.mesa; # make it build on Hydra - mesa_glu = callPackage ../development/libraries/mesa-glu { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; + mesa_glu = callPackage ../development/libraries/mesa-glu {}; ## End libGL/libGLU/Mesa stuff @@ -24607,8 +24550,6 @@ with pkgs; vencord-web-extension = callPackage ../by-name/ve/vencord/package.nix { buildWebExtension = true; }; - vesktop = callPackage ../by-name/ve/vesktop/package.nix { pnpm = pnpm_8; }; - vid-stab = callPackage ../development/libraries/vid-stab { inherit (llvmPackages) openmp; }; @@ -24808,8 +24749,6 @@ with pkgs; xlslib = callPackage ../development/libraries/xlslib { }; - xsimd = callPackage ../development/libraries/xsimd { }; - xtensor = callPackage ../development/libraries/xtensor { }; xtl = callPackage ../development/libraries/xtl { }; @@ -24982,6 +24921,7 @@ with pkgs; mockobjects = callPackage ../development/libraries/java/mockobjects { }; saxonb = saxonb_8_8; + saxon-he = saxon_12-he; inherit (callPackages ../development/libraries/java/saxon { jre = jre_headless; @@ -24991,12 +24931,12 @@ with pkgs; saxonb_8_8 saxonb_9_1 saxon_9-he - saxon-he; + saxon_11-he + saxon_12-he; smack = callPackage ../development/libraries/java/smack { }; - swt = callPackage ../development/libraries/java/swt { }; - swt_jdk8 = callPackage ../development/libraries/java/swt { + swt_jdk8 = callPackage ../by-name/sw/swt/package.nix { jdk = jdk8; }; @@ -25145,17 +25085,17 @@ with pkgs; }; # Steel Bank Common Lisp - sbcl_2_4_4 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.4"; }; - faslExt = "fasl"; - flags = [ "--dynamic-space-size" "3000" ]; - }; sbcl_2_4_5 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.4.5"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_5; + sbcl_2_4_6 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.6"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl = sbcl_2_4_6; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -25253,39 +25193,26 @@ with pkgs; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { inherit apacheHttpd; - mod_auth_mellon = callPackage ../servers/http/apache-modules/mod_auth_mellon { }; - - # Redwax collection mod_ca = callPackage ../servers/http/apache-modules/mod_ca { }; mod_crl = callPackage ../servers/http/apache-modules/mod_crl { }; - mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; mod_cspnonce = callPackage ../servers/http/apache-modules/mod_cspnonce { }; - mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp{ }; - mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; - mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; - mod_spkac= callPackage ../servers/http/apache-modules/mod_spkac { }; - mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { }; - + mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { }; - - - mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; - mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; - - mod_python = callPackage ../servers/http/apache-modules/mod_python { }; - - mod_tile = callPackage ../servers/http/apache-modules/mod_tile { }; - - mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { }; - mod_itk = callPackage ../servers/http/apache-modules/mod_itk { }; - + mod_jk = callPackage ../servers/http/apache-modules/mod_jk { }; mod_mbtiles = callPackage ../servers/http/apache-modules/mod_mbtiles { }; - + mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp { }; + mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; + mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; + mod_python = callPackage ../servers/http/apache-modules/mod_python { }; + mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; + mod_spkac = callPackage ../servers/http/apache-modules/mod_spkac { }; + mod_tile = callPackage ../servers/http/apache-modules/mod_tile { }; + mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { }; + mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { }; php = pkgs.php.override { inherit apacheHttpd; }; - subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; } // lib.optionalAttrs config.allowAliases { mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4"; @@ -25505,6 +25432,7 @@ with pkgs; freeradius = callPackage ../servers/freeradius { }; freshrss = callPackage ../servers/web-apps/freshrss { }; + freshrss-extensions = recurseIntoAttrs (callPackage ../servers/web-apps/freshrss/extensions { }); freeswitch = callPackage ../servers/sip/freeswitch { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; @@ -25967,8 +25895,6 @@ with pkgs; pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { }; - tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; - tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; pies = callPackage ../servers/pies { }; @@ -26771,7 +26697,7 @@ with pkgs; criu = callPackage ../os-specific/linux/criu { }; cryptomator = callPackage ../tools/security/cryptomator { - jdk = jdk21.override { enableJavaFX = true; }; + jdk = jdk22.override { enableJavaFX = true; }; }; cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; @@ -27483,7 +27409,7 @@ with pkgs; octomap = callPackage ../development/libraries/octomap { }; - odin = callPackage ../development/compilers/odin { + odin = callPackage ../by-name/od/odin/package.nix { inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; llvmPackages = llvmPackages_18; @@ -27664,6 +27590,8 @@ with pkgs; sddm-chili-theme = libsForQt5.callPackage ../data/themes/chili-sddm { }; + sddm-sugar-dark = libsForQt5.callPackage ../data/themes/sddm-sugar-dark { }; + sdparm = callPackage ../os-specific/linux/sdparm { }; sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { @@ -28070,6 +27998,8 @@ with pkgs; dracula-theme = callPackage ../data/themes/dracula-theme { }; + dracula-qt5-theme = callPackage ../data/themes/dracula-qt5-theme { }; + ant-nebula-theme = callPackage ../data/themes/ant-theme/ant-nebula.nix { }; arc-icon-theme = callPackage ../data/icons/arc-icon-theme { }; @@ -28500,7 +28430,6 @@ with pkgs; kopia = callPackage ../tools/backup/kopia { }; kora-icon-theme = callPackage ../data/icons/kora-icon-theme { - inherit (gnome) adwaita-icon-theme; inherit (libsForQt5.kdeFrameworks) breeze-icons; }; @@ -28619,11 +28548,9 @@ with pkgs; martian-mono = callPackage ../data/fonts/martian-mono { }; - marwaita = callPackage ../data/themes/marwaita { }; - - marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; - - marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { }; + marwaita-icons = callPackage ../by-name/ma/marwaita-icons/package.nix { + inherit (kdePackages) breeze-icons; + }; marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { }; @@ -28741,7 +28668,6 @@ with pkgs; }; numix-icon-theme = callPackage ../data/icons/numix-icon-theme { - inherit (gnome) adwaita-icon-theme; inherit (plasma5Packages) breeze-icons; }; @@ -28848,9 +28774,7 @@ with pkgs; pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; - pop-icon-theme = callPackage ../data/icons/pop-icon-theme { - inherit (gnome) adwaita-icon-theme; - }; + pop-icon-theme = callPackage ../data/icons/pop-icon-theme { }; powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; @@ -28927,8 +28851,6 @@ with pkgs; skeu = callPackage ../data/themes/skeu { }; - sweet = callPackage ../data/themes/sweet { }; - sweet-nova = callPackage ../data/themes/sweet-nova { }; shared-mime-info = callPackage ../data/misc/shared-mime-info { }; @@ -29008,9 +28930,7 @@ with pkgs; recursive = callPackage ../data/fonts/recursive { }; - reversal-icon-theme = callPackage ../data/icons/reversal-icon-theme { - inherit (gnome) adwaita-icon-theme; - }; + reversal-icon-theme = callPackage ../data/icons/reversal-icon-theme { }; rubik = callPackage ../data/fonts/rubik { }; @@ -29094,7 +29014,6 @@ with pkgs; the-neue-black = callPackage ../data/fonts/the-neue-black { }; tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { - inherit (gnome) adwaita-icon-theme; inherit (libsForQt5) breeze-icons; }; @@ -29402,6 +29321,10 @@ with pkgs; android-studio = androidStudioPackages.stable; android-studio-full = android-studio.full; + androidStudioForPlatformPackages = recurseIntoAttrs + (callPackage ../applications/editors/android-studio-for-platform { }); + android-studio-for-platform = androidStudioForPlatformPackages.stable; + antfs-cli = callPackage ../applications/misc/antfs-cli { }; antimony = libsForQt5.callPackage ../applications/graphics/antimony { }; @@ -29473,12 +29396,11 @@ with pkgs; aucatctl = callPackage ../applications/audio/aucatctl { }; - audacious = libsForQt5.callPackage ../applications/audio/audacious { }; - audacious-plugins = libsForQt5.callPackage ../applications/audio/audacious/plugins.nix { + audacious = qt6Packages.callPackage ../applications/audio/audacious { }; + audacious-plugins = qt6Packages.callPackage ../applications/audio/audacious/plugins.nix { # Avoid circular dependency audacious = audacious.override { audacious-plugins = null; }; }; - audaciousQt5 = audacious; audacity = callPackage ../applications/audio/audacity { inherit (darwin.apple_sdk.frameworks) AppKit CoreAudioKit; @@ -29589,8 +29511,6 @@ with pkgs; awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { }; - inherit (gnome) baobab; - badwolf = callPackage ../applications/networking/browsers/badwolf { }; backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; @@ -29609,8 +29529,6 @@ with pkgs; bashSnippets = callPackage ../applications/misc/bashSnippets { }; - batik = callPackage ../applications/graphics/batik { }; - batsignal = callPackage ../applications/misc/batsignal { }; baudline = callPackage ../applications/audio/baudline { }; @@ -29773,8 +29691,6 @@ with pkgs; podofo = podofo010; }; - calibre-web = callPackage ../servers/calibre-web { }; - # calico-felix and calico-node have not been packaged due to libbpf, linking issues inherit (callPackage ../applications/networking/cluster/calico {}) calico-apiserver @@ -29928,10 +29844,6 @@ with pkgs; coreth = callPackage ../applications/networking/coreth { }; - coriander = callPackage ../applications/video/coriander { - inherit (gnome2) libgnomeui GConf; - }; - cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { }; csa = callPackage ../applications/audio/csa { }; @@ -30111,7 +30023,7 @@ with pkgs; dnglab = callPackage ../tools/graphics/dnglab { }; inherit (callPackage ../applications/virtualization/docker {}) - docker_24 docker_25 docker_26; + docker_24 docker_25 docker_26 docker_27; docker = docker_24; docker-client = docker.override { clientOnly = true; }; @@ -30191,9 +30103,7 @@ with pkgs; dvd-slideshow = callPackage ../applications/video/dvd-slideshow { }; - dvdstyler = callPackage ../applications/video/dvdstyler { - inherit (gnome2) libgnomeui; - }; + dvdstyler = callPackage ../applications/video/dvdstyler { }; dyff = callPackage ../development/tools/dyff { }; @@ -30270,7 +30180,7 @@ with pkgs; em = callPackage ../applications/editors/em { }; - inherit (recurseIntoAttrs (darwin.apple_sdk_11_0.callPackage ../applications/editors/emacs { })) + inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) emacs28 emacs28-gtk2 emacs28-gtk3 @@ -30318,8 +30228,6 @@ with pkgs; epgstation = callPackage ../applications/video/epgstation { }; - inherit (gnome) epiphany; - ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; epic5 = callPackage ../applications/networking/irc/epic5 { }; @@ -30407,8 +30315,6 @@ with pkgs; keeweb = callPackage ../applications/misc/keeweb { }; - inherit (gnome) evince; - evolution-data-server = gnome.evolution-data-server; evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; }; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; @@ -30745,8 +30651,6 @@ with pkgs; gthumb = callPackage ../applications/graphics/gthumb { }; - inherit (gnome) gucharmap; - guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; }; @@ -30826,6 +30730,7 @@ with pkgs; firefox-beta-unwrapped = firefoxPackages.firefox-beta; firefox-devedition-unwrapped = firefoxPackages.firefox-devedition; firefox-esr-115-unwrapped = firefoxPackages.firefox-esr-115; + firefox-esr-128-unwrapped = firefoxPackages.firefox-esr-128; firefox-esr-unwrapped = firefoxPackages.firefox-esr-115; firefox = wrapFirefox firefox-unwrapped { }; @@ -30844,16 +30749,21 @@ with pkgs; firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { }; - firefox-esr = firefox-esr-115; + firefox-esr-128 = wrapFirefox firefox-esr-128-unwrapped { + nameSuffix = "-esr"; + desktopName = "Firefox ESR"; + wmClass = "firefox-esr"; + icon = "firefox-esr"; + }; firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped { nameSuffix = "-esr"; desktopName = "Firefox ESR"; wmClass = "firefox-esr"; icon = "firefox-esr"; }; + firefox-esr = firefox-esr-115; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { - inherit (gnome) adwaita-icon-theme; channel = "release"; generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; }; @@ -30863,7 +30773,6 @@ with pkgs; }; firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { - inherit (gnome) adwaita-icon-theme; channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; }; @@ -30874,7 +30783,6 @@ with pkgs; }; firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { - inherit (gnome) adwaita-icon-theme; channel = "developer-edition"; generated = import ../applications/networking/browsers/firefox-bin/developer-edition_sources.nix; }; @@ -31023,8 +30931,6 @@ with pkgs; gitolite = callPackage ../applications/version-management/gitolite { }; - inherit (gnome) gitg; - gmrun = callPackage ../applications/misc/gmrun { }; gnucash = callPackage ../applications/office/gnucash { }; @@ -31102,8 +31008,8 @@ with pkgs; metacubexd = callPackage ../by-name/me/metacubexd/package.nix { pnpm = callPackage ../development/tools/pnpm/generic.nix { - version = "9.1.4"; - hash = "sha256-MKGAGsTnI3ee/tE6IfTDn562yfu0ztEBvOBrQiWT18k="; + version = "9.4.0"; + hash = "sha256-tv0L/aVV5+WErX5WswxosB1aBPnuk5ifS5PKhHPEnHQ="; }; }; @@ -31206,9 +31112,7 @@ with pkgs; gnomecast = callPackage ../applications/video/gnomecast { }; - gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome) gnome-autoar; - }; + gnome-recipes = callPackage ../applications/misc/gnome-recipes { }; gollum = callPackage ../applications/misc/gollum { }; @@ -31311,8 +31215,6 @@ with pkgs; hex-a-hop = callPackage ../games/hex-a-hop { }; - hexchat = callPackage ../applications/networking/irc/hexchat { }; - hexcurse = callPackage ../applications/editors/hexcurse { }; hexdino = callPackage ../applications/editors/hexdino { }; @@ -31430,10 +31332,6 @@ with pkgs; meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { }; - musikcube = callPackage ../applications/audio/musikcube { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio SystemConfiguration; - }; - libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { }; mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { }; @@ -31637,8 +31535,6 @@ with pkgs; id3v2 = callPackage ../applications/audio/id3v2 { }; - identity = callPackage ../applications/graphics/identity { }; - ifenslave = callPackage ../os-specific/linux/ifenslave { }; ii = callPackage ../applications/networking/irc/ii { @@ -31969,23 +31865,10 @@ with pkgs; kondo = callPackage ../applications/misc/kondo { }; - kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreFoundation CoreServices CoreText CoreGraphics - CoreMedia OpenGL AudioUnit ApplicationServices Foundation AGL Security SystemConfiguration - Carbon AudioToolbox VideoToolbox VideoDecodeAcceleration AVFoundation CoreAudio CoreVideo - CoreMediaIO QuartzCore AppKit CoreWLAN WebKit IOKit GSS MediaPlayer IOSurface Metal MetalKit; - + kotatogram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { stdenv = if stdenv.isDarwin - then overrideSDK llvmPackages_14.stdenv "11.0" + then overrideSDK stdenv "11.0" else stdenv; - - # telegram-desktop has random crashes when jemalloc is built with gcc. - # Apparently, it triggers some bug due to usage of gcc's builtin - # functions like __builtin_ffsl by jemalloc when it's built with gcc. - jemalloc = (jemalloc.override { stdenv = clangStdenv; }).overrideAttrs { - # no idea how to fix the tests :( - doCheck = false; - }; }; kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix { }; @@ -32503,9 +32386,7 @@ with pkgs; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; - mepo = callPackage ../applications/misc/mepo { - inherit (gnome) zenity; - }; + mepo = callPackage ../applications/misc/mepo { }; meshcentral = callPackage ../tools/admin/meshcentral { }; @@ -32633,13 +32514,6 @@ with pkgs; moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; - moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - SDL2 = buildPackages.SDL2.override { - drmSupport = stdenv.isLinux; - }; - }; - mooSpace = callPackage ../applications/audio/mooSpace { }; mop = callPackage ../applications/misc/mop { }; @@ -33764,7 +33638,6 @@ with pkgs; quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss { }; quodlibet = callPackage ../applications/audio/quodlibet { - inherit (gnome) adwaita-icon-theme; kakasi = null; keybinder3 = null; libappindicator-gtk3 = null; @@ -33881,8 +33754,6 @@ with pkgs; rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { }; - remnote = callPackage ../applications/misc/remnote { }; - remotebox = callPackage ../applications/virtualization/remotebox { }; restique = libsForQt5.callPackage ../applications/backup/restique { }; @@ -33976,9 +33847,7 @@ with pkgs; rusty-psn-gui = rusty-psn.override { withGui = true; }; - rymcast = callPackage ../applications/audio/rymcast { - inherit (gnome) zenity; - }; + rymcast = callPackage ../applications/audio/rymcast { }; rymdport = callPackage ../applications/networking/rymdport { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; @@ -34059,8 +33928,6 @@ with pkgs; sic-image-cli = callPackage ../tools/graphics/sic-image-cli { }; - simple-scan = gnome.simple-scan; - sioyek = libsForQt5.callPackage ../applications/misc/sioyek { }; siproxd = callPackage ../applications/networking/siproxd { }; @@ -34073,8 +33940,6 @@ with pkgs; libjpeg_turbo = libjpeg8; }; - skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; - slingshot = callPackage ../tools/misc/slingshot { }; slop = callPackage ../tools/misc/slop { }; @@ -34358,7 +34223,6 @@ with pkgs; surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; surge = callPackage ../applications/audio/surge { - inherit (gnome) zenity; git = gitMinimal; }; @@ -34587,7 +34451,6 @@ with pkgs; desktopName = "Thunderbird"; }; thunderbird-bin-unwrapped = callPackage ../applications/networking/mailreaders/thunderbird-bin { - inherit (gnome) adwaita-icon-theme; generated = import ../applications/networking/mailreaders/thunderbird-bin/release_sources.nix; }; @@ -34656,10 +34519,6 @@ with pkgs; tofi = callPackage ../applications/misc/tofi { }; - tokyonight-gtk-theme = tokyonight-gtk-theme-variants.full; - - tokyonight-gtk-theme-variants = recurseIntoAttrs (callPackage ../data/themes/tokyonight-gtk-theme { }); - topydo = callPackage ../applications/misc/topydo { }; torrential = callPackage ../applications/networking/p2p/torrential { }; @@ -34882,9 +34741,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL; }; - verbiste = callPackage ../applications/misc/verbiste { - inherit (gnome2) libgnomeui; - }; + verbiste = callPackage ../applications/misc/verbiste { }; veusz = libsForQt5.callPackage ../applications/graphics/veusz { }; @@ -34894,7 +34751,11 @@ with pkgs; vimiv-qt = callPackage ../applications/graphics/vimiv-qt { }; - macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; }; + macvim = let + macvimUtils = callPackage ../applications/editors/vim/macvim-configurable.nix { }; + in macvimUtils.makeCustomizable (callPackage ../applications/editors/vim/macvim.nix { + stdenv = clangStdenv; + }); vim-full = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/full.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; @@ -34944,14 +34805,10 @@ with pkgs; }; neovim = wrapNeovim neovim-unwrapped { }; - neovim-gtk = callPackage ../applications/editors/neovim/neovim-gtk.nix { }; - gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { }; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; - neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; - viw = callPackage ../applications/editors/viw { }; virter = callPackage ../applications/virtualization/virter { }; @@ -35604,8 +35461,6 @@ with pkgs; yeetgif = callPackage ../applications/graphics/yeetgif { }; - inherit (gnome) yelp; - yelp-tools = callPackage ../development/misc/yelp-tools { }; yewtube = callPackage ../applications/misc/yewtube { }; @@ -35729,7 +35584,6 @@ with pkgs; alfis = callPackage ../applications/blockchains/alfis { inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit; - inherit (gnome) zenity; }; alfis-nogui = alfis.override { withGui = false; @@ -36338,11 +36192,11 @@ with pkgs; construoBase = lowPrio (callPackage ../games/construo { libGL = null; libGLU = null; - freeglut = null; + libglut = null; }); construo = construoBase.override { - inherit libGL libGLU freeglut; + inherit libGL libGLU libglut; }; crack_attack = callPackage ../games/crack-attack { }; @@ -36571,10 +36425,6 @@ with pkgs; graphwar = callPackage ../games/graphwar { }; - gtetrinet = callPackage ../games/gtetrinet { - inherit (gnome2) GConf libgnome libgnomeui; - }; - gtypist = callPackage ../games/gtypist { }; gweled = callPackage ../games/gweled { }; @@ -37480,8 +37330,6 @@ with pkgs; latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; - gnome-themes-extra = gnome.gnome-themes-extra; - xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; ### SCIENCE/CHEMISTY @@ -38030,8 +37878,6 @@ with pkgs; p4est-sc = p4est-sc-dbg; }; - petsc = callPackage ../development/libraries/science/math/petsc { }; - parmetis = callPackage ../development/libraries/science/math/parmetis { }; QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { }; @@ -38288,23 +38134,23 @@ with pkgs; ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; - isabelle = callPackage ../applications/science/logic/isabelle { + isabelle = callPackage ../by-name/is/isabelle/package.nix { polyml = polyml.overrideAttrs { pname = "polyml-for-isabelle"; - version = "2023"; + version = "2024"; configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; buildFlags = [ "compiler" ]; src = fetchFromGitHub { owner = "polyml"; repo = "polyml"; - rev = "219e0a248f705b770d45699755d00f05b82a9391"; - hash = "sha256-HtT3MGtHrqVhynmx73L7NC12AW9N7gkkOi7MKbF4k6Y="; + rev = "v5.9.1"; + hash = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA="; }; }; - java = openjdk17; + java = openjdk21; }; - isabelle-components = recurseIntoAttrs (callPackage ../applications/science/logic/isabelle/components { }); + isabelle-components = recurseIntoAttrs (callPackage ../by-name/is/isabelle/components { }); iprover = callPackage ../applications/science/logic/iprover { }; @@ -38876,8 +38722,6 @@ with pkgs; brightnessctl = callPackage ../misc/brightnessctl { }; - cached-nix-shell = callPackage ../tools/nix/cached-nix-shell { }; - calaos_installer = libsForQt5.callPackage ../misc/calaos/installer { }; civo = callPackage ../applications/networking/cluster/civo { }; @@ -39941,8 +39785,6 @@ with pkgs; buildGoModule = buildGo122Module; }; - vnote = libsForQt5.callPackage ../applications/office/vnote { }; - sshportal = callPackage ../servers/sshportal { }; ssh-audit = callPackage ../tools/security/ssh-audit { }; @@ -40312,8 +40154,6 @@ with pkgs; dart = callPackage ../development/compilers/dart { }; - dart-sass = callPackage ../development/tools/misc/dart-sass { }; - pub2nix = recurseIntoAttrs (callPackage ../build-support/dart/pub2nix { }); buildDartApplication = callPackage ../build-support/dart/build-dart-application { }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index cca74e047dbd..2fb7539f4198 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -48,11 +48,15 @@ makeScopeWithSplicing' { }; # Pick an SDK - apple_sdk = if stdenv.hostPlatform.isAarch64 then apple_sdk_11_0 else apple_sdk_10_12; + apple_sdk = { + "10.12" = apple_sdk_10_12; + "11.0" = apple_sdk_11_0; + }.${stdenv.hostPlatform.darwinSdkVersion} + or (throw "Unsupported sdk: ${stdenv.hostPlatform.darwinSdkVersion}"); # Pick the source of libraries: either Apple's open source releases, or the # SDK. - useAppleSDKLibs = stdenv.hostPlatform.isAarch64; + useAppleSDKLibs = lib.versionAtLeast stdenv.hostPlatform.darwinSdkVersion "11"; selectAttrs = attrs: names: lib.listToAttrs (lib.concatMap (n: lib.optionals (attrs ? "${n}") [(lib.nameValuePair n attrs."${n}")]) names); @@ -83,8 +87,8 @@ impure-cmds // appleSourcePackages // chooseLibs // { }; binutils-unwrapped = callPackage ../os-specific/darwin/binutils { - inherit (pkgs) binutils-unwrapped; - inherit (pkgs.llvmPackages) llvm clang-unwrapped; + inherit (self) cctools; + inherit (pkgs.llvmPackages) clang-unwrapped llvm llvm-manpages; }; binutils = pkgs.wrapBintoolsWith { @@ -95,17 +99,29 @@ impure-cmds // appleSourcePackages // chooseLibs // { bintools = self.binutils-unwrapped; }; - binutilsDualAs-unwrapped = callPackage ../os-specific/darwin/binutils { - inherit (pkgs) binutils-unwrapped; - inherit (pkgs.llvmPackages) llvm clang-unwrapped; - dualAs = true; + # x86-64 Darwin gnat-bootstrap emits assembly + # with MOVQ as the mnemonic for quadword interunit moves + # such as `movq %rbp, %xmm0`. + # The clang integrated assembler recognises this as valid, + # but unfortunately the cctools.gas GNU assembler does not; + # it instead uses MOVD as the mnemonic. + # The assembly that a GCC build emits is determined at build time + # and cannot be changed afterwards. + # + # To build GNAT on x86-64 Darwin, therefore, + # we need both the clang _and_ the cctools.gas assemblers to be available: + # the former to build at least the stage1 compiler, + # and the latter at least to be detectable + # as the target for the final compiler. + binutilsDualAs-unwrapped = pkgs.buildEnv { + name = "${lib.getName self.binutils-unwrapped}-dualas-${lib.getVersion self.binutils-unwrapped}"; + paths = [ + self.binutils-unwrapped + (lib.getOutput "gas" self.cctools) + ]; }; - binutilsDualAs = pkgs.wrapBintoolsWith { - libc = - if stdenv.targetPlatform != stdenv.hostPlatform - then pkgs.libcCross - else pkgs.stdenv.cc.libc; + binutilsDualAs = self.binutils.override { bintools = self.binutilsDualAs-unwrapped; }; @@ -114,7 +130,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { bintools = self.binutils-unwrapped; }; - cctools = self.cctools-llvm; + cctools = self.cctools-port; cctools-apple = callPackage ../os-specific/darwin/cctools/apple.nix { stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index a14f53d53528..383ba5d73008 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -47,7 +47,7 @@ let inherit lib pkgs; }; - emacsWithPackages = { pkgs, lib }: pkgs.callPackage ../build-support/emacs/wrapper.nix { + emacsWithPackages = { pkgs, lib }: pkgs.callPackage ../applications/editors/emacs/build-support/wrapper.nix { inherit (pkgs.xorg) lndir; inherit lib; }; @@ -77,11 +77,11 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ }; }); - trivialBuild = pkgs.callPackage ../build-support/emacs/trivial.nix { + trivialBuild = pkgs.callPackage ../applications/editors/emacs/build-support/trivial.nix { inherit (self) emacs; }; - melpaBuild = pkgs.callPackage ../build-support/emacs/melpa.nix { + melpaBuild = pkgs.callPackage ../applications/editors/emacs/build-support/melpa.nix { inherit (self) emacs; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b924a29f2616..ad8a4b947964 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -78,7 +78,8 @@ in { packages.ghc865Binary else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. @@ -94,7 +95,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr; buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; @@ -106,7 +108,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. @@ -120,7 +123,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. @@ -134,7 +138,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. @@ -148,7 +153,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. @@ -172,7 +178,8 @@ in { packages.ghc902 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. @@ -196,7 +203,8 @@ in { packages.ghc902 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 2d59c358863b..c80d6c28f840 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -227,7 +227,7 @@ in { ../development/compilers/openjdk/22.nix ../development/compilers/zulu/22.nix { - openjdk22-bootstrap = temurin-bin.jdk-21; + openjdk22-bootstrap = temurin-bin.jdk-22; openjfx = openjfx22; }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 104d8821ff6a..bc80ec658846 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -343,7 +343,7 @@ in { dddvb = callPackage ../os-specific/linux/dddvb { }; - decklink = callPackage ../os-specific/linux/decklink { }; + decklink = throw "The decklink kernel module has been removed due to being unmaintained"; # Module removed on 2024-07-02 digimend = callPackage ../os-specific/linux/digimend { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e39b990ecae1..4b47c2d974dc 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -173,7 +173,7 @@ rec { }) {}; nfd = callPackage ../development/lua-modules/nfd { - inherit (pkgs.gnome) zenity; + inherit (pkgs) zenity; inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 259864f22a78..d516da1b12e0 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -92,7 +92,7 @@ let biocaml = janeStreet_0_15.biocaml; - biotk = janeStreet_0_15.biotk; + biotk = callPackage ../development/ocaml-modules/biotk { }; bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { }; @@ -610,6 +610,10 @@ let github-jsoo = callPackage ../development/ocaml-modules/github/jsoo.nix { }; github-unix = callPackage ../development/ocaml-modules/github/unix.nix { }; + gitlab = callPackage ../development/ocaml-modules/gitlab { }; + gitlab-jsoo = callPackage ../development/ocaml-modules/gitlab/jsoo.nix { }; + gitlab-unix = callPackage ../development/ocaml-modules/gitlab/unix.nix { }; + gluon = callPackage ../development/ocaml-modules/gluon { }; gluten = callPackage ../development/ocaml-modules/gluten { }; @@ -836,22 +840,6 @@ let cfstream = self.cfstream.override { inherit core_kernel; }; }; - biotk = let - angstrom = self.angstrom.override { inherit ppx_let; }; - in callPackage ../development/ocaml-modules/biotk { - angstrom-unix = self.angstrom-unix.override { inherit angstrom; }; - ppx_deriving = self.ppx_deriving.override { inherit (jsDeps) ppxlib; }; - uri = self.uri.override { inherit angstrom; }; - vg = self.vg.override { htmlcBackend = false; }; - }; - - phylogenetics = let - angstrom = self.angstrom.override { inherit ppx_let; }; - in callPackage ../development/ocaml-modules/phylogenetics { - ppx_deriving = self.ppx_deriving.override { inherit (jsDeps) ppxlib; }; - angstrom-unix = self.angstrom-unix.override { inherit angstrom; }; - }; - ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; })).overrideScope liftJaneStreet; @@ -1462,7 +1450,7 @@ let pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; - phylogenetics = janeStreet_0_15.phylogenetics; + phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; piaf = callPackage ../development/ocaml-modules/piaf { }; @@ -2036,13 +2024,6 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages = ocamlPackages_5_1; - # This is a nasty way to replace toplevel janestreet attributes in the scope, - # so that modules outside of ocamlPackages that depend on JS OCaml libraries - # *and* non-JS OCaml libraries can pull in the same version of JS transitive - # dependencies. Remove this once ligo and stanc can be compiled against - # janestreet 0.16 libraries. - ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope (self: super: super // super.janeStreet_0_15); - # We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0. # Below are aliases for porting them to the latest versions of the OCaml 4 series. ocamlPackages_4_14_unsafe_string = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4a11a1732847..76a44d4ec416 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10916,68 +10916,6 @@ with self; { }; }; - Gnome2 = buildPerlPackage { - pname = "Gnome2"; - version = "1.048"; - src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.048.tar.gz"; - hash = "sha256-ZPzDgnFKvY1XaSrDdjKMOiDGy8i81zKwB9FMv5ooLd0="; - }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gnome2Canvas Gnome2VFS Gtk2 ]; - propagatedBuildInputs = [ pkgs.gnome2.libgnomeui ]; - meta = { - description = "(DEPRECATED) Perl interface to the 2.x series of the GNOME libraries"; - homepage = "https://gtk2-perl.sourceforge.net"; - license = with lib.licenses; [ lgpl21Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gnome2Canvas.x86_64-darwin - }; - }; - - Gnome2Canvas = buildPerlPackage { - pname = "Gnome2-Canvas"; - version = "1.006"; - src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Canvas-1.006.tar.gz"; - hash = "sha256-aQZnxziSHeLWUWtOtjlVOlceSoMQ2AMfFYZYU23lq0I="; - }; - buildInputs = [ pkgs.gnome2.libgnomecanvas ]; - propagatedBuildInputs = [ Gtk2 ]; - doCheck = !stdenv.isDarwin; - meta = { - description = "(DEPRECATED) A structured graphics canvas"; - license = with lib.licenses; [ lgpl2Plus ]; - }; - }; - - Gnome2VFS = buildPerlPackage { - pname = "Gnome2-VFS"; - version = "1.084"; - src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-VFS-1.084.tar.gz"; - hash = "sha256-PI2Mlca2XCN9ueiJx57bK7gIvzfAhKvfu9mFn+93h8w="; - }; - propagatedBuildInputs = [ pkgs.gnome2.gnome_vfs Glib ]; - meta = { - description = "(DEPRECATED) Perl interface to the 2.x series of the GNOME VFS"; - license = with lib.licenses; [ lgpl21Plus ]; - }; - }; - - Gnome2Wnck = buildPerlPackage { - pname = "Gnome2-Wnck"; - version = "0.18"; - src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Wnck-0.18.tar.gz"; - hash = "sha256-RL7OyLLX9B8ngKc7CSJp/bec1JJluuDI/zkQN8RWSjU="; - }; - buildInputs = [ pkgs.libwnck2 pkgs.glib pkgs.gtk2 ]; - propagatedBuildInputs = [ Gtk2 ]; - meta = { - description = "(DEPRECATED) Perl interface to the Window Navigator"; - license = with lib.licenses; [ lgpl21Plus ]; - }; - }; - GnuPG = buildPerlPackage { pname = "GnuPG"; version = "0.19"; @@ -19653,7 +19591,7 @@ with self; { }; # FIXME: try with libGL + libGLU instead of libGLU libGL - buildInputs = [ pkgs.libGLU pkgs.libGL pkgs.libGLU pkgs.freeglut pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXmu pkgs.xorg.libXext pkgs.xdummy ]; + buildInputs = [ pkgs.libGLU pkgs.libGL pkgs.libGLU pkgs.libglut pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXmu pkgs.xorg.libXext pkgs.xdummy ]; patches = [ ../development/perl-modules/perl-opengl.patch ]; @@ -20357,10 +20295,11 @@ with self; { --replace 'WITH_PROJ => undef' 'WITH_PROJ => 0' ''; - nativeBuildInputs = with pkgs; [ autoPatchelfHook libGL.dev glibc.dev mesa_glu.dev ]; + # FIXME: Why are these libraries in `nativeBuildInputs`? + nativeBuildInputs = with pkgs; [ autoPatchelfHook (lib.getDev libGL) (lib.getDev glibc) (lib.getDev mesa_glu) ]; buildInputs = [ DevelChecklib TestDeep TestException TestWarn ] ++ - (with pkgs; [ gsl freeglut xorg.libXmu xorg.libXi ]); + (with pkgs; [ gsl libglut xorg.libXmu xorg.libXi ]); propagatedBuildInputs = [ AstroFITSHeader @@ -20381,7 +20320,7 @@ with self; { homepage = "https://pdl.perl.org"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "pdl2"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 09a3029bda53..8e821257be7b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -33,10 +33,12 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ + aadict = throw "aadict was removed, it was introduced as a dependency for a package that never manifested and has been an unused leaf package ever since"; # added 2024-07-08 abodepy = jaraco-abode; # added 2023-02-01 acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19 adafruit-nrfutil = throw "adafruit-nrfutil has been promoted to a top-level attribute name: `pkgs.adafruit-nrfutil`."; # Added 2023-11-19 aioaladdinconnect = throw "aioaladdinconnect has been removed, as the API is supported was obsoleted on 2024-01-24."; # Added 2024-06-07 + aiomysensors = throw "aiomysensors has been removed, as it was packaged for Home Assistant, which migrated to pymysensors."; # Added 2024-07-07 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27 aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05 @@ -53,6 +55,7 @@ mapAliases ({ APScheduler = apscheduler; # added 2023-02-19 async_generator = async-generator; # added 2023-08-08 async_stagger = async-stagger; # added 2023-08-08 + asyncio-mqtt = throw "asyncio-mqtt has been replaced by aiomqtt, which is not API compatible."; # added 2024-07-07 asyncio-nats-client = nats-py; # added 2022-02-08 atsim_potentials = atsim-potentials; # added 2023-10-08 awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13 @@ -84,6 +87,7 @@ mapAliases ({ 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 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 cchardet = faust-cchardet; # added 2023-03-02 cepa = throw "cepa has been removed, as onionshare switched back to stem"; # added 2024-05-07 class-registry = phx-class-registry; # added 2021-10-05 @@ -132,6 +136,7 @@ mapAliases ({ django_hijack_admin = django-hijack-admin; # added 2023-05-16 django-hijack-admin = throw "django-hijack-admin has been removed, since it is no longer compatible to django-hijack"; # added 2023-06-21 django_modelcluster = django-modelcluster; # added 2022-04-02 + django-mysql = throw "django-mysql has been removed, since it was an unused leaf package"; # added 2024-07-02 django_nose = django-nose; # added 2023-07-25 django-nose = throw "django-nose has been removed since it has not been maintained and there are no dependent packages"; # added 2024-05-21 django_reversion = django-reversion; # added 2022-06-18 @@ -160,6 +165,7 @@ mapAliases ({ face_recognition_models = face-recognition-models; # added 2022-10-15 factory_boy = factory-boy; # added 2023-10-08 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 + faster-fifo = throw "faster-fifo has been removed since it was an unused leaf package"; # added 2024-07-02 fastnlo_toolkit = fastnlo-toolkit; # added 2024-01-03 fastpair = throw "fastpair is unmaintained upstream and has therefore been removed"; # added 2024-05-01 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 @@ -186,6 +192,7 @@ mapAliases ({ flufl_bounce = flufl-bounce; # added 2023-11-03 flufl_i18n = flufl-i18n; # added 2023-11-03 flufl_lock = flufl-lock; # added 2023-11-03 + forbiddenfruit = throw "forbiddenfruit has been removed, because it was unmaintained and relied on the nose test framework"; # added 2024-07-08 FormEncode = formencode; # added 2023-02-19 foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 @@ -383,6 +390,7 @@ mapAliases ({ pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 PyMVGLive = pymvglive; # added 2023-02-19 pymyq = python-myq; # added 2023-10-20 + pynose = throw "pynose was removed, because it violates the license of nose, by redistributing modified LGPL code under MIT."; python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07 pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09 pyqt5_sip = pyqt5-sip; # added 2024-01-07 @@ -421,6 +429,7 @@ mapAliases ({ pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 pytest-ordering = throw "pytest-ordering has been removed, since it is no longer maintained and broken"; # added 2023-06-22 + pytest-openfiles = throw "pytest-openfiles has been removed, since it is unmaintained and archived"; # added 2024-06-19 pytest-pep8 = pytestpep8; # added 2021-01-04 pytest-pep257 = throw "pytest-pep257 was removed, as the pep257 package was migrated into pycodestyle"; # added 2022-04-12 pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b165d64e4eb..d4b56d1be53f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25,8 +25,6 @@ self: super: with self; { a2wsgi = callPackage ../development/python-modules/a2wsgi { }; - aadict = callPackage ../development/python-modules/aadict { }; - aafigure = callPackage ../development/python-modules/aafigure { }; aardwolf = callPackage ../development/python-modules/aardwolf { }; @@ -329,8 +327,6 @@ self: super: with self; { aiomusiccast = callPackage ../development/python-modules/aiomusiccast { }; - aiomysensors = callPackage ../development/python-modules/aiomysensors { }; - aiomysql = callPackage ../development/python-modules/aiomysql { }; aionanoleaf = callPackage ../development/python-modules/aionanoleaf { }; @@ -491,6 +487,8 @@ self: super: with self; { alarmdecoder = callPackage ../development/python-modules/alarmdecoder { }; + albucore = callPackage ../development/python-modules/albucore { }; + albumentations = callPackage ../development/python-modules/albumentations { }; ale-py = callPackage ../development/python-modules/ale-py { }; @@ -887,8 +885,6 @@ self: super: with self; { asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { }; - asyncio-mqtt = callPackage ../development/python-modules/asyncio-mqtt { }; - asyncio-rlock = callPackage ../development/python-modules/asyncio-rlock { }; asyncmy = callPackage ../development/python-modules/asyncmy { }; @@ -1395,6 +1391,8 @@ self: super: with self; { backports-strenum = callPackage ../development/python-modules/backports-strenum { }; + backports-tarfile = callPackage ../development/python-modules/backports-tarfile { }; + backports-zoneinfo = callPackage ../development/python-modules/backports-zoneinfo { }; bacpypes = callPackage ../development/python-modules/bacpypes { }; @@ -1964,8 +1962,6 @@ self: super: with self; { casbin = callPackage ../development/python-modules/casbin { }; - case = callPackage ../development/python-modules/case { }; - cashaddress = callPackage ../development/python-modules/cashaddress { }; cashews = callPackage ../development/python-modules/cashews { }; @@ -2505,6 +2501,8 @@ self: super: with self; { convertdate = callPackage ../development/python-modules/convertdate { }; + convertertools = callPackage ../development/python-modules/convertertools { }; + cookiecutter = callPackage ../development/python-modules/cookiecutter { }; cookies = callPackage ../development/python-modules/cookies { }; @@ -2533,6 +2531,8 @@ self: super: with self; { coveralls = callPackage ../development/python-modules/coveralls { }; + cpe = callPackage ../development/python-modules/cpe { }; + cppe = callPackage ../development/python-modules/cppe { inherit (pkgs) cppe; }; @@ -2585,7 +2585,7 @@ self: super: with self; { criticality-score = callPackage ../development/python-modules/criticality-score { }; - crocoddyl = toPythonModule (callPackage ../development/libraries/crocoddyl { + crocoddyl = toPythonModule (pkgs.crocoddyl.override { pythonSupport = true; python3Packages = self; }); @@ -2859,8 +2859,12 @@ self: super: with self; { dbglib = callPackage ../development/python-modules/dbglib { }; + dbt-adapters = callPackage ../development/python-modules/dbt-adapters { }; + dbt-bigquery = callPackage ../development/python-modules/dbt-bigquery { }; + dbt-common = callPackage ../development/python-modules/dbt-common { }; + dbt-core = callPackage ../development/python-modules/dbt-core { }; dbt-extractor = callPackage ../development/python-modules/dbt-extractor { }; @@ -2973,6 +2977,8 @@ self: super: with self; { deltachat2 = callPackage ../development/python-modules/deltachat2 { }; + deltalake = callPackage ../development/python-modules/deltalake { }; + deluge-client = callPackage ../development/python-modules/deluge-client { }; demes = callPackage ../development/python-modules/demes { }; @@ -3321,8 +3327,6 @@ self: super: with self; { django-mptt = callPackage ../development/python-modules/django-mptt { }; - django-mysql = callPackage ../development/python-modules/django-mysql { }; - django-ninja = callPackage ../development/python-modules/django-ninja { }; django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; @@ -4149,6 +4153,8 @@ self: super: with self; { fastapi = callPackage ../development/python-modules/fastapi { }; + fastapi-cli = callPackage ../development/python-modules/fastapi-cli { }; + fastapi-mail = callPackage ../development/python-modules/fastapi-mail { }; fastapi-sso = callPackage ../development/python-modules/fastapi-sso { }; @@ -4177,8 +4183,6 @@ self: super: with self; { fastentrypoints = callPackage ../development/python-modules/fastentrypoints { }; - faster-fifo = callPackage ../development/python-modules/faster-fifo { }; - faster-whisper = callPackage ../development/python-modules/faster-whisper { }; fastimport = callPackage ../development/python-modules/fastimport { }; @@ -4459,10 +4463,10 @@ self: super: with self; { flexcache = callPackage ../development/python-modules/flexcache { }; - flexparser = callPackage ../development/python-modules/flexparser { }; - flexmock = callPackage ../development/python-modules/flexmock { }; + flexparser = callPackage ../development/python-modules/flexparser { }; + flickrapi = callPackage ../development/python-modules/flickrapi { }; flipr-api = callPackage ../development/python-modules/flipr-api { }; @@ -4471,6 +4475,8 @@ self: super: with self; { flit-core = callPackage ../development/python-modules/flit-core { }; + flit-gettext = callPackage ../development/python-modules/flit-gettext { }; + flit-scm = callPackage ../development/python-modules/flit-scm { }; floret = callPackage ../development/python-modules/floret { }; @@ -4552,8 +4558,6 @@ self: super: with self; { foolscap = callPackage ../development/python-modules/foolscap { }; - forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { }; - fordpass = callPackage ../development/python-modules/fordpass { }; forecast-solar = callPackage ../development/python-modules/forecast-solar { }; @@ -4753,6 +4757,11 @@ self: super: with self; { gemfileparser2 = callPackage ../development/python-modules/gemfileparser2 { }; + gemmi = toPythonModule (pkgs.gemmi.override { + enablePython = true; + python3Packages = self; + }); + genanki = callPackage ../development/python-modules/genanki { }; generic = callPackage ../development/python-modules/generic { }; @@ -4930,7 +4939,8 @@ self: super: with self; { gmpy = callPackage ../development/python-modules/gmpy { }; - gmsh = toPythonModule (callPackage ../applications/science/math/gmsh { + gmsh = toPythonModule (pkgs.gmsh.override { + inherit (self) python; enablePython = true; }); @@ -5520,9 +5530,7 @@ self: super: with self; { homepluscontrol = callPackage ../development/python-modules/homepluscontrol { }; - hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { - inherit python; - }); + hoomd-blue = callPackage ../development/python-modules/hoomd-blue { }; hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; @@ -5625,6 +5633,8 @@ self: super: with self; { huawei-lte-api = callPackage ../development/python-modules/huawei-lte-api { }; + huepy = callPackage ../development/python-modules/huepy { }; + huey = callPackage ../development/python-modules/huey { }; hug = callPackage ../development/python-modules/hug { }; @@ -6120,13 +6130,14 @@ self: super: with self; { IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; }; - jaxlib = self.jaxlib-build; + # Use the -bin on macOS since the source build doesn't support it (see #323154) + jaxlib = if jaxlib-build.meta.unsupported then jaxlib-bin else jaxlib-build; - jaxlibWithCuda = self.jaxlib-build.override { + jaxlibWithCuda = self.jaxlib.override { cudaSupport = true; }; - jaxlibWithoutCuda = self.jaxlib-build.override { + jaxlibWithoutCuda = self.jaxlib.override { cudaSupport = false; }; @@ -6174,6 +6185,8 @@ self: super: with self; { jishaku = callPackage ../development/python-modules/jishaku { }; + jiter = callPackage ../development/python-modules/jiter { }; + jiwer = callPackage ../development/python-modules/jiwer { }; jmespath = callPackage ../development/python-modules/jmespath { }; @@ -6208,10 +6221,14 @@ self: super: with self; { jschema-to-python = callPackage ../development/python-modules/jschema-to-python { }; + jschon = callPackage ../development/python-modules/jschon { }; + jsmin = callPackage ../development/python-modules/jsmin { }; json5 = callPackage ../development/python-modules/json5 { }; + jsonxs = callPackage ../development/python-modules/jsonxs { }; + jsonargparse = callPackage ../development/python-modules/jsonargparse { }; jsonconversion = callPackage ../development/python-modules/jsonconversion { }; @@ -6511,6 +6528,7 @@ self: super: with self; { kmsxx = toPythonModule (pkgs.kmsxx.override { withPython = true; + python3Packages = self; }); knack = callPackage ../development/python-modules/knack { }; @@ -7624,11 +7642,14 @@ self: super: with self; { mkdocs-autolinks-plugin = callPackage ../development/python-modules/mkdocs-autolinks-plugin { }; mkdocs-autorefs = callPackage ../development/python-modules/mkdocs-autorefs { }; + mkdocs-awesome-pages-plugin = callPackage ../development/python-modules/mkdocs-awesome-pages-plugin { }; mkdocs-drawio-exporter = callPackage ../development/python-modules/mkdocs-drawio-exporter { }; mkdocs-exclude = callPackage ../development/python-modules/mkdocs-exclude { }; + mkdocs-get-deps = callPackage ../development/python-modules/mkdocs-get-deps { }; + mkdocs-git-authors-plugin = callPackage ../development/python-modules/mkdocs-git-authors-plugin { }; mkdocs-git-revision-date-localized-plugin = callPackage ../development/python-modules/mkdocs-git-revision-date-localized-plugin { }; @@ -8865,7 +8886,7 @@ self: super: with self; { neuron-full = pkgs.neuron-full.override { python3 = python; }; - neuronpy = python.pkgs.toPythonModule neuron-full; + neuronpy = toPythonModule neuron-full; nevow = callPackage ../development/python-modules/nevow { }; @@ -9069,7 +9090,9 @@ self: super: with self; { numpydoc = callPackage ../development/python-modules/numpydoc { }; - numpy = callPackage ../development/python-modules/numpy { }; + numpy_1 = callPackage ../development/python-modules/numpy/1.nix { }; + numpy_2 = callPackage ../development/python-modules/numpy/2.nix { }; + numpy = if self.pythonOlder "3.13" then numpy_1 else numpy_2; numpy-stl = callPackage ../development/python-modules/numpy-stl { }; @@ -9091,6 +9114,8 @@ self: super: with self; { plugp100 = callPackage ../development/python-modules/plugp100 {}; + python-hcl2 = callPackage ../development/python-modules/python-hcl2 { }; + python-ndn = callPackage ../development/python-modules/python-ndn { }; python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; @@ -9521,7 +9546,9 @@ self: super: with self; { paginate = callPackage ../development/python-modules/paginate { }; - paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; + paho-mqtt_1 = callPackage ../development/python-modules/paho-mqtt/1.nix { }; + paho-mqtt_2 = callPackage ../development/python-modules/paho-mqtt/default.nix { }; + paho-mqtt = paho-mqtt_1; palace = callPackage ../development/python-modules/palace { }; @@ -9677,7 +9704,7 @@ self: super: with self; { pbs-installer = callPackage ../development/python-modules/pbs-installer { }; - pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); + pc-ble-driver-py = callPackage ../development/python-modules/pc-ble-driver-py { }; pcapy-ng = callPackage ../development/python-modules/pcapy-ng { inherit (pkgs) libpcap; # Avoid confusion with python package of the same name @@ -10120,8 +10147,6 @@ self: super: with self; { pynobo = callPackage ../development/python-modules/pynobo { }; - pynose = callPackage ../development/python-modules/pynose { }; - pynotifier = callPackage ../development/python-modules/pynotifier { }; pynuki = callPackage ../development/python-modules/pynuki { }; @@ -10709,7 +10734,7 @@ self: super: with self; { py2bit = callPackage ../development/python-modules/py2bit { }; - py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); + py3buddy = callPackage ../development/python-modules/py3buddy { }; py3exiv2 = callPackage ../development/python-modules/py3exiv2 { inherit (pkgs) exiv2; @@ -11625,9 +11650,7 @@ self: super: with self; { phonemizer = callPackage ../development/python-modules/phonemizer { }; - pyopencl = callPackage ../development/python-modules/pyopencl { - mesa_drivers = pkgs.mesa.drivers; - }; + pyopencl = callPackage ../development/python-modules/pyopencl { }; pyopengl = callPackage ../development/python-modules/pyopengl { }; @@ -12285,6 +12308,8 @@ self: super: with self; { pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; + pytest-lazy-fixtures = callPackage ../development/python-modules/pytest-lazy-fixtures { }; + pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; pytest-logdog = callPackage ../development/python-modules/pytest-logdog { }; @@ -12307,8 +12332,6 @@ self: super: with self; { pytest-notebook = callPackage ../development/python-modules/pytest-notebook { }; - pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; - pytest-order = callPackage ../development/python-modules/pytest-order { }; pytest-param-files = callPackage ../development/python-modules/pytest-param-files { }; @@ -12355,6 +12378,8 @@ self: super: with self; { pytest-resource-path = callPackage ../development/python-modules/pytest-resource-path { }; + pytest-responses = callPackage ../development/python-modules/pytest-responses { }; + pytest-runner = callPackage ../development/python-modules/pytest-runner { }; pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; @@ -12779,7 +12804,9 @@ self: super: with self; { pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; - pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; + pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { + inherit (pkgs.config) cudaSupport; + }; pytorch-msssim = callPackage ../development/python-modules/pytorch-msssim { }; @@ -12825,7 +12852,7 @@ self: super: with self; { inherit (pkgs) udev; }; - pyunbound = toPythonModule (callPackage ../tools/networking/unbound/python.nix { }); + pyunbound = callPackage ../development/python-modules/pyunbound { }; pyunifi = callPackage ../development/python-modules/pyunifi { }; @@ -13653,6 +13680,8 @@ self: super: with self; { rxv = callPackage ../development/python-modules/rxv { }; + ryd-client = callPackage ../development/python-modules/ryd-client { }; + rzpipe = callPackage ../development/python-modules/rzpipe { }; s2clientprotocol = callPackage ../development/python-modules/s2clientprotocol { }; @@ -13869,9 +13898,9 @@ self: super: with self; { segno = callPackage ../development/python-modules/segno { }; - segyio = toPythonModule (callPackage ../development/python-modules/segyio { + segyio = callPackage ../development/python-modules/segyio { inherit (pkgs) cmake ninja; - }); + }; selectors2 = callPackage ../development/python-modules/selectors2 { }; @@ -13911,7 +13940,9 @@ self: super: with self; { sentinels = callPackage ../development/python-modules/sentinels { }; - sentry-sdk = callPackage ../development/python-modules/sentry-sdk { }; + sentry-sdk_1 = callPackage ../development/python-modules/sentry-sdk/1.nix { }; + sentry-sdk_2 = callPackage ../development/python-modules/sentry-sdk/default.nix { }; + sentry-sdk = sentry-sdk_1; sepaxml = callPackage ../development/python-modules/sepaxml { }; @@ -15381,7 +15412,7 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; - tokenize-rt = toPythonModule (callPackage ../development/python-modules/tokenize-rt { }); + tokenize-rt = callPackage ../development/python-modules/tokenize-rt { }; tokenlib = callPackage ../development/python-modules/tokenlib { }; @@ -16846,7 +16877,9 @@ self: super: with self; { vidstab = callPackage ../development/python-modules/vidstab { }; - viennarna = toPythonModule pkgs.viennarna; + viennarna = toPythonModule (pkgs.viennarna.override { + python3 = self.python; + }); viewstate = callPackage ../development/python-modules/viewstate { }; @@ -17345,9 +17378,7 @@ self: super: with self; { xtensor-python = callPackage ../development/python-modules/xtensor-python { }; - xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { - inherit (pkgs.xorg) xorgserver; - }; + xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper {}; xxhash = callPackage ../development/python-modules/xxhash { }; diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix index a80b40d36060..489c378abf04 100644 --- a/pkgs/top-level/release-attrpaths-superset.nix +++ b/pkgs/top-level/release-attrpaths-superset.nix @@ -52,6 +52,7 @@ let pkgsMusl = true; pkgsStatic = true; pkgsCross = true; + pkgsx86_64Darwin = true; pkgsi686Linux = true; pkgsLinux = true; pkgsExtraHardening = true; @@ -70,9 +71,11 @@ let override = true; __functor = true; __functionArgs = true; + __splicedPackages = true; newScope = true; scope = true; pkgs = true; + test-pkgs = true; buildHaskellPackages = true; buildPackages = true; diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index f9577b9b72c7..365e306455ac 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -1,60 +1,163 @@ /* Test CUDA packages. - This release file will not be tested on hydra.nixos.org - because it requires unfree software. + This release file is currently not tested on hydra.nixos.org + because it requires unfree software, but it is tested by + https://hydra.nix-community.org/jobset/nixpkgs/cuda-nixos-unstable. + + Cf. https://github.com/nix-community/infra/pull/1335 Test for example like this: - $ hydra-eval-jobs pkgs/top-level/release-cuda.nix --option restrict-eval false -I foo=. --arg nixpkgs '{ outPath = ./.; revCount = 0; shortRev = "aabbcc"; }' - + $ hydra-eval-jobs pkgs/top-level/release-cuda.nix -I . */ -{ # The platforms for which we build Nixpkgs. +let + ensureList = x: if builtins.isList x then x else [ x ]; + allowUnfreePredicate = + p: + builtins.all ( + license: + license.free + || license.redistributable + || builtins.elem license.shortName [ + "CUDA EULA" + "cuDNN EULA" + "NVidia OptiX EULA" + ] + ) (ensureList p.meta.license); +in + +{ + # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" - ] -, # Attributes passed to nixpkgs. - nixpkgsArgs ? { config = { allowUnfree = true; inHydra = true; }; } + "aarch64-linux" + ], + variant ? "cuda", + # Attributes passed to nixpkgs. + nixpkgsArgs ? { + config = { + inherit allowUnfreePredicate; + "${variant}Support" = true; + inHydra = true; + }; + }, }: +assert builtins.elem variant [ + "cuda" + "rocm" + null +]; + let - release-lib = import ./release-lib.nix { - inherit supportedSystems nixpkgsArgs; - }; + release-lib = import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; - inherit (release-lib) linux mapTestOn packagePlatforms pkgs; - - inherit (release-lib.lib) genAttrs; - - # Package sets to evaluate - packageSets = [ - "cudaPackages_10_0" - "cudaPackages_10_1" - "cudaPackages_10_2" - "cudaPackages_10" - "cudaPackages_11_0" - "cudaPackages_11_1" - "cudaPackages_11_2" - "cudaPackages_11_3" - "cudaPackages_11_4" - "cudaPackages_11_5" - "cudaPackages_11_6" - "cudaPackages_11" - "cudaPackages" - ]; + inherit (release-lib) lib; + inherit (release-lib) + linux + mapTestOn + packagePlatforms + pkgs + ; + # Package sets to evaluate whole + packageSets = builtins.filter (lib.strings.hasPrefix "cudaPackages") (builtins.attrNames pkgs); evalPackageSet = pset: mapTestOn { ${pset} = packagePlatforms pkgs.${pset}; }; - jobs = (mapTestOn ({ - # Packages to evaluate - python3.pkgs.caffeWithCuda = linux; - python3.pkgs.jaxlibWithCuda = linux; - python3.pkgs.libgpuarray = linux; - python3.pkgs.tensorflowWithCuda = linux; - python3.pkgs.pyrealsense2WithCuda = linux; - python3.pkgs.torchWithCuda = linux; - python3.pkgs.jaxlib = linux; - }) // (genAttrs packageSets evalPackageSet)); + jobs = + mapTestOn { + blas = linux; + blender = linux; + faiss = linux; + lapack = linux; + magma = linux; + mpich = linux; + openmpi = linux; + ucx = linux; -in jobs + opencv = linux; + cctag = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581 + + cholmod-extra = linux; + colmap = linux; + ctranslate2 = linux; + deepin.image-editor = linux; + ffmpeg-full = linux; + gimp = linux; + gpu-screen-recorder = linux; + gst_all_1.gst-plugins-bad = linux; + lightgbm = linux; + llama-cpp = linux; + meshlab = linux; + monado = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581 + noisetorch = linux; + obs-studio-plugins.obs-backgroundremoval = linux; + ollama = linux; + onnxruntime = linux; + openmvg = linux; + openmvs = linux; + opentrack = linux; + openvino = linux; + pixinsight = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581 + qgis = linux; + rtabmap = linux; + saga = linux; + suitesparse = linux; + truecrack-cuda = linux; + tts = linux; + ueberzugpp = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581 + wyoming-faster-whisper = linux; + xgboost = linux; + + python3Packages = { + boxx = linux; + bpycv = linux; + caffe = linux; + catboost = linux; + chainer = linux; + cupy = linux; + faiss = linux; + faster-whisper = linux; + flax = linux; + gpt-2-simple = linux; + grad-cam = linux; + jaxlib = linux; + jax = linux; + Keras = linux; + kornia = linux; + libgpuarray = linux; + mmcv = linux; + mxnet = linux; + numpy = linux; # Only affected by MKL? + onnx = linux; + openai-triton = linux; + openai-whisper = linux; + opencv4 = linux; + opensfm = linux; + pycuda = linux; + pymc = linux; + pyrealsense2WithCuda = linux; + pytorch-lightning = linux; + pytorch = linux; + scikitimage = linux; + scikit-learn = linux; # Only affected by MKL? + scipy = linux; # Only affected by MKL? + spacy-transformers = linux; + tensorflow = linux; + tensorflow-probability = linux; + tesserocr = linux; + Theano = linux; + tiny-cuda-nn = linux; + torchaudio = linux; + torch = linux; + torchvision = linux; + transformers = linux; + ttstokenizer = linux; + vidstab = linux; + }; + } + // (lib.genAttrs packageSets evalPackageSet); +in +jobs diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index bb4ead25066d..40a42dd49978 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -45,11 +45,12 @@ let constituents = [ jobs.nixos-render-docs.x86_64-linux # Used in nixos manual jobs.remarshal.x86_64-linux # Used in pkgs.formats helper - jobs.python311Packages.buildcatrust.x86_64-linux # Used in pkgs.cacert - jobs.python311Packages.colorama.x86_64-linux # Used in nixos test-driver - jobs.python311Packages.ptpython.x86_64-linux # Used in nixos test-driver - jobs.python311Packages.requests.x86_64-linux # Almost ubiquous package - jobs.python311Packages.sphinx.x86_64-linux # Document creation for many packages + jobs.python312Packages.afdko.x86_64-linux # Used in noto-fonts-color-emoji + jobs.python312Packages.buildcatrust.x86_64-linux # Used in pkgs.cacert + jobs.python312Packages.colorama.x86_64-linux # Used in nixos test-driver + jobs.python312Packages.ptpython.x86_64-linux # Used in nixos test-driver + jobs.python312Packages.requests.x86_64-linux # Almost ubiquous package + jobs.python312Packages.sphinx.x86_64-linux # Document creation for many packages ]; }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 087b43c3cb14..b0c7ec03827b 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -292,7 +292,7 @@ let pkgsExtraHardening = super'; stdenv = super'.withDefaultHardeningFlags ( super'.stdenv.cc.defaultHardeningFlags ++ [ - "zerocallusedregs" + "stackclashprotection" "trivialautovarinit" ] ) super'.stdenv;